From 4abfe25fafccd0beb911e13ad4ae58a5b99e720c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 1 Mar 2023 01:45:38 +0100
Subject: [PATCH 1/2] yubikey-manager4: fix build

---
 pkgs/tools/misc/yubikey-manager/4.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/yubikey-manager/4.nix b/pkgs/tools/misc/yubikey-manager/4.nix
index 6d653caeeb13..3b5b430df0d2 100644
--- a/pkgs/tools/misc/yubikey-manager/4.nix
+++ b/pkgs/tools/misc/yubikey-manager/4.nix
@@ -19,7 +19,7 @@ python3Packages.buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace 'fido2 = ">=0.9, <1.0"' 'fido2 = ">*"'
+      --replace 'cryptography = ">=2.1, <39"' 'cryptography = ">=2.1"'
     substituteInPlace "ykman/pcsc/__init__.py" \
       --replace 'pkill' '${if stdenv.isLinux then "${procps}" else "/usr"}/bin/pkill'
   '';

From d0e6ae382a68a2c1151567d509e829e8585530ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 1 Mar 2023 01:45:46 +0100
Subject: [PATCH 2/2] yubikey-manager4: cleanup

---
 pkgs/tools/misc/yubikey-manager/4.nix | 40 +++++++++++++--------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/pkgs/tools/misc/yubikey-manager/4.nix b/pkgs/tools/misc/yubikey-manager/4.nix
index 3b5b430df0d2..b03e5fa93bb1 100644
--- a/pkgs/tools/misc/yubikey-manager/4.nix
+++ b/pkgs/tools/misc/yubikey-manager/4.nix
@@ -1,4 +1,4 @@
-{ python3Packages, fetchFromGitHub, lib, yubikey-personalization, libu2f-host, libusb1, procps
+{ python3Packages, fetchFromGitHub, lib, installShellFiles, yubikey-personalization, libu2f-host, libusb1, procps
 , stdenv, pyOpenSSLSupport ? !(stdenv.isDarwin && stdenv.isAarch64) }:
 
 python3Packages.buildPythonPackage rec {
@@ -7,9 +7,9 @@ python3Packages.buildPythonPackage rec {
   format = "pyproject";
 
   src = fetchFromGitHub {
+    owner = "Yubico";
     repo = "yubikey-manager";
     rev = "refs/tags/${version}";
-    owner = "Yubico";
     sha256 = "sha256-MwM/b1QP6pkyBjz/r6oC4sW1mKC0CKMay45a0wCktk0=";
   };
 
@@ -24,23 +24,23 @@ python3Packages.buildPythonPackage rec {
       --replace 'pkill' '${if stdenv.isLinux then "${procps}" else "/usr"}/bin/pkill'
   '';
 
-  nativeBuildInputs = with python3Packages; [ poetry-core ];
+  nativeBuildInputs = [ installShellFiles ]
+    ++ (with python3Packages; [ poetry-core ]);
 
-  propagatedBuildInputs =
-    with python3Packages; ([
-      click
-      cryptography
-      pyscard
-      pyusb
-      six
-      fido2
-    ] ++ lib.optionals pyOpenSSLSupport [
-      pyopenssl
-    ]) ++ [
-      libu2f-host
-      libusb1
-      yubikey-personalization
-    ];
+  propagatedBuildInputs = with python3Packages; ([
+    click
+    cryptography
+    pyscard
+    pyusb
+    six
+    fido2
+  ] ++ lib.optionals pyOpenSSLSupport [
+    pyopenssl
+  ]) ++ [
+    libu2f-host
+    libusb1
+    yubikey-personalization
+  ];
 
   makeWrapperArgs = [
     "--prefix" "LD_LIBRARY_PATH" ":"
@@ -48,8 +48,7 @@ python3Packages.buildPythonPackage rec {
   ];
 
   postInstall = ''
-    mkdir -p "$out/man/man1"
-    cp man/ykman.1 "$out/man/man1"
+    installManPage man/ykman.1
 
     mkdir -p $out/share/bash-completion/completions
     _YKMAN_COMPLETE=source $out/bin/ykman > $out/share/bash-completion/completions/ykman || :
@@ -64,7 +63,6 @@ python3Packages.buildPythonPackage rec {
   meta = with lib; {
     homepage = "https://developers.yubico.com/yubikey-manager";
     description = "Previous release of command line tool for configuring any YubiKey over all USB transports";
-
     license = licenses.bsd2;
     platforms = platforms.unix;
     maintainers = with maintainers; [ benley lassulus pinpox ];