Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bcf736b325cb
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 24b381e235d9
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 22, 2018

  1. sysdig: 0.23.1 -> 0.24.1 

    * support kernels 4.14.0 to 4.19.x

* move cmake and perl into native build inputs

* licensing change:
  - userspace programs are now licensed under Apache 2.0
  - kernel module is now licensed under both MIT and GPLv2
    @c0bw3b
    c0bw3b committed Nov 22, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    vdemeester Vincent Demeester
    GPG key ID: 083CC6FD6EB699A3
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c644bf3 View commit details

Commits on Nov 23, 2018

  1. Merge pull request #50929 from c0bw3b/pkg/sysdig 

    sysdig: 0.23.1 -> 0.24.1
    @7c6f434c
    7c6f434c authored Nov 23, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    24b381e View commit details
Showing with 10 additions and 5 deletions.
  1. +10 −5 pkgs/os-specific/linux/sysdig/default.nix
15 changes: 10 additions & 5 deletions pkgs/os-specific/linux/sysdig/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
{stdenv, fetchFromGitHub, cmake, luajit, kernel, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc, elfutils}:
{ stdenv, fetchFromGitHub, cmake, kernel
, luajit, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc, elfutils, tbb
}:

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

src = fetchFromGitHub {
owner = "draios";
repo = "sysdig";
rev = version;
sha256 = "0q52yfag97n6cvrnzgx7inx11zdg7bgwkvqn2idsg9874fd2wkzh";
sha256 = "04y6cqi2j0qpr5bgxyn6zz9f33v5v4lmkcl21c3sg5hmpjwibg3w";
};

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

hardeningDisable = [ "pic" ];
@@ -51,9 +54,11 @@ stdenv.mkDerivation rec {

meta = {
description = "A tracepoint-based system tracing tool for Linux (with clients for other OSes)";
license = licenses.gpl2;
license = with licenses; [ asl20 gpl2 mit ];
maintainers = [maintainers.raskin];
platforms = ["x86_64-linux"] ++ platforms.darwin;
broken = kernel != null && (versionOlder kernel.version "4.14" || versionAtLeast kernel.version "4.20");
homepage = "https://sysdig.com/opensource/";
downloadPage = "https://github.com/draios/sysdig/releases";
};
}