From e6f51faa1273f6585903fa422718a686d40a60fd Mon Sep 17 00:00:00 2001
From: Matthew Maurer <matthew.r.maurer@gmail.com>
Date: Mon, 28 Sep 2015 18:33:48 -0400
Subject: [PATCH 01/43] capnproto: 0.5.1.2 -> 0.5.3

---
 pkgs/development/libraries/capnproto/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/capnproto/default.nix b/pkgs/development/libraries/capnproto/default.nix
index 8a67206d5b49..839d48e488f0 100644
--- a/pkgs/development/libraries/capnproto/default.nix
+++ b/pkgs/development/libraries/capnproto/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "capnproto-${version}";
-  version = "0.5.1.2";
+  version = "0.5.3";
 
   src = fetchurl {
     url = "https://capnproto.org/capnproto-c++-${version}.tar.gz";
-    sha256 = "0a89v6sigsyj9vii0d5kqs2fdv73r71f8czzhdvqdvk3p0mlcgx2";
+    sha256 = "1yvaadhgakskqq5wpv53hd6fc3pp17mrdldw4i5cvgck4iwprcfd";
   };
 
   meta = with stdenv.lib; {

From 9d6625181230a917c5f05ddf8019a02d7a7814c3 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 29 Sep 2015 10:10:31 +0200
Subject: [PATCH 02/43] openbox: 3.5.2 -> 3.6.1

---
 pkgs/applications/window-managers/openbox/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/openbox/default.nix b/pkgs/applications/window-managers/openbox/default.nix
index f1369ebea7d8..326cd2a49f44 100644
--- a/pkgs/applications/window-managers/openbox/default.nix
+++ b/pkgs/applications/window-managers/openbox/default.nix
@@ -3,7 +3,7 @@
 , imlib2, pango, libstartup_notification, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "openbox-3.5.2";
+  name = "openbox-3.6.1";
 
   buildInputs = [
     pkgconfig libxml2
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://openbox.org/dist/openbox/${name}.tar.gz";
-    sha256 = "0cxgb334zj6aszwiki9g10i56sm18i7w1kw52vdnwgzq27pv93qj";
+    sha256 = "1xvyvqxlhy08n61rjkckmrzah2si1i7nmc7s8h07riqq01vc0jlb";
   };
 
   setlayoutSrc = fetchurl {

From 6e7a8808d6cdd2d337d33569ee53f7a63448d2f2 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 29 Sep 2015 10:41:00 +0200
Subject: [PATCH 03/43] avfs: 1.0.2 -> 1.0.3

---
 pkgs/tools/filesystems/avfs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/avfs/default.nix b/pkgs/tools/filesystems/avfs/default.nix
index 1a9a09aaa50f..060247aa532d 100644
--- a/pkgs/tools/filesystems/avfs/default.nix
+++ b/pkgs/tools/filesystems/avfs/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "avfs-${version}";
-  version = "1.0.2";
+  version = "1.0.3";
   src = fetchurl {
     url = "mirror://sourceforge/avf/${version}/${name}.tar.bz2";
-    sha1 = "e4f8377ea2565c1ac59f7b66893905b778ddf849";
+    sha256 = "1j7ysjkv0kbkwjagcdgwcnbii1smd58pwwlpz0l7amki5dxygpn6";
   };
 
   buildInputs = [ pkgconfig fuse xz ];

From e547393fac6c5b752742655425e4f768de04174a Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 29 Sep 2015 10:41:26 +0200
Subject: [PATCH 04/43] jetty: 5.1.4 -> 6.1.4

---
 pkgs/servers/http/jetty/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix
index f691f362bb24..78b6e4cc7eee 100644
--- a/pkgs/servers/http/jetty/default.nix
+++ b/pkgs/servers/http/jetty/default.nix
@@ -1,13 +1,13 @@
 {stdenv, fetchurl, unzip}:
 
 stdenv.mkDerivation {
-  name = "jetty-5.1.4";
+  name = "jetty-6.1.4";
 
   builder = ./bin-builder.sh;
   buildInputs = [unzip];
 
   src = fetchurl {
-    url = mirror://sourceforge/jetty/jetty-5.1.4.zip;
-    sha256 = "1lzvsrlybrf3zzzv4hi2v82qzpkfkib3xbwwlya8c08gf0360mrk";
+    url = mirror://sourceforge/jetty/jetty-6.1.4.zip;
+    sha256 = "061cx442g5a5szzms9zhnfmr4aipmqyy9r8m5r84gr79gz9z6dv0";
   };
 }

From bebfc6ad8287d09bb93e8917a1712f0e0ef64800 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 29 Sep 2015 12:25:38 +0200
Subject: [PATCH 05/43] wmutils-core: 1.0 -> 1.1

---
 pkgs/tools/X11/wmutils-core/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/X11/wmutils-core/default.nix b/pkgs/tools/X11/wmutils-core/default.nix
index 62f6e65bc214..4200293ed080 100644
--- a/pkgs/tools/X11/wmutils-core/default.nix
+++ b/pkgs/tools/X11/wmutils-core/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "wmutils-core-${version}";
-  version = "1.0";
+  version = "1.1";
 
   src = fetchurl {
     url = "https://github.com/wmutils/core/archive/v${version}.tar.gz";
-    sha256 = "10vn56rbrjykcrjr06ki4qc12sri1ywrcvm89nmxlqhkxx4i239p";
+    sha256 = "0aq95khs154j004b79w9rgm80vpggxfqynha5rckm2cx20d1fa5s";
   };
 
   buildInputs = [ libxcb ];

From 1b5fdd1bc98f309ac2381de3fc08ac72b46ea0d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?James=20=E2=80=98Twey=E2=80=99=20Kay?= <twey@twey.co.uk>
Date: Wed, 30 Sep 2015 16:39:09 +0100
Subject: [PATCH 06/43] openfire: Fix JVM test

---
 pkgs/servers/xmpp/openfire/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/xmpp/openfire/default.nix b/pkgs/servers/xmpp/openfire/default.nix
index 3fb89d7a222b..53924f9888c0 100644
--- a/pkgs/servers/xmpp/openfire/default.nix
+++ b/pkgs/servers/xmpp/openfire/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ jre ];
 
   installPhase = ''
-    sed -e 's@\(common_jvm_locations\)=.*@\1${jre}@' -i bin/openfire
+    sed -e 's@\(common_jvm_locations=\).*@\1${jre}@' -i bin/openfire
     cp -r . $out
     rm -r $out/logs
     mv $out/conf $out/conf.inst

From 725a4d67404f4cf204386e52646cf42ecab394b3 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Wed, 30 Sep 2015 22:43:06 +0300
Subject: [PATCH 07/43] nixos-install: Don't use NIX_BUILD_HOOK from caller's
 environment

If nixos-install is run on a machine with `nix.distributedBuilds = true`
the installation will fail at some point like this:

Died at /nix/store/4frhrl31cl7iahlz6vyvysy5dmr6xnh3-nix-1.10/libexec/nix/build-remote.pl line 115, <STDIN> line 1.

This is due to `nix.distributedBuilds` setting
NIX_BUILD_HOOK=/nix/store/.../build-remote.pl in the global environment,
which then gets confused in the minimal chroot created by nixos-install.

To avoid these kinds of issues with build hooks, just disable them in
the chroot.
---
 nixos/modules/installer/tools/nixos-install.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh
index f7fe6245d6d9..4e10615f902f 100644
--- a/nixos/modules/installer/tools/nixos-install.sh
+++ b/nixos/modules/installer/tools/nixos-install.sh
@@ -188,6 +188,9 @@ mkdir -m 0755 -p $mountPoint/bin
 ln -sf @shell@ $mountPoint/bin/sh
 
 
+# Build hooks likely won't function correctly in the minimal chroot; just disable them.
+unset NIX_BUILD_HOOK
+
 # Make the build below copy paths from the CD if possible.  Note that
 # /tmp/root in the chroot is the root of the CD.
 export NIX_OTHER_STORES=/tmp/root/nix:$NIX_OTHER_STORES

From 5ecdc8f3c6a4f3cbb1e0348b2ccabd07bb1a1fc5 Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <tom@logand.com>
Date: Sun, 27 Sep 2015 22:31:08 +0200
Subject: [PATCH 08/43] picolisp: 3.1.10 -> 3.1.11

---
 pkgs/development/interpreters/picolisp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix
index fdeb950bcfd1..5bf68ea8f0f6 100644
--- a/pkgs/development/interpreters/picolisp/default.nix
+++ b/pkgs/development/interpreters/picolisp/default.nix
@@ -3,10 +3,10 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "picoLisp-${version}";
-  version = "3.1.10";
+  version = "3.1.11";
   src = fetchurl {
     url = "http://www.software-lab.de/${name}.tgz";
-    sha256 = "1pn5c0d81rz1fazsdijhw4cqybaad2wn6qramdj2qqkzxa3vvll1";
+    sha256 = "01kgyz0lkz36lxvibv07qd06gwdxvvbain9f9cnya7a12kq3009i";
   };
   buildInputs = [ jdk ];
   sourceRoot = ''picoLisp/src${optionalString stdenv.is64bit "64"}'';

From 411d83d5fed24c3faab8ae6cba89ba11ef0d0663 Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <tom@logand.com>
Date: Sun, 27 Sep 2015 22:36:58 +0200
Subject: [PATCH 09/43] picolisp: compile on arm and i686

---
 pkgs/development/interpreters/picolisp/default.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix
index 5bf68ea8f0f6..496a4ff66681 100644
--- a/pkgs/development/interpreters/picolisp/default.nix
+++ b/pkgs/development/interpreters/picolisp/default.nix
@@ -8,7 +8,17 @@ stdenv.mkDerivation rec {
     url = "http://www.software-lab.de/${name}.tgz";
     sha256 = "01kgyz0lkz36lxvibv07qd06gwdxvvbain9f9cnya7a12kq3009i";
   };
-  buildInputs = [ jdk ];
+  buildInputs = if stdenv.is64bit then [ jdk ] else [];
+  patchPhase = if stdenv.isArm then ''
+    sed -i s/-m32//g Makefile
+    cat >>Makefile <<EOF
+    ext.o: ext.c
+    	\$(CC) \$(CFLAGS) -fPIC -D_OS='"\$(OS)"' \$*.c
+    ht.o: ht.c
+    	\$(CC) \$(CFLAGS) -fPIC -D_OS='"\$(OS)"' \$*.c
+    EOF
+  ''
+  else "";
   sourceRoot = ''picoLisp/src${optionalString stdenv.is64bit "64"}'';
   installPhase = ''
     cd ..

From f9f919e2bf2c503bfea9ec89f8127f5600913cbf Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <tom@logand.com>
Date: Sun, 27 Sep 2015 22:40:05 +0200
Subject: [PATCH 10/43] ccl: also on arm

---
 pkgs/development/compilers/ccl/default.nix | 35 ++++++++++++++++++----
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix
index 3522e234fa2a..30eb528cab71 100644
--- a/pkgs/development/compilers/ccl/default.nix
+++ b/pkgs/development/compilers/ccl/default.nix
@@ -1,23 +1,48 @@
 { 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";
+assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"
+  || stdenv.system == "armv7l-linux" || stdenv.system == "armv6l-linux";
 
+let
+  options = rec {
+    x86_64-linux = {
+      arch = "linuxx86";
+      sha256 = "04p77n18cw0bc8i66mp2vfrhlliahrx66lm004a3nw3h0mdk0gd8";
+      runtime = "lx86cl64";
+      kernel = "linuxx8664";
+    };
+    i686-linux = {
+      arch = "linuxx86";
+      sha256 = x86_64-linux.sha256;
+      runtime = "lx86cl";
+      kernel = "linuxx8632";
+    };
+    armv7l-linux = {
+      arch = "linuxarm";
+      sha256 = "0xg9p1q1fpgyfhwjk2hh24vqzddzx5zqff04lycf0vml5qw1gnkv";
+      runtime = "armcl";
+      kernel = "linuxarm";
+    };
+    armv6l-linux = armv7l-linux;
+  };
+  cfg = options.${stdenv.system};
+in
 stdenv.mkDerivation rec {
   name     = "ccl-${version}";
   version  = "1.10";
   revision = "16313";
 
   src = fetchsvn {
-    url = http://svn.clozure.com/publicsvn/openmcl/release/1.10/linuxx86/ccl;
+    url = "http://svn.clozure.com/publicsvn/openmcl/release/${version}/${cfg.arch}/ccl";
     rev = revision;
-    sha256 = "04p77n18cw0bc8i66mp2vfrhlliahrx66lm004a3nw3h0mdk0gd8";
+    sha256 = cfg.sha256;
   };
 
   buildInputs = [ gcc glibc m4 ];
 
-  CCL_RUNTIME = if stdenv.system == "x86_64-linux" then "lx86cl64"   else "lx86cl";
-  CCL_KERNEL  = if stdenv.system == "x86_64-linux" then "linuxx8664" else "linuxx8632";
+  CCL_RUNTIME = cfg.runtime;
+  CCL_KERNEL = cfg.kernel;
 
   patchPhase = ''
     substituteInPlace lisp-kernel/${CCL_KERNEL}/Makefile \

From 64bde29a312bb3039b39239c25128ed05c126d86 Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <tom@logand.com>
Date: Sun, 27 Sep 2015 22:42:56 +0200
Subject: [PATCH 11/43] sbcl: 1.2.14 -> 1.2.15

---
 pkgs/development/compilers/sbcl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index 2d6a3a451470..c6d8db6751e9 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.14";
+  version = "1.2.15";
 
   src = fetchurl {
     url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
-    sha256 = "01jw1w5siv6q16y1vmgd7s1i22aq0cqaipgn12jvq18c8vb6s55r";
+    sha256 = "0l8nrf5qnr8c9hr6bn1kd86mnr2s37b493azh9rrk3v59f56wnnr";
   };
 
   buildInputs = [ which ]

From 29f120d7b2bc37e0e39884ea827baa9aa4c40792 Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <tom@logand.com>
Date: Sun, 27 Sep 2015 23:35:34 +0200
Subject: [PATCH 12/43] sbcl: improve bootstrap and add arm support

clisp bootstrap is very slow and clisp doesn't compile on arm

now it is possible to also bootstrap using ccl:

   sbclBootstrapHost = "${ccl}/bin/${ccl.CCL_RUNTIME} -b -n";

or alternatively using clisp

   sbclBootstrapHost = "${clisp}/bin/clisp -norc";
---
 pkgs/development/compilers/sbcl/bootstrap.nix | 55 ++++++++++++++-----
 pkgs/development/compilers/sbcl/default.nix   | 22 +++-----
 pkgs/top-level/all-packages.nix               |  4 +-
 3 files changed, 52 insertions(+), 29 deletions(-)

diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix
index 015d7dd95da8..8c1a6e27a769 100644
--- a/pkgs/development/compilers/sbcl/bootstrap.nix
+++ b/pkgs/development/compilers/sbcl/bootstrap.nix
@@ -1,24 +1,53 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, makeWrapper }:
 
+let
+  options = rec {
+    x86_64-darwin = rec {
+      version = "1.1.8";
+      system = "x86-64-darwin";
+      sha256 = "006pr88053wclvbjfjdypnbiw8wymbzdzi7a6kbkpdfn4zf5943j";
+    };
+    x86_64-linux = rec {
+      version = "1.2.15";
+      system = "x86-64-linux";
+      sha256 = "1bpbfz9x2w73hy2kh8p0kd4m1p6pin90h2zycq52r3bbz8yv47aw";
+    };
+    i686-linux = rec {
+      version = "1.2.7";
+      system = "x86-linux";
+      sha256 = "07f3bz4br280qvn85i088vpzj9wcz8wmwrf665ypqx181pz2ai3j";
+    };
+    armv7l-linux = rec {
+      version = "1.2.14";
+      system = "armhf-linux";
+      sha256 = "0sp5445rbvms6qvzhld0kwwvydw51vq5iaf4kdqsf2d9jvaz3yx5";
+    };
+    armv6l-linux = armv7l-linux;
+  };
+  cfg = options.${stdenv.system};
+in
 stdenv.mkDerivation rec {
   name    = "sbcl-bootstrap-${version}";
-  version = "1.1.8";
+  version = cfg.version;
 
-  src = if stdenv.isDarwin
-    then fetchurl {
-      url = mirror://sourceforge/project/sbcl/sbcl/1.1.8/sbcl-1.1.8-x86-64-darwin-binary.tar.bz2;
-      sha256 = "006pr88053wclvbjfjdypnbiw8wymbzdzi7a6kbkpdfn4zf5943j";
-    }
-    else fetchurl {
-      url = mirror://sourceforge/project/sbcl/sbcl/1.1.8/sbcl-1.1.8-x86-64-linux-binary.tar.bz2;
-      sha256 = "0lh1jglxlfwk4cm6sgwk1jnb6ikhbrkx7p5aha2nbmkd6zl96prx";
-    };
+  src = fetchurl {
+    url = "mirror://sourceforge/project/sbcl/sbcl/${version}/sbcl-${version}-${cfg.system}-binary.tar.bz2";
+    sha256 = cfg.sha256;
+  };
+
+  buildInputs = [ makeWrapper ];
 
   installPhase = ''
-    mkdir -p $out/bin
-    cp -p src/runtime/sbcl $out/bin
     mkdir -p $out/share/sbcl
+    cp -p src/runtime/sbcl $out/share/sbcl
     cp -p output/sbcl.core $out/share/sbcl
+    mkdir -p $out/bin
+    makeWrapper $out/share/sbcl/sbcl $out/bin/sbcl \
+      --add-flags "--core $out/share/sbcl/sbcl.core"
+  '';
+
+  postFixup = if stdenv.isArm then "" else ''
+    patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/share/sbcl/sbcl
   '';
 
   meta = {
diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index c6d8db6751e9..534e54f03962 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, sbclBootstrap, clisp, which}:
+{ stdenv, fetchurl, sbclBootstrap, sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit", which }:
 
 stdenv.mkDerivation rec {
   name    = "sbcl-${version}";
@@ -9,10 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0l8nrf5qnr8c9hr6bn1kd86mnr2s37b493azh9rrk3v59f56wnnr";
   };
 
-  buildInputs = [ which ]
-    ++ (stdenv.lib.optional stdenv.isDarwin sbclBootstrap)
-    ++ (stdenv.lib.optional stdenv.isLinux clisp)
-    ;
+  buildInputs = [ which ];
 
   patchPhase = ''
     echo '"${version}.nixos"' > version.lisp-expr
@@ -22,7 +19,10 @@ stdenv.mkDerivation rec {
                (pushnew x features))
              (disable (x)
                (setf features (remove x features))))
-        (enable :sb-thread))) " > customize-target-features.lisp
+        #-arm
+        (enable :sb-thread)
+        #+arm
+        (enable :arm))) " > customize-target-features.lisp
 
     pwd
 
@@ -64,13 +64,9 @@ stdenv.mkDerivation rec {
     export HOME=$PWD/test-home
   '';
 
-  buildPhase = if stdenv.isLinux
-    then ''
-      sh make.sh clisp --prefix=$out
-    ''
-    else ''
-      sh make.sh --prefix=$out --xc-host='${sbclBootstrap}/bin/sbcl --core ${sbclBootstrap}/share/sbcl/sbcl.core --disable-debugger --no-userinit --no-sysinit'
-    '';
+  buildPhase = ''
+    sh make.sh --prefix=$out --xc-host="${sbclBootstrapHost}"
+  '';
 
   installPhase = ''
     INSTALL_ROOT=$out sh install.sh
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 654b02c4f493..7ca074899520 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4701,9 +4701,7 @@ let
   rustfmt = callPackage ../development/tools/rust/rustfmt { };
 
   sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {};
-  sbcl = callPackage ../development/compilers/sbcl {
-    clisp = clisp;
-  };
+  sbcl = callPackage ../development/compilers/sbcl {};
   # For StumpWM
   sbcl_1_2_5 = callPackage ../development/compilers/sbcl/1.2.5.nix {
     clisp = clisp;

From 4e66ba1a70368ea9ba6f8af1dc931d54404bec72 Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <tom@logand.com>
Date: Tue, 29 Sep 2015 09:33:52 +0200
Subject: [PATCH 13/43] lisp-packages: git.b9.com moved to git.kpe.io

---
 pkgs/development/lisp-modules/lisp-packages.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix
index 073721530321..36e0b34e005b 100644
--- a/pkgs/development/lisp-modules/lisp-packages.nix
+++ b/pkgs/development/lisp-modules/lisp-packages.nix
@@ -196,7 +196,7 @@ let lispPackages = rec {
     # Source type: git
     src = pkgs.fetchgit {
       url =
-        #''http://git.b9.com/clsql.git''
+        #''http://git.kpe.io/clsql.git''
 	"http://repo.or.cz/r/clsql.git"
 	;
       sha256 = "1wzc7qsnq8hk0j0h9jmj4xczmh7h6njafwab2zylh8wxmfzwp2nw";
@@ -217,7 +217,7 @@ let lispPackages = rec {
     deps = [];
     # Source type: git
     src = pkgs.fetchgit {
-      url = ''http://git.b9.com/uffi.git'';
+      url = ''http://git.kpe.io/uffi.git'';
       sha256 = "219e4cfebfac251c922bcb9d517980b0988d765bd18b7f5cc765a43913aaacc6";
       rev = ''a63da5b764b6fa30e32fcda4ddac88de385c9d5b'';
     };
@@ -467,7 +467,7 @@ let lispPackages = rec {
     deps = [];
     # Source type: git
     src = pkgs.fetchgit {
-      url = ''http://git.b9.com/cl-base64.git'';
+      url = ''http://git.kpe.io/cl-base64.git'';
       sha256 = "a34196544cc67d54aef74e31eff2cee62a7861a5675d010fcd925f1c61c23e81";
       rev = ''f375d1fc3a6616e95ae88bb33493bb99f920ba13'';
     };
@@ -480,7 +480,7 @@ let lispPackages = rec {
     deps = [];
     # Source type: git
     src = pkgs.fetchgit {
-      url = ''http://git.b9.com/puri.git'';
+      url = ''http://git.kpe.io/puri.git'';
       sha256 = "71804698e7f3009fb7f570656af5d952465bfe77f72e9c41f7e2dda8a5b45c5e";
       rev = ''68260dbf320c01089c8cee54ef32c800eefcde7f'';
     };

From aa6076f9f5ef2064e8f30d816bf29f53c86d617c Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 27 Sep 2015 07:13:36 +0300
Subject: [PATCH 14/43] rpm: 4.11.2 -> 4.12.0

---
 pkgs/tools/package-management/rpm/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix
index 0d537a1c30cb..ef7b99952968 100644
--- a/pkgs/tools/package-management/rpm/default.nix
+++ b/pkgs/tools/package-management/rpm/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, cpio, zlib, bzip2, file, elfutils, nspr, nss, popt, db, xz, python }:
+{ stdenv, fetchurl, cpio, zlib, bzip2, file, elfutils, libarchive, nspr, nss, popt, db, xz, python }:
 
 stdenv.mkDerivation rec {
-  name = "rpm-4.11.2";
+  name = "rpm-4.12.0";
 
   src = fetchurl {
-    url = "http://rpm.org/releases/rpm-4.11.x/${name}.tar.bz2";
-    sha256 = "1m2859js0dwg26sg2mnbkpzhvx303b12kx26az74cf5k6bk8sgs0";
+    url = "http://rpm.org/releases/rpm-4.12.x/${name}.tar.bz2";
+    sha256 = "18hk47hc755nslvb7xkq4jb095z7va0nlcyxdpxayc4lmb8mq3bp";
   };
 
-  buildInputs = [ cpio zlib bzip2 file nspr nss popt db xz python ];
+  buildInputs = [ cpio zlib bzip2 file libarchive nspr nss popt db xz python ];
 
   # Note: we don't add elfutils to buildInputs, since it provides a
   # bad `ld' and other stuff.

From 0870c09854db0269d855cc04940d5236e0e59d7d Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Wed, 30 Sep 2015 17:13:56 -0700
Subject: [PATCH 15/43] darwin purity: emacs-24.5-mac

---
 .../editors/emacs-24/macport-24.5.nix         | 14 +++++-
 pkgs/os-specific/darwin/apple-sdk/default.nix | 14 +++++-
 .../darwin/apple-sdk/frameworks.nix           |  6 +--
 .../darwin/apple-sdk/impure-deps.nix          | 50 +++++++++++++++++++
 .../apple-source-releases/CF/default.nix      |  6 +++
 pkgs/top-level/all-packages.nix               |  3 +-
 6 files changed, 86 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/editors/emacs-24/macport-24.5.nix b/pkgs/applications/editors/emacs-24/macport-24.5.nix
index 2b6dca9039f0..879c0f551376 100644
--- a/pkgs/applications/editors/emacs-24/macport-24.5.nix
+++ b/pkgs/applications/editors/emacs-24/macport-24.5.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls
+{ stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls, Carbon, Foundation,
+libobjc, Cocoa, WebKit, Quartz, ImageCaptureCore, OSAKit
 }:
 
 stdenv.mkDerivation rec {
@@ -17,7 +18,16 @@ stdenv.mkDerivation rec {
     sha256 = "0d4r4mgqxcdba715lbr7rk4bxz7yjxi6wv63kyh6gaqbfgql41vf";
   };
 
-  buildInputs = [ ncurses pkgconfig texinfo libxml2 gnutls ];
+  NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations";
+  NIX_LDFLAGS = stdenv.lib.optional stdenv.isDarwin
+    "/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation";
+
+  enableParallelBuilding = true;
+
+  buildInputs = [
+    ncurses pkgconfig texinfo libxml2 gnutls Carbon Cocoa Foundation libobjc WebKit Quartz
+    ImageCaptureCore OSAKit
+  ];
 
   postUnpack = ''
     mv $emacsName $name
diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix
index fd578cf33d62..7bdff59c5ae8 100644
--- a/pkgs/os-specific/darwin/apple-sdk/default.nix
+++ b/pkgs/os-specific/darwin/apple-sdk/default.nix
@@ -144,7 +144,19 @@ in rec {
     };
   };
 
-  frameworks = stdenv.lib.mapAttrs framework (import ./frameworks.nix { inherit frameworks libs CF; });
+  overrides = super: {
+    QuartzCore = stdenv.lib.overrideDerivation super.QuartzCore (drv: {
+      installPhase = drv.installPhase + ''
+        f="$out/Library/Frameworks/QuartzCore.framework/Headers/CoreImage.h"
+        substituteInPlace "$f" \
+          --replace "QuartzCore/../Frameworks/CoreImage.framework/Headers" "CoreImage"
+      '';
+    });
+  };
+
+  bareFrameworks = stdenv.lib.mapAttrs framework (import ./frameworks.nix { inherit frameworks libs CF; });
+
+  frameworks = bareFrameworks // overrides bareFrameworks;
 
   inherit sdk;
 }
diff --git a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix
index f6bf51f94432..3889ba211a46 100644
--- a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix
+++ b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix
@@ -80,7 +80,7 @@ with frameworks; with libs; {
   PreferencePanes         = [];
   PubSub                  = [];
   Python                  = [ ApplicationServices ];
-  QTKit                   = [ QuickTime ];
+  QTKit                   = [ CoreMediaIO CoreMedia MediaToolbox QuickTime VideoToolbox ];
   QuickLook               = [ ApplicationServices CF ];
   QuickTime               = [ ApplicationServices AudioUnit Carbon CoreAudio CoreServices OpenGL QuartzCore ];
   Ruby                    = [];
@@ -103,7 +103,7 @@ with frameworks; with libs; {
   Tk                      = [ ApplicationServices Carbon X11 ];
   VideoDecodeAcceleration = [ CF CoreVideo ];
   VideoToolbox            = [ CF CoreMedia CoreVideo ];
-  WebKit                  = [ ApplicationServices Carbon JavaScriptCore OpenGL X11 ];
+  WebKit                  = [ ApplicationServices Carbon JavaScriptCore OpenGL ];
 
   # Umbrellas
   Accelerate          = [ CoreWLAN IOBluetooth ];
@@ -114,6 +114,6 @@ with frameworks; with libs; {
   IOBluetooth         = [ IOKit ];
   JavaVM              = [];
   OpenDirectory       = [];
-  Quartz              = [ QuickLook ];
+  Quartz              = [ QuickLook QTKit ];
   QuartzCore          = [ ApplicationServices CF CoreVideo OpenCL ];
 }
diff --git a/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix b/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix
index e2fdef60001f..13bc3fbb6909 100644
--- a/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix
+++ b/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix
@@ -7,6 +7,56 @@ rec {
   IOKit = [
     "/System/Library/Frameworks/IOKit.framework"
   ];
+  JavaScriptCore = [
+    "/System/Library/Frameworks/JavaScriptCore.framework"
+  ];
+  QuickLook = [
+    "/System/Library/Frameworks/QuickLook.framework"
+  ];
+  Quartz = [
+    "/System/Library/Frameworks/Quartz.framework"
+    "/System/Library/PrivateFrameworks/AppleSystemInfo.framework/Versions/A/AppleSystemInfo"
+    "/System/Library/PrivateFrameworks/CorePDF.framework/Versions/A/CorePDF"
+    "/usr/lib/libspindump.dylib"
+  ];
+  ImageCaptureCore = [
+    "/System/Library/Frameworks/ImageCaptureCore.framework"
+  ];
+  VideoToolbox = [
+    "/System/Library/Frameworks/VideoToolbox.framework"
+    "/System/Library/PrivateFrameworks/AppleVA.framework/Versions/A/AppleVA"
+  ];
+  QuickTime = [
+    "/System/Library/Frameworks/QuickTime.framework"
+  ];
+  CoreMedia = [
+    "/System/Library/Frameworks/CoreMedia.framework"
+  ];
+  CoreMediaIO = [
+    "/System/Library/Frameworks/CoreMediaIO.framework"
+    "/System/Library/PrivateFrameworks/AppSandbox.framework/Versions/A/AppSandbox"
+    "/System/Library/PrivateFrameworks/AppContainer.framework/Versions/A/AppContainer"
+    "/System/Library/PrivateFrameworks/SecCodeWrapper.framework/Versions/A/SecCodeWrapper"
+    "/System/Library/PrivateFrameworks/XPCService.framework/Versions/A/XPCService"
+    "/usr/lib/libsandbox.1.dylib"
+    "/usr/lib/libMatch.1.dylib"
+  ];
+  MediaToolbox = [
+    "/System/Library/Frameworks/MediaToolbox.framework"
+    "/System/Library/PrivateFrameworks/CoreAUC.framework/Versions/A/CoreAUC"
+    "/System/Library/PrivateFrameworks/NetworkStatistics.framework/Versions/A/NetworkStatistics"
+  ];
+  QTKit = [
+    "/System/Library/Frameworks/QTKit.framework"
+    "/System/Library/PrivateFrameworks/CoreMediaAuthoring.framework/Versions/A/CoreMediaAuthoring"
+  ];
+  OSAKit = [
+    "/System/Library/Frameworks/OSAKit.framework"
+    "/usr/lib/libexslt.0.dylib"
+  ];
+  WebKit = [
+    "/System/Library/Frameworks/WebKit.framework"
+  ];
   DiskArbitration = [
     "/System/Library/Frameworks/DiskArbitration.framework"
   ];
diff --git a/pkgs/os-specific/darwin/apple-source-releases/CF/default.nix b/pkgs/os-specific/darwin/apple-source-releases/CF/default.nix
index c7fcbb0aabbe..ba97aa4a1fc7 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/CF/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/CF/default.nix
@@ -51,6 +51,12 @@ appleDerivation {
     cp /System/Library/Frameworks/CoreFoundation.framework/Headers/{CFAttributedString,CFNotificationCenter}.h \
       "$out/System/Library/Frameworks/CoreFoundation.framework/Headers"
 
+    cat >> $out/System/Library/Frameworks/CoreFoundation.framework/Headers/CoreFoundation.h <<EOF
+    /* extra private system files [IMPURE] */
+    #include <CoreFoundation/CFAttributedString.h>
+    #include <CoreFoundation/CFNotificationCenter.h>
+    EOF
+
     mv $out/System/* $out
     rmdir $out/System
   '';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 654b02c4f493..baaa26619594 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11113,8 +11113,9 @@ let
   emacs24Macport_24_4 = lowPrio (callPackage ../applications/editors/emacs-24/macport-24.4.nix {
     stdenv = pkgs.clangStdenv;
   });
-  emacs24Macport_24_5 = lowPrio (callPackage ../applications/editors/emacs-24/macport-24.5.nix {
+  emacs24Macport_24_5 = lowPrio (newScope darwin.apple_sdk.frameworks ../applications/editors/emacs-24/macport-24.5.nix {
     stdenv = pkgs.clangStdenv;
+    inherit (darwin) libobjc;
   });
   emacs24Macport = self.emacs24Macport_24_5;
 

From dad6e8d5d758b1f054ddbdf85358fe4ab88a6ad3 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 30 Sep 2015 13:00:32 +0200
Subject: [PATCH 16/43] smtube: 15.8.0 -> 15.9.0

---
 pkgs/applications/video/smtube/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/video/smtube/default.nix b/pkgs/applications/video/smtube/default.nix
index 7482a92e82bb..3076192274be 100644
--- a/pkgs/applications/video/smtube/default.nix
+++ b/pkgs/applications/video/smtube/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, fetchurl, qt4 }:
+{ stdenv, fetchurl, qt5 }:
 
 stdenv.mkDerivation rec {
-  version = "15.8.0";
+  version = "15.9.0";
   name = "smtube-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/smtube/SMTube/${version}/${name}.tar.bz2";
-    sha256 = "0hxh3axlhd16ffnkynm4lcfpkwkfv19y70cqgpqrdj2gl8f917bp";
+    sha256 = "1mr7iz5c2sy0yikdwybchcvgm6scs75p4cwkcpnwy2hw9p28mk1f";
   };
 
   makeFlags = [
     "PREFIX=$(out)"
   ];
 
-  buildInputs = [ qt4 ];
+  buildInputs = [ qt5.script ];
 
   meta = with stdenv.lib; {
     description = "Play and download Youtube videos";

From fb0cb114711b27c82e6a8c94109ae6057919eb39 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Thu, 1 Oct 2015 09:41:45 +0200
Subject: [PATCH 17/43] =?UTF-8?q?sound-juicer:=203.15.92=20=E2=86=92=203.1?=
 =?UTF-8?q?6.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/applications/audio/sound-juicer/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix
index f7f5998846bc..c27dbad78cc6 100644
--- a/pkgs/applications/audio/sound-juicer/default.nix
+++ b/pkgs/applications/audio/sound-juicer/default.nix
@@ -3,8 +3,8 @@
 , makeWrapper }:
 
 let
-  major = "3.15";
-  minor = "92";
+  major = "3.16";
+  minor = "1";
   GST_PLUGIN_PATH = stdenv.lib.makeSearchPath "lib/gstreamer-1.0" [
     gst_all_1.gst-plugins-base
     gst_all_1.gst-plugins-good
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://download.gnome.org/sources/sound-juicer/${major}/${name}.tar.xz";
-    sha256 = "b1420f267a4c553f6ca242d3b6082b60682c3d7b431ac3c979bd1ccfbf2687dd";
+    sha256 = "0mx6n901vb97hsv0cwaafjffj75s1kcp8jsqay90dy3099849dyz";
   };
 
   buildInputs = [ pkgconfig gtk3 intltool itstool libxml2 brasero libcanberra_gtk3

From 673f3de193b5328e7c3906ebf22114956a264e96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 1 Oct 2015 11:20:24 +0200
Subject: [PATCH 18/43] lisps: some refactoring

---
 pkgs/development/compilers/ccl/default.nix       | 16 ++++++++--------
 pkgs/development/compilers/sbcl/bootstrap.nix    | 10 +++++-----
 pkgs/development/compilers/sbcl/default.nix      |  7 +------
 .../interpreters/picolisp/default.nix            |  7 +++----
 4 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix
index 30eb528cab71..de6a041871ea 100644
--- a/pkgs/development/compilers/ccl/default.nix
+++ b/pkgs/development/compilers/ccl/default.nix
@@ -1,11 +1,8 @@
 { 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"
-  || stdenv.system == "armv7l-linux" || stdenv.system == "armv6l-linux";
-
 let
   options = rec {
+    /* TODO: there are also MacOS, FreeBSD and Windows versions */
     x86_64-linux = {
       arch = "linuxx86";
       sha256 = "04p77n18cw0bc8i66mp2vfrhlliahrx66lm004a3nw3h0mdk0gd8";
@@ -28,6 +25,9 @@ let
   };
   cfg = options.${stdenv.system};
 in
+
+assert builtins.hasAttr stdenv.system options;
+
 stdenv.mkDerivation rec {
   name     = "ccl-${version}";
   version  = "1.10";
@@ -70,11 +70,11 @@ stdenv.mkDerivation rec {
     chmod a+x "$out"/bin/"${CCL_RUNTIME}"
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Clozure Common Lisp";
     homepage    = http://ccl.clozure.com/;
-    maintainers = with stdenv.lib.maintainers; [ raskin muflax ];
-    platforms   = stdenv.lib.platforms.linux;
-    license     = stdenv.lib.licenses.lgpl21;
+    maintainers = with maintainers; [ raskin muflax ];
+    platforms   = attrNames options;
+    license     = licenses.lgpl21;
   };
 }
diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix
index 8c1a6e27a769..0b5b48e088ee 100644
--- a/pkgs/development/compilers/sbcl/bootstrap.nix
+++ b/pkgs/development/compilers/sbcl/bootstrap.nix
@@ -46,15 +46,15 @@ stdenv.mkDerivation rec {
       --add-flags "--core $out/share/sbcl/sbcl.core"
   '';
 
-  postFixup = if stdenv.isArm then "" else ''
+  postFixup = stdenv.lib.optionalString (!stdenv.isArm) ''
     patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/share/sbcl/sbcl
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Lisp compiler";
     homepage = "http://www.sbcl.org";
-    license = "bsd";
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.unix;
+    license = licenses.publicDomain; # and FreeBSD
+    maintainers = [maintainers.raskin];
+    platforms = attrNames options;
   };
 }
diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index 534e54f03962..661279db1a90 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -72,12 +72,7 @@ stdenv.mkDerivation rec {
     INSTALL_ROOT=$out sh install.sh
   '';
 
-  meta = {
-    description = "Lisp compiler";
-    homepage = http://www.sbcl.org;
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.all;
+  meta = sbclBootstrap.meta // {
     inherit version;
     updateWalker = true;
   };
diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix
index 496a4ff66681..c43a3ce2429b 100644
--- a/pkgs/development/interpreters/picolisp/default.nix
+++ b/pkgs/development/interpreters/picolisp/default.nix
@@ -8,8 +8,8 @@ stdenv.mkDerivation rec {
     url = "http://www.software-lab.de/${name}.tgz";
     sha256 = "01kgyz0lkz36lxvibv07qd06gwdxvvbain9f9cnya7a12kq3009i";
   };
-  buildInputs = if stdenv.is64bit then [ jdk ] else [];
-  patchPhase = if stdenv.isArm then ''
+  buildInputs = optional stdenv.is64bit jdk;
+  patchPhase = optionalString stdenv.isArm ''
     sed -i s/-m32//g Makefile
     cat >>Makefile <<EOF
     ext.o: ext.c
@@ -17,8 +17,7 @@ stdenv.mkDerivation rec {
     ht.o: ht.c
     	\$(CC) \$(CFLAGS) -fPIC -D_OS='"\$(OS)"' \$*.c
     EOF
-  ''
-  else "";
+  '';
   sourceRoot = ''picoLisp/src${optionalString stdenv.is64bit "64"}'';
   installPhase = ''
     cd ..

From 25938294863a91a8b2120213a123c8fd8f111f1d Mon Sep 17 00:00:00 2001
From: "Antoine R. Dumont" <antoine.romain.dumont@gmail.com>
Date: Sat, 26 Sep 2015 01:34:18 +0200
Subject: [PATCH 19/43] python-packages: importmagic init at 0.1.3

---
 pkgs/top-level/python-packages.nix | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f472aec99c0b..7929877f7770 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18470,4 +18470,24 @@ let
     };
   };
 
+  importmagic = buildPythonPackage rec {
+    simpleName = "importmagic";
+    name = "${simpleName}-${version}";
+    version = "0.1.3";
+    doCheck = false;  # missing json file from tarball
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/i/${simpleName}/${name}.tar.gz";
+      sha256 = "194bl8l8sc2ibwi6g5kz6xydkbngdqpaj6r2gcsaw1fc73iswwrj";
+    };
+
+    propagatedBuildInputs = with self; [ six ];
+
+    meta = {
+      description = "Python Import Magic - automagically add, remove and manage imports";
+      homepage = http://github.com/alecthomas/importmagic;
+      license = "bsd";
+    };
+  };
+
 }; in pythonPackages

From 7fa6cc75298986af984945ff77dfb36e773f03b5 Mon Sep 17 00:00:00 2001
From: "Antoine R. Dumont" <antoine.romain.dumont@gmail.com>
Date: Sun, 27 Sep 2015 18:20:31 +0200
Subject: [PATCH 20/43] python-packages: elpy 1.0.1 -> 1.9.0

---
 pkgs/top-level/python-packages.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7929877f7770..596683a2e16b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5820,10 +5820,11 @@ let
 
 
   elpy = buildPythonPackage rec {
-    name = "elpy-1.0.1";
+    name = "elpy-${version}";
+    version = "1.9.0";
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/e/elpy/elpy-1.0.1.tar.gz";
-      md5 = "5453f085f7871ed8fc11d51f0b68c785";
+      url = "https://pypi.python.org/packages/source/e/elpy/${name}.tar.gz";
+      md5 = "651f6f46767b7132e5c0f83d5ac3b1f7";
     };
     propagatedBuildInputs = with self; [ flake8 ];
 

From 364667c390da7836ed5d4edcd56bc81eed8b2f6e Mon Sep 17 00:00:00 2001
From: "Antoine R. Dumont (@ardumont)" <antoine.romain.dumont@gmail.com>
Date: Thu, 1 Oct 2015 12:23:39 +0200
Subject: [PATCH 21/43] python-packages: elpy add runtime dependencies

---
 pkgs/top-level/python-packages.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 596683a2e16b..85f52b4ba8e8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5826,7 +5826,8 @@ let
       url = "https://pypi.python.org/packages/source/e/elpy/${name}.tar.gz";
       md5 = "651f6f46767b7132e5c0f83d5ac3b1f7";
     };
-    propagatedBuildInputs = with self; [ flake8 ];
+    python2Deps = if isPy3k then [ ] else [ self.rope ];
+    propagatedBuildInputs = with self; [ flake8 autopep8 jedi importmagic ] ++ python2Deps;
 
     doCheck = false; # there are no tests
 

From 8755a79cb8c379a91147c0145dac9f8b16531507 Mon Sep 17 00:00:00 2001
From: "Antoine R. Dumont" <antoine.romain.dumont@gmail.com>
Date: Fri, 25 Sep 2015 15:05:41 +0200
Subject: [PATCH 22/43] emacs-packages: yasnippet init at 0.8.1

---
 pkgs/top-level/emacs-packages.nix | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 2600fe1b82a6..9a1ba1a52d7f 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -1506,6 +1506,29 @@ let self = _self // overrides;
     meta = { license = gpl3Plus; };
   };
 
+  yasnippet = melpaBuild rec {
+    pname = "yasnippet";
+    version = "0.8.1";
+    src = fetchFromGitHub {
+      owner  = "capitaomorte";
+      repo   = pname;
+      rev    = "01139a2deb9eda272b9b771fbbe15d096061efa4";
+      sha256 = "1b0bxzkmw7yd1yf6326zf52aq63n283vy57pysj8cc34d9bk6nnk";
+    };
+    meta = {
+      description = "A template system for Emacs";
+      longDescription = ''
+        YASnippet is a template system for Emacs.
+        It allows you to type an abbreviation and automatically expand it into
+        function templates. Bundled language templates include: C, C++, C#,
+        Perl, Python, Ruby, SQL, LaTeX, HTML, CSS and more.
+        The snippet syntax is inspired from TextMate's syntax, you can even import
+        most TextMate templates to YASnippet.
+      '';
+      license = gpl2Plus;
+    };
+  };
+
   zenburn-theme = melpaBuild rec {
     pname   = "zenburn-theme";
     version = "2.2";

From c62397209195bce9eec9811b4a21fa8a6f4ea364 Mon Sep 17 00:00:00 2001
From: "Antoine R. Dumont" <antoine.romain.dumont@gmail.com>
Date: Fri, 25 Sep 2015 15:06:07 +0200
Subject: [PATCH 23/43] emacs-packages: find-file-in-project init at 3.5

---
 pkgs/top-level/emacs-packages.nix | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 9a1ba1a52d7f..eee886be3184 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -571,6 +571,26 @@ let self = _self // overrides;
     };
   };
 
+  find-file-in-project = melpaBuild rec {
+    pname = "find-file-in-project";
+    version = "3.5";
+    src = fetchFromGitHub {
+      owner  = "technomancy";
+      repo   = pname;
+      rev    = "53a8d8174f915d9dcf5ac6954b1c0cae61266177";
+      sha256 = "0wky8vqg08iw34prbz04bqmhfhj82y93swb8zkz6la2vf9da0gmd";
+    };
+    meta = {
+      description = "Quick access to project files in Emacs";
+      longDescription = ''
+        Find files in a project quickly.
+        This program provides a couple methods for quickly finding any file in a
+        given project. It depends on GNU find.
+      '';
+      license = gpl3Plus;
+    };
+  };
+
   flim = melpaBuild rec {
     pname = "flim";
     version = "1.14.9"; # 20141216

From b429a536de0749fefc914cc0c1bb1e003b62bb2b Mon Sep 17 00:00:00 2001
From: "Antoine R. Dumont" <antoine.romain.dumont@gmail.com>
Date: Fri, 25 Sep 2015 15:06:25 +0200
Subject: [PATCH 24/43] emacs-packages: highlight-indentation init at 0.7.0

---
 pkgs/top-level/emacs-packages.nix | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index eee886be3184..e16cafade0e1 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -852,6 +852,30 @@ let self = _self // overrides;
     meta = { license = gpl3Plus; };
   };
 
+  highlight-indentation = melpaBuild rec {
+    pname = "highlight-indentation";
+    version = "0.7.0";
+    src = fetchFromGitHub {
+      owner = "antonj";
+      repo = "Highlight-Indentation-for-Emacs";
+      rev = "v${version}";
+      sha256 = "00l54k75qk24a0znzl4ij3s3nrnr2wy9ha3za8apphzlm98m907k";
+    };
+    meta = {
+      description = "Minor modes to highlight indentation guides in emacs";
+      longDescription = ''
+        Provides two minor modes highlight-indentation-mode and
+        highlight-indentation-current-column-mode
+
+        - highlight-indentation-mode displays guidelines indentation
+        (space indentation only).
+        - highlight-indentation-current-column-mode displays guidelines for the
+        current-point indentation (space indentation only).
+      '';
+      license = gpl2Plus;
+    };
+  };
+
   ibuffer-vc = melpaBuild rec {
     pname   = "ibuffer-vc";
     version = "0.10";

From d69c493eed8013446fcc3b1d3f8f959a83372969 Mon Sep 17 00:00:00 2001
From: "Antoine R. Dumont" <antoine.romain.dumont@gmail.com>
Date: Fri, 25 Sep 2015 15:06:45 +0200
Subject: [PATCH 25/43] emacs-packages: pyvenv init at 1.7

---
 pkgs/top-level/emacs-packages.nix | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index e16cafade0e1..393ce3436447 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -1233,6 +1233,25 @@ let self = _self // overrides;
     meta = { license = gpl3Plus; };
   };
 
+  pyvenv = melpaBuild rec {
+    pname = "pyvenv";
+    version = "1.7";
+    src = fetchFromGitHub {
+      owner  = "jorgenschaefer";
+      repo   = pname;
+      rev    = "e4f2fa7a32cf480f34d628d8eb5b9b60374d0e8e";
+      sha256 = "1669id1p69kpq8zzldxj1p6iyz68701snn462g22k2acfzc2bfha";
+    };
+    meta = {
+      description = "Python virtual environment interface for Emacs";
+      longDescription = ''
+        This is a simple global minor mode which will replicate the changes done
+        by virtualenv activation inside Emacs.
+      '';
+      license = gpl2Plus;
+    };
+  };
+
   rainbow-delimiters = melpaBuild rec {
     pname = "rainbow-delimiters";
     version = "2.1.1";

From 3e917394378969edc0c2d4e45f1f04761d8dce6e Mon Sep 17 00:00:00 2001
From: "Antoine R. Dumont" <antoine.romain.dumont@gmail.com>
Date: Fri, 25 Sep 2015 15:06:58 +0200
Subject: [PATCH 26/43] emacs-packages: elpy init at 1.9.0

---
 pkgs/top-level/emacs-packages.nix | 36 +++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 393ce3436447..360096aa1ffb 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -440,6 +440,42 @@ let self = _self // overrides;
     };
   };
 
+  elpy = melpaBuild rec {
+    pname   = "elpy";
+    version = "1.9.0";
+    src = fetchFromGitHub {
+      owner  = "jorgenschaefer";
+      repo   = pname;
+      rev    = "39ea47c73f040ce8dcc1c2d2639ebc0eb57ab8c8";
+      sha256 = "0q3av1qv4m6aj4bil608f688hjpr5px8zqnnrdqx784nz98rpjrs";
+    };
+
+    patchPhase = ''
+      for file in elpy.el elpy-pkg.el; do
+        substituteInPlace $file \
+            --replace "company \"0.8.2\"" "company \"${company.version}\"" \
+            --replace "find-file-in-project \"3.3\"" "find-file-in-project \"${find-file-in-project.version}\"" \
+            --replace "highlight-indentation \"0.5.0\"" "highlight-indentation \"${highlight-indentation.version}\"" \
+            --replace "pyvenv \"1.3\"" "pyvenv \"${pyvenv.version}\"" \
+            --replace "yasnippet \"0.8.0\"" "yasnippet \"${yasnippet.version}\""
+     done
+    '';
+
+    packageRequires = [
+      company find-file-in-project highlight-indentation pyvenv yasnippet
+    ];
+
+    meta = {
+      description = "Emacs Python Development Environment";
+      longDescription = ''
+        Elpy is an Emacs package to bring powerful Python editing to Emacs.
+        It combines a number of other packages, both written in Emacs Lisp as
+        well as Python.
+      '';
+      license = gpl3Plus;
+    };
+  };
+
   engine-mode = melpaBuild rec {
     pname = "engine-mode";
     version = "1.0.0";

From e9b3a4f7c49a606bdf09712c8d65f69cff91fe2e Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Thu, 1 Oct 2015 12:53:27 +0200
Subject: [PATCH 27/43] rl-1509.xml: Gnome -> GNOME

---
 nixos/doc/manual/release-notes/rl-1509.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-1509.xml b/nixos/doc/manual/release-notes/rl-1509.xml
index 5efd7e594a45..a68baa0d8078 100644
--- a/nixos/doc/manual/release-notes/rl-1509.xml
+++ b/nixos/doc/manual/release-notes/rl-1509.xml
@@ -57,7 +57,7 @@ system.autoUpgrade.enable = true;
   </listitem>
 
   <listitem>
-    <para>Gnome has been upgraded to 3.16.
+    <para>GNOME has been upgraded to 3.16.
     </para>
   </listitem>
 

From 57155e04a79810364e4810ff9e143f2a36a0b321 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Thu, 1 Oct 2015 20:44:37 +0900
Subject: [PATCH 28/43] firefox-bin: 41.0 -> 41.0.1, thunderbird-bin: 38.2.0 ->
 38.3.0

---
 .../browsers/firefox-bin/sources.nix          | 358 +++++++++---------
 .../mailreaders/thunderbird-bin/sources.nix   | 234 ++++++------
 2 files changed, 296 insertions(+), 296 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
index 3dcf855d0625..f617cf5636b8 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
@@ -4,185 +4,185 @@
 # ruby generate_source.rb > source.nix
 
 {
-  version = "41.0";
+  version = "41.0.1";
   sources = [
-    { locale = "ach"; arch = "linux-i686"; sha1 = "f5170ec868dd1aee22e42ce5df62714cd5bd0272"; }
-    { locale = "ach"; arch = "linux-x86_64"; sha1 = "45cc71012e2c9423f53a9ba501087dc8d47e6b8a"; }
-    { locale = "af"; arch = "linux-i686"; sha1 = "d9677f0ad122cc64a99638397d52177d6df20128"; }
-    { locale = "af"; arch = "linux-x86_64"; sha1 = "7516c969fe2d572d1f9ef9d4de523e3d6caa88e1"; }
-    { locale = "an"; arch = "linux-i686"; sha1 = "d4ad4e5f5f7469b0fea1650b4104bf888cb5c15b"; }
-    { locale = "an"; arch = "linux-x86_64"; sha1 = "70bbff8841cc16f77c5095bd5b1069cb00c5f1cc"; }
-    { locale = "ar"; arch = "linux-i686"; sha1 = "efa4ed982bf62ffdfc665bb87d658936d8db5776"; }
-    { locale = "ar"; arch = "linux-x86_64"; sha1 = "0f9f7ade25f478081ba4c727aecd9984aee4df70"; }
-    { locale = "as"; arch = "linux-i686"; sha1 = "eb2367bf83ac5dbd2ee8878321b52db10d3639ad"; }
-    { locale = "as"; arch = "linux-x86_64"; sha1 = "e08846464bc3ff55d6964d19d737d0039322100f"; }
-    { locale = "ast"; arch = "linux-i686"; sha1 = "86304c1e29b9c5231767bd401273ec68046c76b2"; }
-    { locale = "ast"; arch = "linux-x86_64"; sha1 = "920f441939469910ddc938036cde2ab509cb2343"; }
-    { locale = "az"; arch = "linux-i686"; sha1 = "1f8520b21a3addb7f75068cc10a7b8e33b8ca518"; }
-    { locale = "az"; arch = "linux-x86_64"; sha1 = "177e632d49f6c1d97e5f1597e23ce11dca07e0e5"; }
-    { locale = "be"; arch = "linux-i686"; sha1 = "142285626aa67c743c5713b6a65e153fe0a641e0"; }
-    { locale = "be"; arch = "linux-x86_64"; sha1 = "7d49ab01ed0c42bca581bf86b3e8e1ad5bbf7bf1"; }
-    { locale = "bg"; arch = "linux-i686"; sha1 = "ab1b18aa69960298dfabd161f45d0a27795f0a1a"; }
-    { locale = "bg"; arch = "linux-x86_64"; sha1 = "0993c19e4345d993bb94c2dd2b5e4a80c95c4a43"; }
-    { locale = "bn-BD"; arch = "linux-i686"; sha1 = "a23f101ec5f80a88720615daa367cf0c019da41c"; }
-    { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "5a192b64a22e21cc4e35342c06f90529e0677703"; }
-    { locale = "bn-IN"; arch = "linux-i686"; sha1 = "0c316e902d44dea1a0c6bdb021ac189207aa791a"; }
-    { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "fc72cd6c2fa14120b78f19e75271a3ab61795889"; }
-    { locale = "br"; arch = "linux-i686"; sha1 = "5c159e461a8bf96f2189a843786451c62e842a2b"; }
-    { locale = "br"; arch = "linux-x86_64"; sha1 = "236b0c31e5f0ebd147bab0b0b03be356316242db"; }
-    { locale = "bs"; arch = "linux-i686"; sha1 = "515501f46ba1b02b076204a88954a31b2b2e7914"; }
-    { locale = "bs"; arch = "linux-x86_64"; sha1 = "5c7a4a0a260b5b16dc972cc2e4acaf001b3cdd41"; }
-    { locale = "ca"; arch = "linux-i686"; sha1 = "aa7ea9c8ec0c71445d89bf43031ac87951ea192f"; }
-    { locale = "ca"; arch = "linux-x86_64"; sha1 = "b6d9e57dc189c5178bbb585091d133fc8c04e718"; }
-    { locale = "cs"; arch = "linux-i686"; sha1 = "20fe53563a9c8c21a1e1c4095ac42ed0254bfbdd"; }
-    { locale = "cs"; arch = "linux-x86_64"; sha1 = "eb763eefb704c57ac367b4d242695c28eed640b4"; }
-    { locale = "cy"; arch = "linux-i686"; sha1 = "41c8826a12e642d0a4d073628a02ce3ef1ebd5fe"; }
-    { locale = "cy"; arch = "linux-x86_64"; sha1 = "057359932d6526eaa463907513814e2767a21f7d"; }
-    { locale = "da"; arch = "linux-i686"; sha1 = "b347c71204d4257b0a4ac710644fa0dab1aa8325"; }
-    { locale = "da"; arch = "linux-x86_64"; sha1 = "c0e54aa74ae60b241435a80450f75a8246a472cd"; }
-    { locale = "de"; arch = "linux-i686"; sha1 = "1eb209d6512043b1a51c805fef9056d377fd23bb"; }
-    { locale = "de"; arch = "linux-x86_64"; sha1 = "de9ba01f5f29a704ee4e9ddd05d0072d340c40f3"; }
-    { locale = "dsb"; arch = "linux-i686"; sha1 = "17c154b2f579ee94efc222dc0ba790e8bd93f324"; }
-    { locale = "dsb"; arch = "linux-x86_64"; sha1 = "d6f14ca2d875559e8459967b103fde124ab2827b"; }
-    { locale = "el"; arch = "linux-i686"; sha1 = "6cece97d1faca809bb44cccf1b46c83ec9391ef7"; }
-    { locale = "el"; arch = "linux-x86_64"; sha1 = "a47eecbd48135bb114fcd7160d7368074501a260"; }
-    { locale = "en-GB"; arch = "linux-i686"; sha1 = "e7a85809117d0092cc6532c781bfab915b3f16f6"; }
-    { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "62823bc5fed9ed5b86566e2f4ddfb9764d3c3b83"; }
-    { locale = "en-US"; arch = "linux-i686"; sha1 = "5d5fa02110c31f1b1cca53f23f00119bf404a06d"; }
-    { locale = "en-US"; arch = "linux-x86_64"; sha1 = "41909356a1f661a64cef3c3ae696b356084be5a7"; }
-    { locale = "en-ZA"; arch = "linux-i686"; sha1 = "077a01cd8a9205c025693eb0cb3055e997a1b40e"; }
-    { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "51c13e2eddbabd12d7d35bb7465003768991806e"; }
-    { locale = "eo"; arch = "linux-i686"; sha1 = "a3851ca2e53b4fb2be4b2bb05e5551037d11184d"; }
-    { locale = "eo"; arch = "linux-x86_64"; sha1 = "103d1300b9fa071ae3c793874846c3cdff2c90c4"; }
-    { locale = "es-AR"; arch = "linux-i686"; sha1 = "275d3c72a0b8e6905c97bc58ad7e51811e6e37d7"; }
-    { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "027749dee7e3541b0c29e4c8d1b27e7caa21044e"; }
-    { locale = "es-CL"; arch = "linux-i686"; sha1 = "a1c918e6e4460b49e8efdb4e5999ef1e28db9a5c"; }
-    { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "6ebbb610c3614e308b5ee47a9b034292674b76ca"; }
-    { locale = "es-ES"; arch = "linux-i686"; sha1 = "21d50757c31db0a1a608aff651971670b8f10ab2"; }
-    { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "f3549981b618fe6de379c1806ae8e5b4c088788e"; }
-    { locale = "es-MX"; arch = "linux-i686"; sha1 = "8918a3ae0b1327a100bea927aaad7a6c0fdf35ed"; }
-    { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "e40461a28eb7c1dfa0c9e3bbfd76fbf9f532ca9f"; }
-    { locale = "et"; arch = "linux-i686"; sha1 = "779f1a8399d47a9515e79028e3a0f12a9e9e791a"; }
-    { locale = "et"; arch = "linux-x86_64"; sha1 = "5c1c8be5bc86d386a938d6ad1080d0fd8a763c0d"; }
-    { locale = "eu"; arch = "linux-i686"; sha1 = "5b8c59f4cf19d66bca5c34d51727717e0626ffd6"; }
-    { locale = "eu"; arch = "linux-x86_64"; sha1 = "0e2ba0116a0976059b224321747eb34b91d229dd"; }
-    { locale = "fa"; arch = "linux-i686"; sha1 = "3f1a0cab5c292d5319b852d4a974b17489b5516d"; }
-    { locale = "fa"; arch = "linux-x86_64"; sha1 = "199a7f70e3fa43e910da21b5680368a8b0805fe5"; }
-    { locale = "ff"; arch = "linux-i686"; sha1 = "7f54aa948b7b030e40019612ad5420d913d636d7"; }
-    { locale = "ff"; arch = "linux-x86_64"; sha1 = "38aaae5894f1c9a9aec27a8be3d93239d754178e"; }
-    { locale = "fi"; arch = "linux-i686"; sha1 = "338d3556673f77ee63f21cfaf5f58eaee4442181"; }
-    { locale = "fi"; arch = "linux-x86_64"; sha1 = "f8bd7b421699d499aed052396b2bbaf98c050728"; }
-    { locale = "fr"; arch = "linux-i686"; sha1 = "e2c58911aa0ff3b5bd98e83c758947c97d955503"; }
-    { locale = "fr"; arch = "linux-x86_64"; sha1 = "9b50488ae97c01f2848e827cd842e17abd8b5d21"; }
-    { locale = "fy-NL"; arch = "linux-i686"; sha1 = "cceb0a3752bd584cd02b3f84f8c07bc27ec38eef"; }
-    { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "c6c0d21b8230fdd2b35b8da591b027a594ef60d0"; }
-    { locale = "ga-IE"; arch = "linux-i686"; sha1 = "c662e5b2b59ce620754a845111bc58eab8e8a0ef"; }
-    { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "17e5c0a48e998c9e6f703033b386533ebd8354c0"; }
-    { locale = "gd"; arch = "linux-i686"; sha1 = "9a4569025d500290a4e1db03bca59d5731ba1e85"; }
-    { locale = "gd"; arch = "linux-x86_64"; sha1 = "3ca3494e510159ef1bb8e5c323a1b7c5b8faf235"; }
-    { locale = "gl"; arch = "linux-i686"; sha1 = "0b331461d902100249ef67d9038023ed8001d513"; }
-    { locale = "gl"; arch = "linux-x86_64"; sha1 = "1b11c8dfe0bdd4de77e03148fb1fe3ecbfb20677"; }
-    { locale = "gu-IN"; arch = "linux-i686"; sha1 = "03c09178f69f4040fe3817ba6d2fd40e98392aef"; }
-    { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "b0e6de684fcb7a47f7616f3071d09d89afbbcb80"; }
-    { locale = "he"; arch = "linux-i686"; sha1 = "e3d8f15caf7fa19df43e676a5cf93ca5e09ee27b"; }
-    { locale = "he"; arch = "linux-x86_64"; sha1 = "18441b8f340c0afe14f3869cc37ed041b911fb26"; }
-    { locale = "hi-IN"; arch = "linux-i686"; sha1 = "fb3627d0f89553741a8fbc3b7671309928832076"; }
-    { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "3da130031d183f003aa7c0fa3509f8982a4e70e1"; }
-    { locale = "hr"; arch = "linux-i686"; sha1 = "e6e4909d66672c665cf86db494351354720d5682"; }
-    { locale = "hr"; arch = "linux-x86_64"; sha1 = "027575c413be191f23b22f87a3db0ecdcb48b13c"; }
-    { locale = "hsb"; arch = "linux-i686"; sha1 = "24f5f3027708320a01d884ba7a91feac98c11f98"; }
-    { locale = "hsb"; arch = "linux-x86_64"; sha1 = "ede78b5b3ac15fec01de936dc722f25239dac5fb"; }
-    { locale = "hu"; arch = "linux-i686"; sha1 = "816f5e910aea73d6e36470d3169f900cda2004e2"; }
-    { locale = "hu"; arch = "linux-x86_64"; sha1 = "f5248943de5e8af2ed3e15fb85aa4429a7b97787"; }
-    { locale = "hy-AM"; arch = "linux-i686"; sha1 = "ae4e11326f3ad491ec2f823267be4c54a55f93cc"; }
-    { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "0ad1dce94bdc81f534399b00a09c004bac3c69c9"; }
-    { locale = "id"; arch = "linux-i686"; sha1 = "6568d4e201def196d457eaf13b6e4486ff70d336"; }
-    { locale = "id"; arch = "linux-x86_64"; sha1 = "45b74a17607f5d93d0062bb09c372afec0eedce6"; }
-    { locale = "is"; arch = "linux-i686"; sha1 = "d550eefe14d84cf91b3265675298f6c58cfbfe5c"; }
-    { locale = "is"; arch = "linux-x86_64"; sha1 = "0ddf532263b7f987867e640b278a9f2554e792cb"; }
-    { locale = "it"; arch = "linux-i686"; sha1 = "6cb353c7fbd9fc67571c5ba00b92d4760e33efaa"; }
-    { locale = "it"; arch = "linux-x86_64"; sha1 = "353d8e6e83f709d5ba5d26b1a42bc3cfca9997bf"; }
-    { locale = "ja"; arch = "linux-i686"; sha1 = "e03b1ad563f75cfdec52b392a888c60d2f1438f0"; }
-    { locale = "ja"; arch = "linux-x86_64"; sha1 = "5fad4f77e055e827ae948e9119d6c30e40ecd831"; }
-    { locale = "kk"; arch = "linux-i686"; sha1 = "68b9b9d57b6a28000abfcb6363273888f6f4814a"; }
-    { locale = "kk"; arch = "linux-x86_64"; sha1 = "09f3e62b0e084c26beabdb175232c3a46b8deba9"; }
-    { locale = "km"; arch = "linux-i686"; sha1 = "7bb71271eae1fecc328abd3a22f97eb8218f2ef4"; }
-    { locale = "km"; arch = "linux-x86_64"; sha1 = "c328d9f0ae6805aa5d1d4747c375a1f049e77252"; }
-    { locale = "kn"; arch = "linux-i686"; sha1 = "51d910f52c22180e2a92be77c846303ed037a437"; }
-    { locale = "kn"; arch = "linux-x86_64"; sha1 = "71411c26ed9c3a899c0e059301050acbcb96a751"; }
-    { locale = "ko"; arch = "linux-i686"; sha1 = "74f5c7e44dfd537857b29297f27037a6a741cbdd"; }
-    { locale = "ko"; arch = "linux-x86_64"; sha1 = "dcecd4c55763ec7441c37e048439dc1cb6ea480f"; }
-    { locale = "lij"; arch = "linux-i686"; sha1 = "df8d745849099c514ad7b6c40b89e2a6f1333a54"; }
-    { locale = "lij"; arch = "linux-x86_64"; sha1 = "d449eab057742d8798f2d255b4c3134f820e4379"; }
-    { locale = "lt"; arch = "linux-i686"; sha1 = "9186dab13998c5d01e508fca536f36c1a4fc7dfb"; }
-    { locale = "lt"; arch = "linux-x86_64"; sha1 = "11e28641755c2ee9648d46181f2861ef67937f53"; }
-    { locale = "lv"; arch = "linux-i686"; sha1 = "552bd1ef40500c9a5e68b122c8b3525077ce5f6e"; }
-    { locale = "lv"; arch = "linux-x86_64"; sha1 = "6a6403dd89318608b1436b7d42700054f9a6945a"; }
-    { locale = "mai"; arch = "linux-i686"; sha1 = "ec3d4b155e58cfec6496fbd824a15dba9377e6ae"; }
-    { locale = "mai"; arch = "linux-x86_64"; sha1 = "15c2e13971e05b8023826e96ad9d326dd254bbdc"; }
-    { locale = "mk"; arch = "linux-i686"; sha1 = "7fb2263b3376b8f05ccf12672994919b6a0bdeee"; }
-    { locale = "mk"; arch = "linux-x86_64"; sha1 = "67b91736a82ab8ce2c523ea084e9be2587d6ee9a"; }
-    { locale = "ml"; arch = "linux-i686"; sha1 = "9558d57c27f08cf87e35d827bffdc1161505bdf8"; }
-    { locale = "ml"; arch = "linux-x86_64"; sha1 = "07dd0613207de1b32d7ea7d057154a25f162c240"; }
-    { locale = "mr"; arch = "linux-i686"; sha1 = "1f1138e747e86fd2408ae827f7785af9a46e49ec"; }
-    { locale = "mr"; arch = "linux-x86_64"; sha1 = "6b9d24d1f1956fbe375d4850d977c8794b2094ce"; }
-    { locale = "ms"; arch = "linux-i686"; sha1 = "d8c35c7542ad0c30ac06ba8c6670396eb4cba115"; }
-    { locale = "ms"; arch = "linux-x86_64"; sha1 = "b885a83d29c8b7670bba999df6bcb67f6c9a13de"; }
-    { locale = "nb-NO"; arch = "linux-i686"; sha1 = "3fbd8181255cca312da88cadd088b6fe5edabaad"; }
-    { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "969f2d6715824ca22cb19a5c7c338d9b4e9cbc87"; }
-    { locale = "nl"; arch = "linux-i686"; sha1 = "e8f99b167cc4d9101168c5d054e439fa00b53d66"; }
-    { locale = "nl"; arch = "linux-x86_64"; sha1 = "121c2c1839fb65c242e719c05c2794fb80d3df29"; }
-    { locale = "nn-NO"; arch = "linux-i686"; sha1 = "b77b21a3d8fc78df630f9b412aad94e6bbf6045d"; }
-    { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "bece8813404652dc07b4223d93cf925085a8c2d7"; }
-    { locale = "or"; arch = "linux-i686"; sha1 = "5c79f1aa2a5a4b9d173f8705000cb950764d308e"; }
-    { locale = "or"; arch = "linux-x86_64"; sha1 = "edb4f388e48f6a5e63e285f4fca64fd7053ea291"; }
-    { locale = "pa-IN"; arch = "linux-i686"; sha1 = "618063149909ead3828d509b3f4bdebe98f562c5"; }
-    { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "a50d2f536cbf118ab1480d716f7729627c57e05c"; }
-    { locale = "pl"; arch = "linux-i686"; sha1 = "e94e2d515b8aed6c24a5239f852b971eb7001202"; }
-    { locale = "pl"; arch = "linux-x86_64"; sha1 = "58e2208b25a70586ae6aff1b58e9c25948622be0"; }
-    { locale = "pt-BR"; arch = "linux-i686"; sha1 = "732f7e366000509958fdd8065f67138ea38a55a6"; }
-    { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "2a6e341c14b8bc060e93e9fdbe20f6c7f14ffaeb"; }
-    { locale = "pt-PT"; arch = "linux-i686"; sha1 = "5f54ba5748c637d3a94558bc10e6fab3db1518ec"; }
-    { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "72e93c7a33b799c7067163cb7834ab2f93f851f5"; }
-    { locale = "rm"; arch = "linux-i686"; sha1 = "8c47019cc0cb465431d207e1f8e499d00a7fe8d0"; }
-    { locale = "rm"; arch = "linux-x86_64"; sha1 = "29bea7462e7b3295e1964ff472a295906e297925"; }
-    { locale = "ro"; arch = "linux-i686"; sha1 = "2822d04eef821bbd35448b69f27f8e933def6f4e"; }
-    { locale = "ro"; arch = "linux-x86_64"; sha1 = "9a31c8ce51c31d118de81ef9c7afbd2a0536a9e4"; }
-    { locale = "ru"; arch = "linux-i686"; sha1 = "04a8a632f3cb50445091baa52aced77cfb00f4e2"; }
-    { locale = "ru"; arch = "linux-x86_64"; sha1 = "1de49f0817c3a7c6cf4f58f72c10203a8b5a59ba"; }
-    { locale = "si"; arch = "linux-i686"; sha1 = "f7983c4ce6a6d8b30ae0f55228cc9e3a25ae3971"; }
-    { locale = "si"; arch = "linux-x86_64"; sha1 = "f5cd2cc05d03d34d6284468c08ba76f7ac95b6ef"; }
-    { locale = "sk"; arch = "linux-i686"; sha1 = "dbe36a51050b2efb613318d81da0df2e32a7361c"; }
-    { locale = "sk"; arch = "linux-x86_64"; sha1 = "77dcba31255d019e19c01dc1131b4a2364817e6b"; }
-    { locale = "sl"; arch = "linux-i686"; sha1 = "42976aa670cf12730ac548603f6a84fde0dd4152"; }
-    { locale = "sl"; arch = "linux-x86_64"; sha1 = "7f3d486be4782a5a9a85fbbcccb30cd7f020b0a6"; }
-    { locale = "son"; arch = "linux-i686"; sha1 = "5becaf85ea5b992798e1bf2561f3771d23676d9d"; }
-    { locale = "son"; arch = "linux-x86_64"; sha1 = "56f32e6524b0d16ba7e3aeb1fde7d9d56fae67e6"; }
-    { locale = "sq"; arch = "linux-i686"; sha1 = "654860607a653d13895c188d6d7acba8a3cd3342"; }
-    { locale = "sq"; arch = "linux-x86_64"; sha1 = "859f9e3fda8e9952dd33e67f619124af6a8f3147"; }
-    { locale = "sr"; arch = "linux-i686"; sha1 = "e5b06f11813d3e7e1bce62a20c85a3e860828e0a"; }
-    { locale = "sr"; arch = "linux-x86_64"; sha1 = "fa2167558158241844e2061cb28c7890bef939ac"; }
-    { locale = "sv-SE"; arch = "linux-i686"; sha1 = "71c099a731af87a46dfb153b7ba3ea9a5d188fb4"; }
-    { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "f1a151abc610c75ce54fddfc0649e1e361469d01"; }
-    { locale = "ta"; arch = "linux-i686"; sha1 = "feff271a83d4ed97c754c7502033d5d5d7af8082"; }
-    { locale = "ta"; arch = "linux-x86_64"; sha1 = "1976cdbf1153579bc97e00595ce60f93732ee85c"; }
-    { locale = "te"; arch = "linux-i686"; sha1 = "063c1c55aad4f055cba90292dd231ef037b6add1"; }
-    { locale = "te"; arch = "linux-x86_64"; sha1 = "d04d784383d0bf4a6cf10750c1e2d2dce280e8ad"; }
-    { locale = "th"; arch = "linux-i686"; sha1 = "4b453bd313d45386d5d99b935e24289bd4c51f25"; }
-    { locale = "th"; arch = "linux-x86_64"; sha1 = "784c38a90182d136407a056892349607b414bdd3"; }
-    { locale = "tr"; arch = "linux-i686"; sha1 = "bcbc685a2122c23460d8d2ac4e807fdccd75b8e9"; }
-    { locale = "tr"; arch = "linux-x86_64"; sha1 = "167ffbf3547713c6f236f9c661de8b239699070d"; }
-    { locale = "uk"; arch = "linux-i686"; sha1 = "ebd2e78cd94454a58757ff093b3ee84faf08e7b8"; }
-    { locale = "uk"; arch = "linux-x86_64"; sha1 = "6b8f59fefb8d37750a311614f8403f5be989917f"; }
-    { locale = "uz"; arch = "linux-i686"; sha1 = "5a799fd0f5cdcab2580f14dc107a43160e065092"; }
-    { locale = "uz"; arch = "linux-x86_64"; sha1 = "c28fe123246a378035ee6ceee3e2d33d0412e874"; }
-    { locale = "vi"; arch = "linux-i686"; sha1 = "2cdc27ce098519017e006e2cdfb4b4d883264050"; }
-    { locale = "vi"; arch = "linux-x86_64"; sha1 = "b5891e4e1284ea3e1a2ee7dc60a60ad5460b65e5"; }
-    { locale = "xh"; arch = "linux-i686"; sha1 = "ce010fe5110e0dd6b3763d23c460d74ec7bfcaad"; }
-    { locale = "xh"; arch = "linux-x86_64"; sha1 = "231a10effa87e4a5d8848a175a4016e104c1cbaf"; }
-    { locale = "zh-CN"; arch = "linux-i686"; sha1 = "d40f8e841323cd2cb99392514e6e5daae7ab9246"; }
-    { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "5bf94401578d12e01a0f4a4911472efbae95f5c9"; }
-    { locale = "zh-TW"; arch = "linux-i686"; sha1 = "1e96feab226294cb6170bd4c707d97c6298db91e"; }
-    { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "c7a7698cec959f3592c9cf2e7f3f425016281c04"; }
+    { locale = "ach"; arch = "linux-i686"; sha1 = "cfb24e0fd6e10febf2381101d4a8f3de1516a732"; }
+    { locale = "ach"; arch = "linux-x86_64"; sha1 = "642d44d0fe13be4eaf4d1b495dfc7b285f7c2de7"; }
+    { locale = "af"; arch = "linux-i686"; sha1 = "b4e5ce516dbc5d4157bd1c85b23b5cc233bbf8d5"; }
+    { locale = "af"; arch = "linux-x86_64"; sha1 = "40f9b3a3ac3089f6bbf9c42a3259a484b49a659a"; }
+    { locale = "an"; arch = "linux-i686"; sha1 = "0bfa3cd6867316ca10ebe57ab2cebd03a59b096c"; }
+    { locale = "an"; arch = "linux-x86_64"; sha1 = "69369093f488223decdb77f2d12676be4aeb4d95"; }
+    { locale = "ar"; arch = "linux-i686"; sha1 = "3a091005a265c6b06a77416223caa45a51d36056"; }
+    { locale = "ar"; arch = "linux-x86_64"; sha1 = "0f9c79ae4aa4498bc9f8a3e372b26b0b000a0db9"; }
+    { locale = "as"; arch = "linux-i686"; sha1 = "cf996943809573aca05dc88ed4d843afda11710f"; }
+    { locale = "as"; arch = "linux-x86_64"; sha1 = "609860ebd75ea9731912b4fcbb343fa027ebbb77"; }
+    { locale = "ast"; arch = "linux-i686"; sha1 = "5adbd6c9194f8f214c94b587a41c5399116316d4"; }
+    { locale = "ast"; arch = "linux-x86_64"; sha1 = "feaeae77f9578a452cb98893701f14047d65a5d3"; }
+    { locale = "az"; arch = "linux-i686"; sha1 = "8718585cb6fb8b7823a572ddc21f910877287133"; }
+    { locale = "az"; arch = "linux-x86_64"; sha1 = "0834d8d8a29f805b435c2d6a29403c9180471837"; }
+    { locale = "be"; arch = "linux-i686"; sha1 = "abb5002f7275cb5b65942a735864783bf32c4d9e"; }
+    { locale = "be"; arch = "linux-x86_64"; sha1 = "bc0ef337ec080b46db30728a425695d78a908d46"; }
+    { locale = "bg"; arch = "linux-i686"; sha1 = "7bcee63546e75aa94ccd9fd65db18ebf8360e5ba"; }
+    { locale = "bg"; arch = "linux-x86_64"; sha1 = "8c9c23313710f7467bc34d2ea462dd8e9df6fcde"; }
+    { locale = "bn-BD"; arch = "linux-i686"; sha1 = "fa80f7049f926205878e1f9e99d2abba876ea9d9"; }
+    { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "add645cc1b73affbc35c265ec2f82a9d97abddf6"; }
+    { locale = "bn-IN"; arch = "linux-i686"; sha1 = "a391b6305ecf256a5be3e7b29427ff1979b90a9e"; }
+    { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "77d637809f26bf3214fc93d39547863d56b9949d"; }
+    { locale = "br"; arch = "linux-i686"; sha1 = "a7e0fc1a0b340232585c2b4630834e67b2ee565a"; }
+    { locale = "br"; arch = "linux-x86_64"; sha1 = "80f61d890df9c5c126846ee293a0c1295f3b52bc"; }
+    { locale = "bs"; arch = "linux-i686"; sha1 = "f007e6bac7ae796822496b4b06fed7f9112032ad"; }
+    { locale = "bs"; arch = "linux-x86_64"; sha1 = "7abfb01029faa86d2245a273381ef8e5453dc89a"; }
+    { locale = "ca"; arch = "linux-i686"; sha1 = "3bbdf70ed21803dacb4cf000055f27d8f11bf6a2"; }
+    { locale = "ca"; arch = "linux-x86_64"; sha1 = "de2696a5c031b05479d12319d57dd44dd644f1ff"; }
+    { locale = "cs"; arch = "linux-i686"; sha1 = "0d678464f64f2ba1ff8e924336992faf9f50659c"; }
+    { locale = "cs"; arch = "linux-x86_64"; sha1 = "86d68fde6d6255407b8b0f46845416141745b805"; }
+    { locale = "cy"; arch = "linux-i686"; sha1 = "eb0270f0315d31a0c8f9d2919eb4408996b4cdeb"; }
+    { locale = "cy"; arch = "linux-x86_64"; sha1 = "004c5d1cfbcf7535765bc1cb3d8a8ea2d72386e5"; }
+    { locale = "da"; arch = "linux-i686"; sha1 = "e333b6e553bc208c50c71d89d41ce0075e72bed9"; }
+    { locale = "da"; arch = "linux-x86_64"; sha1 = "dacd29f1fb10cfab134d302ca50092d50ebf8936"; }
+    { locale = "de"; arch = "linux-i686"; sha1 = "349d731fae24d6717d35e5b945add7c992a587e2"; }
+    { locale = "de"; arch = "linux-x86_64"; sha1 = "635fc409b6433c6a8b4bb48799fe76c50153f944"; }
+    { locale = "dsb"; arch = "linux-i686"; sha1 = "ed8520837da7170a1e6ba63b1c97e34730ad2f1d"; }
+    { locale = "dsb"; arch = "linux-x86_64"; sha1 = "7ea5a1cfe9f25364e9d7902cf93459478fddac5e"; }
+    { locale = "el"; arch = "linux-i686"; sha1 = "831e7929fa7fff2e410359b6a599e293f7587f71"; }
+    { locale = "el"; arch = "linux-x86_64"; sha1 = "fb9829b8a41fc07f54ca21260b0e33f178a8c392"; }
+    { locale = "en-GB"; arch = "linux-i686"; sha1 = "f122389f405bb36231139a50198e969a11898273"; }
+    { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "919e765df3434d4349c3d5a8dbd5a3030f749d09"; }
+    { locale = "en-US"; arch = "linux-i686"; sha1 = "a75b1c5106eaefec2c6c68538b870f6fa21667c1"; }
+    { locale = "en-US"; arch = "linux-x86_64"; sha1 = "5ed50e7ba72beec9b46155ffc2958b7ec3c287af"; }
+    { locale = "en-ZA"; arch = "linux-i686"; sha1 = "061a683c163d48c79246a28562b7047f492f87e3"; }
+    { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "d10d80b665c85b8e90be69b3192ec8d0ec623bf3"; }
+    { locale = "eo"; arch = "linux-i686"; sha1 = "65e68765f422a3c829faf7f25f6b832223c27711"; }
+    { locale = "eo"; arch = "linux-x86_64"; sha1 = "a036d85b96a319bd677b17f640329a247d7046ed"; }
+    { locale = "es-AR"; arch = "linux-i686"; sha1 = "9fdccf38442e4d46aca7ad7f0d2936cf2430840f"; }
+    { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "c28754a1f2dd926202edaf13241d0b22de744cd1"; }
+    { locale = "es-CL"; arch = "linux-i686"; sha1 = "900b4573ee4611c537cd97ac353c9200d4a09387"; }
+    { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "235dfe745c2e5de80deadc22e9e0fcfef0d48ee4"; }
+    { locale = "es-ES"; arch = "linux-i686"; sha1 = "1236b095b4a6aed92a574c96aa0d724abf6de934"; }
+    { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "f4d83aa231a22f981c4177971414061b562620fb"; }
+    { locale = "es-MX"; arch = "linux-i686"; sha1 = "fd5e4b7f019b12a307909ab481579d4b717a0ae2"; }
+    { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "4b4a33fd2a6aa8061008f7a22c5c970490f64127"; }
+    { locale = "et"; arch = "linux-i686"; sha1 = "db06c7ea90e42b7dd55e95c3c1c65c3464842056"; }
+    { locale = "et"; arch = "linux-x86_64"; sha1 = "2842e4cb8c1c07dc221acca4dc4965ed25a2c993"; }
+    { locale = "eu"; arch = "linux-i686"; sha1 = "bf5d17a4ba5f08574e7aaa9d34507cff22da87d6"; }
+    { locale = "eu"; arch = "linux-x86_64"; sha1 = "74fef0cd9fe3ec31e2d3127662d33d0b2f02cfe5"; }
+    { locale = "fa"; arch = "linux-i686"; sha1 = "05b07e6d1d274fafbc9a2ce201d36ea3cccbffd3"; }
+    { locale = "fa"; arch = "linux-x86_64"; sha1 = "8e9ad7e990c8091fccda1a6651a5711b61147cd9"; }
+    { locale = "ff"; arch = "linux-i686"; sha1 = "86cf25b38865428ea4c744a3fe438bf88d2994f3"; }
+    { locale = "ff"; arch = "linux-x86_64"; sha1 = "c90ad173f42267a0b8ef16ad4c0b4f29299e6eed"; }
+    { locale = "fi"; arch = "linux-i686"; sha1 = "e22411eeb539a1fde08f20b44cfb1b5ff017b582"; }
+    { locale = "fi"; arch = "linux-x86_64"; sha1 = "ed7b3383209ceb588126a0bcb4433e5bbda2b46f"; }
+    { locale = "fr"; arch = "linux-i686"; sha1 = "90c2a9fb92335d504a9dc9d8a6afedd494b69f8b"; }
+    { locale = "fr"; arch = "linux-x86_64"; sha1 = "80e4efdd06b1aa47f348e4056c134bf24a74f4cc"; }
+    { locale = "fy-NL"; arch = "linux-i686"; sha1 = "122998b498e79a8eb6daf0e877e38fafeeedd679"; }
+    { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "99eb9694ecbd3aa892524467ced78bbc0a97d1fd"; }
+    { locale = "ga-IE"; arch = "linux-i686"; sha1 = "adb3d58c050adfb38576fcbbc62a28bfab5f196d"; }
+    { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "9a5a8a4a78c9b2f114609552e952a5ad4f7c1603"; }
+    { locale = "gd"; arch = "linux-i686"; sha1 = "876bb49fa2399e53d68bf8bd9c403b008068c5c9"; }
+    { locale = "gd"; arch = "linux-x86_64"; sha1 = "06dd806eba47b93f85d49cfabaefbb1d4ed04f49"; }
+    { locale = "gl"; arch = "linux-i686"; sha1 = "3b5867e14e051c8405ebe79f1147c89340ccdfed"; }
+    { locale = "gl"; arch = "linux-x86_64"; sha1 = "25f5e9ca92c194cbca6d3b06089e884b8c0aed13"; }
+    { locale = "gu-IN"; arch = "linux-i686"; sha1 = "df3db443c51ea75a22a9ca0666c92c28b43db5e4"; }
+    { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "2af9d3810a60e0cb2674c74925f9076996abef3d"; }
+    { locale = "he"; arch = "linux-i686"; sha1 = "b8b89d4a3e7836c2bf26819e917b7a655aee44d5"; }
+    { locale = "he"; arch = "linux-x86_64"; sha1 = "9a56a307750c21cdfbefda1abaf1763c2aab1875"; }
+    { locale = "hi-IN"; arch = "linux-i686"; sha1 = "0b8ddcb306d23fdd67abcc098c11420133fea996"; }
+    { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "ae56f2f5caf403ab2f569f843e234cb983e6eb85"; }
+    { locale = "hr"; arch = "linux-i686"; sha1 = "3a829bf25984b0004edb130ef9df5d826ddac5a9"; }
+    { locale = "hr"; arch = "linux-x86_64"; sha1 = "ada293b8ab51d393eda5be8f078e69c584ef6dda"; }
+    { locale = "hsb"; arch = "linux-i686"; sha1 = "3ed330ee86404bdc6080feaeef0f6a095ca0fbee"; }
+    { locale = "hsb"; arch = "linux-x86_64"; sha1 = "ee20f0c59b0340f68f066a78f7455d9c0d95fd2f"; }
+    { locale = "hu"; arch = "linux-i686"; sha1 = "ff66764fe50e5115bf70acce753aa240feffea28"; }
+    { locale = "hu"; arch = "linux-x86_64"; sha1 = "5e7605de920f18b64b0b4974d46e5fc2f2f4e869"; }
+    { locale = "hy-AM"; arch = "linux-i686"; sha1 = "c074b5ce903cd4d8ab66ea79a15025b4eb492774"; }
+    { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "7284c71aaa692a98a451ac862af9e0ed6519df55"; }
+    { locale = "id"; arch = "linux-i686"; sha1 = "80fa7c3cd2dea7ee4e4acccc74c8b6936cfe3fa7"; }
+    { locale = "id"; arch = "linux-x86_64"; sha1 = "7ddf8a8c2c3b590a76463e13f8f677c3cb985302"; }
+    { locale = "is"; arch = "linux-i686"; sha1 = "a52ad05729c59acfe826cb211f5da631036aa366"; }
+    { locale = "is"; arch = "linux-x86_64"; sha1 = "7e21475ef56523e7b7bd92cba2e2f4a46bb437e4"; }
+    { locale = "it"; arch = "linux-i686"; sha1 = "48191529939cf46cf0c0573a4fcd53a9703c8db8"; }
+    { locale = "it"; arch = "linux-x86_64"; sha1 = "6b1d93070e8c29573e32abd3ba7b7bf7f07ab269"; }
+    { locale = "ja"; arch = "linux-i686"; sha1 = "136b76925e0b7f766ccf9ca1ee1dcdb7a2046509"; }
+    { locale = "ja"; arch = "linux-x86_64"; sha1 = "0fe5a34c842963e83b14a79c2309b6a906eae5f8"; }
+    { locale = "kk"; arch = "linux-i686"; sha1 = "98c8801e99639de3609dcaba57eacfd2d3eaffc6"; }
+    { locale = "kk"; arch = "linux-x86_64"; sha1 = "ae3d6c13e877ae207c36c2c6e9e4eb5da3d76fff"; }
+    { locale = "km"; arch = "linux-i686"; sha1 = "4bfa2ddd28447fd34fd9e50b3f75033c8212d3c2"; }
+    { locale = "km"; arch = "linux-x86_64"; sha1 = "bbf1b20376f92c353859d671536436a22a87faa9"; }
+    { locale = "kn"; arch = "linux-i686"; sha1 = "edf31da5957d27e2b60a13d91b4520c7f67da77a"; }
+    { locale = "kn"; arch = "linux-x86_64"; sha1 = "275c253e1b913f8cc2a2437602c7edd66eaab011"; }
+    { locale = "ko"; arch = "linux-i686"; sha1 = "b213520660c5d6a1c85c3f6a11ff7c9d7f947274"; }
+    { locale = "ko"; arch = "linux-x86_64"; sha1 = "65a37cccaf55c9fa251157da1d93dcafc4ddc3b8"; }
+    { locale = "lij"; arch = "linux-i686"; sha1 = "368a3517809b7560908162efeee6d10842f537ea"; }
+    { locale = "lij"; arch = "linux-x86_64"; sha1 = "212b14ce7e8bbd96a60d23fcd8a8598f8f9ed900"; }
+    { locale = "lt"; arch = "linux-i686"; sha1 = "d27ccfe0459f6b3567818af9e5ccd5d84dd810ba"; }
+    { locale = "lt"; arch = "linux-x86_64"; sha1 = "f47264b2fa1e6f073d0300f0476fed32fb8bca48"; }
+    { locale = "lv"; arch = "linux-i686"; sha1 = "abf68081c4c011552974cf191463186fb350bf7e"; }
+    { locale = "lv"; arch = "linux-x86_64"; sha1 = "d3a3d999205418043bef4680c256f1555ab4e615"; }
+    { locale = "mai"; arch = "linux-i686"; sha1 = "2f88361cb70283bd29f641762b0ba9205a3db932"; }
+    { locale = "mai"; arch = "linux-x86_64"; sha1 = "4802f3a575d68d4e471eab9fbb638f8dcf6801f3"; }
+    { locale = "mk"; arch = "linux-i686"; sha1 = "1a82499a0b9eb4bcdc4ffcf305de7e250d4ddf91"; }
+    { locale = "mk"; arch = "linux-x86_64"; sha1 = "6d0eaf89b4f7d0821be181fbe877935db0cd6ea5"; }
+    { locale = "ml"; arch = "linux-i686"; sha1 = "16f7c329c62c7430b7e989e4d20b4fa406d34e57"; }
+    { locale = "ml"; arch = "linux-x86_64"; sha1 = "ea6b4c37abb4bde4c3c97a6de01414df336546b9"; }
+    { locale = "mr"; arch = "linux-i686"; sha1 = "e21203ab9285444b5dd19a7add22efd7750a75c4"; }
+    { locale = "mr"; arch = "linux-x86_64"; sha1 = "0992eabe63f8a9b759be99a410a600df53f70c80"; }
+    { locale = "ms"; arch = "linux-i686"; sha1 = "7c5314f43623fa25ca1813c58f8a0f3bfcb19624"; }
+    { locale = "ms"; arch = "linux-x86_64"; sha1 = "8be86e6ff4f8c0baa220143d2798c3f707db6752"; }
+    { locale = "nb-NO"; arch = "linux-i686"; sha1 = "fcc032e0ceddbe41527d8adad42c55a4a8626660"; }
+    { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "8c4365d752844adb31df201901c951b720b7401a"; }
+    { locale = "nl"; arch = "linux-i686"; sha1 = "42adac56689caf8c2cb838bad8c14b6a81c61456"; }
+    { locale = "nl"; arch = "linux-x86_64"; sha1 = "3c835567fe91ae8c386199957b2d64d185020ca9"; }
+    { locale = "nn-NO"; arch = "linux-i686"; sha1 = "47c29bceee08af768f90f54883300704630ac478"; }
+    { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "57ac712d8b93d19a155ebf08929ee395d5975b09"; }
+    { locale = "or"; arch = "linux-i686"; sha1 = "a96e39bb3eceb2e7252ad9e659981e14975c025b"; }
+    { locale = "or"; arch = "linux-x86_64"; sha1 = "004b52fb5ce3da6106c6875369299a85fd9f2091"; }
+    { locale = "pa-IN"; arch = "linux-i686"; sha1 = "4cf037c5878372a87f18122e8dc205ace8292f68"; }
+    { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "30128d1d927194cc1eac4b8d297faa5ab5d74b1c"; }
+    { locale = "pl"; arch = "linux-i686"; sha1 = "93aae61fcb7f17f5e83ee1ac8af190ee9c28bf5b"; }
+    { locale = "pl"; arch = "linux-x86_64"; sha1 = "f7ae0d826144607bb814c7b1c8dde63ad679148c"; }
+    { locale = "pt-BR"; arch = "linux-i686"; sha1 = "48cedf32ea01a9548902c8ce0a998c01d2c3da12"; }
+    { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "f31b4c25be102bc96f8795721a19c3c9fdd00043"; }
+    { locale = "pt-PT"; arch = "linux-i686"; sha1 = "e735996d21d15020bea72d9b01b0686d8fb1cd9e"; }
+    { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "705dedac0d8b9df87301eb06251b81e8d5f34d47"; }
+    { locale = "rm"; arch = "linux-i686"; sha1 = "ad7ce0ef601763795f5998e56b89d77f466f50de"; }
+    { locale = "rm"; arch = "linux-x86_64"; sha1 = "50f08008a9a12172f379dafaea656cae3f7a2d5b"; }
+    { locale = "ro"; arch = "linux-i686"; sha1 = "6f925c413fe655a35ffad0b9d3b22bc6c9af15d1"; }
+    { locale = "ro"; arch = "linux-x86_64"; sha1 = "6592bf15bdf465100dbb00a00b5e77eb10f42cae"; }
+    { locale = "ru"; arch = "linux-i686"; sha1 = "2bf3af22a827f6ea9ba849bcbe2da6687fecaa2c"; }
+    { locale = "ru"; arch = "linux-x86_64"; sha1 = "35817ed10d23415bc8c8359fc0ac080c84a648fc"; }
+    { locale = "si"; arch = "linux-i686"; sha1 = "084109d7bb0b17da1d44d0cd954d55e1ce0b03ee"; }
+    { locale = "si"; arch = "linux-x86_64"; sha1 = "83c8e57b708a62cfa159f5a58b3d808fd3ca7e2d"; }
+    { locale = "sk"; arch = "linux-i686"; sha1 = "ea7637b7c8228ae9edab0d82bebc4bb7bda7c2a1"; }
+    { locale = "sk"; arch = "linux-x86_64"; sha1 = "6b6a13d882eb59d14d51a24be90153b6c928ce01"; }
+    { locale = "sl"; arch = "linux-i686"; sha1 = "dfbce85ca19bdb9aeecf23027a9f4e6e4eb4dba8"; }
+    { locale = "sl"; arch = "linux-x86_64"; sha1 = "09ba3868ae42a1e937f21c30d7b56d8c74668e5c"; }
+    { locale = "son"; arch = "linux-i686"; sha1 = "05c37865cea7ebc007099c14b2a38c315541477b"; }
+    { locale = "son"; arch = "linux-x86_64"; sha1 = "de6aafaaff37f9ffd5dc2a5dc793a8034340eb16"; }
+    { locale = "sq"; arch = "linux-i686"; sha1 = "0c2b5a383d33a347e2c136a76f99c6a72fdf14a1"; }
+    { locale = "sq"; arch = "linux-x86_64"; sha1 = "e6fb929c285406656ae25156eeb8e446f69cb5ec"; }
+    { locale = "sr"; arch = "linux-i686"; sha1 = "2699adadaf32b89077b2e11fff1966841e4df500"; }
+    { locale = "sr"; arch = "linux-x86_64"; sha1 = "53c0d1d7559b4a9f6310b2bbec039a9d02a42200"; }
+    { locale = "sv-SE"; arch = "linux-i686"; sha1 = "5e680c4a9f9c0be0b74fee65688a4e748b73a7ec"; }
+    { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "feafa153bf9dc1827acb64a219e2eeecda99e49d"; }
+    { locale = "ta"; arch = "linux-i686"; sha1 = "d372de893c61af574ce5543dbea51b86e89ac24b"; }
+    { locale = "ta"; arch = "linux-x86_64"; sha1 = "774e8166ca5418be29bbf75665431301bab0c261"; }
+    { locale = "te"; arch = "linux-i686"; sha1 = "84619cf1f9fca5bc49312e6929e0e27fb38ea058"; }
+    { locale = "te"; arch = "linux-x86_64"; sha1 = "abc1565856241ebb91ceb41c6891c8db843946dd"; }
+    { locale = "th"; arch = "linux-i686"; sha1 = "337b5d30b5da8eef79992c33755956efd2c98297"; }
+    { locale = "th"; arch = "linux-x86_64"; sha1 = "02e7c2ab7ed3ff5da36cb3fca19e019961dd015c"; }
+    { locale = "tr"; arch = "linux-i686"; sha1 = "e3e0caef6f82a09edfbe9024701d829c0e5bc625"; }
+    { locale = "tr"; arch = "linux-x86_64"; sha1 = "184ffa3647d57adaf419f9209682aca913249b49"; }
+    { locale = "uk"; arch = "linux-i686"; sha1 = "0ae60e506d63373730895526bc7bcb9dc5c7b814"; }
+    { locale = "uk"; arch = "linux-x86_64"; sha1 = "f54d9fb8b704178bceed03646af17ab8e49a94d4"; }
+    { locale = "uz"; arch = "linux-i686"; sha1 = "77973a500608be31185ea172b4c4f21191838e9d"; }
+    { locale = "uz"; arch = "linux-x86_64"; sha1 = "5cb1cb1618cdc2b4515b3569c2ef8341b91d547b"; }
+    { locale = "vi"; arch = "linux-i686"; sha1 = "d957cedd5a36546f7d9cef3ddcdbdfb9dfb376a3"; }
+    { locale = "vi"; arch = "linux-x86_64"; sha1 = "992d5939c9db596dfc1e118c80a5fb2c08c96753"; }
+    { locale = "xh"; arch = "linux-i686"; sha1 = "1eab731be806a22e29940676d3766190becf9561"; }
+    { locale = "xh"; arch = "linux-x86_64"; sha1 = "fe4872dd673fdbf867921f7c1fbc36ae0be74c3e"; }
+    { locale = "zh-CN"; arch = "linux-i686"; sha1 = "8cc0e2ea6342577761a6ef9655c4f07f9dae1367"; }
+    { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "5854d58a2ec318d5dc16f905853fa808774c956d"; }
+    { locale = "zh-TW"; arch = "linux-i686"; sha1 = "875013ebba184c5a656abb2ab4fee3948689beef"; }
+    { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "7e416b11856aae2d52bc24b7629fc2d90719e9b1"; }
   ];
 }
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
index e6db0a3f74ef..bdc989fea220 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
@@ -4,123 +4,123 @@
 # ruby generate_source.rb > source.nix
 
 {
-  version = "38.2.0";
+  version = "38.3.0";
   sources = [
-    { locale = "ar"; arch = "linux-i686"; sha1 = "e78d69e77c7a41a5d1db177d1ff2011620d0030e"; }
-    { locale = "ar"; arch = "linux-x86_64"; sha1 = "0392f81672db2005796966f125a50722d62437d5"; }
-    { locale = "ast"; arch = "linux-i686"; sha1 = "583d831cc2a2b9707e76ecead28d830ce4971b0e"; }
-    { locale = "ast"; arch = "linux-x86_64"; sha1 = "741ce8879c18477048eace82676a4e3dc8a9c248"; }
-    { locale = "be"; arch = "linux-i686"; sha1 = "f838f7034293f188566d5866a8e02a7045477deb"; }
-    { locale = "be"; arch = "linux-x86_64"; sha1 = "cd32f6da77e0c9f0d82659105f696daa8ad71798"; }
-    { locale = "bg"; arch = "linux-i686"; sha1 = "784d23acca591ebceca30c67e0468e53c9ee2776"; }
-    { locale = "bg"; arch = "linux-x86_64"; sha1 = "547e8d013635e88e1575a68b0ea11b375c430213"; }
-    { locale = "bn-BD"; arch = "linux-i686"; sha1 = "7ddc0b28640e4e43fa5d70790a46be663962be99"; }
-    { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "b56e9b9e781f73074d2c4ee19e5bd267c6aad9ec"; }
-    { locale = "br"; arch = "linux-i686"; sha1 = "a28f9b548ae4c081e792b77dda3395874b355d13"; }
-    { locale = "br"; arch = "linux-x86_64"; sha1 = "2c37c60ea39218abe1e937be7584ca9966cc6c81"; }
-    { locale = "ca"; arch = "linux-i686"; sha1 = "1fecd72a93a5d76c506dfc5c95e6f0e613f5e89f"; }
-    { locale = "ca"; arch = "linux-x86_64"; sha1 = "32063fa5a27838a4ca9f5dd7c091e01b464653b2"; }
-    { locale = "cs"; arch = "linux-i686"; sha1 = "32ccce02f24ba87cd1c8e5997feb95c6e54b8cbd"; }
-    { locale = "cs"; arch = "linux-x86_64"; sha1 = "98ce62455ffbb373eb47f3c107042510b4ceae23"; }
-    { locale = "cy"; arch = "linux-i686"; sha1 = "4eb168b3858107239fef24c97da279c5f33c737a"; }
-    { locale = "cy"; arch = "linux-x86_64"; sha1 = "4d1dea9922cebc848bb45d82d413968b99f06e73"; }
-    { locale = "da"; arch = "linux-i686"; sha1 = "87b5de179a6be0cc8cca4c125fe32b6c0a23e08b"; }
-    { locale = "da"; arch = "linux-x86_64"; sha1 = "06a0bd4ac2a7709703c3cc860268fcdbccf2ac83"; }
-    { locale = "de"; arch = "linux-i686"; sha1 = "00f40a074255e4f3fe2d3bead1a37b1d406bca68"; }
-    { locale = "de"; arch = "linux-x86_64"; sha1 = "9e58b681b85028a932104295a8e39e209a21e549"; }
-    { locale = "dsb"; arch = "linux-i686"; sha1 = "0ee112d071dd3fb580521bf730e762e314c3c0fb"; }
-    { locale = "dsb"; arch = "linux-x86_64"; sha1 = "69a01bc3875151dd3a7b283f8edc44896778f00d"; }
-    { locale = "el"; arch = "linux-i686"; sha1 = "3ac525634c74814cd8fd73b841b4aa8095af6ca4"; }
-    { locale = "el"; arch = "linux-x86_64"; sha1 = "cce461a7de648677ada0e7ab144c6b492044a370"; }
-    { locale = "en-GB"; arch = "linux-i686"; sha1 = "321795d34d8708fff3149d99db41abbde3d59a38"; }
-    { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "f9435cb01e929591ab54f313442c42fc31007041"; }
-    { locale = "en-US"; arch = "linux-i686"; sha1 = "415c1b828bad3680da7b6f0ac6c6d85be3002ca5"; }
-    { locale = "en-US"; arch = "linux-x86_64"; sha1 = "56eddaa513439a3c66deed3b1396660cecfb7224"; }
-    { locale = "es-AR"; arch = "linux-i686"; sha1 = "9963d13b6b6ab8fe4df7f69fee812e8ed3c79f2b"; }
-    { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "4c64efa0c7b3b46e3db8c2a8bf1afa7fd59b1afb"; }
-    { locale = "es-ES"; arch = "linux-i686"; sha1 = "7fe8db80f25a155a4fbe606b43e8ea192bdeb2d3"; }
-    { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "2a5f57603236604829e5d75103216b2239354b04"; }
-    { locale = "et"; arch = "linux-i686"; sha1 = "f99161ca84c7bf660198481757a97505bff41016"; }
-    { locale = "et"; arch = "linux-x86_64"; sha1 = "220155dbc6f604f3a3daaaa5bafd8f096409931a"; }
-    { locale = "eu"; arch = "linux-i686"; sha1 = "117546c2ea2d2410e0d0da57f79b8a17e39fea0d"; }
-    { locale = "eu"; arch = "linux-x86_64"; sha1 = "ec22ab958396424a1134c6e2e7a6f182ef38d2e3"; }
-    { locale = "fi"; arch = "linux-i686"; sha1 = "2115972a75ab795253b1ac639b3c939cc90b186c"; }
-    { locale = "fi"; arch = "linux-x86_64"; sha1 = "c59da6176e5278f05c489449d477a8b508612efc"; }
-    { locale = "fr"; arch = "linux-i686"; sha1 = "76a50fa696f0f489cd129fd5590853a6b689987e"; }
-    { locale = "fr"; arch = "linux-x86_64"; sha1 = "772b5eab11f94b2f7713e43b7c384f9d24d407bc"; }
-    { locale = "fy-NL"; arch = "linux-i686"; sha1 = "156b5e3a99bb2ee1bc489f3f1d06643860709d55"; }
-    { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "02c52d17d1d2d98d1281ae957205eabb0dae4c3a"; }
-    { locale = "ga-IE"; arch = "linux-i686"; sha1 = "f1e8e28988504c4bec059348942d38b3c1a3b3f3"; }
-    { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "80491a140c3d3b29f46eb882c41fa84842e3e44b"; }
-    { locale = "gd"; arch = "linux-i686"; sha1 = "412e478fb2a56fb53ca27fdf01346a1c8f3e7a53"; }
-    { locale = "gd"; arch = "linux-x86_64"; sha1 = "31a4aee19453bc754db2149e2cfa952ee6829ef7"; }
-    { locale = "gl"; arch = "linux-i686"; sha1 = "70e5d130dc08a86d7ae7b28e29fbd7485e750a6e"; }
-    { locale = "gl"; arch = "linux-x86_64"; sha1 = "b0735f3f05f36b174399300c8eb8c851aa92ea1c"; }
-    { locale = "he"; arch = "linux-i686"; sha1 = "28eda52f1a9b13c15faeb87b241bef6be001f856"; }
-    { locale = "he"; arch = "linux-x86_64"; sha1 = "d311d07f86e3280d422dcaa76925308dec1bbf29"; }
-    { locale = "hr"; arch = "linux-i686"; sha1 = "d19f966f31fa298a4d6d2b61d83a407c950b94ba"; }
-    { locale = "hr"; arch = "linux-x86_64"; sha1 = "b730ed1556bc3337dba3d4391773746c344fd16d"; }
-    { locale = "hsb"; arch = "linux-i686"; sha1 = "bb6e4f02d1b7ebfa56c3510fe7707218c7ee0fbc"; }
-    { locale = "hsb"; arch = "linux-x86_64"; sha1 = "826ce8b68e61a6c6e340ab7e2766f7a432927aa0"; }
-    { locale = "hu"; arch = "linux-i686"; sha1 = "af06b6b2d52dba79ca21cfc7e9eff1b135ba79f8"; }
-    { locale = "hu"; arch = "linux-x86_64"; sha1 = "c90755e7048bb1b33d0407010db770a3a20f144a"; }
-    { locale = "hy-AM"; arch = "linux-i686"; sha1 = "56992cb46445b4f389e62e5e621a09ee37558864"; }
-    { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "764c62cb4b44f25947ef778cd78de2ce17546da6"; }
-    { locale = "id"; arch = "linux-i686"; sha1 = "02170606677c5d1177e98fec537ab9997d1d2bb2"; }
-    { locale = "id"; arch = "linux-x86_64"; sha1 = "9079cdf731c69ad204ec2e4d92b1b9e7e476b8f8"; }
-    { locale = "is"; arch = "linux-i686"; sha1 = "59e47a5d030c8a18faaff875d06fc2fee8ff2fa9"; }
-    { locale = "is"; arch = "linux-x86_64"; sha1 = "207c2e8671f9266c70b03c42e4b6952c7b139fcc"; }
-    { locale = "it"; arch = "linux-i686"; sha1 = "cb724a67e5e0413f670602cb351fd8c7538d4074"; }
-    { locale = "it"; arch = "linux-x86_64"; sha1 = "24901bb227c7df290d030bfaccf048b6fbbd2bf6"; }
-    { locale = "ja"; arch = "linux-i686"; sha1 = "8df9208999956eea39f4774c482da5db3ed5662b"; }
-    { locale = "ja"; arch = "linux-x86_64"; sha1 = "6f29589c86eee9cf95410c0e0098e2b96bffb4d0"; }
-    { locale = "ko"; arch = "linux-i686"; sha1 = "e266fb9dba4368e80d206c248fe3c1bc202dc064"; }
-    { locale = "ko"; arch = "linux-x86_64"; sha1 = "106a6152a5f91407ee1cde665f70b39fbe6bfe69"; }
-    { locale = "lt"; arch = "linux-i686"; sha1 = "3385483d2db12873b645add7e16455874cd2ac91"; }
-    { locale = "lt"; arch = "linux-x86_64"; sha1 = "fb2aafa56998000c6f08730c467d7fb3e37a7f70"; }
-    { locale = "nb-NO"; arch = "linux-i686"; sha1 = "93a2f4e45b47335cad077581601b1da6becb5e5b"; }
-    { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "7d609d01d0cf46b2d94f15253e0e1cd1ba42d6ac"; }
-    { locale = "nl"; arch = "linux-i686"; sha1 = "35d4c18935d64b4ca371eed75def0cda549715ad"; }
-    { locale = "nl"; arch = "linux-x86_64"; sha1 = "168a20038f76eafec00a63501019a55b59b7c9b0"; }
-    { locale = "nn-NO"; arch = "linux-i686"; sha1 = "3fc3c67c8f60814f70e8b53d7896d392b38b1af6"; }
-    { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "be54f52ea730447b53e020c1ed0c804a7f22bf40"; }
-    { locale = "pa-IN"; arch = "linux-i686"; sha1 = "8a4db5fea163ebbb7738f86d878f371323b0da10"; }
-    { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "71ac68f8b117549e7a66207ca556cfc951827406"; }
-    { locale = "pl"; arch = "linux-i686"; sha1 = "1d5fcf5ce59e552e1d122249a158d4956e6e9610"; }
-    { locale = "pl"; arch = "linux-x86_64"; sha1 = "1519da5234c5a7a7ba569c1d995a8ecefcd266aa"; }
-    { locale = "pt-BR"; arch = "linux-i686"; sha1 = "913ba6f41cdbde5a4d0bb7d67751c29d29a4b294"; }
-    { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "ca6e7915533cacd710980711e8143061e6e7fc2e"; }
-    { locale = "pt-PT"; arch = "linux-i686"; sha1 = "5578ba04b7d431a78728cb08cd25513c269db003"; }
-    { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "a2a42233fac046158dbe8ee2f743cddb53df151a"; }
-    { locale = "rm"; arch = "linux-i686"; sha1 = "e8abf6f03cb05a42c47c6dcb68ab9226229fcc14"; }
-    { locale = "rm"; arch = "linux-x86_64"; sha1 = "0a69eb3783653ee645c443b24feb1c100a2e0688"; }
-    { locale = "ro"; arch = "linux-i686"; sha1 = "73fb22e26cd39b32ba42d427d200dd20f6206884"; }
-    { locale = "ro"; arch = "linux-x86_64"; sha1 = "9ea1dbfc283efb72abca7b7ef97c168c54026b0b"; }
-    { locale = "ru"; arch = "linux-i686"; sha1 = "fa9e4eb824a7f2d09bfcf66eb7740e4bdff24131"; }
-    { locale = "ru"; arch = "linux-x86_64"; sha1 = "a0f6e30587f549f44140bbd9fcb7c3abe12e5ec3"; }
-    { locale = "si"; arch = "linux-i686"; sha1 = "cbed568fa683f3b95bd5e63470f5035d67135c8b"; }
-    { locale = "si"; arch = "linux-x86_64"; sha1 = "613576519cc050facff46a4c419f997d2a9660f4"; }
-    { locale = "sk"; arch = "linux-i686"; sha1 = "e22226e26405d9aac5bac49e458f08980ffa7419"; }
-    { locale = "sk"; arch = "linux-x86_64"; sha1 = "d96029ff232537645a6d9f93394e02e9c68b8c2a"; }
-    { locale = "sl"; arch = "linux-i686"; sha1 = "cfb39baf1c3637d4e77f177d4075ec6a1d78e522"; }
-    { locale = "sl"; arch = "linux-x86_64"; sha1 = "78264ea3ff48ff1e5e89c174a181636fe5498f7d"; }
-    { locale = "sq"; arch = "linux-i686"; sha1 = "c55b151b1945ca507fef2e00a492fda7dc622f80"; }
-    { locale = "sq"; arch = "linux-x86_64"; sha1 = "75138732d8f82a879c0ba3c657dde6e41192f55c"; }
-    { locale = "sr"; arch = "linux-i686"; sha1 = "34e9e650bc5adc27a4262897914d8b97d65d9d95"; }
-    { locale = "sr"; arch = "linux-x86_64"; sha1 = "236189aa59dee7d991d2c7e15467666d9fa1c4ec"; }
-    { locale = "sv-SE"; arch = "linux-i686"; sha1 = "924e01fad080da3c2f52834d9f55511cc2c56781"; }
-    { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "2c5ad3832956d427f5a415681145fb2e32a1be71"; }
-    { locale = "ta-LK"; arch = "linux-i686"; sha1 = "b87a9ec4cc658cfb0fcf45f82546ed385104bbdd"; }
-    { locale = "ta-LK"; arch = "linux-x86_64"; sha1 = "db30febd32a867e125df3039dfcef74055f4428e"; }
-    { locale = "tr"; arch = "linux-i686"; sha1 = "513c56c7308d6562a14b268e17f6f7d79e4860da"; }
-    { locale = "tr"; arch = "linux-x86_64"; sha1 = "9f69846c81b847736b917521fae2f6c1cdcaea38"; }
-    { locale = "uk"; arch = "linux-i686"; sha1 = "d43edd5cce1f121e2676b3876ca4579142e7df21"; }
-    { locale = "uk"; arch = "linux-x86_64"; sha1 = "4eeddcadc812dc66a7c510e39018baf98ed928bc"; }
-    { locale = "vi"; arch = "linux-i686"; sha1 = "75832dada4af3880d00d5918a2d8b2e5ad50fb53"; }
-    { locale = "vi"; arch = "linux-x86_64"; sha1 = "8521ce3fb633bd9deafb2bdbba5b8a487a08e23a"; }
-    { locale = "zh-CN"; arch = "linux-i686"; sha1 = "22ec231d065c73627c39147b34c656dfdcd27d14"; }
-    { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "fa037a2ba7e8559ed8bbbc86772dcff24eada7e3"; }
-    { locale = "zh-TW"; arch = "linux-i686"; sha1 = "685ec1667d29b45a144cba118ad97eb3b340feb8"; }
-    { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "859f97ddbb05c76495fd09c4f039bc6324cc60a1"; }
+    { locale = "ar"; arch = "linux-i686"; sha1 = "45a8e9613b5d5083b264fb82704bc69c622372c5"; }
+    { locale = "ar"; arch = "linux-x86_64"; sha1 = "97ea8fa778bd4e5fc65d919f2d0f9f473e00fc38"; }
+    { locale = "ast"; arch = "linux-i686"; sha1 = "0c535223b5620f249ff32381c53e05c8f5429f1a"; }
+    { locale = "ast"; arch = "linux-x86_64"; sha1 = "01352d0046fa41d832c7f18c2b8d0c3d74ab95ce"; }
+    { locale = "be"; arch = "linux-i686"; sha1 = "f496db8690c9a7b61766a235ee1dc204f622fddf"; }
+    { locale = "be"; arch = "linux-x86_64"; sha1 = "2a62ca92f2dfafa3a58fedbf03304fd6daed01ea"; }
+    { locale = "bg"; arch = "linux-i686"; sha1 = "02934c4c9dba3fce844159dc790c0575c0202efd"; }
+    { locale = "bg"; arch = "linux-x86_64"; sha1 = "d8cf360615b05d805b88d6057e4f08527aba6576"; }
+    { locale = "bn-BD"; arch = "linux-i686"; sha1 = "880434d08155275dc4806d45afa365f62bb58ad0"; }
+    { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "e99dcde6db5bd3178ce58f67191bc3f54f75574a"; }
+    { locale = "br"; arch = "linux-i686"; sha1 = "7fab50b35a4bcff0e7e1268e3b50f2088209237e"; }
+    { locale = "br"; arch = "linux-x86_64"; sha1 = "d9d945dc271cf092746f8921f490e0f77359f5e3"; }
+    { locale = "ca"; arch = "linux-i686"; sha1 = "7f6b5f5523d3b67068e153515629bbbb3e944ee5"; }
+    { locale = "ca"; arch = "linux-x86_64"; sha1 = "abd73c39a87a2a28063e165941be98994d22f401"; }
+    { locale = "cs"; arch = "linux-i686"; sha1 = "a80a5e962d0ca4458365cee96715c830681b1ee0"; }
+    { locale = "cs"; arch = "linux-x86_64"; sha1 = "71096a0d6e8293682638abb9073cf2dc8f905ffb"; }
+    { locale = "cy"; arch = "linux-i686"; sha1 = "b64f444d523f3dd88f23d491e91193ef0422f664"; }
+    { locale = "cy"; arch = "linux-x86_64"; sha1 = "e8fdf1acb14801c97a3e48ff49706bd15f3433e6"; }
+    { locale = "da"; arch = "linux-i686"; sha1 = "73ce38987daf2a145dbca2aa8cd7ca32098598a5"; }
+    { locale = "da"; arch = "linux-x86_64"; sha1 = "f403094fbb49addc5d7dfe15370fdd612f067256"; }
+    { locale = "de"; arch = "linux-i686"; sha1 = "f265e65020397b79420691a475adb98f3bcc73a1"; }
+    { locale = "de"; arch = "linux-x86_64"; sha1 = "267ad171576e57df9a241a22332d15efa882e485"; }
+    { locale = "dsb"; arch = "linux-i686"; sha1 = "3d8fb2e858ea3210ddb9eb566235ffeddbc23cb6"; }
+    { locale = "dsb"; arch = "linux-x86_64"; sha1 = "7c50f42a6a0c5172469f37412664306049253637"; }
+    { locale = "el"; arch = "linux-i686"; sha1 = "732fade73221962dc840d3a97b440753bfda35fc"; }
+    { locale = "el"; arch = "linux-x86_64"; sha1 = "9e8f4a7698050b506a815af03534395bf6cfda31"; }
+    { locale = "en-GB"; arch = "linux-i686"; sha1 = "0c0c4f87977c0ca4a70db8ba22dcb35b5276f451"; }
+    { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "0217d912251c52acaf071a6955c725e365d0298b"; }
+    { locale = "en-US"; arch = "linux-i686"; sha1 = "1ffa88c200b17e4fe8ea647c58e0d479b3e673e2"; }
+    { locale = "en-US"; arch = "linux-x86_64"; sha1 = "e2a2690e2e7b72eff8944effc6d8a70f4fb2a3e7"; }
+    { locale = "es-AR"; arch = "linux-i686"; sha1 = "7fddb79300f158ed94c970dd9a0f384093a369fe"; }
+    { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "961e90db7063c5d49c8494ec31761ae1206effec"; }
+    { locale = "es-ES"; arch = "linux-i686"; sha1 = "69a5ad0cc12d9e8e17d4a47c705d3653106248f5"; }
+    { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "fe84027eef32f4788a8056ea331e2a7a1ecc3c8a"; }
+    { locale = "et"; arch = "linux-i686"; sha1 = "d1cdd86f79f6bd17a98a1fcaec70af34671f60c6"; }
+    { locale = "et"; arch = "linux-x86_64"; sha1 = "3ee90372f035ba972aff2bb9e8d592cf007fd2bd"; }
+    { locale = "eu"; arch = "linux-i686"; sha1 = "d0caf6d75b169a1a420f68210782230bc83d5cfe"; }
+    { locale = "eu"; arch = "linux-x86_64"; sha1 = "eb4250e4422699d09bb9a8a2b3a539f72a91e4d1"; }
+    { locale = "fi"; arch = "linux-i686"; sha1 = "37e6d23be510eee3d908a2396eee554c65f24539"; }
+    { locale = "fi"; arch = "linux-x86_64"; sha1 = "0dc06ca1c164a3f2ca7941e376fb3e085ec29f82"; }
+    { locale = "fr"; arch = "linux-i686"; sha1 = "a057112a12aa7e214b2fec5cb3a24126fabe1dbf"; }
+    { locale = "fr"; arch = "linux-x86_64"; sha1 = "392d413e2a4c16391af122c2cbcf264d901e875b"; }
+    { locale = "fy-NL"; arch = "linux-i686"; sha1 = "207d75317e6257c1eb95e6ba133e3a7229125ffa"; }
+    { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "69e02da4f9473b25f8d3b9cd74602f966899602b"; }
+    { locale = "ga-IE"; arch = "linux-i686"; sha1 = "5f356a214e32696e8296a7fee3b9cfe3d86b8176"; }
+    { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "bce6441acd9a438ea707f6db1d8f639fa676adb8"; }
+    { locale = "gd"; arch = "linux-i686"; sha1 = "8a4473b82a10ad3dfefdc381b90a0616d1ecaf6b"; }
+    { locale = "gd"; arch = "linux-x86_64"; sha1 = "3fdbe0debaf43a741b137eeb549117747dfa08eb"; }
+    { locale = "gl"; arch = "linux-i686"; sha1 = "235d6b94cf0e44e7bac6e76ae8c13bd5c090865e"; }
+    { locale = "gl"; arch = "linux-x86_64"; sha1 = "a5f23d30426fb0d78d7840ab2b2ed457785cc6c1"; }
+    { locale = "he"; arch = "linux-i686"; sha1 = "5b98752dd745d406325682faaaba2d8ce4c34743"; }
+    { locale = "he"; arch = "linux-x86_64"; sha1 = "2ce82ecdca404f72f033f3752e34122ff97e6006"; }
+    { locale = "hr"; arch = "linux-i686"; sha1 = "b7e8899d7db51129ef94c2b34bcf950307c0eaa1"; }
+    { locale = "hr"; arch = "linux-x86_64"; sha1 = "85e0d2ee0591df75754f03566f206085a43e1603"; }
+    { locale = "hsb"; arch = "linux-i686"; sha1 = "6252d41415ec5ba7841e629b2617fb38f5bfe25f"; }
+    { locale = "hsb"; arch = "linux-x86_64"; sha1 = "40ef8f4991f9670ded25372805b05cf090ae8419"; }
+    { locale = "hu"; arch = "linux-i686"; sha1 = "b98b9198d0347ccee4cf1b46405c375ed94d1c79"; }
+    { locale = "hu"; arch = "linux-x86_64"; sha1 = "8e144f40a677471b411608cca2170c90de122ffc"; }
+    { locale = "hy-AM"; arch = "linux-i686"; sha1 = "aa4d323f658f4330b13e5883ba8b6e2a3e441add"; }
+    { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "2273f2d4d15a4dc4681a8d21e6f42f2e1ba0772a"; }
+    { locale = "id"; arch = "linux-i686"; sha1 = "60b9a32ba6b831f851399c6f4ba675bff163aba7"; }
+    { locale = "id"; arch = "linux-x86_64"; sha1 = "73cda0ab1e1c04e7ab2816642481d2f9b41746e8"; }
+    { locale = "is"; arch = "linux-i686"; sha1 = "9b61caeaf4f1a7e5153d042f6ec52c7a4c4a5573"; }
+    { locale = "is"; arch = "linux-x86_64"; sha1 = "a705d9724c2fe246a3a9e96f7304bad73ed9897d"; }
+    { locale = "it"; arch = "linux-i686"; sha1 = "0fcd397c3a8f6519ec85f7f2d71416b27053813f"; }
+    { locale = "it"; arch = "linux-x86_64"; sha1 = "6900813562473c64a50087f5d0620666763ceb09"; }
+    { locale = "ja"; arch = "linux-i686"; sha1 = "786e9aadae199fb2a84b03ac9716f021f118e16e"; }
+    { locale = "ja"; arch = "linux-x86_64"; sha1 = "8f92502e03e2bdd704d57a3298a5c109be3d3927"; }
+    { locale = "ko"; arch = "linux-i686"; sha1 = "0d3c52e88f5d0cc329b8bcb3cf3322fb59651dd1"; }
+    { locale = "ko"; arch = "linux-x86_64"; sha1 = "065a6b448189246d52bee2ea2722d22253c7fcae"; }
+    { locale = "lt"; arch = "linux-i686"; sha1 = "b667e748814e2d2ea508eac799325aa4d3e6b56f"; }
+    { locale = "lt"; arch = "linux-x86_64"; sha1 = "174214613317d4ea2c25a6c9cbc61810fe579349"; }
+    { locale = "nb-NO"; arch = "linux-i686"; sha1 = "669f7f03860c7648bc901120f5bbb43e63424759"; }
+    { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "3cb36ad745d505241bba330e0d832a77d1ba8641"; }
+    { locale = "nl"; arch = "linux-i686"; sha1 = "7b399deb6e9a8d4db099bbaaadc8e5a000c13293"; }
+    { locale = "nl"; arch = "linux-x86_64"; sha1 = "1d7391c23da59b9367071c95d43ea2cc870c5388"; }
+    { locale = "nn-NO"; arch = "linux-i686"; sha1 = "25d80451d59a19339ce8d0e8e9b3fb76c183cca0"; }
+    { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "4af717ad8b7dcc7564bada20b3f28f179d29ae91"; }
+    { locale = "pa-IN"; arch = "linux-i686"; sha1 = "225eab7baf002da6543918e1682a931fe7cb4493"; }
+    { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "d519eaf04ee57e1ca1fffe2a1dc5cfbe876ce128"; }
+    { locale = "pl"; arch = "linux-i686"; sha1 = "be4eeed21159601047b59aa832c9adbd54a812dd"; }
+    { locale = "pl"; arch = "linux-x86_64"; sha1 = "47a7a6f548dfad92a725c56858fb625e42821d9c"; }
+    { locale = "pt-BR"; arch = "linux-i686"; sha1 = "5e44c5e9e07cbb0ef864a98c17a3e2c744d7eddd"; }
+    { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "e4337edbaee9023b69518f3804459508a5fb693a"; }
+    { locale = "pt-PT"; arch = "linux-i686"; sha1 = "5ce4e8a2626835c3d17c37a68db6c4cc9f3db5e4"; }
+    { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "f155173b56f3e0302288cb359170615d925d9c12"; }
+    { locale = "rm"; arch = "linux-i686"; sha1 = "57549fda6d8c9ef67950f6729bb17c8fb79d18cb"; }
+    { locale = "rm"; arch = "linux-x86_64"; sha1 = "96cbc015ea082bf9c8a2363929bec574c3ba264d"; }
+    { locale = "ro"; arch = "linux-i686"; sha1 = "85399bb39ddb09b5aedd44c5362bda1a375255d8"; }
+    { locale = "ro"; arch = "linux-x86_64"; sha1 = "6a4f1f43d188cc0bd817d150fe7c958aec4f0ac6"; }
+    { locale = "ru"; arch = "linux-i686"; sha1 = "9fdd1b141cde49a5453540f4ceb3d74dc92b05aa"; }
+    { locale = "ru"; arch = "linux-x86_64"; sha1 = "29537fbb4eacb6a9fc396802d74b35132620613d"; }
+    { locale = "si"; arch = "linux-i686"; sha1 = "410f15673c95ce3744c84559e5801b4c1cc062b6"; }
+    { locale = "si"; arch = "linux-x86_64"; sha1 = "383acd5b025d907ed0dee36f1b8fc5bf5234c860"; }
+    { locale = "sk"; arch = "linux-i686"; sha1 = "86e7b065876b4eb0177e7523bab78d36182f1517"; }
+    { locale = "sk"; arch = "linux-x86_64"; sha1 = "cdc547aca6dfff934195a69e1ad81a357f37fef4"; }
+    { locale = "sl"; arch = "linux-i686"; sha1 = "a88a74354e6b481418d8b5aec08a0c1f87693117"; }
+    { locale = "sl"; arch = "linux-x86_64"; sha1 = "d27b3c018904dcb6862f569b84b4200b05013df0"; }
+    { locale = "sq"; arch = "linux-i686"; sha1 = "822e117f5a840f46c6b2500ad80efb6c16c2a5de"; }
+    { locale = "sq"; arch = "linux-x86_64"; sha1 = "349aeab272d702afbe9f249c54a7cf6d17918f6a"; }
+    { locale = "sr"; arch = "linux-i686"; sha1 = "170c6f23bdb3222e7eb95591a22d09d17ca1b5a2"; }
+    { locale = "sr"; arch = "linux-x86_64"; sha1 = "eda779e2154ca0ede7c69435ad49fbd541ec21d1"; }
+    { locale = "sv-SE"; arch = "linux-i686"; sha1 = "63e9eb73d9854e72f93639c1383dd21075626efb"; }
+    { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "a824725919096f53c3372a038d999ce56b242d40"; }
+    { locale = "ta-LK"; arch = "linux-i686"; sha1 = "5b40dd6b193a92ddc6344825bf6e9c547f58b0a2"; }
+    { locale = "ta-LK"; arch = "linux-x86_64"; sha1 = "5d6c019b2708b87ac32db16b828966f1b1215e08"; }
+    { locale = "tr"; arch = "linux-i686"; sha1 = "17c8ccd0c6d08dd00a6267d9c6850ea8a027b4a5"; }
+    { locale = "tr"; arch = "linux-x86_64"; sha1 = "b5c6a09750d01af1f8428425c9c7af9f73a7e42b"; }
+    { locale = "uk"; arch = "linux-i686"; sha1 = "6dbfd27fd8efd59cd1af932af3f302f9cc35e314"; }
+    { locale = "uk"; arch = "linux-x86_64"; sha1 = "690f60f461d958a076af671321b2588607369754"; }
+    { locale = "vi"; arch = "linux-i686"; sha1 = "84dc2737efcc831a63ea2ceeccfdadb2c065c201"; }
+    { locale = "vi"; arch = "linux-x86_64"; sha1 = "323be14cf52c7587200856ad31528a93d4f88766"; }
+    { locale = "zh-CN"; arch = "linux-i686"; sha1 = "9186336bcf83179205b91f51c56ee7972024d59c"; }
+    { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "97f65edfe8cbb419c4eacb54163df629b8fdb9bb"; }
+    { locale = "zh-TW"; arch = "linux-i686"; sha1 = "239c526df1c25aa4b7f639fb0a88d1969d49e2a1"; }
+    { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "88cf0f7fd1c1f73f1c8bfef0a292eac3158f7b88"; }
   ];
 }

From 25bb1e10f35fbdaa3e038bf38060e9e67f06e429 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 1 Oct 2015 13:51:24 +0200
Subject: [PATCH 29/43] firefox: Update to 41.0.1

---
 pkgs/applications/networking/browsers/firefox/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 9f027a25c175..df176caaa2d6 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -129,8 +129,8 @@ in {
 
   firefox = common {
     pname = "firefox";
-    version = "41.0";
-    sha1 = "0ce7a5ccdf671a6c98eaac07d06d49a895a99449";
+    version = "41.0.1";
+    sha1 = "4f6bf34b7b286e033f401d7d4112ec6310577aae";
   };
 
   firefox-esr = common {

From 562851a0680c35ecc34e59976e2f8eabe142dca6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 1 Oct 2015 13:54:00 +0200
Subject: [PATCH 30/43] thunderbird: Update to 38.3.0

---
 .../networking/mailreaders/thunderbird/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index ad43cd0116f0..32f77cfa2c22 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -13,7 +13,7 @@
   enableOfficialBranding ? false
 }:
 
-let version = "38.2.0"; in
+let version = "38.3.0"; in
 let verName = "${version}"; in
 
 stdenv.mkDerivation rec {
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     url = "http://archive.mozilla.org/pub/thunderbird/releases/${verName}/source/thunderbird-${verName}.source.tar.bz2";
 
     # https://archive.mozilla.org/pub/thunderbird/releases/${verName}/SHA1SUMS
-    sha1 = "0e27c54ee63b71cd7e8ff4fd87bbe66e0a16ffc1";
+    sha1 = "7c8ef066d6b6516fddbb654b38353f894f85d469";
   };
 
   buildInputs = # from firefox30Pkgs.xulrunner, but without gstreamer and libvpx

From 2f5cbb1b625a286cb7dc5bd2f9093dda828b3d01 Mon Sep 17 00:00:00 2001
From: "Antoine R. Dumont (@ardumont)" <antoine.romain.dumont@gmail.com>
Date: Thu, 1 Oct 2015 12:31:11 +0200
Subject: [PATCH 31/43] emacs-packages: elpy add runtime dependencies on
 pythonpackages.elpy

---
 pkgs/top-level/all-packages.nix   | 1 +
 pkgs/top-level/emacs-packages.nix | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5bb5c8183781..5d5b7771d427 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11287,6 +11287,7 @@ let
 
     external = {
       inherit (haskellPackages) ghc-mod structured-haskell-mode Agda;
+      inherit (pythonPackages) elpy;
     };
   };
 
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 360096aa1ffb..d331850b504b 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -442,7 +442,7 @@ let self = _self // overrides;
 
   elpy = melpaBuild rec {
     pname   = "elpy";
-    version = "1.9.0";
+    version = external.elpy.version;
     src = fetchFromGitHub {
       owner  = "jorgenschaefer";
       repo   = pname;
@@ -465,6 +465,8 @@ let self = _self // overrides;
       company find-file-in-project highlight-indentation pyvenv yasnippet
     ];
 
+    propagatedUserEnvPkgs = [ external.elpy ] ++ packageRequires;
+
     meta = {
       description = "Emacs Python Development Environment";
       longDescription = ''

From e0d5b14ce412f6ff629d4fb5104d34a0b00804b7 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Thu, 1 Oct 2015 14:23:22 +0200
Subject: [PATCH 32/43] neard: enable support for Secure Elements

---
 pkgs/servers/neard/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/neard/default.nix b/pkgs/servers/neard/default.nix
index a76f10a262db..995ffc41c60e 100644
--- a/pkgs/servers/neard/default.nix
+++ b/pkgs/servers/neard/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ autoreconfHook pkgconfig systemd glib dbus libnl pythonPackages.python pythonPackages.wrapPython ];
   pythonPath = [ pythonPackages.pygobject pythonPackages.dbus pythonPackages.pygtk ];
 
-  configureFlags = [ "--disable-debug" "--enable-tools" "--with-systemdsystemunitdir=$out/lib/systemd/system" ];
+  configureFlags = [ "--disable-debug" "--enable-tools" "--enable-ese" "--with-systemdsystemunitdir=$out/lib/systemd/system" ];
 
   postInstall = ''
     install -m 0755 tools/snep-send $out/bin/
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
     install -D -m644 src/neard.service $out/lib/systemd/system/neard.service
     install -D -m644 src/main.conf $out/etc/neard/main.conf
 
+    # INFO: the config option "--enable-test" would copy the apps to $out/lib/neard/test/ instead
     install -d $out/lib/neard
     install -m 0755 test/* $out/lib/neard/
     wrapPythonProgramsIn $out/lib/neard "$out $pythonPath"

From c0248c0c1f46f42ed736386e0d0ee67da5b329a6 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Mon, 28 Sep 2015 18:43:40 +0200
Subject: [PATCH 33/43] networking module: init 'wlanInterfaces' option

Configuration option for setting up virtual WLAN interfaces.

If the hardware NIC supports it, then multiple virtual WLAN interfaces can be
configured through the options of the new 'networking.wlanInterfaces' module.
For example, the following configuration transforms the device with the persistent
udev name 'wlp6s0' into a managed and a ad hoc device with the device names
'wlan-managed0' and 'wlan-adhoc0', respectively:

networking.wlanInterfaces = {
    "wlan-managed0" = {
        type = "managed";
        device = "wlp6s0";
    };
    "wlan-adhoc0" = {
        type = "ibss";
        device = "wlp6s0";
    };
};

Internally, a udev rule is created that matches wlp6s0 and runs a script which adds
the missing virtual interfaces and re-configures the wlp6s0 interface accordingly.
Once the new interfaces are created by the Linux kernel, the configuration of the
interfaces is managed by udev and systemd in the usual way.
---
 nixos/modules/tasks/network-interfaces.nix | 168 +++++++++++++++++++++
 1 file changed, 168 insertions(+)

diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 7af3160e2d42..f9410d75922f 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -46,6 +46,51 @@ let
     '';
   });
 
+  # Collect all interfaces that are defined for a device
+  # as device:interface key:value pairs.
+  wlanDeviceInterfaces =
+    let
+      allDevices = unique (mapAttrsToList (_: v: v.device) cfg.wlanInterfaces);
+      interfacesOfDevice = d: filterAttrs (_: v: v.device == d) cfg.wlanInterfaces;
+    in
+      genAttrs allDevices (d: interfacesOfDevice d);
+
+  # Convert device:interface key:value pairs into a list, and if it exists,
+  # place the interface which is named after the device at the beginning.
+  wlanListDeviceFirst = device: interfaces:
+    if hasAttr device interfaces
+    then [{"${device}"=interfaces.device; _iName=device;}] ++ mapAttrsToList (n: v: v//{_iName=n;}) (filterAttrs (n: _: n!=device) interfaces)
+    else mapAttrsToList (n: v: v // {_iName = n;}) interfaces;
+
+  # udev script that configures a physical wlan device and adds virtual interfaces
+  wlanDeviceUdevScript = device: interfaceList: pkgs.writeScript "wlan-${device}-udev-script" ''
+    #!${pkgs.stdenv.shell}
+
+    # Change the wireless phy device to a predictable name.
+    if [ -e "/sys/class/net/${device}/phy80211/name" ]; then
+      ${pkgs.iw}/bin/iw phy `${pkgs.coreutils}/bin/cat /sys/class/net/${device}/phy80211/name` set name ${device} || true
+    fi
+
+    # Crate new, virtual interfaces and configure them at the same time
+    ${flip concatMapStrings (drop 1 interfaceList) (i: ''
+    ${pkgs.iw}/bin/iw dev ${device} interface add ${i._iName} type ${i.type} \
+      ${optionalString (i.type == "mesh" && i.meshID != null) "mesh_id ${i.meshID}"} \
+      ${optionalString (i.type == "monitor" && i.flags != null) "flags ${i.flags}"} \
+      ${optionalString (i.type == "managed" && i.fourAddr != null) "4addr ${if i.fourAddr then "on" else "off"}"} \
+      ${optionalString (i.mac != null) "addr ${i.mac}"}
+    '')}
+
+    # Reconfigure and rename the default interface that already exists
+    ${flip concatMapStrings (take 1 interfaceList) (i: ''
+      ${pkgs.iw}/bin/iw dev ${device} set type ${i.type}
+      ${optionalString (i.type == "mesh" && i.meshID != null) "${pkgs.iw}/bin/iw dev ${device} set meshid ${i.meshID}"}
+      ${optionalString (i.type == "monitor" && i.flags != null) "${pkgs.iw}/bin/iw dev ${device} set monitor ${i.flags}"}
+      ${optionalString (i.type == "managed" && i.fourAddr != null) "${pkgs.iw}/bin/iw dev ${device} set 4addr ${if i.fourAddr then "on" else "off"}"}
+      ${optionalString (i.mac != null) "${pkgs.iproute}/bin/ip link set dev ${device} address ${i.mac}"}
+      ${optionalString (device != i._iName) "${pkgs.iproute}/bin/ip link set dev ${device} name ${i._iName}"}
+    '')}
+  '';
+
   # We must escape interfaces due to the systemd interpretation
   subsystemDevice = interface:
     "sys-subsystem-net-devices-${escapeSystemdPath interface}.device";
@@ -688,6 +733,110 @@ in
       };
     };
 
+    networking.wlanInterfaces = mkOption {
+      default = { };
+      example = {
+        "wlan-station0" = {
+            device = "wlp6s0";
+        };
+        "wlan-adhoc0" = {
+            type = "ibss";
+            device = "wlp6s0";
+            mac = "02:00:00:00:00:01";
+        };
+        "wlan-p2p0" = {
+            device = "wlp6s0";
+            mac = "02:00:00:00:00:02";
+        };
+        "wlan-ap0" = {
+            device = "wlp6s0";
+            mac = "02:00:00:00:00:03";
+        };
+      };
+      description =
+        ''
+          Creating multiple WLAN interfaces on top of one physical WLAN device (NIC).
+
+          The name of the WLAN interface corresponds to the name of the attribute.
+          A NIC is referenced by the persistent device name of the WLAN interface that
+          <literal>udev</literal> assigns to a NIC by default.
+          If a NIC supports multiple WLAN interfaces, then the one NIC can be used as
+          <literal>device</literal> for multiple WLAN interfaces.
+          If a NIC is used for creating WLAN interfaces, then the default WLAN interface
+          with a persistent device name form <literal>udev</literal> is not created.
+          A WLAN interface with the persistent name assigned from <literal>udev</literal>
+          would have to be created explicitly.
+        '';
+
+      type = types.attrsOf types.optionSet;
+
+      options = {
+
+        device = mkOption {
+          type = types.string;
+          example = "wlp6s0";
+          description = "The name of the underlying hardware WLAN device as assigned by <literal>udev</literal>.";
+        };
+
+        type = mkOption {
+          type = types.string;
+          default = "managed";
+          example = "ibss";
+          description = ''
+            The type of the WLAN interface. The type has to be either <literal>managed</literal>,
+            <literal>ibss</literal>, <literal>monitor</literal>, <literal>mesh</literal> or <literal>wds</literal>.
+            Also, the type has to be supported by the underlying hardware of the device.
+          '';
+        };
+
+        meshID = mkOption {
+          type = types.nullOr types.string;
+          default = null;
+          description = "MeshID of interface with type <literal>mesh</literal>.";
+        };
+
+        flags = mkOption {
+          type = types.nullOr types.string;
+          default = null;
+          example = "control";
+          description = ''
+            Flags for interface of type <literal>monitor</literal>. The valid flags are:
+            none:     no special flags
+            fcsfail:  show frames with FCS errors
+            control:  show control frames
+            otherbss: show frames from other BSSes
+            cook:     use cooked mode
+            active:   use active mode (ACK incoming unicast packets)
+          '';
+        };
+
+        fourAddr = mkOption {
+          type = types.nullOr types.bool;
+          default = null;
+          description = "Whether to enable <literal>4-address mode</literal> with type <literal>managed</literal>.";
+        };
+
+        mac = mkOption {
+          type = types.nullOr types.str;
+          default = null;
+          example = "02:00:00:00:00:01";
+          description = ''
+            MAC address to use for the device. If <literal>null</literal>, then the MAC of the
+            underlying hardware WLAN device is used.
+
+            INFO: Locally administered MAC addresses are of the form:
+            <itemizedlist>
+            <listitem>x2:xx:xx:xx:xx:xx</listitem>
+            <listitem>x6:xx:xx:xx:xx:xx</listitem>
+            <listitem>xA:xx:xx:xx:xx:xx</listitem>
+            <listitem>xE:xx:xx:xx:xx:xx</listitem>
+            </itemizedlist>
+          '';
+        };
+
+      };
+    };
+
     networking.useDHCP = mkOption {
       type = types.bool;
       default = true;
@@ -844,6 +993,25 @@ in
 
     virtualisation.vswitch = mkIf (cfg.vswitches != { }) { enable = true; };
 
+    services.udev.packages = mkIf (cfg.wlanInterfaces != {}) [
+      (pkgs.writeTextFile {
+        name = "99-zzz-wlanInterfaces-last.rules";
+        destination = "/etc/udev/rules.d/99-zzz-wlanInterfaces-last.rules";
+        text = ''
+          # If persistent udev device name is not used for an interface, then do not
+          # call systemd for that udev device name and only execute the script that
+          # modifies or prepares the WLAN interfaces. All other commands that would
+          # otherwise be executed when the udev device is added, like, e.g., the calling
+          # of systemd-sysctl or the activation of wpa_supplicant is disabled when the
+          # persistend udev device name is not usef for an interface.
+          ${flip (concatMapStringsSep "\n") (attrNames wlanDeviceInterfaces) (device:
+          let script = wlanDeviceUdevScript device (wlanListDeviceFirst device wlanDeviceInterfaces."${device}"); in
+          if hasAttr device cfg.wlanInterfaces
+          then ''ACTION=="add", SUBSYSTEM=="net", NAME=="${device}", ENV{DEVTYPE}=="wlan", RUN+="${script}"''
+          else ''ACTION=="add", SUBSYSTEM=="net", NAME=="${device}", ENV{DEVTYPE}=="wlan", NAME="", TAG-="systemd", RUN:="${script}"'')}
+        '';
+      }) ];
+
   };
 
 }

From 6dfb16730bb8348c9466260983fb313477611dec Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Thu, 1 Oct 2015 17:48:34 +0200
Subject: [PATCH 34/43] networking module: fix DocBook tags

---
 nixos/modules/tasks/network-interfaces.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index f9410d75922f..9ffede48bf52 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -826,10 +826,10 @@ in
 
             INFO: Locally administered MAC addresses are of the form:
             <itemizedlist>
-            <listitem>x2:xx:xx:xx:xx:xx</listitem>
-            <listitem>x6:xx:xx:xx:xx:xx</listitem>
-            <listitem>xA:xx:xx:xx:xx:xx</listitem>
-            <listitem>xE:xx:xx:xx:xx:xx</listitem>
+            <listitem><para>x2:xx:xx:xx:xx:xx</para></listitem>
+            <listitem><para>x6:xx:xx:xx:xx:xx</para></listitem>
+            <listitem><para>xA:xx:xx:xx:xx:xx</para></listitem>
+            <listitem><para>xE:xx:xx:xx:xx:xx</para></listitem>
             </itemizedlist>
           '';
         };

From c720f06f7c84bed458eecb78c37eaf993b6f1404 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Thu, 1 Oct 2015 17:52:04 +0200
Subject: [PATCH 35/43] linux kernel common config: re-enable NFC support

As test, Linux kernels were build successfully with NFC support for 3.18.x and
for 4.1.x.
---
 pkgs/os-specific/linux/kernel/common-config.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index ef35757fdb24..218532a695e0 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -478,8 +478,6 @@ with stdenv.lib;
   ''}
   ZRAM m
 
-  ${optionalString (versionAtLeast version "3.17") "NFC? n"}
-
   # Enable firmware loading via udev (legacy).
   ${optionalString (versionAtLeast version "3.17") ''
     FW_LOADER_USER_HELPER_FALLBACK y

From 5379504451c67b9773191d4cc56638072d3239d3 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Sat, 26 Sep 2015 06:25:01 -0700
Subject: [PATCH 36/43] Merge pull request #9834 from NixOS/rubies

Merge Ruby versions into one file
---
 .../development/interpreters/ruby/default.nix | 248 ++++++++++++++++++
 .../interpreters/ruby/patchsets.nix           | 126 +++++++++
 .../interpreters/ruby/ruby-1.9.3.nix          | 124 ---------
 .../interpreters/ruby/ruby-2.0.0.nix          | 103 --------
 .../interpreters/ruby/ruby-2.1.0.nix          | 120 ---------
 .../interpreters/ruby/ruby-2.1.1.nix          | 118 ---------
 .../interpreters/ruby/ruby-2.1.2.nix          | 117 ---------
 .../interpreters/ruby/ruby-2.1.3.nix          | 121 ---------
 .../interpreters/ruby/ruby-2.1.6.nix          | 124 ---------
 .../interpreters/ruby/ruby-2.2.0.nix          | 113 --------
 .../interpreters/ruby/ruby-2.2.2.nix          | 112 --------
 pkgs/top-level/all-packages.nix               |  24 +-
 12 files changed, 381 insertions(+), 1069 deletions(-)
 create mode 100644 pkgs/development/interpreters/ruby/default.nix
 create mode 100644 pkgs/development/interpreters/ruby/patchsets.nix
 delete mode 100644 pkgs/development/interpreters/ruby/ruby-1.9.3.nix
 delete mode 100644 pkgs/development/interpreters/ruby/ruby-2.0.0.nix
 delete mode 100644 pkgs/development/interpreters/ruby/ruby-2.1.0.nix
 delete mode 100644 pkgs/development/interpreters/ruby/ruby-2.1.1.nix
 delete mode 100644 pkgs/development/interpreters/ruby/ruby-2.1.2.nix
 delete mode 100644 pkgs/development/interpreters/ruby/ruby-2.1.3.nix
 delete mode 100644 pkgs/development/interpreters/ruby/ruby-2.1.6.nix
 delete mode 100644 pkgs/development/interpreters/ruby/ruby-2.2.0.nix
 delete mode 100644 pkgs/development/interpreters/ruby/ruby-2.2.2.nix

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
new file mode 100644
index 000000000000..89e0016f98de
--- /dev/null
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -0,0 +1,248 @@
+{ stdenv, lib, fetchurl, fetchFromSavannah, fetchFromGitHub
+, zlib, openssl, gdbm, ncurses, readline, groff, libyaml, libffi, autoreconfHook, bison
+, autoconf, darwin ? null
+} @ args:
+
+let
+  op = stdenv.lib.optional;
+  ops = stdenv.lib.optionals;
+  opString = stdenv.lib.optionalString;
+  patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; };
+  config = import ./config.nix { inherit fetchFromSavannah; };
+
+  generic = { majorVersion, minorVersion, teenyVersion, patchLevel, sha256 }: let
+    versionNoPatch = "${majorVersion}.${minorVersion}.${teenyVersion}";
+    version = "${versionNoPatch}-p${patchLevel}";
+    fullVersionName = if patchLevel != "0" && stdenv.lib.versionOlder versionNoPatch "2.1"
+      then version
+      else versionNoPatch;
+    tag = "v" + stdenv.lib.replaceChars ["." "p" "-"] ["_" "_" ""] fullVersionName;
+    isRuby21 = majorVersion == "2" && minorVersion == "1";
+    isRuby18 = majorVersion == "1" && minorVersion == "8";
+    baseruby = self.override { useRailsExpress = false; };
+    self = lib.makeOverridable (
+      { stdenv, lib, fetchurl, fetchFromSavannah, fetchFromGitHub
+      , useRailsExpress ? true
+      , zlib, zlibSupport ? true
+      , openssl, opensslSupport ? true
+      , gdbm, gdbmSupport ? true
+      , ncurses, readline, cursesSupport ? true
+      , groff, docSupport ? false
+      , libyaml, yamlSupport ? true
+      , libffi, fiddleSupport ? true
+      , autoreconfHook, bison, autoconf
+      , darwin ? null
+      }:
+      stdenv.mkDerivation rec {
+        inherit version;
+
+        name = "ruby-${version}";
+
+        src = if useRailsExpress then fetchFromGitHub {
+          owner  = "ruby";
+          repo   = "ruby";
+          rev    = tag;
+          sha256 = sha256.git;
+        } else fetchurl {
+          url = "http://cache.ruby-lang.org/pub/ruby/${majorVersion}.${minorVersion}/ruby-${fullVersionName}.tar.gz";
+          sha256 = sha256.src;
+        };
+
+        # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
+        NROFF = "${groff}/bin/nroff";
+
+        buildInputs = ops useRailsExpress [ autoreconfHook bison ]
+          ++ (op fiddleSupport libffi)
+          ++ (ops cursesSupport [ ncurses readline ])
+          ++ (op docSupport groff)
+          ++ (op zlibSupport zlib)
+          ++ (op opensslSupport openssl)
+          ++ (op gdbmSupport gdbm)
+          ++ (op yamlSupport libyaml)
+          # Looks like ruby fails to build on darwin without readline even if curses
+          # support is not enabled, so add readline to the build inputs if curses
+          # support is disabled (if it's enabled, we already have it) and we're
+          # running on darwin
+          ++ (op (!cursesSupport && stdenv.isDarwin) readline)
+          ++ (ops stdenv.isDarwin (with darwin; [ libiconv libobjc libunwind ]))
+          ++ op isRuby18 autoconf;
+
+        enableParallelBuilding = true;
+
+        patches = (import ./patchsets.nix {
+          inherit patchSet useRailsExpress ops patchLevel;
+        })."${versionNoPatch}";
+
+        postUnpack = opString isRuby21 ''
+          rm "$sourceRoot/enc/unicode/name2ctype.h"
+        '';
+
+        postPatch = opString (!isRuby18) (if isRuby21 then ''
+          rm tool/config_files.rb
+          cp ${config}/config.guess tool/
+          cp ${config}/config.sub tool/
+        '' else opString useRailsExpress ''
+          sed -i configure.in -e '/config.guess/d'
+          cp ${config}/config.guess tool/
+          cp ${config}/config.sub tool/
+        '');
+
+        configureFlags = ["--enable-shared" "--enable-pthread"]
+          ++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby"
+          ++ ops stdenv.isDarwin [
+            # on darwin, we have /usr/include/tk.h -- so the configure script detects
+            # that tk is installed
+            "--with-out-ext=tk"
+            # on yosemite, "generating encdb.h" will hang for a very long time without this flag
+            "--with-setjmp-type=setjmp"
+          ];
+
+        installFlags = stdenv.lib.optionalString docSupport "install-doc";
+        # Bundler tries to create this directory
+        postInstall = ''
+          # Bundler tries to create this directory
+          mkdir -pv $out/${passthru.gemPath}
+          mkdir -p $out/nix-support
+          cat > $out/nix-support/setup-hook <<EOF
+          addGemPath() {
+            addToSearchPath GEM_PATH \$1/${passthru.gemPath}
+          }
+
+          envHooks+=(addGemPath)
+          EOF
+        '' + opString useRailsExpress ''
+          rbConfig=$(find $out/lib/ruby -name rbconfig.rb)
+
+          # Prevent the baseruby from being included in the closure.
+          sed -i '/^  CONFIG\["BASERUBY"\]/d' $rbConfig
+          sed -i "s|'--with-baseruby=${baseruby}/bin/ruby'||" $rbConfig
+        '';
+
+        meta = {
+          license = stdenv.lib.licenses.ruby;
+          homepage = "http://www.ruby-lang.org/en/";
+          description = "The Ruby language";
+          platforms = stdenv.lib.platforms.all;
+        };
+
+        passthru = rec {
+          inherit majorVersion minorVersion teenyVersion patchLevel;
+          rubyEngine = "ruby";
+          baseRuby = baseruby;
+          libPath = "lib/${versionNoPatch}";
+          gemPath = "lib/${rubyEngine}/gems/${versionNoPatch}";
+        };
+      }
+    ) args; in self;
+
+in {
+  ruby_1_8_7 = generic {
+    majorVersion = "1";
+    minorVersion = "8";
+    teenyVersion = "7";
+    patchLevel = "374";
+    sha256 = {
+      src = "0v17cmm95f3xwa4kvza8xwbnfvfqcrym8cvqfvscn45bxsmfwvl7";
+      git = "1xddhxr0j26hpxfixvhqdscwk2ri846w2129fcfwfjzvy19igswx";
+    };
+  };
+
+  ruby_1_9_3 = generic {
+    majorVersion = "1";
+    minorVersion = "9";
+    teenyVersion = "3";
+    patchLevel = "551";
+    sha256 = {
+      src = "1s2ibg3s2iflzdv7rfxi1qqkvdbn2dq8gxdn0nxrb77ls5ffanxv";
+      git = "1r9xzzxmci2ajb34qb4y1w424mz878zdgzxkfp9w60agldxnb36s";
+    };
+  };
+
+  ruby_2_0_0 = generic {
+    majorVersion = "2";
+    minorVersion = "0";
+    teenyVersion = "0";
+    patchLevel = "645";
+    sha256 = {
+      src = "1azl3kbqqw3jvwfcsy6fdb7vmwz5w73fwpq1y1gblz79zzzqx7sy";
+      git = "14bnas1iif2shyaz4ylb0832x96y2mda52x0v0aglkvqmcz1cfxb";
+    };
+  };
+
+  ruby_2_1_0 = generic {
+    majorVersion = "2";
+    minorVersion = "1";
+    teenyVersion = "0";
+    patchLevel = "0";
+    sha256 = {
+      src = "17fhfbw8sr13rxfn58wvrhk2f5i88lkna2afn3gdjvprd8gyqf1m";
+      git = "12sn532yvznqfz85378ys0b9ggmj7w8ddhzc1pnnlx7mbyy7r2hx";
+    };
+  };
+
+  ruby_2_1_1 = generic {
+    majorVersion = "2";
+    minorVersion = "1";
+    teenyVersion = "1";
+    patchLevel = "0";
+    sha256 = {
+      src = "0hc9x3mazyvnk94gs19q8mbnanlzk8mv0hii77slkvc8mqqxyhy8";
+      git = "1v2ffvyd0xx1h1qd70431zczhvsdiyyw5kjxih4rszd5avzh5grl";
+    };
+  };
+
+  ruby_2_1_2 = generic {
+    majorVersion = "2";
+    minorVersion = "1";
+    teenyVersion = "2";
+    patchLevel = "353";
+    sha256 = {
+      src = "0db6krc2bd7yha8p96lcqrahjpsz7g7abhni134g708sh53n8apj";
+      git = "14f8w3zwngnxsgigffh6h9z3ng53xq8mk126xmwrsmz9n3ypm6l0";
+    };
+  };
+
+  ruby_2_1_3 = generic {
+    majorVersion = "2";
+    minorVersion = "1";
+    teenyVersion = "3";
+    patchLevel = "0";
+    sha256 = {
+      src = "00bz6jcbxgnllplk4b9lnyc3w8yd3pz5rn11rmca1s8cn6vvw608";
+      git = "1pnam9jry2l2mbji3gvrbb7jyisxl99xjz6l1qrccwnfinxxbmhv";
+    };
+  };
+
+  ruby_2_1_6 = generic {
+    majorVersion = "2";
+    minorVersion = "1";
+    teenyVersion = "6";
+    patchLevel = "0";
+    sha256 = {
+      src = "1r4bs8lfwsypbcf8j2lpv3by40729vp5mh697njizj97fjp644qy";
+      git = "18kbjsbmgv6l3p1qxgmjnhh4jl7xdk3c20ycjpp62vrhq7pyzjsm";
+    };
+  };
+
+  ruby_2_2_0 = generic {
+    majorVersion = "2";
+    minorVersion = "2";
+    teenyVersion = "0";
+    patchLevel = "0";
+    sha256 = {
+      src = "1z2092fbpc2qkv1j3yj7jdz7qwvqpxqpmcnkphpjcpgvmfaf6wbn";
+      git = "1w7rr2nq1bbw6aiagddzlrr3rl95kk33x4pv6570nm072g55ybpi";
+    };
+  };
+
+  ruby_2_2_2 = generic {
+    majorVersion = "2";
+    minorVersion = "2";
+    teenyVersion = "2";
+    patchLevel = "0";
+    sha256 = {
+      src = "0i4v7l8pnam0by2cza12zldlhrffqchwb2m9shlnp7j2gqqhzz2z";
+      git = "08mw1ql2ghy483cp8xzzm78q17simn4l6phgm2gah7kjh9y3vbrn";
+    };
+  };
+}
diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix
new file mode 100644
index 000000000000..44f4c25a6858
--- /dev/null
+++ b/pkgs/development/interpreters/ruby/patchsets.nix
@@ -0,0 +1,126 @@
+{ patchSet, useRailsExpress, ops, patchLevel }:
+
+let self = rec {
+  "1.8.7" = [
+    "${patchSet}/patches/ruby/1.8.7/p${patchLevel}/railsexpress/01-ignore-generated-files.patch"
+    "${patchSet}/patches/ruby/1.8.7/p${patchLevel}/railsexpress/02-fix-tests-for-osx.patch"
+    "${patchSet}/patches/ruby/1.8.7/p${patchLevel}/railsexpress/03-sigvtalrm-fix.patch"
+    "${patchSet}/patches/ruby/1.8.7/p${patchLevel}/railsexpress/04-railsbench-gc-patch.patch"
+    "${patchSet}/patches/ruby/1.8.7/p${patchLevel}/railsexpress/05-display-full-stack-trace.patch"
+    "${patchSet}/patches/ruby/1.8.7/p${patchLevel}/railsexpress/06-better-source-file-tracing.patch"
+    "${patchSet}/patches/ruby/1.8.7/p${patchLevel}/railsexpress/07-heap-dump-support.patch"
+    "${patchSet}/patches/ruby/1.8.7/p${patchLevel}/railsexpress/08-fork-support-for-gc-logging.patch"
+    "${patchSet}/patches/ruby/1.8.7/p${patchLevel}/railsexpress/09-track-malloc-size.patch"
+    "${patchSet}/patches/ruby/1.8.7/p${patchLevel}/railsexpress/10-track-object-allocation.patch"
+    "${patchSet}/patches/ruby/1.8.7/p${patchLevel}/railsexpress/11-expose-heap-slots.patch"
+    "${patchSet}/patches/ruby/1.8.7/p${patchLevel}/railsexpress/12-fix-heap-size-growth-logic.patch"
+    "${patchSet}/patches/ruby/1.8.7/p${patchLevel}/railsexpress/13-heap-slot-size.patch"
+    "${patchSet}/patches/ruby/1.8.7/p${patchLevel}/railsexpress/14-add-trace-stats-enabled-methods.patch"
+    "${patchSet}/patches/ruby/1.8.7/p${patchLevel}/railsexpress/15-track-live-dataset-size.patch"
+    "${patchSet}/patches/ruby/1.8.7/p${patchLevel}/railsexpress/16-add-object-size-information-to-heap-dump.patch"
+    "${patchSet}/patches/ruby/1.8.7/p${patchLevel}/railsexpress/17-caller-for-all-threads.patch"
+  ];
+  "1.9.3" = [
+    ./ruby19-parallel-install.patch
+    ./bitperfect-rdoc.patch
+  ] ++ ops useRailsExpress [
+    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/01-fix-make-clean.patch"
+    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/02-zero-broken-tests.patch"
+    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/03-railsbench-gc.patch"
+    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/04-display-more-detailed-stack-trace.patch"
+    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/05-fork-support-for-gc-logging.patch"
+    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/06-track-live-dataset-size.patch"
+    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/07-webrick_204_304_keep_alive_fix.patch"
+    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/08-export-a-few-more-symbols-for-ruby-prof.patch"
+    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/09-thread-variables.patch"
+    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/10-faster-loading.patch"
+    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/11-falcon-st-opt.patch"
+    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/12-falcon-sparse-array.patch"
+    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/13-falcon-array-queue.patch"
+    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/14-railsbench-gc-fixes.patch"
+    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/15-show-full-backtrace-on-stack-overflow.patch"
+    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/16-configurable-fiber-stack-sizes.patch"
+    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/17-backport-psych-20.patch"
+    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/18-fix-missing-c-return-event.patch"
+    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/19-fix-process-daemon-call.patch"
+  ];
+  "2.0.0" = ops useRailsExpress [
+    "${patchSet}/patches/ruby/2.0.0/p${patchLevel}/railsexpress/01-zero-broken-tests.patch"
+    "${patchSet}/patches/ruby/2.0.0/p${patchLevel}/railsexpress/02-railsexpress-gc.patch"
+    "${patchSet}/patches/ruby/2.0.0/p${patchLevel}/railsexpress/03-display-more-detailed-stack-trace.patch"
+    "${patchSet}/patches/ruby/2.0.0/p${patchLevel}/railsexpress/04-show-full-backtrace-on-stack-overflow.patch"
+  ];
+  "2.1.0" = ops useRailsExpress [
+    "${patchSet}/patches/ruby/2.1.0/railsexpress/01-current-2.1.1-fixes.patch"
+    "${patchSet}/patches/ruby/2.1.0/railsexpress/02-zero-broken-tests.patch"
+    "${patchSet}/patches/ruby/2.1.0/railsexpress/03-improve-gc-stats.patch"
+    "${patchSet}/patches/ruby/2.1.0/railsexpress/04-display-more-detailed-stack-trace.patch"
+    "${patchSet}/patches/ruby/2.1.0/railsexpress/05-show-full-backtrace-on-stack-overflow.patch"
+    "${patchSet}/patches/ruby/2.1.0/railsexpress/06-fix-missing-c-return-event.patch"
+    "${patchSet}/patches/ruby/2.1.0/railsexpress/07-backport-006e66b6680f60adfb434ee7397f0dbc77de7873.patch"
+    "${patchSet}/patches/ruby/2.1.0/railsexpress/08-funny-falcon-stc-density.patch"
+    "${patchSet}/patches/ruby/2.1.0/railsexpress/09-funny-falcon-stc-pool-allocation.patch"
+    "${patchSet}/patches/ruby/2.1.0/railsexpress/10-aman-opt-aset-aref-str.patch"
+    "${patchSet}/patches/ruby/2.1.0/railsexpress/11-funny-falcon-method-cache.patch"
+    "${patchSet}/patches/ruby/2.1.0/railsexpress/12-backport-r44370.patch"
+  ];
+  "2.1.1" = ops useRailsExpress [
+    "${patchSet}/patches/ruby/2.1.0/railsexpress/01-zero-broken-tests.patch"
+    "${patchSet}/patches/ruby/2.1.0/railsexpress/02-improve-gc-stats.patch"
+    "${patchSet}/patches/ruby/2.1.0/railsexpress/03-display-more-detailed-stack-trace.patch"
+    "${patchSet}/patches/ruby/2.1.0/railsexpress/04-show-full-backtrace-on-stack-overflow.patch"
+    "${patchSet}/patches/ruby/2.1.0/railsexpress/05-fix-missing-c-return-event.patch"
+    "${patchSet}/patches/ruby/2.1.0/railsexpress/07-backport-006e66b6680f60adfb434ee7397f0dbc77de7873.patch"
+    "${patchSet}/patches/ruby/2.1.0/railsexpress/08-funny-falcon-stc-density.patch"
+    "${patchSet}/patches/ruby/2.1.0/railsexpress/09-funny-falcon-stc-pool-allocation.patch"
+    "${patchSet}/patches/ruby/2.1.0/railsexpress/10-aman-opt-aset-aref-str.patch"
+    "${patchSet}/patches/ruby/2.1.0/railsexpress/11-funny-falcon-method-cache.patch"
+    "${patchSet}/patches/ruby/2.1.0/railsexpress/12-backport-r44370.patch"
+  ];
+  "2.1.2" = ops useRailsExpress [
+    "${patchSet}/patches/ruby/2.1.2/railsexpress/01-zero-broken-tests.patch"
+    "${patchSet}/patches/ruby/2.1.2/railsexpress/02-improve-gc-stats.patch"
+    "${patchSet}/patches/ruby/2.1.2/railsexpress/03-display-more-detailed-stack-trace.patch"
+    "${patchSet}/patches/ruby/2.1.2/railsexpress/04-show-full-backtrace-on-stack-overflow.patch"
+    "${patchSet}/patches/ruby/2.1.2/railsexpress/05-fix-missing-c-return-event.patch"
+    "${patchSet}/patches/ruby/2.1.2/railsexpress/06-backport-006e66b6680f60adfb434ee7397f0dbc77de7873.patch"
+    "${patchSet}/patches/ruby/2.1.2/railsexpress/07-funny-falcon-stc-density.patch"
+    "${patchSet}/patches/ruby/2.1.2/railsexpress/08-funny-falcon-stc-pool-allocation.patch"
+    "${patchSet}/patches/ruby/2.1.2/railsexpress/09-aman-opt-aset-aref-str.patch"
+    "${patchSet}/patches/ruby/2.1.2/railsexpress/10-funny-falcon-method-cache.patch"
+  ];
+  "2.1.3" = ops useRailsExpress [
+    "${patchSet}/patches/ruby/2.1.3/railsexpress/01-zero-broken-tests.patch"
+    "${patchSet}/patches/ruby/2.1.3/railsexpress/02-improve-gc-stats.patch"
+    "${patchSet}/patches/ruby/2.1.3/railsexpress/03-display-more-detailed-stack-trace.patch"
+    "${patchSet}/patches/ruby/2.1.3/railsexpress/04-show-full-backtrace-on-stack-overflow.patch"
+    "${patchSet}/patches/ruby/2.1.3/railsexpress/05-funny-falcon-stc-density.patch"
+    "${patchSet}/patches/ruby/2.1.3/railsexpress/06-funny-falcon-stc-pool-allocation.patch"
+    "${patchSet}/patches/ruby/2.1.3/railsexpress/07-aman-opt-aset-aref-str.patch"
+    "${patchSet}/patches/ruby/2.1.3/railsexpress/08-funny-falcon-method-cache.patch"
+  ];
+  "2.1.6" = ops useRailsExpress [
+    "${patchSet}/patches/ruby/2.1.6/railsexpress/01-zero-broken-tests.patch"
+    "${patchSet}/patches/ruby/2.1.6/railsexpress/02-improve-gc-stats.patch"
+    "${patchSet}/patches/ruby/2.1.6/railsexpress/03-display-more-detailed-stack-trace.patch"
+    "${patchSet}/patches/ruby/2.1.6/railsexpress/04-show-full-backtrace-on-stack-overflow.patch"
+    "${patchSet}/patches/ruby/2.1.6/railsexpress/05-funny-falcon-stc-density.patch"
+    "${patchSet}/patches/ruby/2.1.6/railsexpress/06-funny-falcon-stc-pool-allocation.patch"
+    "${patchSet}/patches/ruby/2.1.6/railsexpress/07-aman-opt-aset-aref-str.patch"
+    "${patchSet}/patches/ruby/2.1.6/railsexpress/08-funny-falcon-method-cache.patch"
+    "${patchSet}/patches/ruby/2.1.6/railsexpress/09-heap-dump-support.patch"
+  ];
+  "2.2.0" = ops useRailsExpress [
+    "${patchSet}/patches/ruby/2.2.0/railsexpress/01-zero-broken-tests.patch"
+    "${patchSet}/patches/ruby/2.2.0/railsexpress/02-improve-gc-stats.patch"
+    "${patchSet}/patches/ruby/2.2.0/railsexpress/03-display-more-detailed-stack-trace.patch"
+    "${patchSet}/patches/ruby/2.2.0/railsexpress/04-backport-401c8bb.patch"
+    "${patchSet}/patches/ruby/2.2.0/railsexpress/05-fix-packed-bitfield-compat-warning-for-older-gccs.patch"
+  ];
+  "2.2.2" = ops useRailsExpress [
+    "${patchSet}/patches/ruby/2.2.2/railsexpress/01-zero-broken-tests.patch"
+    "${patchSet}/patches/ruby/2.2.2/railsexpress/02-improve-gc-stats.patch"
+    "${patchSet}/patches/ruby/2.2.2/railsexpress/03-display-more-detailed-stack-trace.patch"
+    "${patchSet}/patches/ruby/2.2.2/railsexpress/04-backported-bugfixes-222.patch"
+  ];
+}; in self
diff --git a/pkgs/development/interpreters/ruby/ruby-1.9.3.nix b/pkgs/development/interpreters/ruby/ruby-1.9.3.nix
deleted file mode 100644
index 1c4318e01686..000000000000
--- a/pkgs/development/interpreters/ruby/ruby-1.9.3.nix
+++ /dev/null
@@ -1,124 +0,0 @@
-{ stdenv, lib, fetchurl, fetchFromGitHub
-, zlib, zlibSupport ? true
-, openssl, opensslSupport ? true
-, gdbm, gdbmSupport ? true
-, ncurses, readline, cursesSupport ? true
-, groff, docSupport ? false
-, libyaml, yamlSupport ? true
-, ruby_1_9_3, autoreconfHook, bison, useRailsExpress ? true
-, libiconv, libobjc
-}:
-
-let
-  op = stdenv.lib.optional;
-  ops = stdenv.lib.optionals;
-  patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; };
-  baseruby = ruby_1_9_3.override { useRailsExpress = false; };
-in
-
-stdenv.mkDerivation rec {
-  version = with passthru; "${majorVersion}.${minorVersion}.${teenyVersion}-p${patchLevel}";
-
-  name = "ruby-${version}";
-
-  src = if useRailsExpress then fetchFromGitHub {
-    owner  = "ruby";
-    repo   = "ruby";
-    rev    = "v1_9_3_${passthru.patchLevel}";
-    sha256 = "1r9xzzxmci2ajb34qb4y1w424mz878zdgzxkfp9w60agldxnb36s";
-  } else fetchurl {
-    url = "http://cache.ruby-lang.org/pub/ruby/1.9/${name}.tar.bz2";
-    sha256 = "07kpvv2z7g6shflls7fyfga8giifahwlnl30l49qdm9i6izf7idh";
-  };
-
-  # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
-  NROFF = "${groff}/bin/nroff";
-
-  buildInputs = ops useRailsExpress [ autoreconfHook bison ]
-    ++ (ops cursesSupport [ ncurses readline ] )
-    ++ (op docSupport groff )
-    ++ (op zlibSupport zlib)
-    ++ (op opensslSupport openssl)
-    ++ (op gdbmSupport gdbm)
-    ++ (op yamlSupport libyaml)
-    # Looks like ruby fails to build on darwin without readline even if curses
-    # support is not enabled, so add readline to the build inputs if curses
-    # support is disabled (if it's enabled, we already have it) and we're
-    # running on darwin
-    ++ (op (!cursesSupport && stdenv.isDarwin) readline)
-    ++ (ops stdenv.isDarwin [ libiconv libobjc ]);
-
-  enableParallelBuilding = true;
-
-  patches = [
-    ./ruby19-parallel-install.patch
-    ./bitperfect-rdoc.patch
-  ] ++ ops useRailsExpress [
-    "${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/01-fix-make-clean.patch"
-    "${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/02-zero-broken-tests.patch"
-    "${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/03-railsbench-gc.patch"
-    "${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/04-display-more-detailed-stack-trace.patch"
-    "${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/05-fork-support-for-gc-logging.patch"
-    "${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/06-track-live-dataset-size.patch"
-    "${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/07-webrick_204_304_keep_alive_fix.patch"
-    "${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/08-export-a-few-more-symbols-for-ruby-prof.patch"
-    "${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/09-thread-variables.patch"
-    "${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/10-faster-loading.patch"
-    "${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/11-falcon-st-opt.patch"
-    "${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/12-falcon-sparse-array.patch"
-    "${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/13-falcon-array-queue.patch"
-    "${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/14-railsbench-gc-fixes.patch"
-    "${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/15-show-full-backtrace-on-stack-overflow.patch"
-    "${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/16-configurable-fiber-stack-sizes.patch"
-    "${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/17-backport-psych-20.patch"
-    "${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/18-fix-missing-c-return-event.patch"
-    "${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/19-fix-process-daemon-call.patch"
-  ];
-
-  configureFlags = [ "--enable-shared" "--enable-pthread" ]
-    ++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby"
-    # on darwin, we have /usr/include/tk.h -- so the configure script detects
-    # that tk is installed
-    ++ ( if stdenv.isDarwin then [ "--with-out-ext=tk " ] else [ ]);
-
-  installFlags = stdenv.lib.optionalString docSupport "install-doc";
-
-  CFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.7";
-
-  postInstall = ''
-    # Bundler tries to create this directory
-    mkdir -pv $out/${passthru.gemPath}
-    mkdir -p $out/nix-support
-    cat > $out/nix-support/setup-hook <<EOF
-    addGemPath() {
-      addToSearchPath GEM_PATH \$1/${passthru.gemPath}
-    }
-
-    envHooks+=(addGemPath)
-    EOF
-  '' + lib.optionalString useRailsExpress ''
-    rbConfig=$(find $out/lib/ruby -name rbconfig.rb)
-
-    # Prevent the baseruby from being included in the closure.
-    sed -i '/^  CONFIG\["BASERUBY"\]/d' $rbConfig
-    sed -i "s|'--with-baseruby=${baseruby}/bin/ruby'||" $rbConfig
-  '';
-
-  meta = with stdenv.lib; {
-    license     = licenses.ruby;
-    homepage    = "http://www.ruby-lang.org/en/";
-    description = "The Ruby language";
-    maintainers = with maintainers; [ lovek323 ];
-    platforms   = platforms.all;
-  };
-
-  passthru = rec {
-    majorVersion = "1";
-    minorVersion = "9";
-    teenyVersion = "3";
-    patchLevel = "551";
-    rubyEngine = "ruby";
-    libPath = "lib/${rubyEngine}/${majorVersion}.${minorVersion}.${teenyVersion}";
-    gemPath = "lib/${rubyEngine}/gems/${majorVersion}.${minorVersion}.${teenyVersion}";
-  };
-}
diff --git a/pkgs/development/interpreters/ruby/ruby-2.0.0.nix b/pkgs/development/interpreters/ruby/ruby-2.0.0.nix
deleted file mode 100644
index dc6c70b676d4..000000000000
--- a/pkgs/development/interpreters/ruby/ruby-2.0.0.nix
+++ /dev/null
@@ -1,103 +0,0 @@
-{ stdenv, lib, fetchurl, fetchFromGitHub
-, zlib, zlibSupport ? true
-, openssl, opensslSupport ? true
-, gdbm, gdbmSupport ? true
-, ncurses, readline, cursesSupport ? true
-, groff, docSupport ? false
-, libyaml, yamlSupport ? true
-, libffi, fiddleSupport ? true
-, ruby_2_0_0, autoreconfHook, bison, useRailsExpress ? true
-}:
-
-let
-  op = stdenv.lib.optional;
-  ops = stdenv.lib.optionals;
-  patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; };
-  baseruby = ruby_2_0_0.override { useRailsExpress = false; };
-in
-
-stdenv.mkDerivation rec {
-  version = with passthru; "${majorVersion}.${minorVersion}.${teenyVersion}-p${patchLevel}";
-
-  name = "ruby-${version}";
-
-  src = if useRailsExpress then fetchFromGitHub {
-    owner  = "ruby";
-    repo   = "ruby";
-    rev    = "v2_0_0_${passthru.patchLevel}";
-    sha256 = "14bnas1iif2shyaz4ylb0832x96y2mda52x0v0aglkvqmcz1cfxb";
-  } else fetchurl {
-    url = "https://cache.ruby-lang.org/pub/ruby/2.0/${name}.tar.bz2";
-    sha256 = "1sc36qxqhziqbrvp99z4qdx9j0f8r1xhcbb6scb3m4nb02cwzk9d";
-  };
-
-  # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
-  NROFF = "${groff}/bin/nroff";
-
-  buildInputs = ops useRailsExpress [ autoreconfHook bison ]
-    ++ (op fiddleSupport libffi)
-    ++ (ops cursesSupport [ ncurses readline ] )
-    ++ (op docSupport groff )
-    ++ (op zlibSupport zlib)
-    ++ (op opensslSupport openssl)
-    ++ (op gdbmSupport gdbm)
-    ++ (op yamlSupport libyaml)
-    # Looks like ruby fails to build on darwin without readline even if curses
-    # support is not enabled, so add readline to the build inputs if curses
-    # support is disabled (if it's enabled, we already have it) and we're
-    # running on darwin
-    ++ (op (!cursesSupport && stdenv.isDarwin) readline);
-
-  enableParallelBuilding = true;
-
-  patches = ops useRailsExpress [
-    "${patchSet}/patches/ruby/2.0.0/p${passthru.patchLevel}/railsexpress/01-zero-broken-tests.patch"
-    "${patchSet}/patches/ruby/2.0.0/p${passthru.patchLevel}/railsexpress/02-railsexpress-gc.patch"
-    "${patchSet}/patches/ruby/2.0.0/p${passthru.patchLevel}/railsexpress/03-display-more-detailed-stack-trace.patch"
-    "${patchSet}/patches/ruby/2.0.0/p${passthru.patchLevel}/railsexpress/04-show-full-backtrace-on-stack-overflow.patch"
-  ];
-
-  configureFlags = ["--enable-shared" ]
-    ++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby"
-    # on darwin, we have /usr/include/tk.h -- so the configure script detects
-    # that tk is installed
-    ++ ( if stdenv.isDarwin then [ "--with-out-ext=tk " ] else [ ]);
-
-  installFlags = stdenv.lib.optionalString docSupport "install-doc";
-  # Bundler tries to create this directory
-  postInstall = ''
-    # Bundler tries to create this directory
-    mkdir -pv $out/${passthru.gemPath}
-    mkdir -p $out/nix-support
-    cat > $out/nix-support/setup-hook <<EOF
-    addGemPath() {
-      addToSearchPath GEM_PATH \$1/${passthru.gemPath}
-    }
-
-    envHooks+=(addGemPath)
-    EOF
-  '' + lib.optionalString useRailsExpress ''
-    rbConfig=$(find $out/lib/ruby -name rbconfig.rb)
-
-    # Prevent the baseruby from being included in the closure.
-    sed -i '/^  CONFIG\["BASERUBY"\]/d' $rbConfig
-    sed -i "s|'--with-baseruby=${baseruby}/bin/ruby'||" $rbConfig
-  '';
-
-  meta = {
-    license = stdenv.lib.licenses.ruby;
-    homepage = "http://www.ruby-lang.org/en/";
-    description = "The Ruby language";
-    platforms = stdenv.lib.platforms.all;
-  };
-
-  passthru = rec {
-    majorVersion = "2";
-    minorVersion = "0";
-    teenyVersion = "0";
-    patchLevel = "645";
-    rubyEngine = "ruby";
-    libPath = "lib/${rubyEngine}/${majorVersion}.${minorVersion}.${teenyVersion}";
-    gemPath = "lib/${rubyEngine}/gems/${majorVersion}.${minorVersion}.${teenyVersion}";
-  };
-}
diff --git a/pkgs/development/interpreters/ruby/ruby-2.1.0.nix b/pkgs/development/interpreters/ruby/ruby-2.1.0.nix
deleted file mode 100644
index 0fe9daa50e4d..000000000000
--- a/pkgs/development/interpreters/ruby/ruby-2.1.0.nix
+++ /dev/null
@@ -1,120 +0,0 @@
-{ stdenv, lib, fetchurl, fetchFromSavannah, fetchFromGitHub
-, zlib, zlibSupport ? true
-, openssl, opensslSupport ? true
-, gdbm, gdbmSupport ? true
-, ncurses, readline, cursesSupport ? true
-, groff, docSupport ? false
-, libyaml, yamlSupport ? true
-, libffi, fiddleSupport ? true
-, ruby_2_1_0, autoreconfHook, bison, useRailsExpress ? true
-}:
-
-let
-  op = stdenv.lib.optional;
-  ops = stdenv.lib.optionals;
-  patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; };
-  config = import ./config.nix { inherit fetchFromSavannah; };
-  baseruby = ruby_2_1_0.override { useRailsExpress = false; };
-in
-
-stdenv.mkDerivation rec {
-  version = with passthru; "${majorVersion}.${minorVersion}.${teenyVersion}-p${patchLevel}";
-
-  name = "ruby-${version}";
-
-  src = if useRailsExpress then fetchFromGitHub {
-    owner  = "ruby";
-    repo   = "ruby";
-    rev    = "v2_1_0";
-    sha256 = "12sn532yvznqfz85378ys0b9ggmj7w8ddhzc1pnnlx7mbyy7r2hx";
-  } else fetchurl {
-    url = "http://cache.ruby-lang.org/pub/ruby/2.1/ruby-2.1.0.tar.gz";
-    sha256 = "17fhfbw8sr13rxfn58wvrhk2f5i88lkna2afn3gdjvprd8gyqf1m";
-  };
-
-  # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
-  NROFF = "${groff}/bin/nroff";
-
-  buildInputs = ops useRailsExpress [ autoreconfHook bison ]
-    ++ (op fiddleSupport libffi)
-    ++ (ops cursesSupport [ ncurses readline ] )
-    ++ (op docSupport groff )
-    ++ (op zlibSupport zlib)
-    ++ (op opensslSupport openssl)
-    ++ (op gdbmSupport gdbm)
-    ++ (op yamlSupport libyaml)
-    # Looks like ruby fails to build on darwin without readline even if curses
-    # support is not enabled, so add readline to the build inputs if curses
-    # support is disabled (if it's enabled, we already have it) and we're
-    # running on darwin
-    ++ (op (!cursesSupport && stdenv.isDarwin) readline);
-
-  enableParallelBuilding = true;
-
-  patches = ops useRailsExpress [
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/01-current-2.1.1-fixes.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/02-zero-broken-tests.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/03-improve-gc-stats.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/04-display-more-detailed-stack-trace.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/05-show-full-backtrace-on-stack-overflow.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/06-fix-missing-c-return-event.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/07-backport-006e66b6680f60adfb434ee7397f0dbc77de7873.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/08-funny-falcon-stc-density.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/09-funny-falcon-stc-pool-allocation.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/10-aman-opt-aset-aref-str.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/11-funny-falcon-method-cache.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/12-backport-r44370.patch"
-  ];
-
-  # Ruby >= 2.1.0 tries to download config.{guess,sub}
-  postPatch = ''
-    rm tool/config_files.rb
-    cp ${config}/config.guess tool/
-    cp ${config}/config.sub tool/
-  '';
-
-  configureFlags = ["--enable-shared" ]
-    ++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby"
-    # on darwin, we have /usr/include/tk.h -- so the configure script detects
-    # that tk is installed
-    ++ ( if stdenv.isDarwin then [ "--with-out-ext=tk " ] else [ ]);
-
-  installFlags = stdenv.lib.optionalString docSupport "install-doc";
-  # Bundler tries to create this directory
-  postInstall = ''
-    # Bundler tries to create this directory
-    mkdir -pv $out/${passthru.gemPath}
-    mkdir -p $out/nix-support
-    cat > $out/nix-support/setup-hook <<EOF
-    addGemPath() {
-      addToSearchPath GEM_PATH \$1/${passthru.gemPath}
-    }
-
-    envHooks+=(addGemPath)
-    EOF
-  '' + lib.optionalString useRailsExpress ''
-    rbConfig=$(find $out/lib/ruby -name rbconfig.rb)
-
-    # Prevent the baseruby from being included in the closure.
-    sed -i '/^  CONFIG\["BASERUBY"\]/d' $rbConfig
-    sed -i "s|'--with-baseruby=${baseruby}/bin/ruby'||" $rbConfig
-  '';
-
-
-  meta = {
-    license = stdenv.lib.licenses.ruby;
-    homepage = "http://www.ruby-lang.org/en/";
-    description = "The Ruby language";
-    platforms = stdenv.lib.platforms.all;
-  };
-
-  passthru = rec {
-    majorVersion = "2";
-    minorVersion = "1";
-    teenyVersion = "0";
-    patchLevel = "0";
-    rubyEngine = "ruby";
-    libPath = "lib/${rubyEngine}/${majorVersion}.${minorVersion}.${teenyVersion}";
-    gemPath = "lib/${rubyEngine}/gems/${majorVersion}.${minorVersion}.${teenyVersion}";
-  };
-}
diff --git a/pkgs/development/interpreters/ruby/ruby-2.1.1.nix b/pkgs/development/interpreters/ruby/ruby-2.1.1.nix
deleted file mode 100644
index 8b2c04e853f8..000000000000
--- a/pkgs/development/interpreters/ruby/ruby-2.1.1.nix
+++ /dev/null
@@ -1,118 +0,0 @@
-{ stdenv, lib, fetchurl, fetchFromSavannah, fetchFromGitHub
-, zlib, zlibSupport ? true
-, openssl, opensslSupport ? true
-, gdbm, gdbmSupport ? true
-, ncurses, readline, cursesSupport ? true
-, groff, docSupport ? false
-, libyaml, yamlSupport ? true
-, libffi, fiddleSupport ? true
-, ruby_2_1_1, autoreconfHook, bison, useRailsExpress ? true
-}:
-
-let
-  op = stdenv.lib.optional;
-  ops = stdenv.lib.optionals;
-  patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; };
-  config = import ./config.nix { inherit fetchFromSavannah; };
-  baseruby = ruby_2_1_1.override { useRailsExpress = false; };
-in
-
-stdenv.mkDerivation rec {
-  version = with passthru; "${majorVersion}.${minorVersion}.${teenyVersion}-p${patchLevel}";
-
-  name = "ruby-${version}";
-
-  src = if useRailsExpress then fetchFromGitHub {
-    owner  = "ruby";
-    repo   = "ruby";
-    rev    = "v2_1_1";
-    sha256 = "1v2ffvyd0xx1h1qd70431zczhvsdiyyw5kjxih4rszd5avzh5grl";
-  } else fetchurl {
-    url = "http://cache.ruby-lang.org/pub/ruby/2.1/ruby-2.1.1.tar.gz";
-    sha256 = "0hc9x3mazyvnk94gs19q8mbnanlzk8mv0hii77slkvc8mqqxyhy8";
-  };
-
-  # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
-  NROFF = "${groff}/bin/nroff";
-
-  buildInputs = ops useRailsExpress [ autoreconfHook bison ]
-    ++ (op fiddleSupport libffi)
-    ++ (ops cursesSupport [ ncurses readline ] )
-    ++ (op docSupport groff )
-    ++ (op zlibSupport zlib)
-    ++ (op opensslSupport openssl)
-    ++ (op gdbmSupport gdbm)
-    ++ (op yamlSupport libyaml)
-    # Looks like ruby fails to build on darwin without readline even if curses
-    # support is not enabled, so add readline to the build inputs if curses
-    # support is disabled (if it's enabled, we already have it) and we're
-    # running on darwin
-    ++ (op (!cursesSupport && stdenv.isDarwin) readline);
-
-  enableParallelBuilding = true;
-
-  patches = ops useRailsExpress [
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/01-zero-broken-tests.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/02-improve-gc-stats.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/03-display-more-detailed-stack-trace.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/04-show-full-backtrace-on-stack-overflow.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/05-fix-missing-c-return-event.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/07-backport-006e66b6680f60adfb434ee7397f0dbc77de7873.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/08-funny-falcon-stc-density.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/09-funny-falcon-stc-pool-allocation.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/10-aman-opt-aset-aref-str.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/11-funny-falcon-method-cache.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/12-backport-r44370.patch"
-  ];
-
-  # Ruby >= 2.1.0 tries to download config.{guess,sub}
-  postPatch = ''
-    rm tool/config_files.rb
-    cp ${config}/config.guess tool/
-    cp ${config}/config.sub tool/
-  '';
-
-  configureFlags = ["--enable-shared" ]
-    ++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby"
-    # on darwin, we have /usr/include/tk.h -- so the configure script detects
-    # that tk is installed
-    ++ ( if stdenv.isDarwin then [ "--with-out-ext=tk " ] else [ ]);
-
-  installFlags = stdenv.lib.optionalString docSupport "install-doc";
-  # Bundler tries to create this directory
-  postInstall = ''
-    # Bundler tries to create this directory
-    mkdir -pv $out/${passthru.gemPath}
-    mkdir -p $out/nix-support
-    cat > $out/nix-support/setup-hook <<EOF
-    addGemPath() {
-      addToSearchPath GEM_PATH \$1/${passthru.gemPath}
-    }
-
-    envHooks+=(addGemPath)
-    EOF
-  '' + lib.optionalString useRailsExpress ''
-    rbConfig=$(find $out/lib/ruby -name rbconfig.rb)
-
-    # Prevent the baseruby from being included in the closure.
-    sed -i '/^  CONFIG\["BASERUBY"\]/d' $rbConfig
-    sed -i "s|'--with-baseruby=${baseruby}/bin/ruby'||" $rbConfig
-  '';
-
-  meta = {
-    license = stdenv.lib.licenses.ruby;
-    homepage = "http://www.ruby-lang.org/en/";
-    description = "The Ruby language";
-    platforms = stdenv.lib.platforms.all;
-  };
-
-  passthru = rec {
-    majorVersion = "2";
-    minorVersion = "1";
-    teenyVersion = "1";
-    patchLevel = "0";
-    rubyEngine = "ruby";
-    libPath = "lib/${rubyEngine}/${majorVersion}.${minorVersion}.${teenyVersion}";
-    gemPath = "lib/${rubyEngine}/gems/${majorVersion}.${minorVersion}.${teenyVersion}";
-  };
-}
diff --git a/pkgs/development/interpreters/ruby/ruby-2.1.2.nix b/pkgs/development/interpreters/ruby/ruby-2.1.2.nix
deleted file mode 100644
index 2cad52cc56d2..000000000000
--- a/pkgs/development/interpreters/ruby/ruby-2.1.2.nix
+++ /dev/null
@@ -1,117 +0,0 @@
-{ stdenv, lib, fetchurl, fetchFromSavannah, fetchFromGitHub
-, zlib, zlibSupport ? true
-, openssl, opensslSupport ? true
-, gdbm, gdbmSupport ? true
-, ncurses, readline, cursesSupport ? true
-, groff, docSupport ? false
-, libyaml, yamlSupport ? true
-, libffi, fiddleSupport ? true
-, ruby_2_1_2, autoreconfHook, bison, useRailsExpress ? true
-}:
-
-let
-  op = stdenv.lib.optional;
-  ops = stdenv.lib.optionals;
-  patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; };
-  config = import ./config.nix { inherit fetchFromSavannah; };
-  baseruby = ruby_2_1_2.override { useRailsExpress = false; };
-in
-
-stdenv.mkDerivation rec {
-  version = with passthru; "${majorVersion}.${minorVersion}.${teenyVersion}-p${patchLevel}";
-
-  name = "ruby-${version}";
-
-  src = if useRailsExpress then fetchFromGitHub {
-    owner  = "ruby";
-    repo   = "ruby";
-    rev    = "v2_1_2";
-    sha256 = "14f8w3zwngnxsgigffh6h9z3ng53xq8mk126xmwrsmz9n3ypm6l0";
-  } else fetchurl {
-    url = "http://cache.ruby-lang.org/pub/ruby/2.1/ruby-2.1.2.tar.gz";
-    sha256 = "0db6krc2bd7yha8p96lcqrahjpsz7g7abhni134g708sh53n8apj";
-  };
-
-  # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
-  NROFF = "${groff}/bin/nroff";
-
-  buildInputs = ops useRailsExpress [ autoreconfHook bison ]
-    ++ (op fiddleSupport libffi)
-    ++ (ops cursesSupport [ ncurses readline ] )
-    ++ (op docSupport groff )
-    ++ (op zlibSupport zlib)
-    ++ (op opensslSupport openssl)
-    ++ (op gdbmSupport gdbm)
-    ++ (op yamlSupport libyaml)
-    # Looks like ruby fails to build on darwin without readline even if curses
-    # support is not enabled, so add readline to the build inputs if curses
-    # support is disabled (if it's enabled, we already have it) and we're
-    # running on darwin
-    ++ (op (!cursesSupport && stdenv.isDarwin) readline);
-
-  enableParallelBuilding = true;
-
-  patches = ops useRailsExpress [
-    "${patchSet}/patches/ruby/2.1.2/railsexpress/01-zero-broken-tests.patch"
-    "${patchSet}/patches/ruby/2.1.2/railsexpress/02-improve-gc-stats.patch"
-    "${patchSet}/patches/ruby/2.1.2/railsexpress/03-display-more-detailed-stack-trace.patch"
-    "${patchSet}/patches/ruby/2.1.2/railsexpress/04-show-full-backtrace-on-stack-overflow.patch"
-    "${patchSet}/patches/ruby/2.1.2/railsexpress/05-fix-missing-c-return-event.patch"
-    "${patchSet}/patches/ruby/2.1.2/railsexpress/06-backport-006e66b6680f60adfb434ee7397f0dbc77de7873.patch"
-    "${patchSet}/patches/ruby/2.1.2/railsexpress/07-funny-falcon-stc-density.patch"
-    "${patchSet}/patches/ruby/2.1.2/railsexpress/08-funny-falcon-stc-pool-allocation.patch"
-    "${patchSet}/patches/ruby/2.1.2/railsexpress/09-aman-opt-aset-aref-str.patch"
-    "${patchSet}/patches/ruby/2.1.2/railsexpress/10-funny-falcon-method-cache.patch"
-  ];
-
-  # Ruby >= 2.1.0 tries to download config.{guess,sub}
-  postPatch = ''
-    rm tool/config_files.rb
-    cp ${config}/config.guess tool/
-    cp ${config}/config.sub tool/
-  '';
-
-  configureFlags = ["--enable-shared" ]
-    ++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby"
-    # on darwin, we have /usr/include/tk.h -- so the configure script detects
-    # that tk is installed
-    ++ ( if stdenv.isDarwin then [ "--with-out-ext=tk " ] else [ ]);
-
-  installFlags = stdenv.lib.optionalString docSupport "install-doc";
-  # Bundler tries to create this directory
-  postInstall = ''
-    # Bundler tries to create this directory
-    mkdir -pv $out/${passthru.gemPath}
-    mkdir -p $out/nix-support
-    cat > $out/nix-support/setup-hook <<EOF
-    addGemPath() {
-      addToSearchPath GEM_PATH \$1/${passthru.gemPath}
-    }
-
-    envHooks+=(addGemPath)
-    EOF
-  '' + lib.optionalString useRailsExpress ''
-    rbConfig=$(find $out/lib/ruby -name rbconfig.rb)
-
-    # Prevent the baseruby from being included in the closure.
-    sed -i '/^  CONFIG\["BASERUBY"\]/d' $rbConfig
-    sed -i "s|'--with-baseruby=${baseruby}/bin/ruby'||" $rbConfig
-  '';
-
-  meta = {
-    license = stdenv.lib.licenses.ruby;
-    homepage = "http://www.ruby-lang.org/en/";
-    description = "The Ruby language";
-    platforms = stdenv.lib.platforms.all;
-  };
-
-  passthru = rec {
-    majorVersion = "2";
-    minorVersion = "1";
-    teenyVersion = "2";
-    patchLevel = "353";
-    rubyEngine = "ruby";
-    libPath = "lib/${rubyEngine}/${majorVersion}.${minorVersion}.${teenyVersion}";
-    gemPath = "lib/${rubyEngine}/gems/${majorVersion}.${minorVersion}.${teenyVersion}";
-  };
-}
diff --git a/pkgs/development/interpreters/ruby/ruby-2.1.3.nix b/pkgs/development/interpreters/ruby/ruby-2.1.3.nix
deleted file mode 100644
index 50cc3484730d..000000000000
--- a/pkgs/development/interpreters/ruby/ruby-2.1.3.nix
+++ /dev/null
@@ -1,121 +0,0 @@
-{ stdenv, lib, fetchurl, fetchFromSavannah, fetchFromGitHub
-, zlib, zlibSupport ? true
-, openssl, opensslSupport ? true
-, gdbm, gdbmSupport ? true
-, ncurses, readline, cursesSupport ? true
-, groff, docSupport ? false
-, libyaml, yamlSupport ? true
-, libffi, fiddleSupport ? true
-, ruby_2_1_3, autoreconfHook, bison, useRailsExpress ? true
-}:
-
-let
-  op = stdenv.lib.optional;
-  ops = stdenv.lib.optionals;
-  patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; };
-  config = import ./config.nix { inherit fetchFromSavannah; };
-  baseruby = ruby_2_1_3.override { useRailsExpress = false; };
-in
-
-stdenv.mkDerivation rec {
-  version = with passthru; "${majorVersion}.${minorVersion}.${teenyVersion}-p${patchLevel}";
-
-  name = "ruby-${version}";
-
-  src = if useRailsExpress then fetchFromGitHub {
-    owner  = "ruby";
-    repo   = "ruby";
-    rev    = "v2_1_3";
-    sha256 = "1pnam9jry2l2mbji3gvrbb7jyisxl99xjz6l1qrccwnfinxxbmhv";
-  } else fetchurl {
-    url = "http://cache.ruby-lang.org/pub/ruby/2.1/ruby-2.1.3.tar.gz";
-    sha256 = "00bz6jcbxgnllplk4b9lnyc3w8yd3pz5rn11rmca1s8cn6vvw608";
-  };
-
-  # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
-  NROFF = "${groff}/bin/nroff";
-
-  buildInputs = ops useRailsExpress [ autoreconfHook bison ]
-    ++ (op fiddleSupport libffi)
-    ++ (ops cursesSupport [ ncurses readline ])
-    ++ (op docSupport groff)
-    ++ (op zlibSupport zlib)
-    ++ (op opensslSupport openssl)
-    ++ (op gdbmSupport gdbm)
-    ++ (op yamlSupport libyaml)
-    # Looks like ruby fails to build on darwin without readline even if curses
-    # support is not enabled, so add readline to the build inputs if curses
-    # support is disabled (if it's enabled, we already have it) and we're
-    # running on darwin
-    ++ (op (!cursesSupport && stdenv.isDarwin) readline);
-
-  enableParallelBuilding = true;
-
-  # Fix a build failure on systems with nix store optimisation.
-  # (The build process attempted to copy file a overwriting file b, where a and
-  # b are hard-linked, which results in cp returning a non-zero exit code.)
-  # https://github.com/NixOS/nixpkgs/issues/4266
-  postUnpack = ''rm "$sourceRoot/enc/unicode/name2ctype.h"'';
-
-  patches = ops useRailsExpress [
-    "${patchSet}/patches/ruby/2.1.3/railsexpress/01-zero-broken-tests.patch"
-    "${patchSet}/patches/ruby/2.1.3/railsexpress/02-improve-gc-stats.patch"
-    "${patchSet}/patches/ruby/2.1.3/railsexpress/03-display-more-detailed-stack-trace.patch"
-    "${patchSet}/patches/ruby/2.1.3/railsexpress/04-show-full-backtrace-on-stack-overflow.patch"
-    "${patchSet}/patches/ruby/2.1.3/railsexpress/05-funny-falcon-stc-density.patch"
-    "${patchSet}/patches/ruby/2.1.3/railsexpress/06-funny-falcon-stc-pool-allocation.patch"
-    "${patchSet}/patches/ruby/2.1.3/railsexpress/07-aman-opt-aset-aref-str.patch"
-    "${patchSet}/patches/ruby/2.1.3/railsexpress/08-funny-falcon-method-cache.patch"
-  ];
-
-  # Ruby >= 2.1.0 tries to download config.{guess,sub}
-  postPatch = ''
-    rm tool/config_files.rb
-    cp ${config}/config.guess tool/
-    cp ${config}/config.sub tool/
-  '';
-
-  configureFlags = ["--enable-shared" ]
-    ++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby"
-    # on darwin, we have /usr/include/tk.h -- so the configure script detects
-    # that tk is installed
-    ++ ( if stdenv.isDarwin then [ "--with-out-ext=tk " ] else [ ]);
-
-  installFlags = stdenv.lib.optionalString docSupport "install-doc";
-  # Bundler tries to create this directory
-  postInstall = ''
-    # Bundler tries to create this directory
-    mkdir -pv $out/${passthru.gemPath}
-    mkdir -p $out/nix-support
-    cat > $out/nix-support/setup-hook <<EOF
-    addGemPath() {
-      addToSearchPath GEM_PATH \$1/${passthru.gemPath}
-    }
-
-    envHooks+=(addGemPath)
-    EOF
-  '' + lib.optionalString useRailsExpress ''
-    rbConfig=$(find $out/lib/ruby -name rbconfig.rb)
-
-    # Prevent the baseruby from being included in the closure.
-    sed -i '/^  CONFIG\["BASERUBY"\]/d' $rbConfig
-    sed -i "s|'--with-baseruby=${baseruby}/bin/ruby'||" $rbConfig
-  '';
-
-  meta = {
-    license = stdenv.lib.licenses.ruby;
-    homepage = "http://www.ruby-lang.org/en/";
-    description = "The Ruby language";
-    platforms = stdenv.lib.platforms.all;
-  };
-
-  passthru = rec {
-    majorVersion = "2";
-    minorVersion = "1";
-    teenyVersion = "3";
-    patchLevel = "0";
-    rubyEngine = "ruby";
-    libPath = "lib/${rubyEngine}/${majorVersion}.${minorVersion}.${teenyVersion}";
-    gemPath = "lib/${rubyEngine}/gems/${majorVersion}.${minorVersion}.${teenyVersion}";
-  };
-}
diff --git a/pkgs/development/interpreters/ruby/ruby-2.1.6.nix b/pkgs/development/interpreters/ruby/ruby-2.1.6.nix
deleted file mode 100644
index 0bf89de1d98c..000000000000
--- a/pkgs/development/interpreters/ruby/ruby-2.1.6.nix
+++ /dev/null
@@ -1,124 +0,0 @@
-{ stdenv, lib, fetchurl, fetchFromSavannah, fetchFromGitHub
-, zlib, zlibSupport ? true
-, openssl, opensslSupport ? true
-, gdbm, gdbmSupport ? true
-, ncurses, readline, cursesSupport ? true
-, groff, docSupport ? false
-, libyaml, yamlSupport ? true
-, libffi, fiddleSupport ? true
-, ruby_2_1_6, autoreconfHook, bison, useRailsExpress ? true
-, libiconv, libobjc, libunwind
-}:
-
-let
-  op = stdenv.lib.optional;
-  ops = stdenv.lib.optionals;
-  patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; };
-  config = import ./config.nix { inherit fetchFromSavannah; };
-  baseruby = ruby_2_1_6.override { useRailsExpress = false; };
-in
-
-stdenv.mkDerivation rec {
-  version = with passthru; "${majorVersion}.${minorVersion}.${teenyVersion}-p${patchLevel}";
-
-  name = "ruby-${version}";
-
-  src = if useRailsExpress then fetchFromGitHub {
-    owner  = "ruby";
-    repo   = "ruby";
-    rev    = "v2_1_6";
-    sha256 = "18kbjsbmgv6l3p1qxgmjnhh4jl7xdk3c20ycjpp62vrhq7pyzjsm";
-  } else fetchurl {
-    url = "http://cache.ruby-lang.org/pub/ruby/2.1/ruby-2.1.6.tar.gz";
-    sha256 = "1r4bs8lfwsypbcf8j2lpv3by40729vp5mh697njizj97fjp644qy";
-  };
-
-  # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
-  NROFF = "${groff}/bin/nroff";
-
-  buildInputs = ops useRailsExpress [ autoreconfHook bison ]
-    ++ (op fiddleSupport libffi)
-    ++ (ops cursesSupport [ ncurses readline ])
-    ++ (op docSupport groff)
-    ++ (op zlibSupport zlib)
-    ++ (op opensslSupport openssl)
-    ++ (op gdbmSupport gdbm)
-    ++ (op yamlSupport libyaml)
-    # Looks like ruby fails to build on darwin without readline even if curses
-    # support is not enabled, so add readline to the build inputs if curses
-    # support is disabled (if it's enabled, we already have it) and we're
-    # running on darwin
-    ++ (op (!cursesSupport && stdenv.isDarwin) readline)
-    ++ (ops stdenv.isDarwin [ libiconv libobjc libunwind ]);
-
-  enableParallelBuilding = true;
-
-  # Fix a build failure on systems with nix store optimisation.
-  # (The build process attempted to copy file a overwriting file b, where a and
-  # b are hard-linked, which results in cp returning a non-zero exit code.)
-  # https://github.com/NixOS/nixpkgs/issues/4266
-  postUnpack = ''rm "$sourceRoot/enc/unicode/name2ctype.h"'';
-
-  patches = ops useRailsExpress [
-    "${patchSet}/patches/ruby/2.1.6/railsexpress/01-zero-broken-tests.patch"
-    "${patchSet}/patches/ruby/2.1.6/railsexpress/02-improve-gc-stats.patch"
-    "${patchSet}/patches/ruby/2.1.6/railsexpress/03-display-more-detailed-stack-trace.patch"
-    "${patchSet}/patches/ruby/2.1.6/railsexpress/04-show-full-backtrace-on-stack-overflow.patch"
-    "${patchSet}/patches/ruby/2.1.6/railsexpress/05-funny-falcon-stc-density.patch"
-    "${patchSet}/patches/ruby/2.1.6/railsexpress/06-funny-falcon-stc-pool-allocation.patch"
-    "${patchSet}/patches/ruby/2.1.6/railsexpress/07-aman-opt-aset-aref-str.patch"
-    "${patchSet}/patches/ruby/2.1.6/railsexpress/08-funny-falcon-method-cache.patch"
-    "${patchSet}/patches/ruby/2.1.6/railsexpress/09-heap-dump-support.patch"
-  ];
-
-  # Ruby >= 2.1.0 tries to download config.{guess,sub}
-  postPatch = ''
-    rm tool/config_files.rb
-    cp ${config}/config.guess tool/
-    cp ${config}/config.sub tool/
-  '';
-
-  configureFlags = ["--enable-shared" ]
-    ++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby"
-    # on darwin, we have /usr/include/tk.h -- so the configure script detects
-    # that tk is installed
-    ++ ( if stdenv.isDarwin then [ "--with-out-ext=tk " ] else [ ]);
-
-  installFlags = stdenv.lib.optionalString docSupport "install-doc";
-  # Bundler tries to create this directory
-  postInstall = ''
-    # Bundler tries to create this directory
-    mkdir -pv $out/${passthru.gemPath}
-    mkdir -p $out/nix-support
-    cat > $out/nix-support/setup-hook <<EOF
-    addGemPath() {
-      addToSearchPath GEM_PATH \$1/${passthru.gemPath}
-    }
-
-    envHooks+=(addGemPath)
-    EOF
-  '' + lib.optionalString useRailsExpress ''
-    rbConfig=$(find $out/lib/ruby -name rbconfig.rb)
-
-    # Prevent the baseruby from being included in the closure.
-    sed -i '/^  CONFIG\["BASERUBY"\]/d' $rbConfig
-    sed -i "s|'--with-baseruby=${baseruby}/bin/ruby'||" $rbConfig
-  '';
-
-  meta = {
-    license = stdenv.lib.licenses.ruby;
-    homepage = "http://www.ruby-lang.org/en/";
-    description = "The Ruby language";
-    platforms = stdenv.lib.platforms.all;
-  };
-
-  passthru = rec {
-    majorVersion = "2";
-    minorVersion = "1";
-    teenyVersion = "6";
-    patchLevel = "0";
-    rubyEngine = "ruby";
-    libPath = "lib/${rubyEngine}/${majorVersion}.${minorVersion}.${teenyVersion}";
-    gemPath = "lib/${rubyEngine}/gems/${majorVersion}.${minorVersion}.${teenyVersion}";
-  };
-}
diff --git a/pkgs/development/interpreters/ruby/ruby-2.2.0.nix b/pkgs/development/interpreters/ruby/ruby-2.2.0.nix
deleted file mode 100644
index a29b74664001..000000000000
--- a/pkgs/development/interpreters/ruby/ruby-2.2.0.nix
+++ /dev/null
@@ -1,113 +0,0 @@
-{ stdenv, lib, fetchurl, fetchFromSavannah, fetchFromGitHub
-, zlib, zlibSupport ? true
-, openssl, opensslSupport ? true
-, gdbm, gdbmSupport ? true
-, ncurses, readline, cursesSupport ? true
-, groff, docSupport ? false
-, libyaml, yamlSupport ? true
-, libffi, fiddleSupport ? true
-, ruby_2_2_0, autoreconfHook, bison, useRailsExpress ? true
-, libiconv, libobjc, libunwind
-}:
-
-let
-  op = stdenv.lib.optional;
-  ops = stdenv.lib.optionals;
-  patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; };
-  config = import ./config.nix { inherit fetchFromSavannah; };
-  baseruby = ruby_2_2_0.override { useRailsExpress = false; };
-in
-
-stdenv.mkDerivation rec {
-  version = with passthru; "${majorVersion}.${minorVersion}.${teenyVersion}-p${patchLevel}";
-
-  name = "ruby-${version}";
-
-  src = if useRailsExpress then fetchFromGitHub {
-    owner  = "ruby";
-    repo   = "ruby";
-    rev    = "v2_2_0";
-    sha256 = "1w7rr2nq1bbw6aiagddzlrr3rl95kk33x4pv6570nm072g55ybpi";
-  } else fetchurl {
-    url = "http://cache.ruby-lang.org/pub/ruby/2.2/ruby-2.2.0.tar.gz";
-    sha256 = "1z2092fbpc2qkv1j3yj7jdz7qwvqpxqpmcnkphpjcpgvmfaf6wbn";
-  };
-
-  # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
-  NROFF = "${groff}/bin/nroff";
-
-  buildInputs = ops useRailsExpress [ autoreconfHook bison ]
-    ++ (op fiddleSupport libffi)
-    ++ (ops cursesSupport [ ncurses readline ])
-    ++ (op docSupport groff)
-    ++ (op zlibSupport zlib)
-    ++ (op opensslSupport openssl)
-    ++ (op gdbmSupport gdbm)
-    ++ (op yamlSupport libyaml)
-    # Looks like ruby fails to build on darwin without readline even if curses
-    # support is not enabled, so add readline to the build inputs if curses
-    # support is disabled (if it's enabled, we already have it) and we're
-    # running on darwin
-    ++ (op (!cursesSupport && stdenv.isDarwin) readline)
-    ++ (ops stdenv.isDarwin [ libiconv libobjc libunwind ]);
-
-  enableParallelBuilding = true;
-
-  patches = ops useRailsExpress [
-    "${patchSet}/patches/ruby/2.2.0/railsexpress/01-zero-broken-tests.patch"
-    "${patchSet}/patches/ruby/2.2.0/railsexpress/02-improve-gc-stats.patch"
-    "${patchSet}/patches/ruby/2.2.0/railsexpress/03-display-more-detailed-stack-trace.patch"
-    "${patchSet}/patches/ruby/2.2.0/railsexpress/04-backport-401c8bb.patch"
-    "${patchSet}/patches/ruby/2.2.0/railsexpress/05-fix-packed-bitfield-compat-warning-for-older-gccs.patch"
-  ];
-
-  postPatch = ops useRailsExpress ''
-    sed -i configure.in -e '/config.guess/d'
-    cp ${config}/config.guess tool/
-    cp ${config}/config.sub tool/
-  '';
-
-  configureFlags = ["--enable-shared" ]
-    ++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby"
-    # on darwin, we have /usr/include/tk.h -- so the configure script detects
-    # that tk is installed
-    ++ ( if stdenv.isDarwin then [ "--with-out-ext=tk " ] else [ ]);
-
-  installFlags = stdenv.lib.optionalString docSupport "install-doc";
-  # Bundler tries to create this directory
-  postInstall = ''
-    # Bundler tries to create this directory
-    mkdir -pv $out/${passthru.gemPath}
-    mkdir -p $out/nix-support
-    cat > $out/nix-support/setup-hook <<EOF
-    addGemPath() {
-      addToSearchPath GEM_PATH \$1/${passthru.gemPath}
-    }
-
-    envHooks+=(addGemPath)
-    EOF
-  '' + lib.optionalString useRailsExpress ''
-    rbConfig=$(find $out/lib/ruby -name rbconfig.rb)
-
-    # Prevent the baseruby from being included in the closure.
-    sed -i '/^  CONFIG\["BASERUBY"\]/d' $rbConfig
-    sed -i "s|'--with-baseruby=${baseruby}/bin/ruby'||" $rbConfig
-  '';
-
-  meta = {
-    license = stdenv.lib.licenses.ruby;
-    homepage = "http://www.ruby-lang.org/en/";
-    description = "The Ruby language";
-    platforms = stdenv.lib.platforms.all;
-  };
-
-  passthru = rec {
-    majorVersion = "2";
-    minorVersion = "2";
-    teenyVersion = "0";
-    patchLevel = "0";
-    rubyEngine = "ruby";
-    libPath = "lib/${rubyEngine}/${majorVersion}.${minorVersion}.${teenyVersion}";
-    gemPath = "lib/${rubyEngine}/gems/${majorVersion}.${minorVersion}.${teenyVersion}";
-  };
-}
diff --git a/pkgs/development/interpreters/ruby/ruby-2.2.2.nix b/pkgs/development/interpreters/ruby/ruby-2.2.2.nix
deleted file mode 100644
index df40f674989e..000000000000
--- a/pkgs/development/interpreters/ruby/ruby-2.2.2.nix
+++ /dev/null
@@ -1,112 +0,0 @@
-{ stdenv, lib, fetchurl, fetchFromSavannah, fetchFromGitHub
-, zlib, zlibSupport ? true
-, openssl, opensslSupport ? true
-, gdbm, gdbmSupport ? true
-, ncurses, readline, cursesSupport ? true
-, groff, docSupport ? false
-, libyaml, yamlSupport ? true
-, libffi, fiddleSupport ? true
-, ruby_2_2_2, autoreconfHook, bison, useRailsExpress ? true
-, libiconv, libobjc, libunwind
-}:
-
-let
-  op = stdenv.lib.optional;
-  ops = stdenv.lib.optionals;
-  patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; };
-  config = import ./config.nix { inherit fetchFromSavannah; };
-  baseruby = ruby_2_2_2.override { useRailsExpress = false; };
-in
-
-stdenv.mkDerivation rec {
-  version = with passthru; "${majorVersion}.${minorVersion}.${teenyVersion}-p${patchLevel}";
-
-  name = "ruby-${version}";
-
-  src = if useRailsExpress then fetchFromGitHub {
-    owner  = "ruby";
-    repo   = "ruby";
-    rev    = "v2_2_2";
-    sha256 = "08mw1ql2ghy483cp8xzzm78q17simn4l6phgm2gah7kjh9y3vbrn";
-  } else fetchurl {
-    url = "http://cache.ruby-lang.org/pub/ruby/2.2/ruby-2.2.2.tar.gz";
-    sha256 = "0i4v7l8pnam0by2cza12zldlhrffqchwb2m9shlnp7j2gqqhzz2z";
-  };
-
-  # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
-  NROFF = "${groff}/bin/nroff";
-
-  buildInputs = ops useRailsExpress [ autoreconfHook bison ]
-    ++ (op fiddleSupport libffi)
-    ++ (ops cursesSupport [ ncurses readline ])
-    ++ (op docSupport groff)
-    ++ (op zlibSupport zlib)
-    ++ (op opensslSupport openssl)
-    ++ (op gdbmSupport gdbm)
-    ++ (op yamlSupport libyaml)
-    # Looks like ruby fails to build on darwin without readline even if curses
-    # support is not enabled, so add readline to the build inputs if curses
-    # support is disabled (if it's enabled, we already have it) and we're
-    # running on darwin
-    ++ (op (!cursesSupport && stdenv.isDarwin) readline)
-    ++ (ops stdenv.isDarwin [ libiconv libobjc libunwind ]);
-
-  enableParallelBuilding = true;
-
-  patches = ops useRailsExpress [
-    "${patchSet}/patches/ruby/2.2.2/railsexpress/01-zero-broken-tests.patch"
-    "${patchSet}/patches/ruby/2.2.2/railsexpress/02-improve-gc-stats.patch"
-    "${patchSet}/patches/ruby/2.2.2/railsexpress/03-display-more-detailed-stack-trace.patch"
-    "${patchSet}/patches/ruby/2.2.2/railsexpress/04-backported-bugfixes-222.patch"
-  ];
-
-  postPatch = ops useRailsExpress ''
-    sed -i configure.in -e '/config.guess/d'
-    cp ${config}/config.guess tool/
-    cp ${config}/config.sub tool/
-  '';
-
-  configureFlags = ["--enable-shared" ]
-    ++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby"
-    # on darwin, we have /usr/include/tk.h -- so the configure script detects
-    # that tk is installed
-    ++ ( if stdenv.isDarwin then [ "--with-out-ext=tk " ] else [ ]);
-
-  installFlags = stdenv.lib.optionalString docSupport "install-doc";
-  # Bundler tries to create this directory
-  postInstall = ''
-    # Bundler tries to create this directory
-    mkdir -pv $out/${passthru.gemPath}
-    mkdir -p $out/nix-support
-    cat > $out/nix-support/setup-hook <<EOF
-    addGemPath() {
-      addToSearchPath GEM_PATH \$1/${passthru.gemPath}
-    }
-
-    envHooks+=(addGemPath)
-    EOF
-  '' + lib.optionalString useRailsExpress ''
-    rbConfig=$(find $out/lib/ruby -name rbconfig.rb)
-
-    # Prevent the baseruby from being included in the closure.
-    sed -i '/^  CONFIG\["BASERUBY"\]/d' $rbConfig
-    sed -i "s|'--with-baseruby=${baseruby}/bin/ruby'||" $rbConfig
-  '';
-
-  meta = {
-    license = stdenv.lib.licenses.ruby;
-    homepage = "http://www.ruby-lang.org/en/";
-    description = "The Ruby language";
-    platforms = stdenv.lib.platforms.all;
-  };
-
-  passthru = rec {
-    majorVersion = "2";
-    minorVersion = "2";
-    teenyVersion = "2";
-    patchLevel = "0";
-    rubyEngine = "ruby";
-    libPath = "lib/${rubyEngine}/${majorVersion}.${minorVersion}.${teenyVersion}";
-    gemPath = "lib/${rubyEngine}/gems/${majorVersion}.${minorVersion}.${teenyVersion}";
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5d5b7771d427..24a183f43eb4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5091,23 +5091,13 @@ let
   bundlerEnv = callPackage ../development/interpreters/ruby/bundler-env { };
 
   ruby_1_8_7 = callPackage ../development/interpreters/ruby/ruby-1.8.7.nix { };
-  ruby_1_9_3 = callPackage ../development/interpreters/ruby/ruby-1.9.3.nix {
-    inherit (darwin) libobjc;
-  };
-  ruby_2_0_0 = callPackage ../development/interpreters/ruby/ruby-2.0.0.nix { };
-  ruby_2_1_0 = callPackage ../development/interpreters/ruby/ruby-2.1.0.nix { };
-  ruby_2_1_1 = callPackage ../development/interpreters/ruby/ruby-2.1.1.nix { };
-  ruby_2_1_2 = callPackage ../development/interpreters/ruby/ruby-2.1.2.nix { };
-  ruby_2_1_3 = callPackage ../development/interpreters/ruby/ruby-2.1.3.nix { };
-  ruby_2_1_6 = callPackage ../development/interpreters/ruby/ruby-2.1.6.nix {
-    inherit (darwin) libobjc libunwind;
-  };
-  ruby_2_2_0 = callPackage ../development/interpreters/ruby/ruby-2.2.0.nix {
-    inherit (darwin) libobjc libunwind;
-  };
-  ruby_2_2_2 = callPackage ../development/interpreters/ruby/ruby-2.2.2.nix {
-    inherit (darwin) libobjc libunwind;
-  };
+  inherit (callPackages ../development/interpreters/ruby {})
+    # TODO: uncomment when ruby_1_8_7 doesn't need autoconf
+    # ruby_1_8_7
+    ruby_1_9_3
+    ruby_2_0_0
+    ruby_2_1_0 ruby_2_1_1 ruby_2_1_2 ruby_2_1_3 ruby_2_1_6
+    ruby_2_2_0 ruby_2_2_2;
 
   # Ruby aliases
   ruby = ruby_2_2;

From 10054a676a2e8cb21c1f5eee89a9d73166be8fb1 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Sat, 26 Sep 2015 23:12:59 -0700
Subject: [PATCH 37/43] update bundler-head SHA256

---
 pkgs/development/interpreters/ruby/bundler-head.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/ruby/bundler-head.nix b/pkgs/development/interpreters/ruby/bundler-head.nix
index a81f2f771bcb..e31f63dccf06 100644
--- a/pkgs/development/interpreters/ruby/bundler-head.nix
+++ b/pkgs/development/interpreters/ruby/bundler-head.nix
@@ -5,7 +5,7 @@ buildRubyGem {
   src = fetchgit {
     url = "https://github.com/bundler/bundler.git";
     rev = "a2343c9eabf5403d8ffcbca4dea33d18a60fc157";
-    sha256 = "1p7kzhmicfljy9n7nq3qh6lvrsckiq76ddypf6s55gfh1l98z4k9";
+    sha256 = "06qsai4ac3i2xlr7nbc4anh4cy6jd9jjf3rpj254g9gwshqv0qgr";
     leaveDotGit = true;
   };
   dontPatchShebangs = true;

From 2b1d851e3eacd4b0f418abd37f2c144064179098 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Tue, 29 Sep 2015 17:56:32 -0700
Subject: [PATCH 38/43] add mpw

---
 pkgs/tools/security/mpw/default.nix | 42 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/tools/security/mpw/default.nix

diff --git a/pkgs/tools/security/mpw/default.nix b/pkgs/tools/security/mpw/default.nix
new file mode 100644
index 000000000000..15937a6792e6
--- /dev/null
+++ b/pkgs/tools/security/mpw/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchurl, autoconf, automake, openssl, libxml2 }:
+
+let
+  scrypt_src = fetchurl {
+    url = "http://masterpasswordapp.com/libscrypt-b12b554.tar.gz";
+    sha256 = "02vz4i66v1acd15xjgki4ilmmp28m6a5603gi4hf8id3d3ndl9n7";
+  };
+
+in stdenv.mkDerivation {
+  name = "mpw-2.1-cli4";
+
+  srcs = [
+    (fetchurl {
+      url = "https://ssl.masterpasswordapp.com/mpw-2.1-cli4-0-gf6b2287.tar.gz";
+      sha256 = "141bzb3nj18rbnbpdvsri8cdwwwxz4d6akyhfa834542xf96b9vf";
+    })
+    scrypt_src
+  ];
+
+  sourceRoot = ".";
+
+  postUnpack = ''
+    cp -R libscrypt-b12b554/* lib/scrypt
+  '';
+
+  prePatch = ''
+    patchShebangs .
+  '';
+
+  NIX_CFLAGS_COMPILE = "-I${libxml2}/include/libxml2";
+
+  buildInputs = [ autoconf automake openssl libxml2 ];
+
+  buildPhase = ''
+    targets="mpw mpw-tests" ./build
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mv mpw $out/bin/mpw
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 24a183f43eb4..533e024784e3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2244,6 +2244,8 @@ let
 
   mpage = callPackage ../tools/text/mpage { };
 
+  mpw = callPackage ../tools/security/mpw { };
+
   mr = callPackage ../applications/version-management/mr { };
 
   mrtg = callPackage ../tools/misc/mrtg { };

From 64eed4b98afdd55c5a827fb67cf53557ffec2db4 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Thu, 1 Oct 2015 18:14:03 +0200
Subject: [PATCH 39/43] deskcon: init at 0.3

---
 pkgs/top-level/python-packages.nix | 34 ++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 85f52b4ba8e8..41f5d5925893 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3015,6 +3015,40 @@ let
     };
   };
 
+  deskcon = self.buildPythonPackage rec {
+    name = "deskcon-0.3";
+    disabled = !isPy27;
+
+    src = pkgs.fetchFromGitHub {
+      owner= "screenfreeze";
+      repo = "deskcon-desktop";
+      rev = "267804122188fa79c37f2b21f54fe05c898610e6";
+      sha256 ="0i1dd85ls6n14m9q7lkympms1w3x0pqyaxvalq82s4xnjdv585j3";
+    };
+
+    phases = [ "unpackPhase" "installPhase" ];
+
+    pythonPath = [ self.pyopenssl pkgs.gtk3 ];
+
+    installPhase = ''
+      substituteInPlace server/deskcon-server --replace "python2" "python"
+
+      mkdir -p $out/bin
+      mkdir -p $out/lib/${python.libPrefix}/site-packages
+      cp -r server/* $out/lib/${python.libPrefix}/site-packages
+      mv $out/lib/${python.libPrefix}/site-packages/deskcon-server $out/bin/deskcon-server
+
+      wrapPythonProgramsIn $out/bin "$out $pythonPath"
+    '';
+
+    meta = {
+      description = "integrates an Android device into a desktop";
+      homepage = https://github.com/screenfreeze/deskcon-desktop;
+      license = licenses.gpl3;
+    };
+  };
+
+
   dill = buildPythonPackage rec {
     name = "dill-${version}";
     version = "0.2.4";

From 4833a37791e7d5cc8892dff5752eb1bf0eecbb8f Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Mon, 28 Sep 2015 10:47:34 -0700
Subject: [PATCH 40/43] bring darwin libtool back into scope for node

---
 pkgs/top-level/all-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 533e024784e3..0eeca122a892 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2021,6 +2021,7 @@ let
   };
 
   nodejs-0_10 = callPackage ../development/web/nodejs/v0_10.nix {
+    libtool = darwin.cctools;
     inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices Carbon Foundation;
   };
 

From 4520a191514cd95163f89f040fb477f19ad77d95 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Mon, 28 Sep 2015 17:23:25 -0700
Subject: [PATCH 41/43] add darwin libtool to nodejs 4.1.0

---
 pkgs/development/web/nodejs/v0_10.nix | 2 ++
 pkgs/top-level/all-packages.nix       | 1 +
 2 files changed, 3 insertions(+)

diff --git a/pkgs/development/web/nodejs/v0_10.nix b/pkgs/development/web/nodejs/v0_10.nix
index eaa3c6386cb5..bf19ba646fd7 100644
--- a/pkgs/development/web/nodejs/v0_10.nix
+++ b/pkgs/development/web/nodejs/v0_10.nix
@@ -54,6 +54,8 @@ in stdenv.mkDerivation {
   propagatedBuildInputs = optionals stdenv.isDarwin [ Carbon ];
   setupHook = ./setup-hook.sh;
 
+  enableParallelBuilding = true;
+
   passthru.interpreterName = "nodejs-0.10";
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0eeca122a892..56a6855e5a8b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2017,6 +2017,7 @@ let
   ninka = callPackage ../development/tools/misc/ninka { };
 
   nodejs-4_1 = callPackage ../development/web/nodejs {
+    libtool = darwin.cctools;
     openssl = openssl_1_0_2;
   };
 

From ccf48cea4d13c771e337911723b99ff831e9799e Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Sat, 26 Sep 2015 06:27:25 -0700
Subject: [PATCH 42/43] revert rubies callPackages change

---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 56a6855e5a8b..dd865a4a25f8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5095,7 +5095,7 @@ let
   bundlerEnv = callPackage ../development/interpreters/ruby/bundler-env { };
 
   ruby_1_8_7 = callPackage ../development/interpreters/ruby/ruby-1.8.7.nix { };
-  inherit (callPackages ../development/interpreters/ruby {})
+  inherit (callPackage ../development/interpreters/ruby {})
     # TODO: uncomment when ruby_1_8_7 doesn't need autoconf
     # ruby_1_8_7
     ruby_1_9_3

From 14961c87810330d22fc1ee11e11a17e32805ff8b Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 1 Oct 2015 10:40:41 -0700
Subject: [PATCH 43/43] v8: Fix compilation issue with gcc4.9+

---
 pkgs/development/libraries/v8/3.16.14.nix | 4 ++++
 pkgs/top-level/all-packages.nix           | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/v8/3.16.14.nix b/pkgs/development/libraries/v8/3.16.14.nix
index ba3aae5cf70a..c79357cd9074 100644
--- a/pkgs/development/libraries/v8/3.16.14.nix
+++ b/pkgs/development/libraries/v8/3.16.14.nix
@@ -16,6 +16,10 @@ stdenv.mkDerivation rec {
     sha256 = "1gpf2xvhxfs5ll3m2jlslsx9jfjbmrbz55iq362plflrvf8mbxhj";
   };
 
+  postPatch = ''
+    sed -i 's/-Werror//' build/standalone.gypi build/common.gypi
+  '';
+
   configurePhase = stdenv.lib.optionalString stdenv.isDarwin ''
     ln -s /usr/bin/xcodebuild $TMPDIR
     export PATH=$TMPDIR:$PATH
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dd865a4a25f8..79862d8613aa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8340,7 +8340,6 @@ let
 
   v8_3_16_14 = callPackage ../development/libraries/v8/3.16.14.nix {
     inherit (pythonPackages) gyp;
-    stdenv = overrideCC stdenv gcc48;
   };
 
   v8_3_24_10 = callPackage ../development/libraries/v8/3.24.10.nix {