nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 23:13:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

sysdig: 0.23.1 -> 0.24.1

Browse Source 
* 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
This commit is contained in:
c0bw3b 2018-11-22 22:31:38 +01:00
parent 20b3d00621
commit c644bf3718
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/os-specific/linux/sysdig/default.nix
View File

@ -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; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "sysdig-${version}"; name = "sysdig-${version}";
version = "0.23.1"; version = "0.24.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "draios"; owner = "draios";
repo = "sysdig"; repo = "sysdig";
rev = version; rev = version;
sha256 = "0q52yfag97n6cvrnzgx7inx11zdg7bgwkvqn2idsg9874fd2wkzh"; sha256 = "04y6cqi2j0qpr5bgxyn6zz9f33v5v4lmkcl21c3sg5hmpjwibg3w";
}; };
nativeBuildInputs = [ cmake perl ];
buildInputs = [ 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; ] ++ optional (kernel != null) kernel.moduleBuildDependencies;
hardeningDisable = [ "pic" ]; hardeningDisable = [ "pic" ];
@ -51,9 +54,11 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "A tracepoint-based system tracing tool for Linux (with clients for other OSes)"; 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]; maintainers = [maintainers.raskin];
platforms = ["x86_64-linux"] ++ platforms.darwin; 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"; downloadPage = "https://github.com/draios/sysdig/releases";
}; };
} }