pyrox.dev
Merge pull request #311487 from NixOS/sysdig_0370
+17
-23
pkgs/os-specific/linux/sysdig/default.nix
+17
-23
pkgs/os-specific/linux/sysdig/default.nix
···
3
3
, protobuf, grpc, yaml-cpp, nlohmann_json, re2, zstd, uthash }:
4
4
5
5
let
6
-
# Compare with https://github.com/draios/sysdig/blob/0.36.0/cmake/modules/falcosecurity-libs.cmake
7
-
libsRev = "0.15.1";
8
-
libsHash = "sha256-CsKa5ybRj7Mjb71xNwd8FtDprOMfpJMrm3mvkeqZE3o=";
6
+
# Compare with https://github.com/draios/sysdig/blob/0.37.0/cmake/modules/falcosecurity-libs.cmake
7
+
libsRev = "0.16.0";
8
+
libsHash = "sha256-aduO2pLj91tRdZ1dW1F1JFEg//SopialXWPd6Oav/u8=";
9
9
10
-
# Compare with https://github.com/falcosecurity/libs/blob/0.15.1/cmake/modules/valijson.cmake
10
+
# Compare with https://github.com/falcosecurity/libs/blob/0.16.0/cmake/modules/valijson.cmake
11
11
valijson = fetchFromGitHub {
12
12
owner = "tristanpenman";
13
13
repo = "valijson";
···
15
15
hash = "sha256-wvFdjsDtKH7CpbEpQjzWtLC4RVOU9+D2rSK0Xo1cJqo=";
16
16
};
17
17
18
-
# https://github.com/draios/sysdig/blob/0.36.0/cmake/modules/driver.cmake
18
+
# https://github.com/draios/sysdig/blob/0.37.0/cmake/modules/driver.cmake
19
19
driver = fetchFromGitHub {
20
20
owner = "falcosecurity";
21
21
repo = "libs";
22
-
rev = "7.0.0+driver";
23
-
hash = "sha256-kXqvfM7HbGh2wEGaO4KBkFDW+m5gpOShJZKJLu9McKk=";
22
+
rev = "7.1.0+driver";
23
+
hash = "sha256-FIlnJsNgofGo4HETEEpW28wpC3U9z5AZprwFR5AgFfA=";
24
24
};
25
-
in stdenv.mkDerivation rec {
25
+
26
+
version = "0.37.0";
27
+
in stdenv.mkDerivation {
26
28
pname = "sysdig";
27
-
version = "0.36.0";
29
+
inherit version;
28
30
29
31
src = fetchFromGitHub {
30
32
owner = "draios";
31
33
repo = "sysdig";
32
34
rev = version;
33
-
hash = "sha256-EQnmtxByTsSawQPFmTe2pBMcv5rFaNtST+2KXZSFuoo=";
35
+
hash = "sha256-vEkwh+iSXlIraDzy9+ujr0ijNWX7oB7ZQi7H+jYi688=";
34
36
};
35
37
36
38
nativeBuildInputs = [ cmake perl installShellFiles pkg-config ];
···
73
75
cp -r ${driver} driver-src
74
76
chmod -R +w driver-src
75
77
76
-
# Hacky but needed until https://github.com/draios/sysdig/issues/2077 is resolved for kernel >= 6.8 as strlcpy got removed and build fails
77
-
${lib.optionalString
78
-
(kernel != null && lib.versionAtLeast kernel.version "6.8") ''
79
-
substituteInPlace libs/driver/ppm_events.c driver-src/driver/ppm_events.c --replace-fail "strlcpy" "strscpy"
80
-
''}
81
-
82
78
cmakeFlagsArray+=(
83
79
"-DFALCOSECURITY_LIBS_SOURCE_DIR=$(pwd)/libs"
84
80
"-DDRIVER_SOURCE_DIR=$(pwd)/driver-src/driver"
···
98
94
] ++ lib.optional (kernel == null) "-DBUILD_DRIVER=OFF";
99
95
100
96
env.NIX_CFLAGS_COMPILE =
101
-
# needed since luajit-2.1.0-beta3
102
-
"-DluaL_reg=luaL_Reg -DluaL_getn(L,i)=((int)lua_objlen(L,i)) " +
103
97
# fix compiler warnings been treated as errors
104
98
"-Wno-error";
105
99
···
138
132
fi
139
133
'';
140
134
141
-
meta = with lib; {
135
+
meta = {
142
136
description =
143
137
"A tracepoint-based system tracing tool for Linux (with clients for other OSes)";
144
-
license = with licenses; [ asl20 gpl2 mit ];
145
-
maintainers = [ maintainers.raskin ];
146
-
platforms = [ "x86_64-linux" ] ++ platforms.darwin;
147
-
broken = kernel != null && ((versionOlder kernel.version "4.14") || kernel.isHardened || kernel.isZen);
138
+
license = with lib.licenses; [ asl20 gpl2 mit ];
139
+
maintainers = with lib.maintainers; [ raskin ];
140
+
platforms = [ "x86_64-linux" ] ++ lib.platforms.darwin;
141
+
broken = kernel != null && ((lib.versionOlder kernel.version "4.14") || kernel.isHardened || kernel.isZen);
148
142
homepage = "https://sysdig.com/opensource/";
149
143
downloadPage = "https://github.com/draios/sysdig/releases";
150
144
};