sysdig: 0.38.1 -> 0.40.1 (#442849)

7c6f434c ce185573 817d54d6

Changed files
+10 -18
pkgs
os-specific
linux
sysdig
+10 -18
pkgs/os-specific/linux/sysdig/default.nix
···
clang,
libbpf,
bpftools,
-
fetchurl,
}:
let
-
# Compare with https://github.com/draios/sysdig/blob/0.38.1/cmake/modules/falcosecurity-libs.cmake
-
libsRev = "0.17.2";
-
libsHash = "sha256-BTLXtdU7GjOJReaycHvXkSd2vtybnCn0rTR7OEsvaMQ=";
+
# Compare with https://github.com/draios/sysdig/blob/0.40.1/cmake/modules/falcosecurity-libs.cmake
+
libsRev = "0.20.0";
+
libsHash = "sha256-G5MMVNceNa1y7CczfoaRBektc//uUN6ijmcTMnnKMRA=";
# Compare with https://github.com/falcosecurity/libs/blob/0.17.2/cmake/modules/valijson.cmake
valijson = fetchFromGitHub {
···
hash = "sha256-wvFdjsDtKH7CpbEpQjzWtLC4RVOU9+D2rSK0Xo1cJqo=";
};
-
# https://github.com/draios/sysdig/blob/0.38.1/cmake/modules/driver.cmake
+
# https://github.com/draios/sysdig/blob/0.40.1/cmake/modules/driver.cmake
driver = fetchFromGitHub {
owner = "falcosecurity";
repo = "libs";
-
rev = "7.2.0+driver";
-
hash = "sha256-FIlnJsNgofGo4HETEEpW28wpC3U9z5AZprwFR5AgFfA=";
-
};
-
-
# "main.c" from master after (https://github.com/falcosecurity/libs/pull/1884)
-
# Remove when an upstream release includes the driver update
-
driverKernel610MainC = fetchurl {
-
url = "https://raw.githubusercontent.com/falcosecurity/libs/fa26daf65bb4117ecfe099fcad48ea75fe86d8bb/driver/main.c";
-
hash = "sha256-VI/tOSXs5OcEDehSqICF3apmSnwe4QCmbkHz+DGH4uM=";
+
rev = "8.0.0+driver";
+
hash = "sha256-G5MMVNceNa1y7CczfoaRBektc//uUN6ijmcTMnnKMRA=";
};
-
version = "0.38.1";
+
version = "0.40.1";
in
stdenv.mkDerivation {
pname = "sysdig";
···
src = fetchFromGitHub {
owner = "draios";
repo = "sysdig";
-
rev = version;
-
hash = "sha256-oufRTr5TFdpF50pmem2L3bBFIfwxCR8f1xi0A328iHo=";
+
tag = version;
+
hash = "sha256-MPiNfxGePtQvh3l9RA6Vg+glB9RiR3ia1vv06MAw9do=";
};
nativeBuildInputs = [
···
cp -r ${driver} driver-src
chmod -R +w driver-src
-
cp ${driverKernel610MainC} driver-src/driver/main.c
cmakeFlagsArray+=(
"-DFALCOSECURITY_LIBS_SOURCE_DIR=$(pwd)/libs"
···
"-DCREATE_TEST_TARGETS=OFF"
"-DVALIJSON_INCLUDE=${valijson}/include"
"-DUTHASH_INCLUDE=${uthash}/include"
+
(lib.cmakeBool "USE_BUNDLED_FALCOSECURITY_LIBS" true)
]
++ lib.optional (kernel == null) "-DBUILD_DRIVER=OFF";