Merge remote-tracking branch 'upstream/master' into HEAD

3 files changed, 12 insertions, 13 deletions

diff --git a/pkgs/os-specific/linux/dmtcp/default.nix b/pkgs/os-specific/linux/dmtcp/default.nix
index e67e54f7b439..cedd5a1cb761 100644
--- a/pkgs/os-specific/linux/dmtcp/default.nix
+++ b/pkgs/os-specific/linux/dmtcp/default.nix
@@ -1,19 +1,21 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchFromGitHub, bash, perl, python }:
 
 stdenv.mkDerivation rec {
   name = "dmtcp-${version}";
-  version = "2.5.0";
+  version = "2.5.1";
 
   src = fetchFromGitHub {
     owner = "dmtcp";
     repo = "dmtcp";
     rev = version;
-    sha256 = "08l774i8yp41j6kmzhj7x13475m5kdfhn678ydpm5cbg4l3dda3c";
+    sha256 = "1z6cc7avs2sj8csf7rapf7nbw0giva6xpj0cshv7p9s643y8yxmi";
   };
 
   dontDisableStatic = true;
 
   postPatch = ''
+    patchShebangs .
+
     substituteInPlace configure \
       --replace '#define ELF_INTERPRETER "$interp"' \
                 "#define ELF_INTERPRETER \"$(cat $NIX_CC/nix-support/dynamic-linker)\""
@@ -25,16 +27,13 @@ stdenv.mkDerivation rec {
     substituteInPlace util/gdb-add-symbol-file \
       --replace /bin/bash ${stdenv.shell}
     substituteInPlace test/autotest.py \
-      --replace /usr/bin/env $(type -p env) \
-      --replace /bin/bash $(type -p bash) \
-      --replace /usr/bin/perl $(type -p perl) \
-      --replace /usr/bin/python $(type -p python) \
+      --replace /bin/bash ${bash}/bin/bash \
+      --replace /usr/bin/perl ${perl}/bin/perl \
+      --replace /usr/bin/python ${python}/bin/python \
       --replace "os.environ['USER']" "\"nixbld1\"" \
       --replace "os.getenv('USER')" "\"nixbld1\""
   '';
 
-  doCheck = false;
-
   meta = {
     description = "Distributed MultiThreaded Checkpointing";
     longDescription = ''
diff --git a/pkgs/os-specific/linux/kernel/linux-4.12.nix b/pkgs/os-specific/linux/kernel/linux-4.12.nix
index ca9ed265799a..4bcbca4dacce 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.12.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.12.nix
@@ -1,12 +1,12 @@
 { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.12.10";
+  version = "4.12.11";
   extraMeta.branch = "4.12";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1156ly1lmsr3l8ad8z80agsl026yk86nyypw67ksc66mznvzgyy0";
+    sha256 = "015kyh0v9lkk4a6sa7ysddi7dm639z5p45v2sh2kswsih4sf7kxf";
   };
 
   kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index faa61372fef1..81f4f2a95775 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,12 +1,12 @@
 { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9.47";
+  version = "4.9.48";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1ja14l9gy7cpj94zwacr3gi4vqzfv2k78556fxga8q4lsrwrdgkm";
+    sha256 = "0y3s5xbh5axdvsx9iwz7sinbm7v6j2dvmj8dz46zj1mziwicagwq";
   };
 
   kernelPatches = args.kernelPatches;