Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 36516712916e
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e8cc0692fc1d
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 29, 2019

  1. linuxPackages.sysdig: 0.24.2 -> 0.25 

    (cherry picked from commit 9e3fb45)
    @terlar @Mic92
    terlar authored and Mic92 committed May 29, 2019
    Copy the full SHA
    0bb60db View commit details

  2. sysdig: 0.25 -> 0.26.1 

    (cherry picked from commit 16ea5a8ca3b90d48a246a926b624ff0b92724249)
(cherry picked from commit 101b2ff)
    @Mic92
    Mic92 committed May 29, 2019
    Copy the full SHA
    e8cc069 View commit details
Showing with 6 additions and 4 deletions.
  1. +6 −4 pkgs/os-specific/linux/sysdig/default.nix
10 changes: 6 additions & 4 deletions pkgs/os-specific/linux/sysdig/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
{ stdenv, fetchFromGitHub, cmake, kernel
, luajit, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc, elfutils, tbb
, luajit, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc, elfutils, tbb, c-ares, protobuf, grpc
}:

with stdenv.lib;
stdenv.mkDerivation rec {
name = "sysdig-${version}";
version = "0.24.2";
version = "0.26.1";

src = fetchFromGitHub {
owner = "draios";
repo = "sysdig";
rev = version;
sha256 = "16gz6gcp0zfhrqldw9cms38w0x5h3qhlx64dayqgsqbkw914b31a";
sha256 = "0mvm14s5lyxddf6fcfwrv7vd8r8vfw9z4447jl5mcvji2rnyywqz";
};

nativeBuildInputs = [ cmake perl ];
buildInputs = [
zlib luajit ncurses jsoncpp libb64 openssl curl jq gcc elfutils tbb
zlib luajit ncurses jsoncpp libb64 openssl curl jq gcc elfutils tbb c-ares protobuf grpc
] ++ optional (kernel != null) kernel.moduleBuildDependencies;

hardeningDisable = [ "pic" ];
@@ -33,6 +33,8 @@ stdenv.mkDerivation rec {
];

preConfigure = ''
cmakeFlagsArray+=(-DCMAKE_EXE_LINKER_FLAGS="-ltbb -lcurl")
export INSTALL_MOD_PATH="$out"
'' + optionalString (kernel != null) ''
export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"