From 7b36a1ad090dbe66c3d4fb5d28b6ed49978d19e0 Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Wed, 7 Apr 2021 13:21:57 +0200 Subject: [PATCH 1/6] pythonPackages.fido2: 0.8.1 -> 0.9.1 --- pkgs/development/python-modules/fido2/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fido2/default.nix b/pkgs/development/python-modules/fido2/default.nix index ac8e912ba3d..1e1af8e9591 100644 --- a/pkgs/development/python-modules/fido2/default.nix +++ b/pkgs/development/python-modules/fido2/default.nix @@ -9,17 +9,27 @@ buildPythonPackage rec { pname = "fido2"; - version = "0.8.1"; + version = "0.9.1"; src = fetchPypi { inherit pname version; - sha256 = "1hzprnd407g2xh9kyv8j8pq949hwr1snmg3fp65pqfbghzv6i424"; + hash = "sha256-hoDuJSOOIwdZbrOQCg+MDZzJEYkUbtgDlUTxo6ad/m4="; }; propagatedBuildInputs = [ six cryptography ]; 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; { From 0e489fbc97413394644271885ed4c49fafa3202b Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Wed, 7 Apr 2021 13:43:11 +0200 Subject: [PATCH 2/6] python3Packages.aws-adfs: loosen fido2 version constraint --- pkgs/development/python-modules/aws-adfs/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/aws-adfs/default.nix b/pkgs/development/python-modules/aws-adfs/default.nix index 2f9cd1a0b19..461ce9d90d9 100644 --- a/pkgs/development/python-modules/aws-adfs/default.nix +++ b/pkgs/development/python-modules/aws-adfs/default.nix @@ -44,7 +44,9 @@ buildPythonPackage rec { # Relax version constraint postPatch = '' - sed -i 's/coverage < 4/coverage/' setup.py + substituteInPlace setup.py \ + --replace 'coverage < 4' 'coverage' \ + --replace 'fido2>=0.8.1,<0.9.0' 'fido2>=0.8.1,<1.0.0' ''; # Test suite writes files to $HOME/.aws/, or /homeless-shelter if unset From c1c43413d6ab30f160c028cacea13f3181bd1439 Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Wed, 7 Apr 2021 20:19:29 +0200 Subject: [PATCH 3/6] python3Packages.solo-python: mark package as broken solo-python currently does not support fido2 >= v0.9. Hence, we mark the package as broken until upstream intoduces support. Starting point to track this issue: https://github.com/solokeys/solo-python/issues/110. --- pkgs/development/python-modules/solo-python/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/solo-python/default.nix b/pkgs/development/python-modules/solo-python/default.nix index 72546642009..8d84ce34eb9 100644 --- a/pkgs/development/python-modules/solo-python/default.nix +++ b/pkgs/development/python-modules/solo-python/default.nix @@ -60,5 +60,8 @@ homepage = "https://github.com/solokeys/solo-python"; maintainers = with maintainers; [ wucke13 ]; license = with licenses; [ asl20 mit ]; + # solo-python v0.0.27 does not support fido2 >= v0.9 + # https://github.com/solokeys/solo-python/issues/110 + broken = true; }; } From 1072da3e3ee2c7ec863aab18c79f5e29aa241065 Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Wed, 7 Apr 2021 13:23:50 +0200 Subject: [PATCH 4/6] yubikey-manager: 3.1.2 -> 4.0.1 --- pkgs/tools/misc/yubikey-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/yubikey-manager/default.nix b/pkgs/tools/misc/yubikey-manager/default.nix index 07218d054df..d15483c8bad 100644 --- a/pkgs/tools/misc/yubikey-manager/default.nix +++ b/pkgs/tools/misc/yubikey-manager/default.nix @@ -3,11 +3,11 @@ python3Packages.buildPythonPackage rec { pname = "yubikey-manager"; - version = "3.1.2"; + version = "4.0.1"; srcs = fetchurl { url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz"; - hash = "sha256-dwnIOuu0QyWRl6RSdyQw7dGsAZ4xpXpx6jOpCkp4efE="; + hash = "sha256-OxbKo5vwOBabU6/2hO4RMWiifo4IVIxz+DlcwP9xO/E="; }; propagatedBuildInputs = From 0ff4e2a61884c31f52d518ed31e3b77686d59217 Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Wed, 7 Apr 2021 17:25:03 +0200 Subject: [PATCH 5/6] pythonPackages.makefun: init at 1.11.2 --- .../python-modules/makefun/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/makefun/default.nix diff --git a/pkgs/development/python-modules/makefun/default.nix b/pkgs/development/python-modules/makefun/default.nix new file mode 100644 index 00000000000..1f5596a46cc --- /dev/null +++ b/pkgs/development/python-modules/makefun/default.nix @@ -0,0 +1,32 @@ +{ lib +, fetchPypi +, buildPythonPackage +, setuptools_scm +}: + +buildPythonPackage rec { + pname = "makefun"; + version = "1.11.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-2qNQpILtWLVyREPGUUMhkem5ewyDdDh50JExccaigIU="; + }; + + nativeBuildInputs = [ setuptools_scm ]; + + # Disabling tests for now due to various (transitive) dependencies on modules + # from @smarie which are, as of yet, not part of nixpkgs. Also introduces + # a tricky dependency: makefun tests depend on pytest-cases, installing + # pytest-cases depends on makefun. + doCheck = false; + + pythonImportsCheck = [ "makefun" ]; + + meta = with lib; { + homepage = "https://github.com/smarie/python-makefun"; + description = "Small library to dynamically create python functions"; + license = licenses.bsd2; + maintainers = with maintainers; [ veehaitch ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 10da6e1f33c..f4e9bd4d565 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4107,6 +4107,8 @@ in { mail-parser = callPackage ../development/python-modules/mail-parser { }; + makefun = callPackage ../development/python-modules/makefun { }; + Mako = callPackage ../development/python-modules/Mako { }; managesieve = callPackage ../development/python-modules/managesieve { }; From 042b7059c50826b39c4021686dc2f6e7f2fa5fce Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Wed, 7 Apr 2021 17:28:36 +0200 Subject: [PATCH 6/6] yubikey-manager: run tests --- pkgs/tools/misc/yubikey-manager/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/tools/misc/yubikey-manager/default.nix b/pkgs/tools/misc/yubikey-manager/default.nix index d15483c8bad..12b3aa0f05f 100644 --- a/pkgs/tools/misc/yubikey-manager/default.nix +++ b/pkgs/tools/misc/yubikey-manager/default.nix @@ -42,8 +42,7 @@ python3Packages.buildPythonPackage rec { --replace 'compdef _ykman_completion ykman;' '_ykman_completion "$@"' ''; - # See https://github.com/NixOS/nixpkgs/issues/29169 - doCheck = false; + checkInputs = with python3Packages; [ pytestCheckHook makefun ]; meta = with lib; { homepage = "https://developers.yubico.com/yubikey-manager";