From f474f82860d7ce780ccef9d1e91b0174f5c5d7e5 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Sat, 11 Mar 2017 16:23:00 -0500 Subject: [PATCH] ykpers: consolidate into yubikey-personalization Looks like this accidentally got packaged twice. --- nixos/modules/system/boot/luksroot.nix | 4 ++-- pkgs/applications/misc/pwsafe/default.nix | 6 ++--- pkgs/applications/misc/ykpers/default.nix | 24 ------------------- .../misc/yubikey-personalization/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 -- 5 files changed, 6 insertions(+), 32 deletions(-) delete mode 100644 pkgs/applications/misc/ykpers/default.nix diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 1f412fe2d8f..8978b73749b 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -434,8 +434,8 @@ in chmod +x $out/bin/cryptsetup-askpass ${optionalString luks.yubikeySupport '' - copy_bin_and_libs ${pkgs.ykpers}/bin/ykchalresp - copy_bin_and_libs ${pkgs.ykpers}/bin/ykinfo + copy_bin_and_libs ${pkgs.yubikey-personalization}/bin/ykchalresp + copy_bin_and_libs ${pkgs.yubikey-personalization}/bin/ykinfo copy_bin_and_libs ${pkgs.openssl.bin}/bin/openssl cc -O3 -I${pkgs.openssl.dev}/include -L${pkgs.openssl.out}/lib ${./pbkdf2-sha512.c} -o pbkdf2-sha512 -lcrypto diff --git a/pkgs/applications/misc/pwsafe/default.nix b/pkgs/applications/misc/pwsafe/default.nix index f65435ba7b2..0ea530b6bf1 100644 --- a/pkgs/applications/misc/pwsafe/default.nix +++ b/pkgs/applications/misc/pwsafe/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, wxGTK, libuuid, xercesc, zip , libXt, libXtst -, libXi, xextproto, gettext, perl, pkgconfig, libyubikey, ykpers +, libXi, xextproto, gettext, perl, pkgconfig, libyubikey, yubikey-personalization }: stdenv.mkDerivation rec { @@ -14,12 +14,12 @@ stdenv.mkDerivation rec { }; makefile = "Makefile.linux"; - makeFlags = "YBPERS_LIBPATH=${ykpers}/lib"; + makeFlags = "YBPERS_LIBPATH=${yubikey-personalization}/lib"; buildFlags = "unicoderelease"; buildInputs = [ wxGTK libuuid gettext perl zip xercesc libXt libXtst libXi xextproto - pkgconfig libyubikey ykpers ]; + pkgconfig libyubikey yubikey-personalization ]; postPatch = '' # Fix perl scripts used during the build. diff --git a/pkgs/applications/misc/ykpers/default.nix b/pkgs/applications/misc/ykpers/default.nix deleted file mode 100644 index 0fa9b5f66b2..00000000000 --- a/pkgs/applications/misc/ykpers/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{stdenv, fetchurl, pkgconfig, libusb1, libyubikey}: - -stdenv.mkDerivation rec -{ - version = "1.17.2"; - name = "ykpers-${version}"; - - src = fetchurl - { - url = "http://opensource.yubico.com/yubikey-personalization/releases/${name}.tar.gz"; - sha256 = "1z6ybpdhl74phwzg2lhxhipqf7xnfhg52dykkzb3fbx21m0i4jkh"; - }; - - buildInputs = [pkgconfig libusb1 libyubikey]; - - meta = - { - homepage = "http://opensource.yubico.com/yubikey-personalization/"; - description = "YubiKey Personalization cross-platform library and tool"; - license = "bsd"; - maintainers = [ stdenv.lib.maintainers.calrama ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/tools/misc/yubikey-personalization/default.nix b/pkgs/tools/misc/yubikey-personalization/default.nix index 71c9a113298..36dd8339f26 100644 --- a/pkgs/tools/misc/yubikey-personalization/default.nix +++ b/pkgs/tools/misc/yubikey-personalization/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { description = "A library and command line tool to personalize YubiKeys"; license = licenses.bsd2; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; + maintainers = with maintainers; [ wkennington calrama ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc3924c5829..b846409edfe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16181,8 +16181,6 @@ with pkgs; inherit (gnome3) yelp; - ykpers = callPackage ../applications/misc/ykpers {}; - yoshimi = callPackage ../applications/audio/yoshimi { }; inherit (python3Packages) you-get;