Merge branch 'staging-next' into staging

In python-packages.nix, resolve conflict between 50d604314e and 187d0371ab.
2021-04-08 17:14:31 +02:00
parent 97490e6783 bf6abedefb
commit 625ce6c7f6
112 changed files with 2577 additions and 1772 deletions
--- a/pkgs/development/python-modules/fido2/default.nix
+++ b/pkgs/development/python-modules/fido2/default.nix
@@ -20,6 +20,16 @@ buildPythonPackage rec {

  checkInputs = [ mock pyfakefs ];

+  # Testing with `python setup.py test` doesn't work:
+  # https://github.com/Yubico/python-fido2/issues/108#issuecomment-763513576
+  checkPhase = ''
+    runHook preCheck
+
+    python -m unittest discover -v
+
+    runHook postCheck
+  '';
+
  pythonImportsCheck = [ "fido2" ];

  meta = with lib; {