Merge remote-tracking branch 'origin/master' into staging

Conflicts:
	pkgs/development/libraries/libav/default.nix
	pkgs/shells/bash/bash-4.2-patches.nix
	pkgs/stdenv/generic/default.nix

4 files changed, 40 insertions, 7 deletions

diff --git a/pkgs/tools/typesetting/biber/default.nix b/pkgs/tools/typesetting/biber/default.nix
index 1769a59520b..efce7d4de81 100644
--- a/pkgs/tools/typesetting/biber/default.nix
+++ b/pkgs/tools/typesetting/biber/default.nix
@@ -6,14 +6,14 @@
 , UnicodeLineBreak, URI, XMLLibXMLSimple, XMLLibXSLT, XMLWriter }:
 
 let
-  version = "1.8";
+  version = "1.9";
   pn = "biblatex-biber";
 in
 buildPerlPackage {
   name = "biber-${version}";
   src = fetchurl {
     url = "mirror://sourceforge/project/${pn}/${pn}/${version}/${pn}.tar.gz";
-    sha256 = "0ffry64pdvg5g487r7qab5b3cs4kq8rq8n3bymxrr1qh3mp79k4n";
+    sha256 = "1a3iq7l9i54f8nfzjmp1qdb6aqm7977q1g4san470010fkfbvjdc";
   };
 
   buildInputs = [
diff --git a/pkgs/tools/typesetting/pdfjam/builder.sh b/pkgs/tools/typesetting/pdfjam/builder.sh
index 9fcb80f6866..720ddeae78d 100644
--- a/pkgs/tools/typesetting/pdfjam/builder.sh
+++ b/pkgs/tools/typesetting/pdfjam/builder.sh
@@ -3,7 +3,7 @@ source $stdenv/setup
 tar zxvf $src
 
 mkdir -p $out/bin
-cp pdfjam/scripts/* $out/bin
+cp pdfjam/bin/* $out/bin
 
 mkdir -p $out/man/man1
 cp pdfjam/man1/* $out/man/man1
diff --git a/pkgs/tools/typesetting/pdfjam/default.nix b/pkgs/tools/typesetting/pdfjam/default.nix
index 1b8d7b5e8d8..f8eafb221a3 100644
--- a/pkgs/tools/typesetting/pdfjam/default.nix
+++ b/pkgs/tools/typesetting/pdfjam/default.nix
@@ -1,10 +1,17 @@
-{stdenv, fetchurl}: stdenv.mkDerivation {
-  name = "pdfjam-1.20";
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation rec {
+  name = "pdfjam-${version}";
+  version = "2.08";
+  url-version = stdenv.lib.replaceChars ["."] [""] version;
+
   builder = ./builder.sh;
+
   src = fetchurl {
-    url = http://www.warwick.ac.uk/go/pdfjam/pdfjam_1.20.tgz;
-    sha256 = "05g3mx7mb6h15ivbv0f53r369xphy8ad8a2xblpnk9mrnlrkaxy9";
+    url = "http://go.warwick.ac.uk/pdfjam/pdfjam_${url-version}.tgz";
+    sha256 = "1wy0xhcy27d7agby598s20ba48s4yg5qkzr6anc6q1xdryccacf7";
   };
+
   meta = with stdenv.lib; {
     platforms = platforms.linux;
     maintainers = [ maintainers.mornfall ];
diff --git a/pkgs/tools/typesetting/tex/pgf/3.x.nix b/pkgs/tools/typesetting/tex/pgf/3.x.nix
new file mode 100644
index 00000000000..9a03500bb96
--- /dev/null
+++ b/pkgs/tools/typesetting/tex/pgf/3.x.nix
@@ -0,0 +1,26 @@
+{stdenv, fetchurl, unzip}:
+
+stdenv.mkDerivation {
+  name = "pgf-3.00";
+  
+  src = fetchurl {
+    url = http://downloads.sourceforge.net/project/pgf/pgf/version%203.0.0/pgf_3.0.0.tds.zip;
+    sha256 = "0kj769hyp4z2zmdv3f8xv443wcfqn5nkkbzxzqgfxjizlz81aav7";
+  };
+  
+  buildInputs = [ unzip ];
+
+  # Multiple files problem
+  unpackPhase = ''
+    mkdir pgf
+    cd pgf
+    unzip $src
+  '';
+
+  buildPhase = "true";
+  
+  installPhase = "
+    mkdir -p $out/share/texmf-nix
+    cp -prd * $out/share/texmf-nix
+  ";
+}