diff options
author | c0bw3b <c0bw3b@users.noreply.github.com> | 2018-11-22 22:31:38 +0100 |
---|---|---|
committer | c0bw3b <c0bw3b@users.noreply.github.com> | 2018-11-22 23:00:39 +0100 |
commit | c644bf3718abc84bba4136ff428349efffe90aa7 (patch) | |
tree | 25a5e72d8e2ad8ae28f84f8e509a92419ecb39a4 /pkgs/os-specific/linux/sysdig/default.nix | |
parent | 20b3d00621fd5fadbaa76b08256a370d42188afc (diff) | |
download | nixpkgs-c644bf3718abc84bba4136ff428349efffe90aa7.tar nixpkgs-c644bf3718abc84bba4136ff428349efffe90aa7.tar.gz nixpkgs-c644bf3718abc84bba4136ff428349efffe90aa7.tar.bz2 nixpkgs-c644bf3718abc84bba4136ff428349efffe90aa7.tar.lz nixpkgs-c644bf3718abc84bba4136ff428349efffe90aa7.tar.xz nixpkgs-c644bf3718abc84bba4136ff428349efffe90aa7.tar.zst nixpkgs-c644bf3718abc84bba4136ff428349efffe90aa7.zip |
sysdig: 0.23.1 -> 0.24.1
* support kernels 4.14.0 to 4.19.x * move cmake and perl into native build inputs * licensing change: - userspace programs are now licensed under Apache 2.0 - kernel module is now licensed under both MIT and GPLv2
Diffstat (limited to 'pkgs/os-specific/linux/sysdig/default.nix')
-rw-r--r-- | pkgs/os-specific/linux/sysdig/default.nix | 15 |
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"; }; } |