Merge branch 'master' into staging.

Conflicts:
      pkgs/development/libraries/gtk+/2.x.nix
      pkgs/tools/security/gnupg/21.nix
      pkgs/top-level/all-packages.nix

9 files changed, 69 insertions, 23 deletions

diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix
index d2c26487c0f4..be65061c544c 100644
--- a/pkgs/development/compilers/ecl/default.nix
+++ b/pkgs/development/compilers/ecl/default.nix
@@ -6,11 +6,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="ecl";
-    version="13.5.1";
+    version="15.3.7";
     name="${baseName}-${version}";
-    hash="18ic8w9sdl0dh3kmyc9lsrafikrd9cg1jkhhr25p9saz0v75f77r";
-    url="mirror://sourceforge/project/ecls/ecls/13.5/ecl-13.5.1.tgz";
-    sha256="18ic8w9sdl0dh3kmyc9lsrafikrd9cg1jkhhr25p9saz0v75f77r";
+    hash="13wlxkd5prm93gcm2dhm7v52fl803yx93aa97lrb39z0y6xzziid";
+    url="mirror://sourceforge/project/ecls/ecls/15.3/ecl-15.3.7.tgz";
+    sha256="13wlxkd5prm93gcm2dhm7v52fl803yx93aa97lrb39z0y6xzziid";
   };
   buildInputs = [
     libffi
diff --git a/pkgs/development/compilers/llvm/3.5/lldb.nix b/pkgs/development/compilers/llvm/3.5/lldb.nix
index 9a25401a874b..92ba4108a4d2 100644
--- a/pkgs/development/compilers/llvm/3.5/lldb.nix
+++ b/pkgs/development/compilers/llvm/3.5/lldb.nix
@@ -40,5 +40,6 @@ stdenv.mkDerivation {
     license     = stdenv.lib.licenses.bsd3;
     maintainers = [ stdenv.lib.maintainers.shlevy ];
     platforms   = stdenv.lib.platforms.all;
+    broken = true;
   };
 }
diff --git a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix
index fbb6ae30f513..ea1c01ec5e56 100644
--- a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix
@@ -1,9 +1,9 @@
 import ./jdk-linux-base.nix {
   productVersion = "8";
-  patchVersion = "31";
+  patchVersion = "40";
   downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
-  sha256_i686 = "1sr3q9y0cd42cqpf98gsv3hvip0r1vw3d0jh6yml6krzdm96zp8s";
-  sha256_x86_64 = "0dz4k3xds1ydqr77hmrjc1w0niqq3jm3h18nk3ibqr1083l1bq7g";
+  sha256_i686 = "1bfabnmbar0kfx3i37wnxh97j7whkib8m6wqxrb1d9zf6k13bw50";
+  sha256_x86_64 = "0nfm4xqd57s8dmkgd0jsrhys8dhfw0fx5d57mq70ramq9dl2jq66";
   jceName = "jce_policy-8.zip";
   jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
   sha256JCE = "f3020a3922efd6626c2fff45695d527f34a8020e938a49292561f18ad1320b59";
diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix
index 5669b15a7000..2d4503886691 100644
--- a/pkgs/development/compilers/rustc/head.nix
+++ b/pkgs/development/compilers/rustc/head.nix
@@ -2,15 +2,15 @@
 callPackage ./makeRustcDerivation.nix {
   shortVersion = "1.0.0-dev";
   isRelease = false;
-  # src rev for master on 2015/03/01
-  srcRev = "157614249594f187f421cd97f928e64c5ab5c1fa";
-  srcSha = "06d6fwl1dg6wfnwa002ak89hnjplpf2sjhg78yjg4ki0ca7b0b74";
-  snapshotHashLinux686 = "3278ebbce8cb269acc0614dac5ddac07eab6a99c";
-  snapshotHashLinux64 = "72287d0d88de3e5a53bae78ac0d958e1a7637d73";
-  snapshotHashDarwin686 = "33b366b5287427a340a0aa6ed886d5ff4edf6a76";
-  snapshotHashDarwin64 = "914bf9baa32081a9d5633f1d06f4d382cd71504e";
-  snapshotDate = "2015-02-25";
-  snapshotRev = "880fb89";
+  # src rev for master on 2015/03/09
+  srcRev = "91bdf23f504f79ed59617cde3dfebd3d5e39a476";
+  srcSha = "1s1v1q630d88idz331n4m0c3ninzipmvfzmkvdaqqm28wsn69xx7";
+  snapshotHashLinux686 = "50a47ef247610fb089d2c4f24e4b641eb0ba4afb";
+  snapshotHashLinux64 = "ccb20709b3c984f960ddde996451be8ce2268d7c";
+  snapshotHashDarwin686 = "ad263bdeadcf9bf1889426e0c1391a7cf277364e";
+  snapshotHashDarwin64 = "01c8275828042264206b7acd8e86dc719a2f27aa";
+  snapshotDate = "2015-03-07";
+  snapshotRev = "270a677";
   patches = [
     ./patches/head.patch
   ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
diff --git a/pkgs/development/compilers/sbcl/1.2.5.nix b/pkgs/development/compilers/sbcl/1.2.5.nix
index 4ca477442a9f..6c0fa874f3eb 100644
--- a/pkgs/development/compilers/sbcl/1.2.5.nix
+++ b/pkgs/development/compilers/sbcl/1.2.5.nix
@@ -80,6 +80,5 @@ stdenv.mkDerivation rec {
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.all;
     inherit version;
-    updateWalker = true;
   };
 }
diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index 94a17c483aba..32a73b68d5e1 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "sbcl-${version}";
-  version = "1.2.8";
+  version = "1.2.9";
 
   src = fetchurl {
     url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
-    sha256 = "0ab9lw056yf6y0rjmx3iirn5n59pmssqxf00fbmpyl6qsnpaja1d";
+    sha256 = "0pws10ylnsxj17dagqcdv0l36k3ax5k3hkc6c91n9yxh2nziagk0";
   };
 
   buildInputs = [ which ]
diff --git a/pkgs/development/compilers/scala/2.10.nix b/pkgs/development/compilers/scala/2.10.nix
index d7e7ecf1ce2e..b518a9a0e0ec 100644
--- a/pkgs/development/compilers/scala/2.10.nix
+++ b/pkgs/development/compilers/scala/2.10.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, makeWrapper, jre }:
 
 stdenv.mkDerivation rec {
-  name = "scala-2.10.4";
+  name = "scala-2.10.5";
 
   src = fetchurl {
     url = "http://www.scala-lang.org/files/archive/${name}.tgz";
-    sha256 = "1hqhm1xvd7g78jspvl30zgdzw79xq5zl837h47p6w1n6qlwbcvdl";
+    sha256 = "1ckyz31gmf2pgdl51h1raa669mkl7sqfdl3vqkrmyc46w5ysz3ci";
   };
 
   buildInputs = [ jre makeWrapper ] ;
diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix
index 82cd9fd9087d..9e55d9f3ac2c 100644
--- a/pkgs/development/compilers/scala/default.nix
+++ b/pkgs/development/compilers/scala/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, makeWrapper, jre }:
 
 stdenv.mkDerivation rec {
-  name = "scala-2.11.5";
+  name = "scala-2.11.6";
 
   src = fetchurl {
     url = "http://www.scala-lang.org/files/archive/${name}.tgz";
-    sha256 = "0ip2nb4n68q8gqbc15dq55xfpvr0yi8fwsn8ycz4marl6qb0rhyv";
+    sha256 = "10v58jm0wbb4v71sfi03gskd6n84jqn6nvd62x166104c3j4bfj1";
   };
 
   buildInputs = [ jre makeWrapper ] ;
diff --git a/pkgs/development/compilers/uhc/default.nix b/pkgs/development/compilers/uhc/default.nix
new file mode 100644
index 000000000000..ce3f805bec32
--- /dev/null
+++ b/pkgs/development/compilers/uhc/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, coreutils, fetchgit, m4, libtool, clang, ghcWithPackages,
+  shuffle,
+  hashable, mtl, network, uhc-util, uulib
+}:
+
+let wrappedGhc = ghcWithPackages ( self: [hashable mtl network uhc-util uulib] );
+in stdenv.mkDerivation rec {
+  version = "1.1.8.7";
+  name = "uhc-${version}";
+
+  src = fetchgit {
+    url = "https://github.com/UU-ComputerScience/uhc.git";
+    rev = "0dec07e9cb60e78bbca63fc101f8fec6e249269f";
+    sha256 = "0isz3qz23ihbn0rg54x8ddzwpsqlmmpkvaa66b7srfly7nciv8gl";
+  };
+
+  postUnpack = "sourceRoot=\${sourceRoot}/EHC";
+
+  buildInputs = [ m4 wrappedGhc clang libtool shuffle ];
+
+  configureFlags = [ "--with-gcc=${clang}/bin/clang" ];
+
+  # UHC builds packages during compilation; these are by default
+  # installed in the user-specific package config file. We do not
+  # want that, and hack the build process to use a temporary package
+  # configuration file instead.
+  preConfigure = ''
+    p=`pwd`/uhc-local-packages
+    echo '[]' > $p
+    sed -i "s|--user|--package-db=$p|g" mk/shared.mk.in
+    sed -i "s|-fglasgow-exts|-fglasgow-exts -package-conf=$p|g" mk/shared.mk.in
+    sed -i "s|/bin/date|${coreutils}/bin/date|g" mk/dist.mk
+    sed -i "s|/bin/date|${coreutils}/bin/date|g" mk/config.mk.in
+    sed -i "s|--make|--make -package-db=$p|g" src/ehc/files2.mk
+    sed -i "s|--make|--make -package-db=$p|g" src/gen/files.mk
+  '';
+
+  inherit clang;
+
+  meta = with stdenv.lib; {
+    homepage = "http://www.cs.uu.nl/wiki/UHC";
+    description = "Utrecht Haskell Compiler";
+    maintainers = [ maintainers.phausmann ];
+    platforms = stdenv.lib.platforms.unix;
+  };
+}