From 02282130d095056e6f0096344144314651a917c0 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 1 Dec 2018 23:29:28 -0600 Subject: [PATCH 1/2] yubikey-manager: 1.0.0 -> 1.0.1 https://developers.yubico.com/yubikey-manager/Release_Notes.html https://github.com/Yubico/yubikey-manager/releases/tag/yubikey-manager-1.0.1 --- pkgs/tools/misc/yubikey-manager/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/yubikey-manager/default.nix b/pkgs/tools/misc/yubikey-manager/default.nix index 140e322c862..5b96b7c18fc 100644 --- a/pkgs/tools/misc/yubikey-manager/default.nix +++ b/pkgs/tools/misc/yubikey-manager/default.nix @@ -2,11 +2,11 @@ yubikey-personalization, libu2f-host, libusb1 }: pythonPackages.buildPythonPackage rec { - name = "yubikey-manager-1.0.0"; + name = "yubikey-manager-1.0.1"; srcs = fetchurl { url = "https://developers.yubico.com/yubikey-manager/Releases/${name}.tar.gz"; - sha256 = "1qdb2b3mv4wafghnmv3sxw4fh7cjc06hnkdimfnwmqcjafzvbawd"; + sha256 = "0i7w1f89hqlw7g800fjhbb6yvq9wjmj5d7w7p6v8bkyvk645v48z"; }; propagatedBuildInputs = @@ -40,6 +40,7 @@ pythonPackages.buildPythonPackage rec { meta = with lib; { homepage = https://developers.yubico.com/yubikey-manager; description = "Command line tool for configuring any YubiKey over all USB transports."; + license = licenses.bsd2; platforms = platforms.unix; maintainers = with maintainers; [ benley ]; From d96a1bd9335daa10d91b771e42515e7678af865a Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 2 Dec 2018 12:23:31 -0600 Subject: [PATCH 2/2] yubikey-manager: lazy-load completions, touchup library path generation --- pkgs/tools/misc/yubikey-manager/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/yubikey-manager/default.nix b/pkgs/tools/misc/yubikey-manager/default.nix index 5b96b7c18fc..e80eee2db3a 100644 --- a/pkgs/tools/misc/yubikey-manager/default.nix +++ b/pkgs/tools/misc/yubikey-manager/default.nix @@ -26,12 +26,13 @@ pythonPackages.buildPythonPackage rec { ]; makeWrapperArgs = [ - "--prefix LD_LIBRARY_PATH : ${libu2f-host}/lib:${libusb1}/lib:${yubikey-personalization}/lib" + "--prefix" "LD_LIBRARY_PATH" ":" + (lib.makeLibraryPath [ libu2f-host libusb1 yubikey-personalization ]) ]; postInstall = '' - mkdir -p $out/etc/bash_completion.d - _YKMAN_COMPLETE=source $out/bin/ykman > $out/etc/bash_completion.d/ykman.sh ||true + mkdir -p $out/share/bash-completion/completions + _YKMAN_COMPLETE=source $out/bin/ykman > $out/share/bash-completion/completions/ykman || : ''; # See https://github.com/NixOS/nixpkgs/issues/29169