Merge pull request #17124 from markus1189/sysdig

sysdig: 0.10.0 -> 0.11.0

authored by Graham Christensen and committed by GitHub c4c75514 e641974f

+22 -8
+22 -8
pkgs/os-specific/linux/sysdig/default.nix
··· 1 - {stdenv, fetchurl, cmake, luajit, kernel, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl}: 2 let 3 inherit (stdenv.lib) optional optionalString; 4 s = rec { 5 - baseName="sysdig"; 6 - version = "0.10.0"; 7 - name="${baseName}-${version}"; 8 - url="https://github.com/draios/sysdig/archive/${version}.tar.gz"; 9 - sha256 = "0hs0r9z9j7padqdcj69bwx52iw6gvdl0w322qwivpv12j3prcpsj"; 10 }; 11 buildInputs = [ 12 cmake zlib luajit ncurses perl jsoncpp libb64 openssl curl 13 ]; 14 in 15 stdenv.mkDerivation { 16 inherit (s) name version; 17 inherit buildInputs; 18 - src = fetchurl { 19 - inherit (s) url sha256; 20 }; 21 postPatch = '' 22 sed '1i#include <cmath>' -i userspace/libsinsp/{cursesspectro,filterchecks}.cpp ··· 24 25 cmakeFlags = [ 26 "-DUSE_BUNDLED_DEPS=OFF" 27 ] ++ optional (kernel == null) "-DBUILD_DRIVER=OFF"; 28 preConfigure = '' 29 export INSTALL_MOD_PATH="$out" 30 '' + optionalString (kernel != null) '' 31 export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" 32 ''; 33 postInstall = optionalString (kernel != null) '' 34 make install_driver
··· 1 + {stdenv, fetchurl, fetchFromGitHub, cmake, luajit, kernel, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl}: 2 let 3 inherit (stdenv.lib) optional optionalString; 4 s = rec { 5 + name = "sysdig-${version}"; 6 + version = "0.11.0"; 7 + owner = "draios"; 8 + repo = "sysdig"; 9 + rev = version; 10 + sha256 = "131bafa7jy16r2jwph50j0bxwqdvr319fsfhqkavx6xy18i31q3v"; 11 }; 12 buildInputs = [ 13 cmake zlib luajit ncurses perl jsoncpp libb64 openssl curl 14 ]; 15 + # sysdig-0.11.0 depends on some headers from jq which are not 16 + # installed by default. 17 + # Relevant sysdig issue: https://github.com/draios/sysdig/issues/626 18 + jq-prefix = fetchurl { 19 + url="https://github.com/stedolan/jq/releases/download/jq-1.5/jq-1.5.tar.gz"; 20 + sha256="0g29kyz4ykasdcrb0zmbrp2jqs9kv1wz9swx849i2d1ncknbzln4"; 21 + }; 22 in 23 stdenv.mkDerivation { 24 inherit (s) name version; 25 inherit buildInputs; 26 + src = fetchFromGitHub { 27 + inherit (s) owner repo rev sha256; 28 }; 29 postPatch = '' 30 sed '1i#include <cmath>' -i userspace/libsinsp/{cursesspectro,filterchecks}.cpp ··· 32 33 cmakeFlags = [ 34 "-DUSE_BUNDLED_DEPS=OFF" 35 + "-DUSE_BUNDLED_JQ=ON" 36 + "-DSYSDIG_VERSION=${s.version}" 37 ] ++ optional (kernel == null) "-DBUILD_DRIVER=OFF"; 38 preConfigure = '' 39 export INSTALL_MOD_PATH="$out" 40 '' + optionalString (kernel != null) '' 41 export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" 42 + ''; 43 + preBuild = '' 44 + mkdir -p jq-prefix/src 45 + cp ${jq-prefix} jq-prefix/src/jq-1.5.tar.gz 46 ''; 47 postInstall = optionalString (kernel != null) '' 48 make install_driver