From d5799cd64fc593f4fba84902b9f49a03c4b54bad Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 20 Mar 2014 13:38:02 -0500 Subject: [PATCH 1/5] scrypt: adopt package Signed-off-by: Austin Seipp --- pkgs/tools/security/scrypt/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/scrypt/default.nix b/pkgs/tools/security/scrypt/default.nix index ca2c9f43dfc..fe2a19491d9 100644 --- a/pkgs/tools/security/scrypt/default.nix +++ b/pkgs/tools/security/scrypt/default.nix @@ -13,8 +13,9 @@ stdenv.mkDerivation rec { meta = { description = "The scrypt encryption utility"; - homepage = https://www.tarsnap.com/scrypt.html; - license = "BSD"; - platforms = stdenv.lib.platforms.all; + homepage = https://www.tarsnap.com/scrypt.html; + license = stdenv.lib.licenses.bsd2; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; }; } From 7dcf9f6907f1031ca84d2b772248121207a06727 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 20 Mar 2014 13:41:05 -0500 Subject: [PATCH 2/5] criu: only supported on 64-bit Signed-off-by: Austin Seipp --- pkgs/os-specific/linux/criu/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix index 30056d8b8e6..4c58fe5a46f 100644 --- a/pkgs/os-specific/linux/criu/default.nix +++ b/pkgs/os-specific/linux/criu/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, protobuf, protobufc, asciidoc, xmlto, utillinux }: +assert stdenv.system == "x86_64-linux"; stdenv.mkDerivation rec { name = "criu-${version}"; version = "1.2"; @@ -31,7 +32,7 @@ stdenv.mkDerivation rec { description = "userspace checkpoint/restore for Linux"; homepage = "http://criu.org"; license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + platforms = [ "x86_64-linux" ]; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; }; } From 76c9e89984e60bccde645c059df6916fd789945d Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 20 Mar 2014 13:54:46 -0500 Subject: [PATCH 3/5] duo-unix: correctly set openssl directory Signed-off-by: Austin Seipp --- pkgs/tools/security/duo-unix/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/security/duo-unix/default.nix b/pkgs/tools/security/duo-unix/default.nix index a7cd61d7f67..2070150a32e 100644 --- a/pkgs/tools/security/duo-unix/default.nix +++ b/pkgs/tools/security/duo-unix/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { [ "--with-pam=$(out)/lib/security" "--prefix=$(out)" "--sysconfdir=$(out)/etc/duo" + "--with-openssl=${openssl}" ]; meta = { From 9bcc48a4b22f20933d045c2ae31ad43460b76762 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 20 Mar 2014 14:01:57 -0500 Subject: [PATCH 4/5] criu: attempt to fix doc building on Hydra Signed-off-by: Austin Seipp --- pkgs/os-specific/linux/criu/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix index 4c58fe5a46f..349d690e4d1 100644 --- a/pkgs/os-specific/linux/criu/default.nix +++ b/pkgs/os-specific/linux/criu/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/etc/logrotate.d - make install PREFIX=$out LIBDIR=$out/lib + make install PREFIX=$out LIBDIR=$out/lib ASCIIDOC=${asciidoc}/bin/asciidoc XMLTO=${xmlto}/bin/xmlto ''; meta = { From 529fdedf05b0a4b6d063f412ba1a4ca4d6a48275 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 20 Mar 2014 14:05:38 -0500 Subject: [PATCH 5/5] duo_unix: disable lib64 directories Signed-off-by: Austin Seipp --- pkgs/tools/security/duo-unix/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/security/duo-unix/default.nix b/pkgs/tools/security/duo-unix/default.nix index 2070150a32e..078e7cc06e0 100644 --- a/pkgs/tools/security/duo-unix/default.nix +++ b/pkgs/tools/security/duo-unix/default.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { "--prefix=$(out)" "--sysconfdir=$(out)/etc/duo" "--with-openssl=${openssl}" + "--enable-lib64=no" ]; meta = {