From 9f71bba8a482bfd6347f50423f04bae908c78d16 Mon Sep 17 00:00:00 2001 From: Anders Papitto Date: Sat, 12 Dec 2015 12:24:21 -0800 Subject: [PATCH 1/2] libb64: init at 1.2 --- pkgs/development/libraries/libb64/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/libb64/default.nix diff --git a/pkgs/development/libraries/libb64/default.nix b/pkgs/development/libraries/libb64/default.nix new file mode 100644 index 000000000000..793c4992c3f0 --- /dev/null +++ b/pkgs/development/libraries/libb64/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation rec { + name = "libb64-${version}"; + version = "1.2"; + + src = fetchurl { + url = "http://download.draios.com/dependencies/libb64-1.2.src.zip"; + md5 = "a609809408327117e2c643bed91b76c5"; + }; + + buildInputs = [ unzip ]; + + installPhase = '' + mkdir -p $out $out/lib $out/bin $out/include + cp -r include/* $out/include/ + cp base64/base64 $out/bin/ + cp src/libb64.a src/cencode.o src/cdecode.o $out/lib/ + ''; + + meta = { + inherit version; + description = "ANSI C routines for fast base64 encoding/decoding"; + license = stdenv.lib.licenses.publicDomain; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3acd586706c3..c728843286be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6837,6 +6837,8 @@ let libjson = callPackage ../development/libraries/libjson { }; + libb64 = callPackage ../development/libraries/libb64 { }; + judy = callPackage ../development/libraries/judy { }; keybinder = callPackage ../development/libraries/keybinder { @@ -8329,7 +8331,7 @@ let rubberband = callPackage ../development/libraries/rubberband { inherit (vamp) vampSDK; }; - + sad = callPackage ../applications/science/logic/sad { }; sbc = callPackage ../development/libraries/sbc { }; From 229f0ac257f430d92c7bbf46b4b3d139fbc039ee Mon Sep 17 00:00:00 2001 From: Anders Papitto Date: Sat, 12 Dec 2015 12:25:17 -0800 Subject: [PATCH 2/2] sysdig: 0.1.102 -> 0.5.1 --- pkgs/os-specific/linux/sysdig/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index e2758e7c2b61..5c15ba1a9ce4 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -1,15 +1,15 @@ -{stdenv, fetchurl, cmake, luajit, kernel, zlib, ncurses}: +{stdenv, fetchurl, cmake, luajit, kernel, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl}: let inherit (stdenv.lib) optional optionalString; s = rec { baseName="sysdig"; - version = "0.1.102"; + version = "0.5.1"; name="${baseName}-${version}"; url="https://github.com/draios/sysdig/archive/${version}.tar.gz"; - sha256 = "0mrz14wvcb8m8idr4iqbr3jmxfs7dlmh06n0q9fcfph75wkc5fp0"; + sha256 = "08wnk0593ljdq466hk0npsjc0gbm37nsjm1x2ilsf58n1xl8dmfs"; }; buildInputs = [ - cmake zlib luajit ncurses + cmake zlib luajit ncurses perl jsoncpp libb64 openssl curl ]; in stdenv.mkDerivation { @@ -20,9 +20,7 @@ stdenv.mkDerivation { }; cmakeFlags = [ - "-DUSE_BUNDLED_LUAJIT=OFF" - "-DUSE_BUNDLED_ZLIB=OFF" - "-DUSE_BUNDLED_NCURSES=OFF" + "-DUSE_BUNDLED_DEPS=OFF" ] ++ optional (kernel == null) "-DBUILD_DRIVER=OFF"; preConfigure = '' export INSTALL_MOD_PATH="$out"