sysdig: 0.38.1 -> 0.40.1 (#442849)

authored by 7c6f434c and committed by GitHub ce185573 817d54d6

+10 -18
+10 -18
pkgs/os-specific/linux/sysdig/default.nix
··· 26 clang, 27 libbpf, 28 bpftools, 29 - fetchurl, 30 }: 31 32 let 33 - # Compare with https://github.com/draios/sysdig/blob/0.38.1/cmake/modules/falcosecurity-libs.cmake 34 - libsRev = "0.17.2"; 35 - libsHash = "sha256-BTLXtdU7GjOJReaycHvXkSd2vtybnCn0rTR7OEsvaMQ="; 36 37 # Compare with https://github.com/falcosecurity/libs/blob/0.17.2/cmake/modules/valijson.cmake 38 valijson = fetchFromGitHub { ··· 42 hash = "sha256-wvFdjsDtKH7CpbEpQjzWtLC4RVOU9+D2rSK0Xo1cJqo="; 43 }; 44 45 - # https://github.com/draios/sysdig/blob/0.38.1/cmake/modules/driver.cmake 46 driver = fetchFromGitHub { 47 owner = "falcosecurity"; 48 repo = "libs"; 49 - rev = "7.2.0+driver"; 50 - hash = "sha256-FIlnJsNgofGo4HETEEpW28wpC3U9z5AZprwFR5AgFfA="; 51 - }; 52 - 53 - # "main.c" from master after (https://github.com/falcosecurity/libs/pull/1884) 54 - # Remove when an upstream release includes the driver update 55 - driverKernel610MainC = fetchurl { 56 - url = "https://raw.githubusercontent.com/falcosecurity/libs/fa26daf65bb4117ecfe099fcad48ea75fe86d8bb/driver/main.c"; 57 - hash = "sha256-VI/tOSXs5OcEDehSqICF3apmSnwe4QCmbkHz+DGH4uM="; 58 }; 59 60 - version = "0.38.1"; 61 in 62 stdenv.mkDerivation { 63 pname = "sysdig"; ··· 66 src = fetchFromGitHub { 67 owner = "draios"; 68 repo = "sysdig"; 69 - rev = version; 70 - hash = "sha256-oufRTr5TFdpF50pmem2L3bBFIfwxCR8f1xi0A328iHo="; 71 }; 72 73 nativeBuildInputs = [ ··· 123 124 cp -r ${driver} driver-src 125 chmod -R +w driver-src 126 - cp ${driverKernel610MainC} driver-src/driver/main.c 127 128 cmakeFlagsArray+=( 129 "-DFALCOSECURITY_LIBS_SOURCE_DIR=$(pwd)/libs" ··· 141 "-DCREATE_TEST_TARGETS=OFF" 142 "-DVALIJSON_INCLUDE=${valijson}/include" 143 "-DUTHASH_INCLUDE=${uthash}/include" 144 ] 145 ++ lib.optional (kernel == null) "-DBUILD_DRIVER=OFF"; 146
··· 26 clang, 27 libbpf, 28 bpftools, 29 }: 30 31 let 32 + # Compare with https://github.com/draios/sysdig/blob/0.40.1/cmake/modules/falcosecurity-libs.cmake 33 + libsRev = "0.20.0"; 34 + libsHash = "sha256-G5MMVNceNa1y7CczfoaRBektc//uUN6ijmcTMnnKMRA="; 35 36 # Compare with https://github.com/falcosecurity/libs/blob/0.17.2/cmake/modules/valijson.cmake 37 valijson = fetchFromGitHub { ··· 41 hash = "sha256-wvFdjsDtKH7CpbEpQjzWtLC4RVOU9+D2rSK0Xo1cJqo="; 42 }; 43 44 + # https://github.com/draios/sysdig/blob/0.40.1/cmake/modules/driver.cmake 45 driver = fetchFromGitHub { 46 owner = "falcosecurity"; 47 repo = "libs"; 48 + rev = "8.0.0+driver"; 49 + hash = "sha256-G5MMVNceNa1y7CczfoaRBektc//uUN6ijmcTMnnKMRA="; 50 }; 51 52 + version = "0.40.1"; 53 in 54 stdenv.mkDerivation { 55 pname = "sysdig"; ··· 58 src = fetchFromGitHub { 59 owner = "draios"; 60 repo = "sysdig"; 61 + tag = version; 62 + hash = "sha256-MPiNfxGePtQvh3l9RA6Vg+glB9RiR3ia1vv06MAw9do="; 63 }; 64 65 nativeBuildInputs = [ ··· 115 116 cp -r ${driver} driver-src 117 chmod -R +w driver-src 118 119 cmakeFlagsArray+=( 120 "-DFALCOSECURITY_LIBS_SOURCE_DIR=$(pwd)/libs" ··· 132 "-DCREATE_TEST_TARGETS=OFF" 133 "-DVALIJSON_INCLUDE=${valijson}/include" 134 "-DUTHASH_INCLUDE=${uthash}/include" 135 + (lib.cmakeBool "USE_BUNDLED_FALCOSECURITY_LIBS" true) 136 ] 137 ++ lib.optional (kernel == null) "-DBUILD_DRIVER=OFF"; 138