Merge branch 'sysdig-0.1.82-now-with-osx' of git://github.com/proger/nixpkgs

sysdig: updated to 0.1.82, starting to support Darwin builds (includes
luajit Darwin support)

pkgs/development/interpreters/luajit/default.nix

@@ -11,7 +11,10 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  patchPhase = stdenv.lib.optionalString (stdenv.gcc.libc != null)
+  patchPhase = ''
+    substituteInPlace Makefile \
+      --replace /usr/local $out
+  '' + stdenv.lib.optionalString (stdenv.gcc.libc != null)
   ''
     substituteInPlace Makefile \
       --replace ldconfig ${stdenv.gcc.libc}/sbin/ldconfig
@@ -21,11 +24,11 @@ stdenv.mkDerivation rec {
   buildFlags     = [ "amalg" ]; # Build highly optimized version
   installPhase   = "make install PREFIX=$out";
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "high-performance JIT compiler for Lua 5.1";
     homepage    = http://luajit.org;
-    license     = stdenv.lib.licenses.mit;
-    platforms   = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+    license     = licenses.mit;
+    platforms   = platforms.linux ++ platforms.darwin;
+    maintainers = [ maintainers.thoughtpolice ];
   };
 }

pkgs/os-specific/linux/sysdig/default.nix

@@ -1,15 +1,16 @@
 {stdenv, fetchurl, cmake, luajit, kernel, zlib}:
 let
+  inherit (stdenv.lib) optional optionalString;
   s = rec {
     baseName="sysdig";
-    version="0.1.81";
+    version="0.1.82";
     name="${baseName}-${version}";
     url="https://github.com/draios/sysdig/archive/${version}.tar.gz";
-    sha256="0p9j1fy7lr027nsvr5bq0416nlsbvk02irzazmigsbr03fg0x1wv";
+    sha256="0yjxsdjbkp5dihg5xhkyl3lg64dl40a0b5cvcai8gz74w2955mnk";
   };
   buildInputs = [
-    cmake luajit kernel zlib
-  ];
+    cmake zlib luajit
+  ] ++ optional (kernel != null) kernel;
 in
 stdenv.mkDerivation {
   inherit (s) name version;
@@ -24,17 +25,18 @@ stdenv.mkDerivation {
   ];
   preConfigure = ''
     export INSTALL_MOD_PATH="$out"
+  '' + optionalString (kernel != null) ''
     export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
   '';
-  postInstall = ''
+  postInstall = optionalString (kernel != null) ''
     make install_driver
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     inherit (s) version;
-    description = ''A tracepoint-based system tracing tool for Linux'';
-    license = stdenv.lib.licenses.gpl2 ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    description = ''A tracepoint-based system tracing tool for Linux (with clients for other OSes)'';
+    license = licenses.gpl2;
+    maintainers = [maintainers.raskin];
+    platforms = platforms.linux ++ platforms.darwin;
   };
 }

pkgs/top-level/all-packages.nix

@@ -7381,6 +7381,10 @@ let
 
   statifier = builderDefsPackage (import ../os-specific/linux/statifier) { };
 
+  sysdig = callPackage ../os-specific/linux/sysdig {
+    kernel = null;
+  }; # pkgs.sysdig is a client, for a driver look at linuxPackagesFor
+
   sysfsutils = callPackage ../os-specific/linux/sysfsutils { };
 
   sysprof = callPackage ../development/tools/profiling/sysprof {