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 26 clang, 27 27 libbpf, 28 28 bpftools, 29 - fetchurl, 30 29 }: 31 30 32 31 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="; 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="; 36 35 37 36 # Compare with https://github.com/falcosecurity/libs/blob/0.17.2/cmake/modules/valijson.cmake 38 37 valijson = fetchFromGitHub { ··· 42 41 hash = "sha256-wvFdjsDtKH7CpbEpQjzWtLC4RVOU9+D2rSK0Xo1cJqo="; 43 42 }; 44 43 45 - # https://github.com/draios/sysdig/blob/0.38.1/cmake/modules/driver.cmake 44 + # https://github.com/draios/sysdig/blob/0.40.1/cmake/modules/driver.cmake 46 45 driver = fetchFromGitHub { 47 46 owner = "falcosecurity"; 48 47 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="; 48 + rev = "8.0.0+driver"; 49 + hash = "sha256-G5MMVNceNa1y7CczfoaRBektc//uUN6ijmcTMnnKMRA="; 58 50 }; 59 51 60 - version = "0.38.1"; 52 + version = "0.40.1"; 61 53 in 62 54 stdenv.mkDerivation { 63 55 pname = "sysdig"; ··· 66 58 src = fetchFromGitHub { 67 59 owner = "draios"; 68 60 repo = "sysdig"; 69 - rev = version; 70 - hash = "sha256-oufRTr5TFdpF50pmem2L3bBFIfwxCR8f1xi0A328iHo="; 61 + tag = version; 62 + hash = "sha256-MPiNfxGePtQvh3l9RA6Vg+glB9RiR3ia1vv06MAw9do="; 71 63 }; 72 64 73 65 nativeBuildInputs = [ ··· 123 115 124 116 cp -r ${driver} driver-src 125 117 chmod -R +w driver-src 126 - cp ${driverKernel610MainC} driver-src/driver/main.c 127 118 128 119 cmakeFlagsArray+=( 129 120 "-DFALCOSECURITY_LIBS_SOURCE_DIR=$(pwd)/libs" ··· 141 132 "-DCREATE_TEST_TARGETS=OFF" 142 133 "-DVALIJSON_INCLUDE=${valijson}/include" 143 134 "-DUTHASH_INCLUDE=${uthash}/include" 135 + (lib.cmakeBool "USE_BUNDLED_FALCOSECURITY_LIBS" true) 144 136 ] 145 137 ++ lib.optional (kernel == null) "-DBUILD_DRIVER=OFF"; 146 138