Unverified Commit 987dc7ad authored by Lassulus's avatar Lassulus Committed by GitHub
Browse files

Merge pull request #198958 from afh/afh-yubikey-manager-update 

yubikey-manager: 4.0.9 -> 5.0.0
parents c8fc2e91 41af17cf

pkgs/tools/misc/yubikey-manager-qt/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
, qtbase

, qtgraphicaleffects

, qtquickcontrols2

, yubikey-manager

, yubikey-manager4

, yubikey-personalization

}:
@@ -41,7 +41,7 @@ mkDerivation rec { 
  ];



  pythonPath = [

    (yubikey-manager.override { python3Packages = python3.pkgs; })

    (yubikey-manager4.override { python3Packages = python3.pkgs; })

  ];



  postInstall = ''

pkgs/tools/misc/yubikey-manager/4.nix

0 → 100644
+73 −0
Original line number Diff line number Diff line 
{ python3Packages, fetchFromGitHub, lib, yubikey-personalization, libu2f-host, libusb1, procps

, stdenv, pyOpenSSLSupport ? !(stdenv.isDarwin && stdenv.isAarch64) }:



python3Packages.buildPythonPackage rec {

  pname = "yubikey-manager";

  version = "4.0.9";

  format = "pyproject";



  src = fetchFromGitHub {

    repo = "yubikey-manager";

    rev = "refs/tags/${version}";

    owner = "Yubico";

    sha256 = "sha256-MwM/b1QP6pkyBjz/r6oC4sW1mKC0CKMay45a0wCktk0=";

  };



  patches = lib.optionals (!pyOpenSSLSupport) [

    ./remove-pyopenssl-tests.patch

  ];



  postPatch = ''

    substituteInPlace pyproject.toml \

      --replace 'fido2 = ">=0.9, <1.0"' 'fido2 = ">*"'

    substituteInPlace "ykman/pcsc/__init__.py" \

      --replace 'pkill' '${if stdenv.isLinux then "${procps}" else "/usr"}/bin/pkill'

  '';



  nativeBuildInputs = with python3Packages; [ poetry-core ];



  propagatedBuildInputs =

    with python3Packages; ([

      click

      cryptography

      pyscard

      pyusb

      six

      fido2

    ] ++ lib.optionals pyOpenSSLSupport [

      pyopenssl

    ]) ++ [

      libu2f-host

      libusb1

      yubikey-personalization

    ];



  makeWrapperArgs = [

    "--prefix" "LD_LIBRARY_PATH" ":"

    (lib.makeLibraryPath [ libu2f-host libusb1 yubikey-personalization ])

  ];



  postInstall = ''

    mkdir -p "$out/man/man1"

    cp man/ykman.1 "$out/man/man1"



    mkdir -p $out/share/bash-completion/completions

    _YKMAN_COMPLETE=source $out/bin/ykman > $out/share/bash-completion/completions/ykman || :

    mkdir -p $out/share/zsh/site-functions/

    _YKMAN_COMPLETE=source_zsh "$out/bin/ykman" > "$out/share/zsh/site-functions/_ykman" || :

    substituteInPlace "$out/share/zsh/site-functions/_ykman" \

      --replace 'compdef _ykman_completion ykman;' '_ykman_completion "$@"'

  '';



  checkInputs = with python3Packages; [ pytestCheckHook makefun ];



  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 ];

    mainProgram = "ykman";

  };

}

pkgs/tools/misc/yubikey-manager/default.nix

+4 −9
Original line number Diff line number Diff line 
{ 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

pkgs/top-level/all-packages.nix

+1 −0
Original line number Diff line number Diff line
@@ -22978,6 +22978,7 @@ with pkgs; 














  yubihsm-connector = callPackage ../tools/security/yubihsm-connector { };



























  yubikey-manager4 = callPackage ../tools/misc/yubikey-manager/4.nix { };















  yubikey-manager = callPackage ../tools/misc/yubikey-manager { };





























  yubikey-manager-qt = libsForQt5.callPackage ../tools/misc/yubikey-manager-qt { };