From 424af2cd52c3c9a684ad595703fcf96eede5499c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 27 Feb 2016 21:47:34 +0100
Subject: [PATCH 1/3] patchelf: 0.8 -> 0.9

---
 pkgs/development/tools/misc/patchelf/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/patchelf/default.nix b/pkgs/development/tools/misc/patchelf/default.nix
index 5aa81e46bed1..50e5443ad5fb 100644
--- a/pkgs/development/tools/misc/patchelf/default.nix
+++ b/pkgs/development/tools/misc/patchelf/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "patchelf-0.8";
+  name = "patchelf-0.9";
 
   src = fetchurl {
-    url = "http://nixos.org/releases/patchelf/${name}/${name}.tar.bz2";
-    sha256 = "c99f84d124347340c36707089ec8f70530abd56e7827c54d506eb4cc097a17e7";
+    #url = "http://nixos.org/releases/patchelf/${name}/${name}.tar.bz2";
+    url = http://hydra.nixos.org/build/32429884/download/2/patchelf-0.9pre265_498aa37.tar.bz2;
+    sha256 = "f762813ad493ad73afb7846a530fe2f5e40a5d89b7dba228ce0c62651e9c851e";
   };
 
   setupHook = [ ./setup-hook.sh ];

From abd3c246a43ea5e2128d3372b5fe0295f18cad78 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 28 Feb 2016 12:59:17 +0100
Subject: [PATCH 2/3] netpbm: Disable parallel building

Looks like the "partlist" file is constructed in an unsound way.

http://hydra.nixos.org/build/32430147
---
 pkgs/tools/graphics/netpbm/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix
index e69a73ff321e..3b9f4e64d07d 100644
--- a/pkgs/tools/graphics/netpbm/default.nix
+++ b/pkgs/tools/graphics/netpbm/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     touch lib/standardppmdfont.c
   '';
 
-  enableParallelBuilding = true;
+  enableParallelBuilding = false;
 
   installPhase = ''
     make package pkgdir=$out

From d255a8980a9a17c9b5ec7217ba1b63b6f9ef21f6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 29 Feb 2016 11:35:59 +0100
Subject: [PATCH 3/3] patchelf: Use 0.9 release tarball

---
 pkgs/development/tools/misc/patchelf/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/patchelf/default.nix b/pkgs/development/tools/misc/patchelf/default.nix
index 50e5443ad5fb..7154166c2516 100644
--- a/pkgs/development/tools/misc/patchelf/default.nix
+++ b/pkgs/development/tools/misc/patchelf/default.nix
@@ -4,9 +4,8 @@ stdenv.mkDerivation rec {
   name = "patchelf-0.9";
 
   src = fetchurl {
-    #url = "http://nixos.org/releases/patchelf/${name}/${name}.tar.bz2";
-    url = http://hydra.nixos.org/build/32429884/download/2/patchelf-0.9pre265_498aa37.tar.bz2;
-    sha256 = "f762813ad493ad73afb7846a530fe2f5e40a5d89b7dba228ce0c62651e9c851e";
+    url = "http://nixos.org/releases/patchelf/${name}/${name}.tar.bz2";
+    sha256 = "a0f65c1ba148890e9f2f7823f4bedf7ecad5417772f64f994004f59a39014f83";
   };
 
   setupHook = [ ./setup-hook.sh ];