summary refs log tree commit diff
path: root/pkgs/os-specific/linux/sysdig/default.nix
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2018-11-24 10:43:33 +0100
committerFrederik Rietdijk <fridh@fridh.nl>2018-11-24 10:43:33 +0100
commite41154d1abcbcd1b9a0f542e590c63a210ea4266 (patch)
treec2971a1611c8141f14fde93fe6db43f019711ea5 /pkgs/os-specific/linux/sysdig/default.nix
parent90720d0139feaf7421344073430d2a6f5ecbb231 (diff)
parent25c562e451e0fe9d54c455f101e1ac59350b24be (diff)
downloadnixpkgs-e41154d1abcbcd1b9a0f542e590c63a210ea4266.tar
nixpkgs-e41154d1abcbcd1b9a0f542e590c63a210ea4266.tar.gz
nixpkgs-e41154d1abcbcd1b9a0f542e590c63a210ea4266.tar.bz2
nixpkgs-e41154d1abcbcd1b9a0f542e590c63a210ea4266.tar.lz
nixpkgs-e41154d1abcbcd1b9a0f542e590c63a210ea4266.tar.xz
nixpkgs-e41154d1abcbcd1b9a0f542e590c63a210ea4266.tar.zst
nixpkgs-e41154d1abcbcd1b9a0f542e590c63a210ea4266.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific/linux/sysdig/default.nix')
-rw-r--r--pkgs/os-specific/linux/sysdig/default.nix15
1 files changed, 10 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix
index 20ecdb5b577..1a89ff57491 100644
--- a/pkgs/os-specific/linux/sysdig/default.nix
+++ b/pkgs/os-specific/linux/sysdig/default.nix
@@ -1,19 +1,22 @@
-{stdenv, fetchFromGitHub, cmake, luajit, kernel, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc, elfutils}:
+{ stdenv, fetchFromGitHub, cmake, kernel
+, luajit, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc, elfutils, tbb
+}:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "sysdig-${version}";
-  version = "0.23.1";
+  version = "0.24.1";
 
   src = fetchFromGitHub {
     owner = "draios";
     repo = "sysdig";
     rev = version;
-    sha256 = "0q52yfag97n6cvrnzgx7inx11zdg7bgwkvqn2idsg9874fd2wkzh";
+    sha256 = "04y6cqi2j0qpr5bgxyn6zz9f33v5v4lmkcl21c3sg5hmpjwibg3w";
   };
 
+  nativeBuildInputs = [ cmake perl ];
   buildInputs = [
-    cmake zlib luajit ncurses perl jsoncpp libb64 openssl curl jq gcc elfutils
+    zlib luajit ncurses jsoncpp libb64 openssl curl jq gcc elfutils tbb
   ] ++ optional (kernel != null) kernel.moduleBuildDependencies;
 
   hardeningDisable = [ "pic" ];
@@ -51,9 +54,11 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A tracepoint-based system tracing tool for Linux (with clients for other OSes)";
-    license = licenses.gpl2;
+    license = with licenses; [ asl20 gpl2 mit ];
     maintainers = [maintainers.raskin];
     platforms = ["x86_64-linux"] ++ platforms.darwin;
+    broken = kernel != null && (versionOlder kernel.version "4.14" || versionAtLeast kernel.version "4.20");
+    homepage = "https://sysdig.com/opensource/";
     downloadPage = "https://github.com/draios/sysdig/releases";
   };
 }