sysdig: 0.28.0 -> 0.29.3

+33 -6
+33 -6
pkgs/os-specific/linux/sysdig/default.nix
··· 1 1 { lib, stdenv, fetchFromGitHub, fetchpatch, cmake, kernel, installShellFiles, pkg-config 2 2 , luajit, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc, elfutils, tbb, protobuf, grpc 3 + , libyamlcpp, nlohmann_json 3 4 }: 4 5 5 6 with lib; 6 7 let 7 8 # Compare with https://github.com/draios/sysdig/blob/dev/cmake/modules/falcosecurity-libs.cmake 8 - libsRev = "2160111cd088aea9ae2235d3385ecb0b1ab6623c"; 9 - libsSha256 = "sha256-TOuxXtrxujyAjzAtlX3/eCfM16mwxnmZ6Wg44SG0dTs="; 9 + libsRev = "e5c53d648f3c4694385bbe488e7d47eaa36c229a"; 10 + libsSha256 = "sha256-pG10y5PpDqaF/cq8oAvax5B/ls2UTRQd7tCfBjWVf0U="; 11 + 12 + # Compare with https://github.com/falcosecurity/libs/blob/master/cmake/modules/valijson.cmake#L17 13 + valijson = fetchFromGitHub { 14 + owner = "tristanpenman"; 15 + repo = "valijson"; 16 + rev = "v0.6"; 17 + sha256 = "sha256-ZD19Q2MxMQd3yEKbY90GFCrerie5/jzgO8do4JQDoKM="; 18 + }; 19 + 10 20 in 11 21 stdenv.mkDerivation rec { 12 22 pname = "sysdig"; 13 - version = "0.28.0"; 23 + version = "0.29.3"; 14 24 15 25 src = fetchFromGitHub { 16 26 owner = "draios"; 17 27 repo = "sysdig"; 18 28 rev = version; 19 - sha256 = "sha256-oE3vCmOw+gcmvGqj7Xk5injpNC/YThckJMNg5XRFhME="; 29 + sha256 = "sha256-dMLeroOd9CgvmgQdPfX8oBxQSyksZi/hP4vO03JhlF0="; 20 30 }; 21 31 22 32 nativeBuildInputs = [ cmake perl installShellFiles pkg-config ]; 23 33 buildInputs = [ 24 - luajit ncurses jsoncpp libb64 openssl curl jq gcc elfutils tbb protobuf grpc 34 + luajit 35 + ncurses 36 + libb64 37 + openssl 38 + curl 39 + jq 40 + gcc 41 + elfutils 42 + tbb 43 + protobuf 44 + grpc 45 + libyamlcpp 46 + jsoncpp 47 + nlohmann_json 25 48 ] ++ optionals (kernel != null) kernel.moduleBuildDependencies; 26 49 27 50 hardeningDisable = [ "pic" ]; ··· 34 57 sha256 = libsSha256; 35 58 }} libs 36 59 chmod -R +w libs 37 - cmakeFlagsArray+=("-DFALCOSECURITY_LIBS_SOURCE_DIR=$(pwd)/libs") 60 + cmakeFlagsArray+=("-DFALCOSECURITY_LIBS_SOURCE_DIR=$(pwd)/libs" "-DVALIJSON_INCLUDE=${valijson}/include") 38 61 ''; 39 62 40 63 cmakeFlags = [ ··· 47 70 NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg -DluaL_getn(L,i)=((int)lua_objlen(L,i))"; 48 71 49 72 preConfigure = '' 73 + if ! grep -q "${libsRev}" cmake/modules/falcosecurity-libs.cmake; then 74 + echo "falcosecurity-libs checksum needs to be updated!" 75 + exit 1 76 + fi 50 77 cmakeFlagsArray+=(-DCMAKE_EXE_LINKER_FLAGS="-ltbb -lcurl -labsl_synchronization") 51 78 '' + optionalString (kernel != null) '' 52 79 export INSTALL_MOD_PATH="$out"