public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ykpers: consolidate into yubikey-personalization 

Looks like this accidentally got packaged twice.
This commit is contained in:
Benjamin Staffin 2017-03-11 16:23:00 -05:00
parent 3ea16e98b4
commit f474f82860
5 changed files with 6 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/system/boot/luksroot.nix
View File

@ -434,8 +434,8 @@ in
chmod +x $out/bin/cryptsetup-askpass chmod +x $out/bin/cryptsetup-askpass
${optionalString luks.yubikeySupport '' ${optionalString luks.yubikeySupport ''
copy_bin_and_libs ${pkgs.ykpers}/bin/ykchalresp copy_bin_and_libs ${pkgs.yubikey-personalization}/bin/ykchalresp
copy_bin_and_libs ${pkgs.ykpers}/bin/ykinfo copy_bin_and_libs ${pkgs.yubikey-personalization}/bin/ykinfo
copy_bin_and_libs ${pkgs.openssl.bin}/bin/openssl 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 cc -O3 -I${pkgs.openssl.dev}/include -L${pkgs.openssl.out}/lib ${./pbkdf2-sha512.c} -o pbkdf2-sha512 -lcrypto

6
pkgs/applications/misc/pwsafe/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, wxGTK, libuuid, xercesc, zip , libXt, libXtst { 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 { stdenv.mkDerivation rec {
@ -14,12 +14,12 @@ stdenv.mkDerivation rec {
}; };
makefile = "Makefile.linux"; makefile = "Makefile.linux";
makeFlags = "YBPERS_LIBPATH=${ykpers}/lib"; makeFlags = "YBPERS_LIBPATH=${yubikey-personalization}/lib";
buildFlags = "unicoderelease"; buildFlags = "unicoderelease";
buildInputs = [ wxGTK libuuid gettext perl zip buildInputs = [ wxGTK libuuid gettext perl zip
xercesc libXt libXtst libXi xextproto xercesc libXt libXtst libXi xextproto
pkgconfig libyubikey ykpers ]; pkgconfig libyubikey yubikey-personalization ];
postPatch = '' postPatch = ''
# Fix perl scripts used during the build. # Fix perl scripts used during the build.

24
pkgs/applications/misc/ykpers/default.nix
View File

@ -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;
};
}

2
pkgs/tools/misc/yubikey-personalization/default.nix
View File

@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
description = "A library and command line tool to personalize YubiKeys"; description = "A library and command line tool to personalize YubiKeys";
license = licenses.bsd2; license = licenses.bsd2;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ wkennington ]; maintainers = with maintainers; [ wkennington calrama ];
}; };
} }

2
pkgs/top-level/all-packages.nix
View File

@ -16181,8 +16181,6 @@ with pkgs;
inherit (gnome3) yelp; inherit (gnome3) yelp;
ykpers = callPackage ../applications/misc/ykpers {};
yoshimi = callPackage ../applications/audio/yoshimi { }; yoshimi = callPackage ../applications/audio/yoshimi { };
inherit (python3Packages) you-get; inherit (python3Packages) you-get;