From 433257ad94e892ff3cf302c5d955889582392c9e Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 2 Mar 2014 05:50:35 -0600 Subject: [PATCH 1/5] cb0cat: add 'unix' to platforms list Signed-off-by: Austin Seipp --- pkgs/tools/security/cb0cat/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/security/cb0cat/default.nix b/pkgs/tools/security/cb0cat/default.nix index e35434f3cc26..251c91260561 100644 --- a/pkgs/tools/security/cb0cat/default.nix +++ b/pkgs/tools/security/cb0cat/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "cryptographic tool based on the CBEAMr0 sponge function"; homepage = "https://www.cblnk.com"; + platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; }; From 7d561c5ba9627fc705ac9da893d9928d46d709f1 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 2 Mar 2014 05:51:22 -0600 Subject: [PATCH 2/5] spark: Remove unneeded whitespace. Signed-off-by: Austin Seipp --- pkgs/applications/networking/cluster/spark/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index 18aae784cbc7..34c3af161261 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -117,7 +117,7 @@ stdenv.mkDerivation rec { phases = "unpackPhase installPhase"; - meta = { + meta = { description = "Spark cluster computing"; homepage = "http://spark.incubator.apache.org"; platforms = stdenv.lib.platforms.all; From 6a88b95ac7092475e37ab7d907ed77fab4c9de51 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 2 Mar 2014 05:51:49 -0600 Subject: [PATCH 3/5] checksec: add homepage Signed-off-by: Austin Seipp --- pkgs/os-specific/linux/checksec/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/checksec/default.nix b/pkgs/os-specific/linux/checksec/default.nix index 5e5ed6da1c92..0f3b87361f83 100644 --- a/pkgs/os-specific/linux/checksec/default.nix +++ b/pkgs/os-specific/linux/checksec/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { meta = { description = "A tool for checking security bits on executables"; + homepage = "http://www.trapkit.de/tools/checksec.html"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; From 73bcce319b5836808788ff024b887b46620b07af Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 2 Mar 2014 05:52:34 -0600 Subject: [PATCH 4/5] ktap: Update to 0.5-e7a38ef0 This adds a new, useful net library as well. Signed-off-by: Austin Seipp --- pkgs/os-specific/linux/ktap/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/ktap/default.nix b/pkgs/os-specific/linux/ktap/default.nix index 21996e26131b..7a54f0aeebef 100644 --- a/pkgs/os-specific/linux/ktap/default.nix +++ b/pkgs/os-specific/linux/ktap/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ktap-${version}"; - version = "0.5-7ee59b19"; + version = "0.5-e7a38ef0"; src = fetchgit { url = "https://github.com/ktap/ktap.git"; - rev = "7ee59b19d536fd3d3164ff0a0623faff827e5d97"; - sha256 = "0a46836469d0afb088e72fd6310406a86c487d17bac40e390cec8bc869e7379c"; + rev = "e7a38ef06bec9a651c9e8bdb3ad66a104210d475"; + sha256 = "07acf20e1926d3afd89b13855154b8cc792c57261e7d3cae2da70cb08844f9c8"; }; buildPhase = '' From 812d17f177e3013e9088b716c45866ce4d32d967 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 2 Mar 2014 05:53:08 -0600 Subject: [PATCH 5/5] ktap: don't use FFI by default It's not yet supported on i386 - instead, make it optional and controlled by a `useFFI` attribute. Signed-off-by: Austin Seipp --- pkgs/os-specific/linux/ktap/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/ktap/default.nix b/pkgs/os-specific/linux/ktap/default.nix index 7a54f0aeebef..542096733595 100644 --- a/pkgs/os-specific/linux/ktap/default.nix +++ b/pkgs/os-specific/linux/ktap/default.nix @@ -1,5 +1,8 @@ -{ stdenv, fetchgit, kernel }: +{ stdenv, fetchgit, kernel, useFFI ? false }: +let + ffiArgs = stdenv.lib.optionalString useFFI "FFI=1"; +in stdenv.mkDerivation rec { name = "ktap-${version}"; version = "0.5-e7a38ef0"; @@ -10,7 +13,7 @@ stdenv.mkDerivation rec { }; buildPhase = '' - make FFI=1 KERNEL_SRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build + make ${ffiArgs} KERNEL_SRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build ''; installPhase = ''