yubikey-manager: 4.0.9 -> 5.0.0

NixOS · Nov 1, 2022 · ad42820 · ad42820
1 parent cd0a368
commit ad42820
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 50 deletions.
diff --git a/pkgs/tools/misc/yubikey-manager/default.nix b/pkgs/tools/misc/yubikey-manager/default.nix
@@ -1,22 +1,18 @@
 { python3Packages, fetchFromGitHub, lib, yubikey-personalization, libu2f-host, libusb1, procps
-, stdenv, pyOpenSSLSupport ? !(stdenv.isDarwin && stdenv.isAarch64) }:
+, stdenv }:
 
 python3Packages.buildPythonPackage rec {
   pname = "yubikey-manager";
-  version = "4.0.9";
+  version = "5.0.0";
   format = "pyproject";
 
   src = fetchFromGitHub {
     repo = "yubikey-manager";
     rev = "refs/tags/${version}";
     owner = "Yubico";
-    sha256 = "sha256-MwM/b1QP6pkyBjz/r6oC4sW1mKC0CKMay45a0wCktk0=";
+    sha256 = "sha256-ZQQhRiUsQwLaOY8NCzSc/PTmRewTL0ECBKj7Uj+6Gn8=";
   };
 
-  patches = lib.optionals (!pyOpenSSLSupport) [
-    ./remove-pyopenssl-tests.patch
-  ];
-
   postPatch = ''
     substituteInPlace pyproject.toml \
       --replace 'fido2 = ">=0.9, <1.0"' 'fido2 = ">*"'
@@ -34,8 +30,7 @@ python3Packages.buildPythonPackage rec {
       pyusb
       six
       fido2
-    ] ++ lib.optionals pyOpenSSLSupport [
-      pyopenssl
+      keyring
     ]) ++ [
       libu2f-host
       libusb1

diff --git a/pkgs/tools/misc/yubikey-manager/remove-pyopenssl-tests.patch b/pkgs/tools/misc/yubikey-manager/remove-pyopenssl-tests.patch