diff --git a/pkgs/tools/misc/yubikey-manager/4.nix b/pkgs/tools/misc/yubikey-manager/4.nix index 6d653caeeb13..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="; }; @@ -19,28 +19,28 @@ 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' ''; - 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 ];