diff options
author | 7c6f434c <7c6f434c@mail.ru> | 2023-03-22 13:32:03 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-22 13:32:03 +0000 |
commit | 5706ae493404c3ea3900f055ba7e289c7fcd2448 (patch) | |
tree | 5afd392526d2aea3403bc773fd49ee596819a2c5 /pkgs/os-specific | |
parent | 185627e77ca8551ffa5166f3f12353994043494b (diff) | |
parent | a06e5ea36566fd4e7dcf7477402b6497fa17417f (diff) |
Merge pull request #222156 from Mic92/sysdig
sysdig: 0.30.2 -> 0.31.3
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/linux/sysdig/default.nix | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 72a148c26e7c9..2d27ecb340328 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, cmake, kernel, installShellFiles, pkg-config , luajit, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc, elfutils, tbb, protobuf, grpc -, yaml-cpp, nlohmann_json, re2 +, yaml-cpp, nlohmann_json, re2, zstd }: let # Compare with https://github.com/draios/sysdig/blob/dev/cmake/modules/falcosecurity-libs.cmake - libsRev = "0.9.1"; - libsSha256 = "sha256-X+zLEnage8AuGdGn9sl1RN9b1CKTA1ErrdPNbYKY0s0="; + libsRev = "0.10.5"; + libsSha256 = "sha256-5a5ePcMHAlniJ8sU/5kKdRp5YkJ6tcr4h5Ru4Oc2kQY="; # Compare with https://github.com/falcosecurity/libs/blob/master/cmake/modules/valijson.cmake#L17 valijson = fetchFromGitHub { @@ -31,13 +31,13 @@ let in stdenv.mkDerivation rec { pname = "sysdig"; - version = "0.30.2"; + version = "0.31.3"; src = fetchFromGitHub { owner = "draios"; repo = "sysdig"; rev = version; - sha256 = "sha256-bDlrnTfm43zpYBIiP2MGB+LM5jtalmeUNtWHgxe81HM="; + sha256 = "sha256-TMh2gw/vw6DbhKGwbqU2+c0DTpRaMZqUM83KE18NDmI="; }; nativeBuildInputs = [ cmake perl installShellFiles pkg-config ]; @@ -58,6 +58,7 @@ stdenv.mkDerivation rec { yaml-cpp jsoncpp nlohmann_json + zstd ] ++ lib.optionals (kernel != null) kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; @@ -97,7 +98,7 @@ stdenv.mkDerivation rec { echo "falcosecurity-libs checksum needs to be updated!" exit 1 fi - cmakeFlagsArray+=(-DCMAKE_EXE_LINKER_FLAGS="-ltbb -lcurl -labsl_synchronization") + cmakeFlagsArray+=(-DCMAKE_EXE_LINKER_FLAGS="-ltbb -lcurl -lzstd -labsl_synchronization") '' + lib.optionalString (kernel != null) '' export INSTALL_MOD_PATH="$out" export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" |