Merge branch 'master.upstream' into staging.upstream

pkgs/development/tools/build-managers/scons/default.nix

@@ -2,7 +2,7 @@
 
 let
   name = "scons";
-  version = "2.3.4";
+  version = "2.3.5";
 in
 
 stdenv.mkDerivation {
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://sourceforge/scons/${name}-${version}.tar.gz";
-    sha256 = "0hdlci43wjz8maryj83mz04ir6rwcdrrzpd7cpzvdlzycqhdfmsb";
+    sha256 = "0hlwkrr5fkjpjgmwipp9a2bnc9riqks2pjc3rvjsq0a8j7hr72ca";
   };
 
   buildInputs = [python makeWrapper];

pkgs/development/tools/misc/ccache/default.nix

@@ -1,23 +1,24 @@
-{ stdenv, fetchurl, runCommand, gcc, perl, zlib }:
+{ stdenv, fetchurl, runCommand, gcc, zlib }:
 
 let
   # TODO: find out if there's harm in just using 'rec' instead.
   name = "ccache-${version}";
   version = "3.2.2";
   sha256 = "1jm0qb3h5sypllaiyj81zp6m009vm50hzjnx994ril94kxlrj3ag";
-  doCheck = true;
 
   ccache =
 stdenv.mkDerivation {
-  inherit name doCheck;
+  inherit name;
   src = fetchurl {
     inherit sha256;
     url = "mirror://samba/ccache/${name}.tar.xz";
   };
 
-  # The test dependency on perl should be gone in the next release:
-  buildInputs = [ zlib ]
-    ++ stdenv.lib.optionals doCheck [ perl ];
+  patches = [ ./test-drop-perl-requirement.patch ];
+
+  buildInputs = [ zlib ];
+
+  doCheck = true;
 
   passthru = {
     # A derivation that provides gcc and g++ commands, but that

pkgs/development/tools/misc/ccache/test-drop-perl-requirement.patch

@@ -0,0 +1,36 @@
+Since perl is used in just one place and can easily be replaced by a
+little bit of shell, do so.  This makes testing on limited systems
+easier.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ INSTALL.txt | 1 -
+ test.sh     | 2 +-
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/INSTALL.txt b/INSTALL.txt
+index 256beab..f77cbe6 100644
+--- a/INSTALL.txt
++++ b/INSTALL.txt
+@@ -67,7 +67,6 @@ In addition to the prerequisites mentioned above, you also need:
+
+ To debug and run the performance test suite you'll also need:
+
+-- Perl (http://www.perl.org/)
+ - Python (http://www.python.org/)
+
+ Run "./autogen.sh" and then follow the steps mentioned under "Installation"
+diff --git a/test.sh b/test.sh
+index f14e287..1090649 100755
+--- a/test.sh
++++ b/test.sh
+@@ -1834,7 +1834,7 @@ prepare_cleanup_test() {
+     mkdir -p $dir
+     i=0
+     while [ $i -lt 10 ]; do
+-        perl -e 'print "A" x 4017' >$dir/result$i-4017.o
++        printf '%4017s' '' | tr ' ' 'A' >$dir/result$i-4017.o
+         touch $dir/result$i-4017.stderr
+         touch $dir/result$i-4017.d
+         if [ $i -gt 5 ]; then
+--

pkgs/development/tools/ocaml/ocp-index/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, ocaml, findlib, ocpBuild, ocpIndent, opam, cmdliner, ncurses, re, lambdaTerm, libev }:
+{ stdenv, fetchurl, fetchzip, ocaml, findlib, ocpBuild, ocpIndent, opam, cmdliner, ncurses, re, lambdaTerm, libev }:
 
 let inherit (stdenv.lib) getVersion versionAtLeast optional; in
 
@@ -6,7 +6,13 @@ assert versionAtLeast (getVersion ocaml) "3.12.1";
 assert versionAtLeast (getVersion ocpBuild) "1.99.6-beta";
 assert versionAtLeast (getVersion ocpIndent) "1.4.2";
 
-let version = "1.1.1"; in
+let
+  version = "1.1.2";
+  patch402 = fetchurl {
+    url = https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/ocp-index/ocp-index.1.1.2/files/ocaml.4.02.patch;
+    sha256 = "1wcpn2pv7h8ia3ybmzdlm8v5hfvq1rgmlj02wwj0yh3vqjvxqvsm";
+  };
+in
 
 stdenv.mkDerivation {
 
@@ -14,9 +20,11 @@ stdenv.mkDerivation {
 
   src = fetchzip {
     url = "http://github.com/OCamlPro/ocp-index/archive/${version}.tar.gz";
-    sha256 = "173lqbyivwv1zf9ifpxa9f8m2y3kybzs3idrwyzy824ixdqv2fww";
+    sha256 = "0cz0bz5nisc5r23b1w07q2bl489gd09mg8rp9kyq9m6rj669b18l";
   };
 
+  patches = optional (versionAtLeast (getVersion ocaml) "4.02") patch402;
+
   buildInputs = [ ocaml findlib ocpBuild opam cmdliner ncurses re libev ]
   ++ optional (versionAtLeast (getVersion lambdaTerm) "1.7") lambdaTerm;
   propagatedBuildInputs = [ ocpIndent ];