Merge branch 'master' into staging

Conflicts:
	pkgs/development/libraries/fontconfig/default.nix

11 files changed, 78 insertions, 86 deletions

diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix
index 6ca11ef7aec8..378a8fc8cad2 100644
--- a/pkgs/development/compilers/ccl/default.nix
+++ b/pkgs/development/compilers/ccl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchsvn, gcc, glibc, m4 }:
+{ stdenv, fetchsvn, gcc, glibc, m4, coreutils }:
 
 /* TODO: there are also MacOS, FreeBSD and Windows versions */
 assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux";
@@ -19,9 +19,17 @@ stdenv.mkDerivation rec {
   CCL_RUNTIME = if stdenv.system == "x86_64-linux" then "lx86cl64"   else "lx86cl";
   CCL_KERNEL  = if stdenv.system == "x86_64-linux" then "linuxx8664" else "linuxx8632";
 
-  buildPhase = ''
-    sed -i lisp-kernel/${CCL_KERNEL}/Makefile -e's/svnversion/echo ${revision}/g'
+  patchPhase = ''
+    substituteInPlace lisp-kernel/${CCL_KERNEL}/Makefile \
+      --replace "svnversion" "echo ${revision}" \
+      --replace "/bin/rm"    "${coreutils}/bin/rm" \
+      --replace "/bin/echo"  "${coreutils}/bin/echo"
+
+    substituteInPlace lisp-kernel/m4macros.m4 \
+      --replace "/bin/pwd" "${coreutils}/bin/pwd"
+  '';
 
+  buildPhase = ''
     make -C lisp-kernel/${CCL_KERNEL} clean
     make -C lisp-kernel/${CCL_KERNEL} all
 
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index 1cda4535efcd..ef7846fadd07 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -52,7 +52,7 @@ assert langGo -> langCC;
 with stdenv.lib;
 with builtins;
 
-let version = "4.9.1";
+let version = "4.9.2";
 
     # Whether building a cross-compiler for GNU/Hurd.
     crossGNU = cross != null && cross.config == "i586-pc-gnu";
@@ -205,7 +205,7 @@ stdenv.mkDerivation ({
 
   src = fetchurl {
     url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2";
-    sha256 = "0zki3ngi0gsidnmsp88mjl2868cc7cm5wm1vwqw6znja28d7hd6k";
+    sha256 = "1pbjp4blk2ycaa6r3jmw4ky5f1s9ji3klbqgv8zs2sl5jn1cj810";
   };
 
   inherit patches;
diff --git a/pkgs/development/compilers/go/1.2.nix b/pkgs/development/compilers/go/1.2.nix
index 8e6f6d3f51ee..a00fe7346701 100644
--- a/pkgs/development/compilers/go/1.2.nix
+++ b/pkgs/development/compilers/go/1.2.nix
@@ -85,7 +85,7 @@ stdenv.mkDerivation {
     homepage = http://golang.org/;
     description = "The Go Programming language";
     license = "BSD";
-    maintainers = with stdenv.lib.maintainers; [ pierron viric wizeman ];
+    maintainers = with stdenv.lib.maintainers; [ pierron viric ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/compilers/icedtea-web/default.nix b/pkgs/development/compilers/icedtea-web/default.nix
index 48b5dbb35a3b..34e025c62dd5 100644
--- a/pkgs/development/compilers/icedtea-web/default.nix
+++ b/pkgs/development/compilers/icedtea-web/default.nix
@@ -3,12 +3,12 @@
 stdenv.mkDerivation rec {
   name = "icedtea-web-${version}";
 
-  version = "1.5.1";
+  version = "1.5.2";
 
   src = fetchurl {
     url = "http://icedtea.wildebeest.org/download/source/${name}.tar.gz";
 
-    sha256 = "1581j1bmg4pavh10dd13q5zchr54j2hf11i2wcd4yml4z9b67w83";
+    sha256 = "1wrvl66qj0yhaqqhcq24005ci5sc3w005809cld55iiwagr8z7mj";
   };
 
   buildInputs = [ gtk2 xulrunner zip pkgconfig npapi_sdk ];
diff --git a/pkgs/development/compilers/icedtea/cppflags-include-fix.patch b/pkgs/development/compilers/icedtea/cppflags-include-fix.patch
index 8931c122538f..731a8d075488 100644
--- a/pkgs/development/compilers/icedtea/cppflags-include-fix.patch
+++ b/pkgs/development/compilers/icedtea/cppflags-include-fix.patch
@@ -1,7 +1,8 @@
-diff -Naur openjdk-orig/jdk/make/sun/awt/mawt.gmk openjdk/jdk/make/sun/awt/mawt.gmk
---- openjdk-orig/jdk/make/sun/awt/mawt.gmk	2012-08-28 19:13:16.000000000 -0400
-+++ openjdk/jdk/make/sun/awt/mawt.gmk	2013-01-22 11:56:22.315418708 -0500
-@@ -234,12 +234,6 @@
+diff --git openjdk-orig/jdk/make/sun/awt/mawt.gmk openjdk/jdk/make/sun/awt/mawt.gmk
+index c6ab06d..23a14da 100644
+--- openjdk-orig/jdk/make/sun/awt/mawt.gmk
++++ openjdk/jdk/make/sun/awt/mawt.gmk
+@@ -270,12 +270,6 @@ LDFLAGS  += -L$(MOTIF_LIB) -L$(OPENWIN_LIB)
  endif # !HEADLESS
  endif # PLATFORM
  
@@ -11,6 +12,6 @@ diff -Naur openjdk-orig/jdk/make/sun/awt/mawt.gmk openjdk/jdk/make/sun/awt/mawt.
 -                        $(wildcard /usr/include/X11/extensions))
 -endif
 -
- ifeq ($(PLATFORM), macosx))
+ ifeq ($(PLATFORM), macosx)
    CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \
                -I$(OPENWIN_HOME)/include 
diff --git a/pkgs/development/compilers/icedtea/default.nix b/pkgs/development/compilers/icedtea/default.nix
index 56c9e69c9a4a..15cf616cc30d 100644
--- a/pkgs/development/compilers/icedtea/default.nix
+++ b/pkgs/development/compilers/icedtea/default.nix
@@ -24,7 +24,7 @@ let
   defSrc = name:
     with (builtins.getAttr name srcInfo.bundles); fetchurl {
       inherit url sha256;
-      name = "${pkgName}-${name}-${baseNameOf url}";
+      name = "${pkgName}-${baseNameOf url}";
     };
 
   bundleNames = builtins.attrNames srcInfo.bundles;
diff --git a/pkgs/development/compilers/icedtea/sources.nix b/pkgs/development/compilers/icedtea/sources.nix
index 098f774b66cf..2be55870ea7e 100644
--- a/pkgs/development/compilers/icedtea/sources.nix
+++ b/pkgs/development/compilers/icedtea/sources.nix
@@ -1,55 +1,47 @@
 # This file is autogenerated from update.py in the same directory.
 {
   icedtea7 = rec {
-    branch = "2.4";
-    version = "${branch}.7";
+    version = "2.5.3";
 
     url = "http://icedtea.wildebeest.org/download/source/icedtea-${version}.tar.xz";
-    sha256 = "17a58wcxvg0dd7ka99k819ci6bga2b9l8kp67fq8z3w0yyz76sdn";
+    sha256 = "1w7i6j4wmg2ixv7d24mad6gphspnkb9w30azjdp4jqn2zqn95wpl";
 
-    hg_url = "http://icedtea.classpath.org/hg/release/icedtea7-forest-${branch}";
+    common_url = "http://icedtea.classpath.org/download/drops/icedtea7/${version}";
 
     bundles = {
       openjdk = rec {
-        changeset = "13970e76b784";
-        url = "${hg_url}/archive/${changeset}.tar.gz";
-        sha256 = "bcd45546509defc439f42f230c0ca64e8aa6ec00542c3634aab3a4c10be3fe6b";
+        url = "${common_url}/openjdk.tar.bz2";
+        sha256 = "3ba1a30762f5d5890e8ee6af11f52213ab9c574c01f07c75a081c42034f5d5c9";
       };
 
       corba = rec {
-        changeset = "e6ad5b912691";
-        url = "${hg_url}/corba/archive/${changeset}.tar.gz";
-        sha256 = "cc37272df260d08207c84763d4c39d7807728ba2d5908276b9bc63e925e70674";
+        url = "${common_url}/corba.tar.bz2";
+        sha256 = "8ceb2cd60782b7fc14b88e3d366f273873fa5436cf0e36b86406c0905b7dc43c";
       };
 
       jaxp = rec {
-        changeset = "94b7e8e0d96f";
-        url = "${hg_url}/jaxp/archive/${changeset}.tar.gz";
-        sha256 = "3515cd105c29563bf78432576e658005386f45d7c3b2b7eac7af86cf196aaaea";
+        url = "${common_url}/jaxp.tar.bz2";
+        sha256 = "2d13a82078f3f2b8831d1e670e5e75719336a56490df64f16ab7647674a272ef";
       };
 
       jaxws = rec {
-        changeset = "bd9a50a78d04";
-        url = "${hg_url}/jaxws/archive/${changeset}.tar.gz";
-        sha256 = "3e107628080d84a80a78ef0ef9dc3664989291dd17c8bacf031d59fba7bd7f4d";
+        url = "${common_url}/jaxws.tar.bz2";
+        sha256 = "5a63d85307203f1aed1e31459ad5e32687909e0640d424ff6f540d9b1cceeb1e";
       };
 
       jdk = rec {
-        changeset = "9448fff93286";
-        url = "${hg_url}/jdk/archive/${changeset}.tar.gz";
-        sha256 = "9222e5317264f20d4a0b8170b4c4d02459cda98333c18e3a75064e7856ff58be";
+        url = "${common_url}/jdk.tar.bz2";
+        sha256 = "40c4dda969be0ecd213e79269184e19cfc32100b83777dc529b3cf4b6aa3e12f";
       };
 
       langtools = rec {
-        changeset = "8c26a3c39128";
-        url = "${hg_url}/langtools/archive/${changeset}.tar.gz";
-        sha256 = "5af29e32344e2f2fc0beb31f91b8312f2a0d6d02c53b4cb700ee2e27bcf1043b";
+        url = "${common_url}/langtools.tar.bz2";
+        sha256 = "516f6c21719f4b5a2092847c147cde7890c5a30d4aed9425ff667c0164ef1dd0";
       };
 
       hotspot = rec {
-        changeset = "69b542696e5b";
-        url = "${hg_url}/hotspot/archive/${changeset}.tar.gz";
-        sha256 = "e3bbed298ed7c77169fdfddc47cdb85c62ef2e5e7ea04ca28aa8779861efca65";
+        url = "${common_url}/hotspot.tar.bz2";
+        sha256 = "8c8e1f7e97f47fe4029e0b0ba42b3515474adabe64e1fbee15c0e2e22a13aa28";
       };
     };
   };
diff --git a/pkgs/development/compilers/icedtea/update.py b/pkgs/development/compilers/icedtea/update.py
index ba3c5fc51ad1..c41cf3d38d2f 100755
--- a/pkgs/development/compilers/icedtea/update.py
+++ b/pkgs/development/compilers/icedtea/update.py
@@ -3,7 +3,7 @@
 import subprocess, urllib.request, re, os, tarfile
 from html.parser import HTMLParser
 
-HG_URL = 'http://icedtea.classpath.org/hg/release/icedtea{}-forest-{}'
+URL = 'http://icedtea.classpath.org/download/drops/icedtea{}/{}'
 DOWNLOAD_URL = 'http://icedtea.wildebeest.org/download/source/'
 DOWNLOAD_HTML = DOWNLOAD_URL + '?C=M;O=D'
 
@@ -81,7 +81,7 @@ def get_latest_version_url(major):
 
 def get_old_bundle_attrs(jdk, bundle):
 	attrs = {}
-	for attr in ('changeset', 'url', 'sha256'):
+	for attr in ('url', 'sha256'):
 		attrs[attr] = get_jdk_attr(jdk, 'bundles.{}.{}'.format(bundle, attr))
 
 	return attrs
@@ -89,7 +89,7 @@ def get_old_bundle_attrs(jdk, bundle):
 def get_old_attrs(jdk):
 	attrs = {}
 
-	for attr in ('branch', 'version', 'url', 'sha256'):
+	for attr in ('version', 'url', 'sha256'):
 		attrs[attr] = get_jdk_attr(jdk, attr)
 
 	attrs['bundles'] = {}
@@ -128,8 +128,8 @@ def get_new_bundle_attr(makefile, bundle, attr):
 
 	return m.group(1)
 
-def get_new_bundle_attrs(jdk, branch, path):
-	hg_url = HG_URL.format(jdk, branch)
+def get_new_bundle_attrs(jdk, version, path):
+	url = URL.format(jdk, version)
 
 	attrs = {}
 
@@ -137,31 +137,22 @@ def get_new_bundle_attrs(jdk, branch, path):
 	tar = tarfile.open(name = path, mode = 'r:xz')
 
 	makefile = get_member_file(tar, 'Makefile.am')
-	hotspot_map = get_member_file(tar, 'hotspot.map')
+	hotspot_map = get_member_file(tar, 'hotspot.map.in')
+
+	hotspot_map = hotspot_map.replace('@ICEDTEA_RELEASE@', version)
 
 	for bundle in BUNDLES:
 		battrs = {}
 
+		battrs['url'] = '{}/{}.tar.bz2'.format(url, bundle)
 		if bundle == 'hotspot':
-			m = re.search(r'^default (.*?) (.*?) (.*?)$', hotspot_map, re.MULTILINE)
+			m = re.search(r'^default (.*?) (.*?) (.*?) (.*?)$', hotspot_map, re.MULTILINE)
 			if m == None:
-				raise Exception('Could not find info for hotspot bundle in hotspot.map')
-
-			battrs['url'] = '{}/archive/{}.tar.gz'.format(m.group(1), m.group(2))
-			battrs['changeset'] = m.group(2)
-			battrs['sha256'] = m.group(3)
-
-			attrs[bundle] = battrs
-			continue
-
-		changeset = get_new_bundle_attr(makefile, bundle, 'changeset')
-		battrs['changeset'] = changeset
-		battrs['sha256'] = get_new_bundle_attr(makefile, bundle, 'sha256sum')
+				raise Exception('Could not find info for hotspot bundle in hotspot.map.in')
 
-		if bundle == 'openjdk':
-			battrs['url'] = '{}/archive/{}.tar.gz'.format(hg_url, changeset)
+			battrs['sha256'] = m.group(4)
 		else:
-			battrs['url'] = '{}/{}/archive/{}.tar.gz'.format(hg_url, bundle, changeset)
+			battrs['sha256'] = get_new_bundle_attr(makefile, bundle, 'sha256sum')
 
 		attrs[bundle] = battrs
 
@@ -193,7 +184,6 @@ def get_new_attrs(jdk):
 	print('Update available, generating new attributes for JDK {}...'.format(jdk))
 
 	attrs['version'] = version
-	attrs['branch'] = '.'.join(version.split('.')[:2])
 	attrs['url'] = url
 
 	print('Downloading tarball from url "{}"...'.format(url))
@@ -203,7 +193,7 @@ def get_new_attrs(jdk):
 
 	print('Inspecting tarball for bundle information...')
 
-	attrs['bundles'] = get_new_bundle_attrs(jdk, attrs['branch'], path)
+	attrs['bundles'] = get_new_bundle_attrs(jdk, attrs['version'], path)
 
 	print('Done!')
 
@@ -212,21 +202,19 @@ def get_new_attrs(jdk):
 def generate_jdk(jdk):
 	attrs = get_new_attrs(jdk)
 
-	branch = attrs['branch']
-	src_version = attrs['version'].replace(branch, '${branch}')
-	src_url = attrs['url'].replace(attrs['version'], '${version}')
+	version = attrs['version']
+	src_url = attrs['url'].replace(version, '${version}')
 
-	hg_url = HG_URL.format(jdk, branch)
-	src_hg_url = HG_URL.format(jdk, '${branch}')
+	common_url = URL.format(jdk, version)
+	src_common_url = URL.format(jdk, '${version}')
 
 	src =  '  icedtea{} = rec {{\n'.format(jdk)
-	src += '    branch = "{}";\n'.format(branch)
-	src += '    version = "{}";\n'.format(src_version)
+	src += '    version = "{}";\n'.format(version)
 	src += '\n'
 	src += '    url = "{}";\n'.format(src_url)
 	src += '    sha256 = "{}";\n'.format(attrs['sha256'])
 	src += '\n'
-	src += '    hg_url = "{}";\n'.format(src_hg_url)
+	src += '    common_url = "{}";\n'.format(src_common_url)
 	src += '\n'
 	src += '    bundles = {\n'
 
@@ -234,11 +222,9 @@ def generate_jdk(jdk):
 		battrs = attrs['bundles'][bundle]
 
 		b_url = battrs['url']
-		b_url = b_url.replace(hg_url, '${hg_url}')
-		b_url = b_url.replace(battrs['changeset'], '${changeset}')
+		b_url = b_url.replace(common_url, '${common_url}')
 
 		src += '      {} = rec {{\n'.format(bundle)
-		src += '        changeset = "{}";\n'.format(battrs['changeset'])
 		src += '        url = "{}";\n'.format(b_url)
 		src += '        sha256 = "{}";\n'.format(battrs['sha256'])
 		src += '      };\n'
diff --git a/pkgs/development/compilers/rustc/common.nix b/pkgs/development/compilers/rustc/common.nix
index d766f22c6adb..fdb1195bb827 100644
--- a/pkgs/development/compilers/rustc/common.nix
+++ b/pkgs/development/compilers/rustc/common.nix
@@ -26,7 +26,7 @@
   meta = with stdenv.lib; {
     homepage = http://www.rust-lang.org/;
     description = "A safe, concurrent, practical language";
-    maintainers = with maintainers; [ madjar cstrahan ];
+    maintainers = with maintainers; [ madjar cstrahan wizeman ];
     license = map (builtins.getAttr "shortName") [ licenses.mit licenses.asl20 ];
     platforms = platforms.linux;
   };
diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix
index 06d691411fa4..cc3fabb244e7 100644
--- a/pkgs/development/compilers/rustc/head.nix
+++ b/pkgs/development/compilers/rustc/head.nix
@@ -18,19 +18,19 @@ assert stdenv.gcc.gcc != null;
 
 */
 
-with ((import ./common.nix) {inherit stdenv; version = "0.12.0-pre-1336-g394269d";});
+with ((import ./common.nix) {inherit stdenv; version = "0.13.0-pre-1673-g3a325c6";});
 
 let snapshot = if stdenv.system == "i686-linux"
-      then "999ba4a0dfb70adca628138a7d5f491023621140"
+      then "c8342e762a1720be939ed7c6a39bdaa27892f66f"
       else if stdenv.system == "x86_64-linux"
-      then "55eaaed3bd6dd5a8d08e99aa4cd618d207f87d8c"
+      then "7a7fe6f5ed47b9cc66261f880e166c7c8738b73e"
       else if stdenv.system == "i686-darwin"
-      then "0581dff21a238343602ec0202a551bac93d21300"
+      then "63e8644512bd5665c14389a83d5af564c7c0b103"
       else if stdenv.system == "x86_64-darwin"
-      then "aad290cf3f8ac4aa0661984a9799c78161ea5a72"
+      then "7933ae0e974d1b897806138b7052cb2b4514585f"
       else abort "no-snapshot for platform ${stdenv.system}";
-    snapshotDate = "2014-11-18";
-    snapshotRev = "9c96a79";
+    snapshotDate = "2014-11-21";
+    snapshotRev = "c9f6d69";
     snapshotName = "rust-stage0-${snapshotDate}-${snapshotRev}-${platform}-${snapshot}.tar.bz2";
 
 in stdenv.mkDerivation {
@@ -40,8 +40,8 @@ in stdenv.mkDerivation {
 
   src = fetchgit {
     url = https://github.com/rust-lang/rust;
-    rev = "394269d16e3752a23ffa273e68f8aaefd2a510c4";
-    sha256 = "0zkz5f4gba4glhrf9f7v42qxk638q9ahgf6m0bjh8b7c3x52cv71";
+    rev = "3a325c666d2cb7e297bf3057ff2442f96a79428b";
+    sha256 = "0a0byglfaf0wfsnlm53vng1gqkkz4i29zphdwqg93v26mciqqc61";
   };
 
   # We need rust to build rust. If we don't provide it, configure will try to download it.
@@ -82,4 +82,9 @@ in stdenv.mkDerivation {
   preCheck = "export TZDIR=${tzdata}/share/zoneinfo";
 
   doCheck = true;
+
+  postInstall = ''
+      # Install documentation
+      cp -r doc "$out/share/doc"
+  '';
 }
diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix
index 01dbaee8cde6..51025847c902 100644
--- a/pkgs/development/compilers/urweb/default.nix
+++ b/pkgs/development/compilers/urweb/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "urweb";
-  version = "20140830";
+  version = "20141206";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "http://www.impredicative.com/ur/${name}.tgz";
-    sha256 = "0l4zhvdy2fdvhihyl4gl09v8q4w05b1k0c6h4k8281px96d5ljgr";
+    sha256 = "077yakksxvdjlmwgc9wlz9jnkr345sikqjchvmxyv0axga5bw4rj";
   };
 
   buildInputs = [ stdenv.gcc file openssl mlton mysql postgresql sqlite ];