From 1d5d7fdee2e85460e44b9931f3259254c2092806 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 14 May 2014 17:53:58 +0200
Subject: [PATCH 0001/1453] pam: Add logFailures option for adding pam_tally to
 su

---
 nixos/modules/programs/shadow.nix | 2 +-
 nixos/modules/security/pam.nix    | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/programs/shadow.nix b/nixos/modules/programs/shadow.nix
index 27a18c726a3a..9763332ed978 100644
--- a/nixos/modules/programs/shadow.nix
+++ b/nixos/modules/programs/shadow.nix
@@ -82,7 +82,7 @@ in
     security.pam.services =
       { chsh = { rootOK = true; };
         chfn = { rootOK = true; };
-        su = { rootOK = true; forwardXAuth = true; };
+        su = { rootOK = true; forwardXAuth = true; logFailures = true; };
         passwd = {};
         # Note: useradd, groupadd etc. aren't setuid root, so it
         # doesn't really matter what the PAM config says as long as it
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 6a5eb4c720f8..76fbd9b671f4 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -132,6 +132,12 @@ let
         description = "Whether to update <filename>/var/log/wtmp</filename>.";
       };
 
+      logFailures = mkOption {
+        default = false;
+        type = types.bool;
+        description = "Whether to log authentication failures in <filename>/var/log/faillog</filename>.";
+      };
+
       text = mkOption {
         type = types.nullOr types.lines;
         description = "Contents of the PAM service file.";
@@ -159,6 +165,8 @@ let
           # Authentication management.
           ${optionalString cfg.rootOK
               "auth sufficient pam_rootok.so"}
+          ${optionalString cfg.logFailures
+              "auth required pam_tally.so"}
           ${optionalString (config.security.pam.enableSSHAgentAuth && cfg.sshAgentAuth)
               "auth sufficient ${pkgs.pam_ssh_agent_auth}/libexec/pam_ssh_agent_auth.so file=~/.ssh/authorized_keys:~/.ssh/authorized_keys2:/etc/ssh/authorized_keys.d/%u"}
           ${optionalString cfg.usbAuth

From d39684b69bb196de3e3440cc7fb0a749f6b7bc6c Mon Sep 17 00:00:00 2001
From: Chris Farmiloe <chrisfarms@gmail.com>
Date: Sat, 21 Jun 2014 14:02:35 +0200
Subject: [PATCH 0002/1453] Simple nixos module to enable configuration of
 freetds and setup the expected environment variables

---
 nixos/modules/module-list.nix      |  1 +
 nixos/modules/programs/freetds.nix | 61 ++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+)
 create mode 100644 nixos/modules/programs/freetds.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index a82cef3e0769..2cdb8a900d8e 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -58,6 +58,7 @@
   ./programs/ssmtp.nix
   ./programs/venus.nix
   ./programs/wvdial.nix
+  ./programs/freetds.nix
   ./programs/zsh/zsh.nix
   ./programs/screen.nix
   ./rename.nix
diff --git a/nixos/modules/programs/freetds.nix b/nixos/modules/programs/freetds.nix
new file mode 100644
index 000000000000..398fd104363b
--- /dev/null
+++ b/nixos/modules/programs/freetds.nix
@@ -0,0 +1,61 @@
+# Global configuration for freetds environment.
+
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.environment.freetds;
+
+in
+{
+  ###### interface
+
+  options = {
+
+    environment.freetds = mkOption {
+      type = types.attrsOf types.str;
+      default = {};
+      example = {
+        MYDATABASE = 
+          ''
+          host = 10.0.2.100
+          port = 1433
+          tds version = 7.2
+          '';
+      };
+      description = 
+        ''
+        Configure freetds database entries. Each attribute denotes
+        a section within freetds.conf, and the value (a string) is the config
+        content for that section. When at least one entry is configured
+        the global environment variables FREETDSCONF, FREETDS and SYBASE
+        will be configured to allow the programs that use freetds to find the
+        library and config.
+        '';
+
+    };
+
+  };
+
+  ###### implementation
+
+  config = mkIf (length (attrNames cfg) > 0) {
+
+    environment.variables.FREETDSCONF = "/etc/freetds.conf";
+    environment.variables.FREETDS = "/etc/freetds.conf";
+    environment.variables.SYBASE = "${pkgs.freetds}";
+
+    environment.etc."freetds.conf" = { text = 
+      (concatStrings (mapAttrsToList (name: value:
+        ''
+        [${name}]
+        ${value}
+        ''
+      ) cfg));
+    };
+
+  };
+
+}

From 86c283824f76d849acbe6f97c34250c8c5533499 Mon Sep 17 00:00:00 2001
From: Daniel Zinn <q@qew.dynalias.org>
Date: Mon, 23 Jun 2014 06:11:34 -0700
Subject: [PATCH 0003/1453] If cuda headers are presented to nix in
 $out/include they are added to future gcc calls via a -isystem flag. However,
 cuda does not allow kernel calls from template function if these are located
 in system-headers. We thus move headers from $out/include to $out/usr_include
 and add a custom hook to add these headers via -I.

---
 pkgs/development/compilers/cudatoolkit/5.5.nix       | 3 +++
 pkgs/development/compilers/cudatoolkit/6.0.nix       | 3 +++
 pkgs/development/compilers/cudatoolkit/setup-hook.sh | 8 ++++++++
 3 files changed, 14 insertions(+)
 create mode 100644 pkgs/development/compilers/cudatoolkit/setup-hook.sh

diff --git a/pkgs/development/compilers/cudatoolkit/5.5.nix b/pkgs/development/compilers/cudatoolkit/5.5.nix
index 99f0828012fa..bf4009f08be3 100644
--- a/pkgs/development/compilers/cudatoolkit/5.5.nix
+++ b/pkgs/development/compilers/cudatoolkit/5.5.nix
@@ -51,8 +51,11 @@ stdenv.mkDerivation rec {
     perl ./install-linux.pl --prefix="$out"
     rm $out/tools/CUDA_Occupancy_Calculator.xls
     perl ./install-sdk-linux.pl --prefix="$sdk" --cudaprefix="$out"
+    mv $out/include $out/usr_include
   '';
 
+  setupHook = ./setup-hook.sh;
+
   meta = {
     license = [ "nonfree" ];
   };
diff --git a/pkgs/development/compilers/cudatoolkit/6.0.nix b/pkgs/development/compilers/cudatoolkit/6.0.nix
index 573cc8262216..5da4b3d0a4aa 100644
--- a/pkgs/development/compilers/cudatoolkit/6.0.nix
+++ b/pkgs/development/compilers/cudatoolkit/6.0.nix
@@ -51,8 +51,11 @@ stdenv.mkDerivation rec {
     perl ./install-linux.pl --prefix="$out"
     rm $out/tools/CUDA_Occupancy_Calculator.xls
     perl ./install-sdk-linux.pl --prefix="$sdk" --cudaprefix="$out"
+    mv $out/include $out/usr_include
   '';
 
+  setupHook = ./setup-hook.sh;
+
   meta = {
     license = [ "nonfree" ];
   };
diff --git a/pkgs/development/compilers/cudatoolkit/setup-hook.sh b/pkgs/development/compilers/cudatoolkit/setup-hook.sh
new file mode 100644
index 000000000000..1b75a2e91ba2
--- /dev/null
+++ b/pkgs/development/compilers/cudatoolkit/setup-hook.sh
@@ -0,0 +1,8 @@
+addIncludePath () {
+    if test -d "$1/usr_include"
+    then
+        export NIX_CFLAGS_COMPILE="${NIX_CFLAGS_COMPILE} -I$1/usr_include"
+    fi
+}
+
+envHooks=(${envHooks[@]} addIncludePath)

From de4d6f0447393a0a2c688461740d12b886a57f9d Mon Sep 17 00:00:00 2001
From: Chris Double <chris.double@double.co.nz>
Date: Mon, 30 Jun 2014 12:08:34 +1200
Subject: [PATCH 0004/1453] Add namecoin cryptocurrency

---
 pkgs/applications/misc/namecoin/default.nix | 37 +++++++++++++++++++++
 pkgs/applications/misc/namecoin/qt.nix      | 33 ++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  3 ++
 3 files changed, 73 insertions(+)
 create mode 100644 pkgs/applications/misc/namecoin/default.nix
 create mode 100644 pkgs/applications/misc/namecoin/qt.nix

diff --git a/pkgs/applications/misc/namecoin/default.nix b/pkgs/applications/misc/namecoin/default.nix
new file mode 100644
index 000000000000..1a26403e6f4f
--- /dev/null
+++ b/pkgs/applications/misc/namecoin/default.nix
@@ -0,0 +1,37 @@
+{ fetchgit, stdenv, db4, boost, openssl, unzip }:
+
+stdenv.mkDerivation rec {
+  version = "0.3.75";
+  name = "namecoin-${version}";
+
+  src = fetchgit {
+    url = "https://github.com/namecoin/namecoin";
+    rev = "31ea638d4ba7f0a3011cb25483f4c7d293134c7a";
+    sha256 = "c14a5663cba675b3508937a26a812316559938fd7b64659dd00749a9f5d7e9e0";
+  };
+
+  # Don't build with miniupnpc due to namecoin using a different verison that
+  # ships with NixOS and it is API incompatible.
+  buildInputs = [ db4 boost openssl unzip ];
+
+  patchPhase = ''
+    sed -e 's/-Wl,-Bstatic//g' -e 's/-l gthread-2.0//g' -e 's/-l z//g' -i src/Makefile
+  '';
+
+  buildPhase = ''
+    make -C src INCLUDEPATHS= LIBPATHS=
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp src/namecoind $out/bin
+  '';
+
+  meta = {
+    description = "Decentralized open source information registration and transfer system based on the Bitcoin cryptocurrency";
+    homepage = "http://namecoin.info";
+    license = "MIT";
+    maintainers = [ "Chris Double <chris.double@double.co.nz>" ];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/applications/misc/namecoin/qt.nix b/pkgs/applications/misc/namecoin/qt.nix
new file mode 100644
index 000000000000..08dbee26f0b2
--- /dev/null
+++ b/pkgs/applications/misc/namecoin/qt.nix
@@ -0,0 +1,33 @@
+{ fetchgit, stdenv, db4, boost, openssl, qt4, unzip, namecoin }:
+
+stdenv.mkDerivation rec {
+  version = "0.3.75";
+  name = "namecoin-qt-${version}";
+
+  src = namecoin.src;
+
+  # Don't build with miniupnpc due to namecoin using a different verison that
+  # ships with NixOS and it is API incompatible.
+  buildInputs = [ db4 boost openssl unzip qt4 ];
+
+  configurePhase = ''
+    qmake USE_UPNP=-
+  '';
+
+  buildPhase = ''
+    make
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp namecoin-qt $out/bin
+  '';
+
+  meta = {
+    description = "Decentralized open source information registration and transfer system based on the Bitcoin cryptocurrency";
+    homepage = "http://namecoin.info";
+    license = "MIT";
+    maintainers = [ "Chris Double <chris.double@double.co.nz>" ];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cfb4ac4ba823..b8a97d5a432c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9169,6 +9169,9 @@ let
 
   mutt = callPackage ../applications/networking/mailreaders/mutt { };
 
+  namecoin = callPackage ../applications/misc/namecoin { };
+  namecoinqt = callPackage ../applications/misc/namecoin/qt.nix { };
+
   pcmanfm = callPackage ../applications/misc/pcmanfm { };
 
   ruby_gpgme = callPackage ../development/libraries/ruby_gpgme {

From c6c889b4ea8295607fc43d99ae4a2f62a31bab6c Mon Sep 17 00:00:00 2001
From: Chris Double <chris.double@double.co.nz>
Date: Fri, 4 Jul 2014 15:19:08 +1200
Subject: [PATCH 0005/1453] Add Self programming language

---
 .../development/interpreters/self/default.nix | 44 +++++++++++++++++++
 pkgs/development/interpreters/self/self       | 18 ++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 64 insertions(+)
 create mode 100644 pkgs/development/interpreters/self/default.nix
 create mode 100755 pkgs/development/interpreters/self/self

diff --git a/pkgs/development/interpreters/self/default.nix b/pkgs/development/interpreters/self/default.nix
new file mode 100644
index 000000000000..b379044789d0
--- /dev/null
+++ b/pkgs/development/interpreters/self/default.nix
@@ -0,0 +1,44 @@
+{ fetchurl, fetchgit, stdenv, xlibs, gcc44, makeWrapper, ncurses, cmake }:
+
+stdenv.mkDerivation rec {
+  # The Self wrapper stores source in $XDG_DATA_HOME/self or ~/.local/share/self 
+  # so that it can be written to when using the Self transposer. Running 'Self'
+  # after installation runs without an image. You can then build a Self image with:
+  #   $ cd ~/.local/share/self/objects
+  #   $ Self 
+  #   > 'worldBuilder.self' _RunScript
+  #
+  # This image can later be started with:
+  #   $ Self -s myimage.snap
+  #
+  version = "4.5.0";
+  name = "self-${version}";
+
+  src = fetchgit {
+    url    = "https://github.com/russellallen/self";
+    rev    = "d16bcaad3c5092dae81ad0b16d503f2a53b8ef86";
+    sha256 = "966025b71542e44fc830b951f404f5721ad410ed24f7236fd0cd820ea0fc5731";
+  };
+
+  # gcc 4.6 and above causes crashes on Self startup but gcc 4.4 works.
+  buildInputs = [ gcc44 ncurses xlibs.libX11 xlibs.libXext makeWrapper cmake ];
+
+  selfWrapper = ./self;
+
+  installPhase = ''
+    mkdir -p "$out"/bin
+    cp ./vm/Self "$out"/bin/Self.wrapped
+    mkdir -p "$out"/share/self
+    cp -r ../objects "$out"/share/self/
+    makeWrapper $selfWrapper $out/bin/Self \
+      --set SELF_ROOT "$out"
+  '';
+
+  meta = {
+    description = "A prototype-based dynamic object-oriented programming language, environment, and virtual machine";
+    homepage = "http://selflanguage.org/";
+    license = stdenv.lib.licenses.bsd3;
+    maintainer = [ "Chris Double <chris.double@double.co.nz>" ];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/development/interpreters/self/self b/pkgs/development/interpreters/self/self
new file mode 100755
index 000000000000..d504682086b0
--- /dev/null
+++ b/pkgs/development/interpreters/self/self
@@ -0,0 +1,18 @@
+#! /usr/bin/env bash
+
+export SELF_HOME="$HOME/.local/share/self"
+if [ -n "$XDG_DATA_HOME" ]
+  then export SELF_HOME="$XDG_DATA_HOME/self"
+fi
+
+if [ ! -d $SELF_HOME ]; then
+  mkdir -p $SELF_HOME
+fi
+
+if [ ! -d $SELF_HOME/objects ]; then
+  mkdir -p $SELF_HOME/objects
+  cp -r $SELF_ROOT/share/self/objects/* $SELF_HOME/objects
+  chmod -R +w $SELF_HOME/objects
+fi
+
+exec $SELF_ROOT/bin/Self.wrapped "$@"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 11d06f40e503..f4978b706f47 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3625,6 +3625,8 @@ let
 
   scheme48 = callPackage ../development/interpreters/scheme48 { };
 
+  self = callPackage_i686 ../development/interpreters/self { };
+
   spark = callPackage ../applications/networking/cluster/spark { };
 
   spidermonkey = callPackage ../development/interpreters/spidermonkey { };

From 518daa96600603ea117c25f80482378d2301ed11 Mon Sep 17 00:00:00 2001
From: Matthew Brown <matt@ederoyd.co.uk>
Date: Sun, 6 Jul 2014 13:08:39 +0100
Subject: [PATCH 0006/1453] Added Sphinx Search package

---
 pkgs/servers/search/sphinxsearch/default.nix | 31 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/servers/search/sphinxsearch/default.nix

diff --git a/pkgs/servers/search/sphinxsearch/default.nix b/pkgs/servers/search/sphinxsearch/default.nix
new file mode 100644
index 000000000000..9264ae996098
--- /dev/null
+++ b/pkgs/servers/search/sphinxsearch/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, pkgconfig, mysql }:
+
+let
+  version = "2.1.9";
+  mainSrc = fetchurl {
+    url = "http://sphinxsearch.com/files/sphinx-${version}-release.tar.gz";
+    sha256 = "00vwxf3zr0g1fq9mls1z2rd8nxw74b76pkl1j466lig1qc5am2b2";
+  };
+in
+
+stdenv.mkDerivation rec {
+  name = "sphinxsearch-${version}";
+  src = mainSrc;
+
+  configureFlags = [
+    "--program-prefix=sphinxsearch-"
+  ];
+
+  buildInputs = [ 
+    pkgconfig
+    mysql
+  ];
+
+  meta = {
+    description = "Sphinx is an open source full text search server.";
+    homepage    = http://sphinxsearch.com;
+    license     = stdenv.lib.licenses.gpl2;
+    platforms   = stdenv.lib.platforms.all;
+    maintainers = with stdenv.lib.maintainers; [ ederoyd46 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f20f6ef89531..bc4eabb8efb4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6125,6 +6125,8 @@ let
 
   sphinxbase = callPackage ../development/libraries/sphinxbase { };
 
+  sphinxsearch = callPackage ../servers/search/sphinxsearch { };
+
   spice = callPackage ../development/libraries/spice {
     celt = celt_0_5_1;
     inherit (xlibs) libXrandr libXfixes libXext libXrender libXinerama;

From a45d48fe08ba7055c25329b9d258704cc158e522 Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Tue, 8 Jul 2014 22:31:16 +0200
Subject: [PATCH 0007/1453] Google hangouts: Bump to 5.4.2.0

Verified working with Firefox, however it still doesn't work with
Chromium because of the NPAPI vs PPAPI thing.

Chrome's Pepper Plugin API doesn't seem to look for
plugins in the MOZ_PLUGIN_PATH, anyway I left them there for others to
find the solution :-)
---
 .../google-talk-plugin/default.nix            | 31 +++++++++----------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
index e1bc4e977f6a..0e3376b5d720 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
@@ -13,6 +13,7 @@ let
     [ mesa
       xorg.libXt
       xorg.libX11
+      xorg.libXrender
       cairo
       libpng
       gtk
@@ -47,20 +48,20 @@ stdenv.mkDerivation rec {
   name = "google-talk-plugin-${version}";
 
   # You can get the upstream version and SHA-1 hash from the following URLs:
-  # http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-amd64/Packages
-  # http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-i386/Packages
-  version = "5.1.5.0";
+  # curl -s http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-amd64/Packages | grep -E 'Version|SHA1'
+  # curl -s http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-i386/Packages | grep -E 'Version|SHA1'
+  version = "5.4.2.0";
 
   src =
     if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "${baseURL}/google-talkplugin_${version}-1_amd64.deb";
-        sha1 = "fc830f4c7f5816f4578ec73e6d4aef059ad4a0b1";
+        sha1 = "d75fad757750b4830c4e401ade92b4993e2a4ab2";
       }
     else if stdenv.system == "i686-linux" then
       fetchurl {
         url = "${baseURL}/google-talkplugin_${version}-1_i386.deb";
-        sha1 = "9b7043c3585b3479ba11aabb7b8af755a61df963";
+        sha1 = "410872377b0bdac06b580c5e1755a3a3c712144b";
       }
     else throw "Google Talk does not support your platform.";
 
@@ -72,22 +73,18 @@ stdenv.mkDerivation rec {
     ''
       plugins=$out/lib/mozilla/plugins
       mkdir -p $plugins
-      cp opt/google/talkplugin/libnp*.so $plugins
+      cp opt/google/talkplugin/*.so $plugins
 
-      patchelf --set-rpath "${makeLibraryPath [ stdenv.gcc.gcc xorg.libX11 ]}:${stdenv.gcc.gcc}/lib64" \
-        $plugins/libnpgoogletalk.so
+      for i in libnpgoogletalk.so libppgoogletalk.so libppo1d.so; do
+        patchelf --set-rpath "${makeLibraryPath [ stdenv.gcc.gcc xorg.libX11 ]}:${stdenv.gcc.gcc}/lib64" $plugins/$i
+      done
 
-      patchelf --set-rpath "$out/libexec/google/talkplugin/lib:${rpathPlugin}:${stdenv.gcc.gcc}/lib64" \
-        $plugins/libnpgtpo3dautoplugin.so
+      for i in libgoogletalkremoting.so libnpo1d.so; do
+        patchelf --set-rpath "$out/libexec/google/talkplugin/lib:${rpathPlugin}:${stdenv.gcc.gcc}/lib64" $plugins/$i
+      done
 
       mkdir -p $out/libexec/google/talkplugin
-      cp -prd opt/google/talkplugin/{GoogleTalkPlugin,locale,windowpicker.glade} $out/libexec/google/talkplugin/
-
-      mkdir -p $out/libexec/google/talkplugin/lib
-      cp opt/google/talkplugin/lib/libCg* $out/libexec/google/talkplugin/lib/
-
-      patchelf --set-rpath "$out/libexec/google/talkplugin/lib" \
-        $out/libexec/google/talkplugin/lib/libCgGL.so
+      cp -prd opt/google/talkplugin/{data,GoogleTalkPlugin,locale,remoting24x24.png,windowpicker.glade} $out/libexec/google/talkplugin/
 
       patchelf \
         --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

From d82c95cf170b9c46ff64afa283cb15b8cd4f5c3d Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Thu, 10 Jul 2014 09:55:50 +0200
Subject: [PATCH 0008/1453] glibc_multi: move glibc_multi script out of
 all-packages.nix

---
 .../libraries/glibc/2.19/multi.nix            | 31 +++++++++++++++++
 pkgs/top-level/all-packages.nix               | 34 +++----------------
 2 files changed, 35 insertions(+), 30 deletions(-)
 create mode 100644 pkgs/development/libraries/glibc/2.19/multi.nix

diff --git a/pkgs/development/libraries/glibc/2.19/multi.nix b/pkgs/development/libraries/glibc/2.19/multi.nix
new file mode 100644
index 000000000000..ad4a34152b65
--- /dev/null
+++ b/pkgs/development/libraries/glibc/2.19/multi.nix
@@ -0,0 +1,31 @@
+{ runCommand, glibc, glibc32
+}:
+
+runCommand "${glibc.name}-multi"
+  { inherit glibc32;
+   glibc64 = glibc;
+  }
+  ''
+    mkdir -p $out
+    ln -s $glibc64/* $out/
+
+    rm $out/lib $out/lib64
+    mkdir -p $out/lib
+    ln -s $glibc64/lib/* $out/lib
+    ln -s $glibc32/lib $out/lib/32
+    ln -s lib $out/lib64
+
+    # fixing ldd RLTDLIST
+    rm $out/bin
+    cp -rs $glibc64/bin $out
+    chmod u+w $out/bin
+    rm $out/bin/ldd
+    sed -e "s|^RTLDLIST=.*$|RTLDLIST=\"$out/lib/ld-2.19.so $out/lib/32/ld-linux.so.2\"|g" \
+        $glibc64/bin/ldd > $out/bin/ldd
+    chmod 555 $out/bin/ldd
+
+    rm $out/include
+    cp -rs $glibc32/include $out
+    chmod -R u+w $out/include
+    cp -rsf $glibc64/include $out
+  ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f3714770c5f5..edf75394cb9a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4634,36 +4634,10 @@ let
 
   glibcInfo = callPackage ../development/libraries/glibc/2.19/info.nix { };
 
-  glibc_multi =
-    runCommand "${glibc.name}-multi"
-      { glibc64 = glibc;
-        glibc32 = (import ./all-packages.nix {system = "i686-linux";}).glibc;
-      }
-      ''
-        mkdir -p $out
-        ln -s $glibc64/* $out/
-
-        rm $out/lib $out/lib64
-        mkdir -p $out/lib
-        ln -s $glibc64/lib/* $out/lib
-        ln -s $glibc32/lib $out/lib/32
-        ln -s lib $out/lib64
-
-        # fixing ldd RLTDLIST
-        rm $out/bin
-        cp -rs $glibc64/bin $out
-        chmod u+w $out/bin
-        rm $out/bin/ldd
-        sed -e "s|^RTLDLIST=.*$|RTLDLIST=\"$out/lib/ld-2.19.so $out/lib/32/ld-linux.so.2\"|g" \
-            $glibc64/bin/ldd > $out/bin/ldd
-        chmod 555 $out/bin/ldd
-
-        rm $out/include
-        cp -rs $glibc32/include $out
-        chmod -R u+w $out/include
-        cp -rsf $glibc64/include $out
-      '' # */
-      ;
+  glibc_multi = callPackage ../development/libraries/glibc/2.19/multi.nix {
+    inherit glibc;
+    glibc32 = (import ./all-packages.nix {system = "i686-linux";}).glibc;
+  };
 
   glm = callPackage ../development/libraries/glm { };
 

From cab929c6c25d69012dc9d161b0068a5c3bf26718 Mon Sep 17 00:00:00 2001
From: System administrator <robberer@freakmail.de>
Date: Thu, 10 Jul 2014 14:32:08 +0200
Subject: [PATCH 0009/1453] httpd: disable logging when logFormat = "none"

---
 nixos/modules/services/web-servers/apache-httpd/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index 6d0416fbb155..b1a247163a47 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -130,7 +130,7 @@ let
   '';
 
 
-  loggingConf = ''
+  loggingConf = (if mainCfg.logFormat != "none" then ''
     ErrorLog ${mainCfg.logDir}/error_log
 
     LogLevel notice
@@ -141,7 +141,9 @@ let
     LogFormat "%{User-agent}i" agent
 
     CustomLog ${mainCfg.logDir}/access_log ${mainCfg.logFormat}
-  '';
+  '' else ''
+    ErrorLog /dev/null
+  '');
 
 
   browserHacks = ''

From 10981178a966f0d8bfc77a680921d85e5497e453 Mon Sep 17 00:00:00 2001
From: Boris Sukholitko <boriss@gmail.com>
Date: Sat, 12 Jul 2014 18:17:50 +0300
Subject: [PATCH 0010/1453] Add emscripten: LLVM to JavaScript compiler

---
 .../compilers/emscripten-fastcomp/default.nix | 42 +++++++++++++++++++
 .../compilers/emscripten/default.nix          | 40 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 3 files changed, 86 insertions(+)
 create mode 100644 pkgs/development/compilers/emscripten-fastcomp/default.nix
 create mode 100644 pkgs/development/compilers/emscripten/default.nix

diff --git a/pkgs/development/compilers/emscripten-fastcomp/default.nix b/pkgs/development/compilers/emscripten-fastcomp/default.nix
new file mode 100644
index 000000000000..3eb9aef528c0
--- /dev/null
+++ b/pkgs/development/compilers/emscripten-fastcomp/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchgit, python }:
+
+let
+  tag = "1.21.0";
+in
+
+stdenv.mkDerivation rec {
+  name = "emscripten-fastcomp-${tag}";
+
+  srcFC = fetchgit {
+    url = git://github.com/kripken/emscripten-fastcomp;
+    rev = "refs/tags/${tag}";
+    sha256 = "0mcxzg2cfg0s1vfm3bh1ar4xsddb6xkv1dsdbgnpx38lbj1mvfs1";
+  };
+
+  srcFL = fetchgit {
+    url = git://github.com/kripken/emscripten-fastcomp-clang;
+    rev = "refs/tags/${tag}";
+    sha256 = "0s2jcn36d236cfpryjpgaazjp3cg83d0h78g6kk1j6vdppv3vgnp";
+  };
+
+  buildInputs = [ python ];
+  buildCommand = ''
+    cp -as ${srcFC} $TMPDIR/src
+    chmod +w $TMPDIR/src/tools
+    cp -as ${srcFL} $TMPDIR/src/tools/clang
+
+    chmod +w $TMPDIR/src
+    mkdir $TMPDIR/src/build
+    cd $TMPDIR/src/build
+
+    ../configure --enable-optimized --disable-assertions --enable-targets=host,js
+    make
+    cp -a Release/bin $out
+  '';
+  meta = with stdenv.lib; {
+    homepage = https://github.com/kripken/emscripten-fastcomp;
+    description = "emscripten llvm";
+    maintainers = with maintainers; [ bosu ];
+    license = "University of Illinois/NCSA Open Source License";
+  };
+}
diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix
new file mode 100644
index 000000000000..dc81b90b4b90
--- /dev/null
+++ b/pkgs/development/compilers/emscripten/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchgit, emscriptenfastcomp, python, nodejs, closurecompiler, jre }:
+
+let
+  tag = "1.21.0";
+in
+
+stdenv.mkDerivation rec {
+  name = "emscripten-${tag}";
+
+  src = fetchgit {
+    url = git://github.com/kripken/emscripten;
+    rev = "refs/tags/${tag}";
+    sha256 = "0y17ab4nhd3521b50sv2i2667w0rlcnmlkpkgw5j3fsh8awxgf32";
+  };
+
+  buildCommand = ''
+    mkdir $out
+    cp -a $src $out/bin
+    chmod -R +w $out/bin
+    grep -rl '^#!/usr.*python' $out/bin | xargs sed -i -s 's@^#!/usr.*python.*@#!${python}/bin/python@'
+    sed -i -e "s,EM_CONFIG = '~/.emscripten',EM_CONFIG = '$out/config'," $out/bin/tools/shared.py
+    sed -i -e 's,^.*did not see a source tree above the LLVM.*$,      return True,' $out/bin/tools/shared.py
+    sed -i -e 's,def check_sanity(force=False):,def check_sanity(force=False):\n  return,' $out/bin/tools/shared.py
+
+    echo "EMSCRIPTEN_ROOT = '$out/bin'" > $out/config
+    echo "LLVM_ROOT = '${emscriptenfastcomp}'" >> $out/config
+    echo "PYTHON = '${python}/bin/python'" >> $out/config
+    echo "NODE_JS = '${nodejs}/bin/node'" >> $out/config
+    echo "JS_ENGINES = [NODE_JS]" >> $out/config
+    echo "COMPILER_ENGINE = NODE_JS" >> $out/config
+    echo "CLOSURE_COMPILER = '${closurecompiler}/bin/closure-compiler'" >> $out/config
+    echo "JAVA = '${jre}/bin/java'" >> $out/config
+  '';
+  meta = with stdenv.lib; {
+    homepage = https://github.com/kripken/emscripten;
+    description = "An LLVM-to-JavaScript Compiler";
+    maintainers = with maintainers; [ bosu ];
+    license = "MIT and University of Illinois/NCSA Open Source License";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 450b28bd85e5..a8cf37220086 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -957,6 +957,10 @@ let
 
   edk2 = callPackage ../development/compilers/edk2 { };
 
+  emscripten = callPackage ../development/compilers/emscripten { };
+
+  emscriptenfastcomp = callPackage ../development/compilers/emscripten-fastcomp { };
+
   efibootmgr = callPackage ../tools/system/efibootmgr { };
 
   elasticsearch = callPackage ../servers/search/elasticsearch { };

From 87b3e7a93cc9f26d362789e520053e9469d4fec1 Mon Sep 17 00:00:00 2001
From: Mathnerd314 <mathnerd314.gph+hs@gmail.com>
Date: Mon, 14 Jul 2014 02:35:09 +0200
Subject: [PATCH 0011/1453] Remove non-cpufreq_* modules since they are loaded
 by udev.

---
 nixos/modules/tasks/cpu-freq.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/nixos/modules/tasks/cpu-freq.nix b/nixos/modules/tasks/cpu-freq.nix
index a8c63c134287..70bbee8474eb 100644
--- a/nixos/modules/tasks/cpu-freq.nix
+++ b/nixos/modules/tasks/cpu-freq.nix
@@ -30,9 +30,7 @@ in
 
   config = mkIf (!config.boot.isContainer && config.powerManagement.cpuFreqGovernor != null) {
 
-    boot.kernelModules = [ "acpi-cpufreq" "speedstep-lib" "pcc-cpufreq"
-      "cpufreq_${cfg.cpuFreqGovernor}"
-    ];
+    boot.kernelModules = [ "cpufreq_${cfg.cpuFreqGovernor}" ];
 
     environment.systemPackages = [ cpupower ];
 

From a0c91d66f1d63192a8145e5d0314eaa701542604 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sun, 13 Jul 2014 15:46:34 +0900
Subject: [PATCH 0012/1453] uim, gtk-exe-env, qt-plugin-env: Add input method
 modules for GTK+ and Qt

---
 nixos/modules/config/gtk-exe-env.nix          |  41 ++++
 nixos/modules/config/qt-plugin-env.nix        |  37 +++
 nixos/modules/module-list.nix                 |   3 +
 nixos/modules/programs/environment.nix        |   2 +-
 nixos/modules/programs/uim.nix                |  29 +++
 pkgs/development/libraries/gtk+/2.x.nix       |   7 +
 pkgs/development/libraries/gtk+/3.x.nix       |   7 +
 pkgs/tools/inputmethods/uim/default.nix       |  44 ++++
 .../inputmethods/uim/immodules_cache.patch    | 231 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   4 +
 10 files changed, 404 insertions(+), 1 deletion(-)
 create mode 100644 nixos/modules/config/gtk-exe-env.nix
 create mode 100644 nixos/modules/config/qt-plugin-env.nix
 create mode 100644 nixos/modules/programs/uim.nix
 create mode 100644 pkgs/tools/inputmethods/uim/default.nix
 create mode 100644 pkgs/tools/inputmethods/uim/immodules_cache.patch

diff --git a/nixos/modules/config/gtk-exe-env.nix b/nixos/modules/config/gtk-exe-env.nix
new file mode 100644
index 000000000000..b565072e3a71
--- /dev/null
+++ b/nixos/modules/config/gtk-exe-env.nix
@@ -0,0 +1,41 @@
+{ config, pkgs, lib, ... }:
+
+{
+  imports = [
+  ];
+
+  options = {
+    gtkPlugins = lib.mkOption {
+      type = lib.types.listOf lib.types.path;
+      default = [];
+      description = ''
+        Plugin packages for GTK+ such as input methods.
+      '';
+    };
+  };
+
+  config = {
+    environment.variables = if builtins.length config.gtkPlugins > 0
+      then
+        let
+          paths = [ pkgs.gtk2 pkgs.gtk3 ] ++ config.gtkPlugins;
+          env = pkgs.buildEnv {
+            name = "gtk-exe-env";
+
+            inherit paths;
+
+            postBuild = lib.concatStringsSep "\n"
+              (map (d: d.gtkExeEnvPostBuild or "") paths);
+
+            ignoreCollisions = true;
+          };
+        in {
+          GTK_EXE_PREFIX = builtins.toString env;
+          GTK_PATH = [
+            "${env}/lib/gtk-2.0"
+            "${env}/lib/gtk-3.0"
+          ];
+        }
+      else {};
+  };
+}
diff --git a/nixos/modules/config/qt-plugin-env.nix b/nixos/modules/config/qt-plugin-env.nix
new file mode 100644
index 000000000000..c59865604165
--- /dev/null
+++ b/nixos/modules/config/qt-plugin-env.nix
@@ -0,0 +1,37 @@
+{ config, pkgs, lib, ... }:
+
+{
+  imports = [
+  ];
+
+  options = {
+    qtPlugins = lib.mkOption {
+      type = lib.types.listOf lib.types.path;
+      default = [];
+      description = ''
+        Plugin packages for Qt such as input methods.
+      '';
+    };
+  };
+
+  config = {
+    environment.variables = if builtins.length config.qtPlugins > 0
+      then
+        let
+          paths = [ pkgs.qt48 ] ++ config.qtPlugins;
+          env = pkgs.buildEnv {
+            name = "qt-plugin-env";
+
+            inherit paths;
+
+            postBuild = lib.concatStringsSep "\n"
+              (map (d: d.qtPluginEnvPostBuild or "") paths);
+
+            ignoreCollisions = true;
+          };
+        in {
+          QT_PLUGIN_PATH = [ (builtins.toString env) ];
+        }
+      else {};
+  };
+}
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index a9039eea71d4..74f4eebd619c 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -5,6 +5,7 @@
   ./config/fonts/fonts.nix
   ./config/fonts/ghostscript.nix
   ./config/gnu.nix
+  ./config/gtk-exe-env.nix
   ./config/i18n.nix
   ./config/krb5.nix
   ./config/ldap.nix
@@ -13,6 +14,7 @@
   ./config/nsswitch.nix
   ./config/power-management.nix
   ./config/pulseaudio.nix
+  ./config/qt-plugin-env.nix
   ./config/shells-environment.nix
   ./config/system-environment.nix
   ./config/swap.nix
@@ -56,6 +58,7 @@
   ./programs/shell.nix
   ./programs/ssh.nix
   ./programs/ssmtp.nix
+  ./programs/uim.nix
   ./programs/venus.nix
   ./programs/wvdial.nix
   ./programs/zsh/zsh.nix
diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix
index 80c3e83fe812..4a510805b019 100644
--- a/nixos/modules/programs/environment.nix
+++ b/nixos/modules/programs/environment.nix
@@ -52,7 +52,7 @@ in
         STRIGI_PLUGIN_PATH = [ "${i}/lib/strigi/" ];
         QT_PLUGIN_PATH = [ "${i}/lib/qt4/plugins" "${i}/lib/kde4/plugins" ];
         QTWEBKIT_PLUGIN_PATH = [ "${i}/lib/mozilla/plugins/" ];
-        GTK_PATH = [ "${i}/lib/gtk-2.0" ];
+        GTK_PATH = [ "${i}/lib/gtk-2.0" "${i}/lib/gtk-3.0" ];
         XDG_CONFIG_DIRS = [ "${i}/etc/xdg" ];
         XDG_DATA_DIRS = [ "${i}/share" ];
         MOZ_PLUGIN_PATH = [ "${i}/lib/mozilla/plugins" ];
diff --git a/nixos/modules/programs/uim.nix b/nixos/modules/programs/uim.nix
new file mode 100644
index 000000000000..237da3415dc3
--- /dev/null
+++ b/nixos/modules/programs/uim.nix
@@ -0,0 +1,29 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+  cfg = config.uim;
+in
+{
+  options = {
+    uim = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        example = true;
+        description = "enable UIM input method";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    environment.systemPackages = [ pkgs.uim ];
+    gtkPlugins = [ pkgs.uim ];
+    qtPlugins = [ pkgs.uim ];
+    environment.variables.GTK_IM_MODULE = "uim";
+    environment.variables.QT_IM_MODULE = "uim";
+    environment.variables.XMODIFIERS = "@im=uim";
+    services.xserver.displayManager.sessionCommands = "uim-xim &";
+  };
+}
diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix
index c57179364a7c..5abba3102ff6 100644
--- a/pkgs/development/libraries/gtk+/2.x.nix
+++ b/pkgs/development/libraries/gtk+/2.x.nix
@@ -37,6 +37,13 @@ stdenv.mkDerivation rec {
 
   postInstall = "rm -rf $out/share/gtk-doc";
 
+  passthru = {
+    gtkExeEnvPostBuild = ''
+      rm $out/lib/gtk-2.0/2.10.0/immodules.cache
+      $out/bin/gtk-query-immodules-2.0 $out/lib/gtk-2.0/2.10.0/immodules/*.so > $out/lib/gtk-2.0/2.10.0/immodules.cache
+    ''; # workaround for bug of nix-mode for Emacs */ '';
+  };
+
   meta = with stdenv.lib; {
     description = "A multi-platform toolkit for creating graphical user interfaces";
     homepage    = http://www.gtk.org/;
diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index ef8f3e398832..acd15b8269cb 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -38,6 +38,13 @@ stdenv.mkDerivation rec {
 
   postInstall = "rm -rf $out/share/gtk-doc";
 
+  passthru = {
+    gtkExeEnvPostBuild = ''
+      rm $out/lib/gtk-3.0/3.0.0/immodules.cache
+      $out/bin/gtk-query-immodules-3.0 $out/lib/gtk-3.0/3.0.0/immodules/*.so > $out/lib/gtk-3.0/3.0.0/immodules.cache
+    ''; # workaround for bug of nix-mode for Emacs */ '';
+  };
+
   meta = {
     description = "A multi-platform toolkit for creating graphical user interfaces";
 
diff --git a/pkgs/tools/inputmethods/uim/default.nix b/pkgs/tools/inputmethods/uim/default.nix
new file mode 100644
index 000000000000..b8ee95fae92c
--- /dev/null
+++ b/pkgs/tools/inputmethods/uim/default.nix
@@ -0,0 +1,44 @@
+{stdenv, fetchurl, intltool, pkgconfig, qt4, gtk2, gtk3, kdelibs, cmake, ... }:
+
+stdenv.mkDerivation rec {
+  version = "1.8.6";
+  name = "uim-${version}";
+
+  buildInputs = [
+    intltool
+    pkgconfig
+    qt4
+    gtk2
+    gtk3
+    kdelibs
+    cmake
+  ];
+
+  patches = [ ./immodules_cache.patch ];
+
+  configureFlags = [
+    "--with-gtk2"
+    "--with-gtk3"
+    "--enable-kde4-applet"
+    "--enable-notify=knotify4"
+    "--enable-pref"
+    "--with-qt4"
+    "--with-qt4-immodule"
+    "--with-skk"
+    "--with-x"
+  ];
+
+  dontUseCmakeConfigure = true;
+
+  src = fetchurl {
+    url = "http://uim.googlecode.com/files/uim-${version}.tar.bz2";
+    sha1 = "43b9dbdead6797880e6cfc9c032ecb2d37d42777";
+  };
+
+  meta = {
+    homepage = "http://code.google.com/p/uim/";
+    description = "A multilingual input method framework";
+    license = stdenv.lib.licenses.bsd3;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/tools/inputmethods/uim/immodules_cache.patch b/pkgs/tools/inputmethods/uim/immodules_cache.patch
new file mode 100644
index 000000000000..c2d08b661e38
--- /dev/null
+++ b/pkgs/tools/inputmethods/uim/immodules_cache.patch
@@ -0,0 +1,231 @@
+diff -ru -x '*~' uim-1.8.6.orig/gtk2/immodule/Makefile.am uim-1.8.6/gtk2/immodule/Makefile.am
+--- uim-1.8.6.orig/gtk2/immodule/Makefile.am	2013-06-30 13:26:09.000000000 +0900
++++ uim-1.8.6/gtk2/immodule/Makefile.am	2014-07-13 21:51:26.538400004 +0900
+@@ -1,5 +1,5 @@
+ uim_gtk_im_module_path = $(libdir)/gtk-2.0
+-uim_gtk_im_module_file = $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules
++uim_gtk_im_module_file = $(uim_gtk_im_module_path)/@GTK_BINARY_VERSION@/immodules.cache
+ 
+ moduledir = $(uim_gtk_im_module_path)/@GTK_BINARY_VERSION@/immodules
+ 
+@@ -38,48 +38,12 @@
+ 
+ install-data-hook: gtk-rc-get-immodule-file
+ 	if test -z $(DESTDIR); then \
+-	  if test $(libdir) = $(GTK_LIBDIR); then \
+-	    if type $(QUERY_COMMAND) > /dev/null 2>&1; then \
+-	      $(QUERY_COMMAND) > `$(GTK_RC_GET_IMMODULE_FILE)`; \
+-	      echo "*** \"`$(GTK_RC_GET_IMMODULE_FILE)`\" is updated. ***";  \
+-	    else \
+-	      echo "********************** Warning ***********************"; \
+-	      echo " $(QUERY_COMMAND) not found"; \
+-	      echo " Please make sure to update"; \
+-	      echo " \"`$(GTK_RC_GET_IMMODULE_FILE)`\""; \
+-	      echo " manually."; \
+-	      echo "******************************************************"; \
+-	    fi \
+-	  else \
+-	    if type $(QUERY_COMMAND) > /dev/null 2>&1; then \
+-	      $(mkinstalldirs) $(sysconfdir)/gtk-2.0; \
+-	      GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \
+-	      echo "******************************************************"; \
+-	      echo " You need to set"; \
+-	      echo " GTK_IM_MODULE_FILE=$(uim_gtk_im_module_file)"; \
+-	      echo " environment variable to use this module."; \
+-	      echo "******************************************************"; \
+-	    else \
+-	      echo "********************** Warning ***********************"; \
+-	      echo " $(QUERY_COMMAND) not found"; \
+-	      echo " Please make sure to update"; \
+-	      echo " \"$(uim_gtk_im_module_file)\""; \
+-	      echo " manually, and set"; \
+-	      echo " GTK_IM_MODULE_FILE=$(uim_gtk_im_module_file)"; \
+-	      echo " environment variable to use this module."; \
+-	      echo "******************************************************"; \
+-	    fi \
+-	  fi \
++	  $(mkinstalldirs) $(uim_gtk_im_module_path)/@GTK_BINARY_VERSION@; \
++	  GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \
+ 	fi
+ uninstall-hook:
+ 	if test -z $(DESTDIR); then \
+-	  if type $(QUERY_COMMAND) > /dev/null 2>&1; then \
+-	    if test $(libdir) = $(GTK_LIBDIR); then \
+-	      $(QUERY_COMMAND) > `$(GTK_RC_GET_IMMODULE_FILE)`; \
+-	    else \
+-	      GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \
+-	    fi \
+-	  fi \
++	  GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \
+ 	fi
+ else
+ install-data-hook:
+diff -ru -x '*~' uim-1.8.6.orig/gtk2/immodule/Makefile.in uim-1.8.6/gtk2/immodule/Makefile.in
+--- uim-1.8.6.orig/gtk2/immodule/Makefile.in	2013-06-30 13:27:08.000000000 +0900
++++ uim-1.8.6/gtk2/immodule/Makefile.in	2014-07-13 22:12:27.947595507 +0900
+@@ -434,7 +434,7 @@
+ top_srcdir = @top_srcdir@
+ uim_pixmapsdir = @uim_pixmapsdir@
+ uim_gtk_im_module_path = $(libdir)/gtk-2.0
+-uim_gtk_im_module_file = $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules
++uim_gtk_im_module_file = $(uim_gtk_im_module_path)/@GTK_BINARY_VERSION@/immodules.cache
+ moduledir = $(uim_gtk_im_module_path)/@GTK_BINARY_VERSION@/immodules
+ @GTK2_TRUE@im_uim_la = im-uim.la
+ @GTK2_TRUE@im_uim_la_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
+@@ -875,48 +875,12 @@
+ 
+ @GTK2_TRUE@install-data-hook: gtk-rc-get-immodule-file
+ @GTK2_TRUE@	if test -z $(DESTDIR); then \
+-@GTK2_TRUE@	  if test $(libdir) = $(GTK_LIBDIR); then \
+-@GTK2_TRUE@	    if type $(QUERY_COMMAND) > /dev/null 2>&1; then \
+-@GTK2_TRUE@	      $(QUERY_COMMAND) > `$(GTK_RC_GET_IMMODULE_FILE)`; \
+-@GTK2_TRUE@	      echo "*** \"`$(GTK_RC_GET_IMMODULE_FILE)`\" is updated. ***";  \
+-@GTK2_TRUE@	    else \
+-@GTK2_TRUE@	      echo "********************** Warning ***********************"; \
+-@GTK2_TRUE@	      echo " $(QUERY_COMMAND) not found"; \
+-@GTK2_TRUE@	      echo " Please make sure to update"; \
+-@GTK2_TRUE@	      echo " \"`$(GTK_RC_GET_IMMODULE_FILE)`\""; \
+-@GTK2_TRUE@	      echo " manually."; \
+-@GTK2_TRUE@	      echo "******************************************************"; \
+-@GTK2_TRUE@	    fi \
+-@GTK2_TRUE@	  else \
+-@GTK2_TRUE@	    if type $(QUERY_COMMAND) > /dev/null 2>&1; then \
+-@GTK2_TRUE@	      $(mkinstalldirs) $(sysconfdir)/gtk-2.0; \
+-@GTK2_TRUE@	      GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \
+-@GTK2_TRUE@	      echo "******************************************************"; \
+-@GTK2_TRUE@	      echo " You need to set"; \
+-@GTK2_TRUE@	      echo " GTK_IM_MODULE_FILE=$(uim_gtk_im_module_file)"; \
+-@GTK2_TRUE@	      echo " environment variable to use this module."; \
+-@GTK2_TRUE@	      echo "******************************************************"; \
+-@GTK2_TRUE@	    else \
+-@GTK2_TRUE@	      echo "********************** Warning ***********************"; \
+-@GTK2_TRUE@	      echo " $(QUERY_COMMAND) not found"; \
+-@GTK2_TRUE@	      echo " Please make sure to update"; \
+-@GTK2_TRUE@	      echo " \"$(uim_gtk_im_module_file)\""; \
+-@GTK2_TRUE@	      echo " manually, and set"; \
+-@GTK2_TRUE@	      echo " GTK_IM_MODULE_FILE=$(uim_gtk_im_module_file)"; \
+-@GTK2_TRUE@	      echo " environment variable to use this module."; \
+-@GTK2_TRUE@	      echo "******************************************************"; \
+-@GTK2_TRUE@	    fi \
+-@GTK2_TRUE@	  fi \
++@GTK2_TRUE@	  $(mkinstalldirs) $(uim_gtk_im_module_path)/@GTK_BINARY_VERSION@; \
++@GTK2_TRUE@	  GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \
+ @GTK2_TRUE@	fi
+ @GTK2_TRUE@uninstall-hook:
+ @GTK2_TRUE@	if test -z $(DESTDIR); then \
+-@GTK2_TRUE@	  if type $(QUERY_COMMAND) > /dev/null 2>&1; then \
+-@GTK2_TRUE@	    if test $(libdir) = $(GTK_LIBDIR); then \
+-@GTK2_TRUE@	      $(QUERY_COMMAND) > `$(GTK_RC_GET_IMMODULE_FILE)`; \
+-@GTK2_TRUE@	    else \
+-@GTK2_TRUE@	      GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \
+-@GTK2_TRUE@	    fi \
+-@GTK2_TRUE@	  fi \
++@GTK2_TRUE@	  GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \
+ @GTK2_TRUE@	fi
+ @GTK2_FALSE@install-data-hook:
+ 
+diff -ru -x '*~' uim-1.8.6.orig/gtk3/immodule/Makefile.am uim-1.8.6/gtk3/immodule/Makefile.am
+--- uim-1.8.6.orig/gtk3/immodule/Makefile.am	2013-06-30 13:26:20.000000000 +0900
++++ uim-1.8.6/gtk3/immodule/Makefile.am	2014-07-13 21:55:38.114246503 +0900
+@@ -45,42 +45,11 @@
+ 
+ install-data-hook: gtk3-rc-get-immodule-file
+ 	if test -z $(DESTDIR); then \
+-	  if test $(libdir) = $(GTK3_LIBDIR); then \
+-	    if type $(QUERY_COMMAND) > /dev/null 2>&1; then \
+-	      $(QUERY_COMMAND) --update-cache; \
+-	      echo "*** \"`$(GTK3_RC_GET_IMMODULE_FILE)`\" is updated. ***";  \
+-	    else \
+-	      echo "********************** Warning ***********************"; \
+-	      echo " $(QUERY_COMMAND) not found"; \
+-	      echo " Please make sure to update"; \
+-	      echo " \"`$(GTK3_RC_GET_IMMODULE_FILE)`\""; \
+-	      echo " manually."; \
+-	      echo "******************************************************"; \
+-	    fi \
+-	  else \
+-	    if type $(QUERY_COMMAND) > /dev/null 2>&1; then \
+-	      GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) --update-cache; \
+-	    else \
+-	      echo "********************** Warning ***********************"; \
+-	      echo " $(QUERY_COMMAND) not found"; \
+-	      echo " Please make sure to update"; \
+-	      echo " immodules.cache"; \
+-	      echo " manually, and set"; \
+-	      echo " GTK_IM_MODULE_FILE=PATH_TO/immodule.cache"; \
+-	      echo " environment variable to use this module."; \
+-	      echo "******************************************************"; \
+-	    fi \
+-	  fi \
++	  GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) > $(uim_gtk3_im_module_path)/@GTK3_BINARY_VERSION@/immodules.cache ; \
+ 	fi
+ uninstall-hook:
+ 	if test -z $(DESTDIR); then \
+-	  if type $(QUERY_COMMAND) > /dev/null 2>&1; then \
+-	    if test $(libdir) = $(GTK3_LIBDIR); then \
+-	      $(QUERY_COMMAND) --update-cache; \
+-	    else \
+-	      GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) --update-cache; \
+-	    fi \
+-	  fi \
++	  GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) > $(uim_gtk3_im_module_path)/@GTK3_BINARY_VERSION@/immodules.cache ; \
+ 	fi
+ else
+ install-data-hook:
+diff -ru -x '*~' uim-1.8.6.orig/gtk3/immodule/Makefile.in uim-1.8.6/gtk3/immodule/Makefile.in
+--- uim-1.8.6.orig/gtk3/immodule/Makefile.in	2013-06-30 13:27:08.000000000 +0900
++++ uim-1.8.6/gtk3/immodule/Makefile.in	2014-07-13 21:56:11.531225832 +0900
+@@ -893,42 +893,11 @@
+ 
+ @GTK3_TRUE@install-data-hook: gtk3-rc-get-immodule-file
+ @GTK3_TRUE@	if test -z $(DESTDIR); then \
+-@GTK3_TRUE@	  if test $(libdir) = $(GTK3_LIBDIR); then \
+-@GTK3_TRUE@	    if type $(QUERY_COMMAND) > /dev/null 2>&1; then \
+-@GTK3_TRUE@	      $(QUERY_COMMAND) --update-cache; \
+-@GTK3_TRUE@	      echo "*** \"`$(GTK3_RC_GET_IMMODULE_FILE)`\" is updated. ***";  \
+-@GTK3_TRUE@	    else \
+-@GTK3_TRUE@	      echo "********************** Warning ***********************"; \
+-@GTK3_TRUE@	      echo " $(QUERY_COMMAND) not found"; \
+-@GTK3_TRUE@	      echo " Please make sure to update"; \
+-@GTK3_TRUE@	      echo " \"`$(GTK3_RC_GET_IMMODULE_FILE)`\""; \
+-@GTK3_TRUE@	      echo " manually."; \
+-@GTK3_TRUE@	      echo "******************************************************"; \
+-@GTK3_TRUE@	    fi \
+-@GTK3_TRUE@	  else \
+-@GTK3_TRUE@	    if type $(QUERY_COMMAND) > /dev/null 2>&1; then \
+-@GTK3_TRUE@	      GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) --update-cache; \
+-@GTK3_TRUE@	    else \
+-@GTK3_TRUE@	      echo "********************** Warning ***********************"; \
+-@GTK3_TRUE@	      echo " $(QUERY_COMMAND) not found"; \
+-@GTK3_TRUE@	      echo " Please make sure to update"; \
+-@GTK3_TRUE@	      echo " immodules.cache"; \
+-@GTK3_TRUE@	      echo " manually, and set"; \
+-@GTK3_TRUE@	      echo " GTK_IM_MODULE_FILE=PATH_TO/immodule.cache"; \
+-@GTK3_TRUE@	      echo " environment variable to use this module."; \
+-@GTK3_TRUE@	      echo "******************************************************"; \
+-@GTK3_TRUE@	    fi \
+-@GTK3_TRUE@	  fi \
++@GTK3_TRUE@	  GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) > $(uim_gtk3_im_module_path)/@GTK3_BINARY_VERSION@/immodules.cache ; \
+ @GTK3_TRUE@	fi
+ @GTK3_TRUE@uninstall-hook:
+ @GTK3_TRUE@	if test -z $(DESTDIR); then \
+-@GTK3_TRUE@	  if type $(QUERY_COMMAND) > /dev/null 2>&1; then \
+-@GTK3_TRUE@	    if test $(libdir) = $(GTK3_LIBDIR); then \
+-@GTK3_TRUE@	      $(QUERY_COMMAND) --update-cache; \
+-@GTK3_TRUE@	    else \
+-@GTK3_TRUE@	      GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) --update-cache; \
+-@GTK3_TRUE@	    fi \
+-@GTK3_TRUE@	  fi \
++@GTK3_TRUE@	  GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) > $(uim_gtk3_im_module_path)/@GTK3_BINARY_VERSION@/immodules.cache ; \
+ @GTK3_TRUE@	fi
+ @GTK3_FALSE@install-data-hook:
+ 
+diff -ru -x '*~' uim-1.8.6.orig/qt4/immodule/quiminputcontextplugin.pro.in uim-1.8.6/qt4/immodule/quiminputcontextplugin.pro.in
+--- uim-1.8.6.orig/qt4/immodule/quiminputcontextplugin.pro.in	2013-06-30 13:26:20.000000000 +0900
++++ uim-1.8.6/qt4/immodule/quiminputcontextplugin.pro.in	2014-03-09 11:31:19.388085048 +0900
+@@ -35,4 +35,4 @@
+ 
+ TARGET = uiminputcontextplugin
+ 
+-target.path += @DESTDIR@$$[QT_INSTALL_PLUGINS]/inputmethods
++target.path += @DESTDIR@@exec_prefix@/lib/qt4/plugins/inputmethods
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5edd597f29be..424a91651615 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2325,6 +2325,10 @@ let
 
   ttmkfdir = callPackage ../tools/misc/ttmkfdir { };
 
+  uim = callPackage ../tools/inputmethods/uim {
+    inherit (pkgs.kde4) kdelibs;
+  };
+
   unclutter = callPackage ../tools/misc/unclutter { };
 
   unbound = callPackage ../tools/networking/unbound { };

From 64c6d0117ddf088e4915f5eefc230ae4e6405eed Mon Sep 17 00:00:00 2001
From: Vincent Laporte <vincent.laporte@gmail.com>
Date: Wed, 9 Jul 2014 09:42:26 +0200
Subject: [PATCH 0013/1453] Adds OCaml libraries: uucd, uunf, uutf and xmlm
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Four OCaml libraries contributed by Daniel Bünzli for unicode and xml
processing.

 -  xmlm: Streaming XML codec for OCaml
 -  uutf: Non-blocking streaming Unicode codec for OCaml
 -  uunf: Unicode text normalization for OCaml
 -  uucd: Unicode character database decoder for Ocaml

Homepage: http://erratique.ch/software
---
 .../ocaml-modules/uucd/default.nix            | 39 +++++++++++++++++++
 .../ocaml-modules/uunf/default.nix            | 37 ++++++++++++++++++
 .../ocaml-modules/uutf/default.nix            | 37 ++++++++++++++++++
 .../ocaml-modules/xmlm/default.nix            | 37 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  5 +++
 5 files changed, 155 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/uucd/default.nix
 create mode 100644 pkgs/development/ocaml-modules/uunf/default.nix
 create mode 100644 pkgs/development/ocaml-modules/uutf/default.nix
 create mode 100644 pkgs/development/ocaml-modules/xmlm/default.nix

diff --git a/pkgs/development/ocaml-modules/uucd/default.nix b/pkgs/development/ocaml-modules/uucd/default.nix
new file mode 100644
index 000000000000..1d0f5c6cd504
--- /dev/null
+++ b/pkgs/development/ocaml-modules/uucd/default.nix
@@ -0,0 +1,39 @@
+{stdenv, fetchurl, ocaml, findlib, opam, xmlm}:
+let
+  pname = "uucd";
+  version = "2.0.0";
+  webpage = "http://erratique.ch/software/${pname}";
+  ocaml_version = (builtins.parseDrvName ocaml.name).version;
+in
+stdenv.mkDerivation rec {
+
+  name = "ocaml-${pname}-${version}";
+
+  src = fetchurl {
+    url = "${webpage}/releases/${pname}-${version}.tbz";
+    sha256 = "12lbrrdjwdxfa99pbg344dfkj51lr5d2ispcj7d7lwsqyxy6h57i";
+  };
+
+  buildInputs = [ ocaml findlib opam xmlm ];
+
+  createFindlibDestdir = true;
+
+  unpackCmd = "tar xjf $src";
+
+  buildPhase = "ocaml ./pkg/build.ml native=true native-dynlink=true";
+
+  installPhase = ''
+    opam-installer --script --prefix=$out ${pname}.install > install.sh
+    sh install.sh
+    ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml_version}/site-lib/
+  '';
+
+  propagatedBuildInputs = [ xmlm ];
+
+  meta = {
+    description = "An OCaml module to decode the data of the Unicode character database from its XML representation";
+    homepage = "${webpage}";
+    platforms = ocaml.meta.platforms;
+    license = stdenv.lib.licenses.bsd3;
+  };
+}
diff --git a/pkgs/development/ocaml-modules/uunf/default.nix b/pkgs/development/ocaml-modules/uunf/default.nix
new file mode 100644
index 000000000000..c807bbd44637
--- /dev/null
+++ b/pkgs/development/ocaml-modules/uunf/default.nix
@@ -0,0 +1,37 @@
+{stdenv, fetchurl, ocaml, findlib, opam}:
+let
+  pname = "uunf";
+  version = "0.9.3";
+  webpage = "http://erratique.ch/software/${pname}";
+  ocaml_version = (builtins.parseDrvName ocaml.name).version;
+in
+stdenv.mkDerivation rec {
+
+  name = "ocaml-${pname}-${version}";
+
+  src = fetchurl {
+    url = "${webpage}/releases/${pname}-${version}.tbz";
+    sha256 = "16cgjy1m0m61srv1pmlc3gr0y40kd4724clvpagdnz68raz4zmn0";
+  };
+
+  buildInputs = [ ocaml findlib opam ];
+
+  createFindlibDestdir = true;
+
+  unpackCmd = "tar xjf $src";
+
+  buildPhase = "./pkg/build true false";
+
+  installPhase = ''
+    opam-installer --script --prefix=$out ${pname}.install > install.sh
+    sh install.sh
+    ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml_version}/site-lib/
+  '';
+
+  meta = {
+    description = "An OCaml module for normalizing Unicode text";
+    homepage = "${webpage}";
+    platforms = ocaml.meta.platforms;
+    license = stdenv.lib.licenses.bsd3;
+  };
+}
diff --git a/pkgs/development/ocaml-modules/uutf/default.nix b/pkgs/development/ocaml-modules/uutf/default.nix
new file mode 100644
index 000000000000..862236c169bc
--- /dev/null
+++ b/pkgs/development/ocaml-modules/uutf/default.nix
@@ -0,0 +1,37 @@
+{stdenv, fetchurl, ocaml, findlib, opam}:
+let
+  pname = "uutf";
+  version = "0.9.3";
+  webpage = "http://erratique.ch/software/${pname}";
+  ocaml_version = (builtins.parseDrvName ocaml.name).version;
+in
+stdenv.mkDerivation rec {
+
+  name = "ocaml-${pname}-${version}";
+
+  src = fetchurl {
+    url = "${webpage}/releases/${pname}-${version}.tbz";
+    sha256 = "0xvq20knmq25902ijpbk91ax92bkymsqkbfklj1537hpn64lydhz";
+  };
+
+  buildInputs = [ ocaml findlib opam ];
+
+  createFindlibDestdir = true;
+
+  unpackCmd = "tar xjf $src";
+
+  buildPhase = "./pkg/build true";
+
+  installPhase = ''
+    opam-installer --script --prefix=$out ${pname}.install > install.sh
+    sh install.sh
+    ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml_version}/site-lib/
+  '';
+
+  meta = {
+    description = "Non-blocking streaming Unicode codec for OCaml";
+    homepage = "${webpage}";
+    platforms = ocaml.meta.platforms;
+    license = stdenv.lib.licenses.bsd3;
+  };
+}
diff --git a/pkgs/development/ocaml-modules/xmlm/default.nix b/pkgs/development/ocaml-modules/xmlm/default.nix
new file mode 100644
index 000000000000..bd19ab716f66
--- /dev/null
+++ b/pkgs/development/ocaml-modules/xmlm/default.nix
@@ -0,0 +1,37 @@
+{stdenv, fetchurl, ocaml, findlib, opam}:
+let
+  pname = "xmlm";
+  version = "1.2.0";
+  webpage = "http://erratique.ch/software/${pname}";
+  ocaml_version = (builtins.parseDrvName ocaml.name).version;
+in
+stdenv.mkDerivation rec {
+
+  name = "ocaml-${pname}-${version}";
+
+  src = fetchurl {
+    url = "${webpage}/releases/${pname}-${version}.tbz";
+    sha256 = "1jywcrwn5z3gkgvicr004cxmdaqfmq8wh72f81jqz56iyn5024nh";
+  };
+
+  buildInputs = [ ocaml findlib opam ];
+
+  createFindlibDestdir = true;
+
+  unpackCmd = "tar xjf $src";
+
+  buildPhase = "./pkg/build true";
+
+  installPhase = ''
+    opam-installer --script --prefix=$out ${pname}.install > install.sh
+    sh install.sh
+    ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml_version}/site-lib/
+  '';
+
+  meta = {
+    description = "An OCaml streaming codec to decode and encode the XML data format";
+    homepage = "${webpage}";
+    platforms = ocaml.meta.platforms;
+    license = stdenv.lib.licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d128e171bef8..2a9c4c86ba4b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3293,6 +3293,11 @@ let
     opam_1_1 = callPackage ../development/tools/ocaml/opam/1.1.nix { };
     opam = opam_1_1;
 
+    uucd = callPackage ../development/ocaml-modules/uucd { };
+    uunf = callPackage ../development/ocaml-modules/uunf { };
+    uutf = callPackage ../development/ocaml-modules/uutf { };
+    xmlm = callPackage ../development/ocaml-modules/xmlm { };
+
     yojson = callPackage ../development/ocaml-modules/yojson { };
 
     zarith = callPackage ../development/ocaml-modules/zarith { };

From ce911624713638ef7b2946b5b3bb5533672e2506 Mon Sep 17 00:00:00 2001
From: Sergey Mironov <grrwlf@gmail.com>
Date: Tue, 15 Jul 2014 19:21:03 +0400
Subject: [PATCH 0014/1453] plowshare: version bump

---
 pkgs/tools/misc/plowshare/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/misc/plowshare/default.nix b/pkgs/tools/misc/plowshare/default.nix
index 199e709f16ae..df5c8a77e829 100644
--- a/pkgs/tools/misc/plowshare/default.nix
+++ b/pkgs/tools/misc/plowshare/default.nix
@@ -1,14 +1,15 @@
-{ stdenv, fetchurl, makeWrapper, curl }:
+{ stdenv, fetchgit, makeWrapper, curl, spidermonkey }:
 
 stdenv.mkDerivation rec {
 
   name = "plowshare4-${version}";
 
-  version = "20121126.47e4480";
+  version = "20140714.0x5s0zn8";
 
-  src = fetchurl {
-    url = "http://plowshare.googlecode.com/files/plowshare4-snapshot-git${version}.tar.gz";
-    sha256 = "1p7bqqfbgcy41hiickgr8cilspyvrrql12rdmfasz0dmgf7nx1x6";
+  src = fetchgit {
+    url = "https://code.google.com/p/plowshare/";
+    rev = "0b67463ca8684c3e9c93bd8164c461a41538e99f";
+    sha256 = "0x5s0zn88w2h0740n4yms6fhwbb19kjwbhaj3k9wrnz4m3112s1m";
   };
 
   buildInputs = [ makeWrapper ];
@@ -19,7 +20,7 @@ stdenv.mkDerivation rec {
     make PREFIX="$out" install
 
     for fn in plow{del,down,list,up}; do
-      wrapProgram "$out/bin/$fn" --prefix PATH : "${curl}/bin"
+      wrapProgram "$out/bin/$fn" --prefix PATH : "${curl}/bin:${spidermonkey}/bin"
     done
   '';
 

From c1fbd9dc6748676361ec0b81cfba603e6a6df9b2 Mon Sep 17 00:00:00 2001
From: Sergey Mironov <grrwlf@gmail.com>
Date: Tue, 15 Jul 2014 19:21:18 +0400
Subject: [PATCH 0015/1453] adom: add famous rogue-like game

---
 pkgs/games/adom/default.nix     | 71 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 +
 2 files changed, 73 insertions(+)
 create mode 100644 pkgs/games/adom/default.nix

diff --git a/pkgs/games/adom/default.nix b/pkgs/games/adom/default.nix
new file mode 100644
index 000000000000..9041fc225b01
--- /dev/null
+++ b/pkgs/games/adom/default.nix
@@ -0,0 +1,71 @@
+{stdenv, patchelf, zlib, libmad, libpng12, libcaca, mesa, alsaLib, pulseaudio,
+xlibs, plowshare}:
+
+let
+
+  inherit (xlibs) libXext libX11;
+
+  lpath = "${stdenv.gcc.gcc}/lib64:" + stdenv.lib.makeSearchPath "lib" [
+      zlib libmad libpng12 libcaca libXext libX11 mesa alsaLib pulseaudio];
+
+in 
+assert stdenv.is64bit;
+stdenv.mkDerivation rec {
+
+  name = "adom-1.20-noteye";
+
+  src = stdenv.mkDerivation {
+    name = "adom-1.20-noteye.tar.gz";
+    buildCommand = ''
+      ${plowshare}/bin/plowdown "http://www30.zippyshare.com/v/39200582/file.html"
+      ls -lh
+      F=`ls *tar.gz`
+      echo "Checking $F"
+      sha256sum -c <<EOF
+      1f825845d5007e676a4d1a3ccd887904b959bdddbcb9f241c42c2dac34037669 $F
+      EOF
+      echo "Moving $F into $out..."
+      mv $F $out
+    '';
+  };
+
+  buildCommand = ''
+    . $stdenv/setup
+
+    unpackPhase
+
+    mkdir -pv $out
+    cp -r -t $out adom/*
+
+    chmod u+w $out/lib
+    for l in $out/lib/*so* ; do
+      chmod u+w $l
+      ${patchelf}/bin/patchelf \
+        --set-rpath "$out/lib:${lpath}" \
+        $l
+    done
+
+    ${patchelf}/bin/patchelf \
+      --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
+      --set-rpath "$out/lib:${lpath}" \
+      $out/adom
+
+    mkdir $out/bin
+    cat >$out/bin/adom <<EOF
+    (cd $out; $out/adom ; )
+    EOF
+    chmod +x $out/bin/adom
+  '';
+
+  meta = {
+    description = "Adom (Ancient Domains Of Mystery) is a rogue-like game with nice graphical interface";
+    homepage = http://adom.de/;
+    license = "unfree-redistributable";
+    maintainers = [stdenv.lib.maintainers.smironov];
+
+    # Please, notify me (smironov) if you need the x86 version
+    platforms = ["x86_64-linux"];
+  };
+}
+
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 54c61561da8d..98096a42a96b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -415,6 +415,8 @@ let
 
   actdiag = pythonPackages.actdiag;
 
+  adom = callPackage ../games/adom { };
+
   aefs = callPackage ../tools/filesystems/aefs { };
 
   aegisub = callPackage ../applications/video/aegisub {

From 8346343aa5e2f92fb75a71217cdd68a53efdf227 Mon Sep 17 00:00:00 2001
From: Andreas Herrmann <andreash87@gmx.ch>
Date: Tue, 1 Jul 2014 15:55:12 +0200
Subject: [PATCH 0016/1453] hdf5: Add mpi support

Optionally, build the parallel version of hdf5.
---
 pkgs/tools/misc/hdf5/default.nix | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix
index a7d03d1335f0..43b3a3240e65 100644
--- a/pkgs/tools/misc/hdf5/default.nix
+++ b/pkgs/tools/misc/hdf5/default.nix
@@ -3,6 +3,7 @@
 , fetchurl
 , zlib ? null
 , szip ? null
+, mpi ? null
 }:
 stdenv.mkDerivation rec {
   version = "1.8.13";
@@ -12,11 +13,22 @@ stdenv.mkDerivation rec {
     sha256 = "1h9qdl321gzm3ihdhlijbl9sh9qcdrw94j7izg64yfqhxj7b7xl2";  			
   };
 
+  passthru = {
+    mpiSupport = (mpi != null);
+    inherit mpi;
+  };
+
   buildInputs = []
     ++ stdenv.lib.optional (zlib != null) zlib
     ++ stdenv.lib.optional (szip != null) szip;
 
-  configureFlags = if szip != null then "--with-szlib=${szip}" else "";
+  propagatedBuildInputs = []
+    ++ stdenv.lib.optional (mpi != null) mpi;
+
+  configureFlags = "
+    ${if szip != null then "--with-szlib=${szip}" else ""}
+    ${if mpi != null then "--enable-parallel" else ""}
+  ";
   
   patches = [./bin-mv.patch];
   

From 2728b27f75dd51317cd60053a0c4be6bed70e8ae Mon Sep 17 00:00:00 2001
From: Andreas Herrmann <andreash87@gmx.ch>
Date: Tue, 1 Jul 2014 15:55:29 +0200
Subject: [PATCH 0017/1453] hdf5: Offer openmpi version of the package

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f0e504ff014f..dcba004aab29 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1251,6 +1251,12 @@ let
 
   hdf5 = callPackage ../tools/misc/hdf5 {
     szip = null;
+    mpi = null;
+  };
+
+  hdf5-mpi = hdf5.override {
+    szip = null;
+    mpi = pkgs.openmpi;
   };
 
   heimdall = callPackage ../tools/misc/heimdall { };

From 37b064fcc713ddd88e5c3dd297fabf12b7725c1f Mon Sep 17 00:00:00 2001
From: Andreas Herrmann <andreash87@gmx.ch>
Date: Wed, 2 Jul 2014 15:10:02 +0200
Subject: [PATCH 0018/1453] hdf5: Optional enableShared flag

Required by h5py in mpi mode.
---
 pkgs/tools/misc/hdf5/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix
index 43b3a3240e65..5cdc468c2a5a 100644
--- a/pkgs/tools/misc/hdf5/default.nix
+++ b/pkgs/tools/misc/hdf5/default.nix
@@ -4,6 +4,7 @@
 , zlib ? null
 , szip ? null
 , mpi ? null
+, enableShared ? true
 }:
 stdenv.mkDerivation rec {
   version = "1.8.13";
@@ -28,6 +29,7 @@ stdenv.mkDerivation rec {
   configureFlags = "
     ${if szip != null then "--with-szlib=${szip}" else ""}
     ${if mpi != null then "--enable-parallel" else ""}
+    ${if enableShared then "--enable-shared" else ""}
   ";
   
   patches = [./bin-mv.patch];

From 63c062947eb765e4a02bc892e1891da7057fdfec Mon Sep 17 00:00:00 2001
From: Andreas Herrmann <andreash87@gmx.ch>
Date: Tue, 1 Jul 2014 16:46:15 +0200
Subject: [PATCH 0019/1453] mpi4py: New package, version 1.3.1

Python wrapper for the message passing interface standard.

Currently building without mpe, or vampir-trace support.
---
 .../python-modules/mpi4py/default.nix         | 45 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  6 +++
 2 files changed, 51 insertions(+)
 create mode 100644 pkgs/development/python-modules/mpi4py/default.nix

diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix
new file mode 100644
index 000000000000..74d46def9074
--- /dev/null
+++ b/pkgs/development/python-modules/mpi4py/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchurl, python, buildPythonPackage, mpi, openssh }:
+
+buildPythonPackage rec {
+  name = "mpi4py-1.3.1";
+
+  src = fetchurl {
+    url = "https://bitbucket.org/mpi4py/mpi4py/downloads/${name}.tar.gz";
+    sha256 = "e7bd2044aaac5a6ea87a87b2ecc73b310bb6efe5026031e33067ea3c2efc3507";
+  };
+
+  passthru = {
+    inherit mpi;
+  };
+
+  configurePhase = "";
+
+  installPhase = ''
+    mkdir -p "$out/lib/${python.libPrefix}/site-packages"
+    export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH"
+
+    ${python}/bin/${python.executable} setup.py install \
+      --install-lib=$out/lib/${python.libPrefix}/site-packages \
+      --prefix="$out"
+
+    # --install-lib:
+    # sometimes packages specify where files should be installed outside the usual
+    # python lib prefix, we override that back so all infrastructure (setup hooks)
+    # work as expected
+  '';
+
+  setupPyBuildFlags = ["--mpicc=${mpi}/bin/mpicc"];
+
+  buildInputs = [ mpi ];
+  # Requires openssh for tests. Tests of dependent packages will also fail,
+  # if openssh is not present. E.g. h5py with mpi support.
+  propagatedBuildInputs = [ openssh ];
+
+  meta = {
+    description = "
+      Provides Python bindings for the Message Passing Interface standard.
+    ";
+    homepage = "http://code.google.com/p/mpi4py/";
+    license = stdenv.lib.licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fccad5c81de4..59f00576dad2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -105,6 +105,12 @@ rec {
     pylabQtSupport = false;
   });
 
+  mpi4py = callPackage ../development/python-modules/mpi4py {
+    inherit (pkgs) stdenv fetchurl openssh;
+    inherit python buildPythonPackage;
+    mpi = pkgs.openmpi;
+  };
+
   nixpart = callPackage ../tools/filesystems/nixpart { };
 
   # This is used for NixOps to make sure we won't break it with the next major

From 3c6afb34967a241e2c2e106cb02bad55b5389b94 Mon Sep 17 00:00:00 2001
From: Andreas Herrmann <andreash87@gmx.ch>
Date: Tue, 1 Jul 2014 16:20:56 +0200
Subject: [PATCH 0020/1453] h5py: New package, version 2.3.1

A pythonic interface to the hdf5 library. It also supports parallel hdf5.
---
 .../python-modules/h5py/default.nix           | 43 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 13 ++++++
 2 files changed, 56 insertions(+)
 create mode 100644 pkgs/development/python-modules/h5py/default.nix

diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix
new file mode 100644
index 000000000000..9ab68ac4cd2b
--- /dev/null
+++ b/pkgs/development/python-modules/h5py/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchurl, python, buildPythonPackage
+, numpy, hdf5, cython
+, mpiSupport ? false, mpi4py ? null, mpi ? null }:
+
+assert mpiSupport == hdf5.mpiSupport;
+assert mpiSupport -> mpi != null
+  && mpi4py != null
+  && mpi == mpi4py.mpi
+  && mpi == hdf5.mpi
+  ;
+
+with stdenv.lib;
+
+buildPythonPackage rec {
+  name = "h5py-2.3.1";
+
+  src = fetchurl {
+    url = "https://pypi.python.org/packages/source/h/h5py/${name}.tar.gz";
+    md5 = "8f32f96d653e904d20f9f910c6d9dd91";
+  };
+
+  setupPyBuildFlags = [ "--hdf5=${hdf5}" ]
+    ++ optional mpiSupport "--mpi"
+    ;
+  setupPyInstallFlags = setupPyBuildFlags;
+
+  preBuild = if mpiSupport then "export CC=${mpi}/bin/mpicc" else "";
+
+  buildInputs = [ hdf5 cython ]
+    ++ optional mpiSupport mpi
+    ;
+  propagatedBuildInputs = [ numpy ]
+    ++ optional mpiSupport mpi4py
+    ;
+
+  meta = {
+    description = "
+      The h5py package is a Pythonic interface to the HDF5 binary data format.
+    ";
+    homepage = "http://www.h5py.org/";
+    license = stdenv.lib.licenses.bsd2;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 59f00576dad2..2e7189c3a5bc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -89,6 +89,19 @@ rec {
     '';
   };
 
+  h5py = callPackage ../development/python-modules/h5py {
+    inherit (pkgs) stdenv fetchurl;
+    inherit python buildPythonPackage cython numpy;
+    hdf5 = pkgs.hdf5.override { mpi = null; };
+  };
+
+  h5py-mpi = h5py.override {
+    mpiSupport = true;
+    mpi = pkgs.openmpi;
+    hdf5 = pkgs.hdf5.override { mpi = pkgs.openmpi; enableShared = true; };
+    inherit mpi4py;
+  };
+
   ipython = import ../shells/ipython {
     inherit (pkgs) stdenv fetchurl sip pyqt4;
     inherit buildPythonPackage pythonPackages;

From 1e0605738a94d834c97d6e7b9d1fc920f649facb Mon Sep 17 00:00:00 2001
From: Andreas Herrmann <andreash87@gmx.ch>
Date: Sun, 6 Jul 2014 23:13:04 +0200
Subject: [PATCH 0021/1453] openmpi: Optional configure flags

 * Activate support for the Sun Grid Engine
 * Pass PATH/LD_LIBRARY_PATH pointing to the current mpi installation
   to other processes by default.
---
 pkgs/development/libraries/openmpi/default.nix | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix
index 678a439fe0ac..15160d3afc49 100644
--- a/pkgs/development/libraries/openmpi/default.nix
+++ b/pkgs/development/libraries/openmpi/default.nix
@@ -1,4 +1,13 @@
-{stdenv, fetchurl, gfortran}:
+{stdenv, fetchurl, gfortran
+
+# Enable the Sun Grid Engine bindings
+, enableSGE ? false
+
+# Pass PATH/LD_LIBRARY_PATH to point to current mpirun by default
+, enablePrefix ? false
+}:
+
+with stdenv.lib;
 
 stdenv.mkDerivation {
   name = "openmpi-1.6.5";
@@ -7,6 +16,10 @@ stdenv.mkDerivation {
     sha256 = "11gws4d3z7934zna2r7m1f80iay2ha17kp42mkh39wjykfwbldzy";
   };
   buildInputs = [ gfortran ];
+  configureFlags = []
+    ++ optional enableSGE "--with-sge"
+    ++ optional enablePrefix "--enable-mpirun-prefix-by-default"
+    ;
   meta = {
     homePage = http://www.open-mpi.org/;
     description = "Open source MPI-2 implementation";

From 7dfd21e982b0be77259a041f08a4f2834c38d977 Mon Sep 17 00:00:00 2001
From: Ian-Woo Kim <ianwookim@gmail.com>
Date: Sun, 20 Jul 2014 22:58:46 +0200
Subject: [PATCH 0022/1453] krb5: explicitly giving --with-tcl=no option for
 configure to remove impurity

---
 pkgs/development/libraries/kerberos/krb5.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix
index 647a6b031138..eeb09a68afbe 100644
--- a/pkgs/development/libraries/kerberos/krb5.nix
+++ b/pkgs/development/libraries/kerberos/krb5.nix
@@ -23,6 +23,8 @@ stdenv.mkDerivation (rec {
     cd ${name}/src
   '';
 
+  configureFlags = "--with-tcl=no";
+
   #doCheck = true; # report: No suitable file for testing purposes
 
   enableParallelBuilding = true;

From 7b1a863f1ef3c94338c3ea48cfa3ea94a4539604 Mon Sep 17 00:00:00 2001
From: Paul Colomiets <paul@colomiets.name>
Date: Mon, 21 Jul 2014 18:54:21 +0300
Subject: [PATCH 0023/1453] Add `--no-same-permission` to `tar` command in node
 package builder

This is because of an error while using `nix` under Archlinux:
```
building path(s) `/nix/store/rwkcbhv9jfhzhandfslg62knl2xw0r7m-node-sources'
building /nix/store/rwkcbhv9jfhzhandfslg62knl2xw0r7m-node-sources
suspicious ownership or permission on `/nix/store/rwkcbhv9jfhzhandfslg62knl2xw0r7m-node-sources'; rejecting this build output
cannot build derivation `/nix/store/01qsszx9y2kyx1x72zr5magy2la98720-uglify-js-2.4.15.drv': 1 dependencies couldn't be built
```

The permissions on all file are like the following:
```
drwxrwxr-x 1 root root    358 Jun  9 17:04 .
drwxr-xr-x 1 root root 421110 Jul 21 15:49 ..
-rw-rw-r-- 1 root root     22 Jun  9 17:04 .gitattributes
```
After the fix, permissions are OK, and no suspicious error any more.

Error is encountered for any node package built. I'm not sure why it
fails on Arch but work on nixos, but I believe the flag is safe to add
anyway.
---
 pkgs/development/web/nodejs/build-node-package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix
index 544634626b03..7341bbd60f79 100644
--- a/pkgs/development/web/nodejs/build-node-package.nix
+++ b/pkgs/development/web/nodejs/build-node-package.nix
@@ -8,7 +8,7 @@ let
   npmFlags = concatStringsSep " " (map (v: "--${v}") flags);
 
   sources = runCommand "node-sources" {} ''
-    tar --no-same-owner -xf ${nodejs.src}
+    tar --no-same-owner --no-same-permissions -xf ${nodejs.src}
     mv *node* $out
   '';
 

From 50c63f9b320a7016a670580dc5cbdc0bc0864138 Mon Sep 17 00:00:00 2001
From: Luke Clifton <ltclifton@gmail.com>
Date: Wed, 23 Jul 2014 20:49:43 +0800
Subject: [PATCH 0024/1453] Added abduco

---
 pkgs/tools/misc/abduco/default.nix | 28 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/tools/misc/abduco/default.nix

diff --git a/pkgs/tools/misc/abduco/default.nix b/pkgs/tools/misc/abduco/default.nix
new file mode 100644
index 000000000000..772c0b982a7a
--- /dev/null
+++ b/pkgs/tools/misc/abduco/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, writeText, conf? null}:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+    name = "abduco-0.1";
+
+    meta = {
+        homepage = http://brain-dump.org/projects/abduco;
+        license = "bsd";
+        description = "Allows programs to be run independently from its controlling terminal";
+        platforms = with platforms; linux;
+    };
+
+    src = fetchurl {
+        url = "http://www.brain-dump.org/projects/abduco/${name}.tar.gz";
+        sha256 = "b4ef297cb7cc81170dc7edf75385cb1c55e024a52f90c1dd0bc0e9862e6f39b5";
+    };
+
+    configFile = optionalString (conf!=null) (writeText "config.def.h" conf);
+    preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h";
+
+    buildInputs = [];
+
+    installPhase = ''
+      make PREFIX=$out install
+    '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 137f11b78e72..7810d0a7e9a3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -427,6 +427,8 @@ let
 
   ### TOOLS
 
+  abduco = callPackage ../tools/misc/abduco { };
+
   acct = callPackage ../tools/system/acct { };
 
   acoustidFingerprinter = callPackage ../tools/audio/acoustid-fingerprinter {

From 073369cdaa0bed835c15c645477ee8b1df4230cc Mon Sep 17 00:00:00 2001
From: Vladimir Kirillov <proger@wilab.org.ua>
Date: Mon, 16 Jun 2014 20:08:38 +0000
Subject: [PATCH 0025/1453] rsync: sha256 for the patch was updated

---
 pkgs/applications/networking/sync/rsync/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix
index 6a5c574f6383..00a00530df44 100644
--- a/pkgs/applications/networking/sync/rsync/default.nix
+++ b/pkgs/applications/networking/sync/rsync/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   srcs = [mainSrc] ++ stdenv.lib.optional enableCopyDevicesPatch patchesSrc;
   patches = [(fetchurl {
       url = "https://git.samba.org/?p=rsync.git;a=commitdiff_plain;h=0dedfbce2c1b851684ba658861fe9d620636c56a";
-      sha256 = "1jpwwdf07naqxc8fv1lspc95jgk50j5j3wvf037bjay2qzpwjmvf";
+      sha256 = "0j1pqmwsqc5mh815x28izi4baki2y2r5q8k7ma1sgs4xsgjc4rk8";
       name = "CVE-2014-2855.patch";
     })]
     ++ stdenv.lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff";

From dcb226deb787df743e04677f3dcbf6fec4c51dfb Mon Sep 17 00:00:00 2001
From: Luke Clifton <ltclifton@gmail.com>
Date: Sat, 26 Jul 2014 08:39:14 +0800
Subject: [PATCH 0026/1453] Changed to correct license from licenses.*

---
 pkgs/tools/misc/abduco/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/abduco/default.nix b/pkgs/tools/misc/abduco/default.nix
index 772c0b982a7a..a3f5c4a1d61e 100644
--- a/pkgs/tools/misc/abduco/default.nix
+++ b/pkgs/tools/misc/abduco/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
 
     meta = {
         homepage = http://brain-dump.org/projects/abduco;
-        license = "bsd";
+        license = licenses.isc;
         description = "Allows programs to be run independently from its controlling terminal";
         platforms = with platforms; linux;
     };

From d105ed081f5e29ca0eab89f591b1d95653773e7f Mon Sep 17 00:00:00 2001
From: Joachim Schiele <js@lastlog.de>
Date: Thu, 24 Jul 2014 10:12:47 +0200
Subject: [PATCH 0027/1453] liquidfun: added google liquidfun (a box2d fork)

---
 .../libraries/liquidfun/default.nix           | 50 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 52 insertions(+)
 create mode 100644 pkgs/development/libraries/liquidfun/default.nix

diff --git a/pkgs/development/libraries/liquidfun/default.nix b/pkgs/development/libraries/liquidfun/default.nix
new file mode 100644
index 000000000000..02604fb94cf5
--- /dev/null
+++ b/pkgs/development/libraries/liquidfun/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, requireFile, cmake, mesa, libX11, libXi, ... }:
+
+let 
+  sourceInfo = rec {
+    version="1.1.0";
+    name="liquidfun-${version}";
+    url="http://github.com/foo/${name}.tar.gz";
+    hash="5011a000eacd6202a47317c489e44aa753a833fb562d970e7b8c0da9de01df86";
+  };
+
+in
+
+stdenv.mkDerivation rec {
+  src = requireFile {
+    url = sourceInfo.url;
+    sha256 = sourceInfo.hash;
+    name = sourceInfo.name + ".tar.gz";
+  };
+
+  inherit (sourceInfo) name version;
+  buildInputs = [ cmake mesa libX11 libXi ];
+
+  sourceRoot = "liquidfun/Box2D/";
+
+  preConfigurePhases = "preConfigure";
+
+  preConfigure = ''
+    sed -i Box2D/Common/b2Settings.h -e 's@b2_maxPolygonVertices .*@b2_maxPolygonVertices 15@'
+    substituteInPlace Box2D/CMakeLists.txt --replace "Common/b2GrowableStack.h" "Common/b2GrowableStack.h Common/b2GrowableBuffer.h"
+  '';
+      
+  configurePhase = ''
+    mkdir Build
+    cd Build; 
+    cmake -DBOX2D_INSTALL=ON -DBOX2D_BUILD_SHARED=ON -DCMAKE_INSTALL_PREFIX=$out ..
+  '';
+
+  meta = {
+    description = "2D physics engine based on Box2D";
+    maintainers = with stdenv.lib.maintainers;
+    [
+      qknight
+    ];
+    platforms = with stdenv.lib.platforms;
+      linux;
+    license = "bsd";
+    homepage = https://google.github.io/liquidfun/;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b3ba6a64df2f..2128d2373874 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5527,6 +5527,8 @@ let
 
   lirc = callPackage ../development/libraries/lirc { };
 
+  liquidfun = callPackage ../development/libraries/liquidfun { };
+
   liquidwar = builderDefsPackage ../games/liquidwar {
     inherit (xlibs) xproto libX11 libXrender;
     inherit gmp mesa libjpeg

From 87cdc61e784a9d96628127e84b972661c83f9fb6 Mon Sep 17 00:00:00 2001
From: Joachim Schiele <js@lastlog.de>
Date: Sun, 27 Jul 2014 22:02:38 +0200
Subject: [PATCH 0028/1453] liquidfun: updated url and license

---
 pkgs/development/libraries/liquidfun/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/liquidfun/default.nix b/pkgs/development/libraries/liquidfun/default.nix
index 02604fb94cf5..994c013c6319 100644
--- a/pkgs/development/libraries/liquidfun/default.nix
+++ b/pkgs/development/libraries/liquidfun/default.nix
@@ -1,15 +1,13 @@
-{ stdenv, requireFile, cmake, mesa, libX11, libXi, ... }:
+{ stdenv, requireFile, cmake, mesa, libX11, libXi }:
 
 let 
   sourceInfo = rec {
     version="1.1.0";
     name="liquidfun-${version}";
-    url="http://github.com/foo/${name}.tar.gz";
+    url="https://github.com/google/liquidfun/releases/download/v${version}/${name}";
     hash="5011a000eacd6202a47317c489e44aa753a833fb562d970e7b8c0da9de01df86";
   };
-
 in
-
 stdenv.mkDerivation rec {
   src = requireFile {
     url = sourceInfo.url;
@@ -43,7 +41,7 @@ stdenv.mkDerivation rec {
     ];
     platforms = with stdenv.lib.platforms;
       linux;
-    license = "bsd";
+    license = stdenv.lib.licenses.bsd2;
     homepage = https://google.github.io/liquidfun/;
   };
 }

From fea8454d3515dbb5bb45be8763b34ad33342e705 Mon Sep 17 00:00:00 2001
From: Paul Colomiets <paul@colomiets.name>
Date: Sat, 12 Jul 2014 22:51:28 +0300
Subject: [PATCH 0029/1453] my-env: Preserve http_proxy and ftp_proxy variables

There are few build scripts which set them to `nodtd.invalid` to disable
downloading files by buildscript. But for user environment we should
restore original values
---
 pkgs/misc/my-env/loadenv.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/misc/my-env/loadenv.sh b/pkgs/misc/my-env/loadenv.sh
index 1aab4ac0208f..2a990e8685c3 100644
--- a/pkgs/misc/my-env/loadenv.sh
+++ b/pkgs/misc/my-env/loadenv.sh
@@ -2,6 +2,8 @@
 
 OLDPATH="$PATH"
 OLDTZ="$TZ"
+OLD_http_proxy="$http_proxy"
+OLD_ftp_proxy="$http_proxy"
 source @myenvpath@
 
 PATH="$PATH:$OLDPATH"
@@ -10,6 +12,8 @@ export NIX_MYENV_NAME="@name@"
 export buildInputs
 export NIX_STRIP_DEBUG=0
 export TZ="$OLDTZ"
+export http_proxy="$OLD_http_proxy"
+export ftp_proxy="$OLD_ftp_proxy"
 
 if test $# -gt 0; then
     exec "$@"

From fb948c4f28a8e42758467b5fe23a27bca182b481 Mon Sep 17 00:00:00 2001
From: Paul Colomiets <paul@colomiets.name>
Date: Thu, 26 Jun 2014 01:09:15 +0300
Subject: [PATCH 0030/1453] Upgrade shadow package

---
 nixos/modules/programs/shadow.nix         | 4 +++-
 pkgs/os-specific/linux/shadow/default.nix | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/programs/shadow.nix b/nixos/modules/programs/shadow.nix
index 658b08b3d870..5a467e112c23 100644
--- a/nixos/modules/programs/shadow.nix
+++ b/nixos/modules/programs/shadow.nix
@@ -100,7 +100,9 @@ in
         chgpasswd = { rootOK = true; };
       };
 
-    security.setuidPrograms = [ "passwd" "chfn" "su" "newgrp" ];
+    security.setuidPrograms = [ "passwd" "chfn" "su" "newgrp"
+      "newuidmap" "newgidmap"  # new in shadow 4.2.x
+      ];
 
   };
 
diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix
index b52801cacff7..f928dc8e657c 100644
--- a/pkgs/os-specific/linux/shadow/default.nix
+++ b/pkgs/os-specific/linux/shadow/default.nix
@@ -15,11 +15,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "shadow-4.1.5.1";
+  name = "shadow-4.2.1";
 
   src = fetchurl {
-    url = "http://pkg-shadow.alioth.debian.org/releases/${name}.tar.bz2";
-    sha256 = "1yvqx57vzih0jdy3grir8vfbkxp0cl0myql37bnmi2yn90vk6cma";
+    url = "http://pkg-shadow.alioth.debian.org/releases/${name}.tar.xz";
+    sha256 = "0h9x1zdbq0pqmygmc1x459jraiqw4gqz8849v268crk78z8r621v";
   };
 
   buildInputs = stdenv.lib.optional (pam != null && stdenv.isLinux) pam;

From 08b214a8f2b6c9101636df43ded09c07ea9b8259 Mon Sep 17 00:00:00 2001
From: Paul Colomiets <paul@colomiets.name>
Date: Thu, 26 Jun 2014 03:11:28 +0300
Subject: [PATCH 0031/1453] First implementation of subuid/subgid manipulation
 module

---
 nixos/modules/config/users-groups.nix | 83 +++++++++++++++++++++++++++
 1 file changed, 83 insertions(+)

diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index 5de81a773424..1fd5735fb74f 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -100,6 +100,36 @@ let
         description = "The path to the user's shell.";
       };
 
+      subUidRanges = mkOption {
+        type = types.listOf types.optionSet;
+        default = [];
+        example = [
+          { startUid = 1000; count = 1; }
+          { startUid = 100001; count = 65534; }
+        ];
+        options = [ subordinateUidRange ];
+        description = ''
+          Subordinate user ids that user is allowed to use.
+          They are set into <filename>/etc/subuid</filename> and are used
+          by <literal>newuidmap</literal> for user namespaces.
+        '';
+      };
+
+      subGidRanges = mkOption {
+        type = types.listOf types.optionSet;
+        default = [];
+        example = [
+          { startGid = 100; count = 1; }
+          { startGid = 1001; count = 999; }
+        ];
+        options = [ subordinateGidRange ];
+        description = ''
+          Subordinate group ids that user is allowed to use.
+          They are set into <filename>/etc/subgid</filename> and are used
+          by <literal>newgidmap</literal> for user namespaces.
+        '';
+      };
+
       createHome = mkOption {
         type = types.bool;
         default = false;
@@ -211,6 +241,36 @@ let
 
   };
 
+  subordinateUidRange = {
+    startUid = mkOption {
+      type = types.int;
+      description = ''
+        Start of the range of subordinate user ids that user is
+        allowed to use.
+      '';
+    };
+    count = mkOption {
+      type = types.int;
+      default = 1;
+      description = ''Count of subordinate user ids'';
+    };
+  };
+
+  subordinateGidRange = {
+    startGid = mkOption {
+      type = types.int;
+      description = ''
+        Start of the range of subordinate group ids that user is
+        allowed to use.
+      '';
+    };
+    count = mkOption {
+      type = types.int;
+      default = 1;
+      description = ''Count of subordinate group ids'';
+    };
+  };
+
   getGroup = gname:
     let
       groups = mapAttrsToList (n: g: g) (
@@ -265,6 +325,20 @@ let
     ))
   );
 
+  mkSubuidEntry = user: concatStrings (
+    map (range: "${user.name}:${toString range.startUid}:${toString range.count}\n")
+        user.subUidRanges);
+
+  subuidFile = concatStrings (map mkSubuidEntry (
+    sortOn "uid" (attrValues cfg.extraUsers)));
+
+  mkSubgidEntry = user: concatStrings (
+    map (range: "${user.name}:${toString range.startGid}:${toString range.count}\n")
+        user.subGidRanges);
+
+  subgidFile = concatStrings (map mkSubgidEntry (
+    sortOn "uid" (attrValues cfg.extraUsers)));
+
   # If mutableUsers is true, this script adds all users/groups defined in
   # users.extra{Users,Groups} to /etc/{passwd,group} iff there isn't any
   # existing user/group with the same name in those files.
@@ -504,6 +578,15 @@ in {
     # for backwards compatibility
     system.activationScripts.groups = stringAfter [ "users" ] "";
 
+    environment.etc."subuid" = {
+      text = subuidFile;
+      mode = "0644";
+    };
+    environment.etc."subgid" = {
+      text = subgidFile;
+      mode = "0644";
+    };
+
     assertions = [
       { assertion = !cfg.enforceIdUniqueness || (uidsAreUnique && gidsAreUnique);
         message = "uids and gids must be unique!";

From a232a2d2c5882bec7c50749a7eee8033cc2548ca Mon Sep 17 00:00:00 2001
From: Joel Taylor <me@joelt.io>
Date: Thu, 31 Jul 2014 16:04:29 -0700
Subject: [PATCH 0032/1453] prevent usage of binutils on darwin

---
 pkgs/development/tools/misc/binutils/default.nix | 2 ++
 pkgs/top-level/all-packages.nix                  | 8 +++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 8d8fc5d464e8..9bcf2ccc14f8 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -2,6 +2,8 @@
 , cross ? null, gold ? true, bison ? null
 }:
 
+assert !stdenv.isDarwin;
+
 let basename = "binutils-2.23.1"; in
 
 with { inherit (stdenv.lib) optional optionals optionalString; };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a46693b92359..714a06ea62ea 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3769,9 +3769,11 @@ let
 
   bam = callPackage ../development/tools/build-managers/bam {};
 
-  binutils = callPackage ../development/tools/misc/binutils {
-    inherit noSysDirs;
-  };
+  binutils = if stdenv.isDarwin
+    then stdenv.gcc.binutils
+    else callPackage ../development/tools/misc/binutils {
+      inherit noSysDirs;
+    };
 
   binutils_nogold = lowPrio (callPackage ../development/tools/misc/binutils {
     inherit noSysDirs;

From 84036dfd8b1890f74b81bab55f2678cc99f233a6 Mon Sep 17 00:00:00 2001
From: NOTtheMessiah <brian.cohen.88@gmail.com>
Date: Tue, 5 Aug 2014 03:22:41 -0400
Subject: [PATCH 0033/1453] Added gcolor2

---
 .../applications/graphics/gcolor2/default.nix | 29 ++++++++++++
 .../graphics/gcolor2/gcolor2-amd64.patch      | 46 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 77 insertions(+)
 create mode 100644 pkgs/applications/graphics/gcolor2/default.nix
 create mode 100644 pkgs/applications/graphics/gcolor2/gcolor2-amd64.patch

diff --git a/pkgs/applications/graphics/gcolor2/default.nix b/pkgs/applications/graphics/gcolor2/default.nix
new file mode 100644
index 000000000000..673cf626a544
--- /dev/null
+++ b/pkgs/applications/graphics/gcolor2/default.nix
@@ -0,0 +1,29 @@
+{stdenv, fetchurl, gtk, perl, perlXMLParser, pkgconfig } :
+
+let version = "0.4"; in
+stdenv.mkDerivation {
+  name = "gcolor2-${version}";
+  arch = if stdenv.system == "x86_64-linux" then "amd64" else "386";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/project/gcolor2/gcolor2/${version}/gcolor2-${version}.tar.bz2";
+    sha1 = "e410a52dcff3d5c6c3d448b68a026d04ccd744be";
+
+  };
+
+  preConfigure = ''
+    sed -i 's/\[:space:\]/[&]/g' configure
+  '';
+
+  # from https://github.com/PhantomX/slackbuilds/tree/master/gcolor2/patches
+  patches = if stdenv.system == "x86_64-linux" then
+        [ ./gcolor2-amd64.patch ] else
+        [ ];
+
+buildInputs = [ gtk perl perlXMLParser pkgconfig ];
+
+  meta = {
+    description = "Simple GTK+2 color selector";
+    homepage = http://gcolor2.sourceforge.net/;
+  };
+}
diff --git a/pkgs/applications/graphics/gcolor2/gcolor2-amd64.patch b/pkgs/applications/graphics/gcolor2/gcolor2-amd64.patch
new file mode 100644
index 000000000000..cd06a8315f98
--- /dev/null
+++ b/pkgs/applications/graphics/gcolor2/gcolor2-amd64.patch
@@ -0,0 +1,46 @@
+diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN gcolor2-0.4.orig/src/callbacks.c gcolor2-0.4/src/callbacks.c
+--- gcolor2-0.4.orig/src/callbacks.c	2005-07-12 14:06:12.000000000 -0400
++++ gcolor2-0.4/src/callbacks.c	2007-02-17 19:19:38.000000000 -0500
+@@ -4,6 +4,9 @@
+ 
+ #include <gtk/gtk.h>
+ #include <stdio.h>
++#include <string.h>
++#include <glib.h>
++#include <glib/gprintf.h>
+ 
+ #include "callbacks.h"
+ #include "interface.h"
+@@ -172,6 +175,9 @@ void on_copy_color_to_clipboard_activate
+ 	gtk_clipboard_set_text (cb, hex, strlen (hex));
+ }
+ 
++void add_rgb_file (gchar *filename, gchar *type);
++gchar* get_system_file (void);
++
+ void on_show_system_colors_activate (GtkMenuItem *menuitem, gpointer user_data)
+ {
+ 	if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (menuitem)))
+@@ -266,6 +272,8 @@ void on_save_button_clicked (GtkButton *
+ 	gtk_widget_destroy (savedialog);
+ }
+ 
++void add_list_color (gchar *spec, gchar *name, gchar *type, gboolean is_new_color);
++
+ void add_color_to_treeview ()
+ {
+ 	GtkTreeView      *treeview;
+diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN gcolor2-0.4.orig/src/main.c gcolor2-0.4/src/main.c
+--- gcolor2-0.4.orig/src/main.c	2005-07-11 10:55:49.000000000 -0400
++++ gcolor2-0.4/src/main.c	2007-02-17 19:18:23.000000000 -0500
+@@ -4,6 +4,10 @@
+ 
+ #include <gtk/gtk.h>
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <glib.h>
++#include <glib/gprintf.h>
+ 
+ #include "interface.h"
+ #include "support.h"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a46693b92359..1a0e618dcff2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8727,6 +8727,8 @@ let
 
   fuze = callPackage ../applications/networking/instant-messengers/fuze {};
 
+  gcolor2 = callPackage ../applications/graphics/gcolor2 { };
+
   get_iplayer = callPackage ../applications/misc/get_iplayer {};
 
   gimp_2_8 = callPackage ../applications/graphics/gimp/2.8.nix {

From 9e6d1da34b012465c0af0429ca8d5e784fcb007b Mon Sep 17 00:00:00 2001
From: NOTtheMessiah <brian.cohen.88@gmail.com>
Date: Tue, 5 Aug 2014 10:55:55 -0400
Subject: [PATCH 0034/1453] Update default.nix

---
 pkgs/applications/graphics/gcolor2/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/graphics/gcolor2/default.nix b/pkgs/applications/graphics/gcolor2/default.nix
index 673cf626a544..0af750ec989e 100644
--- a/pkgs/applications/graphics/gcolor2/default.nix
+++ b/pkgs/applications/graphics/gcolor2/default.nix
@@ -25,5 +25,7 @@ buildInputs = [ gtk perl perlXMLParser pkgconfig ];
   meta = {
     description = "Simple GTK+2 color selector";
     homepage = http://gcolor2.sourceforge.net/;
+    license = stdenv.lib.licenses.gpl2Plus;
+    maintainers = with stdenv.lib.maintainers; [ notthemessiah ];
   };
 }

From 36480116b412a10985644cd8100a30c4d827ea40 Mon Sep 17 00:00:00 2001
From: NOTtheMessiah <brian.cohen.88@gmail.com>
Date: Tue, 5 Aug 2014 10:58:24 -0400
Subject: [PATCH 0035/1453] added license for gcolor2 and myself to maintainers

---
 lib/maintainers.nix                            | 1 +
 pkgs/applications/graphics/gcolor2/default.nix | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index a4386b067b52..4091e2d405a7 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -65,6 +65,7 @@
   modulistic = "Pablo Costa <modulistic@gmail.com>";
   mornfall = "Petr Ročkai <me@mornfall.net>";
   msackman = "Matthew Sackman <matthew@wellquite.org>";
+  notthemessiah = "Brian Cohen <brian.cohen.88@gmail.com>";
   ocharles = "Oliver Charles <ollie@ocharles.org.uk>";
   offline = "Jaka Hudoklin <jakahudoklin@gmail.com>";
   orbitz = "Malcolm Matalka <mmatalka@gmail.com>";
diff --git a/pkgs/applications/graphics/gcolor2/default.nix b/pkgs/applications/graphics/gcolor2/default.nix
index 673cf626a544..0af750ec989e 100644
--- a/pkgs/applications/graphics/gcolor2/default.nix
+++ b/pkgs/applications/graphics/gcolor2/default.nix
@@ -25,5 +25,7 @@ buildInputs = [ gtk perl perlXMLParser pkgconfig ];
   meta = {
     description = "Simple GTK+2 color selector";
     homepage = http://gcolor2.sourceforge.net/;
+    license = stdenv.lib.licenses.gpl2Plus;
+    maintainers = with stdenv.lib.maintainers; [ notthemessiah ];
   };
 }

From 669443f5c1b75a4c74b4ff19716a8b66af5db8e7 Mon Sep 17 00:00:00 2001
From: Jonathan Glines <auntieNeo@gmail.com>
Date: Fri, 8 Aug 2014 11:16:03 -0600
Subject: [PATCH 0036/1453] Added gmock (Google Mock) package to complement
 gtest package.

---
 pkgs/development/libraries/gmock/default.nix | 38 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  1 +
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/development/libraries/gmock/default.nix

diff --git a/pkgs/development/libraries/gmock/default.nix b/pkgs/development/libraries/gmock/default.nix
new file mode 100644
index 000000000000..33c6e00ef650
--- /dev/null
+++ b/pkgs/development/libraries/gmock/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, unzip, cmake}:
+
+stdenv.mkDerivation rec {
+  version = "1.7.0";
+  name = "gmock-${version}";
+
+  src = fetchurl {
+    url = "https://googlemock.googlecode.com/files/${name}.zip";
+    sha256="26fcbb5925b74ad5fc8c26b0495dfc96353f4d553492eb97e85a8a6d2f43095b";
+  };
+
+  buildInputs = [ unzip cmake ];
+
+  configurePhase = ''
+    mkdir build
+    cd build
+    cmake ../ -DCMAKE_INSTALL_PREFIX=$out
+  '';
+
+  buildPhase = ''
+    # avoid building gtest
+    make gmock gmock_main
+  '';
+
+  installPhase = ''
+    mkdir -p $out/lib
+    cp -v libgmock.a libgmock_main.a $out/lib
+    cp -v -r ../include $out
+    cp -v -r ../src $out
+  '';
+
+  meta = {
+    description = "Google mock: Google's framework for writing C++ mock classes.";
+    homepage = https://code.google.com/p/googlemock/;
+    license = stdenv.lib.licenses.bsd3;
+    maintainers = [ stdenv.lib.maintainers.auntie ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8590aa747421..e894507b12a9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1229,6 +1229,7 @@ let
   gt5 = callPackage ../tools/system/gt5 { };
 
   gtest = callPackage ../development/libraries/gtest {};
+  gmock = callPackage ../development/libraries/gmock {};
 
   gtkdatabox = callPackage ../development/libraries/gtkdatabox {};
 

From 0aa2c1dc46779a3df6c4e02d3fae39b0de297be8 Mon Sep 17 00:00:00 2001
From: Alexei Robyn <shados@shados.net>
Date: Fri, 8 Aug 2014 18:28:26 +1000
Subject: [PATCH 0037/1453] initrd: Fixed to include/use modprobe config files

---
 nixos/modules/system/boot/stage-1.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index 6a069c5d0540..1d3878054432 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -199,6 +199,21 @@ let
         { object = pkgs.writeText "mdadm.conf" config.boot.initrd.mdadmConf;
           symlink = "/etc/mdadm.conf";
         }
+        { object = config.environment.etc."modprobe.d/nixos.conf".source;
+          symlink = "/etc/modprobe.d/nixos.conf";
+        }
+        { object = pkgs.stdenv.mkDerivation {
+            name = "initrd-kmod-blacklist-ubuntu";
+            builder = pkgs.writeText "builder.sh" ''
+              source $stdenv/setup
+              target=$out
+
+              ${pkgs.perl}/bin/perl -0pe 's/## file: iwlwifi.conf(.+?)##/##/s;' $src > $out
+            '';
+            src = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf";
+          };
+          symlink = "/etc/modprobe.d/ubuntu.conf";
+        }
       ];
   };
 

From 9d678f78bd5936bb280fbabc32ea313e1b573b27 Mon Sep 17 00:00:00 2001
From: Linquize <linquize@yahoo.com.hk>
Date: Sun, 10 Aug 2014 12:45:38 +0800
Subject: [PATCH 0038/1453] nodejs: Update to 0.10.30

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

diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix
index c53cee4a20e3..1b3d4950e377 100644
--- a/pkgs/development/web/nodejs/default.nix
+++ b/pkgs/development/web/nodejs/default.nix
@@ -6,7 +6,7 @@ let
     ln -sv /usr/sbin/dtrace $out/bin
   '';
 
-  version = "0.10.29";
+  version = "0.10.30";
 
   # !!! Should we also do shared libuv?
   deps = {
@@ -30,7 +30,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz";
-    sha256 = "0pdib215ldypc149ad03wlfj0i8fwdfydd4q2hd7ry35yw0rsds7";
+    sha256 = "1li5hs8dada2lj9j82xas39kr1fs0wql9qbly5p2cpszgwqbvz1x";
   };
 
   configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps);

From fee04927a46a8c2368225486ef9df17bea270b92 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sun, 10 Aug 2014 08:39:31 -0700
Subject: [PATCH 0039/1453] add note about mutableUsers to user management
 section

---
 nixos/doc/manual/configuration.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nixos/doc/manual/configuration.xml b/nixos/doc/manual/configuration.xml
index 051f0fb8c1e0..bbfb434782d0 100644
--- a/nixos/doc/manual/configuration.xml
+++ b/nixos/doc/manual/configuration.xml
@@ -1053,6 +1053,12 @@ a password. However, you can use the <command>passwd</command> program
 to set a password, which is retained across invocations of
 <command>nixos-rebuild</command>.</para>
 
+<para>If you set users.mutableUsers to false, then the contents of /etc/passwd
+and /etc/group will be congruent to your NixOS configuration. For instance,
+if you remove a user from users.extraUsers and run nixos-rebuild, the user
+account will cease to exist. Also, imperative commands for managing users
+and groups, such as useradd, are no longer available.</para>
+
 <para>A user ID (uid) is assigned automatically.  You can also specify
 a uid manually by adding
 

From 8092ce664993830c39aa5e593dc9979b174ff50a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 10 Aug 2014 19:05:15 +0200
Subject: [PATCH 0040/1453] teamspeak_client: 3.0.13.1 -> 3.0.16

---
 .../instant-messengers/teamspeak/client.nix   | 44 ++++++++++++++-----
 1 file changed, 33 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
index f3a88dee2cf4..e7791d762c5e 100644
--- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
+++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
@@ -1,39 +1,56 @@
-{ stdenv, fetchurl, zlib, glib, libpng, freetype, xorg, fontconfig, alsaLib,
-  qt4, pulseaudio ? null }:
+{ stdenv, fetchurl, zlib, glib, libpng, freetype, xorg, fontconfig, alsaLib, makeWrapper, xlibs
+,  qt5, pulseaudio ? null, qt4, xkeyboard_config, libredirect }:
 
 let
 
-  version = "3.0.13.1";
-
   arch = if stdenv.is64bit then "amd64" else "x86";
  
   libDir = if stdenv.is64bit then "lib64" else "lib";
 
   deps =
     [ zlib glib libpng freetype xorg.libSM xorg.libICE xorg.libXrender
-      xorg.libXrandr xorg.libXfixes xorg.libXcursor xorg.libXinerama
-      fontconfig xorg.libXext xorg.libX11 alsaLib qt4 pulseaudio
+      xorg.libXrandr xorg.libXfixes xorg.libXcursor xorg.libXinerama xlibs.libxcb
+      fontconfig xorg.libXext xorg.libX11 alsaLib qt5 pulseaudio quazip
     ];
 
+  quazip = stdenv.mkDerivation {
+    name = "quazip-0.7";
+
+    src = fetchurl {
+      url = "mirror://sourceforge/project/quazip/quazip/0.7/quazip-0.7.tar.gz";
+      sha256 = "193lfvhcpqgl2jmxxa4q3asc4xh1mqp2j2l0h8lmm2zrpzwygxca";
+    };
+
+    buildInputs = [ qt4 ];
+
+    preBuild = ''
+      qmake PREFIX="$out"
+    '';
+  };
+
 in
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "teamspeak-client-${version}";
 
+  version = "3.0.16";
+
   src = fetchurl {
     urls = [
-       "http://dl.4players.de/ts/releases/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run"
+      "http://dl.4players.de/ts/releases/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run"
       "http://teamspeak.gameserver.gamed.de/ts3/releases/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run"
       "http://files.teamspeak-services.com/releases/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run"
     ];
     sha256 = if stdenv.is64bit 
-		then "0mj8vpsnv906n3wgjwhiby5gk26jr5jbd94swmsf0s9kqwhsj6i1"
-                else "1hlw7lc0nl1mrsyd052s6ws64q5aabnw6qpv8mrdxb3hyp7g2qh1";
+                then "0gvphrmrkyy1g2nprvdk7cvawznzlv4smw0mlvzd4b9mvynln0v2"
+                else "1b3nbvfpd8lx3dig8z5yk6zjkbmsy6y938dhj1f562wc8adixciz";
   };
 
+  buildInputs = [ makeWrapper ];
+
   unpackPhase =
     ''
-      yes yes | sh $src
+      yes | sh $src
       cd TeamSpeak*
     '';
 
@@ -60,6 +77,11 @@ stdenv.mkDerivation {
       # Make a symlink to the binary from bin.
       mkdir -p $out/bin/
       ln -s $out/lib/teamspeak/ts3client $out/bin/ts3client
+
+      wrapProgram $out/bin/ts3client \
+        --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
+        --set QT_PLUGIN_PATH "$out/lib/teamspeak/platforms" \
+        --set NIX_REDIRECTS /usr/share/X11/xkb=${xkeyboard_config}/share/X11/xkb
     '';
 
   dontStrip = true;

From 24f3070a854a9b4cc861275f2986b17267d1d248 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Mon, 11 Aug 2014 10:20:17 +0200
Subject: [PATCH 0041/1453] Fix default icon location in 'wrapFirefox'

---
 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 8590aa747421..51aed723e03a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9994,7 +9994,7 @@ let
 
   wrapFirefox =
     { browser, browserName ? "firefox", desktopName ? "Firefox", nameSuffix ? ""
-    , icon ? "${browser}/lib/${browser.name}/icons/mozicon128.png" }:
+    , icon ? "${browser}/lib/${browser.name}/browser/icons/mozicon128.png" }:
     let
       cfg = stdenv.lib.attrByPath [ browserName ] {} config;
       enableAdobeFlash = cfg.enableAdobeFlash or false;

From 5ec563707cd7ae3a1c345cb1fa9b6696d1de4907 Mon Sep 17 00:00:00 2001
From: Patrick Mahoney <pat@polycrystal.org>
Date: Mon, 11 Aug 2014 21:58:00 -0500
Subject: [PATCH 0042/1453] php: Compile pdo_pgsql support

---
 pkgs/development/interpreters/php/5.4.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix
index bc5320ff77c0..e5069fc2ae46 100644
--- a/pkgs/development/interpreters/php/5.4.nix
+++ b/pkgs/development/interpreters/php/5.4.nix
@@ -77,6 +77,11 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
         buildInputs = [ postgresql ];
       };
 
+      pdo_pgsql = {
+        configureFlags = ["--with-pdo-pgsql=${postgresql}"];
+        buildInputs = [ postgresql ];
+      };
+
       mysql = {
         configureFlags = ["--with-mysql=${mysql}"];
         buildInputs = [ mysql ];
@@ -203,6 +208,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
     gettextSupport = config.php.gettext or true;
     pcntlSupport = config.php.pcntl or true;
     postgresqlSupport = config.php.postgresql or true;
+    pdo_pgsqlSupport = config.php.pdo_pgsql or true;
     readlineSupport = config.php.readline or true;
     sqliteSupport = config.php.sqlite or true;
     soapSupport = config.php.soap or true;

From 02cb604fd6d77c2768df484219e752d7fbe5b877 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 12 Aug 2014 20:00:01 +0200
Subject: [PATCH 0043/1453] initrd.availableKernelModules: add support for
 keyboards

As explained in #2169, some keyboards need special drivers,
so these are always added, both on installation and normal systems.
---
 nixos/modules/profiles/all-hardware.nix | 4 ++--
 nixos/modules/system/boot/kernel.nix    | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/profiles/all-hardware.nix b/nixos/modules/profiles/all-hardware.nix
index 511c118e2bf5..6385ee69500f 100644
--- a/nixos/modules/profiles/all-hardware.nix
+++ b/nixos/modules/profiles/all-hardware.nix
@@ -8,7 +8,7 @@
 {
 
   # The initrd has to contain any module that might be necessary for
-  # mounting the CD/DVD.
+  # supporting the most important parts of HW like drives.
   boot.initrd.availableKernelModules =
     [ # SATA/PATA support.
       "ahci"
@@ -43,7 +43,7 @@
       "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "virtio_console"
 
       # Keyboards
-      "hid_apple"
+      "usbhid" "hid_apple" "hid_logitech_dj" "hid_lenovo_tpkbd" "hid_roccat"
     ];
 
   # Include lots of firmware.
diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix
index 9beb7fabce12..79b173a6ead8 100644
--- a/nixos/modules/system/boot/kernel.nix
+++ b/nixos/modules/system/boot/kernel.nix
@@ -195,6 +195,7 @@ in
         "xhci_hcd"
         "usbhid"
         "hid_generic"
+        "hid_apple" "hid_logitech_dj" "hid_lenovo_tpkbd" "hid_roccat"
 
         # Unix domain sockets (needed by udev).
         "unix"

From 6aa3888d97e26727066182d8a9bd7eb278eaa657 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Wed, 13 Aug 2014 12:10:52 +0200
Subject: [PATCH 0044/1453] trackpoint: Add emulateWheel option

---
 nixos/modules/tasks/trackpoint.nix | 44 +++++++++++++++++++++++-------
 1 file changed, 34 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/tasks/trackpoint.nix b/nixos/modules/tasks/trackpoint.nix
index d1c6f8ac1565..5d1bb631b54f 100644
--- a/nixos/modules/tasks/trackpoint.nix
+++ b/nixos/modules/tasks/trackpoint.nix
@@ -36,6 +36,14 @@ with lib;
           configures 97.
         '';
       };
+
+      emulateWheel = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          Enable scrolling while holding the middle mouse button.
+        '';
+      };
       
     };
 
@@ -44,17 +52,33 @@ with lib;
 
   ###### implementation
 
-  config = mkIf config.hardware.trackpoint.enable {
-
-    services.udev.extraRules =
-    ''
-      ACTION=="add|change", SUBSYSTEM=="input", ATTR{name}=="TPPS/2 IBM TrackPoint", ATTR{device/speed}="${toString config.hardware.trackpoint.speed}", ATTR{device/sensitivity}="${toString config.hardware.trackpoint.sensitivity}"
-    '';
-
-    system.activationScripts.trackpoint =
+  config = mkMerge [
+    (mkIf config.hardware.trackpoint.enable {
+      services.udev.extraRules =
       ''
-        ${config.systemd.package}/bin/udevadm trigger --attr-match=name="TPPS/2 IBM TrackPoint"
+        ACTION=="add|change", SUBSYSTEM=="input", ATTR{name}=="TPPS/2 IBM TrackPoint", ATTR{device/speed}="${toString config.hardware.trackpoint.speed}", ATTR{device/sensitivity}="${toString config.hardware.trackpoint.sensitivity}"
       '';
-  };
 
+      system.activationScripts.trackpoint =
+        ''
+          ${config.systemd.package}/bin/udevadm trigger --attr-match=name="TPPS/2 IBM TrackPoint"
+        '';
+    })
+
+    (mkIf config.hardware.trackpoint.emulateWheel {
+      services.xserver.config =
+        ''
+          Section "InputClass"
+            Identifier "Trackpoint Wheel Emulation"
+            MatchProduct "TPPS/2 IBM TrackPoint|DualPoint Stick|Synaptics Inc. Composite TouchPad / TrackPoint|ThinkPad USB Keyboard with TrackPoint|USB Trackpoint pointing device|Composite TouchPad / TrackPoint"
+            MatchDevicePath "/dev/input/event*"
+            Option "EmulateWheel" "true"
+            Option "EmulateWheelButton" "2"
+            Option "Emulate3Buttons" "false"
+            Option "XAxisMapping" "6 7"
+            Option "YAxisMapping" "4 5"
+            EndSection
+        '';
+    })
+  ];
 }

From 4dba9477012969c4123d41846cf920ce756e83b4 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Wed, 13 Aug 2014 19:58:25 +0200
Subject: [PATCH 0045/1453] Added a few VIM plugins.

---
 pkgs/misc/vim-plugins/default.nix | 221 ++++++++++++++++++++++++++++++
 1 file changed, 221 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 87014a9c7144..d174aedf857c 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -413,4 +413,225 @@ in rec
     '';
   };
 
+  vundle = simpleDerivation {
+    name = "vundle-vim-git-0b28e334";
+    src = fetchgit {
+      url = "https://github.com/gmarik/Vundle.vim.git";
+      rev = "0b28e334e65b6628b0a61c412fcb45204a2f2bab";
+      sha256 = "9681d471d1391626cb9ad22b2b469003d9980cd23c5c3a8d34666376447e6204";
+     };
+    path = "vundle";
+  };
+
+  tslime = simpleDerivation {
+    name = "tslime-vim-git-e801a32b";
+    src = fetchgit {
+      url = "https://github.com/jgdavey/tslime.vim.git";
+      rev = "e801a32b27d83cb5d91afbf7c3d71bb6220f32bd";
+      sha256 = "47fb7165c1dcc444285cdff6fa89bbd4ace82ca79ec14ba0da6091c5f78d1251";
+     };
+    path = "tslime";
+  };
+
+  supertab = simpleDerivation {
+    name = "supertab-git-23db5585";
+    src = fetchgit {
+      url = "https://github.com/ervandew/supertab.git";
+      rev = "23db558596d4a73e4afa8fbedcde23b95bf72251";
+      sha256 = "21fa675969f4cfd2686ab3b63cba632fa55d62481e61d36193403bea9c02ebde";
+     };
+    path = "supertab";
+    buildInputs = [ vim ];
+  };
+
+  fugitive = simpleDerivation {
+    name = "vim-fugitive-git-90ee6fb5";
+    src = fetchgit {
+      url = "https://github.com/tpope/vim-fugitive.git";
+      rev = "90ee6fb5d255d14d9f12f2469f92ee50149f5b44";
+      sha256 = "0297512f7fee62af601a99a68617591ecb2e244475ff0d79ebee9c7e6eff2eaf";
+     };
+    path = "fugitive";
+  };
+
+  extradite = simpleDerivation {
+    name = "vim-extradite-git-af4f3a51";
+    src = fetchgit {
+      url = "https://github.com/int3/vim-extradite.git";
+      rev = "af4f3a51b6b654d655121b93c0cd9d8fe9a0c85d";
+      sha256 = "d1d29cfbc654134be383747f2cd6b14b7a87de75f997af6a041f14d7ef61ade6";
+     };
+    path = "extradite";
+  };
+
+  nerdtree = simpleDerivation {
+    name = "nerdtree-git-4f1e6ecb";
+    src = fetchgit {
+      url = "https://github.com/scrooloose/nerdtree.git";
+      rev = "4f1e6ecb057fc0bac189171c1430d71ef25f6bb1";
+      sha256 = "67ff2e7b9a7f39e58e9e334b1b79343a4c11aae10a657ab4fece289d8fe59300";
+     };
+    path = "nerdtree";
+  };
+
+  airline = simpleDerivation {
+    name = "vim-airline-git-2114e702";
+    src = fetchgit {
+      url = "https://github.com/bling/vim-airline.git";
+      rev = "2114e7025188a941e5c63b1f942d576adb98d8a4";
+      sha256 = "b6fc4d0545f8b7e107c5f80b94cf536a2b1fdd55d9f2484a29a007911e96130f";
+     };
+    path = "airline";
+  };
+
+  ultisnips = simpleDerivation {
+    name = "ultisnips-git-279d6e63";
+    src = fetchgit {
+      url = "https://github.com/SirVer/ultisnips.git";
+      rev = "279d6e63c9a8dbaa20ffc43c3c5f057dfc8f1121";
+      sha256 = "f8d93849ef2bce798aa599ba860694ced37d12450010a48dd6bd3004bc52b503";
+     };
+    path = "ultisnips";
+  };
+
+  align = simpleDerivation {
+    name = "align-git-787662fe";
+    src = fetchgit {
+      url = "https://github.com/vim-scripts/Align.git";
+      rev = "787662fe90cd057942bc5b682fd70c87e1a9dd77";
+      sha256 = "f7b5764357370f03546556bd45558837f3790b0e86afadb63cd04d714a668a29";
+     };
+    path = "align";
+  };
+
+  gundo = simpleDerivation {
+    name = "gundo-git-f443470b";
+    src = fetchgit {
+      url = "https://github.com/vim-scripts/Gundo.git";
+      rev = "f443470b96364c24a775629418a6b2562ec9173e";
+      sha256 = "b7a949167e59c936d6eae0d23635b87491b2cd2f46a197683b171d30165a90f9";
+     };
+    path = "gundo";
+  };
+
+  commentary = simpleDerivation {
+    name = "vim-commentary-git-8b4df6ca";
+    src = fetchgit {
+      url = "https://github.com/tpope/vim-commentary.git";
+      rev = "8b4df6ca0ba9cd117d97a8fd26b44b2439d5e3f1";
+      sha256 = "5496ed31706552957d4caa76669ecd04e9b2853cf7a7e40bd0164726b21fcca0";
+     };
+    path = "commentary";
+  };
+
+  tabular = simpleDerivation {
+    name = "tabular-git-60f25648";
+    src = fetchgit {
+      url = "https://github.com/godlygeek/tabular.git";
+      rev = "60f25648814f0695eeb6c1040d97adca93c4e0bb";
+      sha256 = "28c860ad621587f2c3213fae47d1a3997746527c17d51e9ab94c209eb7bfeb0f";
+     };
+    path = "tabular";
+  };
+
+  vim2hs = simpleDerivation {
+    name = "vim2hs-git-f2afd557";
+    src = fetchgit {
+      url = "https://github.com/dag/vim2hs.git";
+      rev = "f2afd55704bfe0a2d66e6b270d247e9b8a7b1664";
+      sha256 = "485fc58595bb4e50f2239bec5a4cbb0d8f5662aa3f744e42c110cd1d66b7e5b0";
+     };
+    path = "vim2hs";
+  };
+
+  hasksyn = simpleDerivation {
+    name = "hasksyn-git-175cd460";
+    src = fetchgit {
+      url = "https://github.com/travitch/hasksyn.git";
+      rev = "175cd4605afa5d9b9c75758112c8159fd118c631";
+      sha256 = "3488e38d1f45a9a3363da62c1c946591621151a0a9cdaedd22b3fe8f666bbdb9";
+     };
+    path = "hasksyn";
+  };
+
+  haskellConceal = simpleDerivation {
+    name = "vim-haskellConceal-git-73a8d712";
+    src = fetchgit {
+      url = "https://github.com/begriffs/vim-haskellConceal.git";
+      rev = "73a8d712d3342b2ffdc087b12924f1cf81053860";
+      sha256 = "be60ca030e2d39e972a8c71c0ab3b75b893589d26d5dd78a20cd6779f1f5cfa8";
+     };
+    path = "haskellConceal";
+  };
+
+  ghcmod = simpleDerivation {
+    name = "ghcmod-vim-git-0c4e9428";
+    src = fetchgit {
+      url = "https://github.com/eagletmt/ghcmod-vim.git";
+      rev = "0c4e94281e57c475752e799adc261f7d5e4ab124";
+      sha256 = "f6a085f7b8198747fae3fff0bc38e4d030e5c97aaeb84958fbf96fa658bbe862";
+     };
+    path = "ghcmod";
+  };
+
+  necoGhc = simpleDerivation {
+    name = "neco-ghc-git-0311f31b";
+    src = fetchgit {
+      url = "https://github.com/eagletmt/neco-ghc.git";
+      rev = "0311f31b3acaccec5b651ae7089d627a3a49239b";
+      sha256 = "302f29f54c56e9cee647745a8355aeafe323c4efe2f3593d5e4f586acc1c06a5";
+     };
+    path = "neco-ghc";
+  };
+
+  hoogle = simpleDerivation {
+    name = "vim-hoogle-git-81f28318";
+    src = fetchgit {
+      url = "https://github.com/Twinside/vim-hoogle.git";
+      rev = "81f28318b0d4174984c33df99db7752891c5c4e9";
+      sha256 = "0f96f3badb6218cac87d0f7027ff032ecc74f08ad3ada542898278ce11cbd5a0";
+     };
+    path = "hoogle";
+  };
+
+  hdevtools = simpleDerivation {
+    name = "vim-hdevtools-git-474947c5";
+    src = fetchgit {
+      url = "https://github.com/bitc/vim-hdevtools.git";
+      rev = "474947c52ff9c93dd36f3c49de90bd9a78f0baa1";
+      sha256 = "bf5f096b665c51ce611c6c1bfddc3267c4b2f94af84b04482b07272a6a5a92f3";
+     };
+    path = "hdevtools";
+  };
+
+  stylishHaskell = simpleDerivation {
+    name = "vim-stylish-haskell-git-453fd203";
+    src = fetchgit {
+      url = "https://github.com/nbouscal/vim-stylish-haskell.git";
+      rev = "453fd203aee3d7305ea8e4088ff53bd1f5933d75";
+      sha256 = "c0e5010e1e8e56b179ce500387afb569f051c45b37ce92feb4350f293df96a8c";
+     };
+    path = "stylish-haskell";
+  };
+
+  wombat256 = simpleDerivation {
+    name = "wombat256-vim-git-8734ba45";
+    src = fetchgit {
+      url = "https://github.com/vim-scripts/wombat256.vim.git";
+      rev = "8734ba45dcf5e38c4d2686b35c94f9fcb30427e2";
+      sha256 = "2feb7d57ab0a9f2ea44ccd606e540db64ab3285956398a50ecc562d7b8dbcd05";
+     };
+    path = "wombat256";
+  };
+
+  tmuxNavigator = simpleDerivation {
+    name = "vim-tmux-navigator-git-3de98bfc";
+    src = fetchgit {
+      url = "https://github.com/christoomey/vim-tmux-navigator.git";
+      rev = "3de98bfcee1289ce8edc6daf9a18f243180c7168";
+      sha256 = "3843f92e0a21fe5ccf613f8a561abd06c822b2ee98bd82c98937548144e4e8df";
+     };
+    path = "tmux-navigator";
+  };
+
 }

From b63b8260b5e4acc48d6ee62531265e38eb7a2513 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Thu, 14 Aug 2014 02:17:55 +0200
Subject: [PATCH 0046/1453] Add thermald: Linux Thermal Daemon

---
 nixos/modules/services/hardware/thermald.nix | 40 ++++++++++++++++++++
 pkgs/tools/system/thermald/default.nix       | 36 ++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 +
 3 files changed, 78 insertions(+)
 create mode 100644 nixos/modules/services/hardware/thermald.nix
 create mode 100644 pkgs/tools/system/thermald/default.nix

diff --git a/nixos/modules/services/hardware/thermald.nix b/nixos/modules/services/hardware/thermald.nix
new file mode 100644
index 000000000000..d197c723d558
--- /dev/null
+++ b/nixos/modules/services/hardware/thermald.nix
@@ -0,0 +1,40 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.thermald;
+
+in {
+
+  ###### interface
+
+  options = { 
+
+    services.thermald = { 
+
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whether to enable thermald, the temperature management daemon.
+        ''; 
+      };  
+
+    };  
+
+  };  
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    systemd.services.thermald = {
+      description = "Thermal Daemon Service";
+      wantedBy = [ "multi-user.target" ];
+      script = "exec ${pkgs.thermald}/sbin/thermald --no-daemon --dbus-enable";
+    };
+
+  };
+
+}
diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix
new file mode 100644
index 000000000000..86d121f0c22f
--- /dev/null
+++ b/pkgs/tools/system/thermald/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, unzip, autoconf, automake, libtool, pkgconfig, dbus_libs, dbus_glib, libxml2 }:
+
+stdenv.mkDerivation rec {
+  version = "1.3";
+  name = "thermald-${version}";
+  src = fetchurl {
+    url = "https://github.com/01org/thermal_daemon/archive/v${version}.zip";
+    sha256 = "0jqxc8vvd4lx4z0kcdisk8lpdf823nysvjcfjxlr5wzla1xysqwc";
+  };
+  buildInputs = [ unzip autoconf automake libtool pkgconfig dbus_libs dbus_glib libxml2 ];
+
+  patchPhase = ''sed -e 's/upstartconfdir = \/etc\/init/upstartconfdir = $(out)\/etc\/init/' -i data/Makefile.am'';
+
+  preConfigure = ''
+                   export PKG_CONFIG_PATH="${dbus_libs}/lib/pkgconfig:$PKG_CONFIG_PATH"
+                   ./autogen.sh #--prefix="$out"
+                 '';
+
+  configureFlags = [
+    "--sysconfdir=$(out)/etc" "--localstatedir=/var"
+    "--with-dbus-sys-dir=$(out)/etc/dbus-1/system.d"
+    "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
+    ];
+
+  preInstall = "sysconfdir=$out/etc";
+
+
+  meta = {
+    description = "Thermal Daemon";
+    longDescription = ''
+         Thermal Daemon
+    '';
+    homepage = https://01.org/linux-thermal-daemon;
+    license = stdenv.lib.licenses.gpl2;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8c0a5e545cf8..98c59895c745 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11322,6 +11322,8 @@ let
     inherit texLive unzip;
   };
 
+  thermald = callPackage ../tools/system/thermald { };
+
   thinkfan = callPackage ../tools/system/thinkfan { };
 
   vice = callPackage ../misc/emulators/vice {

From 1da35629cc4c21dcd45ea4d07df2b69325b526d3 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Thu, 14 Aug 2014 12:42:16 +0200
Subject: [PATCH 0047/1453] Cleanup: remove newlines.

---
 nixos/modules/services/hardware/thermald.nix | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/nixos/modules/services/hardware/thermald.nix b/nixos/modules/services/hardware/thermald.nix
index d197c723d558..5233794a20cc 100644
--- a/nixos/modules/services/hardware/thermald.nix
+++ b/nixos/modules/services/hardware/thermald.nix
@@ -4,37 +4,25 @@ with lib;
 
 let
   cfg = config.services.thermald;
-
 in {
-
   ###### interface
-
   options = { 
-
     services.thermald = { 
-
       enable = mkOption {
         default = false;
         description = ''
           Whether to enable thermald, the temperature management daemon.
         ''; 
       };  
-
     };  
-
   };  
 
-
   ###### implementation
-
   config = mkIf cfg.enable {
-
     systemd.services.thermald = {
       description = "Thermal Daemon Service";
       wantedBy = [ "multi-user.target" ];
       script = "exec ${pkgs.thermald}/sbin/thermald --no-daemon --dbus-enable";
     };
-
   };
-
 }

From 320a82dd7f821e3383fe63b21c7c99927913631d Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 4 Jul 2014 15:11:16 -0500
Subject: [PATCH 0048/1453] nixos/dhcpcd: Add an explicit interfaces option

---
 nixos/modules/services/networking/dhcpcd.nix | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix
index 5a353fc0942a..c541d4fa6041 100644
--- a/nixos/modules/services/networking/dhcpcd.nix
+++ b/nixos/modules/services/networking/dhcpcd.nix
@@ -6,6 +6,8 @@ let
 
   dhcpcd = if !config.boot.isContainer then pkgs.dhcpcd else pkgs.dhcpcd.override { udev = null; };
 
+  cfg = config.networking.dhcpcd;
+
   # Don't start dhcpcd on explicitly configured interfaces or on
   # interfaces that are part of a bridge.
   ignoredInterfaces =
@@ -37,7 +39,10 @@ let
       # (Xen) and virbr* and vnet* (libvirt).
       denyinterfaces ${toString ignoredInterfaces} lo peth* vif* tap* tun* virbr* vnet* vboxnet*
 
-      ${config.networking.dhcpcd.extraConfig}
+      # Use the list of allowed interfaces if specified
+      ${optionalString (cfg.allowInterfaces != [ ]) "allowinterfaces ${toString cfg.allowInterfaces}"}
+
+      ${cfg.extraConfig}
     '';
 
   # Hook for emitting ip-up/ip-down events.
@@ -80,6 +85,17 @@ in
       '';
     };
 
+    networking.dhcpcd.allowInterfaces = mkOption {
+      type = types.listOf types.str;
+      default = [];
+      description = ''
+         Enable the DHCP client for any interface whose name matches
+         any of the shell glob patterns in this list. Any interface not
+         explicitly matched by this pattern will be denied. This pattern only
+         applies when the list is non-empty.
+      '';
+    };
+
     networking.dhcpcd.extraConfig = mkOption {
       type = types.lines;
       default = "";

From a269acf48026b439bce217bd5376bca01298fa07 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 12 Jul 2014 16:53:25 -0500
Subject: [PATCH 0049/1453] nixos/dhcpcd: Use null instead of empty list to
 disable allowInterfaces

---
 nixos/modules/services/networking/dhcpcd.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix
index c541d4fa6041..198c8cb08b2a 100644
--- a/nixos/modules/services/networking/dhcpcd.nix
+++ b/nixos/modules/services/networking/dhcpcd.nix
@@ -40,7 +40,7 @@ let
       denyinterfaces ${toString ignoredInterfaces} lo peth* vif* tap* tun* virbr* vnet* vboxnet*
 
       # Use the list of allowed interfaces if specified
-      ${optionalString (cfg.allowInterfaces != [ ]) "allowinterfaces ${toString cfg.allowInterfaces}"}
+      ${optionalString (cfg.allowInterfaces != null) "allowinterfaces ${toString cfg.allowInterfaces}"}
 
       ${cfg.extraConfig}
     '';
@@ -86,13 +86,13 @@ in
     };
 
     networking.dhcpcd.allowInterfaces = mkOption {
-      type = types.listOf types.str;
-      default = [];
+      type = types.nullOr (types.listOf types.str);
+      default = null;
       description = ''
          Enable the DHCP client for any interface whose name matches
          any of the shell glob patterns in this list. Any interface not
          explicitly matched by this pattern will be denied. This pattern only
-         applies when the list is non-empty.
+         applies when non-null.
       '';
     };
 

From 40d88e9f80075567f4c36e371a3dd36568108b02 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 26 Jun 2014 00:13:21 -0500
Subject: [PATCH 0050/1453] nixos/network-interfaces: Add sit interfaces

Previously, we had no method for creating 6-to-4 tunneled interfaces.
This patch adds the option networking.sits, which allows the user to
create named 6-to-4 sit devices.
---
 nixos/modules/tasks/network-interfaces.nix | 89 ++++++++++++++++++++++
 1 file changed, 89 insertions(+)

diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 991f9f261450..7dabe70f00c4 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -7,6 +7,7 @@ let
   cfg = config.networking;
   interfaces = attrValues cfg.interfaces;
   hasVirtuals = any (i: i.virtual) interfaces;
+  hasSits = cfg.sits != { };
   hasBonds = cfg.bonds != { };
 
   interfaceOpts = { name, ... }: {
@@ -321,6 +322,66 @@ in
       };
     };
 
+    networking.sits = mkOption {
+      type = types.attrsOf types.optionSet;
+      default = { };
+      example = {
+        hurricane = {
+          remote = "10.0.0.1";
+          local = "10.0.0.22";
+          ttl = 255;
+        };
+        msipv6 = {
+          remote = "192.168.0.1";
+          dev = "enp3s0";
+          ttl = 127;
+        };
+      };
+      description = ''
+        This option allows you to define 6-to-4 interfaces which should be automatically created.
+      '';
+      options = {
+
+        remote = mkOption {
+          type = types.nullOr types.str;
+          default = null;
+          example = "10.0.0.1";
+          description = ''
+            The address of the remote endpoint to forward traffic over.
+          '';
+        };
+
+        local = mkOption {
+          type = types.nullOr types.str;
+          default = null;
+          example = "10.0.0.22";
+          description = ''
+            The address of the local endpoint which the remote
+            side should send packets to.
+          '';
+        };
+
+        ttl = mkOption {
+          type = types.nullOr types.int;
+          default = null;
+          example = 255;
+          description = ''
+            The time-to-live of the connection to the remote tunnel endpoint.
+          '';
+        };
+
+        dev = mkOption {
+          type = types.nullOr types.str;
+          default = null;
+          example = "enp4s0f0";
+          description = ''
+            The underlying network device on which the tunnel resides.
+          '';
+        };
+
+      };
+    };
+
     networking.vlans = mkOption {
       default = { };
       example = {
@@ -380,6 +441,7 @@ in
     boot.kernelModules = [ ]
       ++ optional cfg.enableIPv6 "ipv6"
       ++ optional hasVirtuals "tun"
+      ++ optional hasSits "sit"
       ++ optional hasBonds "bonding";
 
     boot.extraModprobeConfig =
@@ -641,6 +703,32 @@ in
             '';
           };
 
+        createSitDevice = n: v:
+          let
+            deps = optional (v.dev != null) "sys-subsystem-net-devices-${v.dev}.device";
+          in
+          { description = "6-to-4 Tunnel Interface ${n}";
+            wantedBy = [ "network.target" "sys-subsystem-net-devices-${n}.device" ];
+            bindsTo = deps;
+            after = deps;
+            serviceConfig.Type = "oneshot";
+            serviceConfig.RemainAfterExit = true;
+            path = [ pkgs.iproute ];
+            script = ''
+              # Remove Dead Interfaces
+              ip link show "${n}" >/dev/null 2>&1 && ip link delete "${n}"
+              ip link add "${n}" type sit \
+                ${optionalString (v.remote != null) "remote \"${v.remote}\""} \
+                ${optionalString (v.local != null) "local \"${v.local}\""} \
+                ${optionalString (v.ttl != null) "ttl ${toString v.ttl}"} \
+                ${optionalString (v.dev != null) "dev \"${v.dev}\""}
+              ip link set "${n}" up
+            '';
+            postStop = ''
+              ip link delete "${n}"
+            '';
+          };
+
         createVlanDevice = n: v:
           let
             deps = [ "sys-subsystem-net-devices-${v.interface}.device" ];
@@ -668,6 +756,7 @@ in
            map createTunDevice (filter (i: i.virtual) interfaces))
          // mapAttrs createBridgeDevice cfg.bridges
          // mapAttrs createBondDevice cfg.bonds
+         // mapAttrs createSitDevice cfg.sits
          // mapAttrs createVlanDevice cfg.vlans
          // { "network-setup" = networkSetup; };
 

From bc6979f7e1a3a2fe65d813cc18ee5a37ed0e4d4d Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 4 Jul 2014 15:01:26 -0500
Subject: [PATCH 0051/1453] nixos/dhcpcd: Don't configure sit devices

---
 nixos/modules/services/networking/dhcpcd.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix
index 5a353fc0942a..866707c3a913 100644
--- a/nixos/modules/services/networking/dhcpcd.nix
+++ b/nixos/modules/services/networking/dhcpcd.nix
@@ -7,9 +7,10 @@ let
   dhcpcd = if !config.boot.isContainer then pkgs.dhcpcd else pkgs.dhcpcd.override { udev = null; };
 
   # Don't start dhcpcd on explicitly configured interfaces or on
-  # interfaces that are part of a bridge.
+  # interfaces that are part of a bridge, bond or sit device.
   ignoredInterfaces =
     map (i: i.name) (filter (i: i.ipAddress != null) (attrValues config.networking.interfaces))
+    ++ mapAttrsToList (i: _: i) config.networking.sits
     ++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.bridges))
     ++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.bonds))
     ++ config.networking.dhcpcd.denyInterfaces;
@@ -35,7 +36,7 @@ let
       # Ignore peth* devices; on Xen, they're renamed physical
       # Ethernet cards used for bridging.  Likewise for vif* and tap*
       # (Xen) and virbr* and vnet* (libvirt).
-      denyinterfaces ${toString ignoredInterfaces} lo peth* vif* tap* tun* virbr* vnet* vboxnet*
+      denyinterfaces ${toString ignoredInterfaces} lo peth* vif* tap* tun* virbr* vnet* vboxnet* sit*
 
       ${config.networking.dhcpcd.extraConfig}
     '';

From 133fb0c6e0b542f01afdeb56537b947799e28332 Mon Sep 17 00:00:00 2001
From: Petar Bogdanovic <petar@smokva.net>
Date: Thu, 14 Aug 2014 22:06:59 +0100
Subject: [PATCH 0052/1453] rtorrent: compile with xmlrpc-c for 3rd party UIs

---
 pkgs/tools/networking/p2p/rtorrent/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/p2p/rtorrent/default.nix b/pkgs/tools/networking/p2p/rtorrent/default.nix
index b843228f3f02..64d518355725 100644
--- a/pkgs/tools/networking/p2p/rtorrent/default.nix
+++ b/pkgs/tools/networking/p2p/rtorrent/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, libtorrent, ncurses, pkgconfig, libsigcxx, curl
-, zlib, openssl
+, zlib, openssl, xmlrpc_c
 }:
 
 stdenv.mkDerivation rec {
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "113yrrac75vqi4g8r6bgs0ggjllj9bkg9shv08vqzdhkwqg2q2mw";
   };
 
-  buildInputs = [ libtorrent ncurses pkgconfig libsigcxx curl zlib openssl ];
+  buildInputs = [ libtorrent ncurses pkgconfig libsigcxx curl zlib openssl xmlrpc_c ];
+  configureFlags = "--with-xmlrpc-c";
 
   # postInstall = ''
   #   mkdir -p $out/share/man/man1 $out/share/rtorrent

From 9eea38285bfa28a70a6996c45c84e7c4aceb0bac Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <_deepfire@feelingofgreen.ru>
Date: Mon, 4 Aug 2014 13:03:49 +0400
Subject: [PATCH 0053/1453] chntpw:  new expression

---
 .../00-chntpw-build-arch-autodetect.patch     | 25 ++++++++++++++++
 .../chntpw/01-chntpw-install-target.patch     | 26 +++++++++++++++++
 pkgs/tools/security/chntpw/default.nix        | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 4 files changed, 82 insertions(+)
 create mode 100644 pkgs/tools/security/chntpw/00-chntpw-build-arch-autodetect.patch
 create mode 100644 pkgs/tools/security/chntpw/01-chntpw-install-target.patch
 create mode 100644 pkgs/tools/security/chntpw/default.nix

diff --git a/pkgs/tools/security/chntpw/00-chntpw-build-arch-autodetect.patch b/pkgs/tools/security/chntpw/00-chntpw-build-arch-autodetect.patch
new file mode 100644
index 000000000000..9c379adb7dfb
--- /dev/null
+++ b/pkgs/tools/security/chntpw/00-chntpw-build-arch-autodetect.patch
@@ -0,0 +1,25 @@
+diff -urN chntpw-140201.orig/Makefile chntpw-140201/Makefile
+--- chntpw-140201.orig/Makefile	2014-02-01 20:54:37.000000000 +0400
++++ chntpw-140201/Makefile	2014-08-03 20:26:56.497161881 +0400
+@@ -12,14 +12,13 @@
+ 
+ CC=gcc
+ 
+-# Force 32 bit
+-CFLAGS= -DUSEOPENSSL -g -I. -I$(OSSLINC) -Wall -m32 
+-OSSLLIB=$(OSSLPATH)/lib
+-
+-# 64 bit if default for compiler setup
+-#CFLAGS= -DUSEOPENSSL -g -I. -I$(OSSLINC) -Wall
+-#OSSLLIB=$(OSSLPATH)/lib64
+-
++ifeq      '$(shell gcc -dumpmachine)' 'x86_64-unknown-linux-gnu'
++  CFLAGS= -DUSEOPENSSL -g -I. -I$(OSSLINC) -Wall
++  OSSLLIB=$(OSSLPATH)/lib64
++else ifeq '$(shell gcc -dumpmachine)' 'i686-unknown-linux-gnu'
++  CFLAGS= -DUSEOPENSSL -g -I. -I$(OSSLINC) -Wall -m32 
++  OSSLLIB=$(OSSLPATH)/lib
++endif
+ 
+ # This is to link with whatever we have, SSL crypto lib we put in static
+ #LIBS=-L$(OSSLLIB) $(OSSLLIB)/libcrypto.a
diff --git a/pkgs/tools/security/chntpw/01-chntpw-install-target.patch b/pkgs/tools/security/chntpw/01-chntpw-install-target.patch
new file mode 100644
index 000000000000..d3163a026f91
--- /dev/null
+++ b/pkgs/tools/security/chntpw/01-chntpw-install-target.patch
@@ -0,0 +1,26 @@
+diff -urN chntpw-140201.orig/Makefile chntpw-140201/Makefile
+--- chntpw-140201.orig/Makefile	2014-08-03 20:26:56.497161881 +0400
++++ chntpw-140201/Makefile	2014-08-04 12:57:16.563818342 +0400
+@@ -10,6 +10,8 @@
+ OSSLPATH=/usr
+ OSSLINC=$(OSSLPATH)/include
+ 
++PREFIX ?= /usr
++
+ CC=gcc
+ 
+ ifeq      '$(shell gcc -dumpmachine)' 'x86_64-unknown-linux-gnu'
+@@ -24,8 +26,12 @@
+ #LIBS=-L$(OSSLLIB) $(OSSLLIB)/libcrypto.a
+ LIBS=-L$(OSSLLIB)
+ 
++BINARIES := chntpw chntpw.static cpnt reged reged.static samusrgrp samusrgrp.static sampasswd sampasswd.static
+ 
+-all: chntpw chntpw.static cpnt reged reged.static samusrgrp samusrgrp.static sampasswd sampasswd.static
++all: $(BINARIES)
++install: $(BINARIES)
++	mkdir -p $(PREFIX)/bin
++	cp $^ $(PREFIX)/bin
+ 
+ chntpw: chntpw.o ntreg.o edlib.o libsam.o
+ 	$(CC) $(CFLAGS) -o chntpw chntpw.o ntreg.o edlib.o libsam.o $(LIBS)
diff --git a/pkgs/tools/security/chntpw/default.nix b/pkgs/tools/security/chntpw/default.nix
new file mode 100644
index 000000000000..a1aab355a3c3
--- /dev/null
+++ b/pkgs/tools/security/chntpw/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, unzip }:
+
+stdenv.mkDerivation rec {
+  name = "chntpw-${version}";
+
+  version = "140201";
+
+  src = fetchurl {
+    url = "http://pogostick.net/~pnh/ntpasswd/chntpw-source-${version}.zip";
+    sha256 = "1k1cxsj0221dpsqi5yibq2hr7n8xywnicl8yyaicn91y8h2hkqln";
+  };
+
+  buildInputs = [ unzip ];
+
+  patches = [
+    ./00-chntpw-build-arch-autodetect.patch
+    ./01-chntpw-install-target.patch
+  ];
+
+  installPhase = ''
+    make install PREFIX=$out
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://pogostick.net/~pnh/ntpasswd/;
+    description = "An utility to reset the password of any user that has a valid local account on a Windows system";
+    license = licenses.gpl2;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 77d2fe85d590..2da8398619fd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -604,6 +604,8 @@ let
   consul = callPackage ../servers/consul { };
   consul_ui = callPackage ../servers/consul/ui.nix { };
 
+  chntpw = callPackage ../tools/security/chntpw { };
+
   coprthr = callPackage ../development/libraries/coprthr {
     flex = flex_2_5_35;
   };

From df8e7f5614abd604426412cd26a980272d9f1cf2 Mon Sep 17 00:00:00 2001
From: Steve Bigham <steve.bigham@gmail.com>
Date: Thu, 14 Aug 2014 21:01:20 -0400
Subject: [PATCH 0054/1453] Remove unnecessary dependencies and centralize
 version string.

---
 .../window-managers/bar/default.nix           | 42 ++++++++++---------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/pkgs/applications/window-managers/bar/default.nix b/pkgs/applications/window-managers/bar/default.nix
index a4b90a04133b..bee774d10da2 100644
--- a/pkgs/applications/window-managers/bar/default.nix
+++ b/pkgs/applications/window-managers/bar/default.nix
@@ -1,23 +1,25 @@
-{ stdenv, fetchurl, git, perl, libxcb, libXinerama, xcbutil, xcbutilwm, xcbutilkeysyms }:
-
-stdenv.mkDerivation rec {
-  name = "bar-1.0";
+{ stdenv, fetchurl, perl, libxcb }:
 
+let
+  version = "1.0";
+in
+  stdenv.mkDerivation rec {
+    name = "bar-${version}";
   
-  src = fetchurl {
-    url = "https://github.com/LemonBoy/bar/archive/v1.0.tar.gz";
-    sha256 = "1n2vak2acs37sslxl250cnz9c3irif5z4s54wi9qjyxbfzr2h2nc";
-  };
-
-  buildInputs = [ libxcb git perl libXinerama xcbutil xcbutilkeysyms xcbutilwm ];
-
-  prePatch = ''sed -i "s@/usr@$out@" Makefile'';
-
-  meta = {
-    description = "A lightweight xcb based bar";
-    homepage = "https://github.com/LemonBoy/bar";
-    maintainers = stdenv.lib.maintainers.meisternu;
-    license = "Custom";   
-    platforms = stdenv.lib.platforms.linux;
-  };
+    src = fetchurl {
+      url = "https://github.com/LemonBoy/bar/archive/v${version}.tar.gz";
+      sha256 = "1n2vak2acs37sslxl250cnz9c3irif5z4s54wi9qjyxbfzr2h2nc";
+    };
+  
+    buildInputs = [ libxcb perl ];
+  
+    prePatch = ''sed -i "s@/usr@$out@" Makefile'';
+  
+    meta = {
+      description = "A lightweight xcb based bar";
+      homepage = "https://github.com/LemonBoy/bar";
+      maintainers = stdenv.lib.maintainers.meisternu;
+      license = "Custom";   
+      platforms = stdenv.lib.platforms.linux;
+    };
 }

From bd957f80380cd45e6473dd29283820fe9f24f6f9 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Thu, 14 Aug 2014 19:52:41 +0100
Subject: [PATCH 0055/1453] haskell-cabal-bounds: update to 0.8.1

---
 pkgs/development/tools/haskell/cabal-bounds/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/haskell/cabal-bounds/default.nix b/pkgs/development/tools/haskell/cabal-bounds/default.nix
index c8dc299e7d90..fa258f95094a 100644
--- a/pkgs/development/tools/haskell/cabal-bounds/default.nix
+++ b/pkgs/development/tools/haskell/cabal-bounds/default.nix
@@ -1,20 +1,21 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, Cabal, cabalLenses, cmdargs, either, filepath, lens
+{ cabal, Cabal, cabalLenses, cmdargs, either, filepath, Glob, lens
 , strict, tasty, tastyGolden, transformers, unorderedContainers
 }:
 
 cabal.mkDerivation (self: {
   pname = "cabal-bounds";
-  version = "0.8";
-  sha256 = "0db5vy4qfjc2d27d4vk37gz9sdjgjlargndligmljf52s2g568r0";
+  version = "0.8.1";
+  sha256 = "19z596niwvjbjs8cp06zqkd29kn7chqkf60cdbr0ikyw8v4dcjw7";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     Cabal cabalLenses cmdargs either lens strict transformers
     unorderedContainers
   ];
-  testDepends = [ filepath tasty tastyGolden ];
+  testDepends = [ filepath Glob tasty tastyGolden ];
+  jailbreak = true;
   doCheck = false;
   meta = {
     description = "A command line program for managing the bounds/versions of the dependencies in a cabal file";

From 7788421cd3db9550c5b819922c24fcf74c5098f3 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Thu, 14 Aug 2014 19:53:17 +0100
Subject: [PATCH 0056/1453] haskell-constraints: update to 0.4

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

diff --git a/pkgs/development/libraries/haskell/constraints/default.nix b/pkgs/development/libraries/haskell/constraints/default.nix
index 6681f3a85bb9..3f1b196ef276 100644
--- a/pkgs/development/libraries/haskell/constraints/default.nix
+++ b/pkgs/development/libraries/haskell/constraints/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "constraints";
-  version = "0.3.5";
-  sha256 = "01xrk0xqkfwzzr5jwkadkyjgrdcpslwiqfqdb7mci688xp2isi3i";
+  version = "0.4";
+  sha256 = "0nnplylzbcw884jgsd4i46z75dkiyx4166j5fym5zdnwhyj75sp5";
   buildDepends = [ newtype ];
   meta = {
     homepage = "http://github.com/ekmett/constraints/";

From 5585769ff606fd3fc1ded8b7311452da6b56e3a7 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Thu, 14 Aug 2014 19:53:32 +0100
Subject: [PATCH 0057/1453] haskell-conduit-extra: update to 1.1.3.1

---
 pkgs/development/libraries/haskell/conduit-extra/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/conduit-extra/default.nix b/pkgs/development/libraries/haskell/conduit-extra/default.nix
index 87fc9f18e761..35fd7c42d0eb 100644
--- a/pkgs/development/libraries/haskell/conduit-extra/default.nix
+++ b/pkgs/development/libraries/haskell/conduit-extra/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "conduit-extra";
-  version = "1.1.3";
-  sha256 = "1gzvplaxplqia23g6l8z42w0z10y33yz594lxdk82g4i7swaagix";
+  version = "1.1.3.1";
+  sha256 = "1glw734nm5gra5zw31lg3ia74dp4b2ik931jmk52b8f62ysg2vx0";
   buildDepends = [
     attoparsec blazeBuilder conduit filepath monadControl network
     primitive resourcet stm streamingCommons text transformers
@@ -18,7 +18,6 @@ cabal.mkDerivation (self: {
     async attoparsec blazeBuilder conduit exceptions hspec resourcet
     stm text transformers transformersBase
   ];
-  noHaddock = true;
   meta = {
     homepage = "http://github.com/snoyberg/conduit";
     description = "Batteries included conduit: adapters for common libraries";

From db42862c96157869b7ddba8d4bb24d15bcc1440e Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Thu, 14 Aug 2014 19:53:50 +0100
Subject: [PATCH 0058/1453] haskell-bytes: update to 0.14.1

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

diff --git a/pkgs/development/libraries/haskell/bytes/default.nix b/pkgs/development/libraries/haskell/bytes/default.nix
index fac15f1d4b81..4a8877b6a59d 100644
--- a/pkgs/development/libraries/haskell/bytes/default.nix
+++ b/pkgs/development/libraries/haskell/bytes/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "bytes";
-  version = "0.14.0.2";
-  sha256 = "1bdradf5lq1kgiri64zd8cvcw2fxwbwv0apznl8vxyqlx406v3rn";
+  version = "0.14.1";
+  sha256 = "023sdwdirvigrdg03f6jrdndm6pkqsmsrwz9ji57dpqg4f5k9jzk";
   buildDepends = [
     binary cereal mtl text time transformers transformersCompat void
   ];

From c2dafe1af3dcee21fdc0e35d8cc6a026e315d723 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Thu, 14 Aug 2014 19:54:05 +0100
Subject: [PATCH 0059/1453] haskell-json-assertions: regenerate with cabal2nix

---
 .../development/libraries/haskell/json-assertions/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/json-assertions/default.nix b/pkgs/development/libraries/haskell/json-assertions/default.nix
index f287b60764e3..fce4d5d79227 100644
--- a/pkgs/development/libraries/haskell/json-assertions/default.nix
+++ b/pkgs/development/libraries/haskell/json-assertions/default.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, aeson, indexed, indexedFree, lens, text }:
 
 cabal.mkDerivation (self: {
@@ -10,6 +12,6 @@ cabal.mkDerivation (self: {
     description = "Test that your (Aeson) JSON encoding matches your expectations";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.ocharles ];
+    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
   };
 })

From 34a3986b144935ba78c282d6a081600302413250 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 14 Aug 2014 21:32:44 -0400
Subject: [PATCH 0060/1453] vim-pluings: Fix missing hash

---
 pkgs/misc/vim-plugins/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 87014a9c7144..73407aa28d56 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -209,6 +209,7 @@ in rec
     src = fetchgit {
       url = "https://github.com/jnwhiteh/vim-golang.git";
       rev = "832d64e5a813511ed52217aa24f0255c49671bab";
+      sha256 = "6858eb674be132477c5dc7f7d3cbe550371f90d1aba480547a614965412a7b3c";
     };
     path = "golang";
     meta = with stdenv.lib; {

From 82c7852608ce40a82240cd64ddc88fd188c90d94 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Fri, 15 Aug 2014 02:17:52 +0100
Subject: [PATCH 0061/1453] haskell-Strafunski-StategyLib: update to 5.0.0.4

---
 .../libraries/haskell/Strafunski-StrategyLib/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/Strafunski-StrategyLib/default.nix b/pkgs/development/libraries/haskell/Strafunski-StrategyLib/default.nix
index 99d58423d3b4..2fa2a91efe8d 100644
--- a/pkgs/development/libraries/haskell/Strafunski-StrategyLib/default.nix
+++ b/pkgs/development/libraries/haskell/Strafunski-StrategyLib/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "Strafunski-StrategyLib";
-  version = "5.0.0.3";
-  sha256 = "1s7410dfzkqd9j8n5g92pvh9rwglngj3ca9ipcr6xsq0n6yhs51y";
+  version = "5.0.0.4";
+  sha256 = "0miffjc8li5l1jarmz8l34z5mx3q68pyxghsi1lbda51bzz3wy1g";
   buildDepends = [ mtl syb ];
   jailbreak = true;
   meta = {

From dae18a3b66a0d693b7ffe71e5e1a6e3cd5cc9064 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Fri, 15 Aug 2014 02:18:29 +0100
Subject: [PATCH 0062/1453] haskell-distributed-process: update to 0.5.1

---
 .../libraries/haskell/distributed-process/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/distributed-process/default.nix b/pkgs/development/libraries/haskell/distributed-process/default.nix
index e4a02faa60f0..21cebedefe46 100644
--- a/pkgs/development/libraries/haskell/distributed-process/default.nix
+++ b/pkgs/development/libraries/haskell/distributed-process/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "distributed-process";
-  version = "0.5.0";
-  sha256 = "16lfmkhc6jk2n46w39vf0q1ql426h5jrjgdi6cyjgwy1d5kaqcny";
+  version = "0.5.1";
+  sha256 = "1c654l7r3cn89nknh67vsg7crnfhgswh4523qyrmn8z4ykyd0zfk";
   buildDepends = [
     binary dataAccessor deepseq distributedStatic hashable mtl
     networkTransport random rank1dynamic stm syb time transformers

From e6c00e60c3eb6ba390e2081818d7ac30c916d3e0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 15 Aug 2014 03:35:55 +0200
Subject: [PATCH 0063/1453] nixos-container destroy: Make idempotent

---
 nixos/modules/virtualisation/nixos-container.pl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/nixos-container.pl b/nixos/modules/virtualisation/nixos-container.pl
index c0d30346e568..c6a5ecde9e32 100644
--- a/nixos/modules/virtualisation/nixos-container.pl
+++ b/nixos/modules/virtualisation/nixos-container.pl
@@ -154,7 +154,10 @@ my $root = "/var/lib/containers/$containerName";
 my $profileDir = "/nix/var/nix/profiles/per-container/$containerName";
 my $gcRootsDir = "/nix/var/nix/gcroots/per-container/$containerName";
 my $confFile = "/etc/containers/$containerName.conf";
-die "$0: container ‘$containerName’ does not exist\n" if !-e $confFile;
+if (!-e $confFile) {
+    exit 0 if $action eq "destroy";
+    die "$0: container ‘$containerName’ does not exist\n" ;
+}
 
 sub isContainerRunning {
     my $status = `systemctl show 'container\@$containerName'`;

From e620be97fe212b43ee42865dd4d3c8bba7f26fa9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 15 Aug 2014 04:04:28 +0200
Subject: [PATCH 0064/1453] Containers: Set up /etc/resolv.conf

Systemd-nspawn is supposed to do this, but doesn't if any of the
--network-* flags are used.
---
 nixos/modules/virtualisation/containers.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index d0d04d9a1e5d..7f545a9d3031 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -187,6 +187,8 @@ in
               "/nix/var/nix/profiles/per-container/$INSTANCE" \
               "/nix/var/nix/gcroots/per-container/$INSTANCE"
 
+            cp -f /etc/resolv.conf "$root/etc/resolv.conf"
+
             if [ "$PRIVATE_NETWORK" = 1 ]; then
               extraFlags+=" --network-veth"
             fi

From 043dc2b1b4bb547cd4a1a3a6499131a9437d42c7 Mon Sep 17 00:00:00 2001
From: Michel Kuhlmann <michel@kuhlmanns.info>
Date: Fri, 15 Aug 2014 10:50:10 +0200
Subject: [PATCH 0065/1453] qgis: update 1.8.0 -> 2.4.0 and adding sip

Unfortunately adding sip doesn't solve the error-message:

    Couldn't load SIP module.
    Python support will be disabled.
---
 pkgs/applications/misc/qgis/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/qgis/default.nix b/pkgs/applications/misc/qgis/default.nix
index cc26a74802b4..9a41bcc36ecc 100644
--- a/pkgs/applications/misc/qgis/default.nix
+++ b/pkgs/applications/misc/qgis/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, x11, sqlite, gsl,
-  pyqt4, qwt, fcgi, python, libspatialindex, libspatialite }:
+  pyqt4, qwt, fcgi, python, libspatialindex, libspatialite, sip }:
 
 stdenv.mkDerivation rec {
-  name = "qgis-1.8.0";
+  name = "qgis-2.4.0";
 
-  buildInputs = [ gdal qt4 flex bison proj geos x11 sqlite gsl pyqt4 qwt
+  buildInputs = [ gdal qt4 flex bison proj geos x11 sqlite gsl pyqt4 sip qwt
     fcgi libspatialindex libspatialite ];
 
   nativeBuildInputs = [ cmake python ];
@@ -19,7 +19,9 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://qgis.org/downloads/${name}.tar.bz2";
-    sha256 = "1aq32ch61bqsvh39lmrxah1fmh18cd3nqyi1l0sn6ssa3kwf82vh";
+    sha256 = "711b7d81ddff45b083a21f05c8aa5093a6a38a0ee42dfcc873234fcef1fcdd76";
+    
+
   };
 
   meta = {

From 94c08cf163f4c894032bf51b3e4ad725ac5c6f89 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Fri, 15 Aug 2014 12:07:42 +0200
Subject: [PATCH 0066/1453] weechat: Bump to 1.0.

A happy day for all weechat-users!
---
 .../networking/irc/weechat/default.nix           | 11 ++---------
 .../networking/irc/weechat/fix-gnutls-32.diff    | 16 ----------------
 2 files changed, 2 insertions(+), 25 deletions(-)
 delete mode 100644 pkgs/applications/networking/irc/weechat/fix-gnutls-32.diff

diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index 954651d79e95..245619fddf07 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -3,12 +3,12 @@
 , pythonPackages, cacert, cmake, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  version = "0.4.3";
+  version = "1.0";
   name = "weechat-${version}";
 
   src = fetchurl {
     url = "http://weechat.org/files/src/${name}.tar.gz";
-    sha256 = "1sfx2j8xy6das0zis2nmzi9z41q96gzq61xaw4i0xbgag17s7ddz";
+    sha256 = "1z17wyrl5fp697qp44srpmzk79w37f5hm1r0krffbmga6sbzdj3x";
   };
 
   buildInputs = 
@@ -17,13 +17,6 @@ stdenv.mkDerivation rec {
       cacert cmake ]
     ++ stdenv.lib.optional stdenv.isDarwin pythonPackages.pync;
 
-  # This patch is based on
-  # weechat/c324610226cef15ecfb1235113c8243b068084c8. It fixes
-  # freeze/crash on /exit when using nixpkgs' gnutls 3.2. The next
-  # weechat release (0.4.4) will include this, so it's safe to remove
-  # then.
-  patches = [ ./fix-gnutls-32.diff ];
-
   NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}";
 
   postInstall = ''
diff --git a/pkgs/applications/networking/irc/weechat/fix-gnutls-32.diff b/pkgs/applications/networking/irc/weechat/fix-gnutls-32.diff
deleted file mode 100644
index 56e357c8f7dc..000000000000
--- a/pkgs/applications/networking/irc/weechat/fix-gnutls-32.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/gui/curses/CMakeLists.txt b/src/gui/curses/CMakeLists.txt
-index 325c611..a8927bc 100644
---- a/src/gui/curses/CMakeLists.txt
-+++ b/src/gui/curses/CMakeLists.txt
-@@ -53,9 +53,7 @@ IF(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
-   ENDIF(HAVE_BACKTRACE)
- ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
- 
--IF(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
--  LIST(APPEND EXTRA_LIBS "pthread")
--ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
-+LIST(APPEND EXTRA_LIBS "pthread")
- 
- IF(ICONV_LIBRARY)
-   LIST(APPEND EXTRA_LIBS ${ICONV_LIBRARY})
-

From 6276f13c0c6eac720b3fac74601959712a776243 Mon Sep 17 00:00:00 2001
From: Matthew Brown <matt@ederoyd.co.uk>
Date: Fri, 15 Aug 2014 11:09:21 +0100
Subject: [PATCH 0067/1453] haskell-protocol-buffers: only mark as broken for
 GHC 7.8.3

---
 pkgs/development/libraries/haskell/protocol-buffers/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/protocol-buffers/default.nix b/pkgs/development/libraries/haskell/protocol-buffers/default.nix
index 8782fbb732de..a2cb0efcf74d 100644
--- a/pkgs/development/libraries/haskell/protocol-buffers/default.nix
+++ b/pkgs/development/libraries/haskell/protocol-buffers/default.nix
@@ -13,6 +13,6 @@ cabal.mkDerivation (self: {
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
+    broken = self.stdenv.lib.versionOlder "7.7" self.ghc.version;
   };
 })

From 3233e569353be190021ee2cde4841dd4ee5130d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 14 Aug 2014 21:04:16 +0200
Subject: [PATCH 0068/1453] add pythonPackages.detox

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 00c9d0e41510..d1a383762fc2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1433,6 +1433,23 @@ rec {
     };
   };
 
+  detox = pythonPackages.buildPythonPackage rec {
+    name = "detox-0.9.3";
+
+    propagatedBuildInputs = with pythonPackages; [ tox py eventlet ];
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/d/detox/detox-0.9.3.tar.gz";
+      md5 = "b52588ec61cd4c2d33e419677a5eac8c";
+    };
+
+    meta = with stdenv.lib; {
+      description = "What is detox?";
+      homepage = http://bitbucket.org/hpk42/detox;
+    };
+  };
+
+
   pbkdf2 = buildPythonPackage rec {
     name = "pbkdf2-1.3";
 

From 91293785e845ce1cc3b5531d61b7dc770251cbdf Mon Sep 17 00:00:00 2001
From: Boris Sukholitko <boriss@gmail.com>
Date: Fri, 15 Aug 2014 14:29:03 +0300
Subject: [PATCH 0069/1453] tigervnc: upgrade to 1.3.1 security release

The source is on github archive now. Therefore switch to fetchurl.
---
 pkgs/tools/admin/tigervnc/default.nix | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix
index 3d5abd074d96..7393336f2be4 100644
--- a/pkgs/tools/admin/tigervnc/default.nix
+++ b/pkgs/tools/admin/tigervnc/default.nix
@@ -4,22 +4,18 @@
 , fixesproto, damageproto, xcmiscproto, bigreqsproto, randrproto, renderproto
 , fontsproto, videoproto, compositeproto, scrnsaverproto, resourceproto
 , libxkbfile, libXfont, libpciaccess, cmake, libjpeg_turbo, libXft, fltk, libXinerama
-, xineramaproto, libXcursor, fetchsvn
+, xineramaproto, libXcursor
 }:
 
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  # Release version = "1.3.0";
-  revision = 5129;
-  version = "r${toString revision}";
+  version = "1.3.1";
   name = "tigervnc-${version}";
 
-  src = fetchsvn {
-    # Release url = "mirror://sourceforge/tigervnc/${version}/${name}.tar.gz";
-    url = "https://tigervnc.svn.sourceforge.net/svnroot/tigervnc/trunk";
-    rev = revision;
-    sha256 = "1qszlqr8z16iqkm05gbs0knj4fxc3bb6gjayky1abmf8pjazi0j8";
+  src = fetchurl {
+    url = "https://github.com/TigerVNC/tigervnc/archive/v${version}.tar.gz";
+    sha256 = "161bhibic777g47lbjgdnvjhkkdzxrzmxz9rw9sim3q0gcbp0vz3";
   };
 
   inherit fontDirectories;

From 371c8dd0bb2a546fd03515b208f0b46e332956ae Mon Sep 17 00:00:00 2001
From: Adam Vogt <vogt.adam@gmail.com>
Date: Tue, 12 Aug 2014 16:15:41 -0400
Subject: [PATCH 0070/1453] update cran packages

---
 pkgs/development/r-modules/cran-packages.nix | 2419 ++++++++++--------
 1 file changed, 1369 insertions(+), 1050 deletions(-)

diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix
index 3a8624c9493a..5d71581c7ae2 100644
--- a/pkgs/development/r-modules/cran-packages.nix
+++ b/pkgs/development/r-modules/cran-packages.nix
@@ -5,6 +5,7 @@
    | library(data.table)
    | library(parallel)
    | cl <- makeCluster(10)
+   | options(repos=structure(c(CRAN="http://cran.rstudio.com/")))
    |
    | nixPrefetch <- function(name, version) {
    |     system(paste0("nix-prefetch-url 2>/dev/null http://cran.rstudio.com/src/contrib/", name, "_", version, ".tar.gz"), intern=TRUE)
@@ -70,23 +71,29 @@ let self = _self // overrides; _self = with self; {
     meta.hydraPlatforms = R.meta.hydraPlatforms;
   };
 
+/* not sure if the above customization is needed, or if the
+   generated RccArmadillo below will work too:
+
+  RcppArmadillo = derive { name="RcppArmadillo"; version="0.4.320.0"; sha256="0cicjn63w9awr9cd5wj09s2rsr83j7rn45cnqlflgx5wmh512jwm"; depends=[Rcpp]; };
+*/
+
   A3 = derive { name="A3"; version="0.9.2"; sha256="01s7znhph2mr3snpscci3y7nbcisa6kg6hy7im3742r6ah0z3jv7"; depends=[xtable pbapply]; };
-  abc = derive { name="abc"; version="1.8"; sha256="042hnhk8npx6rhbsmrdpz4gcczjg5sy665hzvwqvcw8a6836fd1n"; depends=[nnet quantreg MASS]; };
+  abc = derive { name="abc"; version="2.0"; sha256="0fs6hxyk95c61mn3p642xs3ib9wfjii2v9a74pf488iaywc1kd7d"; depends=[nnet quantreg MASS locfit]; };
   abcdeFBA = derive { name="abcdeFBA"; version="0.4"; sha256="1rxjripy8v6bxi25vdfjnbk24zkmf752qbl73cin6nvnqflwxkx4"; depends=[Rglpk rgl corrplot lattice]; };
   ABCExtremes = derive { name="ABCExtremes"; version="1.0"; sha256="032bc9a6cxy4war95n8v4vaax3q96k2wryjbcipi3z55b2l8hdny"; depends=[SpatialExtremes combinat]; };
   ABCoptim = derive { name="ABCoptim"; version="0.13.11"; sha256="1j2pbfl5g9x71gq9f7vg6wznsds8sn8dj3q2h5fhjcv58di3gjhl"; depends=[]; };
   ABCp2 = derive { name="ABCp2"; version="1.1"; sha256="0s0lbwlc8nycm7b8vx0v01f8dmy91r1zqcj9zgrlj7dnpg4cpkml"; depends=[MASS]; };
-  abctools = derive { name="abctools"; version="0.2-2"; sha256="00i1lnnzyry1xj8pgx977j9fp0zmy6nmpr93jb18nq1r5mbagp0n"; depends=[abc abind pls plyr]; };
+  abctools = derive { name="abctools"; version="0.3-2"; sha256="0l5gxrkxiq3ri9iqgy0swc8910c84zkskcr0lc57l3y0dmf90r7q"; depends=[abc abind pls plyr]; };
   abd = derive { name="abd"; version="0.2-6"; sha256="0nlqgjmzpn715kg7pb4zz3rcrf11zd4inj7gam8mr8faf4b5qq2w"; depends=[nlme lattice mosaic]; };
   abf2 = derive { name="abf2"; version="0.7-0"; sha256="0ybl7w8sjfghy8svbxj01q5ldfi05g1r24q9ah1nfca8xzby410n"; depends=[]; };
   abind = derive { name="abind"; version="1.4-0"; sha256="0s7m7wv23z485fc0nb61svcszx0skxl3m8kiilrj506ndazk95hv"; depends=[]; };
   abn = derive { name="abn"; version="0.83"; sha256="12nhk7hb26285pyyppl5289m7y8zvssnriyj84hlnz0ykar66mpi"; depends=[]; };
   abundant = derive { name="abundant"; version="1.0"; sha256="0n2yvq057vq5idi7mynnp15cbsijyyipgbl4p7rqfbbgpk5hy3qb"; depends=[QUIC]; };
-  accelerometry = derive { name="accelerometry"; version="2.2.1"; sha256="1ivwb60vj35radl4vdaqlv2amxrp4rns38x19hhffzw498rj7mxp"; depends=[Rcpp]; };
+  accelerometry = derive { name="accelerometry"; version="2.2.2"; sha256="04gajhx9xha6ks25s9lrn7q4i055bhfx8k7hfrbpwnn3hf5yyfag"; depends=[Rcpp]; };
   AcceptanceSampling = derive { name="AcceptanceSampling"; version="1.0-3"; sha256="1camxmvz8prkvpf3d3rc07bnfphakwdlickqlr4sgzrs4k27rr4f"; depends=[]; };
   ACCLMA = derive { name="ACCLMA"; version="1.0"; sha256="1na27sp18fq12gp6vxgqw1ffsz2yi1d8xvrxbrzx5g1kqxrayy0v"; depends=[]; };
   accrual = derive { name="accrual"; version="1.0"; sha256="0gw418i9nlrm7nkg6d4m2icd4a04a7avqfjj7nidhl6vy4nflg3k"; depends=[fgui SMPracticals]; };
-  accrued = derive { name="accrued"; version="1.0"; sha256="1prrsb7w0pppyc3j3y08pvdgna0h4hmb31sqjll32smxcav6pfvg"; depends=[]; };
+  accrued = derive { name="accrued"; version="1.1"; sha256="1xmrlllh535wdcx6bcwl9hh2ps3ms4rdgal0ziq444rw2phxr48i"; depends=[]; };
   ACD = derive { name="ACD"; version="1.5.3"; sha256="1a67bi3hklq8nlc50r0qnyr4k7m9kpvijy8sqqpm54by5hsysfd6"; depends=[]; };
   Ace = derive { name="Ace"; version="0.0.8"; sha256="0zjg6xwzd2lc555rviaq60rb1fq9vdf8cdazlf3c9m0i1pvz990i"; depends=[]; };
   acepack = derive { name="acepack"; version="1.3-3.3"; sha256="17xfxjflc79y15hnrks3wina5irrggrxb9al9h5q0x1c401ds843"; depends=[]; };
@@ -95,9 +102,10 @@ let self = _self // overrides; _self = with self; {
   acm4r = derive { name="acm4r"; version="1.0"; sha256="1wqzc35i1rshx0zlmas8y4qkkvy6h9r4i4apscjjv1xg2wjflzxa"; depends=[MASS]; };
   ACNE = derive { name="ACNE"; version="0.7.0"; sha256="137xp69adhggz1wxzm5r95vcphrlrqpxsrz0gny59isx4xr28aal"; depends=[aroma_affymetrix MASS R_methodsS3 R_oo R_utils matrixStats R_filesets]; };
   acopula = derive { name="acopula"; version="0.9.2"; sha256="1z8bs4abbfsdxfpbczdrf1ma84bmh7akwx2ki9070zavrhbf00cf"; depends=[]; };
+  acp = derive { name="acp"; version="1.0"; sha256="1i7ryk2scsvck5rg8gglfvqrkzbpn505g7cr7slxykp8wkyhwplm"; depends=[tseries]; };
   aCRM = derive { name="aCRM"; version="0.1.1"; sha256="0kzp568hd9c9a9qgniia5s5gv0q5f89xfvvwpzb197gqhs3x092v"; depends=[dummies randomForest kernelFactory ada]; };
   acs = derive { name="acs"; version="1.2"; sha256="1vw4ghqcz53m3qy7hy2j7nrdinbbqjpwvr1hsvglq31fq7wss3bd"; depends=[stringr plyr XML]; };
-  acss = derive { name="acss"; version="0.1-1"; sha256="16y0g6vwbgsqaafm8l8h49ijs2jmz4595k0h7yndkcn5x0xaj8ig"; depends=[acss_data zoo]; };
+  acss = derive { name="acss"; version="0.2-4"; sha256="0lndsmxrnwhqlw32zc89kpx9ajbg7pa51jck2fgwsrjh0j8gxmm0"; depends=[acss_data zoo]; };
   acss_data = derive { name="acss.data"; version="1.0"; sha256="09kl4179ipr8bq19g89xcdi1xxs397zcx5cvgp6viy8gn687ilgv"; depends=[]; };
   ACTCD = derive { name="ACTCD"; version="1.0-0"; sha256="0zn8f6l5vmn4w1lqjnpcxvfbr2fhwbhdjx4144h3bk71bk9raavl"; depends=[R_methodsS3]; };
   Actigraphy = derive { name="Actigraphy"; version="1.2"; sha256="02xxmzjqym46q0fzddmy29i8la9knrna3b46y8849nmbpqvmp3qn"; depends=[fda lattice SDMTools]; };
@@ -108,20 +116,20 @@ let self = _self // overrides; _self = with self; {
   adagio = derive { name="adagio"; version="0.5.9"; sha256="1yp9w557advb7dzrdqwkffpdmhn6mk4879lrrjd0d6kv89fwz5yr"; depends=[]; };
   AdapEnetClass = derive { name="AdapEnetClass"; version="1.0"; sha256="0m8wg515djdpkq5lv8nkcny9s2iq9ym092jd99nysazqw0qy6a8r"; depends=[imputeYn glmnet lars]; };
   AdaptFit = derive { name="AdaptFit"; version="0.2-2"; sha256="124lj1sq5cbp35z4ybkc7ci3fi6pgf8pc5k9mpqmyb6dj870q836"; depends=[SemiPar MASS nlme cluster]; };
-  AdaptFitOS = derive { name="AdaptFitOS"; version="0.50"; sha256="034qmx4jd5j7al9jnnc4whz9a5wa4hc2fkaci50ndm55agpk1h8w"; depends=[SemiPar nlme MASS mgcv]; };
+  AdaptFitOS = derive { name="AdaptFitOS"; version="0.54"; sha256="0h9jfq9mk5wd6v6an40l3sk2adn6fcaks22bi8d9s7zr2ldpzrjq"; depends=[SemiPar nlme MASS mgcv]; };
   AdaptiveSparsity = derive { name="AdaptiveSparsity"; version="1.4"; sha256="1az7isvalf3kmdiycrfl6s9k9xqk22k1mc6rh8v0jmcz402qyq8z"; depends=[Rcpp]; };
-  adaptivetau = derive { name="adaptivetau"; version="2.0"; sha256="0hp09wna5aqz9xq0nyymk91y4acrqzlg4isx4vpcfy5dnhmazgz6"; depends=[]; };
+  adaptivetau = derive { name="adaptivetau"; version="2.1"; sha256="0q8i9gxybv1xyyxvrppr00jmhg80n0iphwlsqjdp34dd0y8ksx4m"; depends=[]; };
   adaptMCMC = derive { name="adaptMCMC"; version="1.1"; sha256="1y1qxn3qm59nyy9ld5x30p452yam7b2fyl236b14xvpm8g3xx1fa"; depends=[coda Matrix]; };
   adaptsmoFMRI = derive { name="adaptsmoFMRI"; version="1.1"; sha256="1h79gh1bd6s2xhwf4whh72wf2cz4di2p8dnlf6192mfg108qc6nw"; depends=[Matrix coda mvtnorm MCMCpack spatstat]; };
   adaptTest = derive { name="adaptTest"; version="1.0"; sha256="08d7a5dlzhaj236jvaw3c91008l66vf5i4k5anhcs32a3j8yh2iv"; depends=[lattice]; };
   additivityTests = derive { name="additivityTests"; version="1.1-2"; sha256="0ijk91whhsb7nm1ax9wpfw9qgxfb1bvg2cq939m81gvk09kzrvgz"; depends=[]; };
   ade4 = derive { name="ade4"; version="1.6-2"; sha256="0h136nhfqrapwscm3c7frlcynrfxb9x8gmd1s44gaa8m25rjgdqf"; depends=[]; };
   ade4TkGUI = derive { name="ade4TkGUI"; version="0.2-6"; sha256="010ggsxcmljh0cdba4lcfnsd9r49pwqs6kbw88syfn2qv65hh5kq"; depends=[ade4]; };
-  adegenet = derive { name="adegenet"; version="1.4-1"; sha256="0xfyck7p6261vv2k21z123q13v0bw10rs9x9v3afx5vf6zxnvs4f"; depends=[ade4 MASS igraph ape shiny ggplot2]; };
+  adegenet = derive { name="adegenet"; version="1.4-2"; sha256="13fglxy40rnwi5hsmmvwlfcvfn8dybxyy3k5qhpml8jgpbl3fsdb"; depends=[ade4 MASS igraph ape shiny ggplot2]; };
   adehabitat = derive { name="adehabitat"; version="1.8.14"; sha256="048jp9408x80akfnxqpyhhlzl2f89axsc90vr8cgqkimlg6h6xjh"; depends=[ade4 tkrplot shapefiles sp]; };
   adehabitatHR = derive { name="adehabitatHR"; version="0.4.11"; sha256="1llpmpfax9846v3s2finyq9x97hyi87148jx83phzjl7daag3qn1"; depends=[sp deldir ade4 adehabitatMA adehabitatLT]; };
   adehabitatHS = derive { name="adehabitatHS"; version="0.3.9"; sha256="0jv7470z1m219q5paw8cglx3d5l99iagkpm24v6q0xgdffvcq94l"; depends=[sp ade4 adehabitatMA adehabitatHR]; };
-  adehabitatLT = derive { name="adehabitatLT"; version="0.3.15"; sha256="046mzhn2h1lnr0ph4r5w7bw6sdndyjxjr64yknjbilg80332njlx"; depends=[sp ade4 adehabitatMA CircStats]; };
+  adehabitatLT = derive { name="adehabitatLT"; version="0.3.16"; sha256="1rav2q1n1ahrj2iik93rqc52c1gcxha5idrh7rfds0qb15jpmsvh"; depends=[sp ade4 adehabitatMA CircStats]; };
   adehabitatMA = derive { name="adehabitatMA"; version="0.3.8"; sha256="1j3ngry7qyhl4p5m02bgdynixb0v9hd5nbjs6ndfqw23layh8yig"; depends=[sp]; };
   adephylo = derive { name="adephylo"; version="1.1-6"; sha256="1sk639gmk3cs711xn68mx18r28kjd1pychcg89qlki03y1hnxg7j"; depends=[ade4 phylobase ape adegenet]; };
   AdequacyModel = derive { name="AdequacyModel"; version="1.0.8"; sha256="1bpb6lwgkh5g82h4yaf5dh2jbl6f0vz36k22538rhb3kdld6w0i3"; depends=[]; };
@@ -132,39 +140,42 @@ let self = _self // overrides; _self = with self; {
   ADM3 = derive { name="ADM3"; version="1.3"; sha256="1hg9wjdhckilqd13dr4cim4j6jsh2sdwm18i3pfmfdj8cyswm3h0"; depends=[]; };
   AdMit = derive { name="AdMit"; version="2.0.1"; sha256="0bqzq2pf5449qyr8ff5d3sq0lbsph29ppv6zzf1rbjz06sc5d6ff"; depends=[mvtnorm]; };
   ads = derive { name="ads"; version="1.5-2.1"; sha256="1jwgk48qypg36v53kj7wy5rcz059p1qg8awm3nf7xngrb2zff6h3"; depends=[ade4 spatstat]; };
+  aemo = derive { name="aemo"; version="0.1.0"; sha256="1iik0rrqkkx9n1qb1pvq5iwxqmvs6vnx8z80hdzb5vqq0lvi1bsx"; depends=[dplyr stringr assertthat lubridate]; };
   AER = derive { name="AER"; version="1.2-2"; sha256="0ny9khzqxzx4npaqmknhpi3aldz11ipg71zw4skxphclamlsgp86"; depends=[car lmtest sandwich survival zoo Formula]; };
-  afex = derive { name="afex"; version="0.9-109"; sha256="01wwlab77jaalr6a10bp8rklqk54jrzxacxlwpp9n6gf6pqzdpmv"; depends=[car lme4 pbkrtest reshape2 stringr coin Matrix]; };
+  afex = derive { name="afex"; version="0.10-113"; sha256="19fr444dy50d6psfc84qqkc04fp792jb7nxrv5b29q8j1yznkqnq"; depends=[car lme4 pbkrtest reshape2 stringr coin Matrix]; };
   AFLPsim = derive { name="AFLPsim"; version="0.3-3"; sha256="1vknmd98v65118c093gqpfckcggnk4c8rn6bblsaclwmx0jdi78s"; depends=[adegenet introgress]; };
   aftgee = derive { name="aftgee"; version="0.4-3"; sha256="0r1fq3n28hfkdih6a2nyz5vy832fsxxs0fr2zlml6cikpbay8zqx"; depends=[MASS BB survival geepack]; };
   AGD = derive { name="AGD"; version="0.30"; sha256="175hsii3g8vx5ms552wnh1hcn3p6hgfggv1zi5gpwlsc0i875iag"; depends=[gamlss]; };
   agop = derive { name="agop"; version="0.1-3"; sha256="02yc7n8avg69750cnc1prvp2fnz964sfc7vggxfyyqrig9q5ppyq"; depends=[Matrix igraph]; };
-  agRee = derive { name="agRee"; version="0.2-2"; sha256="0d4cfmqqxjdqidiwrrs83386qqxz80px3v9ikfv9s6xq2v7zz5ys"; depends=[miscF]; };
+  agRee = derive { name="agRee"; version="0.3-1"; sha256="1gqbhv44z1r9m54fmrg0frnzsgsp13v5ppmzpv28frz9d8x7sxx6"; depends=[miscF lme4 R2jags]; };
   Agreement = derive { name="Agreement"; version="0.8-1"; sha256="1g29rxr8xsr0dh2r6c6j2bqs0q6snz9wz0hrnb92cxj27ili55yq"; depends=[R2HTML]; };
-  agricolae = derive { name="agricolae"; version="1.1-8"; sha256="0a70ngilbnmhlhd8a6s7r41bamhcjxzjzpmw910r3y6s6338hrbf"; depends=[]; };
-  agridat = derive { name="agridat"; version="1.8"; sha256="12cw7hp7bjcw0zy4gbihc8w82ak36548jdk4i0b2dck6sl78004g"; depends=[lattice reshape2]; };
+  agricolae = derive { name="agricolae"; version="1.2-0"; sha256="1r9x6skkim25qp50xzg3jmv8hibpnr5kig4dqaycc6xki49pps50"; depends=[]; };
+  agridat = derive { name="agridat"; version="1.9"; sha256="0ip8ln0hxx2ax21hhrxnksvkzw6mfwhvxfgj7xph5insly3x9h88"; depends=[lattice reshape2]; };
   agrmt = derive { name="agrmt"; version="1.31"; sha256="0s0av1fg9aswkyj1vzr6fng53r5cnkfb3x0n46zrkb1fgb5fwdgm"; depends=[]; };
   AGSDest = derive { name="AGSDest"; version="2.1"; sha256="1l36x3sjb0732aic2y4yrvx64phii1xjfzr4nc3x9b2crr988n0g"; depends=[ldbounds]; };
+  agsemisc = derive { name="agsemisc"; version="1.3-1"; sha256="1905q35jgjhghlawql43yh296kbpysp927x3hj750yshz5zayzyr"; depends=[lattice MASS]; };
   ahaz = derive { name="ahaz"; version="1.14"; sha256="1z7w5rxd5cya7kxhgxqvn72k87y33ginxra9g7j9wrfs5jgx6kvx"; depends=[survival Matrix]; };
-  AICcmodavg = derive { name="AICcmodavg"; version="1.35"; sha256="1hxldkvyvfk10a50vw26xwsbq3wl5r92abqlpdp7vsla4ff72x39"; depends=[]; };
+  AICcmodavg = derive { name="AICcmodavg"; version="2.00"; sha256="1k156yziqd376mkcyz94c76a3rpmf8afgxdy9rn3dgalxfkb0rx6"; depends=[]; };
   AID = derive { name="AID"; version="1.4"; sha256="1wj2jmqla0b2y9hrvl5i69bncdx1xjdd7if69j6dy1dnxv6clx1z"; depends=[MASS tseries nortest]; };
   aidar = derive { name="aidar"; version="1.0.0"; sha256="01vs14bz4k504q5lx65b60kyi7hgvjdmib8igiipjmg4snwh8hdk"; depends=[XML]; };
   AIM = derive { name="AIM"; version="1.01"; sha256="11lkfilxk265a7jkc1wq5xlgxa56xhg302f1q9xb7gmjnzdigb21"; depends=[survival survival]; };
   akima = derive { name="akima"; version="0.5-11"; sha256="17n7iiwybwanvm5mflb1f2xx1gnw1pcmfsnl1f82afixpalbs0gh"; depends=[]; };
-  akmeans = derive { name="akmeans"; version="1.0"; sha256="1z2a4k419qq4vkl0zx7hnn5vka6vwh9k6ir89ldvwyi849b1nnxv"; depends=[]; };
+  akmeans = derive { name="akmeans"; version="1.1"; sha256="1nqbxbx583n0h2zmpy002rlmr6j86j6bg76xj5c69brrh59dpyw1"; depends=[]; };
   alabama = derive { name="alabama"; version="2011.9-1"; sha256="05c1a8707akwy39n2gjg3ahdp9xdkl18a32wdchw60f0h4ixqfdi"; depends=[numDeriv]; };
+  ALDqr = derive { name="ALDqr"; version="0.5"; sha256="0294d6cjfl5m63jhrv4rbh7npwrbmmw5101jz5bbwihhj94qcxp9"; depends=[HyperbolicDist]; };
   aLFQ = derive { name="aLFQ"; version="1.3.1"; sha256="0i351xa5x3sn0li5qway0wjhifvf9jfjb7hxk5vw13gzn0cq9sd5"; depends=[data_table plyr caret seqinr]; };
   AlgDesign = derive { name="AlgDesign"; version="1.1-7.2"; sha256="1c0hxg02dzjnns6awwsfaa5sc00x4zkc5jmsdz5vssjkliviwm9k"; depends=[]; };
-  algstat = derive { name="algstat"; version="0.0.0"; sha256="0g1bylrwfigh2wb005iais5blrz95asq9dizp1jbqgiyxqfbd1g4"; depends=[mpoly stringr reshape2 Rcpp]; };
   ALKr = derive { name="ALKr"; version="0.5.3.1"; sha256="09df3vx2q0sn8fwz2cc9lckzwrf2hgbglzyn376d6nkrm6gq792a"; depends=[MASS Rcpp]; };
   allan = derive { name="allan"; version="1.01"; sha256="02bv9d5ywbq67achfjifb3i7iiaaxa8r9x3qvpri2jl1cxnlf27m"; depends=[biglm]; };
   allanvar = derive { name="allanvar"; version="1.0"; sha256="0wpywdr15gb49m9kxrpjfsxlxrm4hwm46x42k8dgc6sihfsqbm22"; depends=[gplots]; };
+  alleHap = derive { name="alleHap"; version="0.7.2"; sha256="1x10grrv732a0iidr2c96vbl46553njhvvlq249jxn3y11lfq2gv"; depends=[gtools]; };
   allelematch = derive { name="allelematch"; version="2.03"; sha256="1dmalyljsmf7njr6fj8bcjii13swvh89dj3r1mp2xxf1r0p6jry8"; depends=[dynamicTreeCut]; };
   AlleleRetain = derive { name="AlleleRetain"; version="1.3.1"; sha256="1k2iwns1wk5n02cii6p9prgdb6asys3vwiq5dq2i26fk2xr6j4gq"; depends=[]; };
   allelic = derive { name="allelic"; version="0.1"; sha256="0xs4kd3vqb5ph8kqc3lcqgirrdkz8b627pvnczvci2g0sr3cl18j"; depends=[]; };
   AllPossibleSpellings = derive { name="AllPossibleSpellings"; version="1.1"; sha256="0ksfm2pfjka3yjgcd257v7sns1niaylsfxvhhh2jwdi016cpdw10"; depends=[]; };
-  alm = derive { name="alm"; version="0.1.6"; sha256="148sbp87dz963xq1lzm1hrg0201pba5fqfk3wh2v7zqz4qfji1i8"; depends=[ggplot2 RCurl plyr stringr reshape reshape2 httr RJSONIO lubridate]; };
+  alm = derive { name="alm"; version="0.1.9"; sha256="13i5f9b8bz6chdczlwfd3ka3mvn3i87jgpr2b6df03yc1vd9z25v"; depends=[ggplot2 RCurl plyr stringr reshape reshape2 httr RJSONIO lubridate]; };
   alphahull = derive { name="alphahull"; version="1.0"; sha256="0k3n9l4vbvpmdb4m37y1ynsiv27l8b5fmm6l35sazlfbbinhzwc1"; depends=[tripack sgeostat splancs]; };
-  alphashape3d = derive { name="alphashape3d"; version="1.0-4"; sha256="029j5zwg34hqp21d7w3k89i10sslrs7xiwckk8wc9cikvr1fr79h"; depends=[geometry rgl]; };
+  alphashape3d = derive { name="alphashape3d"; version="1.1"; sha256="1hfxvzqgirc587vxyggxdqii90nvypzi3wddvd2zdw2h95v9kfyg"; depends=[geometry rgl]; };
   alr3 = derive { name="alr3"; version="2.0.5"; sha256="0zrrsv2kjq3cky3bhk6gp32p1qpr1i5k2lx7c1w08bql0nb1x740"; depends=[car]; };
   alr4 = derive { name="alr4"; version="1.0.3"; sha256="1m73b626fljfs96wvv1v627v48qilq5dyi5clqn8b4a5lyjjs2mg"; depends=[car effects]; };
   ALS = derive { name="ALS"; version="0.0.5"; sha256="1ryviknpf7c0v20bmc40khhmx51b83hbh9q9iwz9d694by51xryc"; depends=[nnls Iso]; };
@@ -193,60 +204,64 @@ let self = _self // overrides; _self = with self; {
   anesrake = derive { name="anesrake"; version="0.70"; sha256="17127rmjfrdwnr2m6205cci3b0kd9girp82qranxwac4mgb7p7ld"; depends=[Hmisc]; };
   Animal = derive { name="Animal"; version="1.04"; sha256="0hahvq1x81s0qmr58jv6q96jnc8lzn4ycljd8adhpgsx3wn8s7mq"; depends=[]; };
   animalTrack = derive { name="animalTrack"; version="1.0.0"; sha256="0jlvfflpaq64s48sblzh1n1vx8g3870iss97whigri29s6hn79ry"; depends=[rgl]; };
-  animation = derive { name="animation"; version="2.2"; sha256="0dg754hrbba4k69pd1k85ailiyzm7cc59dcjs3w6gbgy5l605qqa"; depends=[MASS]; };
-  ANN = derive { name="ANN"; version="0.1.4"; sha256="06cgbjybp731bxsv0y3fm3dsl0lzlgm6rqjmni1r3bjp60pjxdxl"; depends=[]; };
+  animation = derive { name="animation"; version="2.3"; sha256="1hqgkaxmyyfrx7cfzv00010r9l2n8gxm35jd41p3kc208mhd7ssp"; depends=[]; };
   AnnotLists = derive { name="AnnotLists"; version="1.2"; sha256="1g2khb2ggniwg2zcjamsm3bxyrl2zabvk540b5vyy9am9k83m1g9"; depends=[]; };
   anoint = derive { name="anoint"; version="1.3"; sha256="0hwvwd6ghxhkfymf124igski8l98k29pj3ahi5mflm8gv0qan92g"; depends=[survival glmnet MASS]; };
   anominate = derive { name="anominate"; version="0.4"; sha256="00cqwlka33aqr3jks1fsxizwdlrfmv5w5bpnkzknhgz70l60h38n"; depends=[wnominate oc pscl MCMCpack]; };
-  ant = derive { name="ant"; version="0.0-10"; sha256="00fmjkkp4ml8kgx90918l36amzr29a9cw756k4z64dd4gdv9s25p"; depends=[rJava]; };
   AnthropMMD = derive { name="AnthropMMD"; version="0.9.9"; sha256="10wn0fkcli5yz3fhngsz8sg1mfllqkvjrpjggd9qynay2zrpiw1n"; depends=[tcltk2]; };
   Anthropometry = derive { name="Anthropometry"; version="1.0"; sha256="1cvq06hyxcgg95n21bi22csdgc6l6av78bvz7r7qdsl7wffddk0w"; depends=[shapes rgl archetypes nnls depth FNN ICGE cluster]; };
-  antitrust = derive { name="antitrust"; version="0.93"; sha256="1ria3ybar84gclqpc5hmigl84m59ajkb75rbmjr5fs8244j6szif"; depends=[MASS evd BB numDeriv ggplot2]; };
+  antitrust = derive { name="antitrust"; version="0.94"; sha256="1k768lmx5vv069bd9fzly1205rxr9mkqi1p8jjx67kwmyhhw5sd2"; depends=[MASS evd BB numDeriv ggplot2]; };
   AntWeb = derive { name="AntWeb"; version="0.6.1"; sha256="1m4r7zx6mmxwdf1ldwmqad2lzc9kw150l0b3z2994nvcx36r4cj4"; depends=[rjson plyr assertthat httr leafletR]; };
   aod = derive { name="aod"; version="1.3"; sha256="1a6xs5d5289w69xd2salsxwikjjhjzvsnplqrq78b1sr6kzfyxz3"; depends=[]; };
   aods3 = derive { name="aods3"; version="0.4-1"; sha256="074c16wmgd1vc2yvwx1y84bg55hvmm5yi8zgpwh51jcsbqlhbpgn"; depends=[lme4 boot]; };
   AOfamilies = derive { name="AOfamilies"; version="1.01"; sha256="0v3b83k12lsrdcrkjl2ff38d0g8sbrnm5pmm9xphyrk3lfgap76k"; depends=[lqmm quantreg]; };
-  aoristic = derive { name="aoristic"; version="0.4"; sha256="114vhh5sxa7m900w1l0xzqp8n6kfqbvhq0fynlxdll6dbh9gg3gm"; depends=[ggplot2 spatstat GISTools lubridate classInt reshape2]; };
-  apcluster = derive { name="apcluster"; version="1.3.3"; sha256="0ly4crmkg0v2dilk54ipbh15gmqchddbdl40rjlzs31vcn3clwkp"; depends=[Rcpp]; };
-  ape = derive { name="ape"; version="3.1-1"; sha256="0vywi5a8hmpc6wphzxvnlln1sffsbkcrwxw26mcagaq4hzc8fbr0"; depends=[nlme lattice]; };
+  aoristic = derive { name="aoristic"; version="0.5"; sha256="0hvq6qf5ib7x7c7jg9qbsglhazvbr5rkhfi1r43h4i2fhdvymhrn"; depends=[ggplot2 spatstat GISTools lubridate classInt reshape2 rgdal plotKML]; };
+  apcluster = derive { name="apcluster"; version="1.3.5"; sha256="1hckvir43s0jshn9kiwqmpsnav04lxv060l6xlf60a8yk5zf1cqs"; depends=[Rcpp]; };
+  ape = derive { name="ape"; version="3.1-4"; sha256="04vkzbqjy89vs2n421ji2r4p60x5frjnlgpjp42k9n5x295hb89s"; depends=[nlme lattice]; };
   aplpack = derive { name="aplpack"; version="1.2.9"; sha256="024q0vsimhr3cj4fz2x10hf7mm89psn8f04j013qas7wdsixkswk"; depends=[]; };
   apmsWAPP = derive { name="apmsWAPP"; version="1.0"; sha256="1azgif06dsbadwlvv9nqs8vwixp6balrrbpj62khzmv1jvqr4072"; depends=[seqinr gtools]; };
   appell = derive { name="appell"; version="0.0-4"; sha256="0g7pzhxqgscnyf07xycbrpyimp1z1hljgcr3nqigpx09w7zi5wlw"; depends=[]; };
   apple = derive { name="apple"; version="0.3"; sha256="194z2f6hwdjjxdkjwlmfhpfp26p9yp3gparklhdbb6zlb4a9nnhz"; depends=[MASS]; };
-  AppliedPredictiveModeling = derive { name="AppliedPredictiveModeling"; version="1.1-5"; sha256="1kcgr1kf4fjhr2skmjp4cdky5093xwm17z46zywimksc94j8aa83"; depends=[CORElearn MASS plyr reshape2]; };
+  AppliedPredictiveModeling = derive { name="AppliedPredictiveModeling"; version="1.1-6"; sha256="004d2k3mhl45inb7kx1ph8xc8h9bgm7f7l3prmvqrl5792400cn4"; depends=[CORElearn MASS plyr reshape2]; };
   approximator = derive { name="approximator"; version="1.2-6"; sha256="165qvx5946wkv1qsgbmjhmwvik7m23r1vbpnp7claylflgj1ycnm"; depends=[emulator]; };
-  aprof = derive { name="aprof"; version="0.1"; sha256="1lqbcm9b4hc03nrjg5szpyl7dgxx5xlrx65x9hnj1f6b6g0vvv18"; depends=[]; };
+  aprof = derive { name="aprof"; version="0.2.1"; sha256="0lsni1p9gpfgsbqs1lrp4bs6ckvp02hny0k1v6q6rj2zp6silwa2"; depends=[]; };
   APSIMBatch = derive { name="APSIMBatch"; version="0.1.0.2374"; sha256="0j44ijq1v1k60lka9nmw8m1jfjw7pidny9bvswqy5v82gzmwl29d"; depends=[]; };
+  apsimr = derive { name="apsimr"; version="0.1"; sha256="03j1g16drch5xkxb86czxmihs9a96f0v2kxjp73k7vig9md625dy"; depends=[ggplot2 XML lubridate reshape2]; };
   apsrtable = derive { name="apsrtable"; version="0.8-8"; sha256="1qmm89npjgqij0bh6p393wywl837lfsshp2mv9b5izh1sg2qfwvw"; depends=[]; };
-  apt = derive { name="apt"; version="2.0"; sha256="1myhda1ickxiw6abf8ci9ca976daldcm5i0yb0jfl5zrxjanx552"; depends=[car erer urca]; };
+  apt = derive { name="apt"; version="2.2"; sha256="0y4wv8pxi1n98ji0yy1jy0lhdwjb2b95h10mpj4vqf24dlx61z10"; depends=[erer gWidgets car urca copula]; };
   apTreeshape = derive { name="apTreeshape"; version="1.4-5"; sha256="0mvnjchhfbpbnrgnplb6qxa7r2kkvw29gqiprwggkf553wi6zl48"; depends=[ape quantreg]; };
   aqfig = derive { name="aqfig"; version="0.8"; sha256="0ha0jb5ag3zx6v7c63lsm81snslzb8y8g565mxjmf7vxpcmzzqsi"; depends=[geoR]; };
   aqp = derive { name="aqp"; version="1.7"; sha256="034lxhssn98rkcvwyycqcpppabm4xi89kr19d8ydj74dfgbhyx1z"; depends=[plyr reshape lattice cluster sp Hmisc stringr scales plotrix RColorBrewer]; };
   aqr = derive { name="aqr"; version="0.4"; sha256="04frgil3nbxsww66r9x0c6f308pzqr1970prp20bdv9qm3ym5axw"; depends=[xts RCurl]; };
   AquaEnv = derive { name="AquaEnv"; version="1.0-3"; sha256="1hkygw09w70im9f6l6q5yxk86mdl5pkczqfqrwc4wl1yhz7z1gjb"; depends=[minpack_lm deSolve]; };
+  AR1seg = derive { name="AR1seg"; version="1.0"; sha256="0v9adx5wj9r4jwl3bqqmj0byiqfp585jz013qfqrq601wj8v4zi3"; depends=[Segmentor3IsBack]; };
   ARAMIS = derive { name="ARAMIS"; version="1.0.1"; sha256="12bsn5lpb9cv0py1ymbqhbnjrpisf09yixpnqbazsmrz7lrin079"; depends=[MASS LearnBayes]; };
+  archdata = derive { name="archdata"; version="0.1"; sha256="1k7cpqwgvkwfz25a9db0c8g6ii6xsbhkj3c9alghhaafs7x8n47w"; depends=[]; };
   archetypes = derive { name="archetypes"; version="2.2-0"; sha256="1djzlnl1pjb0ndgpfj905kf9kpgf9yizrcvh4i1p6f043qiy0axf"; depends=[modeltools nnls]; };
   ArDec = derive { name="ArDec"; version="2.0"; sha256="14niggcq7xlvpdhxhy8j870gb11cpk4rwn9gwsfmcfvh49g58i80"; depends=[]; };
   arf3DS4 = derive { name="arf3DS4"; version="2.5-10"; sha256="12cbrk57c9m7fj1x7nfmcj1vp28wj0wymsjdz8ylxhm3jblbgmxc"; depends=[corpcor]; };
-  arfima = derive { name="arfima"; version="1.2-5"; sha256="0bjhb5swhw4knmsp7fimbcc68bws60saij07p3hj2asjbsqw8n16"; depends=[ltsa]; };
+  arfima = derive { name="arfima"; version="1.2-6"; sha256="1xdcvfaaza3bn5p5yhafqh67018z260aqp9gwwnw1nrrmz7fsh2h"; depends=[ltsa]; };
   argosfilter = derive { name="argosfilter"; version="0.63"; sha256="0rrc2f28hla0azw90a5gk3zj72vxhm1b6yy8ani7r78yyfhgm9ig"; depends=[]; };
   argparse = derive { name="argparse"; version="1.0.1"; sha256="03p8dpwc26xz01lfbnmckcx6wzky43dyq71085b0anzsavgx0786"; depends=[proto findpython getopt rjson]; };
-  arm = derive { name="arm"; version="1.7-03"; sha256="0v92ilikbk5viy544axqapb2q88n21qilfg7hxc0ag87n0xyxfaq"; depends=[MASS Matrix lme4 abind coda nlme]; };
+  argparser = derive { name="argparser"; version="0.1"; sha256="0x4wm8hjzb779pp39v8q210npg7kzh9m8wwqmd17aaqaa3l2al9f"; depends=[]; };
+  arm = derive { name="arm"; version="1.7-05"; sha256="1cpgbhp7pz1m9r40ia08hi2mdl87ar9m1h72cldvajq0imlckcrl"; depends=[MASS Matrix lme4 abind coda nlme]; };
+  arnie = derive { name="arnie"; version="0.1.2"; sha256="14xkgyfn9zvkbgram15w7qzqc5pl1a8ig66cif7a79najrgd914r"; depends=[]; };
   aroma_affymetrix = derive { name="aroma.affymetrix"; version="2.12.0"; sha256="1r3ywi97xqvk6dif7kkc3gqapiydd2sbq0ibxs1qf6s2v236d71r"; depends=[R_utils aroma_core R_methodsS3 R_oo R_cache R_filesets aroma_apd MASS matrixStats]; };
   aroma_apd = derive { name="aroma.apd"; version="0.5.0"; sha256="1pi4k7psrc120r8mn352vg60mjvbnm1f56dm9svfxfyl0qhcfd00"; depends=[R_methodsS3 R_oo R_utils R_huge]; };
   aroma_cn = derive { name="aroma.cn"; version="1.5.0"; sha256="1aih11r3gs969ci5gs7x7z5pia51y75iy559y23cz40q2qsq4ikc"; depends=[R_utils aroma_core R_methodsS3 R_oo R_filesets R_cache matrixStats PSCBS]; };
   aroma_core = derive { name="aroma.core"; version="2.12.1"; sha256="1rg7m9z2j9hn0adj407amyabyh6jhpgip51zd8fb8rplzgbkrm7s"; depends=[R_utils R_filesets R_devices R_methodsS3 R_oo R_cache R_rsp matrixStats RColorBrewer PSCBS]; };
+  ARPobservation = derive { name="ARPobservation"; version="1.0"; sha256="0m9sr0pgwzndia2286fmhlw7xsyn3pvy0044xlp5sw3i3gqhv39f"; depends=[]; };
   aRpsDCA = derive { name="aRpsDCA"; version="1.0.0"; sha256="035888scbl5333sz25f9n6xh1zis7l2752p4nhsbs2g44q38l9h6"; depends=[]; };
   ArrayBin = derive { name="ArrayBin"; version="0.2"; sha256="0jlhcv2d7pmqi32w71nz063ri1yj4i4isr3msnw7ckzvi9r42jwm"; depends=[]; };
   arrayhelpers = derive { name="arrayhelpers"; version="0.76-20120816"; sha256="1q80dykcbqbcigv2f9xg1brfm3835i0zvs0810q6kh682a3hpqbi"; depends=[]; };
   ars = derive { name="ars"; version="0.4"; sha256="0ynciw8n2jpqi40gsrj189419vgr1lgs9wridh09nj7n451b4kvg"; depends=[]; };
   ARTIVA = derive { name="ARTIVA"; version="1.2.2"; sha256="1k51yfh2xxchbiq9b64llc3sp330kh30lai75fgnbycwynkpsk5m"; depends=[MASS igraph gplots]; };
   ARTP = derive { name="ARTP"; version="2.0.4"; sha256="1f6ay9lyaqsc33b0larb8v6imp5adaycya84wif2sg32rv4gx3yl"; depends=[]; };
-  arules = derive { name="arules"; version="1.1-2"; sha256="01dp7mhqff9kqz281dz37in040gxr6wzyxmz4r6kmgww7wzi6j80"; depends=[Matrix]; };
-  arulesNBMiner = derive { name="arulesNBMiner"; version="0.1-2"; sha256="1wsl8g9hi1pv4wm4345p8ch6sn8900s6ak8hnzb9ini0djq6jzyw"; depends=[arules rJava]; };
+  arules = derive { name="arules"; version="1.1-4"; sha256="0i2s706rm6bbzqxb0vfqq14m9zr4djyjjkvsqgrqbsvwgp8i29zk"; depends=[Matrix]; };
+  arulesNBMiner = derive { name="arulesNBMiner"; version="0.1-4"; sha256="05vj7pzzh84xr6d0m16dhzr7bw50hkiyq99vl46zinak648my338"; depends=[arules rJava]; };
   arulesSequences = derive { name="arulesSequences"; version="0.2-6"; sha256="1fvph6c8dy3hj0h63h85bzzzka8dx0cc0lcncz9svyahy1j4q3z0"; depends=[arules]; };
   arulesViz = derive { name="arulesViz"; version="0.1-9"; sha256="1s1hsf64fg32r3p1h8bvzbpr7a28szdh9hs7ck9qykh2s93xh12z"; depends=[arules scatterplot3d vcd seriation igraph]; };
-  asbio = derive { name="asbio"; version="1.0"; sha256="198fkj2wlw0dpqlc6fbycxfkmgj8wkbvfvk2pxvliqy83dkh8d7l"; depends=[scatterplot3d pixmap tkrplot plotrix mvtnorm deSolve lattice]; };
+  asbio = derive { name="asbio"; version="1.0-5"; sha256="1wvg8j9hlla9z9di4qinmkn9d8wmindiqxa3jgdqx6srlwdx1b09"; depends=[scatterplot3d pixmap tkrplot plotrix mvtnorm deSolve lattice]; };
   ascii = derive { name="ascii"; version="2.1"; sha256="19dfbp7k4bjxjn8wdzhbmz7g3za6gn8vcnd5qkm4dz7gg1fg7b8p"; depends=[]; };
   ascrda = derive { name="ascrda"; version="1.15"; sha256="17anzlhcjmrk13s5gs752rsc735y5wvba6r3w1nbv0cnkpnyk8i7"; depends=[class nnet rda MASS sfsmisc e1071 pamr]; };
   asd = derive { name="asd"; version="2.0"; sha256="1nnsbh6g0bhvhp6644zf2l6frr3qnls0s7y7r0g211b5zagq20z3"; depends=[mvtnorm]; };
@@ -255,12 +270,14 @@ let self = _self // overrides; _self = with self; {
   aspect = derive { name="aspect"; version="1.0-2"; sha256="1p06vglsj2z0qal3sacjfm6cr9vb3jidk1c1rsmwy4cfv7dzh58n"; depends=[]; };
   assertive = derive { name="assertive"; version="0.1-8"; sha256="0j1phpx2w34rdjaar3fqhp0rsvdlidvw2irfazbh9955mdn2cwq1"; depends=[]; };
   assertthat = derive { name="assertthat"; version="0.1"; sha256="0dwsqajyglfscqilj843qfqn1ndbqpswa7b4l1d633qjk9d68qqk"; depends=[]; };
-  AssetPricing = derive { name="AssetPricing"; version="0.1-3"; sha256="0043z4453njxm0ziwxbxsxf1d1zanwmaf9flajawm4f96c0iydp2"; depends=[polynom deSolve]; };
+  AssetPricing = derive { name="AssetPricing"; version="1.0-0"; sha256="12v8hmmknkp472x406zgzwjp7x8sc90byc3s3dvmwd5qhryxkkix"; depends=[polynom deSolve]; };
   AssotesteR = derive { name="AssotesteR"; version="0.1-10"; sha256="0aysilg79vprcyjirqz6c5s1ry1ia92xik3l38qrw1gf3vfli9cw"; depends=[mvtnorm]; };
-  aster = derive { name="aster"; version="0.8-27"; sha256="1bn83n41fa58xsv7p69lq06fr07x3w317gfcg4icgj4wyhzgj5c4"; depends=[trust]; };
+  aster = derive { name="aster"; version="0.8-30"; sha256="0vdlimkkmd9ar5v3xrbi9gshvj980l7641brd7cqs78sqf0v71fn"; depends=[trust]; };
   aster2 = derive { name="aster2"; version="0.1"; sha256="1qbh1l2cnhvdfxaw1bv8cpj96nv03g155b1xh1vdigniwc04mssw"; depends=[]; };
   astro = derive { name="astro"; version="1.1"; sha256="15xxa3ynlgk6dhlb1z9lwvf9jqvfw9ghkl7rjbdcrvc52b92nwd3"; depends=[MASS plotrix]; };
+  astrochron = derive { name="astrochron"; version="0.3.1"; sha256="0anm8k31kgvbdkzid2f9mg7ivdrihwb6g1i82jqpljbwvmkp0fmw"; depends=[baseline multitaper fields]; };
   astroFns = derive { name="astroFns"; version="4.1-0"; sha256="0g5q0y067xf1ah91b4lg8mr9imj0d6lgig7gbj3b69fn335k363g"; depends=[]; };
+  astrolibR = derive { name="astrolibR"; version="0.1"; sha256="0gkgry5aiz29grp9vdq9zgg6ss47ql08nwcmz1pfvd0g0h9h75l8"; depends=[]; };
   astsa = derive { name="astsa"; version="1.2"; sha256="13nlk5m5j9rygjih2hd3nj5iyncm1cx4smcj9zpr6nrsc79brwzj"; depends=[]; };
   asympTest = derive { name="asympTest"; version="0.1.3"; sha256="11nlkgws3y8xbz3yli55414a2rkk7367q9q5r2ssa61jaiimibhh"; depends=[]; };
   asypow = derive { name="asypow"; version="2013.9-1"; sha256="0zd42ha30kysjhd6rwxr91k1hhsimw3py2inymbpxgyq4s890whs"; depends=[]; };
@@ -273,6 +290,7 @@ let self = _self // overrides; _self = with self; {
   audio = derive { name="audio"; version="0.1-5"; sha256="1hv4052n2r6jkzkilhkfsk4dj1xhbgk4bhba2ca9nf8ag92jkqml"; depends=[]; };
   audiolyzR = derive { name="audiolyzR"; version="0.4-9"; sha256="09jsrjy15vcn6da0kgk06ghayyrf3s853gqv8qdawg745ky2hbgi"; depends=[hexbin RJSONIO plotrix]; };
   audit = derive { name="audit"; version="0.1-1"; sha256="0hrcdcwda5c0snskrychiyfjcbnymkcl2x43bapb6inw9y8989qv"; depends=[]; };
+  autoencoder = derive { name="autoencoder"; version="1.0"; sha256="18i6b2vjhlq9f82syw3k88gm9bvklv827nflgzq0xzjnzh6z5nr8"; depends=[]; };
   automap = derive { name="automap"; version="1.0-14"; sha256="1190kbmp0x80x0hyifdbblb4ijq79kvrfn9rkp5k6diig4v30n0w"; depends=[sp gstat lattice reshape]; };
   autopls = derive { name="autopls"; version="1.2-7"; sha256="173i1g11waz72myclfdch9v3wsvdr9mdz2gxdqifq9wj50s4zrg4"; depends=[pls]; };
   AutoSEARCH = derive { name="AutoSEARCH"; version="1.2"; sha256="1zl5zd96249y2zfpidpl9n3zwcp74kvcxn4s10v0lypvr19cr3hn"; depends=[zoo]; };
@@ -283,8 +301,9 @@ let self = _self // overrides; _self = with self; {
   aylmer = derive { name="aylmer"; version="1.0-11"; sha256="1b6dryvfz9yp00nj8lv8j1isnshcgwn9fx41knah9pw7dn4pxkk2"; depends=[Brobdingnag]; };
   B2Z = derive { name="B2Z"; version="1.4"; sha256="0w7394vs883vb32gs6yhrc1kh5406rs851yb2gs8hqzxad1alvpn"; depends=[numDeriv coda mvtnorm]; };
   b6e6rl = derive { name="b6e6rl"; version="1.1"; sha256="17scdskn677vaxx1h2jypqaffvjgczryplg17nr3wigi1x0cxg7a"; depends=[]; };
-  babel = derive { name="babel"; version="0.2-5"; sha256="0c4ks9yi90nmlp383dfikdkd4xzsdkadckbs4sw86qrizyv2qb62"; depends=[]; };
+  babel = derive { name="babel"; version="0.2-6"; sha256="1dsxjnhr0cky7wlzz8pr8rn3cldfcyrh8v6gn2ba4abr0df7i4dd"; depends=[]; };
   BaBooN = derive { name="BaBooN"; version="0.1-6"; sha256="1splid5mvyd04d1lxkq45md910ry6n516cph20j6vqfhla0arxjg"; depends=[MASS nnet]; };
+  babynames = derive { name="babynames"; version="0.1"; sha256="0qq0303mmcnpfy5630d7rqmb8rl36p7hg2z842rzd4lkhy8c2l07"; depends=[]; };
   BACCO = derive { name="BACCO"; version="2.0-9"; sha256="0i1dnk0g3miyv3b60rzgjjm60180wxzv6v2q477r71q74b0v0r1y"; depends=[emulator calibrator approximator]; };
   backtest = derive { name="backtest"; version="0.3-2"; sha256="06q488pynxgis1m6rxc8hgscpy8vimffpi4aamviwb089sjzilnn"; depends=[lattice]; };
   BACprior = derive { name="BACprior"; version="1.2.1"; sha256="1xwszrnb6fnfl4pz89y24jykzyjnkzwzkicdp1rp7q3jwp986fxi"; depends=[mvtnorm leaps]; };
@@ -293,9 +312,10 @@ let self = _self // overrides; _self = with self; {
   BalancedSampling = derive { name="BalancedSampling"; version="1.4"; sha256="0l8jxszd0j27kb58xrn7lvf52mhifqjd1w42cp4kdiax8c6s7421"; depends=[Rcpp]; };
   BaM = derive { name="BaM"; version="0.99"; sha256="1q04va2s876ydlmaalx63r520pfx1qzpjg6hbnl9pvn86b5grnf4"; depends=[bayesm coda MASS mice survival foreign nnet]; };
   bamdit = derive { name="bamdit"; version="1.1-1"; sha256="0f865yfwd2pvbkcx8jm4iyilldmprsgyqnscp1n28rp3sbdii4bl"; depends=[coda rjags]; };
-  BAMMtools = derive { name="BAMMtools"; version="1.0.1"; sha256="0850yl0knw705ip2fl3sbgspnwbpks0vhlb3fb5sfh6p9klyk140"; depends=[ape]; };
+  BAMMtools = derive { name="BAMMtools"; version="2.0.2"; sha256="10z638f79j3jksb69sqrnkzs5nzxi9srsxww4ky3bk21zb66ikhd"; depends=[ape]; };
   bams = derive { name="bams"; version="1.6"; sha256="1pplnpilpydxf7gcs87424cajss74q8cr9pyv2biy4pkvfql0nxl"; depends=[]; };
-  bandit = derive { name="bandit"; version="0.4.2"; sha256="09q6b44kcacb8ll3g2vjr58rn0ikic9m1nlm0iq43s1vcsnwcgvh"; depends=[boot gam]; };
+  bandit = derive { name="bandit"; version="0.5.0"; sha256="03mv4vbn9g4mqikd9map33gmw2fl9xvb62p7gpxs1240w5r4w3fp"; depends=[boot gam]; };
+  BANOVA = derive { name="BANOVA"; version="0.2"; sha256="1zgn9wxh4c89rris58hhj5fh37mmy8wjvligr02id7a1pcw177m3"; depends=[rjags runjags coda]; };
   barcode = derive { name="barcode"; version="1.1"; sha256="14zh714cwgq80zspvhw88cs5b82gvz4b6yfbshj9b7x0y2961nxd"; depends=[lattice]; };
   bark = derive { name="bark"; version="0.1-0"; sha256="00sgwr1sfbx0gb2ssbnmbz90mwb40sk3s24asj7lhadwgm150nly"; depends=[]; };
   Barnard = derive { name="Barnard"; version="1.3"; sha256="1kyc6rph0c9lxv6mkdl5n11xw1pvavlm2kknplb3sv6f94ss2yci"; depends=[]; };
@@ -303,61 +323,62 @@ let self = _self // overrides; _self = with self; {
   BAS = derive { name="BAS"; version="1.0"; sha256="1j5crafky3jb25kim3b7gxg9azn3ya357ckq1v7wryzi3zi674sg"; depends=[MASS]; };
   BaSAR = derive { name="BaSAR"; version="1.3"; sha256="0n18gjgnqdmwdna6b5r664rw2svjqlpis95vchnlk19cr3pjvqc1"; depends=[polynom orthopolynom]; };
   base64 = derive { name="base64"; version="1.1"; sha256="1wn3zj1qlgybzid4nr6hvlyqg1rp2dwfh88vxrfby2fy2ba1nl5x"; depends=[]; };
-  base64enc = derive { name="base64enc"; version="0.1-1"; sha256="0aflrnn5af6igmlwhmshiz7nb07ajgaryj9gs93zhk2ca5ki80lv"; depends=[]; };
+  base64enc = derive { name="base64enc"; version="0.1-2"; sha256="0d2b7vl08abssfwprfiqc0yscb1gz4xlzlwwbf7y9z19wbyxizh5"; depends=[]; };
   baseline = derive { name="baseline"; version="1.1-3"; sha256="1n3g1ads26nq3y31nniirac453pdshzkdfg774w46x83cc5pc0xj"; depends=[SparseM]; };
   basicspace = derive { name="basicspace"; version="0.07"; sha256="0lpj03a5cwrj0pag6hb29rfi8dw51hqx7rrc4r00lsbqf5picin2"; depends=[]; };
   BASIX = derive { name="BASIX"; version="1.1"; sha256="18dkvv1iwskfnlpl6xridcgqpalbbpm2616mvc3hfrc0b26v01id"; depends=[]; };
   BaSTA = derive { name="BaSTA"; version="1.9.3"; sha256="1jfki5lnsvd6fjrld2qp179lyzli61pi2308lkkl1h6vgp11zp2v"; depends=[msm]; };
   batade = derive { name="batade"; version="0.1"; sha256="1lr0j20iydh15l6gbn471vzbwh29n58dlpv9bcx1mnsqqnsgpmal"; depends=[hwriter]; };
   batch = derive { name="batch"; version="1.1-4"; sha256="03v8a1hsjs6nfgmhdsv6fhy3af2vahc67wsk71wrvdxwslmn669q"; depends=[]; };
-  BatchExperiments = derive { name="BatchExperiments"; version="1.1"; sha256="1asjk7wwz595k3ylmg19mil42bi3drz96181ikaqpq20l4zr8ccr"; depends=[BatchJobs BBmisc DBI RSQLite plyr]; };
-  BatchJobs = derive { name="BatchJobs"; version="1.2"; sha256="16v3a9awm3isx53lrhlklnxfsgf9kcfsq66hlvkwdvrcw3bsh639"; depends=[BBmisc digest DBI RSQLite sendmailR brew plyr stringr fail]; };
+  BatchExperiments = derive { name="BatchExperiments"; version="1.2"; sha256="0kvn8vaxzdvzfx05639v3jbrxvwrr9rr8zssw62pdr77h7j9a3gf"; depends=[BatchJobs checkmate BBmisc DBI RSQLite plyr]; };
+  BatchJobs = derive { name="BatchJobs"; version="1.3"; sha256="1vcncmy7zzri93gh9gfbz8dz4agz2nkhv1bddzddx27b2sqjq4dn"; depends=[BBmisc checkmate digest DBI RSQLite sendmailR brew stringr fail]; };
   batchmeans = derive { name="batchmeans"; version="1.0-1"; sha256="06p51ipc603zqkf7ifv495jxbnqqxzx5h8mnz5l5sz9rq5pixg13"; depends=[]; };
-  BayesBridge = derive { name="BayesBridge"; version="0.4"; sha256="1h63jdx45fdwwfif4ac9rlhhjldqznb695sp6ddjm7nzzh0vx1zn"; depends=[]; };
+  BayesBridge = derive { name="BayesBridge"; version="0.5"; sha256="1czyna2mrznlr5swvm9i7x99yfwjvwbzy42avh6xb0342q5glnhw"; depends=[]; };
   bayesclust = derive { name="bayesclust"; version="3.1"; sha256="0zxjd64nz8c6vg6jwb2xh6kbw41a2pcmlwq5cl6k2kbplqbm2jdf"; depends=[]; };
   BayesComm = derive { name="BayesComm"; version="0.1-0"; sha256="17hnq4z451g2j3p73awllihhwsdy3grh6ki3qy9bkr064wvzbvcj"; depends=[Rcpp RcppArmadillo coda]; };
-  bayescount = derive { name="bayescount"; version="0.9.9-1"; sha256="1sdc4j06a7h2i3rzjz83l1zd20jmy4rmnmjqq5ghskahgwyab3zc"; depends=[runjags coda lattice]; };
+  bayescount = derive { name="bayescount"; version="0.9.9-2"; sha256="1f27dkdgpylk1v0m722r0jxha9sl17zgl1s5apnd8ihgsajm7sdc"; depends=[runjags coda lattice]; };
   BayesCR = derive { name="BayesCR"; version="1.0"; sha256="0cq1ii01j0nprnyvfxml1nrajrbb9yanr4fa5fcwn764cq5s30n9"; depends=[MCMCpack mvtnorm Rlab truncdist truncnorm]; };
   BayesDA = derive { name="BayesDA"; version="2012.04-1"; sha256="0fp27cmhw8dsxr4mc1flm6qh907476kph8ch2889g9p31xm1psjc"; depends=[]; };
   bayesDem = derive { name="bayesDem"; version="2.4-1"; sha256="0s2dhy8c90smvaxcng6ixhjm7kvwwz2c4lgplynrggrm8rfb19ay"; depends=[gWidgets gWidgetsRGtk2 bayesTFR bayesLife bayesPop RGtk2 wpp2012]; };
   BayesFactor = derive { name="BayesFactor"; version="0.9.7"; sha256="02bqsvxsxkyhxm0llwnscsp204ffjygdk9xraml1l2fkz3cg62vl"; depends=[coda pbapply mvtnorm stringr]; };
   bayesGARCH = derive { name="bayesGARCH"; version="2.0.1"; sha256="1gz18wjikkg3yf71b1g21cx918dyz89f5m295iv8ah807cdx7vjk"; depends=[mvtnorm coda]; };
   bayesGDS = derive { name="bayesGDS"; version="0.6.0"; sha256="17ihpsh7lqjninprfwbx3v2415s27qybr5c2z4ls43slv8zrv8mz"; depends=[Matrix]; };
-  Bayesianbetareg = derive { name="Bayesianbetareg"; version="1.1"; sha256="1kj974fl2mfqlgl03ynfcwm4c9iqgymbnhqiz3dx1xdbqf1vd2cd"; depends=[mvtnorm betareg]; };
+  BayesGESM = derive { name="BayesGESM"; version="1.0"; sha256="1ssg4l86jfriq4izlgzypz37c7xzcfsr6ngh8ksak8ka1lmidsig"; depends=[truncdist GIGrvg normalp gsl]; };
+  Bayesianbetareg = derive { name="Bayesianbetareg"; version="1.2"; sha256="0imsz2761ngbnap0vnxks9527la51m5g8gkkn1vrgwis43i6qcgs"; depends=[mvtnorm betareg]; };
   BayesLCA = derive { name="BayesLCA"; version="1.5"; sha256="0ikx0qxp9mw4206c0i2g8cjr3d5i591wb1qak28c11m22rn1s7gc"; depends=[e1071 coda fields nlme MCMCpack]; };
-  bayesLife = derive { name="bayesLife"; version="2.1-0"; sha256="1cjwxjnfj5vm5m2kr4k3z7a0zdgcm727kwbp5jvc7j67qw7p30k7"; depends=[bayesTFR wpp2012 hett car coda]; };
-  BayesLogit = derive { name="BayesLogit"; version="0.4"; sha256="1a6iv3v7l2vc3ry0ry506bqz7avj24kdz5rly2d65jkxg8xv7vih"; depends=[]; };
+  bayesLife = derive { name="bayesLife"; version="2.1-1"; sha256="0vb9frpla7rvd925h5d23mjza423qhpc4hqy0f9zayj9nnisv212"; depends=[bayesTFR wpp2012 hett car coda]; };
+  BayesLogit = derive { name="BayesLogit"; version="0.5.1"; sha256="0nr215wzhqlfi32617mmqb6i3w5x1kh5fiy68k0xzdqjsyjr65m0"; depends=[]; };
   bayesm = derive { name="bayesm"; version="2.2-5"; sha256="16cnm1i7vwviqxwq3yhj5r9a46qaanq2mb4snd0659rkia6p8h7a"; depends=[]; };
   bayesMCClust = derive { name="bayesMCClust"; version="1.0"; sha256="14cyvcyx3nmkbvsy7n4xjp7zvcgdhy013dv9d72y8j5dvlv82pb4"; depends=[gplots xtable mnormt MASS bayesm boa e1071 gtools]; };
   BayesMed = derive { name="BayesMed"; version="1.0"; sha256="1ppl5g8c5yy8jzhm34wvvprn9dj697ihcg8jb5111qmjybzzp0dh"; depends=[R2jags QRM polspline MCMCpack]; };
   bayesmix = derive { name="bayesmix"; version="0.7-3"; sha256="142132aslmmm35yai4n1d2hqqkczvrnm8ln9gwxvbczmxaggnc01"; depends=[rjags coda]; };
+  BayesNetDiscovery = derive { name="BayesNetDiscovery"; version="0.1"; sha256="1p3mxl75ds75snqim59w9xvr7f4a1mbks2k05zd9wwwy4w7v74l7"; depends=[DPpackage igraph mclust pscl tmvtnorm]; };
   BayesNI = derive { name="BayesNI"; version="0.1"; sha256="0zvr6rkb5zxgl53xby69d0j3yrfnlcmac6kwkxz77q5616w9dwq0"; depends=[]; };
   BayesPen = derive { name="BayesPen"; version="1.0"; sha256="1c31n0mrx07j9mw4afdh1qznkiq2jrig3ldpsnhkv2nd2apgjbbp"; depends=[lars MCMCpack SuppDists]; };
   bayesPop = derive { name="bayesPop"; version="5.0-0"; sha256="0a577jkm0v88q2i7dmn2xqndm9z5y3hwfxr4a5d65cnrlsahfzdl"; depends=[bayesTFR bayesLife abind plyr wpp2012]; };
   bayespref = derive { name="bayespref"; version="1.0"; sha256="0gwlzs7qkgmf90np7xv85d27jjqggyhfj00vpya664a2znyjb3jm"; depends=[coda lattice MASS MCMCpack RColorBrewer]; };
   bayesQR = derive { name="bayesQR"; version="2.2"; sha256="0w5fg7hdwpgs2dg4vzcdsm60wkxgjxhcssw9jzig5qgdjdkm07nm"; depends=[]; };
-  BayesQTLBIC = derive { name="BayesQTLBIC"; version="1.0-2"; sha256="1pgd3h45v3l44pfkin2883lk1davp0y4fq80lp6nqrsbx9cpsy2z"; depends=[leaps]; };
   bayess = derive { name="bayess"; version="1.4"; sha256="0axipk5hn2hw3g4dfh7y3xa0dxqmi8kqpbr77nl14y7ydpija6xm"; depends=[MASS mnormt gplots combinat]; };
-  BayesSAE = derive { name="BayesSAE"; version="1.0-1"; sha256="09s7f472by689b2b0gahnkhyjriizpsx6r5qa95nf3f4bfqi2cpf"; depends=[Formula coda lattice pkgs.gsl]; };
+  BayesSAE = derive { name="BayesSAE"; version="1.0-1"; sha256="09s7f472by689b2b0gahnkhyjriizpsx6r5qa95nf3f4bfqi2cpf"; depends=[Formula coda lattice]; };
   BayesSingleSub = derive { name="BayesSingleSub"; version="0.6.2"; sha256="0hgmyhg4mpxx7k91hbfa9h3533mqyn9rz4kl9kb30cc9g7g0m045"; depends=[coda mvtnorm MCMCpack]; };
-  bayesSurv = derive { name="bayesSurv"; version="2.1-1"; sha256="076lzaiwjp4ahw36wvx9sb1g86b9cidvjv91sc1r509s8khph91w"; depends=[survival coda smoothSurv]; };
+  bayesSurv = derive { name="bayesSurv"; version="2.3-1"; sha256="1p3ppvz7qjd0yjnc3k1mrjqa6v00aind613wxg6xhgk5iz0590rg"; depends=[survival coda smoothSurv]; };
   bayesTFR = derive { name="bayesTFR"; version="4.0-5"; sha256="1cyzkgx0f275ng0ds0lvm3rwryd2ai20shhilp7ajvsria4h4dcw"; depends=[mvtnorm MASS coda wpp2012]; };
   Bayesthresh = derive { name="Bayesthresh"; version="2.0.1"; sha256="0w26h1ragqcg1i4h7c2y6vd8fig2jb2zrnvvchgg5z2hg9qdplsf"; depends=[lme4 MASS VGAM mvtnorm matrixcalc coda]; };
-  BayesTree = derive { name="BayesTree"; version="0.3-1.1"; sha256="1sdxya2nli590m837zmqn4y3h62ph1hx8qszp6ayb19liff2bnmd"; depends=[nnet]; };
   BayesValidate = derive { name="BayesValidate"; version="0.0"; sha256="1gli65avpkb90asx92l1yjbwaxcsyb920idyjwgd2sl2b3l657ly"; depends=[]; };
-  BayesVarSel = derive { name="BayesVarSel"; version="1.5.1"; sha256="0r2al4d74dbra7va88fcazq5h19f0i4wymd39apsz3a3hsb8vdvv"; depends=[MASS pkgs.gsl]; };
+  BayesVarSel = derive { name="BayesVarSel"; version="1.5.1"; sha256="0r2al4d74dbra7va88fcazq5h19f0i4wymd39apsz3a3hsb8vdvv"; depends=[MASS]; };
   BayesX = derive { name="BayesX"; version="0.2-8"; sha256="1kj0xwy972383vx52i8dn7vp0x8r5cbbii0s7nwfz0bn2iaks0c0"; depends=[shapefiles sp maptools colorspace coda]; };
-  BayesXsrc = derive { name="BayesXsrc"; version="2.1-2"; sha256="114804f6maak5dmwzw4cbigjcdw7c6sgx48af35yrvkspi1gsz3b"; depends=[pkgs.readline]; };
+  BayesXsrc = derive { name="BayesXsrc"; version="2.1-2"; sha256="114804f6maak5dmwzw4cbigjcdw7c6sgx48af35yrvkspi1gsz3b"; depends=[]; };
   BayHap = derive { name="BayHap"; version="1.0.1"; sha256="0xqnl2cbf0pyjlpywyy0j4mwknfn8msz4s719dsri3r7hvn9m6kd"; depends=[boa]; };
   BayHaz = derive { name="BayHaz"; version="0.1-3"; sha256="08ilghlkgyma5758yw7mdgqycqcillqmx73knzzdlg2kzc77dvg6"; depends=[]; };
   BaylorEdPsych = derive { name="BaylorEdPsych"; version="0.5"; sha256="1kq6nvzdqwawygp7k62lw5hyccsj81jg82hq60yidgxnmmnnf7y2"; depends=[]; };
+  bayou = derive { name="bayou"; version="1.0.1"; sha256="0l342a4lsn6b18i2kyk2hr50k69bb7jcw8dlnbi96yf1i58qcdri"; depends=[ape geiger phytools coda Rcpp MASS mnormt fitdistrplus denstrip]; };
   BaySIC = derive { name="BaySIC"; version="1.0"; sha256="023ji6q1nvksmhp3ny8ad39xxccc0a1rv9iaiaagwavgzzc0pjd9"; depends=[rjags fields poibin]; };
   BAYSTAR = derive { name="BAYSTAR"; version="0.2-9"; sha256="0crillww1f1jvhjw639sf09lpc3wpzd69milah143gk9zlrkhmz2"; depends=[mvtnorm coda]; };
   BB = derive { name="BB"; version="2014.1-1"; sha256="05ang9k03cpdyjskifp8y68sjgbsnp8xj1a85hzqychlb7d4f2qk"; depends=[]; };
   bbefkr = derive { name="bbefkr"; version="4.2"; sha256="1wjx652w3p41sq71a2zdzmb7frjxm6xvcgrc2ark2spwb0lbjjw6"; depends=[]; };
   bbemkr = derive { name="bbemkr"; version="2.0"; sha256="015c57s8mpimm82nddnh382wlkisxgdmc2hvp7k38pcnqxc5gb5q"; depends=[MASS]; };
-  BBmisc = derive { name="BBmisc"; version="1.6"; sha256="0zb9137rnqjb9jvazfqz5ajqf18w1f57lxqy8q4rys7966bp3ndm"; depends=[]; };
-  bbmle = derive { name="bbmle"; version="1.0.16"; sha256="133ff9md8m2xh8x45xmpdm868pp46dzlly1qq8dp8ail18kqj9ga"; depends=[numDeriv lattice MASS]; };
+  BBmisc = derive { name="BBmisc"; version="1.7"; sha256="06lr7yjq9ypyvrvkf3gn1dl7ppf2mpn6jnvv3m4724g2sgh53cv4"; depends=[checkmate]; };
+  bbmle = derive { name="bbmle"; version="1.0.17"; sha256="1j3x2glnn0i0fc0mmafwkkqh1js90g8q7gix2vrhif0pmwinsrak"; depends=[numDeriv lattice MASS]; };
   BBMM = derive { name="BBMM"; version="3.0"; sha256="1cvv786wf1rr5906qg1di2krrv5jgw3dnyl8z2pvs8jyn0kb3fkj"; depends=[]; };
   bbo = derive { name="bbo"; version="0.1"; sha256="1giif78135f3hy8dqims83imism0k3507jlppgcb3x6pxk7dgwbs"; depends=[]; };
   BBRecapture = derive { name="BBRecapture"; version="0.1"; sha256="05xzp5zjmkh0cyl47qfsz0l8drg8mimssybhycc4q69aif9scqxb"; depends=[HI locfit lme4 secr]; };
@@ -365,7 +386,8 @@ let self = _self // overrides; _self = with self; {
   BCA = derive { name="BCA"; version="0.9-2"; sha256="1kry9v0sfcpn5vv4hwd983svwcgv841y9pkjdzi849gspmc9291r"; depends=[car clv cluster class flexclust rpart nnet rgl Rcmdr]; };
   BCBCSF = derive { name="BCBCSF"; version="1.0-0"; sha256="1ag8wz8a9vh1x4jgppimgchfs53rr6hbg5xzzr6k2h4bfsg7pmn3"; depends=[abind]; };
   BCDating = derive { name="BCDating"; version="0.9.3"; sha256="1ibm34wab1dpigrhifkyr1nylgbprbh22fdw9zpmg8bawb7zgbsl"; depends=[]; };
-  BCE = derive { name="BCE"; version="1.4"; sha256="1i7kxw6ykxk6kzncxgqalx51yj55nr3klr4ziy8fwwyix9llcrqy"; depends=[limSolve]; };
+  BcDiag = derive { name="BcDiag"; version="1.0.4"; sha256="1cpy80cza2yqwgp6zma1p3chdbfbxb3in19rj1zndf89baggr520"; depends=[]; };
+  BCE = derive { name="BCE"; version="2.1"; sha256="0dqp08pbq7r88yhvlwgzzk9dcdln7awlliy5mfq18j5jhiy7axiz"; depends=[FME limSolve Matrix]; };
   BCEA = derive { name="BCEA"; version="2.0-2"; sha256="1n0fp6na2y4n7p6ncwgi6hwx97mfrga3fkp3i0z06bh1p1jh8m88"; depends=[]; };
   BCEs0 = derive { name="BCEs0"; version="1.1"; sha256="0q63bkmk0kk9p5d3xb0f5srzfrbr743isyw4v2h9ch5yyxizcizb"; depends=[]; };
   Bchron = derive { name="Bchron"; version="4.1.1"; sha256="0dnfz7xpmbygyarh9ai9x3xfsqiizi0zhnxm8bmkvqyb8h7zpghb"; depends=[inline hdrcde MASS ellipse coda mclust]; };
@@ -374,19 +396,22 @@ let self = _self // overrides; _self = with self; {
   bcool = derive { name="bcool"; version="1.1"; sha256="03z6wdqpk491gyysbzz1lgfavskmi0j65r3df7baz6lrvzkg30ji"; depends=[MCMCglmm doMPI seqinr]; };
   bcp = derive { name="bcp"; version="3.0.1"; sha256="08sa1az1ljsi00zmj3l7z8p1j5im1w79yjxy8k1p6ba90bck7l4h"; depends=[foreach iterators Rcpp]; };
   bcpa = derive { name="bcpa"; version="1.0"; sha256="02vyvwd1j5d1nvwmhjbldyav1zx8sh8kvchwz73i0vs0jdrwp3q4"; depends=[Rcpp intervals plyr]; };
+  bcpmeta = derive { name="bcpmeta"; version="1.0"; sha256="02fw1qz9cvr7pvmcng7qg7p04wxxpmvb2s8p78f52w4bf694iqhl"; depends=[mvtnorm]; };
   bcrm = derive { name="bcrm"; version="0.4.4"; sha256="0gcigc7505fsk1m70df3n0dz553adkbs8yz2bhskb4qrw4gbmvr7"; depends=[mvtnorm ggplot2]; };
   bcv = derive { name="bcv"; version="1.0"; sha256="053if27miv46mbkni6pcpdpz0l336r5l95k7927dqalnri894xwz"; depends=[]; };
-  bda = derive { name="bda"; version="3.1.3-2"; sha256="1l11p8a57hqyfbm7339fdis8kb7mw044cnpf85bq4rh7fvmknc9n"; depends=[]; };
-  BDgraph = derive { name="BDgraph"; version="2.7"; sha256="1krg11v4gh453xqhyli8qwnd52j0c9c3mp9ynk2fljbimzj6pz81"; depends=[huge]; };
+  bda = derive { name="bda"; version="3.2.0-3"; sha256="1725qdlkcf7hfklnksy7jslh66cfm7gsil1xgm2rw8hr6v2l0pmx"; depends=[]; };
+  BDgraph = derive { name="BDgraph"; version="2.10"; sha256="0f35i3r8i6fbh86537z8lvfmhydp87kmmcs4vycaa9ja88fb6czl"; depends=[Matrix igraph]; };
   bdoc = derive { name="bdoc"; version="1.2"; sha256="15d7grc0a1hakkxhgbm2gp0awggzlmsp8zf8abj5bgfih63gcmj2"; depends=[]; };
   bdpv = derive { name="bdpv"; version="1.1"; sha256="0i6wdf27243ch8pn2chqriwxjg3g72wbvzlx52mz4ahw700xjc7n"; depends=[]; };
   bdsmatrix = derive { name="bdsmatrix"; version="1.3-1"; sha256="1iiqz34ssb5i5jd1x5d0mccir9ycrq2vq30g67ggw12apl7yks1l"; depends=[]; };
+  bdvis = derive { name="bdvis"; version="0.1.0"; sha256="1f837i48gmspx9xrnxzsgdbg6ykxmvkp8l20y19yd9iakhv7k3jy"; depends=[maps plotrix sqldf plyr taxize treemap ggplot2]; };
   bdynsys = derive { name="bdynsys"; version="1.2"; sha256="06n4n5yix6yd5180c5y7qdk2p5jpjqiw28147l8fp58zqxvwjrxb"; depends=[plm Formula MASS Hmisc deSolve pracma caTools matrixStats]; };
   beadarrayFilter = derive { name="beadarrayFilter"; version="1.1.0"; sha256="044dq5irc00v2f2gjz0vb69w7q7b84lppc55ganabdv4f0dxdblc"; depends=[RColorBrewer]; };
   beadarrayMSV = derive { name="beadarrayMSV"; version="1.1.0"; sha256="0785vmjsli37hjyppk7hlqmn0b683s1apysx9dghbw4h6rgvr8n9"; depends=[rggobi]; };
   beanplot = derive { name="beanplot"; version="1.1"; sha256="0h1ns2y0f6x5z9bn4wsv640509q4jxhqvmqr7snf8vk54vc35zs5"; depends=[]; };
   bear = derive { name="bear"; version="2.6.3"; sha256="1w933rb1v4ixgmxpbjxrfwzhiddpr0vxwr3gryl6z6p4wvwdwvp7"; depends=[reshape nlme gdata ICSNP sciplot plotrix ggplot2 png]; };
-  BEDASSLE = derive { name="BEDASSLE"; version="1.3"; sha256="09zjddp9001l31ax7m0il0z5d8j69mj5wcxf56lcwq14fchk3ip5"; depends=[MASS matrixcalc emdbook]; };
+  BEDASSLE = derive { name="BEDASSLE"; version="1.4"; sha256="02638v89rcqky6npfckr1h7g563lbhs51bsprfr10jk44aj527np"; depends=[MASS matrixcalc emdbook]; };
+  beepr = derive { name="beepr"; version="1.1"; sha256="187gww50yc8hzrzwz6j9ib101196g6ci9fx3dqyhg764ydn8if1n"; depends=[stringr audio]; };
   beeswarm = derive { name="beeswarm"; version="0.1.6"; sha256="05n2a1fqmh4m7d0b8vmcprss5ivgb0dlyly07jywj3vrf2z81yhy"; depends=[]; };
   benchden = derive { name="benchden"; version="1.0.5"; sha256="1cwcgcm660k8rc8cpd9sfpzz66r55b4f4hcjc0hznpml35015zla"; depends=[]; };
   benchmark = derive { name="benchmark"; version="0.3-6"; sha256="05rgrjhbvkdv06nzbh0v57b06vdikrqc1d29wirzficxxbjk1hih"; depends=[proto ggplot2 relations psychotools reshape scales plyr]; };
@@ -394,11 +419,13 @@ let self = _self // overrides; _self = with self; {
   benford_analysis = derive { name="benford.analysis"; version="0.1.1"; sha256="00ynk1af5nbq8bn8y77sckx4w32g5zxcp06pdpcxwvp38d7hxhvc"; depends=[data_table]; };
   BenfordTests = derive { name="BenfordTests"; version="1.1.1"; sha256="12xzc4gq4h7p18ypbkybrzjj2qh71rgd7nzznij36yv7n6h21mlw"; depends=[]; };
   bentcableAR = derive { name="bentcableAR"; version="0.2.3"; sha256="0d20cc3zis3pc3r86z12cwcz013w0mglbg6xgv90wq912jjpkxk9"; depends=[]; };
-  BEQI2 = derive { name="BEQI2"; version="1.0-0"; sha256="1yw4q0402qlzl0g541fd2k5pmaf3h6dsq4p2qyk496z0r6fv0x4k"; depends=[knitr markdown RJSONIO xtable plyr reshape2]; };
+  BEQI2 = derive { name="BEQI2"; version="1.0-1"; sha256="0afp8f6kfmpa8qi952qnyxl2nn6kszc8fgvplvbl13v572261m7s"; depends=[knitr markdown RJSONIO xtable plyr reshape2]; };
   ber = derive { name="ber"; version="4.0"; sha256="0gl7rms92qpa5ksn8h3ppykmxk5lzbcs13kf2sjiy0r2535n8ydi"; depends=[MASS]; };
-  Bergm = derive { name="Bergm"; version="2.6"; sha256="1r47xzrc2sl8b4vmw40dxyn5cndwc7872zrb52ni0ismxvvkkwqq"; depends=[ergm network coda mvtnorm]; };
+  Bergm = derive { name="Bergm"; version="2.9"; sha256="1sjc9vkcbbhdc93gzsm25ld5h7hkwb8n6i51xzflphi0w1a66zkv"; depends=[ergm network coda mvtnorm]; };
+  BerlinData = derive { name="BerlinData"; version="1.0.0"; sha256="1i4vb1gs3ffb2lxdhl8hzqwcr9nm8ya484glds3bdvj10ypncrya"; depends=[XML stringr]; };
+  berryFunctions = derive { name="berryFunctions"; version="1.4"; sha256="13kzrz0lrqlbysd7ymphcw12fg237knmvkdc71cl85929ydr09d8"; depends=[]; };
   Bessel = derive { name="Bessel"; version="0.5-5"; sha256="1apcpwqgnbsn544x2mfjkp4136xn33pijazmbzas7lr14syl5a6b"; depends=[Rmpfr]; };
-  BEST = derive { name="BEST"; version="0.2.0"; sha256="076dsy813sq0x21ihp4xz0jf22j5xj80f5gpsk89mafr5ys22zl7"; depends=[rjags]; };
+  BEST = derive { name="BEST"; version="0.2.2"; sha256="160lvrd0zjm1lr8llra6lyz3qsmqhn3bpdlmwingwfimbpb754rz"; depends=[rjags coda]; };
   bestglm = derive { name="bestglm"; version="0.34"; sha256="0b6lj91v0vww0fy50sqdn99izkxqbhv83y3zkyrrpvdzwia4dg9w"; depends=[leaps]; };
   betafam = derive { name="betafam"; version="1.0"; sha256="1nf5509alqnr5qpva36f1wb7rdnc084p170h91jv89xvzsidqxca"; depends=[]; };
   betapart = derive { name="betapart"; version="1.3"; sha256="0h2y2c3q6njzh2rlxh8izgkrq9y7abkbb0b13f2iyj9pnalvdv52"; depends=[ape geometry picante rcdd]; };
@@ -406,37 +433,38 @@ let self = _self // overrides; _self = with self; {
   betareg = derive { name="betareg"; version="3.0-4"; sha256="1crkp1j11zpzd92hc1zaw0pb68ngga8gl6v504p4r7629806g5hv"; depends=[Formula flexmix lmtest modeltools sandwich]; };
   betategarch = derive { name="betategarch"; version="3.1"; sha256="1m4xif7xn1hhz9a77mmy0hlqrfp7qxardc95jcvx1jy76nny21af"; depends=[zoo]; };
   bethel = derive { name="bethel"; version="0.2"; sha256="1zlkw672k1c5px47bpa2vk3w2906vkhvifz20h6xm7s51gmm64i0"; depends=[]; };
-  bezier = derive { name="bezier"; version="1.0"; sha256="0145d2vd2l9l6wq3a1rkqi5n74nwrv6b50c28hrw1nqnmgk2pw2n"; depends=[]; };
+  bezier = derive { name="bezier"; version="1.1"; sha256="1bhqf1zbshkf1x8mgqp4mkgdxk9jxi51xj6i47kqkyn9gbdzch0c"; depends=[]; };
   bfa = derive { name="bfa"; version="0.3.1"; sha256="02vnbm77blllb74kll8w1i91k0llk43vq60aqjwpc5kqmzy652pk"; depends=[coda Rcpp RcppArmadillo]; };
   bfast = derive { name="bfast"; version="1.4.4"; sha256="1k8rwlzrnkgs0wj0yy4gh4lj4zd5zyzwgwckgjy8k53r4296js66"; depends=[strucchange MASS forecast zoo raster sp strucchange zoo raster]; };
   bfp = derive { name="bfp"; version="0.0-27"; sha256="08hlr33dwwjc4ag8vfsa3w4rcsc2093j8zwb05xkkl5nwqsq3mq0"; depends=[Rcpp]; };
   bgeva = derive { name="bgeva"; version="0.2"; sha256="178c2jkg5578mh1yq37713lwfbz98nbsc2p1bmacgmbxbqnkba3x"; depends=[mgcv magic trust]; };
-  BGLR = derive { name="BGLR"; version="1.0.2"; sha256="1w9a0hbh65l8kjm1098d0gka4mgr19v55cwgdygykf8kjh4ihmkn"; depends=[]; };
+  BGLR = derive { name="BGLR"; version="1.0.3"; sha256="02aw71r8khnkahqplycwziz7fh8hmnniq5bqnsk4fijv7z9gkbkg"; depends=[]; };
   bgmm = derive { name="bgmm"; version="1.6"; sha256="04d06rhb8ax1q4ayl03cw18j4wk4g4690kwdgiyym9yi0gh8hjij"; depends=[mvtnorm car lattice combinat]; };
   BGPhazard = derive { name="BGPhazard"; version="1.0"; sha256="14nk8gxzd0xd4fcc16m026rlq3prnppv3jywllfapk5986cacq4g"; depends=[survival]; };
   BGSIMD = derive { name="BGSIMD"; version="1.0"; sha256="0xkr56z8l72wps7faqi5pna1nzalc3qj09jvd3v9zy8s7zf5r7w4"; depends=[]; };
-  BH = derive { name="BH"; version="1.54.0-2"; sha256="0044his8xl2nlf216ya5nzx4k1311221s9k96b5m982kj074y9zv"; depends=[]; };
+  BH = derive { name="BH"; version="1.54.0-3"; sha256="18n82c37562aklykw074ma0x95k9s4xp3l94jrjw2grajcrhx68b"; depends=[]; };
   Bhat = derive { name="Bhat"; version="0.9-10"; sha256="1vg4pzrk3y0dk1kbf80mxsbz9ammkysh6bn26maiplmjagbj954v"; depends=[]; };
   BHH2 = derive { name="BHH2"; version="2012.04-0"; sha256="10ixvjpkqamlddrndpnw5gsdm4gdhp693jdvc0f774ngmf32rbaa"; depends=[]; };
+  BHMSMAfMRI = derive { name="BHMSMAfMRI"; version="1.0"; sha256="0j5ivknsr441clgm0b95f2rz4pr29ixvw3dgsi8nb0ffh52dgz7q"; depends=[fmri AnalyzeFMRI wavethresh]; };
   biasbetareg = derive { name="biasbetareg"; version="1.0"; sha256="1562zdin0y5mrp36ih11ir3h9cv49cx1l98chxd89fkj8x3c1fbg"; depends=[betareg]; };
   BiasedUrn = derive { name="BiasedUrn"; version="1.06.1"; sha256="1ra9fmymm97a2b8jsrsi98cjnnxc478zq51lx7a5pgafprcwcgkg"; depends=[]; };
   bibtex = derive { name="bibtex"; version="0.3-6"; sha256="06v6pzwpx5dh3h4cf382hf0mszxchvzjsjaw880gfbgc9yl931z7"; depends=[]; };
   biclust = derive { name="biclust"; version="1.0.2"; sha256="09w164zsnc48apf3r0yr6bfjxlpy4s2wqpzfhlg60c3c7bk1bf7v"; depends=[MASS colorspace lattice]; };
   BiDimRegression = derive { name="BiDimRegression"; version="1.0.6"; sha256="1kgrk4xanvxqdq619ha08wwplmsn2xqygx4dziagx48iqfpp1lxj"; depends=[nlme]; };
   bifactorial = derive { name="bifactorial"; version="1.4.7"; sha256="187zlsqph7m63wf6wajvs6a4a08aax9hiqssgvma6cpkpisfiz4k"; depends=[mvtnorm multcomp lattice Rcpp]; };
+  BIFIEsurvey = derive { name="BIFIEsurvey"; version="0.3-47"; sha256="10x2zfn19966mmmy2zxjhksxpzs38y8v25bmdn13vdmx70768gsc"; depends=[Rcpp miceadds]; };
   bigalgebra = derive { name="bigalgebra"; version="0.8.4"; sha256="19rv552ac0q9djc1yvpldkc0lipdf6q143m9dnndpsqs7ayqlr4g"; depends=[bigmemory]; };
   biganalytics = derive { name="biganalytics"; version="1.1.1"; sha256="0g45b293c1z9n2z9ab66jsy8yaiqm7bbs2d6pglzwgmmdvwy03qd"; depends=[bigmemory]; };
   bigdata = derive { name="bigdata"; version="0.1"; sha256="1n1zcjhvb2s87d7fkcm95x11ss4b8pczza0n55gxjv4przfiq0in"; depends=[glmnet Matrix lattice]; };
-  bigGP = derive { name="bigGP"; version="0.1-2"; sha256="0ypcg7gwfwf1yriizy777adx5whya7f6al1z0irhq414g46r0s34"; depends=[Rmpi]; };
+  bigGP = derive { name="bigGP"; version="0.1-3"; sha256="1a81an1wkkvdv1jh6d41wl54ac8h4yal27v4m8zp9jmx3ch3y2wy"; depends=[Rmpi]; };
   biglars = derive { name="biglars"; version="1.0.2"; sha256="17zs25dvlja9ynx2fm5f4nmgkx4mnyqs5iscwsyahr6qigx1rz9x"; depends=[ff]; };
   biglm = derive { name="biglm"; version="0.9-1"; sha256="1z7h4by457z93k5i6qf5rq7xmd1y2kcd1rq4pv465cd32d4mb2g1"; depends=[DBI]; };
   bigmemory = derive { name="bigmemory"; version="4.4.6"; sha256="1pplnpxqg380l5mjgz0ak4ipsx7x54339n2wr3dd29xv3w2fb5rp"; depends=[bigmemory_sri BH]; };
   bigmemory_sri = derive { name="bigmemory.sri"; version="0.1.2"; sha256="01nz4phifx10r1hs83avisnaqxvs3y70v0yczjgcr8kih2cnvbsd"; depends=[]; };
   bigml = derive { name="bigml"; version="0.1-1"; sha256="0x0gn5pyffc8s0z2hp9iqgc63mmb3q7fb8lafzz2x67z2gghxi77"; depends=[RJSONIO RCurl plyr]; };
   bigpca = derive { name="bigpca"; version="1.0"; sha256="1s4qmg7xl8z0sv1b1vfqw0r5cvlbrxx1n0m03ira8fpykcck2clm"; depends=[reader NCmisc bigmemory biganalytics bigmemory_sri BH irlba]; };
-  bigrf = derive { name="bigrf"; version="0.1-6"; sha256="0xwimdbrj4iiqqgwj6y018bc7zv4n60b5x5yan64nd1371lcrlrq"; depends=[bigmemory BH foreach]; };
-  bigRR = derive { name="bigRR"; version="1.3-8"; sha256="11c3w9f2hdr74hwfli72i3gv45x3lvhjxrymjc91scxkks6va2s8"; depends=[hglm DatABEL]; };
-  bigsplines = derive { name="bigsplines"; version="1.0-0"; sha256="05lmqpqlaf8qf6is0s0bj9fq6icc6sfwbq6srrvmc9sf5fy6wizj"; depends=[]; };
+  bigrf = derive { name="bigrf"; version="0.1-11"; sha256="0lazi8jk8aapdyyynd5yfcbn4jpjyxh8l64ayd0jj3nisl6hvmdh"; depends=[bigmemory foreach]; };
+  bigsplines = derive { name="bigsplines"; version="1.0-2"; sha256="0sbjq1vh8im6rwyz27h5m8rpckqiiaz9h22kcbzissy2dckis3l8"; depends=[]; };
   bigtabulate = derive { name="bigtabulate"; version="1.1.2"; sha256="0vp873r3gww6kfkjdm87qgcdi85362kq946lvs45ggvyv7iaw0wa"; depends=[bigmemory]; };
   BigTSP = derive { name="BigTSP"; version="1.0"; sha256="1jdpa8rcnrhzn0hilb422pdxprdljrzpgr4f26668c1vv0kd6k4v"; depends=[glmnet tree randomForest gbm]; };
   bilan = derive { name="bilan"; version="2013.12"; sha256="0wrrs6l8iwy6r707djsmlmwiw0y5z6wwnsn27fvmq9cb8scvbfan"; depends=[Rcpp]; };
@@ -444,7 +472,7 @@ let self = _self // overrides; _self = with self; {
   bimetallic = derive { name="bimetallic"; version="1.0"; sha256="181qi4dr0zc7x6wziq7jdc1his20jmprfpq3hrfm56fr5n1sj8wl"; depends=[]; };
   binda = derive { name="binda"; version="1.0.0"; sha256="0h5a67ygn4hwkdzbmhdkqjngln32yr8rk36k87m3hq1ahj4jn73x"; depends=[entropy]; };
   bindata = derive { name="bindata"; version="0.9-19"; sha256="15ya21fz1kvq4qsppkn9ypiqvaq8q4vszdcgcymampa7zc07z2ld"; depends=[e1071 mvtnorm]; };
-  bingat = derive { name="bingat"; version="1.0"; sha256="0x2ira1a6yan3pp206asil4xqrldpybywk1b8bnfbcp4xyclv44n"; depends=[cluster network]; };
+  bingat = derive { name="bingat"; version="1.1"; sha256="1pb1yy1xrfvh71pg237lkmi56p8pbam60rii5i5km1i960lq0wc1"; depends=[matrixStats network]; };
   binGroup = derive { name="binGroup"; version="1.1-0"; sha256="1sf7prg2x1ryynf1kz7jr50svmga7kjgd5pi9qm3g2hyimz8mvs4"; depends=[]; };
   binhf = derive { name="binhf"; version="1.0-1"; sha256="0l8925bj6mjv2y7fn76zh2g8xjig3kbbdy4jl0ip3gd9kbrakl9k"; depends=[wavethresh adlift]; };
   binMto = derive { name="binMto"; version="0.0-6"; sha256="1h9s42wk848x15f4glhsh2iikpra64miwlia6xz5dqlzbs4vw86k"; depends=[mvtnorm]; };
@@ -454,30 +482,29 @@ let self = _self // overrides; _self = with self; {
   binomlogit = derive { name="binomlogit"; version="1.2"; sha256="1njz1g9sciwa8q6h0zd8iw45vg3i1fwcvicj5y8srpk8wqw3qp7k"; depends=[]; };
   binomSamSize = derive { name="binomSamSize"; version="0.1-3"; sha256="0hryaf0y3yjxp84c0k80mhxj8zzlad697bv2yrvcjvllkzdvzbm7"; depends=[binom]; };
   binomTools = derive { name="binomTools"; version="1.0-1"; sha256="14594i7iapd6hy4j36yb88xmrbmczg8zgbs0b6k0adnmqf83bn4v"; depends=[]; };
-  binseqtest = derive { name="binseqtest"; version="0.4"; sha256="1w85hfb6g9y3s4y9ldpi319qdrhi1p5qi040xh3630dlwk7zlpwb"; depends=[clinfun]; };
+  binr = derive { name="binr"; version="1.0"; sha256="0wgc78kx51qfn5wfzll5nz8iwanixkyb5sbqwi40fak93bvycklm"; depends=[]; };
+  binseqtest = derive { name="binseqtest"; version="1.0"; sha256="103nbi3zq9m632665iqz0z79v963ixhd5xrjfx6drwpfp4i69pbl"; depends=[clinfun]; };
   Biodem = derive { name="Biodem"; version="0.3"; sha256="0wfyypr46awki2nrvhcjwacmaxrr2wvhdv9hddnf10msssflvshc"; depends=[]; };
-  BiodiversityR = derive { name="BiodiversityR"; version="2.4-1"; sha256="1b4fx1wh02z6p2l76xqxj0h59ypjngii92n0qp70hdm064h0pxji"; depends=[Rcmdr]; };
-  BioGeoBEARS = derive { name="BioGeoBEARS"; version="0.2.1"; sha256="1j3d7p4cdwhhbxx96sjdjwmlz6pj3als768hfzmjkhq0n6zhfwvq"; depends=[rexpokit cladoRcpp ape phylobase optimx FD xtable plotrix gdata]; };
+  BiodiversityR = derive { name="BiodiversityR"; version="2.4-4"; sha256="1sgjvjhvfdljjap69hi3f5j0ma9nikh43vgzbj8zkrz95d3jwd66"; depends=[Rcmdr]; };
+  BioGeoBEARS = derive { name="BioGeoBEARS"; version="0.2.1"; sha256="0wyddc5ma47ljpqipfkwsgddp12m9iy4kqwwgklyhf0rqia56b1h"; depends=[rexpokit cladoRcpp ape phylobase optimx FD xtable plotrix gdata]; };
   Biograph = derive { name="Biograph"; version="2.0.4"; sha256="1mik5yvbi28xnyzha8p3xjaa064x29wgn18yx766wha7djxxr353"; depends=[etm msm Epi lubridate reshape plyr survival mstate ggplot2]; };
   bio_infer = derive { name="bio.infer"; version="1.3-3"; sha256="14pdv6yk0sk6v8g9p6bazbp7mr3wmxgfi6p6dj9n77lhqlvjcgm9"; depends=[]; };
   biom = derive { name="biom"; version="0.3.12"; sha256="18fmzp2zqjk7wm39yjlln7mpw5vw01m5kmivjb26sd6725w7zlaa"; depends=[plyr RJSONIO Matrix]; };
-  BioMark = derive { name="BioMark"; version="0.4.1"; sha256="163i7jsj8m6bqckpz6vr9rs3fc545w5fzw9vgk8mxq8cdq53yaiz"; depends=[pls glmnet st]; };
+  BioMark = derive { name="BioMark"; version="0.4.2"; sha256="17r4q2migmdk2vqfbr69q07cgdzwpjgs3ijmnm42srs5d3brw8cr"; depends=[pls glmnet MASS st]; };
   BiomarkeR = derive { name="BiomarkeR"; version="1.3"; sha256="0djhqindpmzx6kkj17db6d1n3w5v5wl1l3z14lnl0r2k1hf276fy"; depends=[igraph Hmisc]; };
-  biomod2 = derive { name="biomod2"; version="3.1-25"; sha256="1w3xxiqynmcrvw95jqd8j5mjmbs181gn8hbvvgz257x93fsyl293"; depends=[sp raster abind rasterVis pROC nnet gbm mda randomForest rpart MASS]; };
+  biomod2 = derive { name="biomod2"; version="3.1-48"; sha256="1qsxzgikzxvgfrvm3lqfbwk1fnd55z1jgi9d6nyjxxcmn65lgx5l"; depends=[sp raster reshape abind rasterVis pROC nnet gbm mda randomForest rpart MASS]; };
   bionetdata = derive { name="bionetdata"; version="1.0"; sha256="1y5nnyfzbdk8673jyi733j4ncsc62kbsn1b8ghq10cb4xzxf2mvf"; depends=[]; };
   biopara = derive { name="biopara"; version="1.5"; sha256="1fhhs6lkm3iphlkx6wklh9sgr1mkjkka9wv2m8fnk0xw01bdsyl5"; depends=[]; };
   BioPhysConnectoR = derive { name="BioPhysConnectoR"; version="1.6-10"; sha256="1cc22knlvbvwsrz2a7syk2ampm1ljc44ykv5wf0szhnh75pxg13l"; depends=[snow matrixcalc]; };
   bioPN = derive { name="bioPN"; version="1.2.0"; sha256="0mvqgsfc7d4h6npgg728chyp5jcsf49xhnq8cgjxfzmdayr1fwr8"; depends=[]; };
-  biOps = derive { name="biOps"; version="0.2.2"; sha256="04sc30kfj727c4l7xyax4idjv5shxm97m3rixfxialllcppjppw1"; depends=[]; };
-  biOpsGUI = derive { name="biOpsGUI"; version="0.1.2"; sha256="07567n2ixc1xinbyrzl0xy48x09m4j3xgxmarsrgx3nq5cmdr0rw"; depends=[RGtk2 biOps]; };
   bios2mds = derive { name="bios2mds"; version="1.2.2"; sha256="1avzkbk91b7ifjba5zby5r2yw5mibf2wv05a4nj27gwxfwrr21cd"; depends=[amap e1071 scales cluster rgl]; };
   BioStatR = derive { name="BioStatR"; version="1.0.4"; sha256="043fakac56kf1mdmwlm8q3hjdxlclissxbkv26y2brqp2sfr01pb"; depends=[]; };
-  biotools = derive { name="biotools"; version="1.1"; sha256="034lvkw7bfpyqgkp58phgk97sks7y33mj5hk3489y7pql43j6rfa"; depends=[rpanel MASS boot]; };
+  biotools = derive { name="biotools"; version="1.2"; sha256="0wiv10qqah6yp5kwsndv48agnvrfl3j04pj0nsyiwyf9nvajxvic"; depends=[rpanel tkrplot MASS boot]; };
   bipartite = derive { name="bipartite"; version="2.04"; sha256="0rp2j2ip8523jmvgvbnj56q49yazwz2wqyqc0l00flvp4920svf0"; depends=[vegan sna fields igraph MASS permute]; };
   biplotbootGUI = derive { name="biplotbootGUI"; version="1.0"; sha256="0pgm31nhh1b78a8ciqjxw7gf3j7hh9wjc3myj29jpl92flbqmsw0"; depends=[rgl tkrplot vegan tcltk2]; };
   BIPOD = derive { name="BIPOD"; version="0.2.1"; sha256="04r58gzk3hldbn115j9ik4bclzz5xb2i3x6b90m2w9sq7ymn3zg1"; depends=[Rcpp]; };
-  birch = derive { name="birch"; version="1.2-3"; sha256="1y0fcrmcljq74x7zd27lz9cr8bffg2hg3hm47qssa3301m9a5fjh"; depends=[ellipse]; };
-  birdring = derive { name="birdring"; version="1.0"; sha256="0fn4qaiiskmx19lzpm4hw3nbnicb91p2v6c0jc0n48ycvspa7mc9"; depends=[geosphere ks lazyData raster reshape rgdal rgeos rworldmap rworldxtra sp]; };
+  birdring = derive { name="birdring"; version="1.1"; sha256="0j24s1vwf848bpswphzf0liyyda9rknh03gnqpflk66imxkbvgxc"; depends=[geosphere ks lazyData raster rgdal rgeos rworldmap rworldxtra sp]; };
+  birk = derive { name="birk"; version="1.0"; sha256="09arzwpgcanp6cds70rr7qnpnva0fag88k1gg9yhg4k0yvbhqdbd"; depends=[]; };
   bisectr = derive { name="bisectr"; version="0.1.0"; sha256="1vjsjshvzj66qqzg32rviklqswrb00jyq6vwrywg1hpqhf4kisv7"; depends=[devtools]; };
   BiSEp = derive { name="BiSEp"; version="1.0"; sha256="1iw3ask3gpjhx0gnjgl3402fygi7bnsrha6dfxfsmyzz94im352x"; depends=[mclust]; };
   bisoreg = derive { name="bisoreg"; version="1.1"; sha256="16d6nxbj18y6wv57nxbmwv0gypsgf7hw76hsyv0fhydrkf404igb"; depends=[bootstrap monreg R2WinBUGS coda]; };
@@ -487,10 +514,10 @@ let self = _self // overrides; _self = with self; {
   bivarRIpower = derive { name="bivarRIpower"; version="1.2"; sha256="0vgi0476rwali6k8bkp317jawzq5pf04v75xmycpmadb7drnpzy0"; depends=[]; };
   biwavelet = derive { name="biwavelet"; version="0.17.3"; sha256="08lj0v53l9s12pssy3hgzys988w3y490nab7js655ljs825d2lpc"; depends=[fields]; };
   biwt = derive { name="biwt"; version="1.0"; sha256="1mb3x8ky3x8j4n8d859i7byyjyfzq035i674b2dmdca6mn7paa14"; depends=[rrcov MASS]; };
-  bizdays = derive { name="bizdays"; version="0.1.3"; sha256="12x7p8h3h9rbji96yvwag9n5l09yci3x3lvzvh366rdcl52h0xvy"; depends=[]; };
-  BlakerCI = derive { name="BlakerCI"; version="1.0-2"; sha256="0njx3n469nwyq6nsv5lckvl9xdrf0qjp8kfgc1k01xiljppdb82w"; depends=[]; };
+  bizdays = derive { name="bizdays"; version="0.1.5"; sha256="0y25sm77chk77s4wdb5a4r583ks44mpny9w8c8azbx7nhcvfb4yq"; depends=[]; };
+  BlakerCI = derive { name="BlakerCI"; version="1.0-4"; sha256="1sa9qq5frjjcw46p3ankn7v3gj0gwn9lww6jacz8flf5qpplhn4l"; depends=[]; };
   Blaunet = derive { name="Blaunet"; version="1.0.1"; sha256="1qcp5wag4081pcjg5paryxz3hk3rqql15v891ppqc1injni7rljz"; depends=[network]; };
-  BLCOP = derive { name="BLCOP"; version="0.2.7"; sha256="0dlf4h7bcwypamafl9y8jsjpjrilz153xzw4pjvpxv8gg1wh14d2"; depends=[MASS quadprog]; };
+  BLCOP = derive { name="BLCOP"; version="0.2.8"; sha256="1x4dq7ri23wyhdz4hb80iqwwfijg8a3bj0nqgh4rvrwwdjx96ikv"; depends=[MASS quadprog]; };
   blender = derive { name="blender"; version="0.1.2"; sha256="1qqkfgf7fzwcz88a43cqr8bw86qda33f18dg3rv1k77gpjqr999c"; depends=[vegan]; };
   blighty = derive { name="blighty"; version="3.1-4"; sha256="1fkz3vfcnciy6rfybddcp5j744dcsdpmf7cln2jky0krag8pjzpn"; depends=[]; };
   blkergm = derive { name="blkergm"; version="1.0"; sha256="00xqmqn7y3vwygfx2v6kqm52n96vxlip2yk09gf30cqn2p3b6sck"; depends=[ergm ergm_userterms]; };
@@ -501,39 +528,48 @@ let self = _self // overrides; _self = with self; {
   BlockMessage = derive { name="BlockMessage"; version="1.0"; sha256="1jrcb9j1ikbpw098gqbcj29yhffa15xav90y6vpginmhbfpwlbf4"; depends=[]; };
   blockmodeling = derive { name="blockmodeling"; version="0.1.8"; sha256="0x71w1kysj9x6v6vsirq0nndsf6f3wzkf8pbsq3x68sf4cdji1xl"; depends=[]; };
   blockrand = derive { name="blockrand"; version="1.3"; sha256="1090vb26w6s7iqjcal0xbb3qb6p6j46a5w25f1wjdppd1spvh7f9"; depends=[]; };
-  blockTools = derive { name="blockTools"; version="0.5-8"; sha256="08smr9n5jl8lyhxk9ygbqgym1mlynjjn0007gz986pk8z6cqar0i"; depends=[MASS]; };
+  blockTools = derive { name="blockTools"; version="0.6-1"; sha256="10f2rkailk0bvg5hj9hxy0p3snknbpvsydx3cpsy0n6y5srwhrfr"; depends=[MASS]; };
+  blowtorch = derive { name="blowtorch"; version="1.0.1"; sha256="19z2z2alq5lr3f4nmjzpmyxssxalwfkm437bsjnzyf0r3zvycy9c"; depends=[ggplot2 foreach iterators]; };
   BLR = derive { name="BLR"; version="1.3"; sha256="02p29p06vhh8gxkfnqdf9niq09bygshmiipvd3q19k92g0a10l69"; depends=[SuppDists]; };
-  BMA = derive { name="BMA"; version="3.16.2.3"; sha256="1kgcml0issi43fw0g5qbmrh8y3jdyn98w7gp8z5n581763q9q273"; depends=[survival leaps robustbase]; };
+  BMA = derive { name="BMA"; version="3.17.1"; sha256="0lq42qn82969vhk2vdyxb1d7lrqqgp8793m9rlzgg011c6b38qam"; depends=[survival leaps robustbase]; };
   BMAmevt = derive { name="BMAmevt"; version="1.0"; sha256="0cy3h81xd1jjg7fdwndb5az67cp7kn1wp87p17za8506vyxj1pa0"; depends=[coda]; };
   bmd = derive { name="bmd"; version="0.5"; sha256="0d4wxyymycb416sdn272292l70s1h2m5kv568vakx3rbvb8y6agy"; depends=[drc]; };
   bmem = derive { name="bmem"; version="1.5"; sha256="1miiki743rraralk9dp12dsjjajj3iizcrfwmplf6xas6pl8sfk6"; depends=[Amelia MASS lavaan sem snowfall]; };
   BMhyd = derive { name="BMhyd"; version="1.2-2"; sha256="09gb1pq9y3gq9avpaqrlxdsm9iqsxpbnr0bg2mw1vkhc0d5z8zv7"; depends=[corpcor numDeriv]; };
   Bmix = derive { name="Bmix"; version="0.3"; sha256="0p3ks3miniz356spmdikynwa7yrdk1mwlpz081fnkjnwxa3kdsw7"; depends=[mvtnorm]; };
   bmk = derive { name="bmk"; version="1.0"; sha256="1wxkrlrhmsxsiraj8nyiax9bqs834ln2swykmpf40wxspkykgfdq"; depends=[coda plyr functional]; };
+  bmmix = derive { name="bmmix"; version="0.1-2"; sha256="00php2pgpnm9n0mnamchi6a3dgaa97kdz2ynivrf38s0vca7fqx8"; depends=[ggplot2 reshape2]; };
   BMN = derive { name="BMN"; version="1.02"; sha256="12gyq01cn6a9ixqgki1ihx5jrp2gw6jdj7q210rb12xlvj3p6x7w"; depends=[]; };
   bmp = derive { name="bmp"; version="0.2"; sha256="059ps1sy02b22xs138ba99fkxq92vzgfbyf2z5pyxwzszahgy869"; depends=[]; };
   bmrm = derive { name="bmrm"; version="1.8"; sha256="1kw9i84v5larzy79aghp08760krp29xlwrjg4mh9fsa9nl9wxqda"; depends=[clpAPI kernlab]; };
   BMS = derive { name="BMS"; version="0.3.3"; sha256="1yj9vi8jvhkwpcjkclf0zbah0dayridklpj65ay6r18fyf4crnd2"; depends=[]; };
-  bnlearn = derive { name="bnlearn"; version="3.5"; sha256="1lxfmbj5j904gv8akpgbgwpnzw2a6ws9bvxq7hzxmxxnp9jri1sp"; depends=[]; };
+  bnlearn = derive { name="bnlearn"; version="3.6"; sha256="0q5w5lsjgr7lgfgb7yhybq5ixaps2p91gx19l6dg2xlxw2m5fnab"; depends=[]; };
   BNPdensity = derive { name="BNPdensity"; version="2013.8"; sha256="1qlhav764ji289kcibbmqjj62mmxiw3zsiwjz1gkifzgpmzyar85"; depends=[]; };
   bnpmr = derive { name="bnpmr"; version="1.1"; sha256="0hvwkdbs2p2l0iw0425nca614qy3gsqfq4mifipy98yxxvgh8qgc"; depends=[]; };
   boa = derive { name="boa"; version="1.1.7-2"; sha256="1n7i0i8jq2sa1kzhbgyqzl9d53wja7fsxd7rligc8xjm0sdsb386"; depends=[]; };
   BOG = derive { name="BOG"; version="1.1"; sha256="0lr2n4j32b7qzmyb2048kssc7sbchivhi2a8skmahhjl85jgy166"; depends=[hash DIME]; };
-  boilerpipeR = derive { name="boilerpipeR"; version="1.1"; sha256="0bjnydpz1fiwwj2d02rjsk0dv5rcwxlm3344dwib3igmsi0ch62k"; depends=[rJava]; };
+  boilerpipeR = derive { name="boilerpipeR"; version="1.2"; sha256="00r8rlwx9qkfqk8x0mcskklz3skvnmcc55r9pd9rqxz7sp7s71h5"; depends=[rJava]; };
+  bold = derive { name="bold"; version="0.1.2"; sha256="0fjsnn9iqvlhgq9l5r17l5125arlsaz68pgd3b9i7596767zm1f2"; depends=[XML httr stringr assertthat]; };
   Bolstad = derive { name="Bolstad"; version="0.2-25"; sha256="1dj0ib3jndnsdx2cqsy0dz54szdx1xq3r2xqnxzk4ysng6svdym8"; depends=[]; };
   Bolstad2 = derive { name="Bolstad2"; version="1.0-28"; sha256="08cfadvl9jl9278ilsf8cm2i2a3i8zsa2f3vjzw2nlv85fwi2c7v"; depends=[]; };
-  BoolNet = derive { name="BoolNet"; version="1.63"; sha256="1ay80s4mrr26zfig5igqs0cwzf8ph4qxv33j8njwslgd5srzwrc4"; depends=[]; };
+  boolean3 = derive { name="boolean3"; version="3.1.5"; sha256="0ayjiff1mv7mvzfbqlxryg3vmmq85a63yslw4rk04awh5k4kpr88"; depends=[optimx numDeriv lattice rgenoud mvtnorm rlecuyer]; };
+  BoolNet = derive { name="BoolNet"; version="2.0"; sha256="1zg6knqdmcx1wv6i72fpyh86jjkhb9k0xplaczcxfx2f294y4bfr"; depends=[]; };
+  Boom = derive { name="Boom"; version="0.1"; sha256="03xsfzfl1wvhbd6d1blhwx4dd0vpf7kaha2f50p6q17q6c1ph2vv"; depends=[MASS]; };
+  BoomSpikeSlab = derive { name="BoomSpikeSlab"; version="0.4.1"; sha256="0s0pbb5dmry736x19li5g364kirvhkhpyjm5q0kp5nvq83bi1hq0"; depends=[Boom]; };
+  boostr = derive { name="boostr"; version="1.0.0"; sha256="123ag8m042i1dhd4i5pqayqxbkfdj4z0kq2fyhxfy92a7550gib2"; depends=[foreach iterators stringr]; };
   boostSeq = derive { name="boostSeq"; version="1.0"; sha256="0sikyzhn1i6f6n7jnk1kb82j0x72rj8g5cimp2qx3fxz33i0asx6"; depends=[genetics lpSolveAPI]; };
   boot = derive { name="boot"; version="1.3-11"; sha256="0s8v5mpyz2pqmm0kk8qkjiqr3wb1j1mqazx5hgsdabq6ga85ah8j"; depends=[]; };
   bootES = derive { name="bootES"; version="1.01"; sha256="00y901d5cjdpzras5w6mv851h5zgp36m5ib6dazs4vqrfpqymva8"; depends=[boot]; };
   bootfs = derive { name="bootfs"; version="1.4.2"; sha256="1qac7v0yzhxzqbdhkpgb4z1gqr6v6hjyb2y5lsxlq5dg1ka1cnb0"; depends=[pROC igraph ROCR gbm colorRamps gplots gtools pamr randomForest Boruta caret tgp mlegp penalizedSVM]; };
+  bootLR = derive { name="bootLR"; version="0.9"; sha256="0p4hq8nfdd8jw8r8dmlb6va4g7jjnkbsah69hissa9lqawbj9pi7"; depends=[boot]; };
   BootPR = derive { name="BootPR"; version="0.60"; sha256="03zw7hz4gyhp6iq3sb03pc5k2fhvrpkspzi22zks25s1l7mq51bi"; depends=[]; };
   bootRes = derive { name="bootRes"; version="1.2.3"; sha256="0bb7w6wyp9wjrrdcyd3wh44f5sgdj07p5sz5anhdnm97rn1ib6dz"; depends=[]; };
-  bootruin = derive { name="bootruin"; version="1.2-0"; sha256="1hkyn3wc63z3r3gvfwrhs20rjjknhkk2b21q0m5dnd3jgf9q44lc"; depends=[]; };
+  bootruin = derive { name="bootruin"; version="1.2-1"; sha256="1ii1fcj8sn9x82w23yfzxkgngrgsncnyrik4gcqn6kv7sl58f4r3"; depends=[]; };
   bootspecdens = derive { name="bootspecdens"; version="3.0"; sha256="0hnxhfsc3ac4153lrjlxan8xi4sg1glwb5947ps6pkkyhixm0kc1"; depends=[MASS]; };
   bootStepAIC = derive { name="bootStepAIC"; version="1.2-0"; sha256="0p6v4zjsaj1p6c678010fazdh40lpv0rvhczd1halj8aic98avdx"; depends=[MASS]; };
   bootstrap = derive { name="bootstrap"; version="2014.4"; sha256="1kf5jml03yfqz2868jbnjvy839x09ml0niyq85va503pq8gmj5br"; depends=[]; };
-  Boruta = derive { name="Boruta"; version="3.0.0"; sha256="1311cbg2hx4y068ayryvz6jishr87h6pgkwaax0ixrn0q20w42kn"; depends=[randomForest rFerns]; };
+  bootSVD = derive { name="bootSVD"; version="0.1"; sha256="1rzwp8kadyc0dg6lscag586xliapp1ninz7qxczl8jmxa9sx9z89"; depends=[]; };
+  Boruta = derive { name="Boruta"; version="3.1.0"; sha256="0dmg8yyx6bb5s6glqsajk0qqf6xwb8qzwi6gbi5agd3i57xm8nak"; depends=[randomForest rFerns]; };
   boss = derive { name="boss"; version="2.1"; sha256="1knsnf19b1xvvq20pjiv56anbnk0d51aq6z3ikhi8y92ijkzh0y8"; depends=[lme4 geepack Matrix ncdf]; };
   BoSSA = derive { name="BoSSA"; version="1.2"; sha256="0rvb6y7jwy0nmjvnpkim09fdph5kazg8cr0jchnz1s46n16gvc96"; depends=[ape SoDA]; };
   boussinesq = derive { name="boussinesq"; version="1.0.3"; sha256="1j1jarc3j5rby1wvj1raj779c1ka5w68z7v3q8xhzjcaccrjhzxk"; depends=[]; };
@@ -541,22 +577,23 @@ let self = _self // overrides; _self = with self; {
   bpca = derive { name="bpca"; version="1.2-2"; sha256="05ldz6b2s379mymj8jzvia9x6gj047gwsxvnv3zj9x8b1hvndnd6"; depends=[scatterplot3d rgl]; };
   bpcp = derive { name="bpcp"; version="1.1.0"; sha256="15dy3bbpazm4g72lwdf925f13a4dpdhi771283564v9f3n7qm3qf"; depends=[]; };
   bPeaks = derive { name="bPeaks"; version="1.2"; sha256="1z6jghcmw0lwv17ms7gdp5zzimaawq3ahbwkxa4062g373592smd"; depends=[]; };
-  bpkde = derive { name="bpkde"; version="1.0-2"; sha256="1vvj8z75q2aw3fiv3aiw97bac4ffslq8nqplil0s7a0x77al8nx7"; depends=[mvtnorm KernSmooth]; };
+  bpkde = derive { name="bpkde"; version="1.0-4"; sha256="142wmbs7hm5rs6vfgkg5q1rcc2jvg87kpxc8jbywf620ryycpc5z"; depends=[]; };
   bqtl = derive { name="bqtl"; version="1.0-30"; sha256="1v1p3wvqm5hmwpnjqaz8vlpzm036gpzpxsvy7m0v4x7nc5vrq7g6"; depends=[]; };
-  BradleyTerry2 = derive { name="BradleyTerry2"; version="1.0-4"; sha256="1v25r1yki3p2br6l38b77ailkip5gda1dfyvlb2dvr8a7cbjwp3s"; depends=[lme4 brglm gnm gtools]; };
-  BrailleR = derive { name="BrailleR"; version="0.8"; sha256="0smi8jkrmpmcbv9kzvj82rcbv6gcir51l0qyh6kccw69r2zfk4q4"; depends=[xtable moments nortest]; };
+  BradleyTerry2 = derive { name="BradleyTerry2"; version="1.0-5"; sha256="131z9ccfh55inlczy5wnzni2pch4brs6nzjrg8f5xnvkpyy6jqsp"; depends=[lme4 brglm gtools]; };
+  BrailleR = derive { name="BrailleR"; version="0.9"; sha256="11aygays2f3qy6z8x8srs9d7saggqpcamns36f7dbcc94b84aqkj"; depends=[]; };
   brainR = derive { name="brainR"; version="1.2"; sha256="1515v6kk73p4s3vrnkpkilfxfyqrf7b762sq6j364ygsyfybvh2z"; depends=[rgl misc3d oro_nifti]; };
   brainwaver = derive { name="brainwaver"; version="1.6"; sha256="0r79dpd9bbbn34rm29512srzj3m29qgvbryvrp1mwv8mmcsh6ij6"; depends=[waveslim]; };
   branchLars = derive { name="branchLars"; version="1.0"; sha256="1adk9j77ynv7y8q04nvb468ik4nq4ff3j2nbxw596kgg5bg1ymz0"; depends=[lars]; };
   breakage = derive { name="breakage"; version="1.0-1"; sha256="1zn0hxkz4zqhrfny75gkp2sgc0fs4v3y940aw32fmjh4j8kl3n4j"; depends=[Imap]; };
+  breakaway = derive { name="breakaway"; version="1.0"; sha256="1agigb3b2ff1p9lx9ndz4hs1sgyv1g2zjb41l5p23370i5gk1nbn"; depends=[]; };
   breakpoint = derive { name="breakpoint"; version="1.0"; sha256="0clmrad4ycpi0rxrvkh4agwixdayypjdnk3lfyb5g2w2hngrxv73"; depends=[ggplot2 foreach]; };
-  bReeze = derive { name="bReeze"; version="0.3-1"; sha256="1yyqp2f5avnml50ilajgralw24g7zar2dlmi3qcf5gs8fjhmayhr"; depends=[RColorBrewer]; };
+  bReeze = derive { name="bReeze"; version="0.3-2"; sha256="1k5xc3ymi53pib4hpgy9x6s5c6dvw5v1xrqyiqmbzx2djfw65dr5"; depends=[RColorBrewer]; };
   brew = derive { name="brew"; version="1.0-6"; sha256="1vghazbcha8gvkwwcdagjvzx6yl8zm7kgr0i9wxr4jng06d1l3fp"; depends=[]; };
   brglm = derive { name="brglm"; version="0.5-9"; sha256="14hxjamxyd0npak8wyfmmb17qclj5f86wz2y9qq3gbyi2s1bqw2v"; depends=[profileModel]; };
   bride = derive { name="bride"; version="1.3"; sha256="03k9jwklg1l8sqyjfh914570880ii0qb5dd9l0bg0d0qrghbj0rk"; depends=[]; };
   brnn = derive { name="brnn"; version="0.3"; sha256="0fpmjmxzcsxqv3vfy568r7js0zpydh2q70vw2s8yki2jzxl4gsl9"; depends=[Formula]; };
   Brobdingnag = derive { name="Brobdingnag"; version="1.2-4"; sha256="1saxa492f32f511vw0ys55z3kgyzhswxkylw9k9ccl87zgbszf3a"; depends=[]; };
-  broman = derive { name="broman"; version="0.44-1"; sha256="04qmpdi0s2j083a9c642zf4l58shqz2pnybrrlyy18vkv9vjz8zw"; depends=[]; };
+  broman = derive { name="broman"; version="0.48-2"; sha256="0w3fxs753ds2d4vzz7mck3cdjh4d1mjbwdbzqkb2rxdx5l4w2jp8"; depends=[assertthat]; };
   Brq = derive { name="Brq"; version="1.0"; sha256="0m01qw0mh9za1gx1vkbyvwny4k5fvmvs9dbp0504q8jqfqf4l1vj"; depends=[quantreg truncnorm]; };
   BRugs = derive { name="BRugs"; version="0.8-3"; sha256="1qjwm6qizg70nvpl5p2yx65ynghazchqw7d2iadhdjz7dd293sqi"; depends=[coda]; };
   BSagri = derive { name="BSagri"; version="0.1-8"; sha256="148pr4lkgdi4bwc9lavgj356nh240iazz28xklq14rw4gzhmz2k4"; depends=[gamlss multcomp MCPAN mvtnorm boot mratios]; };
@@ -566,11 +603,13 @@ let self = _self // overrides; _self = with self; {
   bspec = derive { name="bspec"; version="1.4"; sha256="1iq66hx4d0f5pvsh6qcsd2kzm913aqil4w66bfshj192fwbfziix"; depends=[]; };
   bspmma = derive { name="bspmma"; version="0.1-1"; sha256="0bd6221rrbxjvabf1lqr9nl9s0qwav47gc56sxdw32pd99j9x5a9"; depends=[]; };
   BSquare = derive { name="BSquare"; version="1.1"; sha256="1s16307m5gj60nv4m652iisyqi3jw5pmnvar6f52rw1sypfp5n49"; depends=[quadprog quantreg VGAM]; };
-  BSSasymp = derive { name="BSSasymp"; version="1.0-0"; sha256="0gmy74sxif90ypavq0sl58g6wjh1qhlv6pdb2gmq7qiiig2qfdac"; depends=[fICA JADE]; };
-  bst = derive { name="bst"; version="0.3-3"; sha256="0f1apiq0b22w74pqwfnj4h9alrb9qjzjrrfnzk0b6j06lqiydmaw"; depends=[rpart gbm]; };
-  bstats = derive { name="bstats"; version="1.1-11-4"; sha256="1fwp33kswnlk3dyj174gaac7wmpg9n0sjx042hx091y9q2v1cczc"; depends=[]; };
-  BTYD = derive { name="BTYD"; version="1.0"; sha256="09nw1zf2ni6xwbk0kqzy2gada7d1lph6wz6l6r9xh11v4a8mw3xn"; depends=[gsl Matrix]; };
-  bujar = derive { name="bujar"; version="0.1-3"; sha256="01337y65k89bgyfmab6czyy1sy8z8ccklgjbmyakr59qc7pgdnph"; depends=[mda ncvreg mboost gbm earth elasticnet rms]; };
+  BSSasymp = derive { name="BSSasymp"; version="1.0-2"; sha256="1m0rssdi4v68sm28x99j5igcl3z2hnlj8f4wx9xxxbj4l6mqy6yv"; depends=[fICA JADE]; };
+  bst = derive { name="bst"; version="0.3-4"; sha256="1s7qv2q9mcgg1c5mhblqg3nk9hary4pq6z0xgi3a6rs1929mgdyf"; depends=[rpart gbm]; };
+  bstats = derive { name="bstats"; version="1.1-11-5"; sha256="15is47404zlcqrniydhxc9ssixnm846spxcfds4cjg9d9x3mdscj"; depends=[]; };
+  bsts = derive { name="bsts"; version="0.5.1"; sha256="0qzyrn8zbfxrplyw04yrcakig6lc1i8fpwl893vbzciyhwmrjlya"; depends=[BoomSpikeSlab zoo xts Boom]; };
+  btf = derive { name="btf"; version="1.1"; sha256="0n1h4hmjpvj97mpvannh3s5l08m4zfv0w64hrgdv4s5808miwfzc"; depends=[Matrix coda]; };
+  BTYD = derive { name="BTYD"; version="2.3"; sha256="032xcy4z3gs4kqn91z7l6anp1vn5j60g32k2h87jx2aymy796cl0"; depends=[gsl Matrix]; };
+  bujar = derive { name="bujar"; version="0.1-4"; sha256="0v48mkg78sy91z1z4xvy2r3xmay74615kzqxjqlclkk20999z56m"; depends=[mda ncvreg mboost gbm earth elasticnet rms]; };
   BurStFin = derive { name="BurStFin"; version="1.02"; sha256="16w2s0bg73swdps9r0i8lwvf1najiqyx7w7f91xrsfhmnqkkjzka"; depends=[]; };
   BurStMisc = derive { name="BurStMisc"; version="1.00"; sha256="0718a1p7iiqkfhhmnzxggc6hd8sm847n1qh7rfbdl8b0k0bgvnj0"; depends=[]; };
   bursts = derive { name="bursts"; version="1.0-1"; sha256="172g09d1vmwl83xs6gr4gfblqmx3apvblpzdr5d7fcw1ybsx0kj6"; depends=[]; };
@@ -580,56 +619,61 @@ let self = _self // overrides; _self = with self; {
   BVS = derive { name="BVS"; version="4.12.1"; sha256="111g61bpwh80v6gy44q087swcrnnnzdcibm22pzzi9jsfphy6l0c"; depends=[MASS msm haplo_stats]; };
   c060 = derive { name="c060"; version="0.2-3"; sha256="1lynkmdlqi41szrpqqa79d5i65lindqgi0dwqpvvw94yjnbnm6b3"; depends=[glmnet survival mlegp tgp peperr penalizedSVM lattice]; };
   c3net = derive { name="c3net"; version="1.1.1"; sha256="0m4nvrs41kmlakc6m203zlncqwgj94wns8kzcb31xngjcacmcq42"; depends=[igraph]; };
-  C50 = derive { name="C50"; version="0.1.0-16"; sha256="0dhwjvslgza7sqbmvshb981k9spdk6wxwvr6z97m98vmkv2g6czk"; depends=[]; };
-  ca = derive { name="ca"; version="0.53"; sha256="07s51hl0rlbg91dp05qdz31ns9q0ah249710j1fb31ij92avqjj6"; depends=[]; };
+  C50 = derive { name="C50"; version="0.1.0-19"; sha256="1x8a284w1fffvvd7mx3xn1i7sr266wq7j6k0d0v8rln2fwilkd07"; depends=[]; };
+  ca = derive { name="ca"; version="0.55"; sha256="1mk6hias079ys4khlq0mb4z80mcqhml2n8fdiyfcxy61vj522yb8"; depends=[]; };
   cabootcrs = derive { name="cabootcrs"; version="1.0"; sha256="0a6y04jq837k1pk8b9nhgz7rima7s8jid6vdjyfvrqshgaiabg1q"; depends=[]; };
   cacher = derive { name="cacher"; version="1.1-2"; sha256="17zw30mpi1vrgk1jsxqpw2id3k78rrs6i55kq0yl64aikmq91c0v"; depends=[]; };
   cacheSweave = derive { name="cacheSweave"; version="0.6-1"; sha256="0w30ryd24x2z204k8j41knayq3ax4b5zf0ai1andgdzjvf5jmmas"; depends=[filehash stashR digest]; };
   cacIRT = derive { name="cacIRT"; version="1.3"; sha256="1qd9qw47d9dmxhnva3ik62q5rfcw0pd1ha1y689345nl05wysjkh"; depends=[]; };
   CaDENCE = derive { name="CaDENCE"; version="1.2.1"; sha256="1l6mqra36syvpg9aqh4p6ndj3yj50rabx8hh788zpy4n57m5lpv7"; depends=[]; };
   CADFtest = derive { name="CADFtest"; version="0.3-2"; sha256="00nsnzgjwkif7mbrw7msswjxhi9aysjdx3qg3i4mdmj1rmp7c4dc"; depends=[dynlm sandwich tseries urca]; };
-  CAGExploreR = derive { name="CAGExploreR"; version="1.0.2"; sha256="0vszsvpfg1xn1k5qsx42bmlhb92vsyrsf421g1dwx5lgsl4f7xrr"; depends=[data_table rbamtools R2HTML]; };
-  Cairo = derive { name="Cairo"; version="1.5-5"; sha256="0g709j87fvqmxxliczw2z4zixq786c4n632vrygm3ibqg1vmipiq"; depends=[]; };
+  cAIC4 = derive { name="cAIC4"; version="0.2"; sha256="13sp3wywv82wgi1vsbxwn68v9xigy0fi3mcwyxjmmgmnsxns2fza"; depends=[lme4 Matrix]; };
+  Cairo = derive { name="Cairo"; version="1.5-6"; sha256="0x5xd2xq5q8a3kzmz7f9bawg3j131rhyb3s7w34acg7rd79l1935"; depends=[]; };
   cairoDevice = derive { name="cairoDevice"; version="2.20"; sha256="1v9sdv35a1sl42gsz1y9jw1p6fr19yny07cc2pwmcrb4vs5lhysf"; depends=[]; };
-  CALIBERrfimpute = derive { name="CALIBERrfimpute"; version="0.1-5"; sha256="0daii1qbq624zp466492xnwwf7c8qdagskh0w7nh70fqzh8yhqfr"; depends=[mice mvtnorm randomForest]; };
+  CALIBERrfimpute = derive { name="CALIBERrfimpute"; version="0.1-6"; sha256="036nwnday098mawc9qlgl3jjjcdjnja1immg6xkq27hvv2xfbz82"; depends=[mice mvtnorm randomForest]; };
   calibrate = derive { name="calibrate"; version="1.7.2"; sha256="010nb1nb9y7zhw2k6d2i2drwy5brp7b83mjj2w7i3wjp9xb6l1kq"; depends=[MASS]; };
   calibrator = derive { name="calibrator"; version="1.2-6"; sha256="1arprrqmczbhc1gl85fh37cwpcky8vvqdh6zfza3hy21pn21i4kh"; depends=[emulator cubature]; };
   CALINE3 = derive { name="CALINE3"; version="1.0-2"; sha256="07w1kb7wqdi1qslpvpmqcmq6da4h7sgwv3aih4brdprym61c3rkm"; depends=[]; };
   calmate = derive { name="calmate"; version="0.11.0"; sha256="1zy836nk607ra67q0x7yc4czkcn9ffzlipzhr4mhjk6l5d8sys2q"; depends=[R_utils aroma_core MASS R_methodsS3 R_oo matrixStats R_filesets]; };
-  CAMAN = derive { name="CAMAN"; version="0.67"; sha256="1cckgmbzrjafvql17c94y1h812v2hplv1p7p9kalcg13nzd45inx"; depends=[sp]; };
+  CAMAN = derive { name="CAMAN"; version="0.71"; sha256="1pfdypzj0s1nrlyzlam7pprggiriksfdri5xpmm43gmx3bybx8zb"; depends=[sp mvtnorm]; };
   camel = derive { name="camel"; version="0.2.0"; sha256="0krilird8j69zbll96k46pcys4gfkcnkisww138wslwbicl52334"; depends=[lattice igraph MASS Matrix]; };
-  cancerTiming = derive { name="cancerTiming"; version="1.0.0"; sha256="08m50bsl2cxmkdbx2p9b5cwxkmgn2jhfz9dnc1k9kisy6l9s5p5h"; depends=[LearnBayes]; };
+  cancerTiming = derive { name="cancerTiming"; version="2.0.0"; sha256="0p5hxzhql2rlyx334d8km676va50ql73kxsqjr15q80z7zffyq9d"; depends=[LearnBayes]; };
   candisc = derive { name="candisc"; version="0.6-5"; sha256="0rbmfyhnyaq1j7sql2sgi47ahrggbb71z2z5pw2gg16kd2f465qk"; depends=[car heplots]; };
   cape = derive { name="cape"; version="1.2"; sha256="01bh8lngp346w6pjvbw4jllbr8f9f8ypsxv6c9p6zv5l7w5yzri8"; depends=[corpcor evd qpcR Matrix igraph fdrtool]; };
   caper = derive { name="caper"; version="0.5.2"; sha256="1l773sxmh1nyxlrjz8brnwhwraff826scwixrqmgdciqk7046d35"; depends=[ape MASS mvtnorm]; };
-  capm = derive { name="capm"; version="0.4"; sha256="1vy1vilm1qiwshf28kb7dr60vglqn4gga595plirbfhs0ccay4x9"; depends=[deSolve FME survey ggplot2 reshape2 shiny rgdal maptools sp]; };
+  capm = derive { name="capm"; version="0.5"; sha256="1pal7v965zyl52fivdqn30w570gvhxjsnafml6jz16x4kszw5jar"; depends=[deSolve FME survey ggplot2 reshape2 shiny rgdal maptools sp]; };
   capme = derive { name="capme"; version="1.3"; sha256="0d4acwp4y8djcry8gr34dx3h8bn8sj3z2di5zl9657czw5289zm8"; depends=[lpSolve]; };
   capushe = derive { name="capushe"; version="1.0"; sha256="0dwxaiqnz0qbsk4icjapklaa9bpjfl4gqvk1f92livy97jmf1r44"; depends=[MASS]; };
   capwire = derive { name="capwire"; version="1.1.4"; sha256="18a3dnbgr55yjdk6pd7agmb48lsiqjpd7fm64dr1si6rpgpl4i9c"; depends=[]; };
   car = derive { name="car"; version="2.0-20"; sha256="0dbq3ndw9srrf7pp7wl8gj7cwcgggnjh4i6c9aqmrap7wnaa14fb"; depends=[MASS nnet]; };
   CARBayes = derive { name="CARBayes"; version="3.0"; sha256="0wflay6k159cw8149qb4ib1mlpsbgddlbkiyfxd4qz3vwl06dg3q"; depends=[MASS Rcpp truncdist spam coda]; };
-  carcass = derive { name="carcass"; version="1.1"; sha256="09cg6ba44k0i7v7d380nl5vy7cvmpjjl6zab8sscqql5c2nm0lxk"; depends=[arm survival]; };
+  CARBayesST = derive { name="CARBayesST"; version="1.0"; sha256="1mn2g9i39pzq0jvz1qml41mf1bj6qx3cp5c3hszgm8vbamc2a1xx"; depends=[Rcpp truncdist coda]; };
+  carcass = derive { name="carcass"; version="1.2"; sha256="104lpqs65h9z8d3bl0m1f30anadk9hq4sg2ahgppm5n3d4yhcdl5"; depends=[lme4 survival expm arm]; };
   cardidates = derive { name="cardidates"; version="0.4.5"; sha256="1zw8c8jiq8bz748xppwj88z1882qk7k2r0k2gkrsvw7b6c9h35pb"; depends=[boot pastecs]; };
-  care = derive { name="care"; version="1.1.4"; sha256="0x2496r57h03m53gqmcmbjv7n04bl08si97ff29k6q50jxd1v8hy"; depends=[corpcor]; };
+  care = derive { name="care"; version="1.1.5"; sha256="1gvx4a88ci7428sxna74jxfi8ykzjgnarc18mvm8h3mk7i03r4mj"; depends=[corpcor]; };
   CARE1 = derive { name="CARE1"; version="1.1.0"; sha256="1zwl4zv60mrzlzfgd7n37jjlr0j918a8ji36n94s5xw8wwipiznw"; depends=[]; };
-  caret = derive { name="caret"; version="6.0-24"; sha256="1d56z7bik5ry8iglys4ha1mpkc11g93nm0m15107c44shfi56d3v"; depends=[lattice ggplot2 car reshape2 foreach plyr]; };
+  caret = derive { name="caret"; version="6.0-30"; sha256="11298kqidv69zfaqzf7px539dchvkk64ilxy8k55nx37pn665v01"; depends=[lattice ggplot2 car reshape2 foreach plyr nlme BradleyTerry2]; };
   caribou = derive { name="caribou"; version="1.1"; sha256="0ibl3jhvsgjfcva0113z0di9n5n30bs90yz0scckfv1c0pjhn4xd"; depends=[]; };
+  CarletonStats = derive { name="CarletonStats"; version="1.1"; sha256="18pd1hi8bnbv0sdixw746xvdg9szvng422yj12mk0k50v60403xg"; depends=[]; };
   caroline = derive { name="caroline"; version="0.7.6"; sha256="1afxxbrd7w628l4pxdmvwbs7mbgxlhnfq3nxk2s93w47gn7r9fp7"; depends=[]; };
   CARramps = derive { name="CARramps"; version="0.1.2"; sha256="097xxvql6qglk6x4yi7xsvr15n0yj21613zv003z0mhgvqr1n5vf"; depends=[]; };
   CARrampsOcl = derive { name="CARrampsOcl"; version="0.1.4"; sha256="1sdrir7h7xl1imipm9b71vca062dxqsqd8mg3w9f3s80x2aghxl8"; depends=[OpenCL fields]; };
   caschrono = derive { name="caschrono"; version="1.4"; sha256="1l9hmsacynh73kh14jrp7a42385v78znn9ll1jchzgkyz2x4dibw"; depends=[forecast Hmisc its timeSeries]; };
+  caseMatch = derive { name="caseMatch"; version="1.0"; sha256="1nq1ca59akdsp1a5j3y252zy3fcw5908a7k83k93gjy7j1m7q6f8"; depends=[]; };
   cat = derive { name="cat"; version="0.0-6.5"; sha256="1gv7chqp6kccipkrxjwhsa7yizizsmk4pj8672rgjmpfcc64pqfm"; depends=[]; };
   catdata = derive { name="catdata"; version="1.2"; sha256="0907sr7kjlr47sxaxvkk3za5j2rn6zvckkgjc9inr5hrn5nv5hsv"; depends=[MASS]; };
   CatDyn = derive { name="CatDyn"; version="1.0-5"; sha256="1syc40256104nm8n7h5b7w3ia2iya0y47p1sdxk8g1dy4l5wnalm"; depends=[optimx BB]; };
   catenary = derive { name="catenary"; version="1.1"; sha256="0khdk61fh8ngr70qf9i2655h5nblj98r8zl724ljv1cjb5x1vphv"; depends=[ggplot2 boot]; };
-  catIrt = derive { name="catIrt"; version="0.4-1"; sha256="1rrvm954sfsrl978kb47fv6pr9rczrb8n1ffhh71qjhj1bka35vb"; depends=[numDeriv sfsmisc]; };
+  cati = derive { name="cati"; version="0.8"; sha256="0kz58dyq5jacf2w2nvhyh3dvk0vgcrm7fjfirywykbrbh5srfw2a"; depends=[nlme ade4 ape e1071 mice rasterVis hypervolume]; };
+  catIrt = derive { name="catIrt"; version="0.4-2"; sha256="1s6r85ylznhsf4wwlf2rlyhfp5p84lkp0mxpg1p9bwrqnhahygmk"; depends=[numDeriv sfsmisc]; };
   catnet = derive { name="catnet"; version="1.14.3"; sha256="099vxi3fy5y4w635mqmbzsyqiswsw76kz3l5vgg8ckrj1cqshh5z"; depends=[]; };
   caTools = derive { name="caTools"; version="1.17"; sha256="00jgbna2dm99y5hwk3y28ng2w2c0vxrx4rlz6mhd15z4lsdx1ys6"; depends=[bitops]; };
-  catR = derive { name="catR"; version="3.0"; sha256="1qi5qp6s3xclm1wiid48lnyllax0lns8dxmrvssp04v30j19zwml"; depends=[]; };
+  catR = derive { name="catR"; version="3.1"; sha256="03mp0gmzjdxy5ashlir3l6id5r7iw9mvmwvi12jg2byggm5blby3"; depends=[]; };
   catspec = derive { name="catspec"; version="0.97"; sha256="1crry0vg2ijahkq9msbkqknljx6vnx2m88bmy34p9vb170g9dbs1"; depends=[]; };
   CausalGAM = derive { name="CausalGAM"; version="0.1-3"; sha256="0g68m2kxixwr7rx65r57m1n0qa161igc428zh9rj91fg6h4pdq4w"; depends=[gam]; };
   causalsens = derive { name="causalsens"; version="0.1"; sha256="1v72zjplsa073f92qdza1zvwa1fwxlpmh8f6w5z8qcyiwqcbmifr"; depends=[]; };
   Causata = derive { name="Causata"; version="4.2-0"; sha256="04lndjy4rdf063z75zv42b000z06ffnr91pv2sql1ks6w60zmh1m"; depends=[XML R_utils rjson RMySQL RCurl stringr yaml boot foreach data_table glmnet ggplot2]; };
+  CAvariants = derive { name="CAvariants"; version="2.1"; sha256="105bj6r6i7xz95lr5g4ld9xfgyq1dn15lw117jivx76z3k2zpi59"; depends=[]; };
   cba = derive { name="cba"; version="0.2-14"; sha256="067rm1rfz0rrq8xkzibd81pwvc9rx7ki46bncim4j5ra6i9pn24n"; depends=[proxy]; };
   CBPS = derive { name="CBPS"; version="0.8"; sha256="0a619sgr4iv66y16a7bfywxhniaxsrixr6pqwn88hj0j0k5b312i"; depends=[MASS MatchIt nnet numDeriv]; };
   CCA = derive { name="CCA"; version="1.2"; sha256="00zy6bln22qshhlll0y0adnvb8wa1f7famqyws71b6pcnwxki5ha"; depends=[fda fields]; };
@@ -645,12 +689,12 @@ let self = _self // overrides; _self = with self; {
   CCMnet = derive { name="CCMnet"; version="0.0-2"; sha256="1x5xjnnyr31yq9cgqfrvg71x7mmc2c54r59fv0az49njh3yg3vja"; depends=[sna network ergm]; };
   CCP = derive { name="CCP"; version="1.1"; sha256="07jxh33pb8llk1gx4rc80ppi35z8y1gwsf19zrca9w91aahcs8cx"; depends=[]; };
   CCpop = derive { name="CCpop"; version="1.0"; sha256="10kgw3b98r0kn74w89znq6skgk8b3ldil6yb0hn5rlcf6lazjzca"; depends=[nloptr]; };
-  CCTpack = derive { name="CCTpack"; version="1.1"; sha256="07qqsfmd08amkh8yhfgd2g988v3q1j5p756wdjcy45cgzh5mn7d3"; depends=[R2jags rjags psych mvtnorm polycor MASS]; };
+  CCTpack = derive { name="CCTpack"; version="1.2"; sha256="13350yqfj8fdmlhi2il0jvjfa58q6xrjw6jjwnla0y0kh1hgycb3"; depends=[R2jags rjags psych mvtnorm polycor MASS]; };
   cda = derive { name="cda"; version="1.5.1"; sha256="09a2jb25219hq6if3bx03lsp94rp2ll9g73dhkdi665y7rlhgqwh"; depends=[dielectric Rcpp statmod randtoolbox reshape2 plyr]; };
   cdb = derive { name="cdb"; version="0.0.1"; sha256="1rdb4lacjcw67apdyiv7cl1xvv9d1mrzck1qk605n6794k7wf2ys"; depends=[bitops]; };
   CDFt = derive { name="CDFt"; version="1.0.1"; sha256="0sc8ga48l3vvqfjq3ak5j1y27hgr5dw61wp0w5jpwzjz22jzqbap"; depends=[]; };
   CDLasso = derive { name="CDLasso"; version="1.1"; sha256="0n699y18ia2yqpk78mszgggy7jz5dybwsi2y56kdyblddcmz1yv7"; depends=[]; };
-  CDM = derive { name="CDM"; version="3.2-6"; sha256="07vnvqzrs3zny0p2sq0df37jgiwhzrnlgw9p6dd9x9qn5m9asfm6"; depends=[mvtnorm MASS psych polycor sfsmisc Rcpp RcppArmadillo]; };
+  CDM = derive { name="CDM"; version="3.3-24"; sha256="1s6bp45b9y80i3ildha2v4zb41rpf0vxrwc7rh38pzalvvyawgq7"; depends=[mvtnorm MASS psych polycor sfsmisc Rcpp]; };
   CDNmoney = derive { name="CDNmoney"; version="2012.4-1"; sha256="1bnfsygbzdd70m5s9qq7524b1fybdws46axxjbw9dhwqpr8w85id"; depends=[]; };
   CDVine = derive { name="CDVine"; version="1.2"; sha256="1qfjbzdfz2dydkfw3b0jjma4csn62177j5sgzh6rszf0nifsi97g"; depends=[MASS mvtnorm igraph]; };
   cec2005benchmark = derive { name="cec2005benchmark"; version="1.0.3"; sha256="1fc833ji557y2vb6snlxh90gz1n7fxjfkwjmdcmasj1sfzaalsjy"; depends=[]; };
@@ -664,10 +708,11 @@ let self = _self // overrides; _self = with self; {
   CensRegMod = derive { name="CensRegMod"; version="0.0"; sha256="0vfkyj2mx5l1pmcah8zilxrjlb6iign1by4ydjq8ddk1zyi242sw"; depends=[]; };
   CePa = derive { name="CePa"; version="0.5"; sha256="1y2q72j8bqx509i62a2x9j40rj5bkpgx4z6fwj05ibazc1441asd"; depends=[igraph snow]; };
   cepp = derive { name="cepp"; version="1.0"; sha256="0lw3qr0vp0qbg2b62abhi1ady1dwig68m4nzqnjnk3lqxzp0fs8f"; depends=[trust randtoolbox]; };
+  CerioliOutlierDetection = derive { name="CerioliOutlierDetection"; version="1.0.8"; sha256="0n67y7ah496wck9hlrphya9k753gk44v7zgfz4s2a5ii49739zqi"; depends=[robustbase]; };
   cfa = derive { name="cfa"; version="0.9-3"; sha256="0pl1mxv6jxn3mvlh75gr8as0daklyr7gkh37fcgmn2bwi973sspy"; depends=[]; };
   CfEstimateQuantiles = derive { name="CfEstimateQuantiles"; version="1.0"; sha256="1qf85pnl81r0ym1mmsrhbshwi4h1iv19a2wjnghbylpjaslgxp6i"; depends=[]; };
   CFL = derive { name="CFL"; version="0.1"; sha256="1vi1iiyg7qga7knpqgf30zfzy46aqzs8digkv5933lc2xrv03ap1"; depends=[]; };
-  cg = derive { name="cg"; version="1.0-0"; sha256="1dyisisvys85zwn4hix5zsgs08qgxn75fyb6h7xvk0nvmks1md05"; depends=[Hmisc VGAM MASS lattice survival multcomp nlme]; };
+  cg = derive { name="cg"; version="1.0-1"; sha256="0qi3xzjwx303b9m1sddyvz1raw78m5gy9bxqy08hyja2gqj8v855"; depends=[Hmisc VGAM MASS lattice survival multcomp nlme]; };
   cgam = derive { name="cgam"; version="1.1"; sha256="1dy23ix0ll0riqpdqxhf86fmw4m8mgqmp6m1c4nyhwk2z2adxd3k"; depends=[coneproj]; };
   cgAUC = derive { name="cgAUC"; version="1.1.2"; sha256="1y3q4hmkd6wbn4zjgclla3jif272sn4vv63ijxnfrsylzy02xhln"; depends=[]; };
   cgdsr = derive { name="cgdsr"; version="1.1.30"; sha256="0c8n2c6gqhk5klrxmmyf77czn2zwmm1f9cbp8n8yrhdcdqminznm"; depends=[R_oo R_methodsS3]; };
@@ -678,38 +723,40 @@ let self = _self // overrides; _self = with self; {
   cgwtools = derive { name="cgwtools"; version="1.1"; sha256="11ryc20iqz0xwpq0cfjy37f6mnyrwvhf7kkf574j0v9fn6zg2jic"; depends=[]; };
   ChainLadder = derive { name="ChainLadder"; version="0.1.7"; sha256="06jgxhjlvzcgfm7dnzd81ycf1xx7qcyvk5541qmnvniwqppfvm19"; depends=[systemfit Matrix actuar Hmisc statmod reshape2 MASS lattice tweedie]; };
   changeLOS = derive { name="changeLOS"; version="2.1"; sha256="1bld2phnvcwfpqbkg1ycjci4i4dc4di8gjckbqjp997zyr42nnay"; depends=[survival]; };
-  changepoint = derive { name="changepoint"; version="1.1.2"; sha256="1lx52zdpva5yrnscgwziph0vk5k5mz2saz9ngfma5scxiiqfx3d8"; depends=[zoo]; };
-  ChargeTransport = derive { name="ChargeTransport"; version="1.0.1"; sha256="03xm5rzqhcr4fywrgwh8217rck120wyssxin3ahawqzxvrq3b7pv"; depends=[]; };
-  CHAT = derive { name="CHAT"; version="1.0"; sha256="0w6p5ymiancvha41xyzm61ahmz0a95wqh2kax2whb57l1cpz3ghx"; depends=[DPpackage]; };
+  changepoint = derive { name="changepoint"; version="1.1.5"; sha256="090rak3ydlh92w0mpp2sjjx4m9x33clcs77waj20gzxbq38mqdci"; depends=[zoo]; };
+  ChargeTransport = derive { name="ChargeTransport"; version="1.0.2"; sha256="0mq06ckp3yyj5g1z2sla79fiqdk2nlbclm618frhqcgmq93h0vha"; depends=[]; };
+  CHAT = derive { name="CHAT"; version="1.1"; sha256="1hl4xr4lkvb7r36gcbgax6ipqc3rsvn1r03w7fk9gf9bbyg7bkhg"; depends=[DPpackage]; };
   CHCN = derive { name="CHCN"; version="1.5"; sha256="18n8f002w0p0l1s5mrrsyjddn10kdbb6b7jx1v9h1m81ifdbv0xb"; depends=[bitops RCurl]; };
   cheb = derive { name="cheb"; version="0.3"; sha256="0vqkdx7i40w493vr7xywjypr398rjzdk5g410m1yi95cy1nk4mc7"; depends=[]; };
   chebpol = derive { name="chebpol"; version="1.3-1040"; sha256="13x6li7cs72pnhxxdigg6r9f0nay89hldzh76vp0hi0i2y9vw0dz"; depends=[]; };
   CheckDigit = derive { name="CheckDigit"; version="0.1-1"; sha256="0091q9f77a0n701n668zaghi6b2k3n2jlb1y91nghijkv32a7d0j"; depends=[]; };
+  checkmate = derive { name="checkmate"; version="1.2"; sha256="0n1qqyzwyxg6ymibxpbr84gg5bnrwfgw9klwyyvlq1bhd3qs3njn"; depends=[]; };
   cheddar = derive { name="cheddar"; version="0.1-625"; sha256="1qdxid6h7kyja0ac4v6ml2s6vw5lhrlchcz8lbf37gs9bpx6b4jc"; depends=[]; };
   chemCal = derive { name="chemCal"; version="0.1-34"; sha256="0sn0mhp2d9a9rddfpkiv1pkrmvnv4sy18c1x2ks0lwpaklg78fbs"; depends=[]; };
   chemometrics = derive { name="chemometrics"; version="1.3.8"; sha256="0vd5p2qhd17hr9psk6pg4jvcadz2pjffkjaffva4spa7m7qpp5ss"; depends=[class e1071 gclus lars MASS mclust nnet pcaPP pls rpart robustbase som]; };
-  ChemometricsWithR = derive { name="ChemometricsWithR"; version="0.1.7"; sha256="1mach1lxjrz4hfrlc7w1qgvmphmzky6a15gxn8n0hcxk3v3m90jw"; depends=[ChemometricsWithRData MASS pls]; };
-  ChemometricsWithRData = derive { name="ChemometricsWithRData"; version="0.1.3"; sha256="10zhvr2bfl5d2g27bpxvygkm83lh8qjylfi627jmpcplvvifxb01"; depends=[]; };
+  ChemometricsWithR = derive { name="ChemometricsWithR"; version="0.1.8"; sha256="084da2hx6agryw7bv6img10pqmsdz2mpihbrj6j081lammrik4fj"; depends=[ChemometricsWithRData MASS pls]; };
+  ChemometricsWithRData = derive { name="ChemometricsWithRData"; version="0.1.3"; sha256="14l1y4md8hxq8gvip5vgg07vcr0d9yyhm5ckhzk8zwprdabn9a10"; depends=[]; };
   chemosensors = derive { name="chemosensors"; version="0.7.7"; sha256="1yi0d69nxknca3k7pnxppgjaqyzlc1ksxaa7w31favq0xbdw508n"; depends=[pls plyr reshape2 ggplot2 LearnBayes quadprog RColorBrewer]; };
-  ChemoSpec = derive { name="ChemoSpec"; version="1.61-3"; sha256="1309jsib5gckhpaxs63yp6m0ia97jvzv2lr398f89xbwi81zg8va"; depends=[pls amap chemometrics robustbase RColorBrewer plyr pcaPP mvtnorm mvoutlier rgl R_utils mclust MASS baseline IDPmisc gsubfn lattice seriation]; };
-  cherry = derive { name="cherry"; version="0.4-9"; sha256="018jmmjx30jb85w4729pkwp66napbx9bxn8d1zjslwn14930xbrm"; depends=[bitops]; };
+  ChemoSpec = derive { name="ChemoSpec"; version="2.0-2"; sha256="01zng3nhsynj8kbnk7aisj1803q9svd9n6jnnl0vb82lsb29bfw7"; depends=[pls amap chemometrics robustbase RColorBrewer plyr pcaPP mvtnorm mvoutlier rgl R_utils mclust MASS baseline IDPmisc gsubfn lattice seriation]; };
+  cherry = derive { name="cherry"; version="0.5-10"; sha256="0fs4p5k1lwwlin5fj9z91aw59ybp60phjk293imizg6vpai5h39p"; depends=[bitops lpSolve Matrix]; };
   chillR = derive { name="chillR"; version="0.54"; sha256="1qcwspww5nvp6nh26ly6ckqd0jzq4fkq5svjj5a55pvk04xk9frs"; depends=[pls Kendall spam fields]; };
-  chipPCR = derive { name="chipPCR"; version="0.0.6"; sha256="14rq39nn3k5xak6jvnrwgf2r6nwy435bzkin4a1b9mp7iq3dmb56"; depends=[qpcR outliers robustbase signal]; };
+  chipPCR = derive { name="chipPCR"; version="0.0.7"; sha256="0acj8z92zbfv8b14j31h7vlaf8k4w44z8gcg8vcfhxgskfajcwk0"; depends=[MASS outliers ptw quantreg Rfit robustbase shiny signal]; };
+  chngpt = derive { name="chngpt"; version="2014.5-29"; sha256="0i8hz8cixy3fx9cpprraqpadrs835zna8y64irp85xhckdrv9xzv"; depends=[kyotil MASS]; };
   CHNOSZ = derive { name="CHNOSZ"; version="1.0.3.1"; sha256="0cmirnb8jkaxnscpkwm2a8yyzl9zaf3q323avpgg7fwwhr6c1l19"; depends=[]; };
   ChoiceModelR = derive { name="ChoiceModelR"; version="1.2"; sha256="0dkp3354gvrn44010s8fjbmkpgn1hpl4xbfs5xslql8sk8rw0n2c"; depends=[]; };
   choplump = derive { name="choplump"; version="1.0-0.3"; sha256="10nkkcmpay4rcqbkdhlksnxqb177j5bjpsffyy6q5dbl7nf7whx1"; depends=[]; };
   chords = derive { name="chords"; version="0.67"; sha256="0dj9bbl5abdvvfrn17xxnrnrlvdxw4m841ds37a6pf8dzprs1gdv"; depends=[]; };
-  choroplethr = derive { name="choroplethr"; version="1.4.0"; sha256="1fcbrbql6n6xv3gxiq0sl0lf7swgrsyhbzbwdmx4lnw4v2bn5cka"; depends=[ggplot2 scales plyr Hmisc acs stringr]; };
+  choroplethr = derive { name="choroplethr"; version="1.7.0"; sha256="1sq518zb6pv1sg7vb7ml4wsfpk1a5a73mcmdz8an1lnwnqbywsmy"; depends=[ggplot2 scales plyr Hmisc acs stringr]; };
   chromoR = derive { name="chromoR"; version="1.0"; sha256="1x11byr6i89sdk405h6jd2rbvgwrcvqvb112bndv2rh9jnrvcw4z"; depends=[haarfisz gdata]; };
   chron = derive { name="chron"; version="2.3-45"; sha256="0jkanbisi1bxh35rg0i6sl82f8r9v8va8mf8hknfvwv7p7n3ddpx"; depends=[]; };
   CHsharp = derive { name="CHsharp"; version="0.3"; sha256="0aa9v6yih6qmqsmc8zsl8k1wqsp3sp2bfwri3d37k06vfj7gwbh0"; depends=[scatterplot3d KernSmooth]; };
-  CIDnetworks = derive { name="CIDnetworks"; version="0.2.5"; sha256="0ldpgf370rpylrqp3lbxs6r2x1047y6bxqm40a7yq04i6mg0zwh3"; depends=[mvtnorm msm Rcpp igraph]; };
+  CIDnetworks = derive { name="CIDnetworks"; version="0.6.0"; sha256="0bx1wgcsbkg6zqza435fd11kaqkdspl4mlnjjjca8j0gcfvdjxgc"; depends=[mvtnorm msm Rcpp igraph numDeriv pbivnorm]; };
   CIFsmry = derive { name="CIFsmry"; version="1.0.1"; sha256="118vyiiy4iqn86n9xf84n5hrwrhzhr1mdsmyg9sm6qq6dm7zg6la"; depends=[]; };
-  cimis = derive { name="cimis"; version="0.1-7"; sha256="002drrilp6hi6zpr6wn3dm4sg1pakszw7piydaas0jqsz6qz3n79"; depends=[XML RCurl]; };
   cin = derive { name="cin"; version="0.1"; sha256="1pwvy5nh5nrnysfqrzllb9fcrpddqg02c7iw3w9fij2h8s2v6kq5"; depends=[]; };
   CINID = derive { name="CINID"; version="1.0"; sha256="0xa9zbd578ac5gc2mm7k5yisw5sx8x259c5gwyy6frpkldhbwldn"; depends=[]; };
+  CINOEDV = derive { name="CINOEDV"; version="1.0"; sha256="1a6c0y7nzqmb0x5baf54fyddnhi94ixybwm3mgim45z2jzak6435"; depends=[R_matlab igraph ggplot2 reshape2]; };
   CircE = derive { name="CircE"; version="1.0"; sha256="1fik612iggqv9hvp9nmpx0h6g6s6vfk99z8anvqkk5ify5690g1x"; depends=[]; };
-  circlize = derive { name="circlize"; version="0.0.7"; sha256="1ps6cpir6b8pshqmiwqz5nj620h0i0nq7bk3kmcfmvz1mdszhivf"; depends=[]; };
+  circlize = derive { name="circlize"; version="0.1.0"; sha256="0v5czgs21wn261bw686nbsn3c15ssdkx3frclwqcvqlk61xfghqr"; depends=[]; };
   CircNNTSR = derive { name="CircNNTSR"; version="2.1"; sha256="1rl17kw6bl5xf7pgsc4im12i2kqz4a3b11vzzlb6wfl5yck6iff5"; depends=[]; };
   CircStats = derive { name="CircStats"; version="0.2-4"; sha256="1f2pf1ppp843raa82s2qxm3xlcv6zpi578zc4pl0d7qyxqnh603s"; depends=[MASS boot]; };
   circular = derive { name="circular"; version="0.4-7"; sha256="1kgis2515c931ir76kpxnjx0cscw4n09a5qz1rbrhf34gv81pzqw"; depends=[boot]; };
@@ -719,9 +766,9 @@ let self = _self // overrides; _self = with self; {
   citccmst = derive { name="citccmst"; version="1.0.2"; sha256="1b7awn1hjckxisfdi4ck697hwd4a5sqklwi7xzh6kgqhk9pv7vjn"; depends=[]; };
   CityPlot = derive { name="CityPlot"; version="2.0"; sha256="0lskgxmagqjglvpq39hgbygkf4qp28i2bj6b4m2av1s3pzb4465g"; depends=[]; };
   Ckmeans_1d_dp = derive { name="Ckmeans.1d.dp"; version="3.02"; sha256="1r7zxvrcn8lg8i74fnjr7mqcnhc0y5lsxy1zch1bhbrnbr19sgq5"; depends=[]; };
-  cladoRcpp = derive { name="cladoRcpp"; version="0.14.2"; sha256="0gb8j991dxnyrfwqvcb2vcs8dhmsd8777w00r8gqcxx2yx8civvw"; depends=[Rcpp RcppArmadillo]; };
+  cladoRcpp = derive { name="cladoRcpp"; version="0.14.4"; sha256="0d4vl7xrrwbhhx56ymw52rb5svw9nskxdya4dl04lw1qxc45p4jy"; depends=[Rcpp]; };
   CLAG = derive { name="CLAG"; version="2.18.1"; sha256="0y8m6m01vw3rxwrmxvwhpiy6dd2snr0lhb026l1494y43hhqi3wy"; depends=[]; };
-  class = derive { name="class"; version="7.3-10"; sha256="0yb1y2xnybr7mbpz9lgqcbkfwh9kki3qvkxhdxj33fsyb9c5mydr"; depends=[MASS]; };
+  class = derive { name="class"; version="7.3-11"; sha256="1j6wqirih9x6q50vq21543np4i99ia6ih2ffriiw1gms8xmdfrsk"; depends=[MASS]; };
   classGraph = derive { name="classGraph"; version="0.7-4"; sha256="08cid5bdbciyijlzkx3684gx0cyzcj8myawf4dhcrz00jqrg8v60"; depends=[]; };
   classifly = derive { name="classifly"; version="0.4"; sha256="0mw1vcas0gr1r4yvh0j02zhk7kp5342r0bhhg776hqgqdczgh5zj"; depends=[class plyr]; };
   classify = derive { name="classify"; version="1.2"; sha256="1c1919phhn3xlm807408hhryy1ifm8vf68zcb0gj3adiczpj5xcy"; depends=[Rcpp plyr ggplot2 lattice R2jags reshape2]; };
@@ -729,17 +776,18 @@ let self = _self // overrides; _self = with self; {
   clere = derive { name="clere"; version="1.1"; sha256="1jna5dqy47mldd557qxl7vr59v5lalhligvm3c4k6b2dfararhfr"; depends=[Rcpp]; };
   clhs = derive { name="clhs"; version="0.5-1"; sha256="09165qcnlwz6aaafq4lzzpm7id15wgfbz3am9gfp2g5fyh0irsr2"; depends=[ggplot2 sp raster reshape2 plyr scales]; };
   ClickClust = derive { name="ClickClust"; version="0.1.1"; sha256="1mgim5z4j0lmjlazqqigc88r41ciqnz9d49irm9b2bdjwg2rpilw"; depends=[]; };
-  clickstream = derive { name="clickstream"; version="1.1.0"; sha256="0ak1avqaipxnz8g261346i1wki7vf4hiaj2n5krr85ay7rv4gnym"; depends=[igraph plyr reshape2 Rsolnp]; };
+  clickstream = derive { name="clickstream"; version="1.1.2"; sha256="1l59411jsph6v4rkwanbjcgjcyknywl7ri0hh7z957v02h4m7as1"; depends=[igraph plyr reshape2 Rsolnp]; };
   climdex_pcic = derive { name="climdex.pcic"; version="1.1-1"; sha256="1payygvw327qjab9vzivqd21f5w0gwq3f2jjpmkk89fn7rznz7y2"; depends=[PCICt caTools Rcpp]; };
   clime = derive { name="clime"; version="0.4.1"; sha256="0qs9i7cprxddg1cmxhnmcfhl7v7g1r519ff2zfipxbs59m5xk9sf"; depends=[lpSolve]; };
-  clinfun = derive { name="clinfun"; version="1.0.5"; sha256="1498xxyc1j59fr8p6nskhphk558s7dd6p5gvdq24frmlx6nagxd6"; depends=[mvtnorm]; };
+  clinfun = derive { name="clinfun"; version="1.0.6"; sha256="00prrdm6qm5p2sjjlhi99msvqpxcm492z378wgl65iwf0jywdnpw"; depends=[mvtnorm]; };
   clinsig = derive { name="clinsig"; version="1.0-4"; sha256="0w2qb9k6fkw9lqi0ib6kzi6pvpb5hpq78w9x2jjs0yyqsj0rydwv"; depends=[]; };
   clinUtiDNA = derive { name="clinUtiDNA"; version="1.0"; sha256="0x3hb09073gkh60fc8ia0sfk948sm6z6j8sqkz275k4m8ryrabas"; depends=[]; };
-  clogitL1 = derive { name="clogitL1"; version="1.3"; sha256="0bf1x0q3svw286jc8yyjfyqlb1rpvbylksyhwh0ik1v9wp808fqq"; depends=[Rcpp]; };
+  clogitL1 = derive { name="clogitL1"; version="1.4"; sha256="0m9yrg9mzzfv5qkdf6w55xyrjdghyrf27kk7b4x2gyvwvi5b7dkm"; depends=[Rcpp]; };
   cloudUtil = derive { name="cloudUtil"; version="0.1.10"; sha256="1j86vpd4ngrdpfjk44wb1mp0l88dxia64pjd2idfcd276giplh6s"; depends=[]; };
   clpAPI = derive { name="clpAPI"; version="1.2.6"; sha256="1kgzmzf87b0j43ch21anmm2d73bj2d16slmyavpbkdwg72dg1sjb"; depends=[]; };
   CLSOCP = derive { name="CLSOCP"; version="1.0"; sha256="0rkwq9rl2ph4h5zwb2i3yphjyzxmh6b6k23a8gcczycx6xdq4yhw"; depends=[Matrix]; };
   clue = derive { name="clue"; version="0.3-48"; sha256="1lwfm5sk9d35khcrvjs91bixfnjc3zwyfzq5ma9ljsc6hs80y8ar"; depends=[cluster]; };
+  clues = derive { name="clues"; version="0.5-4"; sha256="0pgd3vjfplvsfn3nw6sqlkfsv6lbpjlcai7z9qp31qcih3g71vgr"; depends=[]; };
   cluster = derive { name="cluster"; version="1.15.2"; sha256="0bv7qsbf6x3gq2iz3rwbjsj3cs8j0dvzxjhwdsvnqgkc1yhpkr13"; depends=[]; };
   clusterCrit = derive { name="clusterCrit"; version="1.2.3"; sha256="0xd06w7jsl3srvhqx08vywy191k97lk3mgl2hsx1ki8ydplrdyha"; depends=[]; };
   cluster_datasets = derive { name="cluster.datasets"; version="1.0-1"; sha256="0i68s9305q08fhynpq24qnlw03gg4hbk4184z3q3ycbi8njpr4il"; depends=[]; };
@@ -749,13 +797,14 @@ let self = _self // overrides; _self = with self; {
   clusterGenomics = derive { name="clusterGenomics"; version="1.0"; sha256="127hvpg06is4x486g1d5x7dfkrbk7dj35qkds0pggnqxkq3wsc1c"; depends=[]; };
   clusterPower = derive { name="clusterPower"; version="0.5"; sha256="1g2qpvizyk4q3qlgvar436nrfqxwp5y8yi2y6rch9ak5mbg3yzqb"; depends=[lme4]; };
   clusterRepro = derive { name="clusterRepro"; version="0.5-1.1"; sha256="0vsf6cq6d51a4w23ph8kdz2h8dfpzyd6i85049p2wakn1kdvkz5p"; depends=[]; };
-  clusterSim = derive { name="clusterSim"; version="0.43-4"; sha256="12ngcfh68ck7511yrc9agjnxwbxz52zddmvp8xyayxj8j7qnkk91"; depends=[cluster MASS ade4 e1071 rgl R2HTML]; };
+  clusterSim = derive { name="clusterSim"; version="0.43-5"; sha256="07vdvhlvk31srnw1vwgwqgj2dimgbagp7mnz7n1rwcm1qxnndsmy"; depends=[cluster MASS ade4 e1071 rgl R2HTML]; };
   clusteval = derive { name="clusteval"; version="0.1"; sha256="1ld0bdl4fy8dsfzm3k7a37cyxc6pfc9qs31x4pxd3z5rslghz7rj"; depends=[mvtnorm Rcpp]; };
   clusthaplo = derive { name="clusthaplo"; version="1.2"; sha256="17vxk61bw99h34n9a6vp40nanigfai34s237ydb56jpamsq8sf2b"; depends=[ggplot2]; };
+  clustMD = derive { name="clustMD"; version="1.0"; sha256="1i3c790k300a7y5xhqanp8f1bid2q3a0ajwgf5qsr6dv3ld4h7vj"; depends=[tmvtnorm mvtnorm truncnorm MASS mclust msm]; };
   ClustOfVar = derive { name="ClustOfVar"; version="0.8"; sha256="17y8q2g4yjxs2jl1s8n5svxi021nlm0phs1g5hcnfxzpadq84wbs"; depends=[]; };
   clustrd = derive { name="clustrd"; version="0.1.2"; sha256="022lzp1wvbaa20d8hribgq9miy6i7jxm5m1p3p52h9b7bzga3q6g"; depends=[corpcor e1071 ggplot2 irlba]; };
   clustsig = derive { name="clustsig"; version="1.1"; sha256="0n5nf712vsa8zb0c2lv4gjqsgva62678vjngr9idgswb73shxm8v"; depends=[]; };
-  ClustVarLV = derive { name="ClustVarLV"; version="1.2"; sha256="0831nrid4wv99p35zinhfcnr2kgh4rmgg3vq62rzvcabsq9l825r"; depends=[Rcpp]; };
+  ClustVarLV = derive { name="ClustVarLV"; version="1.3"; sha256="13v7ip42wdzgvzpmkd8pzhv8j0kcavkby8fl4x4wn35ds46hx1v5"; depends=[Rcpp]; };
   clustvarsel = derive { name="clustvarsel"; version="2.0"; sha256="0ql98r2aqwfmbn48xd68wpi2lk671aj2l8dqjn0jjp1vrk9fbw1m"; depends=[mclust BMA foreach iterators]; };
   clv = derive { name="clv"; version="0.3-2.1"; sha256="1qgp2qhblg6ysyrlg0ad169ahwhcyn5pvsqzdlqj700y1k7wl7mc"; depends=[cluster class]; };
   clValid = derive { name="clValid"; version="0.6-6"; sha256="1l9q7684vv75jnbymaa10md13qri2wjjg7chr1z1m0rai8iq3xxw"; depends=[cluster class]; };
@@ -764,9 +813,11 @@ let self = _self // overrides; _self = with self; {
   CMF = derive { name="CMF"; version="1.0"; sha256="0hvqcbmg2vd0i1rjb1m1bkrbv2vkj1siank1v8w0n5b6881cyz7q"; depends=[Rcpp]; };
   cmm = derive { name="cmm"; version="0.7"; sha256="16pw9namrc3crcqnsn4ckk8m4r3af908wm2siw6fzbk6hwac17i6"; depends=[]; };
   CMPControl = derive { name="CMPControl"; version="1.0"; sha256="0cp29cibiydawsl0cq433l9abdivr16b431zlrh45wzr5kzfcs0v"; depends=[compoisson]; };
-  cmprsk = derive { name="cmprsk"; version="2.2-6"; sha256="0ln72h57icsch967hm398bilv13zf9jxjal2zfsa0rv0cishw8qd"; depends=[survival]; };
+  cmprsk = derive { name="cmprsk"; version="2.2-7"; sha256="1imr3wpnj4g57n2x4ryahl4lk8lvq9y2r7319zv3k82mznha8bcm"; depends=[survival]; };
   cmrutils = derive { name="cmrutils"; version="1.2-2"; sha256="0gc4sx8g9364sybmrqdjdvddqjd9ps6v205kaw0nqdx30xn96hmm"; depends=[chron]; };
+  cna = derive { name="cna"; version="0.1-3"; sha256="0y6qqg4454njldm8qipq260jbwfkh23iffpyghjnj2raw5fjgh8b"; depends=[]; };
   cncaGUI = derive { name="cncaGUI"; version="0.0-2"; sha256="1rgs7446qb40b4qi1i4m5c3111kbqap4z1g7s01pnbylil0m80fd"; depends=[rgl tcltk2 tkrplot]; };
+  CNOGpro = derive { name="CNOGpro"; version="1.0"; sha256="02vqnjsz0402xdqsxrxicgdsyi3nqc3cfrbabfkywn3q102gzq0f"; depends=[seqinr]; };
   CNprep = derive { name="CNprep"; version="1.0"; sha256="1i8iz0ir14g56zjsj8z4kmds5rybg8jjra33v0qcjwp489s6475a"; depends=[mclust rlecuyer]; };
   CNVassoc = derive { name="CNVassoc"; version="2.0.1"; sha256="0xf5rrcv7pl158fbz0yjibmrigpqgzwvdyl1gw0fkn5jjsm62hsm"; depends=[CNVassocData mixdist mclust survival]; };
   CNVassocData = derive { name="CNVassocData"; version="1.0"; sha256="17r3b1w9i9v6llawnjnrjns6jkd82m2cn9c90aif8j0bf4dmgdli"; depends=[]; };
@@ -775,29 +826,31 @@ let self = _self // overrides; _self = with self; {
   COBRA = derive { name="COBRA"; version="0.99.4"; sha256="1r1cw12d7c148pcgcg08bfsr1q1s736kfpyyss6b4d7ny7wgmqy4"; depends=[]; };
   cobs = derive { name="cobs"; version="1.2-2"; sha256="1g8qwnda7fqrqknz7lnlq47kqs5k83pg9qq205alm12jgx3180a1"; depends=[SparseM quantreg]; };
   cobs99 = derive { name="cobs99"; version="0.9-12"; sha256="0zd0nyw8ma7k90i1k3ryn6qcb6yivrrajc6nmdh4f95ihvhc9ksm"; depends=[]; };
-  CoClust = derive { name="CoClust"; version="0.2-9"; sha256="0qzvbyv7p7gi4pmvgwc1zc164d4cph20sy8ypgskx2pli2n3lh0d"; depends=[copula gtools]; };
+  CoClust = derive { name="CoClust"; version="0.3-0"; sha256="0vcjy8mr8vfs5j1x0xz1zkjn6l08pg6r28ffbdvrqrbalnh87v3s"; depends=[copula gtools]; };
   cocor = derive { name="cocor"; version="1.0-0"; sha256="173kszv661hailav69khqh9c15y9m5n6l7crc9i6vf71yrig1vqs"; depends=[]; };
   cocorresp = derive { name="cocorresp"; version="0.2-1"; sha256="0q41clhp4nl9vyakfmnhr5ix7nxfq0phq8xa02na38qhfwpxznfn"; depends=[vegan]; };
   cocron = derive { name="cocron"; version="1.0-0"; sha256="190kfv7haybi7s33bqf8dd3pcj8r6da20781583rrq6585yqh4g6"; depends=[]; };
   coda = derive { name="coda"; version="0.16-1"; sha256="0575pbx37jn7ljgjybl2v7rry55l6s6cb3a0m9znh4blln405q4i"; depends=[lattice]; };
   codadiags = derive { name="codadiags"; version="1.0"; sha256="1x243pn6qnkjyxs31h1hxy8x852r0fc952ww77g40qnrk8qw79xg"; depends=[coda]; };
-  codep = derive { name="codep"; version="0.2-2"; sha256="1knl6hrqf98lslgn3hvafxpwvrzcy4fjdw0gg44dixcynv08rncr"; depends=[]; };
+  codep = derive { name="codep"; version="0.4-1"; sha256="1jkd6k80d6vyriwmq1car5zjms304zrdrfbjib664zxzx1wadf8z"; depends=[]; };
   codetools = derive { name="codetools"; version="0.2-8"; sha256="0m326kfxihm5ayfn5b4k8awdf34002iy094gazbc3h0y42r4g86b"; depends=[]; };
   coefficientalpha = derive { name="coefficientalpha"; version="0.2.6"; sha256="0a0fvg22sg3idavv2qrb9sjvjjfm39fvpjsxz83a7bk6400vflsr"; depends=[MASS]; };
   coefplot = derive { name="coefplot"; version="1.2.0"; sha256="1v6c3fk2wrjgs3b31vajmig6dvmp5acfm72wh0iffpg0qgvf5hh7"; depends=[ggplot2 plyr reshape2 useful scales proto]; };
+  coenocliner = derive { name="coenocliner"; version="0.1-0"; sha256="0hys1a4ai09pax5ydcaq39ll3rdjzyhgvz72z0iv9fwv4fbmwbr9"; depends=[]; };
   coexist = derive { name="coexist"; version="1.0"; sha256="15ydhrx996i6caa0360c2bgn2zvgwfg5wdhsqq1gvrggs15w7nml"; depends=[]; };
   CoImp = derive { name="CoImp"; version="0.2-3"; sha256="04n0drx98hi8hmlb5xwl87ylv03j1ld04vp9d8s5sphvm9bbx690"; depends=[copula nnet gtools locfit]; };
   coin = derive { name="coin"; version="1.0-23"; sha256="07433fblandxb8gzkzln49cckv75mqr2z847dwsa3qz68callxba"; depends=[survival modeltools mvtnorm]; };
   CoinMinD = derive { name="CoinMinD"; version="1.1"; sha256="0invnbj5589wbs0k2w5aq9qak7axc3s0g9nw85c48lnl0v95s91i"; depends=[MCMCpack]; };
   colbycol = derive { name="colbycol"; version="0.8"; sha256="198zc4jd7gby1dhvmg7fy41ldbxkgqj6ram54g3w6sw0yv9ilk8r"; depends=[rJava filehash]; };
   cold = derive { name="cold"; version="1.0-3"; sha256="17nlqhp5415m8wjkb2ykmk1q3lgw1aycf85b6byl8p06bfrvmw2p"; depends=[]; };
-  CollocInfer = derive { name="CollocInfer"; version="1.0.0"; sha256="1q8bbj331iylvkvr0gqxvjnbdhncb549vlcamy0iqa9cl0gjlijv"; depends=[fda deSolve MASS Matrix spam]; };
+  CollocInfer = derive { name="CollocInfer"; version="1.0.1"; sha256="0wfk3qw28msz3wqm5xmivjgi18kqv1s6w76vh71zq777d6a7al6i"; depends=[fda deSolve MASS Matrix spam]; };
   coloc = derive { name="coloc"; version="2.3-1"; sha256="1j3m9afpkm0bzib38yqvk85b6s6l56s6j2ni96gii4a06r87ig60"; depends=[colorspace MASS BMA]; };
   colorfulVennPlot = derive { name="colorfulVennPlot"; version="2.4"; sha256="01b3c060fbnap78h9kh21v3zav547ak2crdkvraynpd2096yk51w"; depends=[]; };
   colorRamps = derive { name="colorRamps"; version="2.3"; sha256="0shbjh83x1axv4drm5r3dwgbyv70idih8z4wlzjs4hiac2qfl41z"; depends=[]; };
+  colorscience = derive { name="colorscience"; version="1.0.0"; sha256="0429vlirc95nblmhs5lplh3lw9aay9qnkpib77rbmjzczv551m3d"; depends=[Hmisc munsellinterpol pracma]; };
   colorspace = derive { name="colorspace"; version="1.2-4"; sha256="1ppvkcclqjdj1b9j59sc2gda55kmwq9l00n5643ggjb15m2dm76h"; depends=[]; };
   colortools = derive { name="colortools"; version="0.1.5"; sha256="0z9sx0xzfyb5ii6bzhpii10vmmd2vy9vk4wr7cj9a3mkadlyjl63"; depends=[]; };
-  colourlovers = derive { name="colourlovers"; version="0.1.2"; sha256="1mrdw10j6b6xihsh29vjqiz1jmw3h7lm77y2zcnw01g1lqb4rqlp"; depends=[XML RJSONIO png]; };
+  colourlovers = derive { name="colourlovers"; version="0.1.3"; sha256="09hacmzcw6am8l6725wny2rrrzzn46vk2730ni7rgynk49b2wr9h"; depends=[XML RJSONIO png]; };
   comato = derive { name="comato"; version="1.0"; sha256="03jnvv0sczy13r81aljhj9kv09sl5hrs0n5bn3pdi7ba64zgbjiw"; depends=[igraph Matrix lattice gdata XML cluster clusterSim]; };
   combinat = derive { name="combinat"; version="0.0-8"; sha256="1h9hr88gigihc4na7lb5i7rn4az1xa7sb34zvnznaj6pdrmwy4qm"; depends=[]; };
   CombinS = derive { name="CombinS"; version="1.0"; sha256="0gi66hmj3jmr301r2ahrln4zjjjvl6gabdv3y5df7aqidxlbhqbb"; depends=[]; };
@@ -806,6 +859,7 @@ let self = _self // overrides; _self = with self; {
   commandr = derive { name="commandr"; version="0.9.5"; sha256="1i960c4hszxm10qcpn9hrhxfzxfp9yywkbj4i9hraj8ka759z75a"; depends=[]; };
   CommonJavaJars = derive { name="CommonJavaJars"; version="1.0-4"; sha256="0amn8z8im64q1k6j6l2bh4795b6i665wxqpgabhv471zfhdk0nil"; depends=[]; };
   CommonTrend = derive { name="CommonTrend"; version="0.7-1"; sha256="088pg2hy2g2jgs84xawrnsf7gpvrpqjsimkx7g0i5r5fmkx169f9"; depends=[MASS urca]; };
+  CommunityCorrelogram = derive { name="CommunityCorrelogram"; version="1.0"; sha256="1wkrm5lil595sc4ih3qsf4sgvfipzlav0n7339ixqw9zxm2pg4nj"; depends=[vegan]; };
   comorbidities = derive { name="comorbidities"; version="1.0"; sha256="01aisxy4cx3jw37cg6mwvfj4nv10ndmwjxf8xsfv7s20hdb0gmqn"; depends=[]; };
   Comp2ROC = derive { name="Comp2ROC"; version="1.0"; sha256="0vymjbxdlvm5dvss4z4zjdc7y7040s3j972gh2138wfygji1szg7"; depends=[ROCR boot]; };
   compactr = derive { name="compactr"; version="0.1"; sha256="0f2yds6inmx0lixj08ibqyd2i61l2cbg1ckgpb8dl2q7kcyyd6mx"; depends=[]; };
@@ -815,11 +869,13 @@ let self = _self // overrides; _self = with self; {
   CompareTests = derive { name="CompareTests"; version="1.0"; sha256="098axl20jid35pqvgiwk6h91waafigwks6n5f4pg7xxx1fifks4f"; depends=[]; };
   comparison = derive { name="comparison"; version="1.0-4"; sha256="0pc462rhk8gr8zrf08ksi315kmhydlp027q5gd40ap5mmhk7rd82"; depends=[isotone]; };
   compeir = derive { name="compeir"; version="1.0"; sha256="1bb5459wcqpjic2b9kjn0l0qdn7sqmmx34hdb2aqg80q22mhx5dv"; depends=[lattice etm]; };
+  CompGLM = derive { name="CompGLM"; version="1.0"; sha256="04bjal92r0m7is5ygqpd0mdz3fb3pwcr7rc3mbxg9sg57nff3kf5"; depends=[Rcpp]; };
   compHclust = derive { name="compHclust"; version="1.0-2"; sha256="1h39krvz516xwsvn5987i1zbzan8vx2411qz6dad112hpss0vyk9"; depends=[]; };
   complex_surv_dat_sim = derive { name="complex.surv.dat.sim"; version="2.0.0"; sha256="1x4whyq0bds0zblppcvv7lk6qy567c37x19n1r0xjgyl3id40f7c"; depends=[eha statmod]; };
   CompLognormal = derive { name="CompLognormal"; version="3.0"; sha256="1dhgr9l713l2n889bpa47lbg2qab0fz0r15qa928c0b9nz688ddm"; depends=[numDeriv]; };
   compoisson = derive { name="compoisson"; version="0.3"; sha256="0v5dl7xydqi4p97nipn4hyhpq2gghmx81ygvl0vc8b65jhq89y0p"; depends=[MASS]; };
   COMPoissonReg = derive { name="COMPoissonReg"; version="0.3.4"; sha256="1mf2q7phc2bn700yp7i2i6ccj6lrvh8b2dmibqihh76a85j1ycrq"; depends=[]; };
+  compositions = derive { name="compositions"; version="1.40-1"; sha256="1hn139g86bc1q3dj6kj9f21042v4x0xgrp4ni1zvx1zx8xmy3h8b"; depends=[tensorA robustbase energy bayesm]; };
   compound_Cox = derive { name="compound.Cox"; version="1.4"; sha256="08sdkq040zk9mb1lcy4nm32gwab26vaig8brp2n3aizagx9fv3r9"; depends=[numDeriv survival]; };
   Compounding = derive { name="Compounding"; version="1.0.2"; sha256="1xlb3ylwjv70850agir0mx79kcvs43h0n1sm22zcny3509s2r7lf"; depends=[hypergeo]; };
   CompQuadForm = derive { name="CompQuadForm"; version="1.4.1"; sha256="1kv4bdkwidkjw0hgn2krv42p9v1a03p47g0p03lja3flhfbmiifj"; depends=[]; };
@@ -828,10 +884,10 @@ let self = _self // overrides; _self = with self; {
   ConConPiWiFun = derive { name="ConConPiWiFun"; version="0.4.2"; sha256="0x3md1xfrrg41qfyafbvl9qaa6yy81nky3pl5z9qs850mjbs8qdl"; depends=[Rcpp]; };
   concor = derive { name="concor"; version="1.0-0.1"; sha256="0hjyvi6p16cyrmq0bq7fph1r5f3adp7zpf123wkm5bkjnc5122k0"; depends=[]; };
   concreg = derive { name="concreg"; version="0.5"; sha256="0psvnirl5rqicyzxs9sivh23bzzwdgviqczdl2in2gnrvdiw7m6f"; depends=[survival]; };
-  cond = derive { name="cond"; version="1.2-2"; sha256="0r4z8gkjqd5l9j83k23v7x2w5j7lr3kzzdrgm1fvc6sf8lb18lf7"; depends=[statmod survival]; };
+  cond = derive { name="cond"; version="1.2-3"; sha256="0y7m7valk7zn40y62348czmdvfkx59il9sl6wy565lzqfiimd9ps"; depends=[statmod survival]; };
   condGEE = derive { name="condGEE"; version="0.1-4"; sha256="0mqj2pc91n8h3arpd4b9f7ndbcnai21c67is22qg22wj7vhhs87h"; depends=[numDeriv rootSolve]; };
   condmixt = derive { name="condmixt"; version="1.0"; sha256="05q1fj7akf6lsq9rbcqqkzlx82jvk6mlvmwx6jzk8j228fwqmg90"; depends=[evd]; };
-  CondReg = derive { name="CondReg"; version="0.16"; sha256="1240xspnxh9fkj35jal07rpk7q7h05cvzvpypg4wcx3gvb02askj"; depends=[]; };
+  CondReg = derive { name="CondReg"; version="0.20"; sha256="1ffnrjfjcb66i9nyvidkcn4k9pcj4r7xanjwzcxcrj2qm39apkqx"; depends=[]; };
   coneproj = derive { name="coneproj"; version="1.4"; sha256="07zhqidjinpphvr7xdzrn3f5iq6bx8c2sj5gya2bz8glf4x74h9d"; depends=[Rcpp]; };
   conf_design = derive { name="conf.design"; version="2.0.0"; sha256="06vdxljkjq1x56xkg041l271an1xv9wq79swxvzzk64dqqnmay51"; depends=[]; };
   confReg = derive { name="confReg"; version="0.1.3"; sha256="0cwz5wnrk0qppj65gskizy2jb9y6x6xhkyb5qhd5xfc698x6ivs2"; depends=[e1071]; };
@@ -840,55 +896,57 @@ let self = _self // overrides; _self = with self; {
   conics = derive { name="conics"; version="0.3"; sha256="06p6dj5dkkcy7hg1aa7spi9py45296dk0m6n8s2n3bzh3aal5nzq"; depends=[]; };
   conjoint = derive { name="conjoint"; version="1.39"; sha256="0f8fwf419js9c292i3ac89rlrwxs2idhwxml1qd8xd2ggwfh6w5m"; depends=[AlgDesign clusterSim]; };
   ConjointChecks = derive { name="ConjointChecks"; version="0.0.9"; sha256="097mhiz8zjmmkiiapr3zfx7v35xirg57nqp1swd72dixaa23nhr1"; depends=[]; };
-  ConnMatTools = derive { name="ConnMatTools"; version="0.1.4"; sha256="1z9bq6npm0131msjj35mx053kb7y4xvhg5gcchs45fxk81mbv84b"; depends=[]; };
+  ConnMatTools = derive { name="ConnMatTools"; version="0.1.5"; sha256="02cv2rlfp9shwqc9nwb8278akmwv7yvviwl23jglzsyh721dpqkr"; depends=[]; };
   CONOR = derive { name="CONOR"; version="1.0.2"; sha256="1h6vx8hq8lbjdhv466q9q4h13hir1pfj6bjmg90gmqjwrpbdciw1"; depends=[CLSOCP tseries outliers nortest quadprog zoo fields fpc flexclust plyr CONORData]; };
   CONORData = derive { name="CONORData"; version="1.0.2"; sha256="0a52wz9i9md15wqvhh105wjvlw4byx7qgy9i1sd1wr4jn84ir5wf"; depends=[CLSOCP tseries outliers nortest quadprog zoo fields fpc flexclust plyr]; };
-  constrainedKriging = derive { name="constrainedKriging"; version="0.2.2"; sha256="1bza9xnzvymskxc02s8pc2xafh7sdp0mvfcn7hnjvc7ma2rmjprp"; depends=[sp spatialCovariance rgeos RandomFields]; };
+  constrainedKriging = derive { name="constrainedKriging"; version="0.2.3"; sha256="1hppfc0pv0jphmj7pip1cn65sfrcwvnpymlvpyp7sbn3nmy2qqrb"; depends=[sp spatialCovariance rgeos RandomFields]; };
   contfrac = derive { name="contfrac"; version="1.1-9"; sha256="16yl96bmr16a18qfz6y5zf7p02ky1jy2iimcb1wp50g7imlcq840"; depends=[]; };
-  conting = derive { name="conting"; version="1.1"; sha256="0l2chipx3a3mqj7hrb16ca4hwgxbmg3h0p2s2864l0kxq5my7n62"; depends=[mvtnorm BMS gregmisc tseries coda]; };
+  conting = derive { name="conting"; version="1.3"; sha256="1aw3hp88xif5s94388g4805xqnv21dj47wshgkbg33dn11lf2hwf"; depends=[mvtnorm BMS gtools tseries coda]; };
   contrast = derive { name="contrast"; version="0.19"; sha256="1kc3scz3msa52lplc79mmn4z99kq1p2vlb18wqxa9q2ma133x6pl"; depends=[rms]; };
   ConvCalendar = derive { name="ConvCalendar"; version="1.2"; sha256="0yq9a42gw3pxxwvpbj6zz5a5zl7g5vkswq3mjjv5r28zwa3v05vc"; depends=[]; };
   ConvergenceConcepts = derive { name="ConvergenceConcepts"; version="1.0"; sha256="1s6yxiaxmv7yxydwjhxi778vznh4gs8l5cgy308bxj53d4d6kfkz"; depends=[tkrplot lattice]; };
   convexHaz = derive { name="convexHaz"; version="0.2"; sha256="0lfksb01iilhyjbr9wj3w4s9nbkdcl649w86fp2mz6s6makmq84x"; depends=[]; };
-  cooccur = derive { name="cooccur"; version="1.0"; sha256="12h8bfy5gml47g6b151cynvybh3w8a3swq6l9563qsiq67hivn44"; depends=[reshape gmp ggplot2]; };
+  cooccur = derive { name="cooccur"; version="1.1"; sha256="1q2x89jpr81jq0hw218c9h8spc1gwgax58j8npgd6rnzlkpxxyam"; depends=[reshape2 gmp ggplot2]; };
   COP = derive { name="COP"; version="1.0-2"; sha256="1gynknplvx97hjhi7adsgq9r9lqismch1q1pqvgmz0x1wkg4jj40"; depends=[dr MASS]; };
-  copas = derive { name="copas"; version="0.8-0"; sha256="08c645n4pp077nh7c6b099bpw4vkkz02w0nsm6rrks7kx1kzd3yd"; depends=[meta]; };
+  COPASutils = derive { name="COPASutils"; version="0.1"; sha256="1w080k6fpbvcx1pqaa2n5vhf7nmr1z403wj7ilkxy5s6cw7gmyi5"; depends=[ggplot2 reshape2 dplyr kernlab stringr knitr]; };
   copBasic = derive { name="copBasic"; version="1.5.4"; sha256="1za91mkahkrcg4h54ii2zk3c22rn8krsa95aj9y0kgg3rxnd09hz"; depends=[lmomco]; };
-  copula = derive { name="copula"; version="0.999-8"; sha256="12l0qd4ny9s5j88wggd09r6n3lv17zdf46brl5v7v83rnbd0c27l"; depends=[Matrix gsl ADGofTest stabledist mvtnorm pspline]; };
-  copulaedas = derive { name="copulaedas"; version="1.3.1"; sha256="1prmj3z5znifd2mqq7s9z566fbskrcjx0ly43dcvjc9mb6fpq34p"; depends=[copula vines mvtnorm truncnorm]; };
+  copula = derive { name="copula"; version="0.999-10"; sha256="1xx7f1mzym8amlyf84s7yrwygyfcvfqisar64ikyr1ksf571l77i"; depends=[Matrix gsl ADGofTest stabledist mvtnorm pspline]; };
+  copulaedas = derive { name="copulaedas"; version="1.4.1"; sha256="1xs02s91la4i1x1zs8k5gfvd9jhs2zqhv58431p1j3spfapzf2rc"; depends=[copula vines mvtnorm truncnorm]; };
   CopulaRegression = derive { name="CopulaRegression"; version="0.1-4"; sha256="17cfs47g5am0gf6kv366v87zv2gcmc7s7bcay4ccfqzqhbhli2i4"; depends=[MASS VineCopula]; };
-  CopyDetect = derive { name="CopyDetect"; version="1.0"; sha256="013h9p3fz8dp8f54ddcr6q9nh76ayg6cwmx3ycv5cxmdyd9nz1y8"; depends=[irtoys]; };
+  CopyDetect = derive { name="CopyDetect"; version="1.1"; sha256="0h9bf7ay5yr6dwk7q28b6xxfzy6smljkq6qwjkzfscy5hnmwxkpa"; depends=[irtoys]; };
   corclass = derive { name="corclass"; version="0.1"; sha256="02mxypdrjwf8psk0j9ggbw14889a87c6lw11qki3s3biq52qsx3y"; depends=[igraph]; };
   corcounts = derive { name="corcounts"; version="1.4"; sha256="0irlx62ql5rp5s7nnjdy6jh723wl4039wn10zxri8ihxwqsyyz3f"; depends=[]; };
-  CORE = derive { name="CORE"; version="1.2"; sha256="0r63fyrxx2dkjnr2pdciw3a93zzhmvr75z7xd6grxp1ay3brq78n"; depends=[]; };
-  CORElearn = derive { name="CORElearn"; version="0.9.42"; sha256="19lp1vzqc68ns10bjvsbk2d8v349pya3f6pn9a89w1q0ihp705fm"; depends=[cluster rpart]; };
-  corHMM = derive { name="corHMM"; version="1.13"; sha256="0g2qhk4j6dhpigypxvbm7kib0brdrfi13ssrj1s3mccm1qaf3j79"; depends=[ape nloptr expm numDeriv corpcor phangorn rgenoud]; };
-  CORM = derive { name="CORM"; version="1.0.1"; sha256="1srkca74c1k3q7xqrr5h9909pl5ydlhb1v79g2z9vvljwi3bz7n0"; depends=[cluster]; };
+  CORE = derive { name="CORE"; version="2.0"; sha256="18vnqfasrn0bkplr3qj21wrksnj8wbsfhg7r0aimaa9c9nz9l7kg"; depends=[]; };
+  CORElearn = derive { name="CORElearn"; version="0.9.43"; sha256="0qzj2fx8if157dplxcsss5s0gllwf183vhiqmapbkdix2h9l9jk5"; depends=[cluster rpart]; };
+  corHMM = derive { name="corHMM"; version="1.14"; sha256="03kwj8y4c4jw9lwpvyi3539184yifhcavbhh6rbw9pasnxkzj28l"; depends=[ape nloptr expm numDeriv corpcor phangorn rgenoud]; };
+  CORM = derive { name="CORM"; version="1.0.2"; sha256="0g5plafx2h1ija8jd6rxvy8qsrqprfbwbi1kq1p4jdr9miha20nv"; depends=[cluster]; };
   corpcor = derive { name="corpcor"; version="1.6.6"; sha256="0rjlqbh76f5q3sjbh9nhvsip9391mnh05x5f7cqi6rp63c194v12"; depends=[]; };
   corpora = derive { name="corpora"; version="0.4-3"; sha256="0zh8mabfy9yqgx7asi4yqv4c0kj59yvyxxaxjgdjy5kkr17zd4g4"; depends=[]; };
   CorrBin = derive { name="CorrBin"; version="1.4"; sha256="0xnj2rhm4ph9277v2wfrp15p8nbdxiqfpcj0shj0d9z8rasx7p8m"; depends=[boot combinat]; };
-  CorReg = derive { name="CorReg"; version="0.14.3"; sha256="02r7mw7wr4mhmg3ng06mmv6a6iplr4knvdlcz8xp91fb6v3jd52c"; depends=[Rcpp lars elasticnet clere spikeslab corrplot Matrix mclust Rmixmod ridge rpart MASS parcor]; };
+  CorReg = derive { name="CorReg"; version="0.15.0"; sha256="17cgq5ssqxa8v5afjhnfg4fr1p9bs3migzmh5b9b2kxixm81flk5"; depends=[Rcpp lars elasticnet clere spikeslab corrplot Matrix mclust Rmixmod ridge rpart MASS parcor mvtnorm]; };
   correlate = derive { name="correlate"; version="1.0"; sha256="0hv0i928f49p8n78hd3bcx923l2x0zcs4kwj71ph8gm7s8540fhc"; depends=[]; };
   Correlplot = derive { name="Correlplot"; version="1.0-2"; sha256="0prxnbi7ga5d23i0i4qpynfb3zrsgjxam47km6nsj1prakdkrq7w"; depends=[calibrate xtable]; };
   corrgram = derive { name="corrgram"; version="1.5"; sha256="015h4vnbmjir81x9ifqbnl25havpi8m7p3iaj30rl1hdhhbpy0dz"; depends=[seriation]; };
   corrplot = derive { name="corrplot"; version="0.73"; sha256="0xnlkb8lhdjcc10drym9ymqzvfwa3kvf955y0k66z5jvabzyjkck"; depends=[]; };
   corrsieve = derive { name="corrsieve"; version="1.6-8"; sha256="0ak3j9khcwv5rxbicck2sr260wpmd3xj254y7pdavx2fk0b72yxs"; depends=[]; };
   corTools = derive { name="corTools"; version="1.0"; sha256="0arvqk2xp19ap73zmdk0kb1fycb3v2mf65b4bhanvcqwr4kg4vdk"; depends=[]; };
-  COSINE = derive { name="COSINE"; version="2.0"; sha256="0awn4xsfi3a2cifynivr38wh9x8ps17fij8kfd74p6fvy647d1b5"; depends=[MASS genalg]; };
+  COSINE = derive { name="COSINE"; version="2.1"; sha256="10ypj849pmvhx117ph3k1jqa62nc4sdmv8665yahds7mh0ymhpjj"; depends=[MASS genalg]; };
+  cosinor = derive { name="cosinor"; version="1.1"; sha256="02nnqg51vq48lzk667cyarnmhcf5mifnsdij7dlgqvz2k4fdq4pl"; depends=[ggplot2 shiny]; };
   cosmoFns = derive { name="cosmoFns"; version="1.0-1"; sha256="0a6xhbgxxnymlvicg99yhgny2lscxcbmvqmy17kxmahdi797dsg6"; depends=[]; };
   cosmosR = derive { name="cosmosR"; version="1.0"; sha256="0w4qywnkgcybgyyhnvvg33amqi2vnkry6iajakyqr1x2hzfpf9sv"; depends=[xlsx]; };
   cosso = derive { name="cosso"; version="2.1-1"; sha256="1wyq27qak0kz4bbzynm24r5ksvb6ddd43h2ykh6m935xck16blyb"; depends=[quadprog Rglpk glmnet]; };
   costat = derive { name="costat"; version="2.3"; sha256="1kqyl89lx1amap9zgrfy1bqnl93kahrksj6yms44yrxr1as2g4nk"; depends=[wavethresh]; };
   cotrend = derive { name="cotrend"; version="1.0"; sha256="0h0y502wqq83wlf9ab1b9rxg1wycvi3sp4lbqfpvy46vgljrjw87"; depends=[xts]; };
-  COUNT = derive { name="COUNT"; version="1.2.3"; sha256="0h3d5w93izh9nv97qxjqlv8igydvq6559ln9hj4j2hhp6pwc4n8l"; depends=[MASS]; };
-  countrycode = derive { name="countrycode"; version="0.16"; sha256="1yhab0i0ag3b1r257i1yldr9y3j236x2vlgnhnhzkwm3mz7n7lgm"; depends=[]; };
+  COUNT = derive { name="COUNT"; version="1.3.1"; sha256="1j67f9cjqn523g3khawxj41c19c2l6l287f8ry8mnmijfs0hvpr4"; depends=[msme sandwich MASS]; };
+  countrycode = derive { name="countrycode"; version="0.17"; sha256="0rmmqh0x34bdnyb19r719rsm46q8193lf7wcynd5s3c2i4vbkx8n"; depends=[]; };
   CountsEPPM = derive { name="CountsEPPM"; version="1.0"; sha256="19l0nb1rrhqcxcjx4lrp298xgxprziz1ccl3r1q3h16yj5vhkqrw"; depends=[Matrix Formula]; };
   covLCA = derive { name="covLCA"; version="1.0"; sha256="15jsjrlaws1cqyrwvh4lzbhxkb11jmgpmddg98nfrzmjpczn2iw3"; depends=[Matrix mlogit poLCA]; };
   covreg = derive { name="covreg"; version="1.0"; sha256="0v19yhknklmgl58zhvg4szznb374cdh65i7s8pcj2nwrarycwzaq"; depends=[]; };
   covRobust = derive { name="covRobust"; version="1.1-0"; sha256="1nvy5cqs4g565qj2hhgk5spr58ps2bhas3i752rf7wvrskb89fk7"; depends=[]; };
-  CovSel = derive { name="CovSel"; version="1.0"; sha256="14z58mrvv7c9y3vmzzyfijyxhqkb4q30w6n5fmnzvrjx5ipp6wss"; depends=[MASS dr np boot cubature]; };
+  CovSel = derive { name="CovSel"; version="1.1"; sha256="13dh97857h3r684yw1bzyr1rkpk8l7sshgy9hvg5y95csgai2qhw"; depends=[MASS dr np boot cubature]; };
   covTest = derive { name="covTest"; version="1.02"; sha256="0p4di8bdjghsq5jd678dprlhiwnxr5piqlx2z7hi2bjjpvvl5657"; depends=[lars glmnet glmpath MASS]; };
   CoxBoost = derive { name="CoxBoost"; version="1.4"; sha256="1bxkanc8zr4g3abn4ds5wqibv65flvm4y648fs9s0l4vc9vmyshg"; depends=[survival Matrix prodlim]; };
+  coxinterval = derive { name="coxinterval"; version="1.0"; sha256="0x6xnc5wf5sivwn0hd99lmb52wj5swj01r9wrky9f61nji3fjv4v"; depends=[Matrix survival timereg]; };
   coxme = derive { name="coxme"; version="2.2-3"; sha256="1s9h03crzmvi0szg5rhq0m48q9i7hdppn1k528nfca5ikw2l37h9"; depends=[survival bdsmatrix nlme Matrix]; };
   coxphf = derive { name="coxphf"; version="1.10"; sha256="15bpy6vcn65pnknqbiqhpbpddhzyslgsc06g8rnamg60akg4p3v8"; depends=[survival]; };
   coxphw = derive { name="coxphw"; version="3.0.0"; sha256="11pyd09dwkbixjz1riv8rz3jrp1ix6cbn1fw9nm8vnrc19x5lkz5"; depends=[survival]; };
@@ -900,48 +958,52 @@ let self = _self // overrides; _self = with self; {
   CpGassoc = derive { name="CpGassoc"; version="2.11"; sha256="01hx9flf4mq1kgg77dah7s33kdkdgnmckppcl1y806xsnxqxmrxq"; depends=[nlme]; };
   CPHshape = derive { name="CPHshape"; version="1.0.1"; sha256="05krqcd4spgghp3ihv1zfql6ikd64vkqnrjghjvfki3hi3zi5k7h"; depends=[]; };
   cpk = derive { name="cpk"; version="1.3-1"; sha256="1njmk2w6zbp6j373v5nd1b6b8ni4slgzpf9qxn5wnqlws8801n73"; depends=[]; };
-  cplexAPI = derive { name="cplexAPI"; version="1.2.9"; sha256="1j5hh1f6sxvhavi4j8cz3kycv85whipky3w007s3hxmxlxh4jlgb"; depends=[]; };
+  cplexAPI = derive { name="cplexAPI"; version="1.2.11"; sha256="1rfvq2a561dz3szvrs9s5gsizwwp0b5rn4059v9divzw23clr2a9"; depends=[]; };
   cplm = derive { name="cplm"; version="0.7-2"; sha256="0vwj130r5wbax9ixcn0fdznh1zrr0wq48iivmlymqbhbqajmv8fb"; depends=[coda Matrix biglm ggplot2 minqa nlme reshape2 statmod tweedie]; };
-  cpm = derive { name="cpm"; version="1.1"; sha256="173lxjnp19h6nfy578y3jh6bgwf2lyqj57gqiyb7n11qw52visdn"; depends=[]; };
   CPMCGLM = derive { name="CPMCGLM"; version="1.1"; sha256="1w8yp37vxz2cl0yqdzpyxdfq2scz2h9i4crjzjmjzpzffi45f06s"; depends=[mvtnorm plyr]; };
   Cprob = derive { name="Cprob"; version="1.2.2"; sha256="18dzyfgxx32azmb02i1gr0fb6nq1b81wni9cgj3qgw8ga7lplgik"; depends=[prodlim tpr geepack lgtdl lattice]; };
   CR = derive { name="CR"; version="1.0"; sha256="0smb2i560dwbxg3mp1svfxmaiw193pd3klwqq0i27czf07k1xfvj"; depends=[]; };
   CRAC = derive { name="CRAC"; version="1.0"; sha256="0vnqmmmwakx5jnzqp20dng35p7rvmz3ypm2m7bs41m8nhh2wq1xa"; depends=[]; };
   crackR = derive { name="crackR"; version="0.3-9"; sha256="18fr3d6ywcvmdbisqbrbqsr92v33paigxfbslcxf7pk26nzn2lly"; depends=[Hmisc evd]; };
-  cramer = derive { name="cramer"; version="0.8-1"; sha256="16cn457f9ly1wm3hsx930rw5arywngn2mhhkmcmhdh9jmdkzsbn3"; depends=[boot boot]; };
+  cramer = derive { name="cramer"; version="0.9-1"; sha256="1dlapmqizff911v3jv8064ddg8viw28nq05hs77y5p4pi36gpyw4"; depends=[boot]; };
   crank = derive { name="crank"; version="1.0-5"; sha256="1zy0z308kw0qgyppkm66p8vqw5b1qcn5avhm78zh0r9k60069dm5"; depends=[]; };
   crantastic = derive { name="crantastic"; version="0.1"; sha256="0y2w9g100llnyw2qwjrib17k2r2q9yws77mf6999c93r8ygzn4f5"; depends=[]; };
   crawl = derive { name="crawl"; version="1.4-1"; sha256="175w5933h5hhhjnrc0l1kg5q24b8pclnf5sf36gj1pmg8s58d1gp"; depends=[mvtnorm sp raster]; };
   crblocks = derive { name="crblocks"; version="0.9-1"; sha256="1m6yy6jb1dld7m9jaasms5ps8sn3v039jvlk8b0c08hmm7y0rm3z"; depends=[]; };
   crch = derive { name="crch"; version="0.1-0"; sha256="1f4y2dd6lxsryyjjv569bxh1b4ymcnma0m9k7j150anzvkbrgnjn"; depends=[Formula ordinal]; };
   CreditMetrics = derive { name="CreditMetrics"; version="0.0-2"; sha256="16g3xw8r6axqwqv2f0bbqmwicgyx7nwzff59dz967iqna1wh3spi"; depends=[]; };
-  CRF = derive { name="CRF"; version="0.3-6"; sha256="0hv5mc2w9gr4ykycp4s5xfq97zrz480hkyfp9s7mi2hqnjhj1c0p"; depends=[Rglpk]; };
+  CRF = derive { name="CRF"; version="0.3-8"; sha256="0w9wfjlx6hvd07k0iszfyip0vn0ca5ax2d5g7hsg6pm2isnzap8a"; depends=[Rglpk Matrix]; };
   crimCV = derive { name="crimCV"; version="0.9.3"; sha256="1p2cma78fb9a2ckmwdvpb6fc0818xw2mvq565dgiimgkdmmr0iid"; depends=[]; };
   CRM = derive { name="CRM"; version="1.1.1"; sha256="09h6xvqc2h2gxhdhc7592z93cnw16l549pn9i26ml0f0n20hljmf"; depends=[]; };
   crmn = derive { name="crmn"; version="0.0.19"; sha256="0gja9a2nk328hxali15kc2za32dgbjfznxh08yka6qf6jc6jx9g1"; depends=[pls]; };
   crn = derive { name="crn"; version="1.1"; sha256="1fw0cwx478bs6hxidisykz444jj5g136zld1i8cv859lf44fvx2d"; depends=[chron RCurl]; };
   crossdes = derive { name="crossdes"; version="1.1-1"; sha256="1d7lv3ibq1rwxx8kc3ia6l9dbz2dxdd5pnf2vhhjmwm448iamcfd"; depends=[AlgDesign gtools]; };
   crossmatch = derive { name="crossmatch"; version="1.3-1"; sha256="082lrv2129mfhwlh99z3g8id3a29s8854skl152bl3ig8pk2gbjz"; depends=[survival nbpMatching]; };
+  crossReg = derive { name="crossReg"; version="1.0"; sha256="1866jhfnksv9rk89vw7w4gaxi76bxfjvqxx7cfa8nlrcsmaqd7rf"; depends=[]; };
   crossval = derive { name="crossval"; version="1.0.1"; sha256="1xdl6cmmfkl46arbm71jhdsscjknclvsiaysijlp2p4vgw2762pa"; depends=[]; };
   crp_CSFP = derive { name="crp.CSFP"; version="2.0"; sha256="0ji208hn3zimql0xhy8bl7w0vg40szw28fia7k1f7g9z0wbl9xqp"; depends=[MASS]; };
   crqa = derive { name="crqa"; version="1.0.4"; sha256="05sp7dbi89wanhjlrbqb3ms9gl7s1h1iww26s4iy84i0pr0wg7br"; depends=[Matrix tseriesChaos fields]; };
   crrSC = derive { name="crrSC"; version="1.1"; sha256="171cw56q2yv1vb4qd0va75i2q89jcw1126q8pcbv0235g7p2a86z"; depends=[survival]; };
-  crrstep = derive { name="crrstep"; version="2014-01.08"; sha256="1ak52nf4rabgdd8dpgpcnyn4lw04hgmf6qkd8d224pkgqmmpr80d"; depends=[cmprsk]; };
-  crs = derive { name="crs"; version="0.15-22"; sha256="0mwaixjbjv3g7r9prd0vv99gwfkx3ifkl9f1lklzivchmsdkgpyv"; depends=[boot]; };
+  crrstep = derive { name="crrstep"; version="2014-07.16"; sha256="15di36j44wxvwl7zhnz3s16lf65rnpj1bvgxf0glkkm0pw94ibrl"; depends=[cmprsk]; };
+  crs = derive { name="crs"; version="0.15-23"; sha256="0psb0qaj7xxpfsxylzyzsc4pzfybrrzjzgmr974znaqqwkngdkl4"; depends=[boot]; };
   CRTSize = derive { name="CRTSize"; version="0.3"; sha256="0m7dc29p2vdpcgji4k4yrpmhv29b7n9i2n6qz6fm19jb2byqsrr5"; depends=[]; };
   CrypticIBDcheck = derive { name="CrypticIBDcheck"; version="0.3-1"; sha256="1lrpwgvsif1wnp19agh8fs3nhlb7prr3hhqg28fi4ikdd1l2j3r4"; depends=[rJPSGCS car ellipse]; };
   csampling = derive { name="csampling"; version="1.2-2"; sha256="0gj85cgc3lgv7isqbkng4wgzg8gqcic89768q2p23k4jhhn6xm2w"; depends=[marg statmod survival]; };
   cSFM = derive { name="cSFM"; version="1.1"; sha256="1znxsqa8xdifmryg7jiqbpzm837n4n862kg5x1aki52crc4zyk3k"; depends=[sn mgcv mnormt MASS moments]; };
   cshapes = derive { name="cshapes"; version="0.4-2"; sha256="015mkh0iwdbhpbk8gpnq48pp026mfidd69rj70arpmg3knd2jvff"; depends=[sp maptools plyr]; };
   cslogistic = derive { name="cslogistic"; version="0.1-3"; sha256="1s8p3qpz81nn6zr0pzw6h9ca3p6ahd8zj640vy5gcb5waqwj6bfj"; depends=[mvtnorm]; };
+  csn = derive { name="csn"; version="1.1"; sha256="1cv5pv6g1b635c5bamq43339vh1rxadwjl4vxyrx56991wyr36sl"; depends=[mnormt]; };
   csound = derive { name="csound"; version="0.1-1"; sha256="0d4bad8qld29k0yavg7f2srljnbax0gj53dljqw1b1z7shyqd1n5"; depends=[rdyncall]; };
   CSS = derive { name="CSS"; version="1.0.2"; sha256="0p0c3gfj6p58hd4398kkpjg7rhx6wh5z6qddpqnvbm24acq7nrvh"; depends=[XML stringr]; };
   csSAM = derive { name="csSAM"; version="1.2.4"; sha256="1ms8w4v5m9cxs9amqyljc2hr1178cz6pbhmv7iiq9yj1ijnl4r1x"; depends=[]; };
+  cstar = derive { name="cstar"; version="1.0"; sha256="1zws4cq5d37hqdxdk86g85p2wwihbqnkdsg48vx66sgffsf1fgxd"; depends=[]; };
+  csvread = derive { name="csvread"; version="1.0"; sha256="0llldk4jg8kbr5nq91sb81hi0cn2ykgpg4bhky8zl8i90x2j8l63"; depends=[]; };
   cts = derive { name="cts"; version="1.0-19"; sha256="16f6nah3w63bz8b9xlhi3a7mpkiywq6gqkxgm5am90g0bqg5j3py"; depends=[]; };
   CTT = derive { name="CTT"; version="2.1"; sha256="0v8k54x9pib6hq3nz3m80g1a3p003f7bn8wnj9swwvacc90d6n44"; depends=[]; };
-  ctv = derive { name="ctv"; version="0.7-9"; sha256="16x9fb0mzclfhnm0n3b66n7wr8447fp2p39vrqs5xw3vsyxf46xg"; depends=[]; };
+  ctv = derive { name="ctv"; version="0.8-0"; sha256="1rh38i872hmhj36lmpg7c2p0p7hcvy2kfr5bfl9w7mqn9d9n39qs"; depends=[]; };
   cubature = derive { name="cubature"; version="1.1-2"; sha256="1vgyvygg37b6yhy8nkly4w6p01jsqg2kyam4cn0vvml5vjdlc18a"; depends=[]; };
-  Cubist = derive { name="Cubist"; version="0.0.15"; sha256="1z4iyd7kgqy0cq58n7id4kygcilyyzb21kqg5svajibqgmminlsz"; depends=[lattice reshape2]; };
+  cubfits = derive { name="cubfits"; version="0.1-0"; sha256="0iylwxzz2aa70q1xqk8r1rkfiiscj3blwq7dshkwshh91l2fgzfw"; depends=[]; };
+  Cubist = derive { name="Cubist"; version="0.0.18"; sha256="176k9l7vrxamahvw346aysj19j7il9a2v6ka6dzmk0qq7hf3w9ka"; depends=[lattice reshape2]; };
   cudaBayesreg = derive { name="cudaBayesreg"; version="0.3-15"; sha256="02akp2ib06hqb1vfqj27vj4y5m0pimy6qg69argq6g0bz5msrgp8"; depends=[cudaBayesregData oro_nifti]; };
   cudaBayesregData = derive { name="cudaBayesregData"; version="0.3-11"; sha256="1cls9xqgps7icjpi1mllkrksdxwc1jfhxgffvrcrqx2l16vw6qfx"; depends=[]; };
   cudia = derive { name="cudia"; version="0.1"; sha256="1ms3bc8sp6l3bm75j418mmb707sy3gyvxznhfias3nd4sw7i074x"; depends=[MCMCpack mvtnorm]; };
@@ -952,6 +1014,7 @@ let self = _self // overrides; _self = with self; {
   curvetest = derive { name="curvetest"; version="2.2"; sha256="1lz6rx9fmgyrlci1dyanscp2a18ki9lhrwnrzhp062flysffimg6"; depends=[locfit R_oo R_methodsS3]; };
   curvHDR = derive { name="curvHDR"; version="1.0-3"; sha256="0rq72prxv2r5nicss9mh4wpkfjvlbb885w85ag4qrqijzq6y8q04"; depends=[feature geometry hdrcde ks misc3d ptinpoly rgl]; };
   cusp = derive { name="cusp"; version="2.2"; sha256="0c8hxsvvp2p86jwcbx1rzs6i8w2mh3dnsfmfkwpq9x28aps3dmd5"; depends=[]; };
+  cutoffR = derive { name="cutoffR"; version="1.0"; sha256="1801jylmpp4msyf07rhg4153kky1zvi4v0kkjb9d51dc7zkhh531"; depends=[ggplot2 reshape2]; };
   cuttlefish_model = derive { name="cuttlefish.model"; version="1.0"; sha256="1rmkfyfd1323g2ymd5gi1aksp160cwy5ha5cjqh5r6fzd8hhqjxs"; depends=[]; };
   cvAUC = derive { name="cvAUC"; version="1.0-0"; sha256="1z8l2ivv7h8din6q46ds3gnlsff10l4ry2kavqv9qsl4xkd8rim0"; depends=[ROCR]; };
   CVcalibration = derive { name="CVcalibration"; version="1.0-1"; sha256="0ca582fnysrldlzxc3pihsph9pvdgygdh7sfzgxvr5fc3z1jbjzb"; depends=[]; };
@@ -961,32 +1024,34 @@ let self = _self // overrides; _self = with self; {
   CVST = derive { name="CVST"; version="0.2-1"; sha256="17xacyi8cf37rr2xswx96qy7pwkaqq394awdlswykz3qlyzx4zx2"; depends=[kernlab Matrix]; };
   CVThresh = derive { name="CVThresh"; version="1.1.1"; sha256="19d7pslzj8r3z5gn3cplpz2h2ayz6k1nrfx3s2b7a8w1il3vmi69"; depends=[wavethresh EbayesThresh]; };
   cvTools = derive { name="cvTools"; version="0.3.2"; sha256="0b7xb6dmhqbvz32zyfbdvm9zjyc59snic6wp1r21ina48hchn3sj"; depends=[lattice robustbase lattice robustbase]; };
-  cvxclustr = derive { name="cvxclustr"; version="1.0.0"; sha256="13fmm18507787njyscbs2wzijxq37a2yxqqzbmpdhgqa0jriq64z"; depends=[]; };
+  cvxclustr = derive { name="cvxclustr"; version="1.1.1"; sha256="0idmx4wgz4d0b1xzmlq5bsk2f2q38lpf9c117hg97xsfndzn7vqj"; depends=[Matrix igraph]; };
   cwhmisc = derive { name="cwhmisc"; version="4.0"; sha256="1lvq2mcbdr38nzbx344c2y9ayi3lv9fkzwwf0l2jzan9s2sppxx2"; depends=[lattice]; };
   cwm = derive { name="cwm"; version="0.0.3"; sha256="1ln2l12whjhc2gx38hkf3xx26w5vz7m377kv67irh6rrywqqsyxn"; depends=[MASS matlab permute]; };
   cxxfunplus = derive { name="cxxfunplus"; version="1.0"; sha256="0kyy5shgkn7wikjdqrxlbpfl3zkkv4v1p8a1vv0xkncwarjs4n8d"; depends=[inline]; };
   cycloids = derive { name="cycloids"; version="1.0"; sha256="00pdxny11mhfi8hf76bfyhd1d53557wcbl2bqwjzlpw5x3vdnsan"; depends=[]; };
   cyphid = derive { name="cyphid"; version="1.1"; sha256="0ya9w8aw27n0mvvjvni4hxsr4xc8dd08pjxx7zkfl1ynfn5b08am"; depends=[fda]; };
   cytoDiv = derive { name="cytoDiv"; version="0.5-3"; sha256="00c0gqgypywgbhavb15bvj6ijrk4b5zk86w85n9kwr4069b7jvwc"; depends=[GenKern plotrix]; };
-  d3Network = derive { name="d3Network"; version="0.4.2"; sha256="0sfl1c3ddjrzm8b52vkq85qc4lzr9d2hkln5ism78kr42njvq3ah"; depends=[plyr rjson whisker]; };
+  d3Network = derive { name="d3Network"; version="0.5.1"; sha256="1nc5gca9jsny5jj8m37081l3rwvmp1cxqpqaimzyr475j6cac40r"; depends=[plyr rjson whisker]; };
   DAAG = derive { name="DAAG"; version="1.20"; sha256="05jlsrs0frk9ky20h17c5vj9d4j28c9n0a1jww5lssacimn1d4x5"; depends=[lattice latticeExtra]; };
   DAAGbio = derive { name="DAAGbio"; version="0.62"; sha256="18m4vq8vv0yi79na62nrm0cy1nlk7bg0xbddzxv5gpkmzi1i6m9s"; depends=[]; };
   DAAGxtras = derive { name="DAAGxtras"; version="0.8-4"; sha256="18lg13mbyharidj5j7ncx8s7d72v2hcnqr00vilhf3djk2mjq7xn"; depends=[]; };
   dae = derive { name="dae"; version="2.1-7"; sha256="0wchpq8hg2s33nm86dj6vqqvajg2062gbrxg6z7n9i2r6s1hmdjv"; depends=[lattice]; };
   daewr = derive { name="daewr"; version="1.0-10"; sha256="09ra3zkmvxdxn0fvrbzixvvgddb066bba9q5zih5kifc8kd0a5xp"; depends=[FrF2 BsMD]; };
   dafs = derive { name="dafs"; version="1.0-37"; sha256="1vdi57qaqdn39yf1ih2gzry02l289q4bffpksglsl4shs6bg2206"; depends=[s20x]; };
+  dagbag = derive { name="dagbag"; version="1.1"; sha256="1hpg7fs1yhnycziahscymkr0s3a2lyasfpj0cg677va73nrpdz12"; depends=[]; };
   DAGGER = derive { name="DAGGER"; version="1.4"; sha256="0b2hzv001xhch7pqgb53lfpdcjwg5lj33i6pb884l1kx92svjfr7"; depends=[Rglpk quadprog Matrix]; };
   dagR = derive { name="dagR"; version="1.1.3"; sha256="13jyhwjvvrjjja18rqzfdcw9ck90qm5yjwd25nygxgdf1894y03b"; depends=[]; };
   Daim = derive { name="Daim"; version="1.1.0"; sha256="19s0p3a4db89i169n2jz7lf8r7pdmrksw7m3cp9n275b5h8yjimx"; depends=[rms]; };
   DAKS = derive { name="DAKS"; version="2.1-2"; sha256="1817s7xd4h2zzaagmnw423qaxpa5fmxi3fh4h9hm2ra9w7nh6ljj"; depends=[relations sets]; };
-  DALY = derive { name="DALY"; version="1.2.0"; sha256="1r4hdd79alphdk70z3g08nvw9cm0403h2bb9b7nn0mhm1l2yrk75"; depends=[]; };
+  DALY = derive { name="DALY"; version="1.3.0"; sha256="18naa4422zphdcngbdzahjn9gb7vgzg8jk3kpvn7vccjjcl36gjd"; depends=[]; };
   DAMisc = derive { name="DAMisc"; version="1.2"; sha256="1fkp21inpgfr5lfid8wmajlcsqbnrgl5c35j0863sywvz6gamgc2"; depends=[car effects lattice sm MASS nnet pscl gdata xtable]; };
+  dams = derive { name="dams"; version="0.1"; sha256="0h0chh9ahsfvqhv1a0dfw88q7gdl1d0w11qcw0w4qmc2ipsl52i6"; depends=[RCurl]; };
   DandEFA = derive { name="DandEFA"; version="1.5"; sha256="0d82rjkgqf4w7qg7irlqvzzav1f23i2gmygkbf8jycaa6xhli80d"; depends=[gplots polycor]; };
   darch = derive { name="darch"; version="0.9.1"; sha256="0syrzmmz43msd51whkb4xy5n0kgcl50yw4w3i9sdd9k20glvwpsx"; depends=[futile_logger ff]; };
   darts = derive { name="darts"; version="1.0"; sha256="07i5349s335jaags352mdx8chf47ay41q7b0mh2xjwn2h9kzgqib"; depends=[]; };
-  DatABEL = derive { name="DatABEL"; version="0.9-4"; sha256="11hdzndni7jaa5m42g8vmqk2s3armi7p5aiw7mh0fxzmwya1h32j"; depends=[]; };
+  DatABEL = derive { name="DatABEL"; version="0.9-4.1"; sha256="1vfsfx8kmjdid5xxmm9sn873gs8nwk3bkdkiav74y1qa1fq2cyd5"; depends=[]; };
   datacheck = derive { name="datacheck"; version="1.0.0"; sha256="03lms1m3g1rc6jj224hzzbv975xkdd0jsm602zn74j73i227fvmz"; depends=[Hmisc stringr shiny testthat xtable]; };
-  DataCombine = derive { name="DataCombine"; version="0.1.24"; sha256="0vrs25554m9nzlqb0bg488ylb5nabb8aq8wh6q4xf81zsbz7imi8"; depends=[data_table forecast dplyr]; };
+  DataCombine = derive { name="DataCombine"; version="0.1.26"; sha256="0wvlr7983v5w0cnwqzv72qzx9abwaw2v2r0bq1ay0n1yxi9wnlf9"; depends=[data_table dplyr]; };
   dataframes2xls = derive { name="dataframes2xls"; version="0.4.5"; sha256="0lfdp87k0yypwvnsr7803ylzqfy51l37zgwy9zn5nb6n30p588fv"; depends=[]; };
   datalist = derive { name="datalist"; version="0.2"; sha256="0q82wira0sfi63cn66f5cfyd15f19ig7pbmpk56j38a3115l2fmn"; depends=[assertthat]; };
   datamap = derive { name="datamap"; version="0.1-1"; sha256="0qm4zb9ldg4wz1a7paj5ilr1dhyagq81rk9l2v43hmkv52sssgkv"; depends=[DBI]; };
@@ -1000,9 +1065,10 @@ let self = _self // overrides; _self = with self; {
   dataview = derive { name="dataview"; version="2.0-9"; sha256="0519h2c33v04vwdd8nz9xmqha15svhxdj761d68qmi52jrw6858d"; depends=[xtermStyle]; };
   date = derive { name="date"; version="1.2-34"; sha256="066zsddpw87x1bhl3479k6fd1wrl3x91n5rd454diwmwq2s8i5qb"; depends=[]; };
   DATforDCEMRI = derive { name="DATforDCEMRI"; version="0.55"; sha256="0v26a1gi8l21ga5nqcnyfaa7gc8zxq6wk95b96ajgpdybb0l9s53"; depends=[xtable akima R_oo R_methodsS3 matlab lattice locfit]; };
-  dave = derive { name="dave"; version="1.4"; sha256="1qd01qv6nkfras92zvcdafniirvvnn6hqhcyrgh25z6bpd7pprv0"; depends=[labdsv vegan cluster nnet tree rpart MASS]; };
+  dave = derive { name="dave"; version="1.5"; sha256="0sw9hc4y9wdfbnnk6isg7z7sky6ni68pkjxdlrph5m7jcyqphz96"; depends=[labdsv vegan]; };
   Davies = derive { name="Davies"; version="1.1-8"; sha256="1wp7ifbs4vqfrn4vwh09lc53yiagpww91m5mxmcr62mjbw8q7zhr"; depends=[]; };
   dawai = derive { name="dawai"; version="1.0"; sha256="0vff248ldm24dk7kh2z2sj5m4g7jc5nmnlqay5j4h0gsk95fb8d5"; depends=[mvtnorm ibdreg boot]; };
+  dbarts = derive { name="dbarts"; version="0.8-3"; sha256="17yd0xsb9z175p8gjq06yycbxlqc58q0bd5mz31aspwva96brmjh"; depends=[]; };
   dbConnect = derive { name="dbConnect"; version="1.0"; sha256="1vab5l4cah5vgq6a1b9ywx7abwlsk0kjx8vb3ha03hylcx546w42"; depends=[RMySQL gWidgets]; };
   dbEmpLikeGOF = derive { name="dbEmpLikeGOF"; version="1.2.4"; sha256="0vhpcxy702cp3lvlif2fzmvccys8iy7bv1fbg6ki2l8bvn2f7c5p"; depends=[]; };
   dbEmpLikeNorm = derive { name="dbEmpLikeNorm"; version="1.0.0"; sha256="0h5r2mqgallxf9hin64771qqn9ilgk1kpsjsdj2dqfl3m8zg967l"; depends=[dbEmpLikeGOF]; };
@@ -1011,24 +1077,27 @@ let self = _self // overrides; _self = with self; {
   DBI = derive { name="DBI"; version="0.2-7"; sha256="1qxmcgswrbisvzmaz2s6bcfbh3lb2hmizjxaqkan147r823rh2p9"; depends=[]; };
   DBKGrad = derive { name="DBKGrad"; version="1.5"; sha256="0k0bl680ynblbla5k9fndh5x7a6f8jyr402a7dg9cjnhhw5q7bxc"; depends=[minpack_lm SDD TSA lattice]; };
   dblcens = derive { name="dblcens"; version="1.1.7"; sha256="02639vyaqg7jpxih8cljc8snijb78bb084f4j3ns6byd09xbdwcw"; depends=[]; };
-  dbmss = derive { name="dbmss"; version="2.1.0"; sha256="051q1b0srfiv983938fvhhr74ca8i921s1mg9dvqm716syxqic8z"; depends=[spatstat Rcpp cubature]; };
+  dbmss = derive { name="dbmss"; version="2.1.1"; sha256="1x1148csb6r2xckah3ha595hxx26i3cx3xp99sdwp9dic1hg8ral"; depends=[spatstat Rcpp cubature]; };
   dbstats = derive { name="dbstats"; version="1.0.3"; sha256="1l7yy6m98pkkrzycxcajjjw2h0crbm0fazyq9xg8875ar29i291p"; depends=[cluster pls]; };
   dcemriS4 = derive { name="dcemriS4"; version="0.51"; sha256="14ir9g4jg8asim8f33wizmvj6vm96583h212yygsa6yc301bhad8"; depends=[oro_nifti]; };
   DCGL = derive { name="DCGL"; version="2.1.1"; sha256="16jdlpl09q9pcymk5xxca2ba0vqv2l05wzi4ffb9ffydxpxy61j9"; depends=[igraph]; };
+  dcGOR = derive { name="dcGOR"; version="1.0.2"; sha256="03k6bmnn7qi0192243s9n640fh55rng2r1s8z5zs6ziwrlym7zm2"; depends=[Matrix igraph dnet]; };
   DCL = derive { name="DCL"; version="0.1.0"; sha256="1ls3x3v0wmddfy7ii7509cglb28l1ix1zaicdc6mhwin0rpp2rx3"; depends=[lattice latticeExtra]; };
   dclone = derive { name="dclone"; version="2.0-0"; sha256="1j8g955rvdgcmc9vnz3xizlkq8w1bslav5h72igvzzffcvqbj9hq"; depends=[coda]; };
   DCluster = derive { name="DCluster"; version="0.2-6"; sha256="0g7d15kq3dbrjmd5fmiwwg2b6gakz1lpsgrpkg6q89pzwlqx8xr9"; depends=[boot spdep MASS]; };
   dcmle = derive { name="dcmle"; version="0.2-4"; sha256="0ddb0x0lwk8jgx05k747sa33d2rrj4g2p4aj0m5bw1c9d5gril0m"; depends=[dclone rjags coda lattice]; };
+  dcmr = derive { name="dcmr"; version="1.0"; sha256="1a89wr1n8sykjbwa316zlmcffaysksrqnbd89anxqj8sgw9xv6jq"; depends=[ggplot2 KFAS plyr reshape2 tableplot]; };
   dcv = derive { name="dcv"; version="0.1.1"; sha256="12c716x8dnxnqksibpmyysqp2axggvy9dpd55s9bhnsvqvi6dshj"; depends=[lmtest]; };
   ddalpha = derive { name="ddalpha"; version="1.0.6"; sha256="1scfmq6zsbd15n6mnnplj0c4a0yl8bp7nqqh91cvvycggb5y0a1v"; depends=[MASS class robustbase]; };
-  DDD = derive { name="DDD"; version="2.4"; sha256="1fla2cm0iqmqm2pzkd49c0kswhamss5ir2f19nxydwfw017ygr3s"; depends=[deSolve ape ade4]; };
+  DDD = derive { name="DDD"; version="2.5"; sha256="1svm6l8ssnnf5g3hci46pvw6amisyy1dvfm0mvdryglgfc8vv6jd"; depends=[deSolve ape ade4]; };
   ddepn = derive { name="ddepn"; version="2.2"; sha256="1zwz664jq6qvf1lcwyfn6kyn6dwxhh2nnyirayx0vqs9c6xzpir7"; depends=[lattice coda igraph gam gplots]; };
   DDHFm = derive { name="DDHFm"; version="1.1.1"; sha256="03zs2zbrhjcb321baghva7b8y61c8p9z6bfj2vg9cvadpb0260nk"; depends=[]; };
+  DDIwR = derive { name="DDIwR"; version="0.1-0"; sha256="0rf1gj1lzbivkz0pqxbih1zqjccv2rhaqrfdhpwbsqhlw12qkkg5"; depends=[XML foreign]; };
   ddst = derive { name="ddst"; version="1.03"; sha256="0zbqw4qmrh80jjgn8jzbnq3kykj1v5bsg6k751vircc0x9vnig3j"; depends=[orthopolynom evd]; };
   deal = derive { name="deal"; version="1.2-37"; sha256="1nn2blmxz3j5yzpwfviarnmabbyivc25cbfhcf814avrhpysvpxa"; depends=[]; };
   deamer = derive { name="deamer"; version="1.0"; sha256="1xbxr78n6s1yhf192ab4syi1naqlwl9z4cxzchrkw80q7bxqfiz8"; depends=[]; };
   debug = derive { name="debug"; version="1.3.1"; sha256="0mpwi6sippxyr1l8xf48xqv6qw6pmfkxs13k1gjyd7bkzlbchgqd"; depends=[mvbutils]; };
-  decctools = derive { name="decctools"; version="0.1.5"; sha256="19k50r21mlfzh2lx3mibcqlpvrcdax61725416prqplgbdmi0bis"; depends=[XLConnect stringr XML reshape2 RCurl lubridate plyr]; };
+  decctools = derive { name="decctools"; version="0.2.0"; sha256="0k5w49s9s51m7w1h5adk26nw1ypwv5g1mlal78qmx5a4jzaf5bw9"; depends=[XLConnect stringr XML reshape2 RCurl lubridate plyr]; };
   DECIDE = derive { name="DECIDE"; version="1.1"; sha256="1g6l2k4nmspg5y4gzxcnx58kix0br6sgmf54jlaxk69nkvdxm9xy"; depends=[]; };
   decon = derive { name="decon"; version="1.2-4"; sha256="1v4l0xq29rm8mks354g40g9jxn0didzlxg3g7z08m0gvj29zdj7s"; depends=[]; };
   Deducer = derive { name="Deducer"; version="0.7-7"; sha256="1x97rz92v1hx30fdmgd1lnzydgygjp6zh20v082qymvh997l1zzd"; depends=[ggplot2 JGR car MASS rJava e1071 scales plyr foreign multcomp effects]; };
@@ -1037,26 +1106,27 @@ let self = _self // overrides; _self = with self; {
   DeducerPlugInScaling = derive { name="DeducerPlugInScaling"; version="0.1-0"; sha256="1qg11vi4szznchh54p9345jbmrfzfr9z5l3x5xz4m86myjkys1mb"; depends=[Deducer psych GPArotation mvnormtest irr klaR]; };
   DeducerSpatial = derive { name="DeducerSpatial"; version="0.7"; sha256="0133qk3yjcifyha7c4pqr5s0hmbci72bzgil2r0sxjmrljs3q727"; depends=[JavaGD Deducer sp maptools OpenStreetMap scales rgdal UScensus2010 Hmisc]; };
   DeducerSurvival = derive { name="DeducerSurvival"; version="0.1-0"; sha256="03qk3y4pibvrxbnxbm5rlksw807dvbilip1jbpn1r7k02ibzq676"; depends=[Deducer]; };
-  DeducerText = derive { name="DeducerText"; version="0.1-1"; sha256="080mbjqm6vf9c6ddk2ba2m9mwwg0fawi37g13f80my2i3lsxpfhb"; depends=[Deducer tm wordcloud RColorBrewer SnowballC]; };
+  DeducerText = derive { name="DeducerText"; version="0.1-2"; sha256="0if2p9j74wa5rva4iv0i8iax22grl9j7lqcqzqlywjgqwnlzxa05"; depends=[Deducer tm wordcloud RColorBrewer SnowballC]; };
   deducorrect = derive { name="deducorrect"; version="1.3-4"; sha256="0hpq0cahfar9y9f6mvpmx35mvinwnnmqq16y9yzrmzbxjkylz2ja"; depends=[editrules]; };
   deepnet = derive { name="deepnet"; version="0.2"; sha256="09crwiq12wzwvdp3yxhc40vdh7hsnm4smqamnk4i6hli11ca90h4"; depends=[]; };
   Defaults = derive { name="Defaults"; version="1.1-1"; sha256="0ikgd5mswlky327pzp09cz93bn3mq7qnybq1r64y19c2brbax00d"; depends=[]; };
   degenes = derive { name="degenes"; version="1.1"; sha256="1xxn5j06qizywimrp1pl8z3yjdy1a167b9jnm77gmv87rp6j240c"; depends=[]; };
   degreenet = derive { name="degreenet"; version="1.2"; sha256="07b6phgyydfp8jwjvrqcvcx3b2qhbkr44xkcn20ya1igsbyh6kzz"; depends=[]; };
-  Delaporte = derive { name="Delaporte"; version="2.1-1"; sha256="03ka7dys8ygw5id0zr9718n61mxa5nc8h3sc3b7sw296zcja6xb1"; depends=[Rcpp]; };
-  deldir = derive { name="deldir"; version="0.1-5"; sha256="073rj4ab3dgxy4nqpvdm0936yg4580qf99ndsf43z3xk29dnbblb"; depends=[]; };
-  deltaPlotR = derive { name="deltaPlotR"; version="1.3"; sha256="1f9jji73c1jizgd7k2ii0zw3h99sir0bi5jipihfkp2v9hzcdm82"; depends=[MASS]; };
+  Delaporte = derive { name="Delaporte"; version="2.2-0"; sha256="063cqcizqby81k71lnkrnrcxafrnwqfj20y1k38yp9giwgm1ndxs"; depends=[Rcpp]; };
+  deldir = derive { name="deldir"; version="0.1-6"; sha256="1hbvkcyclnrrh3xrixn23z1f51n41khcqi5b6gx40qpq0zsbn7sn"; depends=[]; };
+  deltaPlotR = derive { name="deltaPlotR"; version="1.4"; sha256="0lmwwaazyrbnp4nsvl2mydcpij34xv9hbyqwcjwx4vij33034k2p"; depends=[MASS]; };
   Demerelate = derive { name="Demerelate"; version="0.8-1"; sha256="1qngwlzzpd2cmij5ldrmhcn12s9yxd0rargc5vzvkrwcqpkgylkn"; depends=[Formula fts sfsmisc vegan mlogit]; };
   DEMEtics = derive { name="DEMEtics"; version="0.8-7"; sha256="1s59qim60d4gp5rxjacdbmxdbpdm7cy9samn088w8fs0q232vjjx"; depends=[]; };
   demi = derive { name="demi"; version="1.1.1"; sha256="19zszmjcczmz9qjp1dhvf92w134266w4qwskdpz36q72m5455zdb"; depends=[plyr R_utils]; };
   demography = derive { name="demography"; version="1.17"; sha256="01yq3wzzcdclgklxqr3sgxglnw18ljxnhzlmzaj9fzqqdw6xngv3"; depends=[forecast rainbow ftsa cobs mgcv strucchange RCurl]; };
   demoKde = derive { name="demoKde"; version="0.9-3"; sha256="1nkvsjms1gfvjz5l7zza0cgx4yqmn2kgnax44pysn0zqmhfny8bw"; depends=[]; };
-  dendextend = derive { name="dendextend"; version="0.14.2"; sha256="01m050s8m3hgnc5yk2b9918p7w397gxk3pj4qczyd2nl9n38bwr5"; depends=[ape]; };
+  dendextend = derive { name="dendextend"; version="0.16.1"; sha256="1qgvr26kn016qwgbaff4r8xqpsvxl3plv1nxafq7rq4havzhfgf9"; depends=[magrittr whisker ape]; };
   dendextendRcpp = derive { name="dendextendRcpp"; version="0.5.1"; sha256="062f7yjsg196v8c09h6gvbhi0fzgwg40a8xhi751avkjc68z30cq"; depends=[Rcpp dendextend]; };
-  dendroextras = derive { name="dendroextras"; version="0.1-4"; sha256="0g5s936xq8dpw7pg9xafrbnppgl8rjq2ig24vpmbdc4icmv1i3z7"; depends=[]; };
+  dendroextras = derive { name="dendroextras"; version="0.2.1"; sha256="0k1w374r4fvfcbzhrgcvklccjggyz755z7wc2vqfi3c5hvdb9ns4"; depends=[]; };
   DendSer = derive { name="DendSer"; version="1.0.1"; sha256="0id6pqx54zjg5bcc7qbxiigx3wyic771xn9n0hbm7yhybz6p3gz9"; depends=[gclus seriation]; };
-  dendsort = derive { name="dendsort"; version="0.2.0"; sha256="14ax7bscwhxn1nrqq498a79jbkr9zn3ig4qr9b64axypbkj2mzyk"; depends=[]; };
+  dendsort = derive { name="dendsort"; version="0.2.1"; sha256="10qhvxbyziy0xw40j35xsk4sixqc4l0653jgd01spmn4dm1ihj33"; depends=[]; };
   denpro = derive { name="denpro"; version="0.9.1"; sha256="0ihgk300njhp6dzm1gsmknlx4c5h6kiwprgv3l3f29s6gdxx4f6n"; depends=[]; };
+  densityClust = derive { name="densityClust"; version="0.1-1"; sha256="1apv9n871dshln5ccg8x3pwqi8yfx73ijfqsvzcljqnv36qpqpqd"; depends=[]; };
   Density_T_HoldOut = derive { name="Density.T.HoldOut"; version="1.02"; sha256="0xjr6z136c0vgsb609xcqf6g4ivyvgpfr4qkwdlj9z5g7gcf3bhl"; depends=[histogram]; };
   denstrip = derive { name="denstrip"; version="1.5.3"; sha256="10h8ivs7nd6gkf93zvqzqjb1lzfabvvs182636m67f86jfn6d4y4"; depends=[]; };
   DEoptim = derive { name="DEoptim"; version="2.2-2"; sha256="0yayp056knd7d6bvk07k7rnj79vibmkzflnk71dsfbkk5yx7vc77"; depends=[]; };
@@ -1066,16 +1136,16 @@ let self = _self // overrides; _self = with self; {
   depmixS4 = derive { name="depmixS4"; version="1.3-2"; sha256="18xmn5fv9wszh86ph91yypfnyrxy7j2gqrzzgkb84986fjp2sxlq"; depends=[nnet MASS Rsolnp]; };
   depth = derive { name="depth"; version="2.0-0"; sha256="1aj4cch3iwb6vz0bzj4w5r6jp2qs39g8lxi2nmpbi3m7a6qrgr2q"; depends=[abind rgl circular]; };
   depthTools = derive { name="depthTools"; version="0.4"; sha256="1699r0h1ksgrlz9xafw2jnqfsc7xs0yaw97fc6dv3r11x6gxk00y"; depends=[]; };
-  descr = derive { name="descr"; version="1.0.2"; sha256="1a39zf7rajdfb03khgmnv3iz9rxl3yix09yxkvhp1cvcsw3vv530"; depends=[xtable]; };
+  descr = derive { name="descr"; version="1.0.3"; sha256="0x3hpr1sy6cpqn434i5z9g4n2insfv7hmks9igx3fnkr5vad7q8l"; depends=[xtable]; };
   DescribeDisplay = derive { name="DescribeDisplay"; version="0.2.4"; sha256="13npxq1314n4n08j6hbmij7qinl1xrxrgc5hxpbbpbd16d75c7iw"; depends=[proto reshape2 ggplot2 plyr scales GGally]; };
-  DescTools = derive { name="DescTools"; version="0.99.6"; sha256="1hgaj9xj6qr7ngmwbip1pdz79gnxbv43xqr0zgn65vhyv66zq2j8"; depends=[boot]; };
+  DescTools = derive { name="DescTools"; version="0.99.7"; sha256="0a53r3spwwq641mgzgj7xipfbrgnwd0radn92n17ra4ffxa6f3bh"; depends=[boot]; };
   deseasonalize = derive { name="deseasonalize"; version="1.35"; sha256="1fjsa7g34dckjs6mx9b10m99byxagggm0p9pw2f1vmpjqlasin0l"; depends=[lattice FitAR]; };
   designGG = derive { name="designGG"; version="1.1"; sha256="1x043j36llwd7kd4skbpl2smz2ybsxjqf5yd1xwqmardq60gdv2w"; depends=[]; };
   desirability = derive { name="desirability"; version="1.6"; sha256="17g998fmps4ypiscqd2nmh38sd0q7k3r60h2zdrq3wbm1vyyzygk"; depends=[]; };
   desire = derive { name="desire"; version="1.0.7"; sha256="0jmj644nj6ck0gsk7c30af9wbg3asf0pqv1fny98irndqv508kf6"; depends=[loglognorm]; };
   DESnowball = derive { name="DESnowball"; version="1.0"; sha256="012kdnxmzap6afc3ffkcvk1mazlkp286av6g9fwz2wcbf5mh9n1m"; depends=[clue combinat MASS cluster]; };
-  deSolve = derive { name="deSolve"; version="1.10-8"; sha256="0l67pr2pr70dmr4igkk1kl9dj5pzib4jclrzfrhw64hzz5hc1whs"; depends=[]; };
-  detect = derive { name="detect"; version="0.3-1"; sha256="1wwz6hcsb0vlgs9bbagd74rpflpc694nvxahhcvi68r6im1gapnx"; depends=[Formula]; };
+  deSolve = derive { name="deSolve"; version="1.10-9"; sha256="03zqq3lfcc9k0zyfm2mhyzkq2crn1m5gaw1w0x377zrrasl3fw9g"; depends=[]; };
+  detect = derive { name="detect"; version="0.3-2"; sha256="1mjc8h3xb2zbj4dxala8yqbdl94knf9q0qvkc37ag1b2w4y2d2b0"; depends=[Formula]; };
   deTestSet = derive { name="deTestSet"; version="1.1.1"; sha256="1qc8sj44zlndyr9k5r179pmy8kyq0wawz7q2xgdmnx27j2rjls43"; depends=[ReacTran]; };
   detrendeR = derive { name="detrendeR"; version="1.0.4"; sha256="1z10gf6mgqybb9ml6z3drq65n7g28h2pqpilc2h84l6y76sy909c"; depends=[dplR]; };
   DetSel = derive { name="DetSel"; version="1.0.2"; sha256="0igkccclmjwzk7sl414zlhiykym0qwaz5p76wf4i7yrpjgk7mhl9"; depends=[ash]; };
@@ -1086,18 +1156,19 @@ let self = _self // overrides; _self = with self; {
   df2json = derive { name="df2json"; version="0.0.2"; sha256="10m7xn7rm4aql1bzpckjcx5kvdw44m1pxgzqkgkd40lzqb1cwk18"; depends=[rjson]; };
   dfcrm = derive { name="dfcrm"; version="0.2-2"; sha256="1kwgxfqnz2bcicyb27lp6bnvrj30lqjpn5fg7kaqshgkj53g0s4f"; depends=[]; };
   dfexplore = derive { name="dfexplore"; version="0.2.1"; sha256="04nbhn59l1kas26nwj4qflkjvvr33sj1mm7zg7fhvya85gvlhrbf"; depends=[ggplot2]; };
+  DFIT = derive { name="DFIT"; version="1.0-1"; sha256="190k577qvbpbzgyys1r52fq1w642aq5syp2p9d7y6zp4g3xra1sr"; depends=[simex mvtnorm ggplot2]; };
   dfoptim = derive { name="dfoptim"; version="2011.8-1"; sha256="19j0h5xdrbmykz2nrjrwqwaw7466zvqaiwafrm1jc12mk5azfcqx"; depends=[]; };
-  dglars = derive { name="dglars"; version="1.0.4"; sha256="1w04zs2mjf0avcns5hi9y7b4ccrnjg4251ilz8642r8bj30p14k7"; depends=[]; };
+  dglars = derive { name="dglars"; version="1.0.5"; sha256="02g8x4p98jv3cfwfxvh68aivb72651w4977g4xqksq0p4nqcs636"; depends=[]; };
   dglm = derive { name="dglm"; version="1.6.2"; sha256="0w9rrvlhy2vd9mmp04i1hc3s1w228p0sicwg56rjywsmfqfr81vv"; depends=[statmod]; };
-  dgmb = derive { name="dgmb"; version="1.0"; sha256="0s1wa8lg814ydajnx3z5zlly4321srdkhvqhr6syliylxi03778k"; depends=[abind MASS]; };
+  dgmb = derive { name="dgmb"; version="1.1"; sha256="134ckgq7rsdypg3c586kkhr9rx5ya34smp38i9lzvbdanzrpf33w"; depends=[MASS abind]; };
   dgof = derive { name="dgof"; version="1.2"; sha256="02qnb3i131hx05k8l5n3xbl5sqmmc2fh19bsgcacgj8ixs4wyjvi"; depends=[]; };
   dhglm = derive { name="dhglm"; version="1.2"; sha256="14wa0xkwb1qvkynk95aw6y4rx3jjdki19wdydg3wv5nfagcc4vdz"; depends=[Matrix numDeriv boot]; };
   diagram = derive { name="diagram"; version="1.6.2"; sha256="0jxy1rwph29w8q1383ykbnpq61p220azyv6miq1dx0v2fk5579da"; depends=[shape]; };
   DiagTest3Grp = derive { name="DiagTest3Grp"; version="1.6"; sha256="04dxyyqv333rkjf2vlfpal59m7klhw6y7qilym6nw78qb1kqqys7"; depends=[car KernSmooth gplots]; };
   diaplt = derive { name="diaplt"; version="1.2.1"; sha256="0pya6rqzsvc5nd3smhydvabarglc4nn04q605vbllmbhq9rv00pa"; depends=[]; };
   dice = derive { name="dice"; version="1.1"; sha256="0wnmiyrf57kjkby26z9lgplphv3p15dfxgsbbsgwq65md2d6idyn"; depends=[gtools]; };
-  DiceDesign = derive { name="DiceDesign"; version="1.4"; sha256="0xpmaljyvvbrgk39m5lxdpnyx17cm5d2zhzpaycmvqydvfs66g92"; depends=[]; };
-  DiceEval = derive { name="DiceEval"; version="1.2"; sha256="0x5j32fabwl2w24skxmkcj41k8a39pf7r8psldqyv8jqf04gdcmd"; depends=[DiceKriging]; };
+  DiceDesign = derive { name="DiceDesign"; version="1.6"; sha256="1djq7clga3cvpgfycs3zjj106213yhfj9909sqrni70nj1nwdpj9"; depends=[]; };
+  DiceEval = derive { name="DiceEval"; version="1.3"; sha256="1vp9zwd09cwl3c8066jr9d3w4yic70fvd40r7hsj2y8d0bhiwl82"; depends=[DiceKriging]; };
   DiceKriging = derive { name="DiceKriging"; version="1.5.3"; sha256="14826fwsj6cifksyd605nbfxlfwnapr80inm4chjmm0f2xjc4r5n"; depends=[]; };
   DiceOptim = derive { name="DiceOptim"; version="1.4"; sha256="11k6gqw8bcfcnxhm6a039vnkdm7526h3aszjqwfp1s7m157w8kp2"; depends=[DiceKriging rgenoud MASS lhs]; };
   DiceView = derive { name="DiceView"; version="1.3-1"; sha256="0c7i1jy13d5bj822q1rp0d7gmmfjd00jaah34pnj8fzwyrq404z9"; depends=[DiceKriging DiceEval rgl]; };
@@ -1107,7 +1178,7 @@ let self = _self // overrides; _self = with self; {
   DierckxSpline = derive { name="DierckxSpline"; version="1.1-9"; sha256="07bp86zfbcp3d7jdhfap3z1sy15534qvdapdzscbyr2x82mmqpy3"; depends=[lattice PolynomF fda]; };
   diffdepprop = derive { name="diffdepprop"; version="0.1-9"; sha256="0mgrm1isr26v2mcm6fkzc7443ji00vpnqmw4zngx81n7442b3cl2"; depends=[gee rootSolve PropCIs]; };
   diffEq = derive { name="diffEq"; version="1.0"; sha256="17b6yw5xhlk70wvv58348hy1237sjwkxfrgkyw876piy50dxmnz8"; depends=[deSolve rootSolve bvpSolve ReacTran diagram deTestSet scatterplot3d]; };
-  diffIRT = derive { name="diffIRT"; version="1.2"; sha256="00ak4cnnw68iswlsj198i6iw8xbpx4knnax30yfqp3ibkzq7mwp8"; depends=[statmod]; };
+  diffIRT = derive { name="diffIRT"; version="1.4"; sha256="13axwzsrlr1akj4viwsyaplh11krixg3l07qi58c81jrcrmqpgv1"; depends=[statmod]; };
   diffractometry = derive { name="diffractometry"; version="0.1-8"; sha256="1m6cyf1kxm9xf1z4mn4iz0ggiy9wcyi8ysbgcsk7l78y7nqh1h99"; depends=[]; };
   diffusionMap = derive { name="diffusionMap"; version="1.1-0"; sha256="1l985q2hfc8ss5afajik4p25dx628yikvhdimz5s0pql800q2yv3"; depends=[scatterplot3d igraph Matrix]; };
   DIFlasso = derive { name="DIFlasso"; version="1.0-1"; sha256="048d5x9nzksphsdk9lwfagl165bb40r0pvjq2ihvhqvxspgpar4b"; depends=[grplasso penalized miscTools]; };
@@ -1125,27 +1196,29 @@ let self = _self // overrides; _self = with self; {
   dirmult = derive { name="dirmult"; version="0.1.3-4"; sha256="1r9bhw1z0c1cgfv7jc0pvdx3fpnwplkxwz8j8jjvw14zyx803rnz"; depends=[]; };
   Disake = derive { name="Disake"; version="1.0"; sha256="1i58q6dqk980mk8qj66hbqd64wmkvpa4v0z6c0q3lkirsvdm4cwv"; depends=[]; };
   disclap = derive { name="disclap"; version="1.5"; sha256="0piv9gxhxcd4pbh5qjn9c3199f32y3qiw5vy8cr77ki70dnmr66n"; depends=[]; };
-  disclapmix = derive { name="disclapmix"; version="1.4"; sha256="06036vs1jx4ac9d30q3pn9zschrpaq5wznk4n7zchyj8nl5lpr73"; depends=[Rcpp disclap cluster]; };
-  DiscML = derive { name="DiscML"; version="1.0"; sha256="1pnv8dycbzj8x3x0dybh7mcsifmk83kcn0f1y11d6fawhq1232y8"; depends=[ape]; };
+  disclapmix = derive { name="disclapmix"; version="1.5"; sha256="03y1ajaz52kar5wj8csh66kdm8ywin9jpwnj40mkz6fjqi50lhb1"; depends=[Rcpp disclap cluster]; };
+  DiscML = derive { name="DiscML"; version="1.0.1"; sha256="0qkh0yak1kmzxxx0cqb47zgrj8v2s1d5danpibwwg43j138sb73l"; depends=[ape]; };
   DiscreteInverseWeibull = derive { name="DiscreteInverseWeibull"; version="1.0"; sha256="0lnpcpwfgl5ncaa67a32nvviv1wn60dprd781dpjljhgja4hrsa7"; depends=[Rsolnp]; };
   DiscreteLaplace = derive { name="DiscreteLaplace"; version="1.0"; sha256="1mwqvlhgswqp697zjl6yjzqbgazycwwz6dfdvx8s72hdmnlqqr9r"; depends=[]; };
   discreteMTP = derive { name="discreteMTP"; version="0.1-2"; sha256="13qsf1kc3rph0kkdkz31qj072www5dwjyk73lfpy141rzhcn1v1x"; depends=[]; };
-  discreteRV = derive { name="discreteRV"; version="1.1"; sha256="1h845ya66d3kqxhxz85lq3ds74h38213s4j7jnm024c3bk9aa83w"; depends=[]; };
+  discreteRV = derive { name="discreteRV"; version="1.1.2"; sha256="1mq05an70m7k36ip22igbmb2i63gxxf7y9ivb5wn25yx0fynarpk"; depends=[]; };
   DiscreteWeibull = derive { name="DiscreteWeibull"; version="1.0"; sha256="0v8za4arqarf20jrw38dzcjxdwfdpn0ss7p5yxbwhylnj7qz207w"; depends=[Rsolnp]; };
   discretization = derive { name="discretization"; version="1.0-1"; sha256="00vq2qsssnvgpx7ihbi9wcafpb29rgv01r06fwqf9nmv5hpwqbmp"; depends=[]; };
   discrimARTs = derive { name="discrimARTs"; version="0.2"; sha256="088v4awic4bhzqcr7nvk2nldf8cm1jqshg2pzjd2l2p1cgwmlxib"; depends=[RUnit]; };
   DiscriMiner = derive { name="DiscriMiner"; version="0.1-29"; sha256="1ii8aa4dwfk991qdnpmkva20wvs5fqcna9030c799ybf11qpdass"; depends=[]; };
   diseasemapping = derive { name="diseasemapping"; version="0.7.5"; sha256="0i5za00p2pgbwak5gl006yamklzg2m6xcxmqba1kiz16dddfscqq"; depends=[sp mgcv]; };
+  diskmemoiser = derive { name="diskmemoiser"; version="1.0-1"; sha256="0lacadc3mm1w55sff3lphp3xrr1inn2r382c1z8gf6kzal7c9pd8"; depends=[digest]; };
   dismo = derive { name="dismo"; version="0.9-3"; sha256="1vr24kx4mv15wivpk6lw1j8l4422p5al80fld8x6fcp31sf7q652"; depends=[raster sp]; };
   disp2D = derive { name="disp2D"; version="1.0"; sha256="0q5bds2r1mqzcwmnj61dmwqv6b0s0scq5h3nim47q3wp0n4gbslz"; depends=[geometry]; };
   displayHTS = derive { name="displayHTS"; version="1.0"; sha256="0mqfdyvn2c5c3204ykyq29ydldsq0kb3a1d7mrzqr7cvrj1ahlqa"; depends=[]; };
   dispmod = derive { name="dispmod"; version="1.1"; sha256="141gzhnmxxl495cpjgd4wnvdrbz6715m6sd1pycrbaqrsdc1pv57"; depends=[]; };
-  Distance = derive { name="Distance"; version="0.9"; sha256="0rj9glc7plc8cyqlfijjcrls2lvi2w0zzlgxd6fq6yk0xicsggjc"; depends=[mrds]; };
+  dissUtils = derive { name="dissUtils"; version="1.0"; sha256="00fzlmkdfw2s3k824wp2pk3v7cvxnywi1hfp86g4mm95z2qlw9br"; depends=[]; };
+  Distance = derive { name="Distance"; version="0.9.1"; sha256="04bk0kplpmz3qifyar1fs8jrkyk55a4z1yxwkxx957r419afl6l4"; depends=[mrds]; };
   DistatisR = derive { name="DistatisR"; version="1.0"; sha256="1il00v26q68h5dd5c9lm2jblgn8hs6n0457r13mlw6r7pcj0158j"; depends=[prettyGraphs car]; };
   distfree_cr = derive { name="distfree.cr"; version="1.0"; sha256="13y714l6b3kkpp75fdrsbdclgj1vw1xsvbj9pxi4lkwf11wwmrqr"; depends=[]; };
   distillery = derive { name="distillery"; version="1.0-1"; sha256="0hfj4qbfb5219dm7yrgf2h4jrh2qsjhwrbv8gbrxcr0xf6gqbxmv"; depends=[]; };
   distory = derive { name="distory"; version="1.4.2"; sha256="12j19cb1b4prm8m43gya15kia1ii1k0yy7hkngpn2vsyk7n2z65m"; depends=[ape]; };
-  distr = derive { name="distr"; version="2.5.2"; sha256="1x2pmb3lagdwspww0bq35qfwsylzq91v5lc470yc4f4q6r39nw21"; depends=[startupmsg sfsmisc SweaveListingUtils]; };
+  distr = derive { name="distr"; version="2.5.3"; sha256="13ssdidbh4x534f0vvhfpi5cdrhlpmrz8s0y33q7ccf3dfmdsyan"; depends=[startupmsg sfsmisc SweaveListingUtils]; };
   distrDoc = derive { name="distrDoc"; version="2.5"; sha256="104y8q7p53pzwr5pgspa0zczmnhylac2k9aj9flqd75ka6icfqh8"; depends=[distr distrEx distrSim distrTEst distrTeach RandVar distrMod MASS SweaveListingUtils startupmsg]; };
   distrEllipse = derive { name="distrEllipse"; version="2.5"; sha256="1slzzmcf09mqqba287rpgpwbsq6j5lprjgxda5lrc21znvrgfxn3"; depends=[mvtnorm setRNG distr distrEx distrSim]; };
   distrEx = derive { name="distrEx"; version="2.5"; sha256="0mbccd53r9wl875i702j14wlrv7pjgrwzlnyc511cqa5pg3mn81i"; depends=[distr]; };
@@ -1168,23 +1241,25 @@ let self = _self // overrides; _self = with self; {
   dlm = derive { name="dlm"; version="1.1-3"; sha256="1mk5hlhm4bm8a5ilrbiwqggj1wg2jiv44s6gjjkjigs24673lg27"; depends=[]; };
   dlmap = derive { name="dlmap"; version="1.13"; sha256="0s6wlkggkm3qndwyvw72xv1n0mcjb7ss3ajbq2ll6rv30splq0db"; depends=[qtl ibdreg wgaim nlme mgcv]; };
   dlmodeler = derive { name="dlmodeler"; version="1.4-2"; sha256="06gqvk2wrzz4kpsh4vyrbqwmxirsvg78qj7clvcxdac0sfqn4gl7"; depends=[KFAS]; };
-  dlnm = derive { name="dlnm"; version="2.0.9"; sha256="1a86fm4054sihd28ilbz8bdd1y4rmfyfpcgbxp6813rds165fmlc"; depends=[nlme]; };
+  dlnm = derive { name="dlnm"; version="2.1.3"; sha256="044khdhk4dgd09cwmidsfa2rgd43h7wnd48bmmrnsvj3314bic0f"; depends=[nlme]; };
   dma = derive { name="dma"; version="1.2-0"; sha256="1q0zclp7y1y1ksy8j64z05jy1fi0lmgd9a5cswxyl8l4xbs894wn"; depends=[]; };
   DMR = derive { name="DMR"; version="2.0"; sha256="1kal3bvhwqs00b6p6kl0ja35pcz9v9y569148qfhy94m319fcpzm"; depends=[magic]; };
   dmt = derive { name="dmt"; version="0.8.20"; sha256="0rwc8l9k2y46hslsb3y8a1g2yjxalcvp1l3v7jix0c5kz2q7917w"; depends=[mvtnorm MASS Matrix]; };
   DMwR = derive { name="DMwR"; version="0.4.1"; sha256="1qrykl9zdvgm4c801iix5rxmhk9vbwnrq9cnc58ms5jf34hnmbcf"; depends=[lattice xts quantmod zoo abind rpart class ROCR]; };
   dna = derive { name="dna"; version="1.1-1"; sha256="0gw70h1j67h401hdvd38d6jz71x1a6xlz6ziba6961zy6m3k5xbm"; depends=[]; };
+  DNAprofiles = derive { name="DNAprofiles"; version="0.2"; sha256="15la7csf45175g4hkfdz41jgbj5njad5d4jwfhpadxkb9v2mgaw4"; depends=[RcppProgress Rcpp bit]; };
   DNAtools = derive { name="DNAtools"; version="0.1-8"; sha256="146r59lhj57b0dlwwsddks9lpfdyvbjm8i5mvkc6w9wwj32g931i"; depends=[Rsolnp multicool]; };
   DnE = derive { name="DnE"; version="1.01"; sha256="04b2zz1b47nxpl8060ravybwq6y3s08fbkg5a4qiiaz9a84kvbhw"; depends=[]; };
-  dnet = derive { name="dnet"; version="1.0.2"; sha256="1111b4565wp0mip96yk6i2fwb9yqzs9mysa4wd7zy1f98xzyd23n"; depends=[igraph Matrix]; };
+  dnet = derive { name="dnet"; version="1.0.5"; sha256="12kx9701gl33rhym6xzfhqjlz1xq0zzqblha6rn9l8wkkkva3aq5"; depends=[igraph Matrix]; };
   DOBAD = derive { name="DOBAD"; version="1.0.3"; sha256="0q8sjcbfdg66jrhii98kls1l2gzx5s8nzv5xrbyl497cn6ysiww0"; depends=[numDeriv]; };
   doBy = derive { name="doBy"; version="4.5-10"; sha256="1axdy61n6jf0chr9276aj16h4dbq9nh4cw82md2r7mgw746ccvcn"; depends=[survival MASS Matrix lme4]; };
+  docopt = derive { name="docopt"; version="0.1.1"; sha256="1fgwh5r216g4ndgpwpp8vb7scls5f47mn29y1fl9rp4mwzr2vpdh"; depends=[stringr]; };
   Dodge = derive { name="Dodge"; version="0.8"; sha256="1vnvqb2qvl6c13s48pyfn1g6yfhc60ql3vn7yh2zymxcsr1gxgcw"; depends=[]; };
   DoE_base = derive { name="DoE.base"; version="0.26-1"; sha256="07mcbxz9xf87ldsigr8bxczhq487ixv4m2xcz622sc43nbzri8la"; depends=[conf_design vcd combinat MASS]; };
   DoE_wrapper = derive { name="DoE.wrapper"; version="0.8-9"; sha256="1f4q7i0d620wn13c6l3bifqqr5b1g1ihdw5fw92yaw1zv9dwzx0c"; depends=[FrF2 DoE_base rsm lhs DiceDesign AlgDesign]; };
   doMC = derive { name="doMC"; version="1.3.3"; sha256="0g5psgk92b2zk9fkap3a86haay2y0kfz75cyk3d1ila9m7cd2cn4"; depends=[foreach iterators]; };
-  Dominance = derive { name="Dominance"; version="0.9.11"; sha256="075a5vijgki8xnfv0ggg0wq5shwaxs5qq25r4ydcwggcgrmwfb1c"; depends=[igraph chron gdata]; };
-  domino = derive { name="domino"; version="0.1-6"; sha256="18gdcqb6x2v0vc2gfj2rqi4y4xay6npbpxi7ggq0l8gyds2hzcaq"; depends=[]; };
+  Dominance = derive { name="Dominance"; version="1.0.0"; sha256="0xcmslzfdcy826vcnlybhdyym5kqkrdqidq6jn10s4jic7jk8nl3"; depends=[igraph chron gdata]; };
+  domino = derive { name="domino"; version="0.1-7"; sha256="0xlmry11jmv4x3pq89w02yjq9qrvaqc8r71lr2cw5k1jsi0swxas"; depends=[]; };
   doMPI = derive { name="doMPI"; version="0.2"; sha256="0cvws4zwbjj9ji0s69qy1843404a221pyxg9y35ihfcrjknfjc0l"; depends=[foreach iterators Rmpi]; };
   doParallel = derive { name="doParallel"; version="1.0.8"; sha256="1z6cwqnjvqsbck44padqkv4r75cy32p5vrlkkan4mq84cc8062nx"; depends=[foreach iterators]; };
   doRedis = derive { name="doRedis"; version="1.1.1"; sha256="10ldfzq6m83b9w24az9bf5wbfm6y9gi233s8qgsk4dnr84n3nizx"; depends=[rredis foreach iterators]; };
@@ -1192,21 +1267,22 @@ let self = _self // overrides; _self = with self; {
   DoseFinding = derive { name="DoseFinding"; version="0.9-11"; sha256="10i2vpv09avspn2daa9bcpj0nicdjm71gixhvh3x7xb3681zsw2d"; depends=[lattice mvtnorm]; };
   doSNOW = derive { name="doSNOW"; version="1.0.12"; sha256="0j71n0l9lbvwllw9iigvjgv0x8z2j57grl3yazkgcyzy0mcgf741"; depends=[foreach iterators snow]; };
   dosresmeta = derive { name="dosresmeta"; version="1.3.0"; sha256="0yfm8dkds8abdl6jrib5vvgkyrd5cl5a99qs27safxx0fcpdiz4k"; depends=[mvmeta aod Matrix]; };
-  dostats = derive { name="dostats"; version="1.3.0"; sha256="1786jc7hpbq5390cs11vlq9fvp0rbsmjwxbgn55qmc1dg46yl2xv"; depends=[]; };
+  dostats = derive { name="dostats"; version="1.3.1"; sha256="0xcp9arpvqb7am6caiazlgllvd3hhk4gqjd2wizr2jc5dkwfl4qn"; depends=[]; };
   DoubleCone = derive { name="DoubleCone"; version="1.0"; sha256="1pba9ypp0n3i2k3ji1x8j7h548pfam9z99hxylcjcxnnvc7xs2fw"; depends=[coneproj Matrix MASS]; };
+  DoubleExpSeq = derive { name="DoubleExpSeq"; version="1.0"; sha256="0y797iqmxihrsp8lhy84p5hlyw3ckpklv0pgcqv4h39a6cpglbvd"; depends=[numDeriv]; };
   downloader = derive { name="downloader"; version="0.3"; sha256="0jpq8z3i9fkgs8wwjrq5qd7qfi5w3rxmzmsi1c1dxlnxzzhg6kxq"; depends=[digest]; };
   dpa = derive { name="dpa"; version="1.0-3"; sha256="0chkbbqxpq5fmqzr74jvflls9h0i2y25jp8gvlg3pfam9j07w7i5"; depends=[sem igraph]; };
-  dpcR = derive { name="dpcR"; version="0.1.0"; sha256="09f0illfs17as5ns4syb2r0db8cm24mdffwf76jbagzs7inm7c4s"; depends=[qpcR binom e1071 dgof pracma shiny]; };
+  dpcR = derive { name="dpcR"; version="0.1.2-1"; sha256="1czkwyqnly7lwn00mifm0apnh8ahfv4v9iwzvfwcamfl7qkwbvx6"; depends=[qpcR binom chipPCR e1071 dgof pracma rateratio_test signal shiny spatstat]; };
   dpglasso = derive { name="dpglasso"; version="1.0"; sha256="1mx28xbm2z2bxyp33wv2v6vgn1yfsdsa0bzjjdxasgd6lvr51myf"; depends=[]; };
   dplR = derive { name="dplR"; version="1.6.0"; sha256="1rjb10adhycp16xav7z5c93jfcjwpcrp8cdiyab8skrijgzbp0vx"; depends=[gmp digest lattice stringr XML]; };
-  dplyr = derive { name="dplyr"; version="0.1.3"; sha256="10dngi0n03mks7jkvci4b5968ds2155p19w0ay065g6ggyrsb3w3"; depends=[assertthat Rcpp]; };
+  dplyr = derive { name="dplyr"; version="0.2"; sha256="04kby4n2qvngfdmpqarhizavpy9mr99zpwfxpknqbnbpbya5px1q"; depends=[assertthat Rcpp magrittr Lahman hflights]; };
   dpmixsim = derive { name="dpmixsim"; version="0.0-8"; sha256="0paa2hmpd6bqf0m7p9j7l2h3j18lm64ya6ya8zvp55wm8pf7xgqg"; depends=[oro_nifti cluster]; };
   DPpackage = derive { name="DPpackage"; version="1.1-6"; sha256="01qdl6cp6wkddl9fwwpxwvyhb7lpjxis6wnbm2s288y2n9wi4j24"; depends=[MASS nlme survival]; };
   DPw = derive { name="DPw"; version="1.1.2"; sha256="0waprp6xql67ijwwsy0z8f0fnazkzci0nzwiajwkvy7vbwcch5bx"; depends=[]; };
   dr = derive { name="dr"; version="3.0.8"; sha256="0plvdkk041giqx8cgph4vdcabq9nv5bvjwz0pvjmhvb3z7q15cgj"; depends=[MASS]; };
   drawExpression = derive { name="drawExpression"; version="1.0"; sha256="0c2daicqrjlqf7s788cknzvw9c6rm500lgmwfr7z03bq7bd2ah90"; depends=[]; };
   drc = derive { name="drc"; version="2.3-96"; sha256="0yrxa7rnsi7w4zdxd713m0l8bfsqnhcypzr091yazlahk33mybxf"; depends=[car gtools MASS magic plotrix lattice nlme]; };
-  drfit = derive { name="drfit"; version="0.6.1"; sha256="1hjjd1djd0acf2qvnx505rhmpq21igckzqjd5zhmm5k2v3al48dh"; depends=[MASS RODBC drc]; };
+  drfit = derive { name="drfit"; version="0.6.3"; sha256="0vx5niw6mfg85937sbjmc0z0gdgf9aj43rmkn1gljky7pq4j3hfn"; depends=[MASS RODBC drc]; };
   drgee = derive { name="drgee"; version="1.0.1"; sha256="0vrmi3q6dhmk9z5168pdfhi18nkm4pgj4zx8d24r4k1jcqvgckl0"; depends=[nleqslv]; };
   DRI = derive { name="DRI"; version="1.1"; sha256="11dqwjqddwis8y8yq248k90wwk2fi3mcy0rwq2dz95m17wvd1v0k"; depends=[cghFLasso]; };
   drm = derive { name="drm"; version="0.5-8"; sha256="1p6ixd7hnv41gfmvan3rv9xzz1279hmrnvfrl6pxwzs9zcnbb53a"; depends=[]; };
@@ -1219,15 +1295,16 @@ let self = _self // overrides; _self = with self; {
   dse1 = derive { name="dse1"; version="2011.11-2"; sha256="0h8f1f4qqycyc4k8ksdlz7cprayaa08gnsgj6hxa0kxnfs726qb6"; depends=[dse]; };
   dse2 = derive { name="dse2"; version="2011.11-2"; sha256="05kf2072a50wd6p42yx5wpy0m7wq1gssy877nfyyc5l0pwviy3zs"; depends=[EvalEst]; };
   DSL = derive { name="DSL"; version="0.1-5"; sha256="0k320cmim9mvi5cmr6964h9i2jbskh76xws3p6zsfakk63ndg3rr"; depends=[]; };
-  dsm = derive { name="dsm"; version="2.2.3"; sha256="1i4ns0042v11f7c6ysrd96r72mkqzs1jmb4ya1cdi0wydwx86s90"; depends=[mgcv mrds nlme ggplot2 statmod]; };
+  dslice = derive { name="dslice"; version="1.0.2"; sha256="0y8q52g7d01hfyysrbqgg0xrqvia046phr9xfwgy0bp254xdwfcp"; depends=[Rcpp ggplot2 scales]; };
+  dsm = derive { name="dsm"; version="2.2.4"; sha256="1pbvirxwxr35hcd64sn1cd3cv40nrq7dz92apdvaf754sxfqx2xw"; depends=[mgcv mrds nlme ggplot2 statmod]; };
   DSpat = derive { name="DSpat"; version="0.1.5"; sha256="1njc9p2cxszcskdm21x00yvcs7gx71x18fdayih6l3g5l40c698a"; depends=[spatstat RandomFields mgcv rgeos]; };
   DSsim = derive { name="DSsim"; version="1.0.1"; sha256="0a62l8jfrnr2h9laxw27p8icvfa8f1gdhdiywwb33328barhzfrk"; depends=[shapefiles splancs mrds mgcv]; };
   DTComPair = derive { name="DTComPair"; version="1.0.3"; sha256="1af2293ckkpz0gjcibgzzvz37852cav4wa4girpc87yn3p4ajlri"; depends=[gee PropCIs]; };
   DTDA = derive { name="DTDA"; version="2.1-1"; sha256="0hi2qjcwd6zrzx87mdn1kns5f2h6jh7sz9jpgbi0p0i80xg8jnn3"; depends=[]; };
-  dti = derive { name="dti"; version="1.1-7"; sha256="0zgl05j74siwnz5qln8gpshr0kxyqspkg9pa8pydd96spy4v021a"; depends=[awsMethods oro_nifti oro_dicom adimpro gsl rgl]; };
+  dti = derive { name="dti"; version="1.2-0"; sha256="01z51x1fpsc79b298gsx5fq2y5w3pwiq58a13pm96a4mkyzzwhk7"; depends=[awsMethods adimpro rgl oro_nifti oro_dicom gsl]; };
   DTK = derive { name="DTK"; version="3.5"; sha256="0nxcvx25by2nfi47samzpfrd65qpgvcgd5hnq9psx83gv502g55l"; depends=[]; };
   DTMCPack = derive { name="DTMCPack"; version="0.1-2"; sha256="0bibas5cf06qq834x9q2l2fyh6q9wrg07k8cn6almcyirzax6811"; depends=[]; };
-  DTR = derive { name="DTR"; version="1.3"; sha256="00a8q47wkfdp2g0mdsw05a8x2xmvjj4hl80iz7n82l3zv8a3awf4"; depends=[survival ggplot2 aod proto]; };
+  DTR = derive { name="DTR"; version="1.5"; sha256="1c73ay0j6jkjm4iv32waz3wnn0qy399k1h72l7rwfzpyidnaprvi"; depends=[survival ggplot2 gridExtra aod proto]; };
   dtt = derive { name="dtt"; version="0.1-2"; sha256="0n8gj5iylfagdbaqirpykb01a9difsy4zl6qq55f0ghvazxqdvmn"; depends=[]; };
   dtw = derive { name="dtw"; version="1.17-1"; sha256="0kbf38a14k112vdi7yaql18w0sj694smlm6pmdw5q4sqpk7azhqg"; depends=[proxy]; };
   dualScale = derive { name="dualScale"; version="0.9.1"; sha256="11hqxprai0s5id6wk4n2q174r1sqx9fzw3fscvqd2cgw8cjn1iwl"; depends=[matrixcalc ff vcd lattice Matrix]; };
@@ -1241,12 +1318,13 @@ let self = _self // overrides; _self = with self; {
   DynamicDistribution = derive { name="DynamicDistribution"; version="1.1"; sha256="1s78hpj2pxjs4vixin1i816qjbn3wk7b8rd2zdjp4d4rbxifcqf5"; depends=[]; };
   dynamicGraph = derive { name="dynamicGraph"; version="0.2.2.6"; sha256="1xnsp8mr3is4yyn0pyrvqhl893gdx2y1zv8d2d55aah2xbfk0fjj"; depends=[ggm]; };
   dynamicTreeCut = derive { name="dynamicTreeCut"; version="1.62"; sha256="1y11gg6k32wpsyb10kdv176ivczx2jlizs1xsrjrs6iwbncwzrkp"; depends=[]; };
+  dynatopmodel = derive { name="dynatopmodel"; version="1.0"; sha256="1dq18wqbf7y597mbqv8fwwc5fm8l618mkqvb2l95bplq7n508hng"; depends=[raster xts shape fields rgeos maptools rgdal sp spam hydroGOF topmodel intervals]; };
   dynaTree = derive { name="dynaTree"; version="1.2-7"; sha256="06pw78j6wwx7yc175bns1m2p5kg5400vg8x14v4hbrz3ydagx4dn"; depends=[]; };
-  dynBiplotGUI = derive { name="dynBiplotGUI"; version="1.0.1"; sha256="06vc8m981va4jiihlyaqigp3snfh06677l2m1idgbl8pwl1k80wh"; depends=[tcltk2 tkrplot RODBC]; };
+  dynBiplotGUI = derive { name="dynBiplotGUI"; version="1.1.0"; sha256="15m4gxdlwzvvj64vjkkb1608q4k0w84my7m8x1qc04bly9p3q038"; depends=[tcltk2 tkrplot]; };
   DynClust = derive { name="DynClust"; version="3.13"; sha256="020zl2yljp47r03rcbzrbdmwk482xx27awwzv4kdrbchbzwhxqgm"; depends=[]; };
   dynCorr = derive { name="dynCorr"; version="0.1-2"; sha256="0qzhhfhkwpq6mwg7y6sxpqvcj8klvivnfv69g7x3ycha1kw2xk3w"; depends=[lpridge]; };
+  dynia = derive { name="dynia"; version="0.2"; sha256="1swip4kqjln3wsa9xl0g92zklqafarva923nw7s44g4pjdy73d5l"; depends=[]; };
   dynlm = derive { name="dynlm"; version="0.3-3"; sha256="0ym23gv2vkvvnxvzk5kh6xy4gb5wbnpdbgkb5s6zx24lh81whvcs"; depends=[zoo car lmtest]; };
-  dynpred = derive { name="dynpred"; version="0.1.1"; sha256="1qs845lzjvhiwd8xq9d5r8rc8sk813wjjl5d0z3alb8217gkhb2j"; depends=[survival survival]; };
   dynsim = derive { name="dynsim"; version="0.2.4"; sha256="1b4j47asqanrfhyg9r730brp3xaw1853jk23va2sx606q2rh94wv"; depends=[DataCombine ggplot2 gridExtra Zelig]; };
   dynsurv = derive { name="dynsurv"; version="0.2-2"; sha256="0418r7adki48pg3h7i1mgv3xpbryi520va3jpd03dx15zrq8zaqg"; depends=[survival reshape plyr nleqslv ggplot2]; };
   e1071 = derive { name="e1071"; version="1.6-3"; sha256="0scyxk3y2fizvw5zrddxid37vzayd879g67faq0a879nhk7fkm1z"; depends=[class]; };
@@ -1254,50 +1332,58 @@ let self = _self // overrides; _self = with self; {
   earlywarnings = derive { name="earlywarnings"; version="1.0.59"; sha256="06j5g5lrzl4p5pb1pp79h00iqpbwralzhpzxmaiymv7j8kz87nr0"; depends=[ggplot2 moments tgp tseries fields nortest quadprog Kendall KernSmooth lmtest som spam]; };
   earth = derive { name="earth"; version="3.2-7"; sha256="1j9w03i4pvz8a6s9rkfssj7bqz5sql0g7rzwpmis33kvi0d7wihn"; depends=[plotmo plotrix]; };
   easi = derive { name="easi"; version="0.2"; sha256="0kvcixbiijh3akxqy2w6kwydayqlr7lk2ws747a1z4whhclm1623"; depends=[systemfit micEcon]; };
+  easingr = derive { name="easingr"; version="1.0.0"; sha256="18q9r5wvfhn03500lvwriycdw3gqbg3fpd86137mz8gxdg2pawic"; depends=[xts lattice latticeExtra]; };
   EasyABC = derive { name="EasyABC"; version="1.3.1"; sha256="1d1j7n6mhpmbbczg0yjs4kqjxlclc7pm5fl7pkxp9dmfic002y34"; depends=[abc pls mnormt MASS lhs]; };
   easyanova = derive { name="easyanova"; version="3.0"; sha256="19mcjj1lvy8kf6s004rqnalv80jf62g7dpsnrwkrklb19n1164v8"; depends=[car nlme]; };
   EasyHTMLReport = derive { name="EasyHTMLReport"; version="0.1.1"; sha256="1hgg8i7py7bx48cldyc7yydf0bggmbj3fx3kwiv9jh1x5wyh929z"; depends=[base64enc markdown knitr ggplot2 scales xtable reshape2]; };
   EasyMARK = derive { name="EasyMARK"; version="1.0"; sha256="10slkblbyxq98c3sxgs194dnkx996khfcpxj6jhz355dp35z7c9d"; depends=[MASS stringr rjags coda foreach doParallel random]; };
   easynls = derive { name="easynls"; version="4.0"; sha256="1j2crqvgsf84bpwzf4qh5xkzn5mhxhfx9c0y3p8dbyn8bg7zc2rf"; depends=[]; };
+  EasyStrata = derive { name="EasyStrata"; version="8.6"; sha256="0agmap9lmqbpfw8ijwxmjkcqjvc1ng0jsadkqpfz71a963nkqdcl"; depends=[Cairo plotrix]; };
   eba = derive { name="eba"; version="1.7-1"; sha256="0kxdhl7bc4f570m9rbxxzg748zvq0q7a0slvfr4w1f45vfzhyh17"; depends=[nlme]; };
   ebal = derive { name="ebal"; version="0.1-6"; sha256="1cpinmbrgxxv0fzi9qi2inv4hw2lz7iq4b0ggp316rdqqb5bj9r0"; depends=[]; };
   EbayesThresh = derive { name="EbayesThresh"; version="1.3.2"; sha256="0n7cr917jrvmgwfqki7shvz9g9zpmbz9z8hm5ax7s8nnfzphrh4g"; depends=[]; };
   ebdbNet = derive { name="ebdbNet"; version="1.2.3"; sha256="123iqp8rnm3pac5fvpzq5sqbf8nyfpf05g23nawanid6yv23ba9a"; depends=[igraph]; };
+  EBEN = derive { name="EBEN"; version="1.1.1"; sha256="12nh96avcx4rrbmlr1q046i5ymrsnqvf0ra5ynh58akajfx7wy49"; depends=[]; };
   EBMAforecast = derive { name="EBMAforecast"; version="0.42"; sha256="161l6jxbzli2g5lcmlp74z320rsvsi80pxk1vc1ypa1hgwz3q80x"; depends=[separationplot ensembleBMA plyr Hmisc abind]; };
   EBS = derive { name="EBS"; version="3.0"; sha256="0nrqglbfr7wagd4xrk5jx0kficjgvk7wqwzqrbs589dkll24sn5b"; depends=[MASS]; };
-  Ecdat = derive { name="Ecdat"; version="0.2-5"; sha256="0g123v1719nhr0d8wryg8vd9avahcl5mnwssl936chpjpzs7a82d"; depends=[Ecfun]; };
+  ebSNP = derive { name="ebSNP"; version="1.0"; sha256="0x3ijwg4yycsfy6jch1zvakzfvdgpiq8i7sqdp5assb8z1823w0b"; depends=[]; };
+  Ecdat = derive { name="Ecdat"; version="0.2-6"; sha256="1chx78xi04jr9qpc3z2g9x3sj41sdqp3zpjcgv817mcz84zc8mkc"; depends=[Ecfun]; };
   ecespa = derive { name="ecespa"; version="1.1-7"; sha256="0ynyphc1jnk088041i0yk22bh4ga1v9xwrcghy70q1ipv0z279ph"; depends=[splancs spatstat]; };
   Ecfun = derive { name="Ecfun"; version="0.1-0"; sha256="0jfcqxbx27dwbipx1b994iy4qnpkg1sh4xpq7qq8yy823rgpkhrp"; depends=[]; };
+  ecipex = derive { name="ecipex"; version="1.0"; sha256="0pzmrpnis52hvy80p3k60mg9xldq6fx8g9n3nnqi3z56wxmqpdv7"; depends=[CHNOSZ]; };
   ecodist = derive { name="ecodist"; version="1.2.9"; sha256="199f3lwwm8r2bnik595m540la1p4z6vbkwfqh9kimy9d0fjp8nps"; depends=[]; };
-  ecoengine = derive { name="ecoengine"; version="1.3"; sha256="0ih6wbqbrqrivxm7003gmkqlw876axb556mm0b1qgk0zg2k3zzws"; depends=[httr plyr assertthat whisker data_table RJSONIO lubridate leafletR]; };
+  ecoengine = derive { name="ecoengine"; version="1.4"; sha256="0smjwgci2kz09idzq10q50z0hs2nr7rjj7i0r7iksdyb7ggb3hzm"; depends=[httr plyr assertthat whisker dplyr RJSONIO lubridate leafletR]; };
   EcoHydRology = derive { name="EcoHydRology"; version="0.4.12"; sha256="03dzdw79s0cnnd7mv6wfxw374yf66dlcmj10xh6sh5i352697xp1"; depends=[operators topmodel DEoptim XML]; };
   ecolMod = derive { name="ecolMod"; version="1.2.5"; sha256="07dr3q17vd60569w34apylpsv81qcf31l7v0bqdycb5mlaifdahz"; depends=[rootSolve diagram deSolve]; };
   ecoreg = derive { name="ecoreg"; version="0.2"; sha256="08iw7w9z7zqwhvirnhdc2jr2qjp9yma8ddc831d5dvbvi2j7kq84"; depends=[]; };
   ecosim = derive { name="ecosim"; version="1.2"; sha256="1lzjd6kl2864ngyiqyfnnra5ag9bj42pxb793gwp45r7z95k32rf"; depends=[deSolve stoichcalc]; };
+  ecospat = derive { name="ecospat"; version="1.0"; sha256="1pnyiy89smr0cnw1z5cv83b7dybzs5h2kfyxis2k3rlx26rzczfv"; depends=[ade4 ape gam gbm sp adehabitatHR adehabitatMA biomod2 dismo ecodist maptools randomForest spatstat raster rms]; };
   EcoTroph = derive { name="EcoTroph"; version="1.6"; sha256="0zi6g0ra107s47r32mm9h6r1wll3avi0mpjmhcr0nj9y48nv14w3"; depends=[XML]; };
+  ecp = derive { name="ecp"; version="1.6.0"; sha256="1xzawnqk8maxk9ha4cms5xvylwb4m1mkxps88p5xh7grgpcw6drn"; depends=[Rcpp]; };
   edcc = derive { name="edcc"; version="1.0-0"; sha256="036fi6mnn9480hkb378xb5jilkfvdydjmkyw4mcc9s1lz195f62w"; depends=[spc]; };
   edeR = derive { name="edeR"; version="1.0.0"; sha256="1dg0aqm5c4zyf015hz1hhn3m4lfvybc4gc1s7sp8jcsk46rxz0cc"; depends=[rJava rjson rJython]; };
   EDISON = derive { name="EDISON"; version="1.0"; sha256="17yjvvsgsmd4i00wzmih50qz3wqig2zdg5r877b4hqk1dsv5kxym"; depends=[corpcor MASS]; };
   editrules = derive { name="editrules"; version="2.7.2"; sha256="19g07caacwphvrqn900chrz3k6x4z8gmvlcvna5x2mqidcjkf25i"; depends=[igraph lpSolveAPI]; };
-  edmr = derive { name="edmr"; version="0.6.3"; sha256="1yjw34m67wxg5qs3r1k9fv7zv5f2zsi1v6s8h1hzjd0p634fza0i"; depends=[data_table mixtools]; };
   EDR = derive { name="EDR"; version="0.6-5.1"; sha256="10ldygd1ymc4s9gqhhnpipggsiv4rwbgajvdk4mykkg3zmz7cbpm"; depends=[]; };
   edrGraphicalTools = derive { name="edrGraphicalTools"; version="2.1"; sha256="09y63xj3gqrz66mym20g4pmfwrb0wnc2n67692hnqq8dz31q7p3i"; depends=[rgl mvtnorm MASS lasso2]; };
+  eegAnalysis = derive { name="eegAnalysis"; version="0.0"; sha256="1lrwjbhm5fnf5fhyyga2b21j2snnmj3zfvfxfkvgsbdnzr3qxaxb"; depends=[e1071 wmtsa fields splus2R]; };
   eeptools = derive { name="eeptools"; version="0.3.1"; sha256="0m6i0hiw565wgziknlf19rh2fq8zvzq2v5a0ppnwcv8vhbhyph3g"; depends=[ggplot2 MASS stringr maptools arm data_table memisc]; };
   effects = derive { name="effects"; version="3.0-0"; sha256="075vd540d8wry1l70s28pkmd1g3424yan9f7mwvcrqf0l62ahmfg"; depends=[lattice colorspace]; };
   EffectsRelBaseline = derive { name="EffectsRelBaseline"; version="0.5"; sha256="1dsnakcrgmlx44599ii92wvhxbxrh0hij59709wsskx1x1152zvh"; depends=[]; };
   EffectStars = derive { name="EffectStars"; version="1.3"; sha256="193j2dbp6bp60yb2qym119ciry3s5z54iv1vmb9wrddjzb77nnvv"; depends=[VGAM]; };
-  effsize = derive { name="effsize"; version="0.5"; sha256="12wvwp87xhz5plasp0cmpd50nqaxvdg790rlva2qzn75xhhaq4jq"; depends=[]; };
+  effsize = derive { name="effsize"; version="0.5.1"; sha256="0dy9q3zbcr5c4nijknly9mfr6rbs2qlv4jgzn0wpl2cz7hpngvk4"; depends=[]; };
   egcm = derive { name="egcm"; version="1.0.2"; sha256="17fzxl34vc38308wbvjp5xdv1q48k4lf6gsw7ax27zc4chqlmqfz"; depends=[ggplot2 tseries zoo MASS]; };
   eggCounts = derive { name="eggCounts"; version="0.2"; sha256="0ilwhw2fk8mvqsnranpj4mny98vhha8jrrxccz6x0f8hsy34b27k"; depends=[coda actuar boot]; };
   egonet = derive { name="egonet"; version="1.2"; sha256="1f0fbqyk2ilmhirxvf1iwgfappi5r7807ag77r89lbaf5jq8akl0"; depends=[sna]; };
   eha = derive { name="eha"; version="2.4-1"; sha256="1znxpcrwp8fllr3m14gbxwgp7yln55jwvkilmbsqldz00za6xn0w"; depends=[survival]; };
   eHOF = derive { name="eHOF"; version="1.4"; sha256="050wlckw2i8iqymdmq68zj2fwq74slsbk83p5kkhxlyn132m0k47"; depends=[mgcv lattice]; };
+  EIAdata = derive { name="EIAdata"; version="0.0.1"; sha256="0adgkjfymgsimlaalcgcqdsagfvycrnsx93bx2xsbvlbywjk9fhn"; depends=[XML plyr xts zoo]; };
   eigeninv = derive { name="eigeninv"; version="2011.8-1"; sha256="18dh29js824d7mrvmq3a33gl05fyldzvgi8mmmr477573iy9r30g"; depends=[]; };
   eigenmodel = derive { name="eigenmodel"; version="1.01"; sha256="0p9n28x5gg46nszzd2z9ky5fhv6qa070673i1df6bhjh962aqgaf"; depends=[]; };
   eigenprcomp = derive { name="eigenprcomp"; version="1.0"; sha256="156qyv7sl8nng55n3ay6dnpayyfrqv27ndz40xf4w92is9zmymy0"; depends=[]; };
   EILA = derive { name="EILA"; version="0.1-2"; sha256="0wxl9k4fa0f7jadw3lvn97iwy7n2d02m8wvm9slnhr2n8r8sx3hb"; depends=[class quantreg]; };
   eiPack = derive { name="eiPack"; version="0.1-7"; sha256="1cxk31bj012ijm85sf6l4rjrwayw94j2d6aav8p9g1f0raha2s6y"; depends=[MASS coda msm]; };
-  eive = derive { name="eive"; version="1.0"; sha256="0g7pn6dbm9cs0nsf03k92v37sjnsda7qc0xi00xzgm6y1g8rdbbq"; depends=[]; };
+  eive = derive { name="eive"; version="2.1"; sha256="1vazl5dnrvljd07csy9rjs4302w09h94i411gffg9fvxn70km7qg"; depends=[Rcpp]; };
   eiwild = derive { name="eiwild"; version="0.6.7"; sha256="1fp4kvlmcjjnzn2a5cmlzaf6y5q6cdbbi2nmvjyqc4y1bmwh3srf"; depends=[gtools coda lattice]; };
   EL = derive { name="EL"; version="1.0"; sha256="13r7vjy2608h8jph8kwy69rnkg98b2v69117nrl728r3ayc46a18"; depends=[]; };
   elasticnet = derive { name="elasticnet"; version="1.1"; sha256="1x8rwqb275lz86vi044m1fy8xanmvs7f7irr1vczps1w45nsmqr2"; depends=[lars]; };
@@ -1310,25 +1396,27 @@ let self = _self // overrides; _self = with self; {
   elmNN = derive { name="elmNN"; version="1.0"; sha256="129r6d3qa48gqvqxks53hdmyk3jjakddsj5fwj91kqq0hkm34kyd"; depends=[MASS]; };
   EloRating = derive { name="EloRating"; version="0.41"; sha256="1d7kcng0iv4paagm0jljkfk7c2n3vvs91khjvlc7jpifisf1zi7a"; depends=[zoo]; };
   elrm = derive { name="elrm"; version="1.2.2"; sha256="0wz0l703v0iyp7nswdmh65n0cy3a7rfvyxd795a6nzk3nich8bfg"; depends=[coda]; };
-  ELT = derive { name="ELT"; version="1.1"; sha256="0h0nir4gb0wprr0lz8lii2n4a48zafknyimpk1pr235z8kw1v6qi"; depends=[locfit lattice latticeExtra xlsx]; };
+  ElstonStewart = derive { name="ElstonStewart"; version="1.1"; sha256="1y2g4x3fhi78c2406bk8r8c3x9zhx8ya3qlbnypdm65j0minixsn"; depends=[kinship2 digest]; };
+  ELT = derive { name="ELT"; version="1.2"; sha256="19q6i1ilsi09mlbs3l0p6n86390jmrs0g93zpa1h0hql7ymcb8p2"; depends=[locfit lattice latticeExtra xlsx]; };
   em2 = derive { name="em2"; version="0.9"; sha256="120731nh5qq3kzbfj9p2s4fhrr3xvddj5n0bv5m3dp5l5495px1b"; depends=[plyr]; };
   EMA = derive { name="EMA"; version="1.4.4"; sha256="1hqkan9k6ps4qckjrhsgxzham106fm38m5rgayz8i2ji3spvbfca"; depends=[survival xtable heatmap_plus GSA MASS FactoMineR cluster]; };
   EMC = derive { name="EMC"; version="1.3"; sha256="0sdpxf229z3j67mr9s7z4adzvvphgvynna09xkkpdj21mpml23p6"; depends=[mvtnorm MASS]; };
   EMCC = derive { name="EMCC"; version="1.2"; sha256="1qff8yvw7iqdsrqkvwb7m14xh7gcnjcrf8gw00g4j6aq0h0cgk2z"; depends=[MASS mclust EMC]; };
   EMCluster = derive { name="EMCluster"; version="0.2-4"; sha256="0m5cl5mrg6q0ixfpjj1jwd7l5hcldc33lr7n6xgy7p9nlr52mimz"; depends=[MASS]; };
   EMD = derive { name="EMD"; version="1.5.7"; sha256="0m2g7akg9h964d6qr1mj20h9pcb2fcmala3skhl0qpy8qz01w5ck"; depends=[fields locfit]; };
-  emdatr = derive { name="emdatr"; version="0.1"; sha256="0d8jkppkr6lwf2grw3d6q849yr5jz365qcqvhxfhf8v38hk5xsay"; depends=[]; };
+  emdatr = derive { name="emdatr"; version="0.2"; sha256="11s9yiziswgll12c1sm3jb7hvy469ks64zx6w8dk1b36cx4lzf3h"; depends=[RCurl]; };
   emdbook = derive { name="emdbook"; version="1.3.4"; sha256="19i8i1wp6vqgc77ajaqrfrjw6ijjafkgdqgfpa0dvl1w117rpy2d"; depends=[MASS lattice plyr]; };
   emdist = derive { name="emdist"; version="0.3-1"; sha256="1z14pb9z9nkd0f2c8pln4hzkfqa9dk9n3vg8czc8jiv0ndnqi7rq"; depends=[]; };
   emg = derive { name="emg"; version="1.0.5"; sha256="028g8gqjjqfwly6vzvinbpilay5jj9rnm7ri9aby9q0hj5prh56m"; depends=[]; };
+  emil = derive { name="emil"; version="1.1-6"; sha256="1qk655swpl8f492y9smzlfxf7aysbwashfs6whnsi7f9dbigw6cd"; depends=[]; };
   EMJumpDiffusion = derive { name="EMJumpDiffusion"; version="1.4.1"; sha256="10lw6717yq9vlywn5ilsl0d99fpx3zvc87vf7s0zxswhs81h7x1w"; depends=[]; };
   emma = derive { name="emma"; version="0.1-0"; sha256="0psd8lrbcqla8mkhp0wlassaaimgwlmqy5yv2wwcq59mc5k1v27f"; depends=[earth clusterSim]; };
   EMMAgeo = derive { name="EMMAgeo"; version="0.9.1"; sha256="1rxbb666gh9g35m4jqa6y1zjp82s62ha6n92fkjvkk9wm25w6imr"; depends=[GPArotation limSolve shape]; };
   emme2 = derive { name="emme2"; version="0.9"; sha256="035s4h95ychqb14wib0dqbg4sjy9q01fsryr0ri25g1hsi5f8lpm"; depends=[reshape]; };
   EMMIXcontrasts = derive { name="EMMIXcontrasts"; version="1.0.0"; sha256="1q7bwf7kkpraj38lz5s1lhhghp7a5lzyj5b9x8024g6rh2qlwp7v"; depends=[]; };
   EMMIXskew = derive { name="EMMIXskew"; version="1.0.1"; sha256="16jkq0a9k1gf6gia8r65nwa2lh8zny4jmnq51g2rcqm44s5ylqbh"; depends=[lattice mvtnorm KernSmooth]; };
-  EMMIXuskew = derive { name="EMMIXuskew"; version="0.11-5"; sha256="00lgjraadkxh68nvdalp784pcrzn6issdps3dbwsl8rl60r4ryk8"; depends=[MASS]; };
-  EMMREML = derive { name="EMMREML"; version="1.0"; sha256="0g6jr9bgiikk4x3hxy9f5626ykh9ffjarc8x60504hgp08560i2m"; depends=[Matrix]; };
+  EMMIXuskew = derive { name="EMMIXuskew"; version="0.11-6"; sha256="0japf0l0sj84jna7b5kirp6pgqa4c923ldwphb16ch2xxrgk5n5k"; depends=[MASS]; };
+  EMMREML = derive { name="EMMREML"; version="2.0"; sha256="0fyqwyym6d1adn5pvrfspmr933qhi30h58hxr2rbzwm5kwh6c8jr"; depends=[Matrix]; };
   emoa = derive { name="emoa"; version="0.5-0"; sha256="1wcnsnkdmpcn21dyql5dmj728n794bmfr6g9hgh9apzbhn4cri8p"; depends=[]; };
   EMP = derive { name="EMP"; version="1.0.1"; sha256="12ahyfav918qf7bphhy251x0gzhdziaz2gg064hcwh6jaqw0jw0g"; depends=[]; };
   emplik = derive { name="emplik"; version="0.9-9-2"; sha256="131wk9nfymkygb89jk9cwi53dx4857c06ip9pfzzvswch3hhdqwb"; depends=[quantreg]; };
@@ -1337,7 +1425,7 @@ let self = _self // overrides; _self = with self; {
   emulator = derive { name="emulator"; version="1.2-13"; sha256="1y8mrrz4dw66wn3lhi7x7r72bxa77rpc68zqab6c67ndyi4wamxr"; depends=[mvtnorm]; };
   EMVC = derive { name="EMVC"; version="0.1"; sha256="1725zrvq419yj0gd79h8bm56lv2mmk296wq3wapivcy6xn0j97jh"; depends=[]; };
   ENA = derive { name="ENA"; version="1.3-0"; sha256="02gsngkzc8vfpg2jvcabwp4kpfs14cajs9xv1rh76807l5ylqihz"; depends=[GeneNet space WGCNA parmigene]; };
-  enaR = derive { name="enaR"; version="2.5"; sha256="1hhxccpgxzyqwri6v59qv2fgh9c5xk6zzm283c1n8wlinj6d87bi"; depends=[sna network MASS stringr xlsx]; };
+  enaR = derive { name="enaR"; version="2.7"; sha256="0jjxqrxyak9b39j9yycfgp7bhb82y8zinc2kcc6pbs5w6m5dsyvr"; depends=[sna network MASS stringr gdata]; };
   endogMNP = derive { name="endogMNP"; version="0.2-1"; sha256="0maxcp321ngbxrg0i23nlwhj849v771xahh53367x928ss4f8v7i"; depends=[]; };
   endorse = derive { name="endorse"; version="1.4.1"; sha256="0xyi2cq4k4xa8kr717i4njl6rgjf5z99056jbhp2rbzfyy4sw61d"; depends=[coda]; };
   energy = derive { name="energy"; version="1.6.1"; sha256="08s7kzl12fcp1lz86jzwznxk6dqvls418zcqwd31shqqynna25vm"; depends=[boot]; };
@@ -1349,23 +1437,25 @@ let self = _self // overrides; _self = with self; {
   enrichvs = derive { name="enrichvs"; version="0.0.5"; sha256="0x91s03hz1yprddm6mqi75bm45ki3yapfrxmap7d4qc0hi06h22k"; depends=[]; };
   ensembleBMA = derive { name="ensembleBMA"; version="5.0.8"; sha256="1wv1g1iwpmxhcgxgx78jc4w5kcbbzjxljj7pbfykgq7hjpkb109f"; depends=[chron]; };
   ensembleMOS = derive { name="ensembleMOS"; version="0.7"; sha256="0g5qzdic5jvgn6wv7zh0jnz8malfgfxn26l7lg30y96vcmi4hk54"; depends=[ensembleBMA chron]; };
-  entropart = derive { name="entropart"; version="1.1.3"; sha256="0k7cdj8ndpxbqq3xczmfcidh71xc0s8gmr0n9rh1idgs12kyn47x"; depends=[ade4]; };
+  entropart = derive { name="entropart"; version="1.2.0"; sha256="11k05nk8lf5790wmx2323w5wk233xmk48scfv3hrph8y6665vddq"; depends=[ade4]; };
   entropy = derive { name="entropy"; version="1.2.0"; sha256="1qs8g5jp6ydhirxnrck3qqq3cc232hcaizy401c8gjn2vn23s15d"; depends=[]; };
   EntropyEstimation = derive { name="EntropyEstimation"; version="0.1"; sha256="1l31vc9478db22zg79zm26xahagvw7p5ywkhyq4lanl38gh2my6y"; depends=[]; };
-  enviPat = derive { name="enviPat"; version="1.5"; sha256="0g86n736r40z7pg4yhsw67vq05dkf651n9pwcizx3irj7bwfmla8"; depends=[]; };
+  enviPat = derive { name="enviPat"; version="1.9"; sha256="0xm23gv4ixmsal9rf0cbq0lwvlpagpmapskz3c4d8qzvhr8qrl3b"; depends=[]; };
+  enviPick = derive { name="enviPick"; version="1.0"; sha256="117m06qp0l554sssv1vzhrysbi6rj9dm53szzkl8i8riqqm1m442"; depends=[shiny readMzXmlData]; };
   EnviroStat = derive { name="EnviroStat"; version="0.4-0"; sha256="05sa63z6yzny2ncxpm5d3x0bx8snkn0x5pzpj2a7y6rwf6al5q4r"; depends=[MASS]; };
   EnvNicheR = derive { name="EnvNicheR"; version="1.0"; sha256="1vw21gsdrx8gkf1rf8cnazv8l9ddcdmy2gckyf33fz7z2mbzgbkk"; depends=[]; };
   EnvStats = derive { name="EnvStats"; version="1.0.2"; sha256="0914j7v190j401rdqqpfz3s69pb6crmq297wiw2q99syx0fnimnw"; depends=[]; };
   epade = derive { name="epade"; version="0.3.8"; sha256="1alvsifc6i71ilm1xxs1d7sqlapb48bqd6z2n4wi6pqcjvwp7bif"; depends=[plotrix]; };
-  Epi = derive { name="Epi"; version="1.1.49"; sha256="1rw31bf0szqp87axyc4z65dbbvk2981ifd6r3lf14d0cizxqfwbf"; depends=[]; };
+  Epi = derive { name="Epi"; version="1.1.67"; sha256="12wbzv21whjnzlyqacgqmsgrjbkgj2495y9fwvav5mr21yfrjds3"; depends=[]; };
+  epi2loc = derive { name="epi2loc"; version="1.0-1"; sha256="16abk1v177sg7gmaw42ldf6hf20l7dvyq295zwbq76nxj467khdv"; depends=[pwr]; };
   epibasix = derive { name="epibasix"; version="1.3"; sha256="0d0087sa8lqw35pn7gdg2qqzw3dvz57sgavymwl1ybcj5d4lsbyk"; depends=[]; };
   epicalc = derive { name="epicalc"; version="2.15.1.0"; sha256="11x9q990hc7rf5xfvba47axdy7vld76xcf3kd9lkr0c8nbl5ss9v"; depends=[foreign survival MASS nnet]; };
   EpiContactTrace = derive { name="EpiContactTrace"; version="0.8.8"; sha256="1vlr2xxnyq1i6ky39g8j3pf3m5775bmhii7vpskb0x7nnq161yzb"; depends=[Rcpp plyr R2HTML]; };
+  EpiDynamics = derive { name="EpiDynamics"; version="0.1"; sha256="11gbqpqnv6aydpwvki912cknvbzn24b3ajbc8ivzj7vvfp9blcmd"; depends=[deSolve FME reshape2 ggplot2]; };
   EpiEstim = derive { name="EpiEstim"; version="1.1-2"; sha256="0r56iglhkrqvlsf3gbahd544h944fmbyn6jdc113rhjscf6dl605"; depends=[]; };
-  EpiModel = derive { name="EpiModel"; version="0.95"; sha256="1dkhcxxhf1hk90s493dq7in4yrikizs5sn5i44nad5c36l930qq0"; depends=[network networkDynamic tergm deSolve RColorBrewer statnet_common]; };
+  EpiModel = derive { name="EpiModel"; version="1.0.1"; sha256="00afgdvbmc7qxq1r8kpldkfqvnwqp23ig2y06jmipmrcga3xf5z2"; depends=[network networkDynamic tergm deSolve ergm RColorBrewer statnet_common]; };
   epinet = derive { name="epinet"; version="0.0-8.1"; sha256="00mq2bqdnjp7wwsb3dldlxd0l3vyij48az4s3vrmycab8g9dffk5"; depends=[]; };
-  epipen = derive { name="epipen"; version="1.0-0"; sha256="1g3w7siiwnmmrh14q7xqx6ycc6a1nywqrin0n4kbf32g02x7b4v8"; depends=[pwr]; };
-  epiR = derive { name="epiR"; version="0.9-58"; sha256="154syr08jy74cj0bg22yv5ysn9q4a644wasj5q8iap5143ixs7v8"; depends=[survival]; };
+  epiR = derive { name="epiR"; version="0.9-59"; sha256="0x0k7s2kl9mj7x2vnrj1bc586jkvc6sb34jsgjhwk3gyh9prp57q"; depends=[survival]; };
   epitools = derive { name="epitools"; version="0.5-7"; sha256="163sibnbihdsnkxf313fr8n8rh5d64dwjagv95vhhzr87f21sw22"; depends=[]; };
   epoc = derive { name="epoc"; version="0.2.5-1"; sha256="1r19cvcqf39yf09n3znbdy3dsr7z96yx6zib6031mqqdsxaav5qd"; depends=[lassoshooting Matrix irr elasticnet survival]; };
   epr = derive { name="epr"; version="2.0"; sha256="1xqc0jhgdwwvilqpljxzpzz3wx30kigy09sxvzcfvsjmxyyvflqy"; depends=[car]; };
@@ -1373,19 +1463,21 @@ let self = _self // overrides; _self = with self; {
   eqs2lavaan = derive { name="eqs2lavaan"; version="3.0"; sha256="1lj6jwkfd84h9ldb6l74lrx2pnsl1c0d7mnrcrjkska87djb2nzd"; depends=[lavaan stringr]; };
   eqtl = derive { name="eqtl"; version="1.1-7"; sha256="0xfr8344irhzyxs9flnqn4avk3iv1scqhzac5c2ppmzqhb398azr"; depends=[qtl]; };
   equate = derive { name="equate"; version="2.0-2"; sha256="1n83rr01y5rcsr2wgcd1n7ihjk5bvxdl7f9abcjdz6vja7qg6h83"; depends=[]; };
-  equateIRT = derive { name="equateIRT"; version="1.0-1"; sha256="1dfhn2p13hzlm9sa36rwgnysd5gd8bvrkgqy4hl4alwadiacdj5g"; depends=[statmod]; };
-  equivalence = derive { name="equivalence"; version="0.5.7"; sha256="0dddpj2xzwvkyl5d1sgpwqmcw5k58b4rdkwxaf61ahz6q79h5wms"; depends=[lattice boot]; };
+  equateIRT = derive { name="equateIRT"; version="1.1"; sha256="0z889z973yvklbn6i4jf6cxzvs2x9bn7454v5f23xmnj1wh5qv2s"; depends=[statmod]; };
+  equivalence = derive { name="equivalence"; version="0.6.0"; sha256="1q17c2bs36f46bmm6wzmp0g2lg7d0j9mlrfnkzxnlvmspwksc0zl"; depends=[lattice boot PairedData]; };
   erboost = derive { name="erboost"; version="1.2"; sha256="0afgh0zkl3h3ab4s7wl0cn24qdyhszssai9i390mi7w0p88wgba9"; depends=[lattice]; };
-  erer = derive { name="erer"; version="2.0"; sha256="0375vvi67gy8j6va181149r618w16x4rv1cfbgqxlrraqk0jks3a"; depends=[systemfit lmtest tseries ggplot2 urca]; };
-  ergm = derive { name="ergm"; version="3.1.2"; sha256="1v7cchmw305xcfpf464z59iiqfpa2aab4zvhi76qax8a674b972p"; depends=[statnet_common network robustbase coda trust Matrix]; };
+  erer = derive { name="erer"; version="2.2"; sha256="198bahz958dpdlk3himrjs0sa4j2hdppy3v4l3h8l52jaf1iq4n1"; depends=[lmtest systemfit tseries urca ggplot2]; };
+  ergm = derive { name="ergm"; version="3.1.3"; sha256="0g4cap1gx0l57l0aix29wz9lspnxv2vqkkdlcghbdv41fdddvdlm"; depends=[statnet_common network robustbase coda trust Matrix]; };
   ergm_count = derive { name="ergm.count"; version="3.1.1"; sha256="0l66shy5p7h9j3h5gpkn48ps069mdaqbscnnkvmwjfvcc7k5vr8m"; depends=[statnet_common ergm network]; };
   ergm_graphlets = derive { name="ergm.graphlets"; version="1.0.1"; sha256="0j2z8dvgfrkvm9sqpyqvylz6sakxl8wpy4fbgc20wwznfzbaaal6"; depends=[statnet]; };
   ergmharris = derive { name="ergmharris"; version="1.0"; sha256="1bfijhsljlykb94wi25lbpv35zkmgqpmgzmxcq98gjvzbn5j9pdq"; depends=[]; };
   ergm_userterms = derive { name="ergm.userterms"; version="3.1.1"; sha256="0pvklvyxi7sjc5041zl8vcisni0jz1283gyjw5mhas9bl47g1cwc"; depends=[network ergm statnet_common]; };
   eRm = derive { name="eRm"; version="0.15-4"; sha256="0x05vsf8kp0z422w1b1wqayada2vbl7jh4ifa52sqlq7ygsmnmi1"; depends=[MASS Matrix]; };
   ERP = derive { name="ERP"; version="1.0.1"; sha256="0wy1p7pp9dvc3krylskb627rmfqaj11qvia97m88x05ydqx1fwmr"; depends=[fdrtool mnormt]; };
+  erpR = derive { name="erpR"; version="0.2.0"; sha256="1y6abc5fkcyyjh36maj1zbxppqzwd5wkvzvqahyvzsz5fqpjkcdx"; depends=[rpanel]; };
   ES = derive { name="ES"; version="1.0"; sha256="1rapwf6kryr6allzbjk6wmxpj9idd3xlnh87rwbh6196xb7rp8lv"; depends=[]; };
   ESG = derive { name="ESG"; version="0.1"; sha256="1jw6239asv6lwxrz5v0r5pzg6v500bqxg8361sh4jj67rsrc7g9m"; depends=[]; };
+  ESGtoolkit = derive { name="ESGtoolkit"; version="0.1"; sha256="0r09arhsvamdyahini5yhgc43msdxwvn45l57xbfszahsnr3b3aq"; depends=[CDVine ggplot2 gridExtra reshape2 ycinterextra Rcpp]; };
   esotericR = derive { name="esotericR"; version="1.0"; sha256="0kl9c2z2mpg3mk8jnl0ssgcf6y0i9jpczms746j8f07ydrcxpf41"; depends=[]; };
   ESPRESSO = derive { name="ESPRESSO"; version="2.0"; sha256="1xz4lw1rczs4laz1drrqyz91w62a99z7jzs2wkcdrhcirgmmpjp3"; depends=[MASS]; };
   EstCRM = derive { name="EstCRM"; version="1.3"; sha256="0fmnlh0pnprskq01iq3rfassyxq7fywiprvqw0xdlh8yxl3w2c9n"; depends=[Hmisc lattice]; };
@@ -1399,7 +1491,7 @@ let self = _self // overrides; _self = with self; {
   eulerian = derive { name="eulerian"; version="1.0"; sha256="0yhpnx9vnfly14vn1c2z009m7yipv0j59j3s826vgpczax6b48m0"; depends=[]; };
   EvalEst = derive { name="EvalEst"; version="2012.4-1"; sha256="19yn4haxkny9kij0jhkwdbp34c9h2cc5l2n2b14khjhv1msqcfmi"; depends=[setRNG tframe tfplot dse]; };
   evaluate = derive { name="evaluate"; version="0.5.5"; sha256="15i6bkzrzkgsdlgf2pcx8b3gcjh1rplzhimy310845pfgkldcq9b"; depends=[stringr]; };
-  Evapotranspiration = derive { name="Evapotranspiration"; version="1.3"; sha256="1s0r448h69nxa47phs6b6fz9lfhklhak3bk8mwl5sy45hami4016"; depends=[zoo]; };
+  Evapotranspiration = derive { name="Evapotranspiration"; version="1.4"; sha256="1x12z44y78lcibf4wpc7l3ll7zwf1c1fkavwfm79q7sdlhwi1x9h"; depends=[zoo]; };
   EvCombR = derive { name="EvCombR"; version="0.1-2"; sha256="1f5idjaza91npf64hvcnpgnr72mpb7y6kf91dp57xy9m14k7jx5g"; depends=[]; };
   evd = derive { name="evd"; version="2.3-0"; sha256="1h3dkssgw2x7pblvknfr0l8k7q25nikxyl7kl9x95ganjpi2452v"; depends=[]; };
   evdbayes = derive { name="evdbayes"; version="1.1-1"; sha256="0lfjfkvswnw3mqcjsamxnl8hpvz08rba05xcg0r47h5vkgpw5lgd"; depends=[]; };
@@ -1409,12 +1501,13 @@ let self = _self // overrides; _self = with self; {
   eventstudies = derive { name="eventstudies"; version="1.1"; sha256="13l2yhmlpiid9r3njnmvja231l00ym7gvwfbv0m9fk2k5j6gm5id"; depends=[zoo xts boot]; };
   EVER = derive { name="EVER"; version="1.2"; sha256="1yk6ln4shp53jvph6jy1d5m4cq080p6f03qwigdw4f0al9qzja2s"; depends=[]; };
   evir = derive { name="evir"; version="1.7-3"; sha256="1kn139vvzdrx5r9jayjb4b0803b0bbppxk68z00gdb50mxgvi593"; depends=[]; };
-  evmix = derive { name="evmix"; version="2.0"; sha256="0848lig19dmcaz3780knd3kzr7igbfjx02lxvdi7s9l3clzc4v3s"; depends=[MASS gsl]; };
+  evmix = derive { name="evmix"; version="2.1"; sha256="1fg3pz1l3qk37qbp02c81rfsvpfm0zjh8q83cvkir1ap5k6xzfwl"; depends=[MASS gsl]; };
   evobiR = derive { name="evobiR"; version="1.0"; sha256="12j01qzc4yrjpxbj39bl29f5ypxwk33c6qf0mjjbgpwn5g6fgsi4"; depends=[seqinr ape stringr geiger taxize]; };
+  evolvability = derive { name="evolvability"; version="1.0"; sha256="17vkmb5208q4lx6jslx96nbhsl9m2c4ra6264bparbgrg34byg9x"; depends=[coda]; };
   evora = derive { name="evora"; version="1.0"; sha256="0blq28ldynbq3v6rh0yk89wy1sjp4621h6iwnyyiipqwzihwrhz2"; depends=[Hmisc]; };
-  EvoRAG = derive { name="EvoRAG"; version="1.0"; sha256="1dd4c9pg8apagp8bn04n1irz09ab6bf2s8h90zfq0n060jmnbbml"; depends=[]; };
+  EvoRAG = derive { name="EvoRAG"; version="2.0"; sha256="0gb269mpl2hbx1cqakv3qicpyrlfb4k8a3a7whhg90masbgmh8f6"; depends=[]; };
   evt0 = derive { name="evt0"; version="1.1-3"; sha256="08sbyvx49kp3jsyki60gbbnci26d6yk0yj2zcl4bhfac8c3mm6ya"; depends=[evd]; };
-  evtree = derive { name="evtree"; version="0.1-4"; sha256="1n75w11jc6sbs3fzd4dmimn0hs7p4rj9ikaxaa85gh383p9yfw0h"; depends=[partykit]; };
+  evtree = derive { name="evtree"; version="0.1-5"; sha256="09byr935z4bzc3yk0l51lnm99k2ac2z44pwx2p35w4080gpsa10r"; depends=[partykit]; };
   EWGoF = derive { name="EWGoF"; version="2.0"; sha256="07kpzaqfd7ihpmh2y5806mz5h64dcajia5v36pp9myl04fvpjapp"; depends=[Rcpp maxLik miscTools]; };
   Exact = derive { name="Exact"; version="1.4"; sha256="1l4cq6kslnl8x8c53m2w8w1vijmbxaxzr1fpdzrm2hfra0p5z90s"; depends=[]; };
   exact2x2 = derive { name="exact2x2"; version="1.3.0"; sha256="0gp6b04bd6pf1a01d6d99p8mbjcqsayrdbm58wky2pg8s445523q"; depends=[exactci ssanv]; };
@@ -1424,10 +1517,10 @@ let self = _self // overrides; _self = with self; {
   exactmeta = derive { name="exactmeta"; version="1.0-1"; sha256="1alva8ls4l56j3bdxgd1mh9isqk198iyrycc88vgpmj30gjpwncn"; depends=[]; };
   ExactPath = derive { name="ExactPath"; version="1.0"; sha256="0ngvalmgdswf73q0jr4psg0ihnb7qwkamm6h64l01k5rmgd5nm16"; depends=[ncvreg lars]; };
   exactRankTests = derive { name="exactRankTests"; version="0.8-27"; sha256="0ygy3ygdnrrcggps5zh5r7kqfa9vj6gfgdyli63n8cwdimfyndhn"; depends=[]; };
-  exams = derive { name="exams"; version="1.9-6"; sha256="1dyhc3nkvyw1s3mk44m141dhrg92lhk06b6d6n76b2iadjk90ywa"; depends=[]; };
-  ExceedanceTools = derive { name="ExceedanceTools"; version="1.1.2"; sha256="1f466mc0gdk5qzqxr2sylc9j990wi6nx0083gbzwnh2bq1k1d0sh"; depends=[SpatialTools splancs]; };
-  excursions = derive { name="excursions"; version="1.0-20140427"; sha256="01m91r3xsrabdaq79gqryhzic0frcdhapnygv3hz6bypv9ls7g76"; depends=[Matrix]; };
-  ExomeDepth = derive { name="ExomeDepth"; version="1.0.0"; sha256="00d0glxaax0qx2siyxrp9zfd4xwq7idd25nmiws4gngmzm16s2q5"; depends=[aod VGAM]; };
+  exams = derive { name="exams"; version="2.0-0"; sha256="0w3hnwnwcvl2i0y08qw96fkhfy31hx3pvw2qjxi95vhna5987k0h"; depends=[]; };
+  ExceedanceTools = derive { name="ExceedanceTools"; version="1.2.2"; sha256="084sc6pggfbcyavhfnd5whyigw7dyjhb4cxmxi0kh2jiam5k8v5b"; depends=[splancs SpatialTools]; };
+  excursions = derive { name="excursions"; version="1.1-20140610"; sha256="0x7rk00abf7fw9h2qqp6s2snkm1snkl35mgmxvgwv0a0jm3q56ls"; depends=[Matrix]; };
+  ExomeDepth = derive { name="ExomeDepth"; version="1.0.7"; sha256="02jsbnpyb8y4qnid084z6x1w22pdhnjq6729ixjiw715vavn4p27"; depends=[aod VGAM]; };
   expands = derive { name="expands"; version="1.4"; sha256="1k9rr13vbppmaq8i0s4q7szp42b444hx5fka9q9vwskhv3d9azwi"; depends=[rJava flexmix matlab mclust moments ape permute]; };
   ExpDes = derive { name="ExpDes"; version="1.1.2"; sha256="0qfigbx06b3p04x5v7wban139mp8hg8x77x6nzwa4v6dr226qbkv"; depends=[]; };
   ExpDes_pt = derive { name="ExpDes.pt"; version="1.1.2"; sha256="0khw2jhg2vxcivgr20ybvrsqhd8l8bir5xjmr4m44za9nhap43bz"; depends=[]; };
@@ -1438,24 +1531,26 @@ let self = _self // overrides; _self = with self; {
   expoRkit = derive { name="expoRkit"; version="0.9"; sha256="0raf0m2nfbdbd1pc4lincyp8y8lgn3bfi4hn0p04plc5p40l1gvc"; depends=[Matrix SparseM]; };
   ExPosition = derive { name="ExPosition"; version="2.8.19"; sha256="04s9kk8x6khvnryg6lqdwnyn79860dzrjk8a9jyxgzp94rgalnnz"; depends=[prettyGraphs]; };
   expoTree = derive { name="expoTree"; version="1.0.1"; sha256="0hj1x4niqp0ghqik3mz733nc3zpnhyknrdpzpj6y2rfia2ysdiz8"; depends=[ape deSolve]; };
-  expp = derive { name="expp"; version="1.0"; sha256="03yxgg7vldcclpwj1yin33rdh2sm7nqsqwgs819j6vh2wr5x9h27"; depends=[sp spdep rgeos deldir]; };
+  expp = derive { name="expp"; version="1.1"; sha256="13zbhkkcshqrpln5gsa051d390q9ij97lawsdbd5j7fj9hxm9pwh"; depends=[sp spdep rgeos deldir]; };
   expsmooth = derive { name="expsmooth"; version="2.02"; sha256="1l9k4llzkqwzmrr1l68qr58ngzs3ql67hxrr5fcrcwwnaa1zinyj"; depends=[tseries forecast]; };
   exptest = derive { name="exptest"; version="1.2"; sha256="0wgjg62rjhnr206hkg5h2923q8dq151wyv54pi369hzy3lp8qrvq"; depends=[]; };
   exsic = derive { name="exsic"; version="1.0"; sha256="01gvqpy72vs7hn5hcxazzqjb44crh0j31khc11m99ig1ynkbvkms"; depends=[stringr markdown]; };
+  ExtDist = derive { name="ExtDist"; version="0.3.3"; sha256="1igdjyadjvm26n3y08gckblxnndrly8d8cgr23hrjww7khdn6ng2"; depends=[numDeriv optimx matrixcalc]; };
   extfunnel = derive { name="extfunnel"; version="1.3"; sha256="162w5b2wjs3yqy8jisamsapav6swa8sskf1b6x5hglnrv3i4qyyy"; depends=[rmeta]; };
+  extlasso = derive { name="extlasso"; version="0.1"; sha256="1yb7pfvpchpx81ffa8hjl5h0qf7714zasllf7w4znk3i9dadbyd1"; depends=[]; };
   extraBinomial = derive { name="extraBinomial"; version="2.1"; sha256="0qmvl35f7n78kghszwyaz4wzbswqy4p98c3b6alzrc2ldsq6pq5z"; depends=[]; };
-  extracat = derive { name="extracat"; version="1.6-4"; sha256="1v398ih6ikqwwc5frs6zqxmhzpx4vinbdxvj9704rzs6zl4vp7aj"; depends=[colorspace hexbin scales ggplot2 reshape2 plyr TSP]; };
+  extracat = derive { name="extracat"; version="1.7-0"; sha256="1m0rfz6vma8rw8rgmadagw26ysq4jmwwysdy9kb5vk8d06la3hag"; depends=[colorspace hexbin scales ggplot2 reshape2 plyr TSP]; };
   extrafont = derive { name="extrafont"; version="0.16"; sha256="0ml1a7m28cdx1a6qcmg8840v95lmhl39ad51q1k3bnqzbxfgqncl"; depends=[extrafontdb Rttf2pt1]; };
   extrafontdb = derive { name="extrafontdb"; version="1.0"; sha256="115n42hfvv5h4nn4cfkfmkmn968py4lpy8zd0d6w5yylwpzbm8gs"; depends=[]; };
-  extraTrees = derive { name="extraTrees"; version="0.4-5"; sha256="0svxafhkl3lc3c6r0aqs1cx8gzp699ij6hl5396vwlbsy0bvpk8x"; depends=[rJava]; };
-  ExtremeBounds = derive { name="ExtremeBounds"; version="0.1.3"; sha256="15p7ghgam1myfaq8mwmf1m5mhy45sbrwpz2kjjz6h3792ccwa9f7"; depends=[]; };
-  extRemes = derive { name="extRemes"; version="2.0-0"; sha256="0nygiz9h5xzkbda7ihqq3mf7h0glc7phc28hi00q6fda3gm7cgwj"; depends=[Lmoments distillery car]; };
+  extraTrees = derive { name="extraTrees"; version="1.0.1"; sha256="0kq59aw05cjvry4sbwb4mrnrhggibjnf0ga9kwbipkkdgzzj5wsz"; depends=[rJava]; };
+  ExtremeBounds = derive { name="ExtremeBounds"; version="0.1.4.1"; sha256="00k7s5dpia9hajdsb70vd0bx01spaz4m6cjk00gzwndia54cb1dp"; depends=[Formula]; };
+  extRemes = derive { name="extRemes"; version="2.0-1"; sha256="0rp2khgrq3wpyxvhyrgrx5b5af33jzfcgmmqlvkx0rr6ql4fqywq"; depends=[Lmoments distillery car]; };
   extremevalues = derive { name="extremevalues"; version="2.2"; sha256="162j6kqnd1ak2w2m6y5dbxcya1ap4648hvc83ibq33bxk98rh7sb"; depends=[]; };
   extWeibQuant = derive { name="extWeibQuant"; version="1.0"; sha256="0l20x33nh50jfrkwm8d0n824d400lnjia8ymdwr10sgj3v1x7vp1"; depends=[]; };
   eyetracking = derive { name="eyetracking"; version="1.1"; sha256="0ajas96s25hjp3yrg42hp78qjhl1aih04mjirkskx32qsyq5hfpv"; depends=[]; };
   ez = derive { name="ez"; version="4.2-2"; sha256="1dk4ig137ridr4pw4afp3flm22s8l38yrgxabld1zv46slndc8mm"; depends=[car ggplot2 lme4 MASS Matrix mgcv plyr reshape2 scales stringr]; };
   ezglm = derive { name="ezglm"; version="1.0"; sha256="0x7ffk3ipzbdr9ddqzv0skmpj5zwazkabibhs74faxnld7pcxhps"; depends=[]; };
-  ezsim = derive { name="ezsim"; version="0.5.3"; sha256="0kfppsl8ckni6dl3qfqxi8saskqx3das7grwqw2f6v1yfms68xvy"; depends=[foreach ggplot2 reshape plyr Jmisc digest]; };
+  ezsim = derive { name="ezsim"; version="0.5.5"; sha256="03x75vmf75qsmk4zb09j7xrb11w31rpfwd3dvv12nwjgndh9bnld"; depends=[foreach ggplot2 digest plyr reshape Jmisc]; };
   FacPad = derive { name="FacPad"; version="3.0"; sha256="0h7knzin0rfk25li127zwjsyz223w7nx959cs328p6b2azhgn59b"; depends=[Rlab MASS]; };
   factas = derive { name="factas"; version="2.3"; sha256="015lpxf37z8vx4h7a8lavksd7i0gc4x7a7ja63wi9h1czdjsc28k"; depends=[plotrix FactoMineR Matrix]; };
   FactMixtAnalysis = derive { name="FactMixtAnalysis"; version="1.0"; sha256="1l4wfp39b7g38vdk6jpd5zq08sjhsg0s71f662aca2rj6l3a2x3r"; depends=[MASS mvtnorm]; };
@@ -1464,6 +1559,7 @@ let self = _self // overrides; _self = with self; {
   factorplot = derive { name="factorplot"; version="1.1-1"; sha256="1l8pabf32dr12l7b4dgv5jaxpsjymgdxc51miv72zczrx8adc7da"; depends=[multcomp nnet]; };
   factorQR = derive { name="factorQR"; version="0.1-4"; sha256="1vl01fm5qfyhnqbl5y86vkr50b8cv07vzlqs3v6smqaqq6yp4lv4"; depends=[lattice]; };
   factualR = derive { name="factualR"; version="0.5"; sha256="1wz8ibcmilcx62yy29nd2i1pdmjf7fm0g9i5s58gdn8cjlhnw1jl"; depends=[RJSONIO RCurl]; };
+  FADA = derive { name="FADA"; version="1.0"; sha256="1qqxzlmwybajyjfvmlvkq6bfd8vm7lgvgs49vh3x8fdbk6annaj6"; depends=[MASS elasticnet sparseLDA sda glmnet mnormt]; };
   FAdist = derive { name="FAdist"; version="2.0"; sha256="0qkbliz25xlsng7fi9hk1vshpd3535yrv5rc43m3g2mj024a9wxg"; depends=[]; };
   Fahrmeir = derive { name="Fahrmeir"; version="2012.04-0"; sha256="1axx6r4g6gj1inih41i2az4y0d3jq9x1a6nyj8k7wp51z4z2nbmk"; depends=[]; };
   fail = derive { name="fail"; version="1.2"; sha256="0xzvb71iq20ah1x1zlb9kbx0r47jhqlzxx0sxwhkibglpzskg84z"; depends=[BBmisc]; };
@@ -1471,26 +1567,25 @@ let self = _self // overrides; _self = with self; {
   faisalconjoint = derive { name="faisalconjoint"; version="1.10"; sha256="0z1d241s05jpcih6kh8dhs3k506mwls4xms5zszsmdbzri6sa34x"; depends=[]; };
   falcon = derive { name="falcon"; version="0.1"; sha256="0yas8a8nqdp03s77k5z1xlyz59gapyx68pz0mf6i2snjwpgai59v"; depends=[]; };
   fame = derive { name="fame"; version="2.18"; sha256="132wb59d15bs94fga5hwxxr9pklyp2rjn448nl8lx5spjrvycwf4"; depends=[tis]; };
-  Familias = derive { name="Familias"; version="1.2"; sha256="0y97sn2wn3g804yx5fx40pbki5d6avb73prb24k85ri3gscrac38"; depends=[paramlink]; };
+  Familias = derive { name="Familias"; version="2.1"; sha256="1ccm2hm8vlm450yqx3r45qklgwa6wb54i39ybfh9g2fl544spzn8"; depends=[paramlink]; };
   FAMT = derive { name="FAMT"; version="2.5"; sha256="0mn85yy9zmiklfwqjbhbhzbawwp2yqrm9pvm8jhasn9c3kw1pcp2"; depends=[mnormt]; };
   fanc = derive { name="fanc"; version="1.13"; sha256="08qw4vhms8q2jyqqp2vlq8xdg7y7m0mcwb1pibm7wn938rgablq3"; depends=[Matrix]; };
   fANCOVA = derive { name="fANCOVA"; version="0.5-1"; sha256="034m2mmm6wmsjd41sg82m9ppqjf4b1kgw5vl2w7kzqfx0lypaiwv"; depends=[]; };
   fanovaGraph = derive { name="fanovaGraph"; version="1.4.7"; sha256="19bzl6yrmi5lgyx6nq3f7i0rdaz2ig580h8116axrsxpx8c4d52x"; depends=[sensitivity igraph DiceKriging]; };
-  fanplot = derive { name="fanplot"; version="3.2"; sha256="0xs02036dw7p5nqn6n33vl19hi7r8567hkhi2f2akayi81ryb288"; depends=[]; };
+  fanplot = derive { name="fanplot"; version="3.3"; sha256="0bv7x3xrsg0pmp9gmck30jypv8cwc03bv753m49dfpgs2p9srcmc"; depends=[]; };
   FAOSTAT = derive { name="FAOSTAT"; version="1.6"; sha256="18wx691hclbf7fvfk3swsz6ripv9w70nlqhsk3lgr4il8bjsr3cy"; depends=[RJSONIO plyr data_table MASS classInt ggplot2 labeling scales]; };
-  faoutlier = derive { name="faoutlier"; version="0.3.1"; sha256="15gibfhdffgwcrz435b6bhz4zabmzwbn9hgirimsgy0k492ywnl6"; depends=[sem lattice MASS]; };
+  faoutlier = derive { name="faoutlier"; version="0.4"; sha256="113qpwil669jr89kpqs6c6xzh0z3vp2hzfy98mh1dr2dvaznd06f"; depends=[sem lattice lavaan MASS]; };
   far = derive { name="far"; version="0.6-3"; sha256="0i7c0zrz33abwkml1zdjf5m61bxpfndwziqjbh6wyhdz8msp2kmf"; depends=[nlme]; };
-  faraway = derive { name="faraway"; version="1.0.5"; sha256="0grqpmmfq8ymhscqn2s6zhf2b86nj7vi4qcg6ymaaydnc228xb75"; depends=[]; };
+  faraway = derive { name="faraway"; version="1.0.6"; sha256="10vj38chfnlz595pdi16v8gcwsbmn8a7p4gb0mm98dncyin5p2a3"; depends=[]; };
   fArma = derive { name="fArma"; version="3010.79"; sha256="1byxyy4afl1gq58r1cmc5p6frdr9rljr1x3pdnc8nj8rr65lkg72"; depends=[timeDate timeSeries fBasics]; };
   farsi = derive { name="farsi"; version="1.0"; sha256="0y14f86bccwjirdx33383wa605y7l7lr0w7ygvg8r7f7izkv7r3n"; depends=[]; };
   fAsianOptions = derive { name="fAsianOptions"; version="3010.79"; sha256="1w9ph3rz6cd7g275flzsnqxwd3r5xin6pkini8pbsi9s8hbqv3vl"; depends=[timeDate timeSeries fBasics fOptions]; };
-  fAssets = derive { name="fAssets"; version="3003.81"; sha256="12dxd2vwg58lp8mzwff3nap2sr2gg9h69j921qp0m39cgs2nlsk0"; depends=[MASS timeDate timeSeries fBasics fCopulae sn robustbase ecodist energy mvnormtest]; };
   fast = derive { name="fast"; version="0.63"; sha256="00ag9d0dwn9al104y93m8dclbjqabr9liif8gr19v3gv6k2k6p2c"; depends=[zoo]; };
   fastclime = derive { name="fastclime"; version="1.2.4"; sha256="0z91khjzffwy4mbqgkfw4l9mw32sg4p5pvcg4v24z1q44pgnwn4y"; depends=[lattice igraph MASS Matrix]; };
   fastcluster = derive { name="fastcluster"; version="1.1.13"; sha256="0hkml8ggmq5gqw9indqh6rb5x922qq8chd9s35fkxdcgzw58253a"; depends=[]; };
   fastcox = derive { name="fastcox"; version="1.1.1"; sha256="1a5i0ragl0r6p29iamkn04igakiwyysykfbs2p6ybgy8pfdq69sv"; depends=[Matrix]; };
   fastGHQuad = derive { name="fastGHQuad"; version="0.1-1"; sha256="0qnffhplfl2kb4dd90as298ays19k4f18slhj063f01gywqqrahn"; depends=[Rcpp]; };
-  FastHCS = derive { name="FastHCS"; version="0.0.1"; sha256="02hh4cj1viccw95r54jlxdppmqfyllw1csx5hwls5gp6gwx8f861"; depends=[matrixStats]; };
+  FastHCS = derive { name="FastHCS"; version="0.0.2"; sha256="0vc7wmsgk731br0y1vrv50vx5sp7jjjbavd4my6y72rsl9iajv3q"; depends=[matrixStats]; };
   fastHICA = derive { name="fastHICA"; version="1.0"; sha256="02lqqni7j2sp3ndb3kq785d7jf08p2s3ch30di8ffhwn57indald"; depends=[fastICA energy]; };
   fastICA = derive { name="fastICA"; version="1.2-0"; sha256="0ykk78fsk5da2g16i4wji85bvji7nayjvkfp07hyaxq9d15jmf0r"; depends=[]; };
   FastImputation = derive { name="FastImputation"; version="1.2"; sha256="04bz623kcanxcl9z8zl6m7m47pk0szcjrjlgs5v1yl3jnq9m2n7g"; depends=[]; };
@@ -1502,6 +1597,7 @@ let self = _self // overrides; _self = with self; {
   FastRWeb = derive { name="FastRWeb"; version="1.1-0"; sha256="1hiabi7ibp69n5wi5x4kwznxhc2i7dxdrqf1fm6ppv7ix0wkjs07"; depends=[Cairo]; };
   fastSOM = derive { name="fastSOM"; version="0.9"; sha256="03501d5289lrlr4qcgxciz160hqc6nhqb9ab266fr132fkbiv4id"; depends=[]; };
   fat2Lpoly = derive { name="fat2Lpoly"; version="1.0.2"; sha256="1v5lrs2jksqiaavyhrsa2kjcw84wzg98g3v0kyx7jhmq8686027g"; depends=[kinship2 multgee]; };
+  FatTailsR = derive { name="FatTailsR"; version="1.0-3"; sha256="0r9n18qlr70p6y4v1xv1lxi1lzm9qp29qy4w51chllqjn15kmv7l"; depends=[minpack_lm]; };
   FAwR = derive { name="FAwR"; version="1.0.1"; sha256="1j97hdhaamg6xqkaxb04xzsd60hd69n9y84frkqi9swvhr565waj"; depends=[MASS lattice]; };
   fBasics = derive { name="fBasics"; version="3010.86"; sha256="1ij7f030r12g7s4jfykyfbnfwxwy777smccf9aw0imrz5ik6qjaj"; depends=[MASS timeDate timeSeries stabledist gss]; };
   fbati = derive { name="fbati"; version="1.0-1"; sha256="1ia67dg9b61kc14mjg7065v0c6n6agdp8cjdviasyzga00wzsyxj"; depends=[pbatR fgui rootSolve]; };
@@ -1512,15 +1608,14 @@ let self = _self // overrides; _self = with self; {
   fcd = derive { name="fcd"; version="0.1"; sha256="091wbf5iskcgyr7jv58wrf590qijb0qcpninmvm3xrwxi34r37xr"; depends=[glmnet MASS combinat]; };
   fCertificates = derive { name="fCertificates"; version="0.5-3"; sha256="1m0kglsr6g0f7m8r9ls95zj3hmjqq83whyk6svar39p13vabadw6"; depends=[fBasics fOptions fExoticOptions]; };
   fclust = derive { name="fclust"; version="1.0.1"; sha256="1xl8mw4wfwp9n9fmfmzxz8k8qyrk62qr77j085b3kgp7a85dp8ma"; depends=[]; };
-  fCopulae = derive { name="fCopulae"; version="3000.79"; sha256="0khinbvma19zcp01qjqishwjlzj99qfggldnsasvbyq13hdj1zf0"; depends=[sn timeDate timeSeries fBasics]; };
   fcros = derive { name="fcros"; version="1.1"; sha256="1wnsjghcs0gfqzl6v95zf0cxm3apnii92b2gxg3hkbgmc6xjm5bf"; depends=[]; };
   FD = derive { name="FD"; version="1.0-11"; sha256="18g2fn6s60hxnasrj58450bjsf4kz62mypyby9avs5anlwihj8gm"; depends=[ade4 ape geometry vegan]; };
-  fda = derive { name="fda"; version="2.4.0"; sha256="1jj4s3dk2l2r871la848bawyjm62w2w1669xa7cqc7xqid78ry68"; depends=[Matrix]; };
-  fdakma = derive { name="fdakma"; version="1.0"; sha256="19bzc02vcgh847xihjf5y9qfm1jsvygmfddf31hnszr3rgqchpl0"; depends=[]; };
+  fda = derive { name="fda"; version="2.4.3"; sha256="19a7jylpr8sh1yz9ljyk889ksfd0xwagbvg83vy6vfsi82q1910g"; depends=[Matrix]; };
+  fdakma = derive { name="fdakma"; version="1.1.1"; sha256="0y70ckgxkns6p45gv9w02krrr96vzs8f838s5vk02c2m6ynp4prs"; depends=[]; };
   fdaMixed = derive { name="fdaMixed"; version="0.4"; sha256="15m13v71kqxd9gqiymgfkq0dvcpzp05576m8zkg08m0k067ga9bd"; depends=[Formula Rcpp]; };
   fdasrvf = derive { name="fdasrvf"; version="1.4.2"; sha256="12x04fi0sxs9yh1mf9iykk69zlz6m31j7s01in28p5hgk6wqf8fi"; depends=[foreach mvtnorm matrixcalc numDeriv]; };
   fdatest = derive { name="fdatest"; version="1.0"; sha256="0m17abycfczkhwmrmjg43ra3fcaqicr15v2frwfgr5p1wj9x0gwq"; depends=[fda]; };
-  fda_usc = derive { name="fda.usc"; version="1.1.0"; sha256="0b7g4qjf0sjk438cflviz0yh9addy6ra8aiq7nwvx3dg2vx13gm3"; depends=[fda MASS mgcv]; };
+  fda_usc = derive { name="fda.usc"; version="1.2.0"; sha256="1ifp94i0px3683ph90f7c3z1gh92c33nlfk1f2drr4s0fyb1kzy3"; depends=[fda MASS mgcv rpart]; };
   FDboost = derive { name="FDboost"; version="0.0-5"; sha256="1xra0g46kicq74cpjby6y1va2bxvx8b9fiy76mdg1s6n8m6r1pxn"; depends=[mboost Matrix mgcv zoo nnls]; };
   fdrci = derive { name="fdrci"; version="2.0"; sha256="0smyl9phl02wghimawvff3h267w3h213jbqpka155i6cfzig9qjy"; depends=[]; };
   FDRreg = derive { name="FDRreg"; version="0.1"; sha256="17hppvyncbmyqpi7sin9qsrgffrnx8xjcla2ra6y0sqzam1145y4"; depends=[fda Rcpp mosaic]; };
@@ -1531,7 +1626,8 @@ let self = _self // overrides; _self = with self; {
   feature = derive { name="feature"; version="1.2.10"; sha256="0jsqa2mv4kxzx3jh1lakg62f15776yzc8clj7wyijnx4jbkx8k8j"; depends=[ks]; };
   features = derive { name="features"; version="2011.8-2"; sha256="0yshwqv2mzl5jj323jwxscpz2ygb4ywxh6q0zwphb24bhv7h9lwd"; depends=[lokern]; };
   fechner = derive { name="fechner"; version="1.0-2"; sha256="0yhiqr0wlka3wq0nhwy9n02ax3x5b0y803iadbsr3xb54pxbfbqd"; depends=[]; };
-  FeedbackTS = derive { name="FeedbackTS"; version="1.0"; sha256="0xbpjyhz24cdc0kz0i96mwd6375x6kbipjs6zqhyh2z7pckvd6sb"; depends=[maps mapdata proj4 geoR]; };
+  federalregister = derive { name="federalregister"; version="0.1.2"; sha256="0f73jhzhqi3a97iyfx5c5i09vxwnyypgw6668z7nch8lvq337s8x"; depends=[RCurl RJSONIO]; };
+  FeedbackTS = derive { name="FeedbackTS"; version="1.1"; sha256="1vp9kxfk1p9hcdl9qg0f5bggh7h2ly9ag70w7dbmkgsika4c0r03"; depends=[maps mapdata proj4 geoR]; };
   fExoticOptions = derive { name="fExoticOptions"; version="2152.78"; sha256="0h58prj8nh340b0fxxkgg4bk25yxvb4f8ppq677hr12x8sysf1a8"; depends=[timeDate timeSeries fBasics fOptions]; };
   fExpressCertificates = derive { name="fExpressCertificates"; version="1.2"; sha256="1r4qkhf7alasbwjz910b0x4dlzm72af06kv7v2vwyzvf3byn21c5"; depends=[mvtnorm tmvtnorm fCertificates Matrix]; };
   fExtremes = derive { name="fExtremes"; version="3010.81"; sha256="0bzgnn0wf7lqhj7b2dbbhi61s8fi2kmi87gg9hzqqi6p7krnz1n5"; depends=[timeDate timeSeries fBasics fGarch fTrading]; };
@@ -1545,14 +1641,14 @@ let self = _self // overrides; _self = with self; {
   fgac = derive { name="fgac"; version="0.6-1"; sha256="0paddf5a4w0g2i0ay7my0bppwh534d8ghy6csfxl5jj034xjgwkk"; depends=[]; };
   FGalgorithm = derive { name="FGalgorithm"; version="1.0"; sha256="1dq6yyb3l6c9fzvk9gs6pb240xb5hvc6fh8p3qd3c91b3m289mcc"; depends=[]; };
   fGarch = derive { name="fGarch"; version="3010.82"; sha256="08q452pasvjhsg2ks6c52lqg276hlbdwk0vh25xya2bw2bgbqy99"; depends=[timeDate timeSeries fBasics]; };
-  FGN = derive { name="FGN"; version="2.0-11"; sha256="01l6gddxqg7cqlw1anskmzfs58yxr7a5zib8ayln19xrvws6c0v8"; depends=[ltsa akima ltsa]; };
+  FGN = derive { name="FGN"; version="2.0-12"; sha256="0jxawb4wm1vcp0131mdnc0r24dw8sd29ih0fc2wh6ahy7mxzajqn"; depends=[akima ltsa]; };
   fgof = derive { name="fgof"; version="0.2-1"; sha256="0bclkb3as0fl2gyggqxczndfyj9pfnni5pa3inpn5msrnjg4g2j2"; depends=[mvtnorm numDeriv]; };
   FGSG = derive { name="FGSG"; version="1.0"; sha256="01v0jbj09r1c4anbs3xa8y8by9ffwbbc36vsh0bv62blrisp7a03"; depends=[]; };
   fgui = derive { name="fgui"; version="1.0-5"; sha256="0gzwxzvf2y9p5rlfk862d7l1dm2sdwjhjpcb8p494cj4g1xshazg"; depends=[]; };
   FHtest = derive { name="FHtest"; version="1.1"; sha256="0yqy3lvxjhk7biqfikxqlgs9zsy1vlld9pqxhgxmq04gbnjn2jfk"; depends=[interval MLEcens MASS KMsurv]; };
   FI = derive { name="FI"; version="1.0"; sha256="17qzl8qvxklpqrzsmvw4wq3lyqz3zkidr7ihxc4vdzmmz69pyh2f"; depends=[]; };
   fICA = derive { name="fICA"; version="1.0-0"; sha256="054dg6ikps0ynfy06y95an5mi2wwqx88ylk5qcifxhjiylw36v5v"; depends=[JADE]; };
-  fields = derive { name="fields"; version="6.9.1"; sha256="004arwyhzps19ljjlx30qqm080r3a3bhq8kglvrnvpgzjxrl68x0"; depends=[spam maps]; };
+  fields = derive { name="fields"; version="7.1"; sha256="0wxm8pq4j5clz1hcgdlajasg5cbq8x35i82wrw3gsy27kslyadkd"; depends=[spam maps]; };
   FieldSim = derive { name="FieldSim"; version="3.1.3"; sha256="0ap1mfsjj3bflpryn0y8h9kg5mzfrnqj6h9f3m5ja32yjv19ql60"; depends=[rgl RColorBrewer]; };
   fifer = derive { name="fifer"; version="1.0"; sha256="0vbkks6y6pacgpiixm10fbfa34lmk5r9kwd30lfjf0g7r51fhvv9"; depends=[xtable MASS]; };
   filehash = derive { name="filehash"; version="2.2-2"; sha256="0766wrc42qh7r99bd2zy50vvdnqlz0vkzplskzkm5f4g63qdhjxh"; depends=[]; };
@@ -1567,12 +1663,13 @@ let self = _self // overrides; _self = with self; {
   FindMinIC = derive { name="FindMinIC"; version="1.6"; sha256="0vlr56nw32msvz8bljrw82nzrnazncs6nz7zisidffm2v3najkar"; depends=[nlme sets]; };
   findpython = derive { name="findpython"; version="1.0.1"; sha256="0fa01znc9cckj4ay4zmwmssm2lkhmsw6h07y1pwgd6z1b2pj7bns"; depends=[]; };
   fingerprint = derive { name="fingerprint"; version="3.5.2"; sha256="042aycxs00rglqh2y27bjlwkk6z312gavli7g8xvqfx1lisijrjk"; depends=[]; };
+  finiteruinprob = derive { name="finiteruinprob"; version="0.4"; sha256="0wcllbqkryll3v3fjb6k210pcgkskzrpa78gg8nda0jvkij11zb7"; depends=[sdprisk numDeriv]; };
   FinTS = derive { name="FinTS"; version="0.4-5"; sha256="16m57h6rk4344aalfwaz7hsyis30c1dirsyx8ih661ihgqn1ai1r"; depends=[zoo]; };
   FisherEM = derive { name="FisherEM"; version="1.4"; sha256="1lhkyyk82i6alxyiqrvy5fx60f8vab0y62zmw5fjaq6h0vczqn3s"; depends=[MASS elasticnet]; };
   fisheyeR = derive { name="fisheyeR"; version="0.9"; sha256="1w6va7gakqq2q8hsvdszpn8s2ysdfc648bk5p5v3wbl5s403bci8"; depends=[tkrplot]; };
-  FisHiCal = derive { name="FisHiCal"; version="1.0"; sha256="17ga4d6ln8zz24s0iirv6a0z5wys9d8si7r8zsjdxnsgnhiwdxad"; depends=[igraph RcppArmadillo]; };
+  FisHiCal = derive { name="FisHiCal"; version="1.1"; sha256="1dds629jlja3vw2l010n1334yh3z10nijqksr0q98ckd2yrwg2rf"; depends=[igraph RcppArmadillo]; };
   fishmethods = derive { name="fishmethods"; version="1.6-0"; sha256="1vp125sg3fy02zj5rbvgq4aymg1dj8g54kq5ss78c7rzwww7a560"; depends=[MASS boot bootstrap]; };
-  fishMod = derive { name="fishMod"; version="0.24"; sha256="1kjn94zvcxqx1j26f99ih1yffzv626x3lfhg7z2imypffm955ap3"; depends=[]; };
+  fishMod = derive { name="fishMod"; version="0.25"; sha256="0mg1bziz2ia406m4ilc7hw1bghrgdibm537hnlf9ffhfayjc4kid"; depends=[]; };
   fishmove = derive { name="fishmove"; version="0.2-1"; sha256="1b8drjvslmpqnq5v3axrshrl2xq87h3x5cgfnibbhn4slrxw55v9"; depends=[ggplot2 plyr]; };
   fit4NM = derive { name="fit4NM"; version="3.3.3"; sha256="1xy334svv7cc3xh2j33q6icnibxl46yvnxw8bd4xrpclg4xchc1g"; depends=[gWidgets tkrplot RGtk2 gWidgetsRGtk2 cairoDevice]; };
   FitAR = derive { name="FitAR"; version="1.94"; sha256="1mkk3kvfq4v0pdabnhbwrk31ji2mv2v6ns16xsvvr1qyg2fnx6hq"; depends=[lattice leaps ltsa bestglm lattice leaps ltsa]; };
@@ -1583,28 +1680,30 @@ let self = _self // overrides; _self = with self; {
   FITSio = derive { name="FITSio"; version="2.0-0"; sha256="1gf3i1q9g81gydag2gj1wsy6wi5jj2v4j3lyrnh1n2g4kxd6s3cp"; depends=[]; };
   fitTetra = derive { name="fitTetra"; version="1.0"; sha256="0ia6wk4gicpmn6kclsd28p7v1npwfv2blagiz0cxzwfw3njv103g"; depends=[]; };
   FKF = derive { name="FKF"; version="0.1.3"; sha256="01ibihca39zng4wrvhq8h28bmb2rnsjm21xy22b85kpn3mbnh7f1"; depends=[RUnit]; };
-  flare = derive { name="flare"; version="1.3.0"; sha256="1i2lwda8whzxhi834fcwx87nc19z4xxv2l9rzavxgsdsfjh0nx83"; depends=[lattice MASS Matrix]; };
+  flare = derive { name="flare"; version="1.4.0"; sha256="19hygxsz0sr1cvqyr6snxgrd9cfi25h1zyk8xhg35jffpbs97d7p"; depends=[lattice MASS Matrix]; };
   flashClust = derive { name="flashClust"; version="1.01-2"; sha256="0l4lpz451ll7f7lfxmb7ds24ppzhfg1c3ypvydglcc35p2dq99s8"; depends=[]; };
   flexclust = derive { name="flexclust"; version="1.3-4"; sha256="1x9gyg69kb3wn02w885kl6hcwpf2ki66gzfayvc83jisrwxvdfvv"; depends=[lattice modeltools]; };
   flexCWM = derive { name="flexCWM"; version="1.1"; sha256="0vxzf3ifmpg7l13bvbmv6h5a3gmn2h1xvkq354lvy4s8znk643c4"; depends=[numDeriv mnormt mclust ellipse mixture Flury]; };
   flexmix = derive { name="flexmix"; version="2.3-11"; sha256="14nv6dxpgm9nr01rcz32x42agr4xi2anyss2fiywjidwbdgj50iy"; depends=[lattice modeltools nnet]; };
   FlexParamCurve = derive { name="FlexParamCurve"; version="1.4-3"; sha256="1056lxs9c2bbh2i2gv1bv2sy8gq6k6p0jpl1d3axqd1xk5pipm2x"; depends=[nlme]; };
   flexsurv = derive { name="flexsurv"; version="0.3"; sha256="0ig0151843qfc4pvk9mh80kly1n9mq9aphwkwligm9llspiwbcja"; depends=[survival muhaz mvtnorm]; };
-  flip = derive { name="flip"; version="2.4.2"; sha256="0qyn5y66hx4zbpxz2n56zazih44qrdi8lllq6awfin1dn8yx9xip"; depends=[e1071 someMTP cherry Rcpp]; };
+  FLIM = derive { name="FLIM"; version="1.1"; sha256="1gghzmj3mvih4gglk27rx1v18q72xnvymgzjwa84m5vlc8840jpa"; depends=[zoo MASS]; };
+  flip = derive { name="flip"; version="2.4.3"; sha256="04zf2gnk5w57gxnlnh26pn1ir1wfrzxhfhchr33ghk7prhc7k4b8"; depends=[e1071 someMTP cherry Rcpp]; };
   FLLat = derive { name="FLLat"; version="1.1"; sha256="1h2nfx7gb66hjdfkdm6im6n8c1fjdz9csg39pckb47c0khl3g9r0"; depends=[gplots]; };
-  flora = derive { name="flora"; version="0.1"; sha256="1bccx65aw2z44h8j9q2f6yqz5745h7l3q9nz0fjc9sqbyd4n1wpw"; depends=[RCurl XML rjson]; };
+  flora = derive { name="flora"; version="0.2.3"; sha256="03n2as362fcz7jbkprwqr2rs86njbkywczsf8cjfa2akwh93gj7s"; depends=[shiny]; };
   flowfield = derive { name="flowfield"; version="1.0"; sha256="1cx3i0w3xq781mmms4x20fshlf1i9bwxw9bxx562crix3fq3m50j"; depends=[]; };
+  FLR = derive { name="FLR"; version="1.0"; sha256="0k50vi73qj7sjps0s6b2hq1cmpa4qr2vwkpd2wv2w1hhhrj8lm0n"; depends=[combinat]; };
   flsa = derive { name="flsa"; version="1.05"; sha256="07z2b1pnpnimgbzkjgjl2b074pl9mml7nac2p8qvdgv7aj070cmh"; depends=[]; };
+  FLSSS = derive { name="FLSSS"; version="1.0"; sha256="1plpq4m7fh1g3hrbby1v93pnp1kn7ickb2vd6fa3zs7r9dkglikn"; depends=[Rcpp]; };
   FluOMatic = derive { name="FluOMatic"; version="1.0"; sha256="06hww6viynisnfiphvghv4iqf1gk2snb8aksignaw8pnlkixnsg7"; depends=[]; };
   Flury = derive { name="Flury"; version="0.1-3"; sha256="105fv9azjkd8bsb9b8ba3gpy3pjnyyyp753qhrd11byp3d0bbxy0"; depends=[]; };
   flux = derive { name="flux"; version="0.3-0"; sha256="0pc9cab2pwrfl0fnz29wp7a398r49hvbi50jp8i2fk2rfvck21a7"; depends=[caTools]; };
   fma = derive { name="fma"; version="2.01"; sha256="1j5mvhbrdnkyj4svibpahnz7d4221nkhja5b7fnh68mbmil607fc"; depends=[tseries forecast]; };
   FME = derive { name="FME"; version="1.3.1"; sha256="1wylpxr9m65ksizjhn97082kfkf9m451qraw93cgn5660skxw7d8"; depends=[deSolve rootSolve minpack_lm MASS coda]; };
-  fmri = derive { name="fmri"; version="1.5-0"; sha256="1a40rpm86kpqbq7hsfl3a3zkm3i938wdhdwf8vplrd117f15jbyb"; depends=[]; };
-  fmsb = derive { name="fmsb"; version="0.4.4"; sha256="16kbbxlxwa1dnsyqw30rjwygh09cn0131zk2zswv7zq1imxniayr"; depends=[]; };
+  fmri = derive { name="fmri"; version="1.5-1"; sha256="0dla5w8x4njw2njryb35nqh4r31wdps9bl5wzab2grzl546wwmwm"; depends=[]; };
+  fmsb = derive { name="fmsb"; version="0.5.0"; sha256="1aynq4d2nrx11irrbhvjavvd86ffgrw5jv6pwnk97lw6qjfk5kc3"; depends=[]; };
   FMStable = derive { name="FMStable"; version="0.1-2"; sha256="00viigpqfbqc4hyl9cwicbwqf2ksjak28qrqaa16jhbqz93j4fck"; depends=[]; };
   fmt = derive { name="fmt"; version="1.0"; sha256="13gsywnyvf9zy5n644g2xyd60f92w2dp7vil2dncjvjcqsib22a0"; depends=[]; };
-  fMultivar = derive { name="fMultivar"; version="2152.77"; sha256="1gli46v7gvfbmbqvlam5g858ggyr8bl6ndbrqidq4bd1pdb8s9sl"; depends=[sn timeDate timeSeries fBasics]; };
   FNN = derive { name="FNN"; version="1.1"; sha256="1kncmiaraq1mrykb9fj3fsxswabk3l71fnp1vks0x9aay5xfk8mj"; depends=[]; };
   fNonlinear = derive { name="fNonlinear"; version="3010.78"; sha256="0pmz16b606i3mx05zjln4nyl53ks7rlwgm45ldr9qgmw51pflwz9"; depends=[timeDate timeSeries fBasics fGarch]; };
   foba = derive { name="foba"; version="0.1"; sha256="1af8whgl66v0vwzdf03b6141k3dysdc0svymlgifcga5gqkwzsl0"; depends=[]; };
@@ -1614,15 +1713,16 @@ let self = _self // overrides; _self = with self; {
   forams = derive { name="forams"; version="2.0-4"; sha256="1kvxlqdyzb3rqa45hp7jxjm009w0r6h78nr3yh9bqcz594zqidbq"; depends=[vegan]; };
   foreach = derive { name="foreach"; version="1.4.2"; sha256="097zk7cwyjxgw2i8i547y437y0gg2fmyc5g4i8bbkn99004qzzfl"; depends=[codetools iterators]; };
   ForeCA = derive { name="ForeCA"; version="0.1"; sha256="1nbflawx8h4lpb9ixbp0zcyl0bqykqlqail31i00ywkak2ic3pm3"; depends=[ifultools splus2R nlme R_utils sapa mgcv astsa]; };
-  forecast = derive { name="forecast"; version="5.3"; sha256="1nb4llzvkawxd5iwq50wj07w17v2bnz4ynddgrvs3k719fdqi9i2"; depends=[zoo timeDate tseries fracdiff Rcpp nnet colorspace]; };
+  forecast = derive { name="forecast"; version="5.5"; sha256="040sjs26jdpcvn1mipbvy81ygr1ck1z69jhx375l76hbswyq801c"; depends=[zoo timeDate tseries fracdiff Rcpp nnet colorspace]; };
   foreign = derive { name="foreign"; version="0.8-61"; sha256="0r994z3ihvrbfhzpvp2dkxbfgkbmccgrryfaxmy1vi56v59n73w8"; depends=[]; };
   forensic = derive { name="forensic"; version="0.2"; sha256="0kn8wn6p3fm67w88fbarg467vfnb42pc2cdgibs0vlgzw8l2dmig"; depends=[genetics combinat]; };
   forensim = derive { name="forensim"; version="4.3"; sha256="1j92imykw48cciay0r6n1aq1jrdb2b1grrz6lpc4kgbnbd7mk0qm"; depends=[tcltk2 tkrplot]; };
   ForImp = derive { name="ForImp"; version="1.0.2"; sha256="1qplsg3cxs95b3ax71a3wyjfk4q207k72ggba2sl0zc7mjqhv1f4"; depends=[homals sampling mvtnorm]; };
+  ForIT = derive { name="ForIT"; version="1.0"; sha256="0mi2cw09mbc54s8qwcwxin2na1gfyi60cdssy2ncynma7alq3733"; depends=[]; };
   fork = derive { name="fork"; version="1.2.4"; sha256="1sb4xypirmrknhrc872ky845kym58dmakn6c2crsbp67wpg63m4l"; depends=[]; };
   FormalSeries = derive { name="FormalSeries"; version="1.0"; sha256="09m4ifinasww0xfprs29xsrqhxxkw9zffb3919xnkkjkwp0nax4v"; depends=[]; };
   formatR = derive { name="formatR"; version="0.10"; sha256="0rxm4c896rcmalmq1hsjg053dqb3m2vf9jqap5w5bsllaiakwh4a"; depends=[]; };
-  Formula = derive { name="Formula"; version="1.1-1"; sha256="06lrl2yv58qhgnyc44cbzf8av4pr8gfizn00mmbb54wl685cr9g1"; depends=[]; };
+  Formula = derive { name="Formula"; version="1.1-2"; sha256="1axjcmy4x2175nrfjc7vwkijcyr86ws6nbs08990wq8gcal15a10"; depends=[]; };
   formula_tools = derive { name="formula.tools"; version="1.3.4"; sha256="1xxl45x88fpskwvfj6sbcbfng84plpf8sjrkwawzki9a41ydhwaq"; depends=[operator_tools]; };
   fortunes = derive { name="fortunes"; version="1.5-2"; sha256="1wv1x055v388ay4gnd1l8y6dgvamyfvmsd0ik9fziygwsaljb049"; depends=[]; };
   forward = derive { name="forward"; version="1.0.3"; sha256="0swn5ysp3f660kl9jpmkck9324j1g3yhj2hl238rfrcr5wihxifc"; depends=[MASS]; };
@@ -1631,7 +1731,6 @@ let self = _self // overrides; _self = with self; {
   fpc = derive { name="fpc"; version="2.1-7"; sha256="1zymk2v7s8jyn4jm3qaxzd5rlx748ap4ad2dd56w195q5j1xn4bh"; depends=[MASS cluster mclust flexmix]; };
   fpca = derive { name="fpca"; version="0.2-1"; sha256="13b102026xlfb7c2rb3xsqsymm7xpmaxppaafjkb5dx0b1lz0jrc"; depends=[sm]; };
   FPDC = derive { name="FPDC"; version="1.0"; sha256="0f6f5bjh1dqv9n6hpbgj922ymbd1zdb0b4ad5h9nk1c6c9ysai7y"; depends=[ThreeWay]; };
-  fPortfolio = derive { name="fPortfolio"; version="2130.80"; sha256="0i1f60nc6xn9a3cvq2m8hzvvcbqgyjj08f71410kd5vqyk58gahw"; depends=[MASS robustbase timeDate timeSeries fBasics fAssets quadprog Rglpk]; };
   fpow = derive { name="fpow"; version="0.0-2"; sha256="0am3nczimcfrm9hi02vl2xxsh703qjmr2j11y014mll3f2v1l8cy"; depends=[]; };
   fpp = derive { name="fpp"; version="0.5"; sha256="1jqnx6bgpvnbbj2fa2b6m6aj8jd5cb9kz877r8kp7a5qj62xv1ww"; depends=[forecast fma expsmooth lmtest tseries]; };
   fptdApprox = derive { name="fptdApprox"; version="2.0"; sha256="152bajs76wrapp0zdbkckff6kdkkm6sqqlqd2w220hsi96l2p9dh"; depends=[]; };
@@ -1642,36 +1741,37 @@ let self = _self // overrides; _self = with self; {
   fractalrock = derive { name="fractalrock"; version="1.1.0"; sha256="15f4w8hq3d8khgq269669ri16qxhar9646w40cw7wzh79r9gpf00"; depends=[futile_any futile_logger timeDate quantmod]; };
   FRACTION = derive { name="FRACTION"; version="1.0"; sha256="0g25dzsbharsq8bzfka96zccaqppdclax24mz5m080ddg4y8zj49"; depends=[]; };
   frailtyHL = derive { name="frailtyHL"; version="1.1"; sha256="1xjdph0ixanf9w4b6hx6igfhkcp8h93sclrg0pgqgmbvm41lhb1x"; depends=[Matrix numDeriv survival]; };
-  frailtypack = derive { name="frailtypack"; version="2.6"; sha256="1mwglniv7v2ivx5hkg12l61w95bzc7nh9q89fvn3hrdy9s4zpg3h"; depends=[survival boot MASS survC1]; };
+  frailtypack = derive { name="frailtypack"; version="2.6.1"; sha256="0xzf7qffp9ybxdd9x2s30k23lcss8wf6rbljp3x5xbyg87nfawyd"; depends=[survival boot MASS survC1]; };
   frair = derive { name="frair"; version="0.4"; sha256="1g52ykj1m9znpp0pvry7dnmhg4m73nbkw0bp31zl6pcsdgmxxqjr"; depends=[bbmle emdbook boot]; };
   FRAPO = derive { name="FRAPO"; version="0.3-8"; sha256="1wqayyai8pdm1vq6qvpd10qpd882cyjb0y0jl582fxd3a2ic7n14"; depends=[quadprog Rglpk timeSeries]; };
   FRB = derive { name="FRB"; version="1.8"; sha256="13rp4gqldx84mngrdv5fa9xamkng7b3kgy30ywykcx46gmrym6ps"; depends=[corpcor rrcov]; };
-  FRBData = derive { name="FRBData"; version="0.3"; sha256="1m109kmk7pimin6wspck0yc1am4d7w75f1b8lr5kb9xzl9gw4i7c"; depends=[xts]; };
   frbs = derive { name="frbs"; version="2.2-0"; sha256="13m8hm2925h1mz2wgbsxiqls5gy7sgvp0rsdcsy2sm7czjnl2z7n"; depends=[]; };
   FRCC = derive { name="FRCC"; version="1.0"; sha256="1g1rsdqsvwf7wc16dj16y6r0347j8jsv5l1pxvj1h0579zinaf2b"; depends=[CCP MASS calibrate corpcor]; };
   freeknotsplines = derive { name="freeknotsplines"; version="1.0"; sha256="19zs42q9njknirdbrbnp8bv4vr32kd8wxmkqj0a0nh06i5fcx67r"; depends=[]; };
-  freestats = derive { name="freestats"; version="0.0.2"; sha256="167z75scm5jasm7zz38n6sq6ryi10xaj694riyqlczw55ac3csn7"; depends=[MASS mvtnorm]; };
-  fRegression = derive { name="fRegression"; version="3010.80"; sha256="07ncfp103a4g98xhfh89r0ixgwgd1l7d7fkr2xwi39lrjdfxk97h"; depends=[fBasics fTrading fMultivar mgcv nnet polspline lmtest MASS]; };
+  FreeSortR = derive { name="FreeSortR"; version="1.0"; sha256="1zrff48abf42md6y2x2s8sd23807dx78fjgbfzzxswg3hz34g5sa"; depends=[smacof vegan ellipse]; };
+  freestats = derive { name="freestats"; version="0.0.3"; sha256="0b18n8idap089gkmjknzzb94dvs2drpdqs0mrw7dqnacxgbbqwfj"; depends=[MASS mvtnorm]; };
   FREQ = derive { name="FREQ"; version="1.0"; sha256="01nra30pbnqdd63pa87lcws3hnhhzybcjvx2jqyxjghn6khz47j0"; depends=[]; };
   freqMAP = derive { name="freqMAP"; version="0.2"; sha256="02hpkqqrxifrr1cxn5brp166jwa8lgl1mcgmq7s8csrbbd900ziv"; depends=[]; };
   freqparcoord = derive { name="freqparcoord"; version="1.0.0"; sha256="0hn5y10yp3j76lqrmj6dsaafamgy4pfxx1p4y92z17s79x29j59q"; depends=[ggplot2 GGally FNN mvtnorm]; };
-  freqweights = derive { name="freqweights"; version="0.0.1"; sha256="062av7fv17xzkpymlmaajby4jp39d26qdr08mrbys6hdgcdrk5zd"; depends=[plyr data_table dplyr biglm fastcluster]; };
-  FrF2 = derive { name="FrF2"; version="1.7"; sha256="1z6ld8m0xmqb1dpvmaq36n2yz6b5j6jxll8pj2qav8x1055n3wfm"; depends=[DoE_base sfsmisc BsMD scatterplot3d igraph]; };
+  freqweights = derive { name="freqweights"; version="0.1.0"; sha256="1ckhr0d21gd193lkwv4723n4q72phg93ymi00810f1h5677mghby"; depends=[plyr dplyr data_table biglm fastcluster FactoMineR]; };
+  FrF2 = derive { name="FrF2"; version="1.7-1"; sha256="0i9hfx7n0g866imdsmalqzs8v95vx08cz97hi8311v1wc3pqsn1j"; depends=[DoE_base sfsmisc BsMD scatterplot3d igraph]; };
   FrF2_catlg128 = derive { name="FrF2.catlg128"; version="1.2-1"; sha256="0i4m5zb9dazpvmnp8wh3k51bm0vykh4gncnhdg71mfk4hzrfpdac"; depends=[FrF2]; };
-  frm = derive { name="frm"; version="1.0"; sha256="1pxzywyvh95i57g2ppj4qhl4j47s46kmhc6xlvmghw44c3pynfyz"; depends=[]; };
+  frm = derive { name="frm"; version="1.2"; sha256="128ya5gx27hywkhf9mivscxsk8rgf07c0y65fh15hp1c8m6dx0nz"; depends=[]; };
   frmqa = derive { name="frmqa"; version="0.1-5"; sha256="0vd5jnjzhkc0vd4cqn4cs6a3limd4fxwyb5i7845rwmkzk1944aj"; depends=[partitions Rmpfr]; };
   frontier = derive { name="frontier"; version="1.1-0"; sha256="0k2ap22qddzki63biikr1jzi5vmqz4j06d7qrf1y8axdq1q1cr44"; depends=[micEcon lmtest moments Formula miscTools]; };
   frontiles = derive { name="frontiles"; version="1.2"; sha256="08qq25wbylvhvmq34wggyj0hwdlxfs9rfs8gjqsrg50xccchniqi"; depends=[classInt colorspace rgl sp]; };
   frt = derive { name="frt"; version="0.1"; sha256="1qy76a1wkznaqzlyj1nq74mf1pnyly1s8gnff8q30zfccqk68cxv"; depends=[]; };
   fscaret = derive { name="fscaret"; version="0.8.5.6"; sha256="060i64q65ra2npxvrd6ihzqqqv3s4xyisvgrskkyybswhqzvhxvr"; depends=[caret gsubfn]; };
   FSelector = derive { name="FSelector"; version="0.19"; sha256="1b9jj8lqly31v393mx9dmr437sw0pk7m693ah4xnr2c9vjry6fav"; depends=[randomForest RWeka digest]; };
+  fslr = derive { name="fslr"; version="1.1"; sha256="0m2bhmbkf4594k6l8xmqlrgv2z6pmhwm3an0ll5qvl6giy1q70vc"; depends=[stringr oro_nifti matrixStats]; };
   fso = derive { name="fso"; version="2.0-1"; sha256="02dr12bssiwn8s1aa1941hfpa4007gd65f3l4s74gs2vgjzdxf8s"; depends=[labdsv rgl]; };
-  fSRM = derive { name="fSRM"; version="0.3.4"; sha256="013nlz28nyyx59w8rbyqh074kzabkkb0zfm9vpk5ay4nd2i9a28r"; depends=[lavaan plyr reshape2]; };
+  fSRM = derive { name="fSRM"; version="0.3.5"; sha256="1dprw19ssw4v892b6iqsz5i7dmicjhgr6v1fkhnwd988nqv6h01s"; depends=[lavaan plyr reshape2]; };
   FTICRMS = derive { name="FTICRMS"; version="0.8"; sha256="0kv02mdmwflhqdrkhzb55si5qnqqgdadgyabqc2hwr6iccn7aq8c"; depends=[Matrix lattice]; };
   ftnonpar = derive { name="ftnonpar"; version="0.1-88"; sha256="0df9zxwjpfc939ccnm1iipwhpf76b34v0x74nsi1mm1g927dfl0i"; depends=[]; };
   fTrading = derive { name="fTrading"; version="3010.78"; sha256="0qakjxnr5nslw06ywlj65m3w7pjgn5hixxc2rnqhvvvmjpdxybz7"; depends=[timeDate timeSeries fBasics]; };
   fts = derive { name="fts"; version="0.9.9"; sha256="1qgp8xdwr5pp2b7nd8r717a6p8b6izwqrindx2d1d0lhhnqlcwhv"; depends=[zoo]; };
-  ftsa = derive { name="ftsa"; version="3.9"; sha256="1fbaclaj7a74gvy7kax45vg0805jp7myr5929mj90lymazm7r76j"; depends=[forecast rainbow colorspace]; };
+  ftsa = derive { name="ftsa"; version="4.0"; sha256="0phqsw3zq0bq6sdqdacyajk1xk7ns66nd3rpszl96gi7jw5m5bf8"; depends=[forecast rainbow colorspace]; };
+  fueleconomy = derive { name="fueleconomy"; version="0.1"; sha256="1svy5naqfwdvmz98l80j38v06563vknajisnk596yq5rwapl71vj"; depends=[]; };
   fugeR = derive { name="fugeR"; version="0.1.2"; sha256="0kd90s91vzv0g3v9ii733h10d8y6i05lk21p5npb3csizqbdx94l"; depends=[snowfall Rcpp]; };
   fume = derive { name="fume"; version="1.0"; sha256="0g9ygyjxsk0m3ad25h3bcgxs9g29blqn8p27s9g47kxvh4v1nq4y"; depends=[chron]; };
   fun = derive { name="fun"; version="0.1-0"; sha256="0z4nq2w1wz1clc7cf87pf870hayxq5mpzhllfgwj4mmh2xpphnrf"; depends=[]; };
@@ -1679,27 +1779,31 @@ let self = _self // overrides; _self = with self; {
   FunCluster = derive { name="FunCluster"; version="1.09"; sha256="0i73asn1w4s6ydf2ddn5wpr0mwbbxzgmaly1pslarzkx71wk03fz"; depends=[Hmisc cluster]; };
   Funclustering = derive { name="Funclustering"; version="1.0.1"; sha256="0i6g98mfgdyc9hdzvviynrgqhkzicp8y6s0scqy3ifgk9h1k79dw"; depends=[fda Rcpp]; };
   FuncMap = derive { name="FuncMap"; version="1.0-2"; sha256="0psz2bsmq22ghgr3dijsw094b9ams15dvknigcgi5sq1invafx4a"; depends=[mvbutils]; };
-  functional = derive { name="functional"; version="0.4"; sha256="1a3hka0ba9bbpk5bnb4vhygxyw88hif636hw8wwdjx55wq6sbl85"; depends=[]; };
+  functional = derive { name="functional"; version="0.6"; sha256="120qq9apg6bf39n9vnp68db5rdhwvnj2vi12a8j8243vq8kqxdqr"; depends=[]; };
+  FunctionalNetworks = derive { name="FunctionalNetworks"; version="1.0.0"; sha256="071hjgiccbrf1gxrh7niw2w1p6vgc77qvrildi59xhk53qcwzqdp"; depends=[]; };
   fUnitRoots = derive { name="fUnitRoots"; version="3010.78"; sha256="04nwwazd8jvzds6p4njzq4wpcsrvvvs0y9z8v8r402myd4856ssm"; depends=[urca timeDate timeSeries fBasics]; };
+  funreg = derive { name="funreg"; version="1.1"; sha256="1sxr4mylcpbya197d55yi6d7g5pfspaf59xxbwjgmwgjw06rl76r"; depends=[MASS mgcv mvtnorm]; };
+  FusedLasso = derive { name="FusedLasso"; version="1.0.6"; sha256="1m2l7ihd55viy5a543gg2rhzkcmf5myxxbc5gqf1icrwjg6bny41"; depends=[Matrix]; };
   FusedPCA = derive { name="FusedPCA"; version="0.2"; sha256="0z4kvm6mn11fmc8w62aky2binjdcgrw4ij5vg65sb55da9s8d2kd"; depends=[genlasso]; };
   futile_any = derive { name="futile.any"; version="1.3.0"; sha256="1c7pj64kz09qzwrxvkp1w1w8mvxwq36zkj6w4b7yyi8v7x3daq2a"; depends=[lambda_r]; };
   futile_logger = derive { name="futile.logger"; version="1.3.7"; sha256="0mcca1d70a173f2c54g05fp6174z3265bc4z73k8hs16sfb3s7zf"; depends=[lambda_r futile_options]; };
-  futile_matrix = derive { name="futile.matrix"; version="1.2.0"; sha256="0nas464z70318d8mh81k7w28889jqva5ghisnknzin1rsrpws0zg"; depends=[futile_logger futile_any RMTstat]; };
+  futile_matrix = derive { name="futile.matrix"; version="1.2.2"; sha256="1cb975n93ck5fma0gvvbzainp7hv3nr8fc6b3qi8gnxy0d2i029m"; depends=[lambda_r lambda_tools futile_logger RMTstat]; };
   futile_options = derive { name="futile.options"; version="1.0.0"; sha256="1hp82h6xqq5cck67h7lpf22n3j7mg3v1mla5y5ivnzrrb7iyr17f"; depends=[]; };
   futile_paradigm = derive { name="futile.paradigm"; version="2.0.4"; sha256="14xsp1mgwhsawwmswqq81bv6jfz2z6ilr6pmnkx8cblyrl2nwh0v"; depends=[futile_options RUnit]; };
   fuzzyFDR = derive { name="fuzzyFDR"; version="1.0"; sha256="0zd8i9did0d9gp42xjmwrccm32glabvvy08kl8phhwb1yaq53h7w"; depends=[]; };
+  fuzzyMM = derive { name="fuzzyMM"; version="1.0.1"; sha256="1pqfc9b9l2xx5pl45hfildikqjsdgqfhqzi2nbb34026nla5m8vk"; depends=[osmar frbs igraph rgeos rgdal]; };
   FuzzyNumbers = derive { name="FuzzyNumbers"; version="0.3-3"; sha256="1vbfkr8r1n8d564ws8dqfbd49f33vd7drg3chg2vr9bxh292wsl3"; depends=[]; };
   fuzzyRankTests = derive { name="fuzzyRankTests"; version="0.3-5"; sha256="1g09506bbpk05a2r2wxjynjs8dmjd2q7x74d83vjscg1kdk4kazq"; depends=[]; };
   FuzzyStatProb = derive { name="FuzzyStatProb"; version="1.0"; sha256="0dkxix2blb403a72a9n13hyx31rknfxfq0cbkvvk7dvgis2w6k14"; depends=[MultinomialCI FuzzyNumbers DEoptim]; };
   FuzzyToolkitUoN = derive { name="FuzzyToolkitUoN"; version="1.0"; sha256="104s45mmlam67vwpshhpns2mgwvmhnbj8w1918jyk2r5mqibwz06"; depends=[]; };
   fwdmsa = derive { name="fwdmsa"; version="0.2"; sha256="0p0kh8am6gajfaixkvq61f12hfbm6chl9372yzn1yilhiyvqdxgp"; depends=[]; };
   FWDselect = derive { name="FWDselect"; version="1.1"; sha256="1snamrzf0cqcm6sc5vr1b0scgy83jgr5hgsf2cjb3vi3j01hz9wd"; depends=[mgcv]; };
-  fwi_fbp = derive { name="fwi.fbp"; version="1.3"; sha256="0fsrqvf4w8izbbkx99syy842bkgm932g5q81k9qsrb0a61l94nsr"; depends=[]; };
+  fwi_fbp = derive { name="fwi.fbp"; version="1.5"; sha256="08ngg70vi2fca5yblm2gf1lkjjmb6m39d8q6429n7i3jn6ca5nzf"; depends=[]; };
   fwsim = derive { name="fwsim"; version="0.3.1"; sha256="0l9qsysi0v8q58ik0pk7jxs2m57q2n82apc0rb0d0czm7dmib6b6"; depends=[Rcpp]; };
   fxregime = derive { name="fxregime"; version="1.0-3"; sha256="15fh8yhcba2gw2xfd0yiw5ssvbgb62l6vb28bxz71ckdyv9nsahk"; depends=[zoo strucchange car sandwich]; };
   G1DBN = derive { name="G1DBN"; version="3.1.1"; sha256="015rw3bpz32a8254janddgg1ip947qgcvmiwx5r3v7g8n854bwxn"; depends=[MASS igraph]; };
   G2Sd = derive { name="G2Sd"; version="2.1-1"; sha256="01b7bpvnl51dms7bp076v0mbz8bk2vrlkqji9fk6nyqfpxg5zn6a"; depends=[shiny xlsx rJava xlsxjars]; };
-  GA = derive { name="GA"; version="2.0"; sha256="0bcxxjbsbv4m8dn02dw74gidcjn1jilmp88ckz6w5dnhdm74d42z"; depends=[]; };
+  GA = derive { name="GA"; version="2.1"; sha256="06adi6kdav5c9kzn4y6gq73p496y73hvcdv6nf7d0by8hx5ncyc4"; depends=[]; };
   GA4Stratification = derive { name="GA4Stratification"; version="1.0"; sha256="0li23mrxjx72fir16j3q06fa32cicck4pfc30n0dy2lysf81m9gs"; depends=[]; };
   GABi = derive { name="GABi"; version="0.1"; sha256="1zmiaqbd1jrpiz9hk16s8rggcpl3xyyhjkkdliymx2p42vy5b5mf"; depends=[hash]; };
   GAD = derive { name="GAD"; version="1.1.1"; sha256="0lyrw0d7i7yn1wkqlbf3rg3dnijfwsjn3kdbsg19hmvwq6qpsak2"; depends=[matrixStats R_methodsS3]; };
@@ -1708,25 +1812,25 @@ let self = _self // overrides; _self = with self; {
   galts = derive { name="galts"; version="1.3"; sha256="0b18hsdcsx43rn8l4x9nhy9hgggjr5b8kvjnbxrf6r23qsdk43mn"; depends=[genalg DEoptim]; };
   gam = derive { name="gam"; version="1.09.1"; sha256="09p83ki821x57kc74klh6i1h8bz3acsrvibz3mzzcgq6sa8gzr5i"; depends=[]; };
   gamair = derive { name="gamair"; version="0.0-8"; sha256="11qwmhrzks8gi9is2n9xcy6cviy7a8mwh2v78fw78x7g7ccd8i9x"; depends=[]; };
-  gambin = derive { name="gambin"; version="1.0"; sha256="01jsh9h83s0lh887s6gfhb074k8cv96jhj8x6bkql5g948p2b0p0"; depends=[]; };
+  gambin = derive { name="gambin"; version="1.1"; sha256="197k8j6mvf8236gwg8vvfnskf4hic9y075chsd8214n1nk7i6jmz"; depends=[]; };
   GAMBoost = derive { name="GAMBoost"; version="1.2-3"; sha256="0450h9zf12r524lxk1lrv9imvvkk6fmyd3chnxp18nnvys7215pv"; depends=[Matrix]; };
-  gamboostLSS = derive { name="gamboostLSS"; version="1.0-3"; sha256="04p3f2vq2h2abqjm0hf0g29anw18b338d6apyfm438glji60fm5y"; depends=[survival mboost]; };
+  gamboostLSS = derive { name="gamboostLSS"; version="1.1-2"; sha256="1my718gp5wnzrpy50r9cjcjy4kbxvy0q1867n21dll6rhbxz0yil"; depends=[mboost]; };
   gamboostMSM = derive { name="gamboostMSM"; version="1.1.5"; sha256="1n6ngbxx9f3p98jfiq4x21y0rqmhy18zyv13y8mkrz7hrchh835f"; depends=[mboost]; };
   gamclass = derive { name="gamclass"; version="0.52"; sha256="0ypdsjmzj5vj6z5iimx1xva6pqh75s1dlaar2hkyn8zx08d0q2kh"; depends=[car mgcv DAAG MASS rpart randomForest lattice latticeExtra ape KernSmooth]; };
-  games = derive { name="games"; version="1.1-1"; sha256="0qw2pfigkqfwldam45q786fksz7ssldh62cw6rxclb4j14c8ibig"; depends=[maxLik Formula MASS stringr]; };
+  games = derive { name="games"; version="1.1-1"; sha256="05x27vivz2acp7darja0x21l29ddlav6ch6l89a9s60v52zqflik"; depends=[maxLik Formula MASS stringr]; };
   gamlr = derive { name="gamlr"; version="1.11-3"; sha256="01mwgmmyp132d792darjrfbcihw04sy3fyw2xchshjqry616j82i"; depends=[Matrix]; };
-  gamlss = derive { name="gamlss"; version="4.2-8"; sha256="13562jiilcci20v0j5p04jvh2bs4r31svv54d9gar3hn8syhn3wp"; depends=[gamlss_data gamlss_dist nlme MASS survival]; };
-  gamlss_add = derive { name="gamlss.add"; version="4.2-8"; sha256="1spa5ds68a5r7ihiimybm1rm6n21r1csxn9asjxrb6v2vi3kiy34"; depends=[gamlss mgcv nnet rpart]; };
+  gamlss = derive { name="gamlss"; version="4.3-0"; sha256="0hsywaf3ng7c8b7xcq16q1cnld7g224gwdkf7s07zlfv23v6kxs8"; depends=[gamlss_data gamlss_dist nlme MASS survival]; };
+  gamlss_add = derive { name="gamlss.add"; version="4.3-0"; sha256="0kafvrh5b60pd7vs7swd6xq9c2py6ixjrdnhq2y4w112fp86jnbp"; depends=[gamlss mgcv nnet rpart]; };
   gamlss_cens = derive { name="gamlss.cens"; version="4.2.7"; sha256="1dy8myravipsa3cmkdwy3m46s419fhck0f0yz1kf6qlvxxr7a4m4"; depends=[gamlss gamlss_dist survival]; };
   gamlss_data = derive { name="gamlss.data"; version="4.2-7"; sha256="0g3fmqrwxmj14r0p0ai1adq6cs3bd3ys47gjcja035xjiajg6cs2"; depends=[]; };
   gamlss_demo = derive { name="gamlss.demo"; version="4.2-7"; sha256="1mlfkm290dk8fvfahmrr7adhw0bj4923zjs2xn0fvbj739rgv6b7"; depends=[rpanel gamlss gamlss_tr gamlss_util]; };
-  gamlss_dist = derive { name="gamlss.dist"; version="4.2-7"; sha256="0fbr2zcc4vf6hyi1b09n6j0jr578m9xjpiw4bv5gzk5xkx9w3sbr"; depends=[MASS]; };
+  gamlss_dist = derive { name="gamlss.dist"; version="4.3-0"; sha256="1cnv7f7qwaw4fhaciw3s7xgyqa9h6v12frix6arb9nkciknb8hv5"; depends=[MASS]; };
   gamlss_mx = derive { name="gamlss.mx"; version="4.2-7"; sha256="0k1isn2mavmwm15jk4gp9r3ks6z9pwd7k3xdsc29b9p8v8iapj4q"; depends=[gamlss nnet MASS]; };
   gamlss_nl = derive { name="gamlss.nl"; version="4.1-0"; sha256="083l5lsb0csxcp4vffvdv2nr7jk3s2gkcavx66m8inzw16j7xilz"; depends=[gamlss survival]; };
   gamlss_spatial = derive { name="gamlss.spatial"; version="0.1"; sha256="0lsq3lfv9gxjvnbnib551sfvcn6g9amwg51q5ipwwzh12hdl0m98"; depends=[gamlss spam mgcv]; };
   gamlss_tr = derive { name="gamlss.tr"; version="4.2-7"; sha256="0f0vmspknkg8039dnrxkjqwjqbl34vjb5sgkcdvy5g8x8dlb5h3w"; depends=[gamlss]; };
   gamlss_util = derive { name="gamlss.util"; version="4.2-7"; sha256="1c8xc0qf387cd9d6k9fzlwvj9735y7v6njsb5fls2fimpnd5vsik"; depends=[gamlss colorspace Matrix MASS rgenoud zoo gamlss_add spam]; };
-  gamm4 = derive { name="gamm4"; version="0.2-2"; sha256="0jx17gh0rk3a56dx7yhh9hlzj9pi04r9z28vcwqip43x5pxq8y86"; depends=[Matrix lme4 mgcv]; };
+  gamm4 = derive { name="gamm4"; version="0.2-3"; sha256="19vy5wik9nh77cm25gp3j3j8w8vinwzx5pv90nzdzvx84yvvf0y3"; depends=[Matrix lme4 mgcv]; };
   Gammareg = derive { name="Gammareg"; version="1.0"; sha256="1a5wibnbd8jg0v8577n1x9kc358qpd4jz7l8h7r541sdpprm6wb0"; depends=[]; };
   gammSlice = derive { name="gammSlice"; version="1.2-6"; sha256="19443rfpk9ivv42zy5vdfhs4pcrbcn4d984xnchfbznmddilavg8"; depends=[KernSmooth lattice mgcv]; };
   GANPA = derive { name="GANPA"; version="1.0"; sha256="0ia8djv46jm397nxjrm9yc5gacf1r4z0ckiliz57cbrqwh7z2wpa"; depends=[GANPAdata]; };
@@ -1736,11 +1840,13 @@ let self = _self // overrides; _self = with self; {
   gaussDiff = derive { name="gaussDiff"; version="1.1"; sha256="0fqjdxp2ibbami75ba16d02dz4rz5sk8mni45di9anydx44g9d45"; depends=[]; };
   gaussquad = derive { name="gaussquad"; version="1.0-2"; sha256="0bcvkssmwwngcd4cnv924n9h3c8z1w3x9c9bkwn5jbz9zyv1lfms"; depends=[polynom orthopolynom]; };
   gb = derive { name="gb"; version="1.1.8-8"; sha256="18n9wqz82mjxjgzk8vc68kyz3b6lk21d2f16551d6fikjla03adf"; depends=[boot]; };
+  GB2 = derive { name="GB2"; version="1.2"; sha256="1b5mkgn8c26bmi9ndzsqqp22vxqssy4nya1yysrl5wssjgicpdzs"; depends=[cubature hypergeo laeken numDeriv]; };
   gbm = derive { name="gbm"; version="2.1"; sha256="1a150ksvdbdv8b5f4j62q7v68sbgjvvq0izm4d877izp6d8qd99g"; depends=[survival lattice]; };
   gbRd = derive { name="gbRd"; version="0.4-11"; sha256="06x97rw5i6v6cgjxkfhxnw4dn7lghn5q6ra7ri5ag1x9dkfzcl82"; depends=[]; };
   gbs = derive { name="gbs"; version="1.0"; sha256="19zcsvd258ibrj356zlwgryjqylcs56agg3z6d44xbnf8prg05ig"; depends=[nlme]; };
+  GCAI_bias = derive { name="GCAI.bias"; version="1.0"; sha256="10092mwpmfbcga0n39a0i6g8xxch8xiwg15cckipw6yxjyx0sivc"; depends=[]; };
   gcbd = derive { name="gcbd"; version="0.2.5"; sha256="0fkg6vk0jkl6680n1hljyv783j4hd84mql0k4pfblvqafwv4nhm3"; depends=[RSQLite plyr reshape lattice]; };
-  GCD = derive { name="GCD"; version="3.0.3"; sha256="19y6xk6qzc8vc7q6svjqinlr97yb9mir0cd4ji9fgplrmgs7qdf7"; depends=[sp raster ggplot2]; };
+  GCD = derive { name="GCD"; version="3.0.4"; sha256="1mrgscbrljfyzxprclyw9rcwlkcnifm15kkkapkv56c5ms2ic2i5"; depends=[sp raster ggplot2]; };
   gcdnet = derive { name="gcdnet"; version="1.0.4"; sha256="0fmy0li06rahch4ir0xa81yilvrd0zqyhmpl4hfxjahhl3npw370"; depends=[Matrix]; };
   gcExplorer = derive { name="gcExplorer"; version="0.9-4"; sha256="1ig5m278n8mp93z1c8z39mf1zwwlkl38csn6d6ykpnrfpa3kk65a"; depends=[flexclust flexclust modeltools]; };
   gclus = derive { name="gclus"; version="1.3.1"; sha256="02ba6zj9bjwrzykamjp40ajynx9xjx9h2i85n0ym0r5lcki4x6fn"; depends=[cluster]; };
@@ -1752,34 +1858,35 @@ let self = _self // overrides; _self = with self; {
   g_data = derive { name="g.data"; version="2.4"; sha256="14a4m0v38p3j1k1kymkxwydlgm8b73hlx9m80sg1l4aj38fvflzl"; depends=[]; };
   GDAtools = derive { name="GDAtools"; version="1.1"; sha256="0r1d98wavzwg3icr3czfzmcf1d86nwzq2s6avqkh4h0sank220wn"; depends=[FactoMineR]; };
   GDELTtools = derive { name="GDELTtools"; version="1.2"; sha256="1rx6kjh7kmyycqapvbizcxkcfp09qvqv7k8f25v333sxkacpz6p5"; depends=[plyr TimeWarp]; };
-  gdimap = derive { name="gdimap"; version="0.1-3"; sha256="14cij862r2i1056hd67dy6yhx3xwhbypi8hy8fjpj8hnrv27ylmx"; depends=[rgl oro_nifti movMF gridExtra colorspace geometry gsl abind]; };
+  gdimap = derive { name="gdimap"; version="0.1-6"; sha256="0bz7h8wxkwp8yb2qzfj1932m4b28rxlhr8939cqbzfma0zb2ywzx"; depends=[rgl oro_nifti movMF gridExtra colorspace geometry gsl abind]; };
   gdistance = derive { name="gdistance"; version="1.1-5"; sha256="12877mg0ih346h62xa087xwbrqrjvdh0fs8avrvyy4qpqls2s7qn"; depends=[raster igraph Matrix sp]; };
-  gdsfmt = derive { name="gdsfmt"; version="1.0.4"; sha256="13iynlcvbgwlh34gn8h5x39lvm6hsf4314620079bzwdmrribqhy"; depends=[]; };
   gee = derive { name="gee"; version="4.13-18"; sha256="0zfxmjajbgr7999gbnqppq43zzk901kqra7b1d5fa2qn8js6h1ng"; depends=[]; };
   geeM = derive { name="geeM"; version="0.7.1"; sha256="0pzvy0ga17g5v5dd2q4q7fmcwj3nws0p1cg5s0dz3azmrj7n4s31"; depends=[Matrix]; };
   geepack = derive { name="geepack"; version="1.1-6"; sha256="0ixwrr2jjrqzh23zg9cibayinjxzgdpia9znsv7qwhc7hx23a2zm"; depends=[]; };
   geigen = derive { name="geigen"; version="1.3"; sha256="16zz3k4j75hn1dkzydsxnk0jblka22fbww7ak9lgg1znkfws6dhk"; depends=[]; };
-  geiger = derive { name="geiger"; version="2.0.1"; sha256="11rrdymwj9wl11sqi3rxfl7vr86w86m5460k04v35kn8sf0g3gw2"; depends=[ape MASS mvtnorm subplex deSolve digest Rcpp coda]; };
-  gems = derive { name="gems"; version="0.9.4"; sha256="1i0dygrdvqjmham5ay64if7lg9fji53p94acnayhn4893wmy98ma"; depends=[MASS msm mstate plyr data_table]; };
+  geiger = derive { name="geiger"; version="2.0.3"; sha256="1wqihvscmq44i34205fzv79wk7j2a72qd8y6ycgrv74plql0316c"; depends=[ape MASS mvtnorm subplex deSolve digest Rcpp coda]; };
+  gems = derive { name="gems"; version="0.9.5"; sha256="15n3xfhifcxmhsmc2p4ijgfd9l1pmzqj0zmh0xxi8y10ax68f524"; depends=[MASS msm mstate plyr data_table]; };
   gemtc = derive { name="gemtc"; version="0.6"; sha256="03aw5r62577fizvbl7wpl7k3m8bxji21h8a41gl8yr4fpj0353yj"; depends=[coda igraph meta XML]; };
   gemtc_jar = derive { name="gemtc.jar"; version="0.14.3"; sha256="18hbiygpsv67flc4v6z6mir0rfq41v1vsh11dg9phmdr8bx4kcl1"; depends=[rJava]; };
   GenABEL = derive { name="GenABEL"; version="1.8-0"; sha256="0sd497qvik70iwv7wc8r50rhc5wx153pm8vif738wwqqp43chks3"; depends=[MASS GenABEL_data]; };
   GenABEL_data = derive { name="GenABEL.data"; version="1.0.0"; sha256="0p66fb0gynjx3mnfvnlz45cbn6xf49gwx9mfyxf584xfcggxaa1c"; depends=[]; };
   genalg = derive { name="genalg"; version="0.1.1.1"; sha256="0f6j3zj9frnjhs4rrcn05z2bmp6c7d1blpwjqg7ckfwk46x61app"; depends=[]; };
-  GenBinomApps = derive { name="GenBinomApps"; version="1.0-1"; sha256="1iz66j8jv5rym5zzn200ybdcyxzb9nr8yj6qwsgy1syljw95adx2"; depends=[]; };
+  genasis = derive { name="genasis"; version="1.0"; sha256="1r0733cc2hss3f8dp19s1ji55yp72mds7p3x1zvvpiks2r7w712p"; depends=[Kendall fitdistrplus]; };
+  GenBinomApps = derive { name="GenBinomApps"; version="1.0-2"; sha256="1ps1rq8cjlwh658mysdh3xbn5fihanzcwxb38xvg4031vnwv80in"; depends=[]; };
+  gendata = derive { name="gendata"; version="1.0"; sha256="1hyyf9kpf8f0xxwwvirxlz6nw6wf2wqq5vvjnyikq5dwa7a3ngmw"; depends=[]; };
   GENEAread = derive { name="GENEAread"; version="1.1.1"; sha256="0c3d76yl8dqclk8zhhgrd6bv6b599vkpbyg3hjspb6npdw6zs6k8"; depends=[bitops]; };
   GeneCycle = derive { name="GeneCycle"; version="1.1.2"; sha256="1ghdzdddbv6cnxqd08amy4c4s5jsxa637r828ygffk6z76xjr6b6"; depends=[MASS longitudinal fdrtool]; };
   GeneF = derive { name="GeneF"; version="1.0"; sha256="0bizf47944b2zv9ayxb9rhrqx0ilz2xlvkw7x5vbg7l67y2g2l4d"; depends=[]; };
   GeneFeST = derive { name="GeneFeST"; version="1.0.1"; sha256="0qgzjzhwf3nigfi09maywg9zkjxiicwiwiyqfcdk9gsvmp6mr4qn"; depends=[BASIX]; };
   Geneland = derive { name="Geneland"; version="4.0.4"; sha256="14crcj71i4vc48a132k024jrkwlwbrqi6jd9w3d1qsy6dn7inc0k"; depends=[RandomFields fields]; };
   geneListPie = derive { name="geneListPie"; version="1.0"; sha256="0z2gawfzhm05dafj4zlj6ifmf0dy7p1hrpa59lzxrnrc0wr6laji"; depends=[]; };
-  GeneNet = derive { name="GeneNet"; version="1.2.9"; sha256="1hlifd4a3v4whb6cxdmf7vawbsjyrg2skz9hp6bb26cn2y0q45gr"; depends=[corpcor longitudinal fdrtool igraph]; };
+  GeneNet = derive { name="GeneNet"; version="1.2.10"; sha256="0gk1ndibnxyqdbd0zyrf88qd7b4wf9441d4bq2hf6fgg95sxmk5s"; depends=[corpcor longitudinal fdrtool igraph]; };
   genepi = derive { name="genepi"; version="1.0.1"; sha256="1whhdlq9p8gmygv7464hvfz6dhm65gqq1dqls6hgpmw822zxgbd5"; depends=[]; };
   GeneralizedHyperbolic = derive { name="GeneralizedHyperbolic"; version="0.8-1"; sha256="1q7bagq6c4an5jprypab5121ymich55xgyxfxnj5izihssmcwssp"; depends=[DistributionUtils RUnit]; };
   GeneReg = derive { name="GeneReg"; version="1.1.2"; sha256="081qc66mb17dwk886x9l2z4imklxnfs02yqql0ri9c47bpsga7wp"; depends=[igraph]; };
   geneSignatureFinder = derive { name="geneSignatureFinder"; version="2014.02.17"; sha256="1s9jj87wnzzgm9hnws09yhrxdlb6jw56i3ddwznvmh8vpzrspv4h"; depends=[survival cluster class]; };
   genetics = derive { name="genetics"; version="1.3.8.1"; sha256="0gfbrpz0zp5bgw3s21wrhjfy70laif47wcrjrm6mjgs6xapiw790"; depends=[combinat gdata gtools MASS mvtnorm]; };
-  GeneticTools = derive { name="GeneticTools"; version="0.2.1"; sha256="0iz4afkm9gp6sdriyv0b0dhwwjmjpw92i2x7dihra12bb3z1mqvp"; depends=[gMWT Rcpp RcppArmadillo plotrix]; };
+  GeneticTools = derive { name="GeneticTools"; version="0.3"; sha256="16jqi98nvdmfbmx6z10d2kxfc9mp4zhpg22rschiy6ysp4lczs3c"; depends=[gMWT Rcpp RcppArmadillo plotrix]; };
   GenKern = derive { name="GenKern"; version="1.2-60"; sha256="12qmd9ydizl7h178ndn25i4xscjnrssl5k7bifwv94m0wrgj4x6c"; depends=[KernSmooth]; };
   genlasso = derive { name="genlasso"; version="1.2"; sha256="0ahkml10nvx1sfikl0ai3yfs5gzps7ss9aymsg1wy494p95riwz5"; depends=[MASS Matrix igraph]; };
   genMOSS = derive { name="genMOSS"; version="1.1"; sha256="08d6j0iwfah1ianqdr884hh6bg04vfk4kml3clmf7vzx8wfmliy5"; depends=[]; };
@@ -1790,84 +1897,85 @@ let self = _self // overrides; _self = with self; {
   genridge = derive { name="genridge"; version="0.6-3"; sha256="01rjvfjmdn0hxgydvrinl4md74n0ndvqcib4m59q6f67m3qnylfr"; depends=[car]; };
   GenSA = derive { name="GenSA"; version="1.1.4"; sha256="0ph3n0hv7p8i03by42hl0f2b1kmhpvyvd7rfgay2wl9lknfsq0vv"; depends=[]; };
   gensemble = derive { name="gensemble"; version="1.0"; sha256="0yyi7djzqx4yhxp6yy1rjgvzidjlna79ds89bgj6m6zj3aav6yw2"; depends=[]; };
-  genSurv = derive { name="genSurv"; version="1.0.1"; sha256="17f9ccg9r0lpakhmk4wxqycb2qi13ql4l7bmf2sw27icv2zh9lhm"; depends=[]; };
-  geoChina = derive { name="geoChina"; version="1.0"; sha256="06sqzg4jn8nv2mg5qm3kps482jb5av9ag4b71lc2y66w4qsr2k5r"; depends=[RCurl RJSONIO plyr]; };
+  genSurv = derive { name="genSurv"; version="1.0.2"; sha256="0hvkrlcl8jrj0x0ixrl34484p9kxlwxfaa64ynz6jf3dcyghp9l0"; depends=[]; };
   geoCount = derive { name="geoCount"; version="1.131209"; sha256="0v9nsqhwf58czq4vh9f2yim2r7w9sfx9g9hp4jdbfy4q7jc5m02a"; depends=[Rcpp RcppArmadillo]; };
+  GeoDE = derive { name="GeoDE"; version="1.0"; sha256="0wawkzj0344pprm8g884d7by8v74iw96b109rgm7anal48fl30im"; depends=[Matrix MASS]; };
+  GeoGenetix = derive { name="GeoGenetix"; version="0.0.2"; sha256="0rrc8rdf6whpd830s2g9ybz82jcd0il9kkfrjh3xza3b86fasdvg"; depends=[RandomFields]; };
   GeoLight = derive { name="GeoLight"; version="1.03"; sha256="0l2p4rcmk33dj31xy06652mn05d2dhnny3xpzcf12kxyflpipdgr"; depends=[maps changepoint]; };
   GEOmap = derive { name="GEOmap"; version="2.2-2"; sha256="1kp9sdp51zcz98bk03pknya9g5fhz2i677wgacabq402yjhfgn80"; depends=[RPMG splancs MBA]; };
   geomapdata = derive { name="geomapdata"; version="1.0-4"; sha256="1g89msnav87kim32xxbayqcx1v4439x4fsmc8xhlvq4jwlhd5xxw"; depends=[]; };
   geometry = derive { name="geometry"; version="0.3-4"; sha256="1rplvy7528v270c4pdxxb34h7mfdd6141dnb9aw59xc0sd9cx0lv"; depends=[magic]; };
-  geomorph = derive { name="geomorph"; version="2.0.1"; sha256="12alj8lkajqxjlkp9apay6lvvh526qr5jxqn70ld6ppxmsl120zy"; depends=[rgl jpeg calibrate vegan ape geiger]; };
-  geonames = derive { name="geonames"; version="0.8"; sha256="0k8jx3jf0aa51vp3mm21skr4cf9hhpyjx3nprbaclpylvwlzjbhf"; depends=[rjson]; };
+  geomorph = derive { name="geomorph"; version="2.1.1"; sha256="12w5d7m6kg1pl42g21zfgk9by77wak82z8k0xh4zlbwiy8zv30z6"; depends=[rgl jpeg vegan ape geiger phytools]; };
+  geonames = derive { name="geonames"; version="0.996"; sha256="14fgwhg8c7aagrp1c1yc80hjr06z8ldr85v27gn1nnikvz71idgy"; depends=[rjson]; };
   geophys = derive { name="geophys"; version="1.3-6"; sha256="1yfhilgc2nv5jfp0n7iah0wl041an2850c2qnzrvx0vv9fywgw9g"; depends=[RPMG RSEIS RFOC GEOmap cluster]; };
   geoR = derive { name="geoR"; version="1.7-4"; sha256="00868h4rvw923n2b7v191rcr10vyyljxzg3dl7hgc7al1c98gjwq"; depends=[sp MASS splancs RandomFields]; };
   geoRglm = derive { name="geoRglm"; version="0.9-4"; sha256="1wzq8p4xi40j4cagg7ji8qz9kynrwlyrlcvv0358pbl19nvg7hxb"; depends=[geoR]; };
-  georob = derive { name="georob"; version="0.1-2"; sha256="1j4l3hri7k1fy8q5g48xc5fnvcw7y1wvhzxvizjqrf06rrh00hn6"; depends=[sp constrainedKriging lmtest nlme nleqslv quantreg RandomFields robustbase]; };
+  georob = derive { name="georob"; version="0.1-4"; sha256="0a68r63adya3syf8fc1ha90x8587r2hp5w44na4gvnr9rs883f1i"; depends=[sp constrainedKriging lmtest nlme nleqslv quantreg RandomFields robustbase]; };
   geoscale = derive { name="geoscale"; version="1.1"; sha256="1xmn8y33jz1f16sjbzrld20gy7w54awrr79lhs9s4r8k1gmn0zqg"; depends=[]; };
   geospacom = derive { name="geospacom"; version="0.5-7"; sha256="00yi2wwnjh2z8xhzfbp1jhh5fhq2z885s0gv937xsin4a63m76fd"; depends=[rgeos classInt sp maptools geosphere]; };
   geosphere = derive { name="geosphere"; version="1.3-8"; sha256="1ldg3lrz9plhr5b1dgnc2nj5srpv23xxma83kcd7aicll4x1jmbw"; depends=[sp]; };
   geospt = derive { name="geospt"; version="0.5-0"; sha256="0bpflmj1kx2fph5b9dfy57bxdqjhpwnn8050k8afky5fmiwzm708"; depends=[geoR gstat genalg limSolve MASS plyr TeachingDemos gsl]; };
-  geostatsp = derive { name="geostatsp"; version="0.9.7"; sha256="1i8ri78zq0w4n0aw9z4ws15nrv488421p1937cvbmxfzvf3gr4gr"; depends=[Matrix raster sp]; };
+  geostatsp = derive { name="geostatsp"; version="0.9.999"; sha256="0qrcfgyv4g6vmz3623mlh2ad31hw6k82xjlsmcgab3d4mzk0q7qx"; depends=[Matrix raster sp]; };
   geotools = derive { name="geotools"; version="0.1"; sha256="0d0vf9dvrrv68ivssp58qzaj8vra26ms33my097jmzmgagwy1spd"; depends=[]; };
-  geotopbricks = derive { name="geotopbricks"; version="1.3.5"; sha256="0036lb60wfwy602c85ngmgnnjk4cw8wqscqq2l64gbzxh6ax6qcd"; depends=[raster stringr zoo]; };
+  geotopbricks = derive { name="geotopbricks"; version="1.3.5.4"; sha256="065h5dd7qxjydblgkgj2amz8krscgf7ds61b923w3b4biin4s4q4"; depends=[raster stringr zoo]; };
   GeoXp = derive { name="GeoXp"; version="1.6.2"; sha256="18wdmdwb79ipdjdii068dz9f55b5ldxn95g5q6jcxsqwp0wldvw8"; depends=[quantreg rgl spdep KernSmooth rgeos robustbase splancs]; };
   geozoo = derive { name="geozoo"; version="0.4.3"; sha256="0nmmmyk0ih5aqpsn7ip4dhgfm7jhcnca8pigyr9794b110icq1rv"; depends=[bitops]; };
   GESTr = derive { name="GESTr"; version="0.1"; sha256="1q12l2vcq6bcyybnknrmfbm6rpzcmxgq2vyj33xwhkmm9g2ii9k6"; depends=[mclust gtools]; };
-  GetNenshuJP = derive { name="GetNenshuJP"; version="0.1"; sha256="0s1j58i688zj64xmjyswk03vxz2ndvj204rncy3wc3fjfrpr2asv"; depends=[XML]; };
   getopt = derive { name="getopt"; version="1.20.0"; sha256="00f57vgnzmg7cz80rjmjz1556xqcmx8nhrlbbhaq4w7gl2ibl87r"; depends=[]; };
-  GetoptLong = derive { name="GetoptLong"; version="0.0.3"; sha256="132zhvd4qng5q1bwfn2nbvm3628nkbw7c6mdc0wk41a73c2wj37l"; depends=[rjson]; };
+  GetoptLong = derive { name="GetoptLong"; version="0.0.5"; sha256="1aygm6h4mqac6h4scss3c2p3snyl2lmd8lnw034rakz2azj8j0by"; depends=[rjson]; };
   GetR = derive { name="GetR"; version="0.1"; sha256="1b2wirhz4nhvmf863czwb8z8b42ilsyjjrg9rc4nd9b7nz50bmjg"; depends=[party]; };
-  gettingtothebottom = derive { name="gettingtothebottom"; version="2.0"; sha256="1icl2s0qbczvdrn39j5bmaf55ckc9y8qfn6rah8lpy47zkcc6rfs"; depends=[ggplot2 Matrix]; };
+  gettingtothebottom = derive { name="gettingtothebottom"; version="3.0"; sha256="0n3d8xx4pwh4bps6jkfj4g8mpknj0lsfk03bayhvil744r5jnrn7"; depends=[ggplot2 Matrix lpSolve reshape2]; };
   GEVcdn = derive { name="GEVcdn"; version="1.1.3"; sha256="13p6hkdybs8s2i363z2a65yijqarwj9swvy22ljk61shf2nzbk80"; depends=[VGAM]; };
   GEVStableGarch = derive { name="GEVStableGarch"; version="1.0"; sha256="007s7lbfpp1bqnyg08rwarsmkxlx16p4is1k3736fmnri9sfp7z6"; depends=[fGarch fExtremes stabledist skewt Rsolnp]; };
   GExMap = derive { name="GExMap"; version="1.1.3"; sha256="1a6i2z9ndgia4v96nkr77cjqnbgxigqbqlibg82gwa0a6pl7r7nz"; depends=[]; };
   gfcanalysis = derive { name="gfcanalysis"; version="1.1"; sha256="1z29y6gx0b9b9h6939vb9pqplcjhi0xb5l3bgjybjad01p2dnqas"; depends=[raster rgdal geosphere RCurl rgeos plyr ggplot2 sp stringr animation rasterVis]; };
-  GGally = derive { name="GGally"; version="0.4.5"; sha256="0mfk3g469xk2hdlrhcmgid2qyqwywiihbhgycbaix8z15vc7qrra"; depends=[ggplot2 reshape gtable plyr stringr]; };
+  GGally = derive { name="GGally"; version="0.4.7"; sha256="1wbpl47ha6q6si4xyfx0i019wagn2ka1zyfhblvjcj9hhcvzz6m9"; depends=[ggplot2 gtable plyr reshape stringr]; };
   ggdendro = derive { name="ggdendro"; version="0.1-14"; sha256="0x6bl0v2lkiybc5pdrcak5cslhaw7cxhh6imsrvdhcrzdr4cc45s"; depends=[MASS ggplot2]; };
   GGEBiplotGUI = derive { name="GGEBiplotGUI"; version="1.0-8"; sha256="0bkagsm9mkcghc2q46cc86kjajzgjbq9588v0v2bp71qw8m97mbh"; depends=[rgl tkrplot]; };
   ggHorizon = derive { name="ggHorizon"; version="0.1"; sha256="0k617qnfqdl9w2hdwppkrgl51krnwpdf0gahzvivcwzynbmywc37"; depends=[ggplot2 plyr RColorBrewer proto]; };
   GGIR = derive { name="GGIR"; version="1.0-4"; sha256="09fqw4al4bn87h9543ais634crk9mzvfzdgp25gwy7lhpwzdl2y0"; depends=[GENEAread matlab]; };
-  gglasso = derive { name="gglasso"; version="1.1"; sha256="1zq1xckb4nlc2acg8p16lx610c87j8ac6v34b8m49d6gjl7r39wp"; depends=[]; };
-  ggm = derive { name="ggm"; version="2.0"; sha256="05980y142qzihawj9s20swqa10lslarrdxn496gacc18dvbnv2cg"; depends=[igraph]; };
+  gglasso = derive { name="gglasso"; version="1.2"; sha256="0bn56axyr741qdj5pxzbwaqjb7mp727ph67ng5d6ibsz1z2bh7pk"; depends=[]; };
+  ggm = derive { name="ggm"; version="2.1"; sha256="1m2p5cn7lfy4757rspp3d3jnphjp5vh3lvrim1lxlda577kpdmnf"; depends=[igraph]; };
   ggmap = derive { name="ggmap"; version="2.3"; sha256="0sl3jkifba3q0khl5sg2nf08kgn1pirw5a1xag07za51sqda5b5q"; depends=[ggplot2 proto scales RgoogleMaps png plyr reshape2 rjson mapproj]; };
   ggmcmc = derive { name="ggmcmc"; version="0.5.1"; sha256="17pmb2kfrjc2s538my8finr029vy1npzk44626xvznf6bf6bv895"; depends=[plyr reshape2 ggplot2]; };
   GGMselect = derive { name="GGMselect"; version="0.1-8"; sha256="1chmyzbn85c5z5b8lvgqpr7knwg25dm7qbb4nhivcdr6ipd1dqr0"; depends=[mvtnorm lars gtools]; };
   ggparallel = derive { name="ggparallel"; version="0.1.1"; sha256="1z8w4bm4ahmmwbr87qlqhm8jlrqf7dhdvm1cf0xrwjlkmy6dqjvg"; depends=[ggplot2 reshape2 plyr]; };
-  ggplot2 = derive { name="ggplot2"; version="0.9.3.1"; sha256="00b67911g6msz5yxjfg6sjsh9llyjiizjakih2ciyms4zl279jdl"; depends=[plyr digest gtable reshape2 scales proto MASS]; };
+  ggplot2 = derive { name="ggplot2"; version="1.0.0"; sha256="138rxp8zr0x945ajmhg35x35xs0ci743iqhffqy90c7hcn0gpvz6"; depends=[plyr digest gtable reshape2 scales proto MASS]; };
   ggROC = derive { name="ggROC"; version="1.0"; sha256="0p9gdy7ia59d5m84z9flz5b03ri7nbigb3fav2v2wrml300d24vn"; depends=[ggplot2]; };
   ggsubplot = derive { name="ggsubplot"; version="0.3.2"; sha256="1rrq47rf95hnwz8c33sbnpvc37sb6v2w37863hyjl6gc0bhyrvzb"; depends=[ggplot2 plyr proto scales stringr]; };
-  ggtern = derive { name="ggtern"; version="1.0.3.1"; sha256="0w42w0rr0s48s9ax5ccih0l6cp0s097x32zm7mc8yf0zw0gbxcar"; depends=[ggplot2 plyr gtable scales reshape2 proto MASS sp]; };
+  ggtern = derive { name="ggtern"; version="1.0.3.2"; sha256="05nh8610l5lw41wkidl2m78nqyfbc7faiawpc442lin3qxrj64bq"; depends=[ggplot2 plyr gtable scales reshape2 proto MASS sp]; };
   ggthemes = derive { name="ggthemes"; version="1.7.0"; sha256="1wfqh3mq4hyyfgvw99bq1s8qxvl3qasa8qcikfhbp2ky898w5npb"; depends=[ggplot2 colorspace proto scales]; };
+  ggvis = derive { name="ggvis"; version="0.3.0.1"; sha256="0fx39j7vg9r4a7ni9nnq7x7s93lfzbbsg4zsbb6x429hyawvcj8x"; depends=[assertthat RJSONIO shiny magrittr dplyr htmltools]; };
   GhcnDaily = derive { name="GhcnDaily"; version="1.5"; sha256="1gln1giid5n5b9mxidh90l8ahvcgx968zak2lxr2f9c32pnrpmnp"; depends=[R_utils R_oo R_methodsS3 abind ncdf]; };
   GHQp = derive { name="GHQp"; version="1.0"; sha256="0qpcpwv7rz67qhz1p5k2im02jvs7l8z9sa6ypz13hig5fzm8j9bp"; depends=[statmod]; };
   ghyp = derive { name="ghyp"; version="1.5.6"; sha256="0y3915jxb2rf01f7r6111p88ijhmzyz4qsmy7vfijlilkz0ynn20"; depends=[numDeriv gplots]; };
   GibbsACOV = derive { name="GibbsACOV"; version="1.1"; sha256="1ikcdsf72sn1zgk527zmxw3zjhx0yvkal6dv001cgkv202842kll"; depends=[MASS]; };
   gibbs_met = derive { name="gibbs.met"; version="1.1-3"; sha256="1yb5n8rkphsnxqn8rv8i54pgycv9p7x1xhinx4l5wzrds3xhf2dc"; depends=[]; };
-  GIGrvg = derive { name="GIGrvg"; version="0.2"; sha256="15m540xsnw0n7fl03yh2yxj3yfyw76mpra70pr5088258rg7dxkn"; depends=[]; };
+  GIGrvg = derive { name="GIGrvg"; version="0.3"; sha256="014srgh79g8y9fcj979v3md9qqx9i6b6fx6lw0r0qdrg4v6bvr76"; depends=[]; };
   GillespieSSA = derive { name="GillespieSSA"; version="0.5-4"; sha256="0bs16g8vm9yrv74g94lj8fdfmf1rjj0f04lcnaya7gyak3jhk36q"; depends=[]; };
   gIPFrm = derive { name="gIPFrm"; version="2.0"; sha256="1syjsnna7b7y27yf7zsxjwq8z5f4wxf2hfadhgjaw898gvfcnrbc"; depends=[]; };
   giRaph = derive { name="giRaph"; version="0.1.2"; sha256="137c39fz4vz37lpws3nqhrsf4qsyf2l0mr1ml3rq49zz4146i0rz"; depends=[]; };
   GISTools = derive { name="GISTools"; version="0.7-2"; sha256="1n1zzi25xx320gwmsn5rj8c3m1wqwmjbzf32krdzmaqiwvhf7c1b"; depends=[maptools RColorBrewer MASS rgeos]; };
   gitter = derive { name="gitter"; version="1.0.4"; sha256="1pvl8k8mb15mcfz1074y246s9basmi5vbpw2n1ca0d8wm5wdidap"; depends=[jpeg tiff logging PET ggplot2]; };
   Giza = derive { name="Giza"; version="1.0"; sha256="13nkm8mk1v7s85kmp6psvnr1v97vi0gid8rsqyq3x6046pyl5z6v"; depends=[reshape lattice lattice]; };
-  glarma = derive { name="glarma"; version="1.1-0"; sha256="06sm8kv43ngy495mv020wh350nfmk4djiwh1267xvp97f5sbgmxr"; depends=[MASS]; };
-  glasso = derive { name="glasso"; version="1.7"; sha256="1rl3rnc7c5gd99ffryyi30xgy9zdbwvvnl6bkwgfkfcz6bm0cwlk"; depends=[]; };
+  glarma = derive { name="glarma"; version="1.2-0"; sha256="1zci132hz11y8j2jvakzqsxddihqr88y09bd7fx5xzipm7iaa7yq"; depends=[MASS]; };
+  glasso = derive { name="glasso"; version="1.8"; sha256="0gcapw7kyxb19wvdyxq1vsmc5j7yyd0rvqxs2i71k31q352sg6zw"; depends=[]; };
   glassomix = derive { name="glassomix"; version="1.2"; sha256="13a2ly0by58z8djq8nbakpyacgb6nkdsqxjq44yw4v2fy3s22z3n"; depends=[mvtnorm glasso huge]; };
-  glcm = derive { name="glcm"; version="0.3.1"; sha256="0bsvih2fk5liqrhnhs3hlb7p3kcgmyymwhpq0gial0g1dh324p2w"; depends=[Rcpp]; };
+  glcm = derive { name="glcm"; version="0.3.2"; sha256="1kipm2z1q47ban6yah6hxkaa9fvkw990hn9c02bywf80wg16770n"; depends=[Rcpp]; };
   gld = derive { name="gld"; version="2.2.1"; sha256="1x9xlqj87xmk90hn20k1yvnvyndxdbi67yrxrfdhr3lhxabq5msw"; depends=[]; };
   GLDEX = derive { name="GLDEX"; version="2.0.0.0"; sha256="0pskh9wa32im6wrjkqkxczfsds71mx2435yhn7vrna4vzyc2xdvb"; depends=[cluster]; };
   gldist = derive { name="gldist"; version="2160.2"; sha256="1dcf3pb4xqvhqj4m3xc3ihzjbzxjspjrnc8819hmlnmdd0csghmx"; depends=[]; };
   glinternet = derive { name="glinternet"; version="0.9.0"; sha256="0qihlzdb9ifqlyx5l34vkwi6z59xd7wbl72a3pj725n9kkk7bmig"; depends=[]; };
   gllm = derive { name="gllm"; version="0.35"; sha256="1m9asamh2yha9q8mrllvvc9qj2im6cspvfpafzc8krmh17zq4ins"; depends=[]; };
-  glm2 = derive { name="glm2"; version="1.1.1"; sha256="181s0h4npd759b7m58gnab50hk0xmw884iwmn7xxjvnyi16ll179"; depends=[]; };
+  glm2 = derive { name="glm2"; version="1.1.2"; sha256="1x9pq2ddsz9al8w044qch34s3fahca63dz85lvm5qn16945ccw1s"; depends=[]; };
   glmc = derive { name="glmc"; version="0.2-4"; sha256="03m1ym9w0b0gqib13pnh1yrjijlcwsn5lijg0nsr4hd6gxw29cla"; depends=[emplik]; };
   glmdm = derive { name="glmdm"; version="2.60"; sha256="09vljki24fccqkvxkmg2i6a8pxqhfwm155b41m2q51lqaq29bfw7"; depends=[]; };
   glmlep = derive { name="glmlep"; version="0.1"; sha256="0jnm3cf2r9fyncxzpk87g4pnxbryqcxxrc5y2a80pv48al3sxlzk"; depends=[]; };
   glmmBUGS = derive { name="glmmBUGS"; version="2.3"; sha256="1j96c1c2lqplhjvyigpj494yxj85bpmc7cnd1hl1rc8b552jr192"; depends=[MASS abind]; };
   glmmGS = derive { name="glmmGS"; version="0.5-1"; sha256="1aqyxw3nrjri8k8wlwvddy25dj7mjqndssd5p5arax8vaqgrdnjz"; depends=[]; };
-  glmmLasso = derive { name="glmmLasso"; version="1.2.2"; sha256="1av14z8anhnq265kqhqyi1js0p5a38h2l0kn88b08m8rxxzpwx55"; depends=[minqa]; };
+  glmmLasso = derive { name="glmmLasso"; version="1.3.1"; sha256="07i5bnaj3is8ag8gqzpma4kzfk33f11k9r30cdwzx8sp2xfh16gr"; depends=[minqa]; };
   glmmML = derive { name="glmmML"; version="1.0"; sha256="0b1q5mj325xga3lfks28r03363bjfa31rlgjzwk4s0a6g21bdl4a"; depends=[]; };
-  glmnet = derive { name="glmnet"; version="1.9-5"; sha256="1pilqd4cqdhydxzbwqkw2y5zw4g92ihm4zgplpxiig94jwlr7gfp"; depends=[Matrix]; };
+  glmnet = derive { name="glmnet"; version="1.9-8"; sha256="1ndaq6qbn8vxs7ha4x9k0qcblr1byixvrhh572794xzgdn548prm"; depends=[Matrix]; };
   glmnetcr = derive { name="glmnetcr"; version="1.0.2"; sha256="1pyg23hdqksiaqdcrsaqz9vb7mgclm41hh0vb7ndkdv284bzzlbz"; depends=[glmnet]; };
   glmpath = derive { name="glmpath"; version="0.97"; sha256="054v188ffjl6x11cld5s9py22kxcs0iq58x4yhxb0ny7mbma5hkn"; depends=[survival]; };
   glmpathcr = derive { name="glmpathcr"; version="1.0.3"; sha256="0qa63c7kwpxf6smczgzf4fmvczw1ynqq5vgcw3bxdbs37q4ypj8n"; depends=[glmpath mvtnorm]; };
@@ -1880,28 +1988,32 @@ let self = _self // overrides; _self = with self; {
   globalOptTests = derive { name="globalOptTests"; version="1.0"; sha256="0vmly1mh8k5aihlwxfp30gj0qdrwfx2b9bcbs8ccrpfhgcvacnr9"; depends=[]; };
   glogis = derive { name="glogis"; version="0.1-1"; sha256="02wdncycmnsvj09d1032cns3xbrh92ki5zn9sa3gscw1xzz0yzh6"; depends=[zoo sandwich]; };
   glpkAPI = derive { name="glpkAPI"; version="1.2.10"; sha256="0xlgccb77xgscfg46pxxcz5k9gm8a913xgp48dfmxw31n7ynckml"; depends=[]; };
+  GLSME = derive { name="GLSME"; version="1.0.1"; sha256="0v1d8jpjg0gpsvscx6gna4hi9pxr762bjf77hnla30hwfc0a95a2"; depends=[mvtnorm corpcor]; };
+  gmailr = derive { name="gmailr"; version="0.0.1"; sha256="0i87bgjzfd69s2cihvpilvl8nvw993cfsya3bz14fyvplvzf41lx"; depends=[httr base64enc jsonlite]; };
   gmatrix = derive { name="gmatrix"; version="0.1"; sha256="06fbqixjbpxm4k6l132krbmk2jvh4r2s64nlbi9gb3whq55pf4ih"; depends=[]; };
-  GMCM = derive { name="GMCM"; version="1.0"; sha256="1nj16kz7382aif7vgmwwnl998v7c4l63da3cwy3a3vsaxv45v8r9"; depends=[Rcpp RcppArmadillo mvtnorm]; };
+  GMCM = derive { name="GMCM"; version="1.0.1"; sha256="0vy4givxvppjc2r6s4q8yz86xzaw059fl1vjv0ni0hlbxz4dbb96"; depends=[mvtnorm Rcpp]; };
   gMCP = derive { name="gMCP"; version="0.8-6"; sha256="1pr40k4qj4yy9hcp2zx8x4dys9vav7gk4164999wg4psp7f06va0"; depends=[rJava JavaGD MASS PolynomF multcomp mvtnorm Matrix CommonJavaJars]; };
   GMD = derive { name="GMD"; version="0.3.1.1"; sha256="1vpapfnkn5gfqy033qirblx7xkbh52nw95sxw10v4aajddy0dyx9"; depends=[gplots]; };
-  Gmisc = derive { name="Gmisc"; version="0.6.2.0"; sha256="1q9pswywil1hbvm1g23p4vh29l32rba1lzd6f233hk64plnizl6d"; depends=[Hmisc stringr lattice sp]; };
+  Gmisc = derive { name="Gmisc"; version="0.6.7"; sha256="15bgkgxqmgg81ry3ssx1darspmyhpzfcnkhkprqf495c07sh94jb"; depends=[Hmisc stringr lattice sp]; };
   gmm = derive { name="gmm"; version="1.5-0"; sha256="071i2bk73z606yb6a3vrv4cfyvgfwkrirm09i7bg2l3y2is1dfgj"; depends=[sandwich]; };
   GMMBoost = derive { name="GMMBoost"; version="1.1.2"; sha256="01q165vkdiv4qh96lha0g2g94jpnzdclbby6q43ghh9j1yrd4qzj"; depends=[minqa magic]; };
   gmodels = derive { name="gmodels"; version="2.15.4.1"; sha256="1yizjw181bg0ml6j96calflz3k3wpvpxh61hfd3pdba013ixjib5"; depends=[MASS gdata]; };
-  gmp = derive { name="gmp"; version="0.5-11"; sha256="1zlsgmfdnc8p1k6y07bzhgjpxpaj8hicx49xia09acs0n0hpxmdh"; depends=[]; };
+  gmp = derive { name="gmp"; version="0.5-12"; sha256="10fpvcli526a8j6jaryn0mwk78c24xy7whdpcvqzzvb41l6nnkma"; depends=[]; };
   gmt = derive { name="gmt"; version="1.2-0"; sha256="09az2iwwhyrls4mr619vwzhzmaks6klm67lnir48bh40hynsvibp"; depends=[]; };
-  gMWT = derive { name="gMWT"; version="0.3"; sha256="15d681j913zmw6yknj7n6bmij127vcx0i41ag3rgr7mq2pn4nv24"; depends=[clinfun Rcpp RcppArmadillo]; };
+  gMWT = derive { name="gMWT"; version="0.9"; sha256="0c91bwwfm0qyqrrd3n9g6l8kackqm58hmamypn1awzpz1p13axyv"; depends=[clinfun Rcpp RcppArmadillo]; };
+  GNE = derive { name="GNE"; version="0.99-0"; sha256="1iwlh1mx8z24hgry78i5sqfrbqqp4946x1jxh6h7z1vxs7qfpq0v"; depends=[alabama nleqslv BB SQUAREM]; };
   gnm = derive { name="gnm"; version="1.0-7"; sha256="1jnh39i4462ky9vwnrlwq30d8qbp0jg73p8mwm6hnl8sdh53nkr1"; depends=[MASS Matrix nnet qvcalc relimp]; };
   gnmf = derive { name="gnmf"; version="0.7"; sha256="00y1dx1c66gv769yiwnb91xbr77wpidf36x0n0dzaqfn7s9yh6xq"; depends=[]; };
   gnumeric = derive { name="gnumeric"; version="0.7-2"; sha256="14c7a8aiqvqfbrjb1akpfjwidrzdhrw8a07ask083krki6vbi7hh"; depends=[XML]; };
   goalprog = derive { name="goalprog"; version="1.0-2"; sha256="1h3nd3d53hbz5hl3494lpfjnp1ddklc17nhgw18362jd1nk14awy"; depends=[lpSolve]; };
   gof = derive { name="gof"; version="0.9.1"; sha256="1s12gga9d6yizn2y7lzql4jd80lp5jpyml8ybn7xqswp8am82vpg"; depends=[]; };
-  GoFKernel = derive { name="GoFKernel"; version="1.0"; sha256="0x3g7m1vi5xrsda4lvmzr4ggicyiiwc00w3rg4v036hdbp8yjv6h"; depends=[KernSmooth]; };
+  GoFKernel = derive { name="GoFKernel"; version="2.0-3"; sha256="1ddnm7r48ya9rgna9jvf9mpk3bkn6954rr4rwsimybcp758b4ilv"; depends=[KernSmooth]; };
   goft = derive { name="goft"; version="1.0"; sha256="061x6mnzidmnza9q7z2ikik9zrn434yjx1690bxbh41ckvb92hnx"; depends=[gPdtest mvShapiroTest]; };
+  goftest = derive { name="goftest"; version="1.0-2"; sha256="11xw0cfj71z5smywsds9ijbhf3glxkqnhxmwwdqkv4gjrrr2y1bv"; depends=[]; };
   GOGANPA = derive { name="GOGANPA"; version="1.0"; sha256="1xbir21zvr5hv2y6nndzpsrpmnr7glrc7y6xgcyb856wx46ajan9"; depends=[GANPA WGCNA]; };
   gogarch = derive { name="gogarch"; version="0.7-2"; sha256="03gpl73zc6kx4gni59xbg7b38dkpd7p4c7kvlqm46f58j257viik"; depends=[fGarch fastICA]; };
   googlePublicData = derive { name="googlePublicData"; version="0.12.05"; sha256="01wilag2h55zdxxim2h06k0l93csi2nl7iqjnmk4yf9ayz226bc8"; depends=[XML XLConnect]; };
-  googleVis = derive { name="googleVis"; version="0.5.1"; sha256="0sf2yhxj65gg4c3rrhndq6jmvz34h6dw4zipcw7vd7dyyp1fi3wb"; depends=[RJSONIO]; };
+  googleVis = derive { name="googleVis"; version="0.5.4"; sha256="0182bspqyg91ckczlq3p48basak12vcsj6nzgv7yljzzan0yx2sr"; depends=[RJSONIO]; };
   gooJSON = derive { name="gooJSON"; version="1.0.01"; sha256="02sldh5lsrjprc9mbf99jyid7ij62db5f1h60z719gxl4pk6fjms"; depends=[rjson]; };
   goric = derive { name="goric"; version="0.0-7"; sha256="199scq0ii2l2jgxm634n9vs4w4zxq5scyc4ssab8m6yg4z8v45xp"; depends=[mvtnorm quadprog Matrix nlme MASS]; };
   GOsummaries = derive { name="GOsummaries"; version="1.1"; sha256="1lkaid88lrm2xyz62xx32xnpch9qlhb3lif9jmk2zaym1d53558a"; depends=[ggplot2 Rcpp plyr gProfileR reshape2 gtable]; };
@@ -1912,33 +2024,34 @@ let self = _self // overrides; _self = with self; {
   gpclib = derive { name="gpclib"; version="1.5-5"; sha256="08j81b8wymsgin20n54gvm6m54rmdic51p6qzs9cz4pmgl7dkkjv"; depends=[]; };
   GPCSIV = derive { name="GPCSIV"; version="0.1.0"; sha256="118l792mwd54xsi3g8afg3vc6wds8j6fyaz3mwmq04mlcyblym4l"; depends=[scatterplot3d sqldf]; };
   gPdtest = derive { name="gPdtest"; version="0.4"; sha256="00dlhnklfg2yp4hp7yjgr2nfswv22c007xq1mxdbkll62zgd94mq"; depends=[]; };
-  GPFDA = derive { name="GPFDA"; version="2.0"; sha256="0acwp9jxbp2bdkvbb1q0azds5sqrkada8j45r83l1dhxad8f0l1d"; depends=[fda_usc spam MASS]; };
-  GPfit = derive { name="GPfit"; version="0.1-0"; sha256="1gk14qm94088prwaiilklqb2xrb81qr25psmg31585dv93yawgqr"; depends=[lhs lattice]; };
+  GPFDA = derive { name="GPFDA"; version="2.1"; sha256="05al7s49zcxhww8zirh2p2bk7yl262sl3sb2zzyisn8fnwn46iyk"; depends=[fda_usc spam MASS]; };
+  GPfit = derive { name="GPfit"; version="0.2-0"; sha256="16r3lqgkqb90w2hcf4ha3jczmrycagw3vmqknq32ly2a025n9gv9"; depends=[lhs lattice]; };
   gpk = derive { name="gpk"; version="1.0"; sha256="1zfhkqyypb24mhbj2zi9qy3gw0kqxvlp8j5ni3zm7k5rz1bnrygg"; depends=[]; };
-  gplm = derive { name="gplm"; version="0.7-1"; sha256="0pyl4hjvbhxvnssxsr8mdgs8phvkwimfcgfp34vr2mbyiycy2dl1"; depends=[]; };
-  gplots = derive { name="gplots"; version="2.13.0"; sha256="1qxm6878lzcca9q0sbc4p3g3xh32169hkaidbk3m14ph0vwl45b2"; depends=[gtools gdata caTools KernSmooth]; };
-  GPLTR = derive { name="GPLTR"; version="0.85"; sha256="1njlq8s56m42n8yg93xgjk91dcaprf3n05rkqfiq8sbpfvva8v3j"; depends=[rpart]; };
+  gplm = derive { name="gplm"; version="0.7-2"; sha256="0pr39fbkv61iwd110lq76p2fi4dvx9qz6mjsvg6bpja9pfbb6wc0"; depends=[AER]; };
+  gplots = derive { name="gplots"; version="2.14.1"; sha256="1xmn29jsmkzbz5lazaxqq79kb58n2rlicns4ifsg45x8ypj1mqjn"; depends=[gtools gdata caTools KernSmooth]; };
+  GPLTR = derive { name="GPLTR"; version="0.95"; sha256="0fm260pwg66j91hddyql95lvvcpzvvbi3hddwzrk1bhyrgd8kj55"; depends=[rpart]; };
   gpmap = derive { name="gpmap"; version="0.1.1"; sha256="00jhslbxbp6dgq7bw346hfpw0gans048vsn7chyzjhyr7ah5xrfg"; depends=[isotone plyr ggplot2 foreach]; };
   gpr = derive { name="gpr"; version="1.1"; sha256="03ywik11kc6cnaqrzzzi94jkrdbd378m3sf26f2vpb7d834nl728"; depends=[]; };
   gProfileR = derive { name="gProfileR"; version="0.5"; sha256="0jadfj2hcn3zx4ph61685p5iz16330jccp5ipi8183dkcybvimw4"; depends=[RCurl plyr]; };
   GPseq = derive { name="GPseq"; version="0.5"; sha256="0k5xif44qk2ppvcyja16xshmfciq1h84l1w6d8dfkyryfajbc8ai"; depends=[]; };
   gptk = derive { name="gptk"; version="1.08"; sha256="0fk6c8f8fni4y2n2cbfwywlfyz74xlb8lx25wajsxr2v4x74pa7l"; depends=[Matrix fields]; };
   gputools = derive { name="gputools"; version="0.28"; sha256="0ria03ggcfqgn93gjv2anhvkd3k73c6vfwgka16kf66g1nfzxs4l"; depends=[]; };
-  GPvam = derive { name="GPvam"; version="3.0-1"; sha256="1ig079m9rwhsbv0pwxp2swvrxajaxsfq3hic4cq56sxpq1wr9vja"; depends=[Rcpp RcppArmadillo Matrix numDeriv]; };
+  GPvam = derive { name="GPvam"; version="3.0-2"; sha256="160j0zwbcmvzvia1b5p5midf395xfv1frk2w6w3v2zpbn8h6pdz5"; depends=[Rcpp RcppArmadillo Matrix numDeriv]; };
   grade = derive { name="grade"; version="0.2-1"; sha256="085hfvqn880yk19axdjv3z9jr33kls212vs172a8mzhnkallph1r"; depends=[]; };
   GRaF = derive { name="GRaF"; version="0.1-12"; sha256="1d7mr2z49v6ch4jbzh0dj2yjy2c5p51ws38xfz233sjz475snajr"; depends=[dismo]; };
   gRain = derive { name="gRain"; version="1.2-3"; sha256="0cxlni9b4p4g02zhhsbbpkwhx9y3x83vm7qd6lsca02yi96palsi"; depends=[gRbase igraph]; };
+  gramEvol = derive { name="gramEvol"; version="1.1-1"; sha256="026sy3p1b6hy5xkg70zw6bb56i7qpadqs2ndym9ddznh09mk1fsj"; depends=[]; };
+  GrammR = derive { name="GrammR"; version="1.0.0"; sha256="1j1k891cn9fyyp1nfyj6hjcz87qflipfwd9f9zg5s8y4jf0i9a7g"; depends=[gWidgets RGtk2 gWidgetsRGtk2 MASS cluster rgl GUniFrac ape]; };
   granova = derive { name="granova"; version="2.0"; sha256="02jk6p0y29z09l2d35flyrx1g0b4vjpwv99v46pi4kdkiv50508x"; depends=[car]; };
   granovaGG = derive { name="granovaGG"; version="1.2"; sha256="0gy8ba1zlm62f458sxrph3cyz4c6nqkaddm6nwj54nyicxqah32h"; depends=[ggplot2 RColorBrewer plyr gridExtra reshape2]; };
   gRapfa = derive { name="gRapfa"; version="1.0"; sha256="07yzwzna9pdyzndxk6wwyl6v3gkfc7dvy1ixmdl3d38mcl1ahwyq"; depends=[igraph]; };
   gRapHD = derive { name="gRapHD"; version="0.2.4"; sha256="0fxd04s6zh23chks4k6nwb5w408xjy89b44pa42kv6qnqj86ylvm"; depends=[]; };
-  GrapheR = derive { name="GrapheR"; version="1.9-82"; sha256="0rqc12mcs5q5ybdj19as6q4sn8a39yqbv8n235v9hf8dh2c9ph71"; depends=[]; };
+  GrapheR = derive { name="GrapheR"; version="1.9-84"; sha256="1wwks2a4vzhj1rcspizp1vadl6kvrqr8s4zd6pghj02nd266znk9"; depends=[]; };
   graphicsQC = derive { name="graphicsQC"; version="1.0-5"; sha256="1h0qrf47r16np1ysymvlvvb95a8w86brh440kk20ajhbr5njp6kz"; depends=[XML]; };
   GraphPCA = derive { name="GraphPCA"; version="1.0"; sha256="17ipcp7nh47lfs9jy1aybpz4r172zj5yyrdrgmd6wa7hax8yv8gg"; depends=[ggplot2 FactoMineR scatterplot3d scales]; };
   GrassmannOptim = derive { name="GrassmannOptim"; version="2.0"; sha256="05r5zg4kf3xd6pp56bl8ldchdxvspxkdfd33b623hndjhn4lj2lq"; depends=[Matrix]; };
   gRbase = derive { name="gRbase"; version="1.7-0.1"; sha256="1x52i4c5jbry17y1pfnjq03kz4xxnk3anidva41z5alp7c73zlqv"; depends=[Matrix igraph Rcpp]; };
   gRc = derive { name="gRc"; version="0.4-1"; sha256="1a6q24yj7js1sk0lfqbm7kdv605cby6i711w4dlygsxdvwxbrsdr"; depends=[gRbase]; };
-  gregmisc = derive { name="gregmisc"; version="2.1.5"; sha256="06mwyxf1s3alwsmlwm39q5x7jq9k5rlgrkjn7ysxd72h5g1hh54i"; depends=[gdata gmodels gplots gtools]; };
   greport = derive { name="greport"; version="0.5-1"; sha256="0l88w78djgyzd8ma3b61xkjsr76xlxzc3ibhzh6xz389knn3vfl5"; depends=[Hmisc data_table rms lattice latticeExtra Formula survival]; };
   Grid2Polygons = derive { name="Grid2Polygons"; version="0.1-4"; sha256="00qnvi5f5mywknir67rbn36hz8s1x71y1jkkj4nrp60d15vh6hk7"; depends=[sp rgeos]; };
   gridBase = derive { name="gridBase"; version="0.4-7"; sha256="09jzw4rzwf2y5lcz7b16mb68pn0fqigv34ff7lr6w3yi9k91i1xy"; depends=[]; };
@@ -1950,18 +2063,19 @@ let self = _self // overrides; _self = with self; {
   gRim = derive { name="gRim"; version="0.1-17"; sha256="0vn031r318kp78cx00n43fc42bv6sjyb8dm6q0l08s0g9n2w17dp"; depends=[gRbase gRain igraph]; };
   grImport = derive { name="grImport"; version="0.9-0"; sha256="1d8fd7502qj7cirjqdkr1qj51rylw2fz5hs06avfvc2dxs2xwfw1"; depends=[XML]; };
   grnn = derive { name="grnn"; version="0.1.0"; sha256="1dxcmar42g9hz4zlyszlmmnnsnja0gxfggav5jxv0gkp32rkd0wh"; depends=[]; };
-  groc = derive { name="groc"; version="1.0.1"; sha256="147vwvr5n0z6197j6lwm7hvpxbdc2cmykxqgx9mk2v3ssvpjwg86"; depends=[pls mgcv robust robustbase]; };
+  groc = derive { name="groc"; version="1.0.4"; sha256="1v32gwr8ghv47dmzp1x02n3aaqv3cfywh7xzx2486v4p960s42gc"; depends=[rrcov pls mgcv robust robustbase MASS]; };
   grofit = derive { name="grofit"; version="1.1.1"; sha256="0m0phd5irk007k2kpxlsg03g7939nndf363fmkcxffykvp0023hz"; depends=[]; };
   grouped = derive { name="grouped"; version="0.6-0"; sha256="1glxgacpwk7yjbkwg5ci6bmb2il6hf5zhydwi5bbq6hc032m9976"; depends=[MASS]; };
   GroupSeq = derive { name="GroupSeq"; version="1.3.2"; sha256="16n06jw7f97jhafgl9sfvd163v1walhlpmai1hmhiwjvv341sp13"; depends=[]; };
   growcurves = derive { name="growcurves"; version="0.2.3.9"; sha256="1f8hh8ppp6bgrb8crm46xrria3vdnz62aya9lhwcdaggfmy7j25l"; depends=[Rcpp RcppArmadillo reshape2 scales ggplot2 Formula testthat]; };
+  growfunctions = derive { name="growfunctions"; version="0.1"; sha256="0r11grbxbmdx2yg2jh22rf0frg7jz0w7n5d7mbhn16fwnkm3y9mw"; depends=[Rcpp Matrix spam mvtnorm ggplot2 reshape2 scales]; };
   growthmodels = derive { name="growthmodels"; version="1.2.0"; sha256="1wy5z77819s3daa0mifafcjfkggsq0ac522yagj86ml3vf7yqppj"; depends=[]; };
   growthrate = derive { name="growthrate"; version="1.2"; sha256="05a2g3lcw4c0r3hykk5lsxmx2s1lp1fsjjxmip75dhid969sagcs"; depends=[Matrix clime mvtnorm]; };
   grplasso = derive { name="grplasso"; version="0.4-3"; sha256="1v15x0kbzfvl3ygbrsxqgj3mz6a107bfvanbymh0hs7668b1zkab"; depends=[]; };
   grppenalty = derive { name="grppenalty"; version="2.1-0"; sha256="12hbghmg96dwlscjy6nspgkmqqj4vwq2qcwcz1gp50a08qbmdcrk"; depends=[]; };
   grpreg = derive { name="grpreg"; version="2.6-0"; sha256="1j112c96milqnd34dmznm1x7i02ydh484msd6vm98daghb42dzsg"; depends=[Matrix]; };
   grt = derive { name="grt"; version="0.2"; sha256="0cqjk7yqk2ryx1pgvjd3x8l25hqv92p8rvdr7xw4jkzillllwmhz"; depends=[MASS rgl misc3d]; };
-  GRTo = derive { name="GRTo"; version="1.1"; sha256="0fzl3f3x9g9rv1lcsp72sq2cj13d93pdcmjzm4p1p1bb9ainggif"; depends=[bootstrap]; };
+  GRTo = derive { name="GRTo"; version="1.2"; sha256="0x65g8a39vrb8m3hqajxi0ksmdavz0p6mlamqprkdn9p6ikf5c73"; depends=[bootstrap]; };
   GSA = derive { name="GSA"; version="1.03"; sha256="1h1sbpn1rrdh44w4fx2avc7x24ba40mvpd8b2x5wfrc7a294zf6z"; depends=[]; };
   GSAgm = derive { name="GSAgm"; version="1.0"; sha256="18bhk67rpss6gg1ncaj0nrz0wbfxv7kvy1cxria083vi60z0vwbb"; depends=[survival]; };
   gsalib = derive { name="gsalib"; version="2.0"; sha256="0yk39ca7yrsksga73ma2pdqfy3s1xpp07y8622x44b9cazv6rdy4"; depends=[]; };
@@ -1970,28 +2084,30 @@ let self = _self // overrides; _self = with self; {
   gsDesign = derive { name="gsDesign"; version="2.8-8"; sha256="0czr2xyh3nd8kgvw71wvqakvmfbdbysiyyfnh2az7l4j33xyhfc9"; depends=[ggplot2 xtable stringr RUnit plyr]; };
   GSE = derive { name="GSE"; version="3.0"; sha256="1b1nrnvgly7zpyw9z9ddgmx7qfz0mllwm8k7czs17x3l5gkmw8ir"; depends=[Rcpp RcppArmadillo MASS ggplot2]; };
   gSeg = derive { name="gSeg"; version="0.1"; sha256="0qnv3c0rla0g2fb4s4x1i0zdp3dlvi98qf80wlr54gnn7s9vpjf1"; depends=[]; };
+  gset = derive { name="gset"; version="1.0"; sha256="10qiwp94z8zm2gvklnz23qmypdwh72jz0v7rdcni38pv2hcky637"; depends=[Hmisc mvtnorm MCMCpack]; };
   gsg = derive { name="gsg"; version="1.0"; sha256="0j2h1i94vr0mvj4rl328n666b9nn2xnakid8k1r2lh88vk3dv9ma"; depends=[mgcv mvtnorm boot numDeriv]; };
-  GSIF = derive { name="GSIF"; version="0.3-6"; sha256="00z0fbfr5xird1nnjrkmddqc8zbzcqfgmp65wfc5dhsjip7jzcy2"; depends=[sp RSAGA dismo rgdal raster aqp plotKML gstat boot rpart quantregForest randomForest nlme]; };
+  GSIF = derive { name="GSIF"; version="0.4-1"; sha256="0ry2lq9cncd68wnrfgfw53mqi1jiijggdz3ib37xpkcqh754101x"; depends=[sp RSAGA dismo rgdal raster aqp plotKML gstat boot rpart quantregForest randomForest nlme]; };
   gskat = derive { name="gskat"; version="1.0"; sha256="19mbif7wr88vk5wlc7m2l4xghjmfj2qd3s8yvjlkawbnjk8x6ib0"; depends=[CompQuadForm e1071 gee geepack Matrix]; };
   gsl = derive { name="gsl"; version="1.9-10"; sha256="06n21p0k2ki6nb725a6sxwlb4p7xc5jhg11nq9c3z3dj39r0qgbd"; depends=[]; };
   GSM = derive { name="GSM"; version="1.3.1"; sha256="1ay6znw31qnhz5k6fa0aiccr2xxmnj7v3vzrvlk6y5v5smlvybd0"; depends=[gtools]; };
   gsmaRt = derive { name="gsmaRt"; version="1.0"; sha256="0hpf0vgmhill3w8cqpsgvxjgwk2ka154vm9klidckm05qcqlwdn6"; depends=[R2HTML rgl scatterplot3d xtable]; };
-  gsmoothr = derive { name="gsmoothr"; version="0.1.5"; sha256="13z1klyrkbiv069q9cmvdrwr627x5z68y414wxxhsr2099wrj4bd"; depends=[]; };
-  gss = derive { name="gss"; version="2.1-0"; sha256="1ncnim4m63wlmh1mvd5l6clgnqmy4g5vv3d2a7bb28n4274zvwy9"; depends=[]; };
+  gsmoothr = derive { name="gsmoothr"; version="0.1.7"; sha256="00z9852vn5pj04dhl3w36yk0xjawniay6iifw1i7fd8g98mgspxp"; depends=[]; };
+  gss = derive { name="gss"; version="2.1-3"; sha256="07bp60fhax8v4nyzcgadadi1kfwgwk5r08y6ifsgim500jbw7apk"; depends=[]; };
   gsscopu = derive { name="gsscopu"; version="0.9-1"; sha256="0qg4ra7zvp0j6wjbb14sqajfq745bza3v50s0c5xxnddblqi4hcc"; depends=[gss]; };
   gstat = derive { name="gstat"; version="1.0-19"; sha256="1yhrp1dgkl11hr8jy1kmsiaf8avf02m85wcnvf34vlbil24hy7py"; depends=[lattice sp zoo spacetime FNN]; };
-  gstudio = derive { name="gstudio"; version="1.2"; sha256="01rmyvsmf21992wvr18qz81f01wkch0dq260y9pxiz9mhw0cdsd2"; depends=[ggplot2 raster sp reshape2 ggmap popgraph]; };
+  gstudio = derive { name="gstudio"; version="1.3"; sha256="1ddifizswm41y4sxnnfw8j90clba6zf022x0z4xipccaznim2gy9"; depends=[ggplot2 raster sp reshape2 ggmap popgraph]; };
   gsubfn = derive { name="gsubfn"; version="0.6-5"; sha256="1glpq5ghzgarqg8wfl7pblblm31d4dsxrlrkhsgckldbdap52yws"; depends=[proto]; };
   gtable = derive { name="gtable"; version="0.1.2"; sha256="0k9hfj6r5y238gqh92s3cbdn34biczx3zfh79ix5xq0c5vkai2xh"; depends=[]; };
   gtcorr = derive { name="gtcorr"; version="0.2-1"; sha256="1n56zmyv58jwr95p453jb86j82pdnq57gfc8m15jndjc9p31zl0m"; depends=[]; };
   gte = derive { name="gte"; version="1.2-1"; sha256="0h6c5n9wz8b4b5pmqfbc8ivqpg2jh4k6x94wns1l33kiah70pmjd"; depends=[survival]; };
-  gtools = derive { name="gtools"; version="3.4.0"; sha256="1q0az6sqjnrl76i2lsn7zjl4zcwfbh29ia1vmw0dwm4s1afrhvqj"; depends=[]; };
+  gtools = derive { name="gtools"; version="3.4.1"; sha256="0d5v864v3qnmmxas8xf74aarli9nr3l16bwj9qzs2s9k498q6azs"; depends=[]; };
   gtx = derive { name="gtx"; version="0.0.8"; sha256="0x71jji2yldi9wpx8d3nldbjfj4930j7zcasayzbylf9094gmg26"; depends=[survival]; };
-  GuardianR = derive { name="GuardianR"; version="0.3"; sha256="11dhzhrv6ykb2glymaxq33m0r8fr3v4481g4cwhlbzkmbncvwl6d"; depends=[RCurl RJSONIO]; };
+  GuardianR = derive { name="GuardianR"; version="0.4"; sha256="0jk97x106srswp28r68713ky707cx957hvbkjggfppcglic5dc1n"; depends=[RCurl RJSONIO]; };
   Guerry = derive { name="Guerry"; version="1.5-0"; sha256="18pgmsqd6ign5g4lwpd35gxaypm3zjf1i82w63ss11dsqddnfyvh"; depends=[sp shapefiles]; };
   GUIDE = derive { name="GUIDE"; version="1.0.9"; sha256="1y0y6rwv1khd9bdaz5rl9nmxiangx0jckgihg16wb6hx6kf8kzc1"; depends=[rpanel tkrplot]; };
   gumbel = derive { name="gumbel"; version="1.04"; sha256="0fl44i4kz9wbba1iv4fy1b74nf25axdkifhczgrgpy5d81ky43v6"; depends=[]; };
   GUniFrac = derive { name="GUniFrac"; version="1.0"; sha256="0w08b22xkx0llmwk1kj4ibapvg3fxkgkmjz6z6acr4nwqfwmjzzx"; depends=[vegan ape]; };
+  GUTS = derive { name="GUTS"; version="0.3.5"; sha256="10yi18yv3vbm7pn11bbj3baxqga5yymilabf56bc18prpirnw51b"; depends=[Rcpp]; };
   gvcm_cat = derive { name="gvcm.cat"; version="1.6"; sha256="0v5q97gjninxrjdclxj1bn362h0j93pm71k9gp79aa3sdy4ay6s4"; depends=[Matrix MASS]; };
   gvlma = derive { name="gvlma"; version="1.0.0.2"; sha256="0gj52hg665nmlwgbjh9yvz7a3sbzlbj41ksxchnnlxaxipdf6sl8"; depends=[]; };
   GWAF = derive { name="GWAF"; version="2.1"; sha256="1s56d3b6p5fpaxi32ks2mmhsa5sgi746hf159wk0z99099gli8g3"; depends=[geepack coxme lme4]; };
@@ -1999,23 +2115,25 @@ let self = _self // overrides; _self = with self; {
   GWAtoolbox = derive { name="GWAtoolbox"; version="2.2.4"; sha256="0adpixlfh0j1py79b0636921kmz2zvhv8p07m6ism6h3xva0i4ck"; depends=[]; };
   gwerAM = derive { name="gwerAM"; version="1.0"; sha256="1c3rzd1jf52a4dn63hh43m9s9xnjvqn67amlm9z1ndrnn6fwfg1b"; depends=[MASS Matrix]; };
   GWG = derive { name="GWG"; version="1.0"; sha256="1va0cd229dhhi1lmrkpwapcm96hrdmxilrmba02xnl7ikhisw0my"; depends=[]; };
-  gWidgets = derive { name="gWidgets"; version="0.0-52"; sha256="0nldrgc3kbqf8x09n0h8kcf86zc3f94s1fmb3jdcxjzw4p5f0dna"; depends=[]; };
+  gWidgets = derive { name="gWidgets"; version="0.0-53"; sha256="06imjabf9fqghaszqq77x6vxq864cn36n6534bkg23m9fwzqzf23"; depends=[]; };
   gWidgets2 = derive { name="gWidgets2"; version="1.0-5"; sha256="1y6vm6ds77yr1qiqlcaixbsarbwx5w53ba343svla7wva80ajbpl"; depends=[digest]; };
   gWidgets2RGtk2 = derive { name="gWidgets2RGtk2"; version="1.0-2"; sha256="1pzcpjz5cdizvj0ih2r4i3ll6flm45q8ym6sz0wqbg4j3ir0l5kh"; depends=[memoise RGtk2 gWidgets2]; };
   gWidgets2tcltk = derive { name="gWidgets2tcltk"; version="1.0-2"; sha256="1dzrc8yry4l2afpijr35irnqmvfpd22vlb3lih4pk14n52690y0h"; depends=[digest memoise gWidgets2]; };
   gWidgetsRGtk2 = derive { name="gWidgetsRGtk2"; version="0.0-82"; sha256="0b1imvy2094s2ixar7z4kxs047855ssijx8l22a1hlwdg7zp7sng"; depends=[RGtk2 gWidgets]; };
-  gWidgetstcltk = derive { name="gWidgetstcltk"; version="0.0-54"; sha256="04mc0vc0iz18v86fmz4yb46m4flcljzx9njm9jnfq3lh2gj3bf9d"; depends=[gWidgets digest]; };
+  gWidgetstcltk = derive { name="gWidgetstcltk"; version="0.0-55"; sha256="06991rqh4927bal7j718bn2ziy6rws8yq682lmp5vbqhdd36afv2"; depends=[gWidgets digest]; };
   gWidgetsWWW = derive { name="gWidgetsWWW"; version="0.0-23"; sha256="14yw04kgfqfwl44zkyqy075rjd5vafbzig6x5py25ypbdk3hwn7a"; depends=[proto filehash digest rjson]; };
-  GWmodel = derive { name="GWmodel"; version="1.2-2"; sha256="0ixy0005lgi3h9mfbbmd6l6k3zg2w3j0caarx4yp7457mjla2471"; depends=[maptools robustbase]; };
+  GWmodel = derive { name="GWmodel"; version="1.2-3"; sha256="04sks9rnqxgxyj9q3nyrnknp4cdfck2p52svxfdrgvxqr48kf6ff"; depends=[maptools robustbase]; };
   GWRM = derive { name="GWRM"; version="1.1"; sha256="1l8rw2nksd1vskjb7kjn93vgrs39bcrr8zz1j66rmkcc399pf6nf"; depends=[]; };
   gwrr = derive { name="gwrr"; version="0.2-1"; sha256="1fjk217pimnmxsimqp9sn02nr1mwy3hw3vsr95skbfsd6vdda14d"; depends=[fields lars]; };
   GWsignif = derive { name="GWsignif"; version="1.0"; sha256="04663qgy3xmijrx8m1s5ql7zj70mgsd58dl08ci742l1fzmfya5f"; depends=[]; };
   GxM = derive { name="GxM"; version="1.0"; sha256="1vaq0fkx3bf2kdmn2iqgad8haprg9i3a9101nrvyh2pv2g894761"; depends=[Rcpp minqa nlme]; };
-  h5r = derive { name="h5r"; version="1.4.7"; sha256="1q2l6hq30x5cnxrhk6fz8ymb836sc2z48h37yw4v13xqmb8q74wp"; depends=[]; };
+  h2o = derive { name="h2o"; version="2.4.3.11"; sha256="0mlyzvylqqi3w85riyp2mhyzdqf6yvmxibdjj41glaqc5vj37dlx"; depends=[RCurl rjson statmod]; };
   haarfisz = derive { name="haarfisz"; version="4.5"; sha256="1qmh4glwzqwqx3pvxc71rlcimp1l0plgdf380v9hk0b4gj7g3pkf"; depends=[wavethresh]; };
-  HAC = derive { name="HAC"; version="0.3-1"; sha256="1rzfc8h5w2rxjlppi3pa7n3gavxclkwm7bw081k8jlmrifx87sp3"; depends=[copula]; };
+  HAC = derive { name="HAC"; version="1.0-0"; sha256="00va1q17a1vijhb557kh6scqakllqlblcv2hfisi7fq0h2ainni1"; depends=[copula]; };
   HadoopStreaming = derive { name="HadoopStreaming"; version="0.2"; sha256="1l9msaizjvnsj1jrpghj4g057qifdgg6vbqhfxhn1fiqdqi2056q"; depends=[getopt]; };
+  hamlet = derive { name="hamlet"; version="0.7"; sha256="0f3gl5xvgdksaxk76dyv46hahc41f2j3pf9wp0rc0q7wpp5nfsjl"; depends=[]; };
   HandTill2001 = derive { name="HandTill2001"; version="0.2-9"; sha256="1j4ivxarm3k9sj05824lv6b03apyabpciv4mp253vv0yzjcp2bzf"; depends=[]; };
+  Hankel = derive { name="Hankel"; version="0.0-1"; sha256="0g3b0ji8hw29k0wxxvlnbcm0z91p4vbajbrhm6cqbccjq85lg4si"; depends=[]; };
   hapassoc = derive { name="hapassoc"; version="1.2-6"; sha256="14ddh7wiyks0wcw0iy1af9njg4wsn5flv59r463z2b3pbj5zp1qc"; depends=[]; };
   HapEstXXR = derive { name="HapEstXXR"; version="0.1-6"; sha256="0ldmfa9729sf9r1kaldsskq8w6kvjac778bzjyi0a1pfz2walzjb"; depends=[survival]; };
   HAPim = derive { name="HAPim"; version="1.3"; sha256="03qy0pxazv3gdq3fck7171ixilb9zi1dwnvc4v7d726g0lvn80pg"; depends=[]; };
@@ -2025,12 +2143,13 @@ let self = _self // overrides; _self = with self; {
   haplo_stats = derive { name="haplo.stats"; version="1.6.8"; sha256="1zz8hi37zwc6wkn5q7zhz1l29vlklhnj8gzp1pmz4ys496c2lwxh"; depends=[]; };
   HAP_ROR = derive { name="HAP.ROR"; version="1.0"; sha256="1id9amz1cc2l2vnpp0ikbhf8ghbgzqd1b9dfivnyglg7996c3gbg"; depends=[hash ape]; };
   hapsim = derive { name="hapsim"; version="0.3"; sha256="18r0cq15psjwxprml84ihj5gw4pk6agd7x0qicj899awa21f2qb3"; depends=[MASS]; };
-  HardyWeinberg = derive { name="HardyWeinberg"; version="1.5.2"; sha256="10djqp3qd2a7wr2l9nn13wwvhwrlj9wdr5sij8ac8l2xibrxdghv"; depends=[mice]; };
-  harvestr = derive { name="harvestr"; version="0.5.2"; sha256="1559pzfsp3fnz7ichi5ayqb3vk48xgw5x5i48s45lm9vkqyha303"; depends=[plyr digest]; };
+  HardyWeinberg = derive { name="HardyWeinberg"; version="1.5.4"; sha256="0098n5m3svcc3z5cvmqygazlvm1dzd4zfbpj1q9zqs5wr3407wcv"; depends=[mice]; };
+  harvestr = derive { name="harvestr"; version="0.6.0"; sha256="1jg4d98bwx2cm3hliayqrazq43sa9kd9ynpaid6x4ld3mz5y8mlq"; depends=[plyr digest]; };
   hash = derive { name="hash"; version="2.2.6"; sha256="0mkx59bmni3b283znvbndnkbar85fzavzdfgmwrhskidsqcz34yz"; depends=[]; };
   hashFunction = derive { name="hashFunction"; version="1.0"; sha256="1v57xj8xwv6xhxvgp0zxgvs5vcjw8z5k2ciwbn0jxf4ilyd66cgj"; depends=[]; };
-  hasseDiagram = derive { name="hasseDiagram"; version="0.1"; sha256="1j48h6im66vc60fkrlkdgcqmz8ilvwa56qn97ybmy50gl0ispd2c"; depends=[]; };
-  hawkes = derive { name="hawkes"; version="0.0-3"; sha256="03gw5wnyqw4yn313d8jgdrl87dwmwji4ljvjllc5yv8z8mnmhv6j"; depends=[Rcpp RcppArmadillo]; };
+  hasseDiagram = derive { name="hasseDiagram"; version="0.1.1"; sha256="1szj5pi9i5ijqakxx4vwvwpz7y76jbgcgm76vfg4cnxvndf7sf4l"; depends=[]; };
+  hawkes = derive { name="hawkes"; version="0.0-4"; sha256="1ghwq3icxwmrai3xn9r8cnvlh3z3j18lznhw1bm31h9mkkp2dk0a"; depends=[Rcpp]; };
+  hazus = derive { name="hazus"; version="0.1"; sha256="1c0ahjdy9di1683nk5k4rmr6rhb66523ny039nyv842rgqdy625j"; depends=[reshape2]; };
   hbim = derive { name="hbim"; version="1.0.3"; sha256="1480nydsi2xj7zbfk4zw24mhsjadf83d827kpqzbmn0yh6srp3ps"; depends=[mvtnorm]; };
   hbmem = derive { name="hbmem"; version="0.3"; sha256="0ylxp77ack874sadwfnry84a6bg8gdl9xbw821lp5q05nnyg0dcj"; depends=[]; };
   hbsae = derive { name="hbsae"; version="1.0"; sha256="1iwmpi0pn5fxyxkwqkbmy6w1f1wcx0p809jnviim0ypwib32mhh7"; depends=[Matrix arm]; };
@@ -2041,37 +2160,41 @@ let self = _self // overrides; _self = with self; {
   HDclassif = derive { name="HDclassif"; version="1.2.2"; sha256="0j32nhl2v0bipflidwfk6q8a0pvn7qjs7ks1al2izsr772dwfcvq"; depends=[MASS]; };
   hddplot = derive { name="hddplot"; version="0.56"; sha256="0s9iijwq8zfvavqq2bkqm2884sg0957ppkggsv6mmm3cbdi2xrlc"; depends=[MASS]; };
   hdeco = derive { name="hdeco"; version="0.4.1"; sha256="04nggwckvn1kwi238qd33l4pryzn4aq5bmi30bvfi99gwnrlgfgq"; depends=[]; };
-  hdi = derive { name="hdi"; version="0.0-6"; sha256="1w4ijr385zvnc1r6agzy2gg3knyf58zbm46yyp0yscgrxp85v1bb"; depends=[glmnet linprog plus]; };
+  hdi = derive { name="hdi"; version="0.1-2"; sha256="19lc2h34jlj198gchnhbfbb8igwlan2b977a47j8p3q6haj5bcv1"; depends=[glmnet linprog MASS scalreg]; };
   hdlm = derive { name="hdlm"; version="1.2"; sha256="0s4lzg3s2k7f7byygb11s7f78l3rkkb0zn03kh3d7h8250wg9fax"; depends=[glmnet foreach MASS iterators]; };
   HDMD = derive { name="HDMD"; version="1.2"; sha256="0na0z08fdf47ghfl2r3fp9qg5pi99kvp7liymwxym2wglkwl4chq"; depends=[psych MASS]; };
+  HDPenReg = derive { name="HDPenReg"; version="0.89.8"; sha256="1w1p3ivqw5snp9c08qss08radcv32h9pd5av0gj8kachcf4b6x0l"; depends=[Rcpp]; };
   hdrcde = derive { name="hdrcde"; version="3.1"; sha256="027nxpzk1g0yx8rns7npdz30afs5hwpdqjiamc7yjrsi0rzm71lw"; depends=[mvtnorm locfit ash ks KernSmooth]; };
   HDtweedie = derive { name="HDtweedie"; version="1.1"; sha256="14awd7sws0464f68f5xwnv1xvr0xflvx2z2zzcfj1csvk3af0zzj"; depends=[]; };
   HEAT = derive { name="HEAT"; version="1.2"; sha256="1qifqd06ifl0f5l44mkxapnkwhpm0b82yq6dhfw4f8yhb27wd0z2"; depends=[]; };
   heatex = derive { name="heatex"; version="1.0"; sha256="0c7bxblq24m80yi24gmrqqlcw8jh0lb749adsh51yr6nzpap6i9n"; depends=[]; };
-  heatmapFit = derive { name="heatmapFit"; version="1.0"; sha256="0fj75f4hs2pxwq8vwk2mjy0kigkf2fpamcy8zzwa1n7x6q109c02"; depends=[]; };
+  heatmap3 = derive { name="heatmap3"; version="1.0.4"; sha256="0yrqq97r05xypqgd2dz5cyb54kjdhdzi59rclppcibwhjzpvgdka"; depends=[fastcluster]; };
+  heatmapFit = derive { name="heatmapFit"; version="2.0.2"; sha256="00p39y6x13yxrxfqx6gzmb80fk1hsyi8wa6brx40hj37pyyfis0p"; depends=[]; };
   heatmap_plus = derive { name="heatmap.plus"; version="1.3"; sha256="0rzffm15a51b7l55k0krk6w7v8czy3vpwz1qmbybr7av0pln7wn3"; depends=[]; };
   heavy = derive { name="heavy"; version="0.2-3"; sha256="17mr2i629hw38dadbl75rmkz9y3brc2yz3hap1vp607ya420cmv8"; depends=[]; };
   helloJavaWorld = derive { name="helloJavaWorld"; version="0.0-7"; sha256="0x0f64w5783mh0ryv0krpdzhicbv912y36h74h1qapcy5225fxh5"; depends=[rJava]; };
-  helsinki = derive { name="helsinki"; version="0.9.12"; sha256="1bajxhzsg555xlkmp38b1mg69kaai814m3rl863v3xg988ing2yr"; depends=[rjson RCurl maptools]; };
-  heplots = derive { name="heplots"; version="1.0-11"; sha256="0zbrkq62gcig9bils51dc4x7bgjskh1lp38diajifvypqmfhciph"; depends=[car MASS]; };
+  helsinki = derive { name="helsinki"; version="0.9.20"; sha256="0jlyvj8cyzb0si2gqwik4jzbmwfawwnap9k6jl1z2nw2rz5w1k3c"; depends=[maptools rjson RCurl]; };
+  heplots = derive { name="heplots"; version="1.0-12"; sha256="064kanmqm4b0sbyw60wfb19adclpdagm23l6p86vi0hyx0dr0ykz"; depends=[car MASS]; };
   hergm = derive { name="hergm"; version="1.3-11"; sha256="1kfh7ry84smxf3d0ykjr7d0ckh2dk9y63761f4pmskfxqx12w98a"; depends=[ergm]; };
   hett = derive { name="hett"; version="0.3-1"; sha256="1y0hr9g2pjwzc5azh095h33qidxhhmlvd1csamjnhwdphj5drzz0"; depends=[MASS lattice]; };
   het_test = derive { name="het.test"; version="0.1"; sha256="08kxp81dx32anh0k5b65x7w7madwnn9hiabdrk6ck6b6mx37x26v"; depends=[vars]; };
-  hexbin = derive { name="hexbin"; version="1.26.3"; sha256="1srvpj5nzmrnk5l0j9rdr246j8fd07r44shc9mayv58qk8ivbhqy"; depends=[lattice]; };
+  hexbin = derive { name="hexbin"; version="1.27.0"; sha256="0fs5nsaalic6fj7b347yjczws310y3q2v37yr8sg74yq8wqzsdj8"; depends=[lattice]; };
   hexView = derive { name="hexView"; version="0.3-2"; sha256="19s87qxz9rjvzr64pv51wfd26jy5f00i8lwv39hhr6rh0jwngdly"; depends=[]; };
   hflights = derive { name="hflights"; version="0.1"; sha256="1rb6finck13i6949i6hsgfk90q4ybxh1m3is2mlw2m6087bpzfbd"; depends=[]; };
   hgam = derive { name="hgam"; version="0.1-2"; sha256="1flcc67n8kbh9m5phdfl587xg1x935zbp305y0gdmkc8vpkiwpcf"; depends=[grplasso lattice rgl]; };
-  hglasso = derive { name="hglasso"; version="1.0"; sha256="1nfnyb9ns5jgqqdg6dmvdc7708j4d7picy8135pa3g7pnrfxs9mm"; depends=[glasso mvtnorm igraph fields]; };
-  hglm = derive { name="hglm"; version="2.0-4"; sha256="0jdihcank1dx2k56mhwxlh2bbbpwrdblf9jgy6x68mly4b863239"; depends=[Matrix MASS]; };
+  hglasso = derive { name="hglasso"; version="1.2"; sha256="1qq41ma33wz7qjs5zx72yvngpsiq62z9sd6d5hvvl83brq0fcr4b"; depends=[glasso mvtnorm igraph fields]; };
+  hglm = derive { name="hglm"; version="2.0-8"; sha256="14md1d54zbhc2cnrvim5l8rwg556ln0ssamxj5354nrvr6sxv8gs"; depends=[Matrix MASS hglm_data]; };
+  hglm_data = derive { name="hglm.data"; version="1.0-0"; sha256="1hrq1jac658z5xjsg03nfkb4kwm9z44bhciv5chk74ww8gjr9j9q"; depends=[Matrix MASS]; };
   HGNChelper = derive { name="HGNChelper"; version="0.3.0"; sha256="1w1x8fkvwlm4xqfx3afg42hhsa459sxqacsiph088sr77lhd3acz"; depends=[]; };
   HH = derive { name="HH"; version="3.0-4"; sha256="11b1qvhdl1waskvvcdkdkljh5d3ql6ajsq0vg4fapprfkq4jamv1"; depends=[lattice latticeExtra multcomp reshape2 leaps vcd colorspace RColorBrewer]; };
-  HHG = derive { name="HHG"; version="1.3"; sha256="0m8h460m5qv5zcs648kaw8w3p7nlgb88zybs7r9j0kya1xlqjwkm"; depends=[]; };
-  hht = derive { name="hht"; version="2.0.1"; sha256="1xs6p2xqcnh3xixhv7wblbyv02rwd1pd8xj14n2jyrq1icl9idri"; depends=[EMD fields]; };
+  HHG = derive { name="HHG"; version="1.4"; sha256="048jbwhrbgp1pv2j6sw234ykdn7bgpa49slwh3p5547nl2cwjysg"; depends=[]; };
+  hht = derive { name="hht"; version="2.0.2"; sha256="1hah6f8svvp63nzdfrnri8bi6dzx1qn372dmiz6x2jpp77mw2mkc"; depends=[EMD fields]; };
   HI = derive { name="HI"; version="0.4"; sha256="0i7y4zcdr6wcjy43lz9h8glzpdv0pz7livr95xb1j4p8zafykday"; depends=[]; };
   HIBAG = derive { name="HIBAG"; version="1.2.3"; sha256="08hg9l5il2zicbpg04biiqm99lj51ny6ias8hwxj2s4gyr1qd5ny"; depends=[]; };
-  HiCseg = derive { name="HiCseg"; version="1.0"; sha256="1g7sw2nsq71la42nz4mfgi6y6kzwz4lcsqhrlinahw2sq1kxfp9b"; depends=[]; };
+  HiClimR = derive { name="HiClimR"; version="1.1.2"; sha256="1vq8gln5888aa9835phixniijf1madxgsx895ld6nxxrwd9jhwpl"; depends=[]; };
+  HiCseg = derive { name="HiCseg"; version="1.1"; sha256="19581k3g71wrznyqrp4hmspqyzcbcfbc48xgjlq13zmqii45hcn6"; depends=[]; };
+  hiddenf = derive { name="hiddenf"; version="1.0"; sha256="00r27dyfg4mjsp4s3hjk19alqc4jbfvy8pk5zjvz7gdgq68fxaza"; depends=[]; };
   HiddenMarkov = derive { name="HiddenMarkov"; version="1.7-0"; sha256="0223yw1ga2c2y1fqjgr3m4yw7w8cp5r0z5cz766qvbc5wv65bh59"; depends=[]; };
-  HiDimDA = derive { name="HiDimDA"; version="0.2-1"; sha256="0i898f5ij0imw6iq6h1r5f84qb7g86c1r3ljnb23fkq2ki4z4igk"; depends=[locfdr]; };
   hierarchicalDS = derive { name="hierarchicalDS"; version="2.01"; sha256="0qdpdr8wk27zm1gf50awnmy8sghqq7mcdq30ahcyphmxmkm5cn1l"; depends=[truncnorm MASS mvtnorm Matrix coda spsurvey MCMCpack xtable mc2d]; };
   hierfstat = derive { name="hierfstat"; version="0.04-10"; sha256="1n0nn5liwvf3xc743vdxpfqsbr40n599f981gk49d9nq8qk0kggl"; depends=[gtools ade4]; };
   hierNet = derive { name="hierNet"; version="1.6"; sha256="08lifk92caa4l9nfb89rl6vby8sd1ba3ay7z29ffirsg7cx07qiw"; depends=[]; };
@@ -2081,6 +2204,7 @@ let self = _self // overrides; _self = with self; {
   highlight = derive { name="highlight"; version="0.4.4"; sha256="03mch5waqkzb9pb4llgalbxdfn3h6adh05f3i43kscssc67bs30l"; depends=[]; };
   highr = derive { name="highr"; version="0.3"; sha256="1y0amfvdpqwq0n60fykbsir4jd1ynkwfcgadjnn1997amk9qja5x"; depends=[]; };
   highriskzone = derive { name="highriskzone"; version="1.1"; sha256="1qpk63jh44075b6fnhqx1iqjywzzwhvr6lry3vjlx0sfv1nqad6k"; depends=[spatstat ks]; };
+  hillmakeR = derive { name="hillmakeR"; version="0.2"; sha256="1baynibgn4xqmpsxna8irggxvdc484mq5nza00rwg58vh1bc7wzq"; depends=[]; };
   HiLMM = derive { name="HiLMM"; version="1.0"; sha256="1x3my51vzxlk9q7vj2ljpqinxw777953mhgzvbqildph4szh4xh4"; depends=[]; };
   hint = derive { name="hint"; version="0.1-1"; sha256="1n18j2hcb1qynhsln10nzryi20l5aqhr7i1aanww10y5dz573zi3"; depends=[]; };
   HiPLARM = derive { name="HiPLARM"; version="0.1"; sha256="0af68gfmc89nn1chmqay6ix0zygcp1hmylj02i7l6rx6vb06qw6w"; depends=[Matrix]; };
@@ -2089,25 +2213,25 @@ let self = _self // overrides; _self = with self; {
   HistData = derive { name="HistData"; version="0.7-5"; sha256="17s64hfs7r77p0wjzpbgz9wp3gjzbly2d0v784f9m2bka8gj6xhr"; depends=[]; };
   histogram = derive { name="histogram"; version="0.0-23"; sha256="0hrhk423wdybqbvgsjn7dxgb95bkvmbh573q1696634hvzfdm68c"; depends=[]; };
   HistogramTools = derive { name="HistogramTools"; version="0.3"; sha256="1wfvrznr578s2hc8ccs849pz4kjlyi4brdxhw919cvk758ahy9rv"; depends=[Hmisc ash stringr]; };
-  hitandrun = derive { name="hitandrun"; version="0.4-1"; sha256="1p2wnib0ngdcz01ml3izl4k4a6ww5ygkk5050q4nzabl1gby9xg6"; depends=[rcdd]; };
+  hitandrun = derive { name="hitandrun"; version="0.4-2"; sha256="143aj926mx0v26f8dsagr90ggzk23lfms57agzrnqfvddla7ng9c"; depends=[rcdd]; };
   hive = derive { name="hive"; version="0.1-16"; sha256="1xaxnr8nfkji2b5f5dq2h01pkl20rm24wxnf1y1xv695v3j58ibd"; depends=[rJava XML]; };
-  HiveR = derive { name="HiveR"; version="0.2-17"; sha256="1nbs79ikhp60nmhjd30vapn7aggpdw2f6dp5gz4g3fp82gld9llb"; depends=[RColorBrewer plyr tkrgl]; };
+  HiveR = derive { name="HiveR"; version="0.2-27"; sha256="1c0isfiq8xw68qi3mk6m5dilsvbib7hy0ill9wga6kf6qndlfc49"; depends=[RColorBrewer plyr tkrgl jpeg png]; };
   HIV_LifeTables = derive { name="HIV.LifeTables"; version="0.1"; sha256="0qa5n9w5d5l1kr4827a34581q380xmpyzmmhhl300z1jwr0j94df"; depends=[]; };
   HK80 = derive { name="HK80"; version="0.0.1"; sha256="1qhknrqpspxrdxzf5kakans94db58bbhgpblvpwcyw4jrjmm0ng7"; depends=[]; };
   HLMdiag = derive { name="HLMdiag"; version="0.2.5"; sha256="1yim9m5q1m112aj7zhsw345l32bdj7lbw2mqpcxhjzv1lcknm5lq"; depends=[lme4 ggplot2 plyr reshape2 MASS Matrix Rcpp]; };
   hlr = derive { name="hlr"; version="0.0-4"; sha256="04w1hzjfg2ly9vm9ynh676fy74d9ncy3a1mak209z2ddgr3m7r2y"; depends=[MASS]; };
+  HLSM = derive { name="HLSM"; version="0.2"; sha256="052qsdbfamlpwmxz7bwbnd956kibgvw3w6r7gvvp2s08g58arvy7"; depends=[MASS coda]; };
   hmeasure = derive { name="hmeasure"; version="1.0"; sha256="0wr0xq956glmhvy4yis3qq7cfqv9x82ci9fzx3wjvaykd16h0sx9"; depends=[]; };
   Hmisc = derive { name="Hmisc"; version="3.14-4"; sha256="1jpz1sxvcip1k7yc8wkxf68fplr6dv24pavblxmi823xq1pjq21y"; depends=[lattice survival Formula latticeExtra cluster]; };
   HMM = derive { name="HMM"; version="1.0"; sha256="0z0hcqfixx1l2a6d3lpy5hmh0n4gjgs0jnck441akpp3vh37glzw"; depends=[]; };
   HMMCont = derive { name="HMMCont"; version="1.0"; sha256="1drni4f72x83sprn65wnhw0pv1q8lfkgmxdr9h4rwv1accril85x"; depends=[]; };
-  hmm_discnp = derive { name="hmm.discnp"; version="0.2-1"; sha256="0xqvg2hfcp4m8k2pkcvrbrlyv66m1hr0flwb0k5haj0y2h73g373"; depends=[]; };
+  hmm_discnp = derive { name="hmm.discnp"; version="0.2-3"; sha256="1r9xxgsqh5pw9incldaxnsqhyanhd4jwm6w0ix1k43i53dw4diyr"; depends=[]; };
   hmmm = derive { name="hmmm"; version="1.0-2"; sha256="057yfp1sgp1wvhdq0sfvs598zcq8dhrbqfc02lih5pnwacf96vpc"; depends=[quadprog MASS mvtnorm]; };
-  HMMmix = derive { name="HMMmix"; version="1.0"; sha256="1wipyc80ywf8ahlc4hny8pawcx2js6zgwv981s4sydx56c4fy8f2"; depends=[mnormt]; };
   HMMpa = derive { name="HMMpa"; version="1.0"; sha256="14r2axg42by49qm6avgv7g3xnc29bxlrni5fhc5vdz0wygkcrqhn"; depends=[]; };
   HMP = derive { name="HMP"; version="1.3.1"; sha256="1r39mq8j071khza37ck7w4kvk1di71hhn5m4wnx9dak7nlcq2nwx"; depends=[MCMCpack dirmult]; };
   HMPTrees = derive { name="HMPTrees"; version="1.2"; sha256="0agp8w7rzr1byj01di89r3qy1vb9inb2zgys78mg8jnk7axi925l"; depends=[ape]; };
   HMR = derive { name="HMR"; version="0.3.1"; sha256="1lmxp46r5jr0r37sk9y080irbrf89rkzhv0943xv0f0l2dyyk415"; depends=[]; };
-  hoardeR = derive { name="hoardeR"; version="0.0-1"; sha256="17720hg1zksgaiandbsq9ab9l0vkm3crg5275n5jyz37yrz9mka6"; depends=[httr XML]; };
+  hoardeR = derive { name="hoardeR"; version="0.0-2"; sha256="1k9a469h6fmr1br93dsk4q14h2bw8225l0v5sfp2wyr8sfpwm1dg"; depends=[httr XML stringr]; };
   holdem = derive { name="holdem"; version="1.1"; sha256="07h4cbg7hx91hc6ypi6hbalzdd9qz9rfhjgk5sq1srnangwwnxlw"; depends=[]; };
   Holidays = derive { name="Holidays"; version="1.0-0"; sha256="1p7rwph50i0dwl7a6n394dq7sl9nb2y8p5ip5y6ql48ixjh4d078"; depends=[TimeWarp]; };
   homals = derive { name="homals"; version="1.0-5"; sha256="1azrwvdzn379in2sz9d94w2f2xp0d6iiayrv0bws44kvdzr95aqm"; depends=[rgl ape scatterplot3d]; };
@@ -2118,25 +2242,29 @@ let self = _self // overrides; _self = with self; {
   hotspots = derive { name="hotspots"; version="1.0.2"; sha256="1cwcwin86y7afjhs8jwlz1m63hh70dcjag0msds4ngksvjh9gj2q"; depends=[lattice ineq]; };
   howmany = derive { name="howmany"; version="0.3-1"; sha256="045ck8qahfg2swbgyf7dpl32ryq1m4sbalhr7m5qdgpm62vz8h7f"; depends=[]; };
   HPbayes = derive { name="HPbayes"; version="0.1"; sha256="1kpqnv7ymf95sgb0ik7npc4qfkzc1zb483vwnjpba4f42jhf508y"; depends=[MASS mvtnorm corpcor numDeriv boot]; };
+  hpcwld = derive { name="hpcwld"; version="0.4"; sha256="1vh5jvq9nbghsl59fi6v3nmsh0jmxq7pzbs3fgasz8c3jmjw50kp"; depends=[]; };
   HPO_db = derive { name="HPO.db"; version="1.2"; sha256="04mys72qajp7cn0vhzr9mv388d5a69kjvkwxjjskz24k91xwn4vz"; depends=[]; };
+  hpoPlot = derive { name="hpoPlot"; version="1.0"; sha256="0jd0imbhsw74gziafkzn7hrxz79llmpksspbnxnslm1mifl81www"; depends=[functional plotrix Hmisc]; };
   HPOSim = derive { name="HPOSim"; version="1.2"; sha256="1bgakx9y1cqc54adm6d4zlqvd2smxq895bf68njsgj3ygrlglc2v"; depends=[HPO_db igraph]; };
   hqmisc = derive { name="hqmisc"; version="0.1-1"; sha256="0jcy2hb3dmzf9j4n92aq7247mx9w7n30wpsx0dkchqnjwlqwwncw"; depends=[]; };
   hrr = derive { name="hrr"; version="1.1.1"; sha256="17jzsgh2784y7jdwpa50v7qz99dw6k2n25sisnam6h1a39b96byn"; depends=[]; };
   HSAUR = derive { name="HSAUR"; version="1.3-3"; sha256="0lf6z9fgmbdhpvz2dyni5wi1ri6y6fikkf1px03pirlswm1mbchj"; depends=[]; };
-  HSAUR2 = derive { name="HSAUR2"; version="1.1-9"; sha256="0sp51fr86lcx02kz4sqcppip8hbd4vdbh5n3jiq1197fcvamvb1y"; depends=[]; };
-  HSAUR3 = derive { name="HSAUR3"; version="1.0-0"; sha256="1lzcpmmdczf2wq0s9kpriwn4q9grvhqhrzf3prpdq8lq280x9zx7"; depends=[]; };
-  hSDM = derive { name="hSDM"; version="1.0"; sha256="0j1pl6vg9yypaikh89pwwbbpvkhxabgrbvza14bvqbp6v52c651l"; depends=[coda]; };
+  HSAUR2 = derive { name="HSAUR2"; version="1.1-10"; sha256="0r06abgiiwj3b9cd652hics2rzkslk1gplxv751501nn7k2qid7i"; depends=[]; };
+  HSAUR3 = derive { name="HSAUR3"; version="1.0-1"; sha256="1w1c3ypyvlfi95qg3xxdjfgxlykrcn3rly7z2mvpzkdx4dhi3kls"; depends=[]; };
+  hSDM = derive { name="hSDM"; version="1.4"; sha256="1jq6hdnyv446ng62srip0b48kccf0qw3xqym3fprg74mjdy3inqr"; depends=[coda]; };
   hsicCCA = derive { name="hsicCCA"; version="1.0"; sha256="1d4lkjrihwhl3jrsj7250ccd90nfwpllyavc3mp15fhcy2jnjci8"; depends=[]; };
   hsmm = derive { name="hsmm"; version="0.4"; sha256="1fh8c5kfv4brygdq6bfkrhrhkm99mxl4ljb1mhp9nf2bjlla11mc"; depends=[mvtnorm]; };
-  hsphase = derive { name="hsphase"; version="1.2.6"; sha256="1xwgxhlr54kmqpwlp9aphii95829hjpgz1xi3z9m9hd7hsd1fcp8"; depends=[snowfall Rcpp]; };
+  hsphase = derive { name="hsphase"; version="2.0.0"; sha256="04zhqnrrzhg1kqxf251q7iglazsj28dqqvhvch472925xf7dnap3"; depends=[snowfall Rcpp]; };
   HSROC = derive { name="HSROC"; version="2.1.7"; sha256="05gixmzmgdply9zhjpss54b50ch4b8586cik6c49naxcqxr0y5vd"; depends=[lattice coda MASS MCMCpack]; };
+  HSSVD = derive { name="HSSVD"; version="1.1"; sha256="0kpfcb9ibwhdanc56ysbvx3zirhbrxqyrgpbmi9yvnc5m2c8377d"; depends=[bcv]; };
+  htmltools = derive { name="htmltools"; version="0.2.4"; sha256="0957n22dfbhy0fc1hnf65jghdfiv1zj0kd6x5byafv54aby0bzqy"; depends=[digest]; };
   HTMLUtils = derive { name="HTMLUtils"; version="0.1.5"; sha256="12r8x7b944lbzz3f4j6w88szq6j9gscbss3f5bzpisw33sr4wgx3"; depends=[R2HTML]; };
-  hts = derive { name="hts"; version="4.2"; sha256="12ayz90c2ajasm54j7gvmzypifgdy24d2g9b1igyhikfnvn44yk1"; depends=[forecast SparseM]; };
-  HTSCluster = derive { name="HTSCluster"; version="2.0.1"; sha256="093g7rs8kbmh7fn7kppb7a7h4zrngxajzc32dmk80dbbm7694271"; depends=[plotrix ggplot2 RColorBrewer]; };
-  HTSDiff = derive { name="HTSDiff"; version="1.0.1"; sha256="0qpnvfgd3vhmcjim0dr78lz4xxpfvx1zz4giw501n0lhghg9cqgm"; depends=[plotrix HTSCluster]; };
+  hts = derive { name="hts"; version="4.4"; sha256="1dpm669lc4khjkcs49m1nh7i61sclsqy7xbcn4mqqjhfgs7sg7sk"; depends=[forecast SparseM]; };
+  HTSCluster = derive { name="HTSCluster"; version="2.0.3"; sha256="1c3gk6q87fl7yfikpr7q6h9mp8mjm9qmzm1vxxilfl5qm9d8f92p"; depends=[plotrix ggplot2 RColorBrewer poisson_glm_mix]; };
+  HTSDiff = derive { name="HTSDiff"; version="1.0.2"; sha256="0l1shki2jkbx22l3rksdk1np9rgv40594ldn2rwhrzz6k2vz15by"; depends=[plotrix HTSCluster poisson_glm_mix]; };
   httpRequest = derive { name="httpRequest"; version="0.0.9"; sha256="1s71lpxv5n1syffckxnnxm5470b2lb2l7pikcm1r2j21j08g807f"; depends=[]; };
   httpuv = derive { name="httpuv"; version="1.3.0"; sha256="0fs2saz9g17069hkrh6r3wlzsbljv2dvq6sdlwh54dlm6skp7jm6"; depends=[Rcpp]; };
-  httr = derive { name="httr"; version="0.3"; sha256="179cw0by3szzpy9w38v03m5k7fpa3dmkmfqi3y4as4sbv3ii4g9s"; depends=[RCurl stringr digest]; };
+  httr = derive { name="httr"; version="0.4"; sha256="18ikpbjczjci8di9mwcjkm10fcl9jn40kp4i33kidrmamyryq4zq"; depends=[RCurl stringr digest jsonlite]; };
   huge = derive { name="huge"; version="1.2.6"; sha256="11njfd4i8q950apga6sdk84p4wk4qvp8bpg6yz9lgjrgj2hn14n2"; depends=[Matrix lattice igraph MASS]; };
   HUM = derive { name="HUM"; version="1.0"; sha256="1bq74l88jvscmq9ihv5wn06w2wng073ybvqb2bdx2dmiqlpv6jw2"; depends=[gtools Rcpp rgl]; };
   humanFormat = derive { name="humanFormat"; version="1.0"; sha256="0zwjbl8s5dx5d57sfmq6myc6snximc56zl88h8y1s1jqphyn9sir"; depends=[testthat]; };
@@ -2146,54 +2274,64 @@ let self = _self // overrides; _self = with self; {
   HW_pval = derive { name="HW.pval"; version="1.0"; sha256="14nmyqw2d9cmn64789yc54fmiqanh6n1dizp7vj94h7b0jwq63yy"; depends=[]; };
   hwriter = derive { name="hwriter"; version="1.3"; sha256="12hs78m2pzjhjpv43qdc3lazf5qi5w1vpzqign6qpdrhm85xgvhi"; depends=[]; };
   hwriterPlus = derive { name="hwriterPlus"; version="1.0-3"; sha256="06hq493v702hy2mv73glav4az2wphzy3lqqkxjkpjpab00xc42d5"; depends=[hwriter TeachingDemos]; };
+  HWxtest = derive { name="HWxtest"; version="1.0.3"; sha256="0qw632djkfx94d8rxgpwmbb4zwwlhgzakjj657wcd6gfi90i72ix"; depends=[]; };
   hybridEnsemble = derive { name="hybridEnsemble"; version="0.1.1"; sha256="1hn6zfz22mgxv5qpwdgmn7a9snha7hdkbbqq3xicy37j8xypsab5"; depends=[kernelFactory ada rpart ROCR nnet e1071 NMOF GenSA Rmalschains pso AUC soma genalg reportr nnls quadprog tabuSearch glmnet]; };
   hybridHclust = derive { name="hybridHclust"; version="1.0-4"; sha256="1967p6crkrbnlfghd9x1alr2x57nqjl1zh58hhyshgla3xmdmhx5"; depends=[cluster]; };
   HybridMC = derive { name="HybridMC"; version="0.2"; sha256="1wgzfyk0scwq9s2sdmc91fj7r4d7zlgwgnj6mdiia8w88ja8kzqy"; depends=[coda]; };
-  hydroApps = derive { name="hydroApps"; version="0.0-1"; sha256="1mf9kchrsnqsam2a8s0hksa4dfdrxcjijlafd0m2bca76bfdqky8"; depends=[nsRFA]; };
-  hydrogeo = derive { name="hydrogeo"; version="0.2-2"; sha256="18ybphkvrghmv1i3mkmiibz75khnc1v6cawkyn71ar557q8w4613"; depends=[]; };
+  hydroApps = derive { name="hydroApps"; version="0.1-1"; sha256="1ycv7l2ywwnx2mgklg6rry7n24jyhi4spvp1xl345yvyn9kf15dz"; depends=[nsRFA]; };
+  hydrogeo = derive { name="hydrogeo"; version="0.2-3"; sha256="1kvzpdjrzbxy4rbfhjqmxdipaamd2rjdyxjv6vfxv1ixs1bm8cwm"; depends=[]; };
   hydroGOF = derive { name="hydroGOF"; version="0.3-8"; sha256="1ljk2dk5ydsg7qdizyzkbw0b2zdhnb3x9h965d94ygzg8nw5kbak"; depends=[zoo hydroTSM xts]; };
   HydroMe = derive { name="HydroMe"; version="2.0"; sha256="1a1d3lay94mzwk8n22l650h3p133npdf4aj63zgrdw4760p54rqf"; depends=[nlme minpack_lm]; };
   hydroPSO = derive { name="hydroPSO"; version="0.3-4"; sha256="12md94g78m7m1np36sadx0wxpb149pn5gd8yj2kw7fphb8g6a218"; depends=[Hmisc sp lattice zoo lhs]; };
+  hydrostats = derive { name="hydrostats"; version="0.2"; sha256="1sp8lp4rqkq5ivlfdg26k6azmxvr8ma0ggkcj10zdl0q85j7ldj2"; depends=[]; };
   hydroTSM = derive { name="hydroTSM"; version="0.4-2-1"; sha256="0z5xw25w2fn67x2dw61msfdnp2dr2s2yi525fcjxn77339x9ksfr"; depends=[zoo xts e1071 gstat automap sp]; };
   HyperbolicDist = derive { name="HyperbolicDist"; version="0.6-2"; sha256="1wgqbx9ascyk6gw1dmvfz6hljvbh49gb9shr9qgf22qbq83waiva"; depends=[]; };
   hyperdirichlet = derive { name="hyperdirichlet"; version="1.4-9"; sha256="03c2xgfhfbpn1za84ajhvm0i5cpmfnz1makidrr2222addgyp9zx"; depends=[aylmer abind mvtnorm cubature]; };
+  hypergea = derive { name="hypergea"; version="1.0.1"; sha256="17fi0sjgyjydd327wghicpys09bpkil4840d9zv779dj9zk2slj9"; depends=[]; };
   hypergeo = derive { name="hypergeo"; version="1.2-5"; sha256="00rqyw7xc4q6lqg0vy1jkb4rc1xbdgvqsmx58n6w2006zni54ss1"; depends=[elliptic contfrac]; };
-  hyperSpec = derive { name="hyperSpec"; version="0.98-20140220"; sha256="1hyzmpbzzj09759lbfy1y0xlnsqadnpgyrpvjdbarsh4h9jqng1g"; depends=[lattice mvtnorm]; };
-  hypervolume = derive { name="hypervolume"; version="0.9.9.7"; sha256="039blwjhx77qgl0mfnz78nmidr50hxcvcwfw26n5m3jy63pi8z08"; depends=[Rcpp rgl]; };
+  hyperSpec = derive { name="hyperSpec"; version="0.98-20140523"; sha256="1ypmq5xgcjqrq9i8f08csjqffv9qfpfkvrbawlf1ds7i49h6jq28"; depends=[lattice mvtnorm]; };
+  hypervolume = derive { name="hypervolume"; version="1.0.1"; sha256="1ja3wx8k1hbcgwinbbs5m2amayj2wdmkk2kqaywrvgpm2k1f40i5"; depends=[Rcpp rgl MASS geometry igraph]; };
   HyPhy = derive { name="HyPhy"; version="1.0"; sha256="0994ymv7sswbp8qw3pay34s926cflw2hq2gnchw7rknybvlsrinq"; depends=[ape R_utils]; };
   hypothesestest = derive { name="hypothesestest"; version="1.0"; sha256="0g8sm386m1zm9i3900r62x83wb600cy8hqk7dlvbx6wcgrxg82sm"; depends=[]; };
   hypred = derive { name="hypred"; version="0.4"; sha256="08nqgw0h3zh4vyhfd1cngr6snz5n7skj3d9rg2qccz9pnjp7j1ab"; depends=[]; };
   hysteresis = derive { name="hysteresis"; version="2.0"; sha256="1g9d91djwi9k2q10zqak8fpmywnwmha1pm18g2hmwzrqrwnr6dh9"; depends=[car msm nlrwr]; };
   hzar = derive { name="hzar"; version="0.2-5"; sha256="000l4ki3hvznnhkxc5j422h5ifnsfqalv666j48yby1hsf1lc3kg"; depends=[MCMCpack foreach coda]; };
   IASD = derive { name="IASD"; version="1.0.7"; sha256="0a25sd82fxnmz3f4iaxhc69cdfb7xmh7wi79wv11sbw9cv2pl7kr"; depends=[]; };
-  IAT = derive { name="IAT"; version="0.1"; sha256="1fjx053352qrxwhcbkqslwcnrkafray8hqm9ziqyhpphbl98kwjx"; depends=[data_table ggplot2]; };
+  IAT = derive { name="IAT"; version="0.2"; sha256="0byivq2298sjvpsz5z1w7r31h6z2jqpip40z8r2alygbgwwa48pd"; depends=[data_table ggplot2]; };
   ibd = derive { name="ibd"; version="1.1"; sha256="1p7dw74qpbdalb8vq8jixjhizjl2zc8wrl28mzavw89lbragvi6k"; depends=[lpSolve MASS]; };
-  IBDhaploRtools = derive { name="IBDhaploRtools"; version="1.5"; sha256="14mp81xsjmha2zkyy57fzn41ph7m8h7z82sz1pizvgdmahmzkg87"; depends=[]; };
+  IBDhaploRtools = derive { name="IBDhaploRtools"; version="1.7"; sha256="1jg2vrs9ly7l8yidw8ppa41v657jhjcj7n27zi1f2vsh3vmjri0m"; depends=[]; };
   ibdreg = derive { name="ibdreg"; version="0.2.5"; sha256="1kaa5q1byi30wzr0mw4w2cv1ssxprzcwf91wrpqwkgcsdy7dkh2g"; depends=[]; };
-  IBDsim = derive { name="IBDsim"; version="0.9-2"; sha256="01ky69mpi404a3j8gv32ha1fbzr1f9c15a5b3lz6bg172qcxb6zs"; depends=[paramlink]; };
+  IBDsim = derive { name="IBDsim"; version="0.9-4"; sha256="0cpabz7mnhsrmjrgb23zs5anjrkhwc2005b2inl6p93l47i81fps"; depends=[paramlink]; };
+  ibeemd = derive { name="ibeemd"; version="1.0.1"; sha256="115z13q02gzixziknix2l53mi12zzg30ra9h35pv6qzrr11ra1ic"; depends=[fields deldir rgeos sp spdep]; };
   IBHM = derive { name="IBHM"; version="1.1-11"; sha256="1m0zxlybcak2v5c4spgaa39ngb2hryak4xd875jryk1dcnk9c702"; depends=[DEoptim cmaes Rcpp]; };
   Iboot = derive { name="Iboot"; version="0.1-1"; sha256="1fahh86kgv2axj2qg14n87v888sc0kb567s6zr3fh5zv361phwkq"; depends=[]; };
   ibr = derive { name="ibr"; version="1.4.5"; sha256="0nw2j232br06l30v3cn4qcr25vbh911v2mz7nfail40sqxc6wwc4"; depends=[]; };
   IBrokers = derive { name="IBrokers"; version="0.9-10"; sha256="1kpmmiar5762byy6pl8x8drpsw8as9ilbqzgqhfrvj5rd31mylz6"; depends=[xts]; };
   iBUGS = derive { name="iBUGS"; version="0.1.4"; sha256="0vsxy8pnbix0rg7ksgywx7kypqb5ngkxhldh3cisjkvdv638ybps"; depends=[R2WinBUGS gWidgetsRGtk2]; };
+  iC10 = derive { name="iC10"; version="1.0.2"; sha256="17pgm3k1zh502bvdcc86wl8fsd1mbcl6hw2rqhpy0c3bhabrixki"; depends=[pamr CONOR iC10TrainingData]; };
+  iC10TrainingData = derive { name="iC10TrainingData"; version="1.0.0"; sha256="0il8caxwinjpcf4gfimi07b7ccv5v916s2968vy2vdx6439y1rss"; depends=[]; };
   IC2 = derive { name="IC2"; version="1.0-1"; sha256="03jjb62msxjxdg9l3zd1ns0d2w37hkxy5pnjgaywxw3vfk4zwfj9"; depends=[]; };
   ic50 = derive { name="ic50"; version="1.4.2"; sha256="1a5ddmbdfr3ls132fvalbkh4yaawv9k58rgpy54s5qddrm6aas2s"; depends=[]; };
+  icamix = derive { name="icamix"; version="1.0"; sha256="1ain8fnyy4bj306zcli1c3d50sqckg88wnm0ppni0crwxvqcvvkm"; depends=[Rcpp]; };
   icaOcularCorrection = derive { name="icaOcularCorrection"; version="3.0.0"; sha256="1vmvarc2apipd0vlhprc5wpgh8i38m5myj1gqdymjrnky0azq17f"; depends=[fastICA mgcv]; };
   icapca = derive { name="icapca"; version="1.0"; sha256="1m8z5444y06wadc63zlb1x3qfgam81j78nvzzxlpxijydzh8xla8"; depends=[]; };
   ICC = derive { name="ICC"; version="2.2.1"; sha256="1xl8x8ddbrk8ma57mybmmv9m096wlpbas7hsmd2c6qzcrlz6i7wa"; depends=[]; };
+  icd9 = derive { name="icd9"; version="0.5"; sha256="128gv2yxylncmbr6b1qz82ys7aanqxf35psrmrh2i4l84w3w5l8g"; depends=[memoise]; };
   ICE = derive { name="ICE"; version="0.69"; sha256="04p8lakaha28mdh965w0ppyxfrz5ssi1n9xifvsbn3ihdra67rip"; depends=[KernSmooth]; };
   ICEbox = derive { name="ICEbox"; version="1.0"; sha256="1m3p0b93ksrcsp45m4gszcz01cwbfpj4ldar6l0q3c9lmyqsznx8"; depends=[sfsmisc]; };
   ICEinfer = derive { name="ICEinfer"; version="1.0-1"; sha256="0gjgr1r33w6d5ra0njh15lj46lw6v751yl8iqrdf4a5pazs7w3lm"; depends=[lattice]; };
-  icensmis = derive { name="icensmis"; version="1.1"; sha256="18raaylj1y753xw9x1ghsgvli4rp5npl7ca6xcicwklg2jmjwfws"; depends=[]; };
+  icensmis = derive { name="icensmis"; version="1.2.1"; sha256="1h4l9irip4hv34hr92j8756qgmy455mfdblr7ypgsgvr27cgax8h"; depends=[Rcpp]; };
   ICGE = derive { name="ICGE"; version="0.3"; sha256="0xin7zml1nbygyi08hhg3wwr2jr1zcsvrlgia89zp4xanxlzgaqa"; depends=[MASS cluster]; };
-  ic_infer = derive { name="ic.infer"; version="1.1-4"; sha256="02dsp1vmh8226mf9mx571b72nvcg0bxkll9yybynj9mbxm5db95w"; depends=[quadprog mvtnorm boot kappalab]; };
+  ic_infer = derive { name="ic.infer"; version="1.1-5"; sha256="0nmx7ijczzvrv1j4321g5g5nawzll8srf302grc39npvv1q17jyz"; depends=[quadprog mvtnorm boot kappalab]; };
   iCluster = derive { name="iCluster"; version="2.1.0"; sha256="09j36xv87d382m5ijkhmp2mxaajc4k97cf9k1hb11ksk7fxdqz6r"; depends=[lattice caTools gdata gtools gplots]; };
   icomp = derive { name="icomp"; version="0.1"; sha256="0xpjbfb9lxgsby9fj5lbb4nkl6zy8k4whqpgdqq5ndzy7zgq1lvm"; depends=[]; };
   ICS = derive { name="ICS"; version="1.2-4"; sha256="1sfm9ymrrl72jzg8gsdw6v4q20i4s2w4syyr7brlvan136khpqyn"; depends=[mvtnorm survey]; };
   ICSNP = derive { name="ICSNP"; version="1.0-9"; sha256="0kisk7wk0zjsr47hgrmz5c8f2ljsl7x4549a1rwzsfkjz8901qka"; depends=[mvtnorm ICS]; };
+  ICsurv = derive { name="ICsurv"; version="1.0"; sha256="1mbndpy3x5731c9y955wscy76jrxlgv33bf6ldqp65cwyvdgxl86"; depends=[MASS matrixcalc]; };
   idbg = derive { name="idbg"; version="1.0"; sha256="1rxmj04hswxybrg7dfib3mjy8v8mdiv13zwbscp2q55z55hhf1m5"; depends=[]; };
   identity = derive { name="identity"; version="0.2-1"; sha256="1j5wb5cj5j49in2g6r1shdm4ri4cfzj22hpqazvcmq4dm291sdi9"; depends=[]; };
   IDPmisc = derive { name="IDPmisc"; version="1.1.17"; sha256="0nbwdyg9javjjfvljwbp2jl0c6414c11zb2pirmm5pmimaq9vv0q"; depends=[lattice]; };
+  IDPSurvival = derive { name="IDPSurvival"; version="1.0"; sha256="1v1w0i74b065b4qc302xbdl5df7qx9z8jmbc9cn46fqm1hh2b6d7"; depends=[Rsolnp gtools survival]; };
   idr = derive { name="idr"; version="1.1.1"; sha256="0shwwyvc4j32grxanhyqk66aykzy5bzic2004krvzbmcb5cr1sgb"; depends=[]; };
   iDynoR = derive { name="iDynoR"; version="1.0"; sha256="01702vl10191mbq2wby1m0y6h8i6y6ic4pa83d27cg3yccsrhziz"; depends=[XML vegan]; };
   ieeeround = derive { name="ieeeround"; version="0.2-0"; sha256="0xaxrlalyn8w0w4fva8fd86306nvw3iyz44r0hvay3gsrmgn3fjh"; depends=[]; };
@@ -2201,36 +2339,38 @@ let self = _self // overrides; _self = with self; {
   iFad = derive { name="iFad"; version="3.0"; sha256="0jrl9bayihp3wb4k5w9kc71qlsdxk7vl83ydfibx2bg79c4hf3cs"; depends=[Rlab MASS coda ROCR]; };
   ifs = derive { name="ifs"; version="0.1.4"; sha256="0fzani8rnn4rdwlghq967hhi4zfjnk3gwpk3v6wys738xj7yfwp1"; depends=[]; };
   ifultools = derive { name="ifultools"; version="2.0-0"; sha256="0xgd4j09kixsv653cj5h1kyf9jfzz8nhc85xixbcpz3yn0fqbn00"; depends=[splus2R MASS]; };
-  iGasso = derive { name="iGasso"; version="1.1-1"; sha256="1j12ynh4fmhql0adk12fm5dn3f1b88ccprc7vpwj65f7jv4cx0lg"; depends=[lattice]; };
+  iGasso = derive { name="iGasso"; version="1.2"; sha256="123487slizsmw5b0imwqll8n03navx30kvawr6jfibbjfdd8vfn7"; depends=[lattice CompQuadForm]; };
   IgorR = derive { name="IgorR"; version="0.7.1"; sha256="1ahj1ckzjffsskicdy2b70pzx5cn2r0s22yg1ajwiyy4ykwcg4pk"; depends=[bitops]; };
   igraph = derive { name="igraph"; version="0.7.1"; sha256="1nvb30zjjw861idbd8zap9qqg22k87zdi6qqvjf1s29v7hkx7kq7"; depends=[Matrix]; };
   igraphdata = derive { name="igraphdata"; version="0.2"; sha256="0hm757fc2snqlav3wx1vdmwy2gr5cskig97c2zlvk88sfwgx4i2m"; depends=[]; };
   igraphtosonia = derive { name="igraphtosonia"; version="1.0"; sha256="0vy9jnpjp68l8s0hi1l57j9p41c543h3iqv16pwl550f38zqp8j6"; depends=[igraph]; };
   IM = derive { name="IM"; version="1.0"; sha256="1f1vr5zfqnanc5xmmlfkjkvxwbyyysi3mcvkg95p8r687a7zl0cx"; depends=[png jpeg bmp]; };
   Imap = derive { name="Imap"; version="1.32"; sha256="0b4w0mw9ljw6zxwvi0qzb08yq9n169lzgkdcwizrd07x9k9xjxs7"; depends=[]; };
-  imguR = derive { name="imguR"; version="0.1.5"; sha256="052381fppz81bdc0sxnqpl9s9hzsgv675mnpgyw673chp05hi5ix"; depends=[XML RCurl httr]; };
+  imguR = derive { name="imguR"; version="1.0.0"; sha256="0yhlir0qxi6hjmqlmmklwd4vkymc5bzv9id9dlis1fr1f8a64vwp"; depends=[RCurl httr png jpeg]; };
   IMIS = derive { name="IMIS"; version="0.1"; sha256="09zb48vdj0i3vf8vxrs07xwb9ji27vp2fyvmg6jfq631licsryc2"; depends=[mvtnorm]; };
   ImpactIV = derive { name="ImpactIV"; version="1.0"; sha256="1bb6gw1h15hscr71hy779k2x5ywzx63ylim3hby02d7fnnj46p58"; depends=[nnet]; };
   imprProbEst = derive { name="imprProbEst"; version="1.0.1"; sha256="09y8yd9sw0b79ca45ryi7p82vy5s8cx0gg603rlc39lgwcdv45i3"; depends=[inline lpSolve]; };
+  imputeLCMD = derive { name="imputeLCMD"; version="1.0"; sha256="0avgl8wwwsz27z439y415lv4h33af58db084mjr236y1z9sfhdyw"; depends=[tmvtnorm norm]; };
   imputeMDR = derive { name="imputeMDR"; version="1.1.2"; sha256="0ds5a4wav9vb9z5nji8hv5l76310rd970xf702fd0ckx1sh6rgd7"; depends=[]; };
+  imputeR = derive { name="imputeR"; version="1.0.0"; sha256="18rx70w7xb33m84ifxl3p599js78pa748c9lmlkic6yqrgsabcip"; depends=[caret reshape2 glmnet pls rda Cubist ridge gbm mboost rpart]; };
   imputeYn = derive { name="imputeYn"; version="1.1"; sha256="12hdx7bwpm4jickpbj7cswjsl6f772ibzaf3d79q24n24ymw576h"; depends=[quadprog emplik mvtnorm]; };
   in2extRemes = derive { name="in2extRemes"; version="1.0-1"; sha256="0k5qczs54b7bl71my8xmnqly91g7c5skj0lm2g8dk4hgrx6wwsrf"; depends=[extRemes]; };
   inarmix = derive { name="inarmix"; version="0.4"; sha256="11a1vaxq22d5lab07jp5pw0znkaqj6bmkn6vsx62y6m4mmqk04yr"; depends=[Matrix Rcpp]; };
   incReg = derive { name="incReg"; version="1.0"; sha256="1kckx64hn8g9wvjg7g9xild5hclim1rs7z2m7rgmbdwlbayxpwgv"; depends=[car]; };
   IndependenceTests = derive { name="IndependenceTests"; version="0.2"; sha256="04qfh2mg9xkfnvp6k7w1ip4rb663p3pzww9lyprcjvr3hcac7gqa"; depends=[xtable]; };
-  indicspecies = derive { name="indicspecies"; version="1.7.1"; sha256="11z166qaywpdplx4b73wsziygi41dbmk05gjnl4wdim7iv6im9ps"; depends=[permute]; };
-  ineq = derive { name="ineq"; version="0.2-11"; sha256="1vadgqcl8wqhryfwdn5ih7bxc6c1xqpkfyxv72xzfzs10wws9v3l"; depends=[]; };
+  indicspecies = derive { name="indicspecies"; version="1.7.2"; sha256="1spf70a42kc5yg62zi9a2dvdyh5npc67bcln4zqcg7dyachw3f2n"; depends=[permute sp rgeos]; };
+  ineq = derive { name="ineq"; version="0.2-13"; sha256="09fsxyrh0j7mwmb5hkhmrzgcy7kf85jxkh7zlwpgqgcsyl1n91z0"; depends=[]; };
   InfDim = derive { name="InfDim"; version="1.0"; sha256="0rh3ch0m015xjkxy08vf9pc6q7azjc6sgicd2j6cwh611pqq39wq"; depends=[]; };
   inference = derive { name="inference"; version="0.1.0"; sha256="0j92isfkbhk13yx2hd3a5dd7ikcbgjc04zisd1n5kmg6ajw2aj6r"; depends=[sandwich]; };
   InferenceSMR = derive { name="InferenceSMR"; version="1.0"; sha256="13d3v8kyk6br33659jgql6j1nqmnd8zszqrwfw2x3khkiqzgdmhk"; depends=[survival]; };
   inflection = derive { name="inflection"; version="1.1"; sha256="1nb1pf07c371vwgplfyjs3q1iqgb5hyk9czxqrjiy18g8p7zdln2"; depends=[]; };
   influence_ME = derive { name="influence.ME"; version="0.9-4"; sha256="1smvhr72vnds20x71986idk6rak69g28dddlf9g2ivg0ajkji5q9"; depends=[lme4 Matrix lattice]; };
-  influence_SEM = derive { name="influence.SEM"; version="1.2"; sha256="066h8zhqbai07yg9p3js9m2a1ya050kp4inbfhwc3b8gwpajg9h1"; depends=[lavaan]; };
+  influence_SEM = derive { name="influence.SEM"; version="1.4"; sha256="1grsnp8xwmhh9qx0yc5fy8b3g4i4cfqbg6sfzbmn39si2z34wrxw"; depends=[lavaan]; };
   infoDecompuTE = derive { name="infoDecompuTE"; version="0.5.1"; sha256="1aigd1fvpdqjplq1s1js0sy8px68q73lbp5q591rn52c77smdhaj"; depends=[MASS]; };
   informR = derive { name="informR"; version="1.0.04"; sha256="0s40hlilk8fjld2m43f2m50a3764qgnv07y5jwv60a8d0nf4gpa2"; depends=[abind relevent]; };
-  infotheo = derive { name="infotheo"; version="1.1.1"; sha256="12c16r2v5bn4dxwcihqiicw2j13ar971478qc3n109f5mxxmxywq"; depends=[]; };
+  infotheo = derive { name="infotheo"; version="1.2.0"; sha256="18xacczfq3z3xpy434js4nf3l19lczngzd0lq26wh22pvg1yniwv"; depends=[]; };
   infutil = derive { name="infutil"; version="1.0"; sha256="02d0hfbkdqjj0lm1fzwwxy60831kbcjn2m4rfblpib0krkbpz72n"; depends=[ltm]; };
-  INLABMA = derive { name="INLABMA"; version="0.1-4"; sha256="18a5hz7yvw6xikv7qn6r8whmxsr7q10fywj65rnz2rw1f2rdhq5q"; depends=[Matrix spdep]; };
+  INLABMA = derive { name="INLABMA"; version="0.1-5"; sha256="1z5mwibgrc0hrwjq70pm49l5ppcwwm5z4slc1madr291w37awi51"; depends=[Matrix spdep]; };
   inline = derive { name="inline"; version="0.3.13"; sha256="1dijlcnm7wfd6jgy6wsj6imwg43f91cl7iiz5j2jhhavw2pczr62"; depends=[]; };
   inlinedocs = derive { name="inlinedocs"; version="2013.9.3"; sha256="13vk6v9723wlfv1z5fxmvxfqhaj68h0x3s2qq9j6ickr4wakb4ar"; depends=[]; };
   InPosition = derive { name="InPosition"; version="0.12.7"; sha256="1f7xb2kxikmja4cq7s1aiwhdq27zc6hghjbliqqpm8ci8860lb8p"; depends=[prettyGraphs ExPosition]; };
@@ -2240,35 +2380,40 @@ let self = _self // overrides; _self = with self; {
   intamapInteractive = derive { name="intamapInteractive"; version="1.1-10"; sha256="073k6sdds40fmlbw1xnp3x5sc9qdyq2s1bhp7av4jjm930hsvsrn"; depends=[intamap spcosa spatstat automap gstat]; };
   intcox = derive { name="intcox"; version="0.9.3"; sha256="1m1lzmymh2pk570k6nxq3nj7wxkvs1s3nvz8cb456fnv72ng8fap"; depends=[survival]; };
   integrOmics = derive { name="integrOmics"; version="2.55"; sha256="1c9vkhvnndhs3h9qzcg3pvizjk9rhgk8gccaxh33spgr4rql8vcw"; depends=[]; };
-  Interact = derive { name="Interact"; version="1.0"; sha256="14mxqbr2ivwihnpbwmb9xf70p0svp4bi7l9v1c45vr1x9lyqkxgd"; depends=[]; };
+  Interact = derive { name="Interact"; version="1.1"; sha256="1g9zhafdpr7j410bi8p03d8x9f8m3n329x8v01yk15f65fp7pl1d"; depends=[]; };
   InteractiveIGraph = derive { name="InteractiveIGraph"; version="1.0.6.1"; sha256="0srxlp77xqq0vw2phfv7zcnqswi2i5nzkpqbpa5limqx00jd12zy"; depends=[igraph]; };
+  interAdapt = derive { name="interAdapt"; version="0.1"; sha256="06ki36l1mrnd9lbm696a6gapr488dz8na4wvl9y1fif9hfv4zk25"; depends=[shiny knitcitations RCurl mvtnorm knitr]; };
   intergraph = derive { name="intergraph"; version="2.0-0"; sha256="0y5cd7y08p86fxm4zqraj81sj5a5h7725wvzcyxd8p1q3ky2sj9f"; depends=[network igraph]; };
   Interpol = derive { name="Interpol"; version="1.3.1"; sha256="1598lnnrcxihxysdljphqxig15fd8z7linw9byjmqypwcpk6r5jn"; depends=[]; };
   Interpol_T = derive { name="Interpol.T"; version="2.1.1"; sha256="1fbsl1ypkc65y6c0p32gpi2a2aal8jg02mclz7ri57hf4c1k09gz"; depends=[date chron]; };
-  InterVA4 = derive { name="InterVA4"; version="1.2"; sha256="0ic78i7vnvb6c3iz1gv6k69q9n0894rzy26df0zd0gd55hral1fx"; depends=[]; };
+  InterVA4 = derive { name="InterVA4"; version="1.4"; sha256="06yq0zfpakw4ifg8i5jazsbh6k62ksnpw7b02kyc2phi67gvj84k"; depends=[]; };
   interval = derive { name="interval"; version="1.1-0.1"; sha256="1lln9jkli28i4wivwzqrsxvv2n15560f7msjy5gssrm45vxrxms8"; depends=[survival perm MLEcens]; };
   intervals = derive { name="intervals"; version="0.14.0"; sha256="0hqifkb8pbx0v42z3s78nm38b3ixi0vycq8kba4mv3w8v7zcfbxb"; depends=[]; };
-  interventionalDBN = derive { name="interventionalDBN"; version="1.2"; sha256="0byqpfn2dv045f0kd36kci4amg6vivsilapxx8r513yl9diz3vy2"; depends=[]; };
+  interventionalDBN = derive { name="interventionalDBN"; version="1.2.2"; sha256="0wpp4bfi22ncvl0vdivniwwvcqgnpifpgxb4g5jbyvr0z735cd9w"; depends=[]; };
   IntLik = derive { name="IntLik"; version="1.0"; sha256="13ww5bsbf1vnpaip0w53rw99a8hxzziibj7j66cm31jmi8l6fznf"; depends=[maxLik]; };
   intpoint = derive { name="intpoint"; version="1.0"; sha256="0zcv64a0clgf1k3ylh97q1w5ddrv227846gy9a68h6sgwc0ps88b"; depends=[]; };
+  inTrees = derive { name="inTrees"; version="1.1"; sha256="1b88zy4rarcx1qxzv3089gzdz1smga6ssj8cxxccyyzci6px85j1"; depends=[RRF arules gbm xtable]; };
   intReg = derive { name="intReg"; version="0.1-2"; sha256="1sm7v4fnfsdhyqr3q8dms0ifwb00hzf3x1g0fpm7xldlqc3wf6pr"; depends=[maxLik sets sets]; };
   intRegGOF = derive { name="intRegGOF"; version="0.85-1"; sha256="0fyvhl6jmi6krfbimsq61dhixlz9h9jxk4yjvwbx2vl8d9fnnr54"; depends=[]; };
   introgress = derive { name="introgress"; version="1.2.3"; sha256="1j527gf7pmfy5365p2j2jbxq0fb0xh2992hj4d7dxapn4psgmvsk"; depends=[nnet genetics RColorBrewer]; };
   intsvy = derive { name="intsvy"; version="1.3"; sha256="0743kn95njgv31yhl21h35k9fv78czdw3w669wsvzf35gasxak3y"; depends=[memisc foreign plyr]; };
-  investr = derive { name="investr"; version="1.0.1"; sha256="1j598kirf21mcwjy6m48nif8f92aawl9dkpbvp19xbbkxz6jrxfj"; depends=[]; };
+  InventorymodelPackage = derive { name="InventorymodelPackage"; version="1.0.2"; sha256="1w35idsagl9v93ci3qmal3xbf11sy6h1k7xnv25c59ivfnpjpkva"; depends=[e1071]; };
+  investr = derive { name="investr"; version="1.1.0"; sha256="1r01dk2xkg2j56xig7yrczbks2kllcszwdj9ih3xxxk16hgb1cgd"; depends=[]; };
   invGauss = derive { name="invGauss"; version="1.1"; sha256="0l93pk2sh74dd6a6f3970nval5p29sz47ynzqnphx0wl3yfmmg9c"; depends=[survival optimx]; };
+  io = derive { name="io"; version="0.1"; sha256="1yvyxp45y1v1lrksga5gfjqb2w509l3v817830ya5f740h517l74"; depends=[]; };
   ipdmeta = derive { name="ipdmeta"; version="2.4"; sha256="0k9wqpmrvqdh73brmdzv86a2dbyddjyyyqzqgp1vqb3k48k009s2"; depends=[nlme]; };
+  ipdw = derive { name="ipdw"; version="0.2-1"; sha256="18qvw635dy9ddz16nn0j4s0n97nbyw7yb4a8v1m0f5v9prggj7py"; depends=[gdistance raster]; };
   ipfp = derive { name="ipfp"; version="1.0"; sha256="1hpfbgygnpnl3fpx7zl728jyw00y3kbbc5f0d407phm56sfqmqwi"; depends=[]; };
   iplots = derive { name="iplots"; version="1.1-7"; sha256="052n8jdhj8gy72xlr23dwd5gqycqnph7s1djg1cdx2f05iy693y6"; depends=[rJava png]; };
   IPMpack = derive { name="IPMpack"; version="2.1"; sha256="08b79g5a9maxnxladvc2x2dgcmm427i8p6hhgda3mw2h5qmch2q3"; depends=[Matrix MASS nlme]; };
   ipred = derive { name="ipred"; version="0.9-3"; sha256="07mw1mdlczlpy232n2sacwncdjcsn6mv7rrzk9xvl2g85pn3bhjl"; depends=[rpart MASS survival nnet class prodlim]; };
   IPSUR = derive { name="IPSUR"; version="1.5"; sha256="0brh3dx7m1rilvr1ig6vbi7p13bfbblgvs8fc114f08d90fczwnq"; depends=[]; };
-  ipw = derive { name="ipw"; version="1.0-10"; sha256="15wpjfkvlfhpwsvb5hbp8f5cp0zr20f6c0iym39api71ahn14ma0"; depends=[boot geepack MASS nlme nnet survey survival]; };
   IQCC = derive { name="IQCC"; version="0.6"; sha256="0gsnkdl4cfxzq6pm9g4i1g23mxg108j3is4x69id1xn2plf92m04"; depends=[qcc MASS micEcon miscTools]; };
   iqLearn = derive { name="iqLearn"; version="1.2"; sha256="160nl63bxr9ira7v89ags9fm7zd5v09h1820i8bq5wxxfcyjarja"; depends=[]; };
-  irace = derive { name="irace"; version="1.04"; sha256="00ckh02i9hrzccv7pfpkg2cmvk2spcv6xamyilgwi6f9rkx43164"; depends=[]; };
+  irace = derive { name="irace"; version="1.05"; sha256="0192i7mv9yibvjv140iapa4qjqyv87kdw76csmwsjlgs3yrr228h"; depends=[]; };
   iRefR = derive { name="iRefR"; version="1.13"; sha256="17kjfga62xc4s1kii5clxszbag2dr1dyxfm7jasr20prx28ya6pp"; depends=[igraph]; };
   iRegression = derive { name="iRegression"; version="1.2"; sha256="1fn25xnrvgx2ayhss136rxn1h3c9pvq2gmb5kbp92vsf07klvh6v"; depends=[mgcv]; };
+  iRepro = derive { name="iRepro"; version="1.0"; sha256="1knncn47pl411r31z1r5ipsiyagcpjbc2gb972n7l3539pcpf0zy"; depends=[]; };
   irlba = derive { name="irlba"; version="1.0.3"; sha256="1h2ymk9hg9xj2075w715742j23jl7kqa4cgzl1jvr48gcysq5byy"; depends=[Matrix]; };
   irr = derive { name="irr"; version="0.84"; sha256="0njxackqj8hyf9j1yszwxbnaxgp27fc2bwyyf7dip72wc12f81n5"; depends=[lpSolve]; };
   irtoys = derive { name="irtoys"; version="0.1.7"; sha256="11nz675haigs6vg08qjibs8yccy2pbz0b9r8761fs8gw3n7bpfz4"; depends=[sm ltm]; };
@@ -2280,11 +2425,12 @@ let self = _self // overrides; _self = with self; {
   isdals = derive { name="isdals"; version="2.0-1"; sha256="0r4dwfz18aai38wg213pn3gny9sh42nm19p6swxmzrkrigiwy4qa"; depends=[]; };
   ISDA_R = derive { name="ISDA.R"; version="1.0"; sha256="0w6p2iy6s7fy8pw2cf4b5zhqcgjjwd5bkax1aqflaaj4ppmfx64v"; depends=[scatterplot3d]; };
   IsingFit = derive { name="IsingFit"; version="0.2.0"; sha256="03858wnz9si8r9qlwg5hx0xai4kfn6nnh0mfmias6f5wkgjj0niv"; depends=[qgraph Matrix glmnet]; };
-  isingLenzMC = derive { name="isingLenzMC"; version="0.1.1"; sha256="1bm2pdq2pi3c2fgyzsp20yv68zn0hyfxhnr2133vnxvrym4is0z3"; depends=[]; };
+  isingLenzMC = derive { name="isingLenzMC"; version="0.2.1"; sha256="1g1rz8p9vw2jnx6qw9mb614fpkv5bd7cndwcz0mva33y5shhnibl"; depends=[]; };
   IsingSampler = derive { name="IsingSampler"; version="0.1.1"; sha256="068fy16fw2ja25mllyw4z3bn17pxdq17zg75zwlwmljds6psa1gk"; depends=[Rcpp plyr]; };
   ISLR = derive { name="ISLR"; version="1.0"; sha256="0gmhvsivhpq3x8a240lgcbv1qzdgf6wxms4svak1501clc87xc6x"; depends=[]; };
   ismev = derive { name="ismev"; version="1.39"; sha256="0z5pam5lq72jv13gy40l35nvpk5hfcg3sq14mwhjqd129670gjbv"; depends=[mgcv]; };
   Iso = derive { name="Iso"; version="0.0-15"; sha256="18ig772xxsbj1vhrv7b20hrglnnz742s1mjzhwx02bpjhica4a46"; depends=[]; };
+  IsoCI = derive { name="IsoCI"; version="1.1"; sha256="0r7ksfic6p2v95c953s4gbzzclk4ldxysm8szb8xba1w0nx2izil"; depends=[KernSmooth]; };
   isocir = derive { name="isocir"; version="1.1-3"; sha256="1bx68n9wyfs2dcgph66rsy0jw8hjkl5kw212l0563kz3m1nik9sr"; depends=[circular combinat]; };
   ISOcodes = derive { name="ISOcodes"; version="2014.03.24"; sha256="0a6ap9a5h88c6iqzlqfalcg1fwm9x7rm3c8z9vwxfw6jrjs6v2cp"; depends=[]; };
   IsoGene = derive { name="IsoGene"; version="1.0-22"; sha256="097xxgqdk2j7y22qflrgss9pgbyg01rcw5088b43pbv3sc85fqcs"; depends=[Iso xtable ff]; };
@@ -2299,19 +2445,21 @@ let self = _self // overrides; _self = with self; {
   iteRates = derive { name="iteRates"; version="3.1"; sha256="1dycmlm3vldc60wz2jjdfbla14383911zfahgal5mx8whxwq95c5"; depends=[partitions VGAM MASS ape apTreeshape geiger gtools]; };
   iterators = derive { name="iterators"; version="1.0.7"; sha256="1zwqawhcpi95fx4qqj4cy31v5qln2z503f7cvv9v5ch3ard4xxqv"; depends=[]; };
   iterLap = derive { name="iterLap"; version="1.1-2"; sha256="0ixh9aw115496ib0iswfsj97rjcd2f02z116dg57vl9hhzh28f13"; depends=[quadprog randtoolbox]; };
-  iterpc = derive { name="iterpc"; version="0.2.3"; sha256="1ynablx06hqhryp0ibzl4f7slk1n15krym6mmki0x42scdgr6m4f"; depends=[Rcpp polynom]; };
+  iterpc = derive { name="iterpc"; version="0.2.5"; sha256="1sqb4d3whljmvbik9a0xc1chna8jbshpidzb2xjxsm0h66lavxki"; depends=[Rcpp polynom]; };
   itertools = derive { name="itertools"; version="0.1-3"; sha256="1ls5biiva10pb1dj3ph4griykb9vam02hkrdmlr5a5wf660hg6xn"; depends=[iterators]; };
+  itertools2 = derive { name="itertools2"; version="0.1.1"; sha256="0yra3x9ddvn5pp3jibm69205zazv81bz0cflw4mdvxpqadaf9f96"; depends=[iterators]; };
   itree = derive { name="itree"; version="0.1"; sha256="164zgr142hcp9plnbccs6m823p4m0prk73bvp54bc7bqnqmc3d9a"; depends=[]; };
   its = derive { name="its"; version="1.1.8"; sha256="1g9qmdrw7qiw0xiryf7bf5m9prrba7r11jyzprzdglc1akizav8a"; depends=[Hmisc]; };
   itsmr = derive { name="itsmr"; version="1.5"; sha256="0l9m5is6d6pkpfkihx0jir5iv8zmqqav8vh9bkkpqv5iz61p4kxb"; depends=[]; };
   IUPS = derive { name="IUPS"; version="1.0"; sha256="01pv03ink668fi2vxqybli0kgva13gxhqfdxkwz6qk5rnpzwvf5w"; depends=[R2jags Matching boot]; };
   ivbma = derive { name="ivbma"; version="1.02"; sha256="0ay7ghrygllpgh7cagrk1f56hxw1s1wfv4bap78javiyj6jgwfzy"; depends=[]; };
   ivfixed = derive { name="ivfixed"; version="1.0"; sha256="0a26zrkvz0ffq4zxdx5vhr1nvsi9c15s6gvc1zy2pddjz31x2xi5"; depends=[Formula]; };
-  ivivc = derive { name="ivivc"; version="0.1.9"; sha256="0m992snhvjbw9crigvksajpdj7rqyxx20nx72z0irc2vvfsynlnb"; depends=[deSolve reshape sciplot png]; };
+  ivivc = derive { name="ivivc"; version="0.2.0"; sha256="0dsmdhy8iv96xvlm734vh16gva10gh9dij9vqlnj6l782cffs04w"; depends=[reshape sciplot png deSolve minpack_lm]; };
+  ivlewbel = derive { name="ivlewbel"; version="1.1"; sha256="0ykcfikm2i28s3fm6zzx8cjvpwhksg8an0rfr0b35gf7p69brgag"; depends=[gmm plyr lmtest]; };
   ivpack = derive { name="ivpack"; version="1.1"; sha256="058g73n3gbpwdav4n78n1wfskfp518wkk220a55x5h82i77a5n6a"; depends=[AER sandwich lmtest]; };
   iWeigReg = derive { name="iWeigReg"; version="1.0"; sha256="09ajbqllr4ajmpk8qs6qw019fx8a7vsabm37867zycssn77z9nc8"; depends=[MASS trust]; };
   iwtp = derive { name="iwtp"; version="1.0.0"; sha256="1q3nrp526kzkz74vjxvzm6dgdwlsmx7n034a06sqw210z9mqw3dr"; depends=[survival]; };
-  jaatha = derive { name="jaatha"; version="2.3"; sha256="0xjcl2man8aal6zlzjga75znbh0y9a7sbgqa0425nsl2h6mzal8v"; depends=[foreach phyclust Rcpp plyr]; };
+  jaatha = derive { name="jaatha"; version="2.5"; sha256="06p04lbxkxg3lbs5idg27iknhkz5j6mcv1mjd4bnxpfcmhhcl4k3"; depends=[phyclust Rcpp reshape2]; };
   jackknifeKME = derive { name="jackknifeKME"; version="1.0"; sha256="1vkxp6z4fb73azndk6iis2ckv3ch5c5lrpf5x4ah56z3wd785v9v"; depends=[imputeYn survival]; };
   jackstraw = derive { name="jackstraw"; version="1.0"; sha256="1irfzivy7c9fb2pr98flx05s5hkk6sid1hkd5b3k9m9mgs6ixbfy"; depends=[corpcor]; };
   JADE = derive { name="JADE"; version="1.9-91"; sha256="142a7cq2rpl746m1lcsr5da50zhc0zddxzc8dxddc87qszf920jw"; depends=[clue]; };
@@ -2320,10 +2468,8 @@ let self = _self // overrides; _self = with self; {
   JBTools = derive { name="JBTools"; version="0.7.2.6"; sha256="1wpkv8841kzpw2iqacp6k0y182lsvfl1ri54aq1hg4ypb51b8ibb"; depends=[foreach gplots colorspace plotrix]; };
   JGL = derive { name="JGL"; version="2.3"; sha256="1351iq547ln06nklrgx192dqlfnn03hkwj3hrliqzfbmsls098qc"; depends=[igraph]; };
   JGR = derive { name="JGR"; version="1.7-16"; sha256="0iv659mjsv7apzpzvmq23w514h6yq50hi70ym7jrv948qrzh64pg"; depends=[rJava JavaGD iplots]; };
-  JJcorr = derive { name="JJcorr"; version="0.01"; sha256="1mbzmzrja8a086z0hqibk2l9b3sa0481mjjz014hb0bjlavgfkv3"; depends=[fCopulae mvtnorm]; };
   JM = derive { name="JM"; version="1.3-0"; sha256="0yn33dvy9kp7xaxlqk11f86qaichdcxpmq04gpnbcs8w8cdjjz3m"; depends=[MASS nlme survival]; };
-  JMbayes = derive { name="JMbayes"; version="0.6-0"; sha256="0p2jsxky7fg1lax5s5555mqybalc6gm7v6rwwfrl2v3j5hm18b0i"; depends=[MASS nlme survival]; };
-  jmec = derive { name="jmec"; version="1.0-4"; sha256="125scv3wxkdrnqqhsp4lziiqrkk1pvs4gjl96jh71h1w7sv8mb5f"; depends=[nlme survival]; };
+  JMbayes = derive { name="JMbayes"; version="0.6-1"; sha256="1zshy4v7jj3r1vcp9yrw1jj5abmc8wkglsxdb5v6rpmk4xwhvvcq"; depends=[MASS nlme survival]; };
   Jmisc = derive { name="Jmisc"; version="0.3.1"; sha256="1szn29dng54l2xmrm6pg3d5rmwdc1ks23vsnsmplnr5rx7yj002s"; depends=[]; };
   Johnson = derive { name="Johnson"; version="1.4"; sha256="12ajcfz5mwxvimv8nq683a2x3590gz0gnyviviyzf5x066a4q0lj"; depends=[]; };
   JohnsonDistribution = derive { name="JohnsonDistribution"; version="0.24"; sha256="00211pa2wn4bsfj6wfl9q9g123cp8iz3kxc17pw9q65j9an4sr0m"; depends=[]; };
@@ -2335,40 +2481,40 @@ let self = _self // overrides; _self = with self; {
   JoSAE = derive { name="JoSAE"; version="0.2.2"; sha256="1ag4qg9cfcg8i2xz79bza2qlw3azw33h7k2ip5nlfkfpd33l9w05"; depends=[nlme]; };
   jpeg = derive { name="jpeg"; version="0.1-8"; sha256="05hawv5qcb82ljc1l2nchx1wah8mq2k2kfkhpzyww554ngzbwcnh"; depends=[]; };
   JPSurv = derive { name="JPSurv"; version="1.0.1"; sha256="11hfji0nyfmw1d7y2cijpp7ivlv5s9k8g771kmgwy14wflkyf7g2"; depends=[]; };
-  jsonlite = derive { name="jsonlite"; version="0.9.7"; sha256="1c66j35fxxj9llnh16j3s4wa6axhbb4m0v1lhzc2j0pb56qg5020"; depends=[]; };
+  jSonarR = derive { name="jSonarR"; version="1.0"; sha256="1369v79y2679p1c1s6pfi0zdj21zbbln3a4gqsxivx82m0lwqprp"; depends=[RCurl]; };
+  jsonlite = derive { name="jsonlite"; version="0.9.10"; sha256="0w49mv4fabzgc86gv2jn9apwf9k6bk1s1p3mjmaxpmw95wgjpc9r"; depends=[]; };
   jtrans = derive { name="jtrans"; version="0.1"; sha256="1wcrjyifsnpk9jfmwc1cx30qp5vavwl87i0avbbls8cmji7z0nay"; depends=[]; };
   JudgeIt = derive { name="JudgeIt"; version="1.5.1"; sha256="1jssz1x9gw9hjpqlqbvlxa99icl8gffzl6qya0cnaxr50p82hdag"; depends=[]; };
   Julia = derive { name="Julia"; version="1.0"; sha256="0df72mjkfsaz7wbrg3l6fcypwm59hdxxndjv1b833xa4qpq5301g"; depends=[]; };
-  jvmr = derive { name="jvmr"; version="1.0.4"; sha256="14sbkj1ssxgf9ka6qnhqkf4ry9n0n5v07a8q112zvq0766rs3rrr"; depends=[rJava]; };
+  jvmr = derive { name="jvmr"; version="2.11.1.1"; sha256="18hb0pwyrgnrs16w4hl44i401604qfj0hwv2fggm8s21qxb35x9x"; depends=[rJava]; };
   KANT = derive { name="KANT"; version="1.0"; sha256="0k5i1fwbmc1cg9p2zi94npkdn12lm92d7y8ncqnn64dr8ypxh2h5"; depends=[]; };
   KappaGUI = derive { name="KappaGUI"; version="1.1"; sha256="1fyx23i6j18q6swazwy2l70lg2933akh4d0k6dzvfjxrai7fvi7y"; depends=[irr]; };
   kappalab = derive { name="kappalab"; version="0.4-6"; sha256="0dmzy0d7azzfpnzbf8b7a6zgmmfwzfiybz8610asajyfsj36gszl"; depends=[lpSolve quadprog kernlab]; };
   kappaSize = derive { name="kappaSize"; version="1.1"; sha256="0jrjal8cvy2yg0qiyilmv3jl3ib5k9jg8gp2533kdsx4m0sack04"; depends=[]; };
-  KappaV = derive { name="KappaV"; version="0.2"; sha256="05qwf083jn05qpbsmnfbp3kglsrlgl136rj4rb3nprcxzbgb8b0r"; depends=[maptools sp rgeos PresenceAbsence]; };
+  KappaV = derive { name="KappaV"; version="0.3"; sha256="13mmfb8ijpgvzfj20andqb662950lp9g25k5b26r5ba65p7nhva7"; depends=[PresenceAbsence maptools rgeos sp]; };
   kaps = derive { name="kaps"; version="1.0-0"; sha256="19dwvlvpm8naisch2c8265rm178jixc6klqf7ilsrz6wi5r119x5"; depends=[survival Formula coin]; };
   KATforDCEMRI = derive { name="KATforDCEMRI"; version="0.740"; sha256="1k8fihd9m26k14rvc5d5x0d9xc3mh8d49hs64p55np1acqfhg2sy"; depends=[locfit R_matlab matlab]; };
   kcirt = derive { name="kcirt"; version="0.6.0"; sha256="1gm3c89i5dq7lj8khc12v30j1c0l1gwb4kv24cyy1yw6wg40sjig"; depends=[mvtnorm snowfall corpcor]; };
-  kdetrees = derive { name="kdetrees"; version="0.1.3"; sha256="1lh6dkayyhwmas8fnfl9qxv5zihyimm02v2hizgcw7mk7lmjqr79"; depends=[ape distory ggplot2]; };
+  kdetrees = derive { name="kdetrees"; version="0.1.5"; sha256="1plf2yp2vl3r5znp5j92l6hx1kgj0pzs7ffqgvz2nap5nf1c6rdg"; depends=[ape distory ggplot2]; };
   kedd = derive { name="kedd"; version="1.0.0"; sha256="1llc8hqbrp1r75b28z889nik047y400g2h05a7cjaq0r2qxbcqx1"; depends=[]; };
   kelvin = derive { name="kelvin"; version="1.2-2"; sha256="0fl2yxc0dpmkhq3f7711gd08i7jlzlfncin1d6q251dfnmwd7rzf"; depends=[Bessel]; };
   Kendall = derive { name="Kendall"; version="2.2"; sha256="0z2yr3x2nvdm81w2imb61hxwcbmg14kfb2bxgh3wmkmv3wfjwkwn"; depends=[boot]; };
-  kequate = derive { name="kequate"; version="1.3.2"; sha256="1sgdxkkgqpzi61c5y0slflvsvf0hr39plq0g5v7jbdbjrgqdyadv"; depends=[ltm]; };
+  kequate = derive { name="kequate"; version="1.4.0"; sha256="0vr45y4f6x3080pf3k53nifavf8mfhikz54nis66c53fs9rp0jwf"; depends=[ltm equateIRT]; };
   kerdiest = derive { name="kerdiest"; version="1.2"; sha256="16xj2br520ls8vw5qksxq9hqlpxlwmxccfk5balwgk5n2yhjs6r3"; depends=[date chron evir]; };
   kernelFactory = derive { name="kernelFactory"; version="0.2.0"; sha256="1ihghqrrndgif6kh6n0f4g3bfy5miskn3mk5ynxfcnnrfvp9h3xj"; depends=[randomForest AUC genalg kernlab]; };
-  kernelPop = derive { name="kernelPop"; version="1.0.2"; sha256="04p0q1bnabjswr8xnm91gbglaiqf2jqqyjp8vjak89k92cq3ryfw"; depends=[ape ade4 MASS]; };
   kernlab = derive { name="kernlab"; version="0.9-19"; sha256="0caqp5dp1irhwpq8lyram35r8x16qlfp6f5wzqyi5rzcz27d03sg"; depends=[]; };
   KernSmooth = derive { name="KernSmooth"; version="2.23-12"; sha256="0jlpfaf8wqa9hq7scdmgfhkvr5hi61di54slkzskg0pr7c28rlqh"; depends=[]; };
-  KernSmoothIRT = derive { name="KernSmoothIRT"; version="6.0"; sha256="09ypvyb59hz5jhf4n225y2k75xa6vw4k0ra3ql38y78aig55drry"; depends=[Rcpp plotrix rgl]; };
-  KFAS = derive { name="KFAS"; version="1.0.3"; sha256="09adqacq4r6s2ba7879s2g09wbxzgcnavxkr9pmmirsl0zvqd8vy"; depends=[]; };
-  KFKSDS = derive { name="KFKSDS"; version="1.3"; sha256="19ypaz75cl5il65klwmahkj56qy403lwfisrb6qkmprx2zwz2pil"; depends=[]; };
+  KernSmoothIRT = derive { name="KernSmoothIRT"; version="6.1"; sha256="1hq4sykddh9sg24qrnccii89nqxmq7hnldhn8wl6y62aj0h1nrqm"; depends=[Rcpp plotrix rgl]; };
+  KFAS = derive { name="KFAS"; version="1.0.4-1"; sha256="0s9mrqb1mvs77z57hx734kajbyqddcc9j20wrsmrbf8g97in61s7"; depends=[]; };
+  KFKSDS = derive { name="KFKSDS"; version="1.5"; sha256="0wahqli7j851kdqi29b059gb2zm0x00fq08sixvlrcbdf3irlv3m"; depends=[]; };
   kimisc = derive { name="kimisc"; version="0.2-1"; sha256="1nbhw1q0p87w4z326wj5b4k0xdv0ybkgcc59b3cqbqhrdx8zsvql"; depends=[plyr]; };
   kin_cohort = derive { name="kin.cohort"; version="0.6"; sha256="13gnjk58m5kya9wj87klwm6h7cdqi61ba6y0cg9k1hgbc1ajy3s8"; depends=[survival]; };
   kinfit = derive { name="kinfit"; version="1.1.12"; sha256="1vh64k244lk8x7223dr29ds0qnhw7c7xdmrk86vhwshlzb8x712y"; depends=[]; };
-  kinship2 = derive { name="kinship2"; version="1.5.7"; sha256="13rmx9bb9lzg56k2vpdx4cc9116n27nahsiisjkj505f8j3j8x7n"; depends=[Matrix quadprog]; };
+  kinship2 = derive { name="kinship2"; version="1.6.0"; sha256="06f544yk61i1xq0rm0r5gpzwfl6rvzyg7gz8z86bjyxg0z44h3vy"; depends=[Matrix quadprog]; };
   kintone = derive { name="kintone"; version="0.1.1"; sha256="13c82vkapks9j2crrb4awnhl60ld8b1r7xmy9yv4zzch868kcl5g"; depends=[RCurl rjson]; };
   kitagawa = derive { name="kitagawa"; version="2.1-0"; sha256="1ddyd0rwwmdpbq823qass5dlp2lvi9d64wpl61ik6fghms2p9ryr"; depends=[kelvin]; };
   kknn = derive { name="kknn"; version="1.2-5"; sha256="0c1qnn1lnypjybk2p0dpfrg6hzxflzbwmjb5biq45r57bzji7im7"; depends=[igraph Matrix]; };
-  klaR = derive { name="klaR"; version="0.6-10"; sha256="19w0ahh5b7wriky1d0hq9l1p74fiy2lf8x93yaqbbyn70bf5wka3"; depends=[MASS combinat]; };
+  klaR = derive { name="klaR"; version="0.6-12"; sha256="10nkqb1zradbvifgv1fm373mhyydgdjjgmnw2442a2lark59z3vs"; depends=[MASS combinat]; };
   klausuR = derive { name="klausuR"; version="0.12-5"; sha256="1agd432ihljww3bhm73lqdvgkd8w99jqr7fp5xwwav7mawwsirfj"; depends=[xtable psychometric]; };
   klin = derive { name="klin"; version="2007-02-05"; sha256="0j0hr4bppzk754a66q5z42h7jzfavqpxgl7y266804aginfqm1ax"; depends=[Matrix]; };
   kmc = derive { name="kmc"; version="0.1-2"; sha256="16lv8wk24cp91qg5202zhfmdhg83qw8bwiycknaml5ki820ffdlx"; depends=[rootSolve emplik Rcpp]; };
@@ -2380,20 +2526,20 @@ let self = _self // overrides; _self = with self; {
   kml3d = derive { name="kml3d"; version="2.2"; sha256="1n94kfi49rgb9149bgc9043f0y5xpaclmfjr8fkwairqz5nnmgbv"; depends=[clv rgl misc3d longitudinalData kml]; };
   kmlcov = derive { name="kmlcov"; version="1.0.1"; sha256="09s9ganfsnwp22msha78g6pjr45ppyfyqjf6ci64w3w15q5qlcd9"; depends=[]; };
   KMsurv = derive { name="KMsurv"; version="0.1-5"; sha256="0hi5vvk584rl70gbrr75w9hc775xmbxnaig0dd6hlpi4071pnqjm"; depends=[]; };
-  knitcitations = derive { name="knitcitations"; version="0.5-0"; sha256="1zp6flkzr3wmhnshv0sr67nwbd7fy9cg2qdvgyfz9fgwq70qbdyc"; depends=[knitr bibtex xtable RCurl XML httr]; };
-  knitr = derive { name="knitr"; version="1.5"; sha256="07f0fxgxkm6lq9lajnn590m0lpfdbjj9nwsnf2aifj46kpqkrs4y"; depends=[evaluate digest formatR highr markdown stringr]; };
+  knitcitations = derive { name="knitcitations"; version="1.0-1"; sha256="0zlgia03r7am1ahbkraxqzsl649x1iidxq5s1jf1c8jkgfdjgicm"; depends=[RefManageR digest httr]; };
+  knitr = derive { name="knitr"; version="1.6"; sha256="0r34ras0csvm73z6j4f606pi387mjn4dz91djkx1j6fpk5rx1f68"; depends=[evaluate digest formatR highr markdown stringr]; };
   knitrBootstrap = derive { name="knitrBootstrap"; version="0.9.0"; sha256="1cw5dvhjiypk6847qypxphfl9an54qjvd6qv029znhwijsg56mmg"; depends=[knitr markdown]; };
   knnGarden = derive { name="knnGarden"; version="1.0.1"; sha256="1gmhgr42l6pvc6pzlq5khrlh080795b0v1l5xf956g2ckgk5r8m1"; depends=[cluster]; };
   knnIndep = derive { name="knnIndep"; version="1.0"; sha256="13iav0db8qmbmnf7hxmbvcyb0d76wyd05ib8mfzmgsdcpdkn4f72"; depends=[]; };
-  kobe = derive { name="kobe"; version="1.2.2"; sha256="028i4inzfrm574x0abmhs1mznhv670prhj2vd1vhxlcad6ndgyyi"; depends=[ggplot2 reshape plyr MASS coda emdbook tables RCurl ellipse]; };
-  kohonen = derive { name="kohonen"; version="2.0.14"; sha256="0rh5hs00wvkyg7kpra1lfhr93w30jmmdzkg7byypk4smxlxq64am"; depends=[class MASS]; };
+  kobe = derive { name="kobe"; version="1.3.2"; sha256="1z64jwrq6ddpm22cvk2swmxl1j7qyz0ddk3880c7zfq6gk7f9bxl"; depends=[plyr reshape ggplot2 MASS emdbook coda]; };
+  kohonen = derive { name="kohonen"; version="2.0.15"; sha256="1mamn6lwnd54jw7bbxgrxj511abn9wg5rxrm9fac7jndf00kjaim"; depends=[class MASS]; };
   kolmim = derive { name="kolmim"; version="0.2"; sha256="1cq1miny83shxas4zijcbzcnxv29vjyxj3pip8brf52sjvrj4max"; depends=[]; };
   KoNLP = derive { name="KoNLP"; version="0.76.9"; sha256="1q72irl4izb7f5bb99plpqnmpfdq4x4ymp4wm2bsyfjcxm649ya8"; depends=[rJava stringr hash tau Sejong]; };
   koRpus = derive { name="koRpus"; version="0.05-5"; sha256="03rw0yb67y652j8hcr5m4c0py0rr3gp87y0hdxpypd81rkikwhfm"; depends=[]; };
   Kpart = derive { name="Kpart"; version="1.1"; sha256="1cyml48i1jvwy4xzymijwraqpnssnkrd81q3m7nyjd5m2czjvihv"; depends=[leaps]; };
   kriging = derive { name="kriging"; version="1.0.1"; sha256="0ppkhjrz09x4b8syp6j2xjdv5gi4mjkvnqdfxv3pqcm3c7zqfdrs"; depends=[]; };
   KrigInv = derive { name="KrigInv"; version="1.3"; sha256="1zgrx0rmcaf3j3igqhvnbzjwh2dm2x5s5l027c7cbrl1rn20im0r"; depends=[DiceKriging rgenoud MASS lhs pbivnorm randtoolbox DiceView]; };
-  KRLS = derive { name="KRLS"; version="0.3-5"; sha256="11r886l7rhbi247m7jnjgr0l574wicl81lxc4v2sb4ap9zzfymld"; depends=[]; };
+  KRLS = derive { name="KRLS"; version="0.3-7"; sha256="0dx4b68xx3saqlkbpvvrhxjscl7jr5phwqvjywxsp4qxlr3ysl79"; depends=[]; };
   krm = derive { name="krm"; version="13.11-03"; sha256="05yy06ib879j1gcgqgljkfw79a3vg2ij71w7zah4ixl7di0301la"; depends=[]; };
   ks = derive { name="ks"; version="1.9.2"; sha256="05h13g4nla3gvawsb9zf7w8cdylpf7rc6ly6lp5dbsgc9qxha5py"; depends=[KernSmooth misc3d mvtnorm rgl multicool]; };
   kSamples = derive { name="kSamples"; version="1.0"; sha256="0a4kl6508isjsbv8g7b8g9c2kmai90lwdjn0576i7l4hnqvi532b"; depends=[SuppDists]; };
@@ -2418,6 +2564,7 @@ let self = _self // overrides; _self = with self; {
   LaF = derive { name="LaF"; version="0.6.1"; sha256="1yg498qzxzx4qpp27rwh854x7vkz8iqmny1pvcy2rvnnb8g0wk24"; depends=[Rcpp]; };
   laGP = derive { name="laGP"; version="1.1"; sha256="03xpgmab61m160vbcach218njwdkpfqvs19fvcvixvgy3hpa0prc"; depends=[]; };
   Lahman = derive { name="Lahman"; version="2.0-3"; sha256="0rsjm81yda7z73dvafhbplkp1ly5diwwmls2fgpz3pvr2hc72v1f"; depends=[]; };
+  LakeMetabolizer = derive { name="LakeMetabolizer"; version="1.1"; sha256="0l2l9l2c75cmxpqi2w9cgsad2ffnx6b7wvx6xdx6mkb52kkp9sqy"; depends=[rLakeAnalyzer plyr]; };
   Lambda4 = derive { name="Lambda4"; version="3.0"; sha256="04ikkflfr0nmy1gr3gfldlh2v8mpl82k1wwnzp57d2kn75m9vbxz"; depends=[]; };
   lambda_r = derive { name="lambda.r"; version="1.1.6"; sha256="03f3945f9kqj7in1mxk23ai56x68rdyd10c3ki4nqqysshyjr4d4"; depends=[]; };
   lambda_tools = derive { name="lambda.tools"; version="1.0.3"; sha256="1vd1ms8yzy01wvg4baj2ypyiyy27ck3na9awlmvhdvxc1s459sr7"; depends=[lambda_r]; };
@@ -2430,8 +2577,8 @@ let self = _self // overrides; _self = with self; {
   LargeRegression = derive { name="LargeRegression"; version="1.0"; sha256="05vkd6skqg19bs54vsjf3i4rwz1j3g1gmp9jj8fsnmkds46yr91y"; depends=[Matrix]; };
   lars = derive { name="lars"; version="1.2"; sha256="0blj44wqrx6lmym1m9v6wkz8zxzbjax2zl6swgdczci0ixb5nx34"; depends=[]; };
   laser = derive { name="laser"; version="2.4-1"; sha256="1f6j3xdks0w63fqjj9q8ng2m6ss90kcnsrigwal0bqskpvrpiqyz"; depends=[ape geiger]; };
-  lasso2 = derive { name="lasso2"; version="1.2-18"; sha256="0pzbp3052ns056ynk2fq8q3k6qz8ygf16zkm2bydj13qfa9k03dd"; depends=[]; };
-  lassoscore = derive { name="lassoscore"; version="0.1"; sha256="05jpybp00hl36my5ifqidp5a0n05na8maf5c0amwhmfwhl8i0p7j"; depends=[]; };
+  lasso2 = derive { name="lasso2"; version="1.2-19"; sha256="0zkwjsd42a6z4gylq9xbs4z8n1v7ncwvssjnn3h4yz1icjfzzlvk"; depends=[]; };
+  lassoscore = derive { name="lassoscore"; version="0.5"; sha256="1nnaxy0h48p8ribg4s6sxvqmnwjvr7d9yjxxcn2j4g8pwvfpiirg"; depends=[glasso glmnet]; };
   lassoshooting = derive { name="lassoshooting"; version="0.1.5-1"; sha256="0ixjw8akplcfbzwyry9p4bhbcm128yghz2bjf9yr8np6qrn5ym22"; depends=[]; };
   latdiag = derive { name="latdiag"; version="0.2"; sha256="11fahajwky3cfbd8y5xfaiz24qf7bkifbzcnvhv7daan4gsha04z"; depends=[]; };
   latentnet = derive { name="latentnet"; version="2.5.1"; sha256="0jzdgsw3i0s0rn8199m7g4x2gwbbrc5nd7fzimhxmib99pyzvrjf"; depends=[statnet_common network ergm sna mvtnorm abind coda]; };
@@ -2439,16 +2586,16 @@ let self = _self // overrides; _self = with self; {
   lattice = derive { name="lattice"; version="0.20-29"; sha256="0ip6qw1kry68dqj97bh8ddpq6gfsxf3n3axc6pn3zv2n1mfv6s9s"; depends=[]; };
   latticeDensity = derive { name="latticeDensity"; version="1.0.7"; sha256="1y33p8hfmpzn8zl4a6zxg1q3zx912nhqlilca6kl5q156zi0sv3d"; depends=[splancs spdep spatstat spam]; };
   latticeExtra = derive { name="latticeExtra"; version="0.6-26"; sha256="16x00sg76mga8p5q5ybaxs34q0ibml8wq91822faj5fmg7r1050d"; depends=[RColorBrewer lattice]; };
-  LatticeKrig = derive { name="LatticeKrig"; version="3.1"; sha256="0gvddhji6a7z0g1v5g1zjkv5hmbh6i9gb712k7j11d1gw6pla5cm"; depends=[spam fields]; };
+  LatticeKrig = derive { name="LatticeKrig"; version="3.3"; sha256="1l8rw63ljc54zsmnan8z7ipgdhzy3fjqrgywspn7g1120pfl59a4"; depends=[spam fields]; };
   latticist = derive { name="latticist"; version="0.9-44"; sha256="0kx2dyyr3zn3p63r5ypaw22hdrqyjibkws3hgyc3d560shjyfafv"; depends=[lattice latticeExtra vcd gWidgets]; };
-  lava = derive { name="lava"; version="1.2.5"; sha256="1kkp5lcs8rm26p82wc5vjgl53k8cl8l1rv3rl9xpkf4wsrvxy3ng"; depends=[numDeriv]; };
+  lava = derive { name="lava"; version="1.2.6"; sha256="16vdc1j3py4jszcldprlsxjc2pzbprpj7mdj53164adiw7vfah78"; depends=[numDeriv]; };
   lavaan = derive { name="lavaan"; version="0.5-16"; sha256="1ifzhbzb57smzj22hc19d0hl1v6qg1jvilgrjy9fp0kixk1qmf80"; depends=[MASS mnormt pbivnorm quadprog]; };
   lavaan_survey = derive { name="lavaan.survey"; version="1.1"; sha256="1vscv165kilkc00pgs2s9qn404l3rv45zc9kzmrghxz42jsy04zc"; depends=[lavaan survey MASS Matrix]; };
   lava_tobit = derive { name="lava.tobit"; version="0.4-7"; sha256="1da98d5pndlbbw37k64fmr2mi1hvkhjxsmm3y9p4b772pz9i1pvj"; depends=[lava mvtnorm survival]; };
   lawstat = derive { name="lawstat"; version="2.4.1"; sha256="142plbzpvi5xy7j5m5wizhz3w1n9im9hs8byhs6kfjpdw710qn7h"; depends=[mvtnorm VGAM]; };
   lazy = derive { name="lazy"; version="1.2-15"; sha256="1pdqgvn0qpfg5hcg5159ccf5qj2nd1ibai9p85rwjpddfynk6jks"; depends=[]; };
   lazyData = derive { name="lazyData"; version="1.0.3"; sha256="1i4jry54id8hhfla77pwk3rj2cci6na36hxj7k35k8lx666fdam2"; depends=[]; };
-  lazyWeave = derive { name="lazyWeave"; version="2.2.0"; sha256="1cl6pqn40k4fj3p695xpp3qzy3j1swccjgrajs8z2yb563pnz9zr"; depends=[Hmisc survival]; };
+  lazyWeave = derive { name="lazyWeave"; version="2.2.5"; sha256="18j31lbbplxvrz4wnq7hfw9qcx1s0y4c34lbxwly2wyrvzjhxybl"; depends=[Hmisc survival]; };
   lbiassurv = derive { name="lbiassurv"; version="1.1"; sha256="1i6l3y4rasqpqka7j39qjx22wjbilgc9pkp05an52aysfvfxy193"; depends=[actuar]; };
   LCA = derive { name="LCA"; version="0.1"; sha256="14nhx2fs18558zljnw56mdz3qx30v394llhzswxhznjfiiqc9z5h"; depends=[]; };
   LCAextend = derive { name="LCAextend"; version="1.2"; sha256="1y9azq9v42a3z5fq6gj8js89qblb2z93k4mg4jmw0wgkyv6mysfc"; depends=[boot mvtnorm rms kinship2]; };
@@ -2456,53 +2603,53 @@ let self = _self // overrides; _self = with self; {
   lcda = derive { name="lcda"; version="0.3"; sha256="1ximsyn6qw2gfn7b1hdpbjs6h6nk7hrignlii0np1lbf0k8l4xxl"; depends=[poLCA]; };
   LCFdata = derive { name="LCFdata"; version="2.0"; sha256="1x3vbr6hdviqvd6dxn1kb449g0q5zkfmjsmr5nxd2g82p69lv3xm"; depends=[]; };
   lcmm = derive { name="lcmm"; version="1.6.4"; sha256="1qk821q7abq7w2iyyd2yyjj1cr943ycjb4174m3zdxj3qxlq1v0z"; depends=[survival]; };
-  lctools = derive { name="lctools"; version="0.1-2"; sha256="1d3vxz198mwngqbhhpdz5w43j3h04dg590bzvzwfdbr1lgw8hw2g"; depends=[reshape weights]; };
+  lctools = derive { name="lctools"; version="0.1-3"; sha256="1wn9qymbcq9q99xnjbk3qswrfljvfqqhihvgr0brbpq3pbbxh55x"; depends=[reshape weights]; };
   lda = derive { name="lda"; version="1.3.2"; sha256="1iizsksp8wz34ji7p2kc6npxz9rzhs6217793nfri6y6mq23vs8z"; depends=[]; };
   ldbounds = derive { name="ldbounds"; version="1.1-1"; sha256="15ixrq615x64zmi6dryq3ww0dqxd0qf5xx1bs3w934sf99l46bhs"; depends=[lattice]; };
   LDcorSV = derive { name="LDcorSV"; version="1.3.1"; sha256="0i4npl90mkj8vry6ckq8bc4ydbl44vxichgsxyn80r6k9i71yl67"; depends=[MASS]; };
-  ldDesign = derive { name="ldDesign"; version="2.0-1"; sha256="1a9j139a6ld3hvxawj0zhdfnhl8dhrcj4nx2qyq5vwgq8195d9y5"; depends=[]; };
   LDExplorer = derive { name="LDExplorer"; version="1.0.3"; sha256="1hkhbhclm1bvxzq7z663i583f94cvkklaq0z5qkswrpi406md7mi"; depends=[]; };
   LDheatmap = derive { name="LDheatmap"; version="0.99-1"; sha256="1bj42chw1xyf8yg6cfv9p4yzsggng7zy6wrw6q22559pwm6c6vr0"; depends=[genetics]; };
   ldlasso = derive { name="ldlasso"; version="3.2"; sha256="0ij68zvgm8dfd2qwx6h6ygndac29qa0ddpf11z959v06n8jsnk11"; depends=[GenABEL quadprog]; };
   LDOD = derive { name="LDOD"; version="1.0"; sha256="0mf2sy01yv57mqicrz08a17m6crigklx6fmw9zpxv7g85qw1iq4v"; depends=[Rsolnp Rmpfr]; };
-  ldr = derive { name="ldr"; version="1.3"; sha256="0yjjy577wqi9hajgpl8bk10sgcn04knxyhbmjjr0jh08jmkvcqmx"; depends=[GrassmannOptim Matrix]; };
+  ldr = derive { name="ldr"; version="1.3.2"; sha256="1fjgj3g5qgc0sx6xwp48agvm2f59s55qjsxn332cgnfyxaz5pazz"; depends=[GrassmannOptim Matrix]; };
+  LDRTools = derive { name="LDRTools"; version="0.1"; sha256="1cr0v6qsdldy89p44lhr6hisqaz99qzab32kd1srdnnwnwl1q2y4"; depends=[]; };
   LDtests = derive { name="LDtests"; version="1.0"; sha256="1jwqr7zlp9hv7vw8xp80xvrwbdv796wjgr914v393wfa07j5wbd1"; depends=[]; };
   LeafAngle = derive { name="LeafAngle"; version="1.2"; sha256="18b3gncn18jvsjprjmaays67iwjdcpszy5z711rb71h1vyi0fdfs"; depends=[]; };
-  leafletR = derive { name="leafletR"; version="0.2-0"; sha256="143khia10hhr3dlj5vgnp3b0wmhls8bpabcxlhxbnk7djgfkgnb9"; depends=[]; };
+  leafletR = derive { name="leafletR"; version="0.2-1"; sha256="0l2xqi8b5j1qrfrahk06r7b3vx0lrgihfaiv0psxj6d81xv2x72y"; depends=[]; };
   LEAPFrOG = derive { name="LEAPFrOG"; version="1.0.6"; sha256="0zsvf22ir8r4ld67ir4m9ziqwrxfnjs44yjayicpm6sg4bdfdfa5"; depends=[alabama MASS]; };
-  leapp = derive { name="leapp"; version="1.1"; sha256="19jicg9qqgbrssi8jqqhqwxi17918zx4vp0vm1axgzyasfji36a6"; depends=[MASS]; };
+  leapp = derive { name="leapp"; version="1.2"; sha256="1yiqzmhgl5f3zwpcc5sz3yqrvp8p6r4w2ffdfyirirayqc96ar17"; depends=[MASS corpcor]; };
   leaps = derive { name="leaps"; version="2.9"; sha256="1ax9v983401hvb6cdswkc1k7j62j8yk6ds22qdj24vdidhdz5979"; depends=[]; };
-  LearnBayes = derive { name="LearnBayes"; version="2.12"; sha256="0ynklfwfkw0iz2l6k1vddcbylrskl64852xqc9d6jyysrvydanam"; depends=[]; };
-  LearnEDA = derive { name="LearnEDA"; version="1.2"; sha256="0pvxi5ab2mrh9rwxpl4pvjzy7qr6aqg82jfga0rlcqm95wjh6br2"; depends=[aplpack vcd]; };
+  LearnBayes = derive { name="LearnBayes"; version="2.15"; sha256="0cz2rgqy1cmdz2h1qbdvfqxmmdzmg2z1scdlxr7k385anha13ja5"; depends=[]; };
   learningr = derive { name="learningr"; version="0.29"; sha256="1nr4ydcq2mskv4c0pmf0kxv5wm8pvjqmv19xz5yaq0j834b0n5q7"; depends=[plyr]; };
   leiv = derive { name="leiv"; version="2.0-6"; sha256="18cf050653qrwyma23r50i66irjpdbp03nc96pirji5sl4dr9q7x"; depends=[]; };
   LeLogicielR = derive { name="LeLogicielR"; version="1.2"; sha256="0h52pzrksi1mn55mnxbfi61hl7x61cnkhp450slfrk68f6kp30x6"; depends=[xtable RColorBrewer gdata IndependenceTests]; };
   lessR = derive { name="lessR"; version="3.1"; sha256="1hnjzh8chh08hgmsfc3gqgzcvs5rqycxdp0kjv660mbmrmi0g270"; depends=[car leaps MBESS foreign gdata triangle]; };
   lestat = derive { name="lestat"; version="1.8"; sha256="12w3s5yr9lsnjkr3nsay5sm4p241y4xz0s3ir56kxjqw23g6m80v"; depends=[MASS]; };
+  letsR = derive { name="letsR"; version="1.0"; sha256="1far1vil7g4ymvmhzb0dgfng5d1nkcb4rr1sp7yi72lz60h3g9hk"; depends=[maps raster XML geosphere maptools sp]; };
   lfe = derive { name="lfe"; version="1.7-1289"; sha256="1k64llwsjk6lpfyvzwq5plickds15r42p0x5ppr57xzjqfyhyy61"; depends=[Matrix Formula xtable]; };
-  lfstat = derive { name="lfstat"; version="0.6"; sha256="0wffcdgs2bqq3dvz15182jjblxgya38cfdk0vi0wxyigrlywb5ib"; depends=[lattice lmom lmomRFA latticeExtra]; };
+  lfstat = derive { name="lfstat"; version="0.6.1"; sha256="0i3zrinvjxlg9w5zqrv8wzy15vxvi2gw3jrlfs4rddkxnp98ya9d"; depends=[lattice lmom lmomRFA latticeExtra]; };
   lga = derive { name="lga"; version="1.1-1"; sha256="1nkvar9lmdvsc3c21xmrnpn0haqk03jwvc9zfxvk5nwi4m9457lg"; depends=[boot lattice]; };
-  lgarch = derive { name="lgarch"; version="0.2"; sha256="1l3n9vvj6d7famff4v1phlyjr57s4hkda857frpc11adx7k7aan7"; depends=[zoo]; };
-  lgcp = derive { name="lgcp"; version="1.3-4"; sha256="1wkv4gz0jnjlwqwmg1vpbsf2j40c4260814x1fx1xfhhrii03m0q"; depends=[spatstat sp raster RandomFields iterators ncdf rpanel fields maptools Matrix rgeos]; };
+  lgarch = derive { name="lgarch"; version="0.4"; sha256="0pf66p8nvrzjkayjj4y38lbyhz389q3q7ffd3kzsa3a1z9h2156x"; depends=[zoo]; };
+  lgcp = derive { name="lgcp"; version="1.3-6"; sha256="04khs0knax3g20hgi5ykny1ck4jxz1aivaa19bb24fljvhn88prv"; depends=[spatstat sp raster RandomFields iterators ncdf rpanel fields maptools Matrix rgeos]; };
   LGS = derive { name="LGS"; version="0.91"; sha256="0rzj1shapyg7hyzsb9v81dirwihd7bz9s861l75g3yl3p4qm8sg7"; depends=[]; };
-  lgtdl = derive { name="lgtdl"; version="1.1.1"; sha256="03gasdlw12lgw40522f6s3vybsv737f0r8w6v4k8ara1gxfy3xc6"; depends=[]; };
+  lgtdl = derive { name="lgtdl"; version="1.1.3"; sha256="00lffc60aq1qjyy66nygaypdky9rypy607mr8brwimjn8k1f0gx4"; depends=[]; };
   lhs = derive { name="lhs"; version="0.10"; sha256="1hc23g04b6nsg8xffkscwsq2mr725r6s296iqll887b3mnm3xaqz"; depends=[]; };
-  libamtrack = derive { name="libamtrack"; version="0.5.4"; sha256="198wjqdhyw4s9qd7pd5qnml9sl6nyhrq75kr02ismbcx20q6ks65"; depends=[]; };
+  libamtrack = derive { name="libamtrack"; version="0.5.5"; sha256="0v2h4ficf87ai3h2liw8j7428k0bzzb59zini2vskwhcqb7ky7yw"; depends=[]; };
   LiblineaR = derive { name="LiblineaR"; version="1.80-7"; sha256="1gg4x0x94qq7h3nf5z3k7zy3iknydz3cfpnb8syhpgv5a462i84v"; depends=[]; };
   LICORS = derive { name="LICORS"; version="0.2.0"; sha256="0p9y21k1mj1v397jpb5g6jiw7rpzbyfwr4kv2rp3lyxyasy2ykf0"; depends=[RColorBrewer mvtnorm zoo FNN fields locfit Matrix]; };
   LICurvature = derive { name="LICurvature"; version="0.1.1"; sha256="09hqar4kvksd816ya6jg349r0v6z2m2109hq6j4k1d2vchab4lni"; depends=[MASS]; };
   lifecontingencies = derive { name="lifecontingencies"; version="1.1"; sha256="0rjiqmhqiliy8zbprxnr63r0wvwzs825gd6rrz4skwxcwpl4d0sh"; depends=[]; };
   LifeTables = derive { name="LifeTables"; version="0.2"; sha256="1n4mqypxm0rbi77ykpr6bpzxfxvq8mm9bmfvcqz7k3ajb78cdr0d"; depends=[mclust]; };
   LIHNPSD = derive { name="LIHNPSD"; version="0.2.1"; sha256="08ils29vvaq6abkgxbh028vwjw6l6h10cirbnwr65s458zvh4xqv"; depends=[sn moments BB Bolstad2 optimx Rmpfr]; };
-  likelihood = derive { name="likelihood"; version="1.5"; sha256="104rvhrsszzp4h9d0qjzqxk2q06xp8p4s64s7zdi4hswqm1cp224"; depends=[nlme]; };
-  likeLTD = derive { name="likeLTD"; version="5.3.2"; sha256="1kmch31w098j4qc9gx5wkh96cz6nhaggl3ka3rrb9adlvsrlnknj"; depends=[DEoptim ggplot2 gtools rtf gdata]; };
+  likelihood = derive { name="likelihood"; version="1.6"; sha256="11p7k6wpr7ypas414qir0hracy0960j8g3nwlhjbmynwmfzpkq1r"; depends=[nlme]; };
+  likeLTD = derive { name="likeLTD"; version="5.4.0"; sha256="09h1a4pn1i3vm3116yxvx07b62cbqmq84svpkbxykl4jmlqmwg8x"; depends=[DEoptim ggplot2 gtools rtf gdata]; };
   likert = derive { name="likert"; version="1.1"; sha256="1jmzxqav5hqvafb53k4mk8a2zfbzvlynqxkphndnbngq7z5915ah"; depends=[ggplot2 gridExtra xtable reshape psych]; };
   LIM = derive { name="LIM"; version="1.4.5"; sha256="1dir9dqrpns77n5ydm3fpj2k0pl7q15z8vqbi5704vsfv94mgmas"; depends=[limSolve diagram]; };
   limitplot = derive { name="limitplot"; version="1.2"; sha256="0wj1xalm80fa5pvjwh2zf5hpvxa3r1hnkh2z9z285wkbrcl0qfl2"; depends=[]; };
   limSolve = derive { name="limSolve"; version="1.5.5"; sha256="1wcw4f95alsn1x1x98hlivc65p28ykq9njgjs561yl2zn4dyfqxf"; depends=[quadprog lpSolve MASS]; };
-  LinearizedSVR = derive { name="LinearizedSVR"; version="1.2"; sha256="08kj5mnfda6h100wvggywkcjx7mc6cwjnyqiw1kc8m8ax4birqdp"; depends=[kernlab LiblineaR expectreg]; };
+  LinearizedSVR = derive { name="LinearizedSVR"; version="1.3"; sha256="0h3xmlnd5x37r5hdhcz90z5n1hsbr2ci3m939i89p1x9644i2l5g"; depends=[kernlab LiblineaR expectreg]; };
   lineup = derive { name="lineup"; version="0.34-1"; sha256="0p6gxbv8xdrhgk8zdlnqrybald9vqz717czb49b123h84rjr2f19"; depends=[qtl class]; };
-  linkcomm = derive { name="linkcomm"; version="1.0-8"; sha256="1j7m8h5pnlrz036ly9br4f9wkgbi4951cpfv5sd1lqh1gy191ldn"; depends=[igraph RColorBrewer dynamicTreeCut]; };
+  linkcomm = derive { name="linkcomm"; version="1.0-10"; sha256="1xs22cskrbk1yvsaa5dmnr62468z4baw6hy5m2jjcm854b42mkp9"; depends=[igraph RColorBrewer dynamicTreeCut]; };
   linkim = derive { name="linkim"; version="0.1"; sha256="0yvyid9x59ias8h436a202hd2kmqvn8k1zcrgja2l4z2pzcvfn91"; depends=[]; };
   linLIR = derive { name="linLIR"; version="1.1"; sha256="1v5bwki5j567x2kndfd5nli5i093a33in31025h9hsvkbal1dxgp"; depends=[]; };
   linprog = derive { name="linprog"; version="0.9-2"; sha256="1ki14an0pmhs2mnmfjjvdzd76pshiyvi659zf7hqvqwj0viv4dw9"; depends=[lpSolve]; };
@@ -2513,35 +2660,36 @@ let self = _self // overrides; _self = with self; {
   lisrelToR = derive { name="lisrelToR"; version="0.1.4"; sha256="0zicq0z3hhixan1p1apybnf3v5s6v6ysll4pcz8ivygwr2swv3p5"; depends=[]; };
   list = derive { name="list"; version="6.1"; sha256="18yclnj71yknw46wy2f2hjhrg38fyklirgr0x5aibk7yywpry0qq"; depends=[sandwich VGAM magic gamlss_dist MASS quadprog arm corpcor mvtnorm coda]; };
   LIStest = derive { name="LIStest"; version="2.1"; sha256="1gk253v3f1jcr4z5ps8nrqf1n7isjhbynxsi9jq729w7h725806a"; depends=[]; };
-  ljr = derive { name="ljr"; version="1.3-0"; sha256="0dfv0nndlbpn3b8g2b1h9qrx2if2s5cpgqkwbivh47pj9gjsir0i"; depends=[]; };
-  llama = derive { name="llama"; version="0.6"; sha256="0ga1zxibmqvqa6246y0zlrgibvcwddc8kn1h5l8f8x4jik8iq77r"; depends=[plyr rJava parallelMap]; };
+  llama = derive { name="llama"; version="0.7"; sha256="01hxphrii5lydg3yivrl0yg45ilma9a3g0r6rh44vak79zc6gxz7"; depends=[mlr plyr rJava parallelMap]; };
   lle = derive { name="lle"; version="1.1"; sha256="09wq7mzw48czp5k0b4ij399cflc1jz876fqv0mfvlrydc9igmjhk"; depends=[scatterplot3d MASS snowfall]; };
   lllcrc = derive { name="lllcrc"; version="1.1"; sha256="0m4dqg774d0pzpwvr4hj50xdz93y83w0yjcial8b14wy8zcdsmmz"; depends=[data_table combinat VGAM plyr]; };
   lmbc = derive { name="lmbc"; version="0.9.1"; sha256="0pxm29n8rhcy7g8kia0bgz78w5nr851dhhrb7nn13szw6j13ji8x"; depends=[mseq lars]; };
+  lm_beta = derive { name="lm.beta"; version="1.0"; sha256="13n9y9q4igqswvf4yfjk15gqa81z3kc7l0hizr3ssxpa8x9igpc5"; depends=[]; };
   lm_br = derive { name="lm.br"; version="2.5"; sha256="0v4gam24gny4g5618kakamryw0aq62wb9k7w6n3wq397mysnkd15"; depends=[Rcpp]; };
-  lme4 = derive { name="lme4"; version="1.1-6"; sha256="0axlax675sm9jh8h3r6ylqanknr0mi367cq7pl9z2ap0cngnd6ra"; depends=[Matrix Rcpp MASS nlme lattice minqa RcppEigen]; };
+  lme4 = derive { name="lme4"; version="1.1-7"; sha256="0v9vl9rspakyw2dmcl5lbhv1nlg10yhgdvi3gpfnizln7xw9ksyp"; depends=[Matrix Rcpp MASS nlme lattice minqa nloptr]; };
   lmec = derive { name="lmec"; version="1.0"; sha256="09shj01h2dl5lh7ch0wayr7qyhlmk0prv3p1vfgy91sn0wpbqlxr"; depends=[mvtnorm]; };
   lmeNB = derive { name="lmeNB"; version="1.2"; sha256="0xgw1kmq3krz8z0ickjg6qkj3bq2bkbwcd79c5fkl6fa3hp035mh"; depends=[numDeriv statmod lmeNBBayes]; };
   lmeNBBayes = derive { name="lmeNBBayes"; version="1.2"; sha256="0zpxdgqv5yhpwl2jfrxx37b126pgrflynmw9i4vmcvzx830d084l"; depends=[]; };
   LMERConvenienceFunctions = derive { name="LMERConvenienceFunctions"; version="2.5"; sha256="1kq0ww8h43rsygjz5pmb3ym027klgi4sw1csdr9apwgd3ydbnr7n"; depends=[Matrix lme4]; };
-  lmerTest = derive { name="lmerTest"; version="2.0-6"; sha256="113iv3ib7917mchmns9di84c52m0yp14ikc1sklg4bfvk607cw6l"; depends=[Matrix lme4 numDeriv MASS Hmisc gplots pbkrtest]; };
+  lmerTest = derive { name="lmerTest"; version="2.0-11"; sha256="151zgpqabvq1m58632caw9q298y7zh4aw059hdfzx9p8z7104ris"; depends=[Matrix lme4 numDeriv MASS Hmisc gplots pbkrtest]; };
   lmeSplines = derive { name="lmeSplines"; version="1.1-10"; sha256="0fy6hspk7rqqkzv0czvvs8r4ishvs7zsf4ykvia65nj26w7yhyia"; depends=[nlme]; };
   LMest = derive { name="LMest"; version="1.0"; sha256="0i76wkj8a95pa5spxsaxbkk2nyrjdlnzri9739n3h08sagwc0y67"; depends=[MASS Matrix]; };
   lmf = derive { name="lmf"; version="1.2"; sha256="1xqlqmjl7wf5b2s2a1k1ara21v74b3wvwl4mhbj9dkdb0jcrgfva"; depends=[]; };
   lmm = derive { name="lmm"; version="0.9"; sha256="0gs68iwk9gajb5af5ibgg9k5280ixqki8vxyp3cq5lrk96gcmqpr"; depends=[]; };
   lmmfit = derive { name="lmmfit"; version="1.0"; sha256="06mzmx7md7qw5mfhgdljc7i40sx9yrx7j57xbbp3fhl2zs1dpb4g"; depends=[nlme MASS]; };
   lmmlasso = derive { name="lmmlasso"; version="0.1-2"; sha256="1mvd38k9npyc05a2x7z0908qz9x4srqgzq9yjyyggplqfrl4dgsz"; depends=[emulator miscTools penalized]; };
+  lmms = derive { name="lmms"; version="1.0"; sha256="1qisic9ha764nl8xscf17r2chhx1jp8s2hv189ksc6wl34dcxvqq"; depends=[nlme lmeSplines reshape gdata]; };
   lmodel2 = derive { name="lmodel2"; version="1.7-2"; sha256="0dyzxflr82k7ns824zlycj502jx3qmgrck125im2k2da34ir3m3q"; depends=[]; };
   lmom = derive { name="lmom"; version="2.4"; sha256="04mfp7fcw1696qn34pxdffspwy0xalig3p7mqcj49v6kdxclpx1p"; depends=[]; };
-  lmomco = derive { name="lmomco"; version="2.0.1"; sha256="0m889d436nxsl3y383sl30f82ndz06a1a9dyxz199qrw944f2cbi"; depends=[]; };
+  lmomco = derive { name="lmomco"; version="2.1.1"; sha256="0q58g13j7h8pag3yj96qpnsa2m77hrrjkc24f6x847vlsn39md80"; depends=[]; };
   Lmoments = derive { name="Lmoments"; version="1.1-5"; sha256="13s9lbmfbjfam6xg0q9jl2p3q3db3pimcmnx47vx82qdm43xa4an"; depends=[]; };
   lmomRFA = derive { name="lmomRFA"; version="3.0"; sha256="188i2fk2csqwdmw3x1wwigaajbvwfd9dwd8q3pmx7ha4smp49amk"; depends=[lmom]; };
-  lmPerm = derive { name="lmPerm"; version="1.1-2"; sha256="0wxp1dhs42isqfjfr154x0lysi55f0mw9kyas7l28xp0h57mqjqz"; depends=[]; };
   lmSupport = derive { name="lmSupport"; version="1.07.1"; sha256="1smv1ag12373981qqhlrdf4xj73j2h0jblb74gd2w70zrbx0s2qb"; depends=[car psych gplots gvlma MASS]; };
   lmtest = derive { name="lmtest"; version="0.9-33"; sha256="1ycmxjrxf41mnbgakdmn4y2kmgp4rkj7v3nqwqnlc6gdfdmac73s"; depends=[zoo]; };
   loa = derive { name="loa"; version="0.2.15"; sha256="137l90qz87xrid28knbj8997pjqgqf6769cwfj82cm57m98bda91"; depends=[lattice MASS png RgoogleMaps RColorBrewer]; };
   localdepth = derive { name="localdepth"; version="0.5-7"; sha256="0h0y74xnhdqa7y51ljmpz7ayznppvy2ll06wfds6200lb9cxgr7k"; depends=[circular]; };
   localgauss = derive { name="localgauss"; version="0.33"; sha256="1xgcwlgkzkxws771zig4x6v0m6flf9vlcgpa80ajr0vmjhlplbly"; depends=[ggplot2 MASS foreach matrixStats]; };
+  localsolver = derive { name="localsolver"; version="2.3"; sha256="1d18rihzqf1f5j9agfp8jysll7lqk1ai23hkdqkn6wwxj442llv4"; depends=[]; };
   locfdr = derive { name="locfdr"; version="1.1-7"; sha256="1ix64nf0lymvqfks399871ynyph32x4yhymdw0nw59jh3c3ldhxx"; depends=[]; };
   locfit = derive { name="locfit"; version="1.5-9.1"; sha256="0lafrmq1q7x026m92h01hc9cjjiximqqi3v1g2hw7ai9vf7i897m"; depends=[lattice]; };
   locits = derive { name="locits"; version="1.4"; sha256="1q9vsf5h4n7r4gy1dwdhfyq3n0rn33akb3nx6yzinncj4w4cqq0h"; depends=[wavethresh igraph]; };
@@ -2549,7 +2697,7 @@ let self = _self // overrides; _self = with self; {
   locpol = derive { name="locpol"; version="0.6-0"; sha256="1zpdh3g7yx3rcn3rhlc3dm19c4b9kx2k8wy8vkwh744a1kysvdga"; depends=[]; };
   loe = derive { name="loe"; version="1.0"; sha256="11wjzq4h7qjrnrj1zg3msg1ksld9c3r3n3biamf2hz8zvi1asvqv"; depends=[igraph MASS vegan Matrix]; };
   log4r = derive { name="log4r"; version="0.1-4"; sha256="1wgn9gywkldfzxgpdfj84l05zw6y84bwzjr7q6fjddfdvxmdwa5n"; depends=[]; };
-  LogConcDEAD = derive { name="LogConcDEAD"; version="1.5-8"; sha256="1hycsdgbmaxqq2cmyw0zg33imyzx5y82x2s7marpjiqxv4q4v95r"; depends=[MASS mvtnorm]; };
+  LogConcDEAD = derive { name="LogConcDEAD"; version="1.5-9"; sha256="135vkp70q6gn75ds43aq08y13vrsgsgykssmnhrh6545i86vmhhi"; depends=[MASS mvtnorm]; };
   logconcens = derive { name="logconcens"; version="0.16-4"; sha256="11bk03kjlb747g54axmb0nayz226g41xvanbw79aij76vjbglv7y"; depends=[]; };
   logcondens = derive { name="logcondens"; version="2.1.1"; sha256="1anawy47g2bmpi5x4s9dqw82c51mv98wfy39sikb1jixbs40mqgp"; depends=[]; };
   logcondens_mode = derive { name="logcondens.mode"; version="1.0.1"; sha256="1i2c2prk5j863p3a3q3xnsv684igfi5czz3dib7zfjldpf0qyaq7"; depends=[logcondens distr]; };
@@ -2558,7 +2706,9 @@ let self = _self // overrides; _self = with self; {
   LOGICOIL = derive { name="LOGICOIL"; version="0.99.0"; sha256="1wgg7kigzzk5ghjn3hkjf1bb8d6mvjfmkwq64phri5jpxd742ps9"; depends=[nnet]; };
   LogicReg = derive { name="LogicReg"; version="1.5.5"; sha256="1lccxiafi2g2jmzaklcgman5zgax2rvfh61qzwz1w0p57460m581"; depends=[survival]; };
   logistf = derive { name="logistf"; version="1.21"; sha256="0cwbmd0mvj4wywpx7p4lhs70nhab7bfl6fzz2c4snn3ma6sy7x8c"; depends=[mice mgcv]; };
+  LogisticDx = derive { name="LogisticDx"; version="0.1"; sha256="1w530panmbwf4qplzzj02q9g2lfzrkawxy66ibwdd14z9bwjdclj"; depends=[multcomp data_table pROC car gRbase rms statmod speedglm]; };
   logistiX = derive { name="logistiX"; version="1.0-1"; sha256="0k2658hph4h9v0f1c4nd0zi72xzf7l4ivhy063y01zx61q8dbi8q"; depends=[]; };
+  logitchoice = derive { name="logitchoice"; version="0.9.1"; sha256="16019836wf1vhs49qmw9z53px4l20ggg4k6lhlll8l91q0mkisk3"; depends=[]; };
   LogitNet = derive { name="LogitNet"; version="0.1-1"; sha256="08xi5rpbqkc1b3qj24blv3l0r68wcqbsbjcqxiypm75f3c2irc4i"; depends=[]; };
   logitnorm = derive { name="logitnorm"; version="0.8.29"; sha256="0wbdxh3n44nzb6c0ahyd8gndfql1y56fns2bkmzqi3nxy9blhx18"; depends=[]; };
   loglognorm = derive { name="loglognorm"; version="1.0.1"; sha256="0rhx769a5nmidpbpngs2vglsbkpgw9badz3kj3jfmpj873jfnbln"; depends=[]; };
@@ -2569,7 +2719,6 @@ let self = _self // overrides; _self = with self; {
   lokern = derive { name="lokern"; version="1.1-5"; sha256="0fgpkmz8jy77sb0m862j7v32lj9d3x373na1102wvq164jjhyqg2"; depends=[sfsmisc]; };
   lomb = derive { name="lomb"; version="1.0"; sha256="06lbk7s1ilqx6xsgj628wzdwmnvbs0p03hdpx8665fhddcxh3ryy"; depends=[]; };
   longCatEDA = derive { name="longCatEDA"; version="0.17"; sha256="1yb0117ycj4079590mrx3lg9m5k7xd1dhb779r3rmnww94pmvja9"; depends=[]; };
-  longclust = derive { name="longclust"; version="1.1"; sha256="0cqpwkzgyg42w0yicl7diy4i3g7v3m0g0xwqg64m7hyw123dlcwl"; depends=[]; };
   longitudinal = derive { name="longitudinal"; version="1.1.9"; sha256="048z9n7ca655mjj4gdfj1hlpddkn8jikmh5igv76l5zj9iccw5xy"; depends=[corpcor]; };
   longitudinalData = derive { name="longitudinalData"; version="2.2"; sha256="1kdgnkhk39a9r4fq6zmrvzcvs7qjd21knpzfjglxyx723r9p3fs7"; depends=[clv class rgl misc3d]; };
   longmemo = derive { name="longmemo"; version="1.0-0"; sha256="1jnck5nfwxywj74awl4s9i9jn431655mmi85g0nfbg4y71aprzdc"; depends=[]; };
@@ -2579,7 +2728,7 @@ let self = _self // overrides; _self = with self; {
   lordif = derive { name="lordif"; version="0.2-2"; sha256="0898k5w9wky318k8x0zknjqdzdify0yyrnb1506j341l4n1bm04s"; depends=[MASS msm mvtnorm polycor sfsmisc ltm Hmisc rms]; };
   lorec = derive { name="lorec"; version="0.6.1"; sha256="0mgypd8awixh1lzbh5559br4k7vi3pfmwniqhgh68wc06sc6bn65"; depends=[]; };
   LOST = derive { name="LOST"; version="1.1"; sha256="19ar85dykbz0jlzbhlm3pcpffj4cizc6sj3gn93qdvpxkp64jfq9"; depends=[gdata shapes e1071 MASS miscTools]; };
-  LowRankQP = derive { name="LowRankQP"; version="1.0.2"; sha256="04xxg68509sgshjnzixzasp41d0vwzgvvwalm0vzfdkfrzp26h24"; depends=[]; };
+  LowRankQP = derive { name="LowRankQP"; version="1.0.2"; sha256="0is7v4cy4w1g3wn4wa32iqv4awd1nwvfcb71b3yk5wj59lpm8gs3"; depends=[]; };
   lpc = derive { name="lpc"; version="1.0.2"; sha256="1r6ynkhqjic1m7fqrqsp7f8rpxqih5idn4j96fqrdj8nj01znv29"; depends=[]; };
   LPCM = derive { name="LPCM"; version="0.44-8"; sha256="14627wk5azxm3y3a0qfy4qz57nxbdcasnv7djpqhk2gxf5smq19k"; depends=[]; };
   lpint = derive { name="lpint"; version="2.0"; sha256="0p1np8wlfbax0c7ysc5fs9dai8s00h1v0gan89dbd6bx06307w2r"; depends=[]; };
@@ -2587,25 +2736,27 @@ let self = _self // overrides; _self = with self; {
   lpmodeler = derive { name="lpmodeler"; version="0.2-1"; sha256="17k67l03dkjx61p4hwswghjm6awk0zx173x9xafxrfd8jrgsf6kf"; depends=[slam]; };
   lpridge = derive { name="lpridge"; version="1.0-7"; sha256="0nkl70fwzra308bzlhjfpkxr8hpd8v1xdnah7nscxa10qlisgr2k"; depends=[]; };
   LPS = derive { name="LPS"; version="1.0.4"; sha256="0dy45nn1bmzd17y2dsh4pf4jmh9qvifigvpg2lv2zrmvlx53cli5"; depends=[]; };
-  lpSolve = derive { name="lpSolve"; version="5.6.8"; sha256="112lvmkzzl3ds3mvnmyzydjvlzgsdwsywsld6v5paq633975f4aj"; depends=[]; };
-  lpSolveAPI = derive { name="lpSolveAPI"; version="5.5.2.0-9"; sha256="1kq3ai04dps2c14gixk67y4ax850zv79674qmf0xxrppq4yzq9n1"; depends=[]; };
-  LPStimeSeries = derive { name="LPStimeSeries"; version="1.0-2"; sha256="1gwz2lalgqm6r364lgvk1xd1p11kbrx7lfcpclasz3ygj8lsck9y"; depends=[]; };
+  lpSolve = derive { name="lpSolve"; version="5.6.10"; sha256="0hrgac5gfihhk4spy5smwgnawgn5nbv7aydb1w28lgd46a4zldvc"; depends=[]; };
+  lpSolveAPI = derive { name="lpSolveAPI"; version="5.5.2.0-11"; sha256="1d7g840aa392i310y4886haa8dvb881p6py74gmqi14rsajchzgs"; depends=[]; };
+  LPStimeSeries = derive { name="LPStimeSeries"; version="1.0-3"; sha256="06w4gcz3h4gi05zzb37adxj4kl6pxpmlbzl4xaf03vqyabnvv9s0"; depends=[]; };
   lqa = derive { name="lqa"; version="1.0-3"; sha256="141r2cd9kybi6n9jbdsvhza8jdxxqch4z3qizvpazjy8qifng29q"; depends=[]; };
   lqmm = derive { name="lqmm"; version="1.5"; sha256="12fggqka00y2hwknxwfa2326r2r17mdn2qd213n7xs3pn7v0rg18"; depends=[SparseGrid nlme]; };
   lrmest = derive { name="lrmest"; version="1.0"; sha256="1gdj8pmmzvs1li05pwhad63blhibq45xd1acajxsx06k7k21ajs7"; depends=[MASS]; };
   LS2W = derive { name="LS2W"; version="1.3-3"; sha256="0pdsv7ld0j116rh94m5y1i2mwrzc80fqxmc6ykc51i1sj6ws3i5k"; depends=[wavethresh]; };
+  LS2Wstat = derive { name="LS2Wstat"; version="2.0-3"; sha256="0wkh1a6xbp3qg5favxsj166jcgdza16zki675gswxckana6s4is7"; depends=[LS2W matrixStats geoR RandomFields spdep]; };
   lsa = derive { name="lsa"; version="0.73"; sha256="041wa1i85i90qvm5sxvd9nidis8s069cvf9nw1r68ajkvds65y91"; depends=[SnowballC]; };
-  LSAfun = derive { name="LSAfun"; version="0.2"; sha256="114hmqjzrq9pzq6na7yg0wl4yip50na3sgd81c6s3wrnlbdwpl0a"; depends=[lsa rgl]; };
+  LSAfun = derive { name="LSAfun"; version="0.3.1"; sha256="15sa3hq2x6wna8bv9mry06k80kvhf1kkl6zfybwzc953vxp6yijp"; depends=[lsa rgl]; };
   LSC = derive { name="LSC"; version="0.1.5"; sha256="1nlnwqb24sbgvl96azh8a833ij5xknjr2wr8shs59lm2n63a3ql9"; depends=[LICORS RColorBrewer fields gam Matrix]; };
   LSD = derive { name="LSD"; version="2.5"; sha256="0j7lmsz93q2zv9y05aan5pwhpzh8m1i45mh4p386g7bvfrwlmxbx"; depends=[MASS gtools RColorBrewer colorRamps schoolmath ellipse]; };
   lsdv = derive { name="lsdv"; version="1.1"; sha256="0rl1xszr9r8v71j98gjpav30n2ncsci19hjlc9flzs1s20sb1xpr"; depends=[]; };
   lsgl = derive { name="lsgl"; version="1.0.123.0"; sha256="15chgzds2vb4jgw7vzday6km7i92g6ifpj0a2x9s4nvrdzh9y8di"; depends=[sglOptim Matrix]; };
   lshorth = derive { name="lshorth"; version="0.1-6"; sha256="0nbjakx0zx4fg09fv26pr9dlrbvb7ybi6swg84m2kwjky8399vvx"; depends=[]; };
-  lsmeans = derive { name="lsmeans"; version="2.00-5"; sha256="0yqqkzy2ignsgjwhda6i59cvh11p78az5xqb39w4ckcidk5pq96v"; depends=[multcomp plyr Matrix]; };
+  lsmeans = derive { name="lsmeans"; version="2.11"; sha256="15cvdc4mzk9qr9zq5adkabzs1bkpnl2cf8mhsdc1jgm521ff4w26"; depends=[multcomp plyr Matrix]; };
   LSMonteCarlo = derive { name="LSMonteCarlo"; version="1.0"; sha256="0w5042phkba5dw92r67ppp2s4khjpw5mm701dh9dya9lhj88bz6s"; depends=[mvtnorm fBasics]; };
   lspls = derive { name="lspls"; version="0.2-1"; sha256="1g27fqhnx9db0zrxbhqr76agvxy8a5fx1bfy58j2ni76pki1y4rl"; depends=[pls]; };
   lsr = derive { name="lsr"; version="0.3.2"; sha256="1ahcj3ja5hj7pc7hvzlvhmh62mql3a0awli8szsyld0fpn50wprz"; depends=[]; };
   lss = derive { name="lss"; version="0.52"; sha256="1fvs8p9rhx81xfn450smnd0i1ym06ar6nwwcpl74a66pfi9a5sbp"; depends=[quantreg]; };
+  ltbayes = derive { name="ltbayes"; version="0.3"; sha256="1b35bwli08yzgv3idg86wz8fzpx7r5sx0ryr950rdh0n2jdml09q"; depends=[mcmc MHadaptive numDeriv]; };
   ltm = derive { name="ltm"; version="1.0-0"; sha256="1igkgb0jy3mzlnp9s6avhcpplwijz5g3x26a3lavyy3d9fjpmfpa"; depends=[MASS msm polycor]; };
   ltmle = derive { name="ltmle"; version="0.9.3-1"; sha256="0nvcxl55nmcabsz79vkjxmnifzm2vxg0lgwcjqiwsj242vhnfjhh"; depends=[]; };
   LTPDvar = derive { name="LTPDvar"; version="1.1"; sha256="0zb3ffz5vw1zabgzhpcw1mzfqh4g7r0sq4iy31nzyv8smdwddqzw"; depends=[]; };
@@ -2615,7 +2766,8 @@ let self = _self // overrides; _self = with self; {
   ltsk = derive { name="ltsk"; version="1.0.1"; sha256="1ym9h6af1aq46b6yxhdwnp6kqgx3zw08sal67y8rqd9z68432lx4"; depends=[fields]; };
   lubridate = derive { name="lubridate"; version="1.3.3"; sha256="1f07z3f90vbghsarwjzn2nj6qz8qyfkqalszx8cb5kliijdkwy8z"; depends=[plyr stringr memoise]; };
   luca = derive { name="luca"; version="1.0-5"; sha256="1jiqwibkrgga4ahz0qgpfkvrsxjqc55i2nwnm60xddb8hpb6a6qx"; depends=[survival genetics]; };
-  Luminescence = derive { name="Luminescence"; version="0.3.3"; sha256="0z66hc3z5qrbx5j8s11kpv7qc2mcf45r0xrxqfhfbfawzy52sqm3"; depends=[Rserve XML shape rgl matrixStats]; };
+  Luminescence = derive { name="Luminescence"; version="0.3.4"; sha256="036kib458qwr1l1pl1nb4hip43rchmx7qwf32y8z7b8nf9b8sbvy"; depends=[Rserve XML shape rgl matrixStats]; };
+  lvm4net = derive { name="lvm4net"; version="0.1"; sha256="0b140jybn6jpr1qh3s84vg0ba34356vc8pa4v2zfp9ggipfl073b"; depends=[ergm ellipse igraph]; };
   LVMMCOR = derive { name="LVMMCOR"; version="0.01.1"; sha256="1lq4hqcg0qkywdr4a22m1fr3m97749mm6n2jzdj9i7jrf0agc1fs"; depends=[nlme MASS]; };
   LVQTools = derive { name="LVQTools"; version="1.2"; sha256="06mninrrr49xsh00gfsp0vc418r6pdvq3m6sbnj0ywdyki106mni"; depends=[]; };
   lxb = derive { name="lxb"; version="1.3"; sha256="0mvjk0s9bzvznjy0cxjsqv28f6jjzvr713b2346ym4cm0y4l3mir"; depends=[]; };
@@ -2624,38 +2776,38 @@ let self = _self // overrides; _self = with self; {
   MAc = derive { name="MAc"; version="1.1"; sha256="1lshi5rb8l2mpd302wskhlk5vz1wjidvbss9y69l63zjqdwjs7ch"; depends=[]; };
   MAclinical = derive { name="MAclinical"; version="1.0-5"; sha256="1g0ka1kqww2xim8rp5rznkzn0a541zvf841s3lbphfh9k3y3ixs3"; depends=[party plsgenomics st e1071]; };
   MAd = derive { name="MAd"; version="0.8-1"; sha256="16lis6q61d11z0kn3svd77yr0k3jm0zhqpwacl86jdjlmn67l92i"; depends=[]; };
-  mada = derive { name="mada"; version="0.5.5"; sha256="01hmj68dn3a003zxkih7h4332fsvib56kpgcw5hanmakdh3lq41j"; depends=[mvtnorm ellipse mvmeta]; };
+  mada = derive { name="mada"; version="0.5.6"; sha256="10vw138ykfz0s8c2q39fd4vipran85w04jmr1fni4z8x0i67iak2"; depends=[mvtnorm ellipse mvmeta]; };
   MADAM = derive { name="MADAM"; version="1.2.2"; sha256="09w5liqa3mpkbyvkwlabcgyg2b4316qpzq7pbpl0wxl74bsh76vq"; depends=[]; };
   madsim = derive { name="madsim"; version="1.1"; sha256="1d9mv769zia43krdfl43hp22cp5mdi3ycwj3kxyfcjrg23bjnyc0"; depends=[]; };
   Maeswrap = derive { name="Maeswrap"; version="1.4.11"; sha256="15i36xj2bdzhly78614077s8k2z75a1gmzl2crsfgvhyyjdax8r7"; depends=[rgl lattice geometry]; };
   magic = derive { name="magic"; version="1.5-6"; sha256="1399w1zhz79nj8cdhslybncd9h6rylfhb548nv22ip0dxxdkyv0v"; depends=[abind]; };
-  magicaxis = derive { name="magicaxis"; version="1.7"; sha256="1zq68iia327gignqpmv314vm79gs39yzqcd3qnwalwbcidrhp32g"; depends=[MASS plotrix]; };
+  magicaxis = derive { name="magicaxis"; version="1.9"; sha256="0v851arnpc15h7ccqwjlz52jv83ij96r4b44qkm45ipr9dfm84zf"; depends=[MASS plotrix sm]; };
   magma = derive { name="magma"; version="1.3.0-2"; sha256="0hgwjq30ksx2qg4q9fj57m27i96sci8hrfrqc2lw4hz18b6kkph4"; depends=[]; };
-  magrittr = derive { name="magrittr"; version="1.0.0"; sha256="1hbiid6pmi0pjwfpamxh260qp9rqgj8hjbji1xncs1z82bpmx99f"; depends=[]; };
+  magrittr = derive { name="magrittr"; version="1.0.1"; sha256="0syb8dpcqag392any8s7shgqv4s33q3ppwnpmih31yhz875k3aaw"; depends=[]; };
   mail = derive { name="mail"; version="1.0"; sha256="1m89cvw5ba4d87kp2dj3f8bvd6sgj9k56prqmw761q919xwprgw6"; depends=[]; };
-  mailR = derive { name="mailR"; version="0.1"; sha256="098pn75l4bd0s6x22nv67sypj8i4r4sdzyzka3dr7k3is7gpn1r5"; depends=[rJava]; };
+  mailR = derive { name="mailR"; version="0.3"; sha256="0m23npg5zsdwflw4744v30ypnpa6f8ddflwh3mpabxrxw4scb547"; depends=[rJava stringr]; };
   MAINT_Data = derive { name="MAINT.Data"; version="0.2"; sha256="0kmvz3s6ci9zi9k3vvrkl7jwqfjgdfk7b6xv7dskjh6mbgpcqcf4"; depends=[MASS sn miscTools]; };
   makeProject = derive { name="makeProject"; version="1.0"; sha256="09q8xa5j4s5spgzzr3y06l3xis93lqxlx0q66s2nczrhd8nrz3ca"; depends=[]; };
   malaria_em = derive { name="malaria.em"; version="2.0"; sha256="1n34ahifggpdlpmigy010zysana0fg9c8ji0khk8g3il2gmzmgim"; depends=[]; };
-  MALDIquant = derive { name="MALDIquant"; version="1.10"; sha256="1g1xr26skvz4i1m3di35krlzal69gvrk3d6qkf5fhmh2n7qlga6h"; depends=[]; };
-  MALDIquantForeign = derive { name="MALDIquantForeign"; version="0.7"; sha256="03kz73n3vmbnqq7sg9qy1d13kxv1kl4pc4jr382zg306z5dphsjw"; depends=[MALDIquant base64enc digest downloader readBrukerFlexData readMzXmlData XML]; };
+  MALDIquant = derive { name="MALDIquant"; version="1.11"; sha256="1jnpmv44j9zry64wvnv37hcda61570hypnv16z99arjazpi4nzmn"; depends=[]; };
+  MALDIquantForeign = derive { name="MALDIquantForeign"; version="0.9"; sha256="0bs6frqz462hrad16kjvbmq2s66bv3kpriav4hdz5a4klra389gl"; depends=[MALDIquant base64enc digest downloader readBrukerFlexData readMzXmlData XML]; };
   mallet = derive { name="mallet"; version="1.0"; sha256="06rksf5nvxp4sizgya7h4sb6fgw3yz212a01dqmc9p5a5wqi76x0"; depends=[rJava]; };
   MAMA = derive { name="MAMA"; version="2.2.1"; sha256="1dcyfir6jv28jzvphiqrjns3jh2zg2201iwcvjzbmddl2isk9h0i"; depends=[metaMA xtable gtools xtable]; };
-  MAMS = derive { name="MAMS"; version="0.2"; sha256="1q5ldw2y5ckwbbgny96x6d6wsbvn7v4gvx0h2fdjnjd5bw50144h"; depends=[mvtnorm]; };
+  MAMS = derive { name="MAMS"; version="0.3"; sha256="17d75phlxi9267dwpzmnzpk01l69xvcdqjjabj0ai7j2l6llp2n9"; depends=[mvtnorm]; };
   MAMSE = derive { name="MAMSE"; version="0.1-3"; sha256="06q6raqbyi9zwg3wzaygqmfs3di55fh4bln3vscdw95kma4hz9km"; depends=[]; };
   Mangrove = derive { name="Mangrove"; version="1.1"; sha256="15dzxsm982v7sskqh31fdiiqyac37l00i51z3f4nk3zpz6gq2nw5"; depends=[]; };
-  ManyTests = derive { name="ManyTests"; version="1.0"; sha256="0lmcvspai6mnq7xn793sx8vbml78ziqs80zym64qa5c1prvrm4jy"; depends=[]; };
+  ManyTests = derive { name="ManyTests"; version="1.1"; sha256="11xk3j2q7w6b6ljmp7b8gni0khpmpvcvzwxypy0w8ihi2gaczsxj"; depends=[]; };
   Map2NCBI = derive { name="Map2NCBI"; version="1.0"; sha256="02cgmayrhkyji0cwr6n0f439njq29mzna7sgzkq6ml45njm9m5nh"; depends=[]; };
-  MAPA = derive { name="MAPA"; version="1.3"; sha256="00px8yh1jlfhrkkx0ln3acgidn1js3f6nv9n5hs685s82qi64937"; depends=[forecast miscTools]; };
-  mapdata = derive { name="mapdata"; version="2.2-2"; sha256="1271qw6v17v12q6g2nabr7jc4k2jvq2dy3vl90kjfdjrpb1fp3rs"; depends=[maps]; };
+  MAPA = derive { name="MAPA"; version="1.7"; sha256="1xw9slmhn6r0cczp37m75l944vggnjwinx2p4jkkya445mvgyhjy"; depends=[forecast]; };
+  mapdata = derive { name="mapdata"; version="2.2-3"; sha256="1fhj34cgq6rniy0339qv2ghbs0aiq38h9jfwx7szb83yj37v7wm6"; depends=[maps]; };
   MapGAM = derive { name="MapGAM"; version="0.7-0"; sha256="00ggr7wrkz13n1f9gsp3qxxjwb01kq47aqv2mj4pa6p253iw19i7"; depends=[gam maptools]; };
   MAPLES = derive { name="MAPLES"; version="1.0"; sha256="0hzsh7z1k7qazpxjqbm9842zgdpl51irg7yfd119a7b2sd3a8li9"; depends=[mgcv]; };
   mapmisc = derive { name="mapmisc"; version="0.9.4"; sha256="0qsv36sk6fd3ix85yagl86y2r1kkl3qry0g0k6d0rb87aaxmk86i"; depends=[sp raster]; };
   mapplots = derive { name="mapplots"; version="1.4"; sha256="0wwz52hjhp2xzw38zsvbk5cgdfr58rakjnmficjr305x88kisz20"; depends=[]; };
   mapproj = derive { name="mapproj"; version="1.2-2"; sha256="1fdb72hvcp6jm7rhvs8zdkya6ifs92lfqnmq5vj5amwckkxfidc6"; depends=[maps]; };
-  maps = derive { name="maps"; version="2.3-6"; sha256="1jw461gb81ykxnjpkykim0fmm3zvb6grkaxip1h9ish8q0sh08kw"; depends=[]; };
+  maps = derive { name="maps"; version="2.3-7"; sha256="01bzy9xqa5fhqjhvwrxygkk5ym3rl9kz86frpby735bx5qy6ij4b"; depends=[]; };
   mapStats = derive { name="mapStats"; version="1.17"; sha256="1jnqchrrn2v1smzk1c3laycr2fs8x59c9mb8lhs4bxqbhhwgmi8p"; depends=[survey lattice maptools RColorBrewer Hmisc quantreg classInt sp colorspace reshape2]; };
-  maptools = derive { name="maptools"; version="0.8-29"; sha256="1fb5r9i63kch2s7qjidr1n1apwkav9kzh17byrm8p89d50v5ycff"; depends=[sp foreign lattice]; };
+  maptools = derive { name="maptools"; version="0.8-30"; sha256="0vbpgxdz6xl8a2bkhcw6rfs15nvmppka0ad7i2v2pi18350riwpq"; depends=[sp foreign lattice]; };
   maptpx = derive { name="maptpx"; version="1.9-1"; sha256="1yrlgz5bkjjs3m59dqp60n95lax0fp7xw00v59kymmw5hr3sis6f"; depends=[slam]; };
   maptree = derive { name="maptree"; version="1.4-7"; sha256="1k7v84wvy6wz6g0dyiwvd3lvf78rlfidk60ll4fz7chvr2nrqdp4"; depends=[cluster rpart]; };
   mAr = derive { name="mAr"; version="1.1-2"; sha256="0i9zp8n8i3fxldgvwj045scss533zsv8p476lsla294gp174njr7"; depends=[MASS]; };
@@ -2665,19 +2817,19 @@ let self = _self // overrides; _self = with self; {
   marg = derive { name="marg"; version="1.2-2"; sha256="0j08zzcrj8nqsargi6xi50gy9pl4smmsp4b7ywlga7r1ga38g82r"; depends=[statmod survival]; };
   margie = derive { name="margie"; version="1.0"; sha256="1jkhg15xdiqjvpzbbc39l8jlfw0yrbarnd3zbgb3p0rh733x5g4j"; depends=[]; };
   marginalmodelplots = derive { name="marginalmodelplots"; version="0.4.2"; sha256="0d7m7sddz9rp1mkvirhcmk7hlbxsag3nm3vqfampnr7l2h158baa"; depends=[locfit]; };
-  markdown = derive { name="markdown"; version="0.7"; sha256="18q1yvzv9fk5j09ngrldm32cnswxhrmqx6g8d17srriis6ng6i5v"; depends=[ mime ]; };
-  marked = derive { name="marked"; version="1.1.3"; sha256="0nvk7fq2q7yqxmw507bsbss04wggy13kgvcv5v01g8a0wb3ig9ym"; depends=[R2admb truncnorm coda optimx ggplot2 Matrix numDeriv Rcpp plyr]; };
+  markdown = derive { name="markdown"; version="0.7.2"; sha256="02dgi2q5gs359affvx0w2pvfcr25wqpzfvyc6labyfxmiw0gax13"; depends=[mime]; };
+  marked = derive { name="marked"; version="1.1.6"; sha256="0f9sa4mdkiq1fn99sczb0glf5xfm17a3x8dq9ycf0l39fyg582d0"; depends=[lme4 R2admb truncnorm coda optimx ggplot2 Matrix numDeriv Rcpp plyr]; };
   MarkedPointProcess = derive { name="MarkedPointProcess"; version="0.2.21"; sha256="06bypa124raa4vbcvi082vpd8bndnar4p1v18dq261z6j3ixk44k"; depends=[RandomFields R2Cuba]; };
   maRketSim = derive { name="maRketSim"; version="0.9.2"; sha256="1cq17zjwyf4i5lcqgxqkw805s4mr6qp89blgpmpxy8gdrbfj93m4"; depends=[]; };
-  markovchain = derive { name="markovchain"; version="0.0.9"; sha256="0mkyzjzvc9ry7h58zp5jsnryasjllw2n877h1603g1byi9hnhvqg"; depends=[igraph Matrix matlab expm]; };
+  markovchain = derive { name="markovchain"; version="0.0.9.5"; sha256="06fsfrfm7xyba97yfxcp85vqamavbinvm8wr2darafn20ggahrck"; depends=[igraph Matrix matlab expm]; };
   MarkowitzR = derive { name="MarkowitzR"; version="0.1402"; sha256="1fbn6l8z76ak8z2nyzmizcjm7h54y58773nsy03x1pwykcwpzw9f"; depends=[matrixcalc sandwich gtools]; };
-  marmap = derive { name="marmap"; version="0.7"; sha256="0c015zzwz56qz5wnasng5ckpz2i51nvq03ikzpimzrsn63a8j78z"; depends=[RSQLite gdistance geosphere sp raster ncdf]; };
+  marmap = derive { name="marmap"; version="0.8"; sha256="0141vz2bwwzyhfxvy5w0f0idp8amq89633acfy3r1al50razispp"; depends=[RSQLite gdistance geosphere sp raster ncdf plotrix shape]; };
   marqLevAlg = derive { name="marqLevAlg"; version="1.1"; sha256="1wmqi68g0flrlmj87vwgvyxap0miss0n42qiiw7ypyj4jw9kwm8j"; depends=[]; };
   MARSS = derive { name="MARSS"; version="3.9"; sha256="0vn8axzz0nqdcl3w00waghz68z8pvfm764w11kxxigvjpw2plj31"; depends=[nlme mvtnorm KFAS]; };
   maSAE = derive { name="maSAE"; version="0.1-2"; sha256="18a1zbfmjhrmi3fgqd7vaicpsca59kp8r1003pwl7l4032p32fxk"; depends=[]; };
   MASS = derive { name="MASS"; version="7.3-33"; sha256="1bq005zxyc7842z4cz5ilhh917clfdmhg5czfq6plkdgwq8nfhlk"; depends=[]; };
   MASSI = derive { name="MASSI"; version="1.1"; sha256="13kavfsm48qq9zyp10scfjcgrk0x2n4my7cz2xy78s14knlrks5y"; depends=[fpc gplots]; };
-  MASSTIMATE = derive { name="MASSTIMATE"; version="1.1"; sha256="10hs2mprdfa747sz2bjy29jixblbnyb744wxf8gh4jq3d5f5xpiq"; depends=[epicalc]; };
+  MASSTIMATE = derive { name="MASSTIMATE"; version="1.2"; sha256="1j9l8b5d518ag9ivzr1z4dd2m23y2ia1wdshx1krmshn8xsd6lwp"; depends=[]; };
   MasterBayes = derive { name="MasterBayes"; version="2.51"; sha256="0mbvhn6yspralmlajimdin14hszh78m0bxb3zdxd73xhjqxl4ixk"; depends=[coda genetics gtools kinship2]; };
   MAT = derive { name="MAT"; version="0.1-3"; sha256="0z9kiji0kar286dcirsgrszd2kn6hcrfq8jhnn5pa2rfscgccdmj"; depends=[MASS]; };
   Matching = derive { name="Matching"; version="4.8-3.4"; sha256="04m647342j4yi74ds7ddwnyrf58qdy7k3mc067k3p779qavq2ka1"; depends=[MASS]; };
@@ -2685,14 +2837,15 @@ let self = _self // overrides; _self = with self; {
   mathgraph = derive { name="mathgraph"; version="0.9-11"; sha256="0xikgzn24p0qqlrmaydmjk5yz5pq2rilsvpx86n3p2k2fc3wpwjy"; depends=[]; };
   maticce = derive { name="maticce"; version="1.0-3"; sha256="0nir60jbai0fisccrpkrnjm5z9lvhimhwfiqnmzxw4mjiifj41c2"; depends=[ouch ape]; };
   matie = derive { name="matie"; version="1.2"; sha256="1ymx49cyvz63imqw5n48grilphiqvvdirwsrv82p7jgxdyav2xv0"; depends=[dfoptim mvtnorm seriation igraph gplots cba]; };
-  matlab = derive { name="matlab"; version="1.0.1"; sha256="0cfjif92visppk4r028gpp66l8x1c4cc287nildwlhrwf7s9szm3"; depends=[]; };
-  Matrix = derive { name="Matrix"; version="1.1-3"; sha256="0f10j4f7bsq55ks4a976l1d8pq3brfpwjx7gj54iv79viyvz1lr3"; depends=[lattice]; };
+  matlab = derive { name="matlab"; version="1.0.2"; sha256="0m21k2vzbc5d3c93p2hk4208xyd2av2slg55q5j1ibjidiryqgd2"; depends=[]; };
+  Matrix = derive { name="Matrix"; version="1.1-4"; sha256="1pxkyfa09gf5rwk1x9hdxrgr1hjs4390h73z3f8h2224rszr3hqh"; depends=[lattice]; };
   matrixcalc = derive { name="matrixcalc"; version="1.0-3"; sha256="1c4w9dhi5w98qj1wwh9bbpnfk39rhiwjbanalr8bi5nmxkpcmrhp"; depends=[]; };
   MatrixEQTL = derive { name="MatrixEQTL"; version="2.1.0"; sha256="03ccawgrkv0r3y8smpym27p5bsxy8y9rhn7pqs9ybb385951azy9"; depends=[]; };
   MatrixModels = derive { name="MatrixModels"; version="0.3-1.1"; sha256="0b44gyvpfvhbkl1vymni7pplidz9a5jrcalswx19hnh5x14qw168"; depends=[Matrix]; };
   matrixpls = derive { name="matrixpls"; version="0.3.0"; sha256="12qa1isj9609xj8qrr8ra8l711zagckim3nwvp7crrv4i6jm4299"; depends=[assertive matrixcalc psych lavaan MASS]; };
-  matrixStats = derive { name="matrixStats"; version="0.8.14"; sha256="1sb9vzgcidiy0jynczigbddc70g0nm9052jzh7wxzx922bj8pir1"; depends=[R_methodsS3]; };
+  matrixStats = derive { name="matrixStats"; version="0.10.0"; sha256="15pgp50jyycp9hqrf6g9yz0gfv9a0w5yd9amw3vwn3mr202fab5f"; depends=[R_methodsS3]; };
   MATTOOLS = derive { name="MATTOOLS"; version="1.1"; sha256="1nzrkm3a08rpsd9vplyf33rrkadlrd0ln70k95qxj98ndh2v97px"; depends=[]; };
+  MAVTgsa = derive { name="MAVTgsa"; version="1.3"; sha256="0rzal9nsi8y873cbf6hrdyzyxnpd4r1yr9fj66cn0s1c8g93ls0y"; depends=[corpcor foreach multcomp randomForest MASS]; };
   MaXact = derive { name="MaXact"; version="0.2.1"; sha256="1n7af7kg54jbr09qk2a8gb9cjh25cnxzj2snscpn8sr8cmcrij0i"; depends=[mnormt]; };
   maxent = derive { name="maxent"; version="1.3.3.1"; sha256="1skc7d0p6kg0gi1bpgaqn2dmxjzbvcphx5x3idpscxfbplm5v96p"; depends=[SparseM tm Rcpp]; };
   maxLik = derive { name="maxLik"; version="1.2-0"; sha256="1vgq2pjy8244ccdjcrrgri4sn2kcwqyfwskh885ci5aw01121d36"; depends=[miscTools sandwich]; };
@@ -2702,14 +2855,18 @@ let self = _self // overrides; _self = with self; {
   mbbefd = derive { name="mbbefd"; version="0.1"; sha256="0m24q679b7a27hw7v370p21w9bq18zc225q2df319hdrya3aygf2"; depends=[]; };
   MBCluster_Seq = derive { name="MBCluster.Seq"; version="1.0"; sha256="0xbi2r0g0gzsy05qrq1ljr5f5s3glwxj204vk2f1lgwdx3fd116m"; depends=[]; };
   MBESS = derive { name="MBESS"; version="3.3.3"; sha256="12jsrxwdprrahqbk0i0js7lja81ydy385xmijlqk0slppd72dd9c"; depends=[]; };
+  mbest = derive { name="mbest"; version="0.1"; sha256="0dz54rgbl40cbrv6670qd441ymz43lj16dvd9fnq3znfafc1790n"; depends=[lme4]; };
   MBI = derive { name="MBI"; version="1.0"; sha256="1lb0sjwa6x360n9a9pagz6yhxh37gxq1fk0f5c3i2sd56ny9jpns"; depends=[]; };
   mblm = derive { name="mblm"; version="0.12"; sha256="17h65bapvz89g5in3gkxq541bxgpj9pciz6i5hzhqn0bdbsb3k6r"; depends=[]; };
-  MBmca = derive { name="MBmca"; version="0.0.3-2"; sha256="1fg1yl8nx8mv44d3sb5cjvyqazz0z4qc7947m96bwpcdva79lvkh"; depends=[robustbase chipPCR]; };
+  MBmca = derive { name="MBmca"; version="0.0.3-3"; sha256="04v1xbkmrb196pm6a1ql8jdw2h126zzq5qni0mv3vh9wwnlnqlcs"; depends=[robustbase chipPCR]; };
   mbmdr = derive { name="mbmdr"; version="2.6"; sha256="0ss5w66hcgd8v8j9bbbp12a720sblhr2hy9kidqfr8hgjaqlch86"; depends=[logistf]; };
-  mboost = derive { name="mboost"; version="2.2-3"; sha256="05xsmli8srxq1jyza6s67xgcrjby1rzp1ahc62rh636i9m0ihr9k"; depends=[survival Matrix lattice]; };
+  mboost = derive { name="mboost"; version="2.3-0"; sha256="1p4jqmnsp37jx52cw3k86zkbxr8qch710nszk173mqxcf77w28ip"; depends=[Matrix survival lattice nnls quadprog]; };
   mc2d = derive { name="mc2d"; version="0.1-14"; sha256="1djnvwlq1qvvwhnmj3ijwyaqyp1k778i1yv6qmlj053lc38b54j7"; depends=[mvtnorm]; };
+  MC2toPath = derive { name="MC2toPath"; version="0.0.16"; sha256="0jdn9wpxavn2wrml907v23mfxr62wwjdh7487ihjj59g434ry7wh"; depends=[RNetCDF]; };
   MCAPS = derive { name="MCAPS"; version="0.3-2"; sha256="1jvxl9xi102pcs3swxlx4jk76i7i4fll88c92k7m379ik3r36alb"; depends=[stashR]; };
+  MCAvariants = derive { name="MCAvariants"; version="1.0"; sha256="08c5qpklilj41agi5nzm4f5w41pdxk98i1wc1ahhnawc3n2cdbjz"; depends=[]; };
   mcbiopi = derive { name="mcbiopi"; version="1.1.2"; sha256="12h4bv3hx1m6bsqdxj5n3b5gh98ms508am8pigz7ckmv0xkyhx85"; depends=[]; };
+  mcc = derive { name="mcc"; version="1.0"; sha256="0p661a870bvh3xhcahqqq85azn9rjl3vacjy96jsdn86irj4s0vi"; depends=[]; };
   mcclust = derive { name="mcclust"; version="1.0"; sha256="00qprmsjwbn2d0jl7p9mz8pv7k8ld3mzk862pr1grigk0lqwhx06"; depends=[lpSolve]; };
   MCDA = derive { name="MCDA"; version="0.0.3"; sha256="0nfj5wlsjhj3z20jvdwl12r18rxnpk343r49j5awkh41qa0qyjr8"; depends=[Rglpk Kendall glpkAPI]; };
   mcga = derive { name="mcga"; version="2.0.9"; sha256="197yldx03c634f3x0mpxxvqrys93n7z7n3x0alvqa42z3vdkrz7b"; depends=[]; };
@@ -2722,8 +2879,9 @@ let self = _self // overrides; _self = with self; {
   mclogit = derive { name="mclogit"; version="0.2-7"; sha256="1ykkrbbnha7npmxr79qc7x77xa3847rjcax6gxrala5s07yg7sww"; depends=[memisc Matrix]; };
   mclust = derive { name="mclust"; version="4.3"; sha256="0ii3w4d66p47i0xmjl9gz4g36piqz3b2kny876qdfjj7wh9m7hpl"; depends=[]; };
   mcmc = derive { name="mcmc"; version="0.9-3"; sha256="148l28nb1qv82x2hj46c26yhn0lw8x5jsrp2dav9sbysv1bdj2f8"; depends=[]; };
-  MCMCglmm = derive { name="MCMCglmm"; version="2.19"; sha256="1rwg5ys8k3ccdndsyswmv2q4hnhqkqix2l271qafhg71nxlm1wd1"; depends=[Matrix coda ape corpcor tensorA]; };
+  MCMCglmm = derive { name="MCMCglmm"; version="2.21"; sha256="1mjjp65w7pg2kxrx2qf0lh1kdi9d21xxj7s39zhi3q8ixw35h95r"; depends=[Matrix coda ape corpcor tensorA]; };
   MCMChybridGP = derive { name="MCMChybridGP"; version="4.3"; sha256="1a2mhhscjf7s2qczc4zz2pvb9kichdqr1lnkjsyiy61snbhkvp3n"; depends=[MASS]; };
+  MCMC_OTU = derive { name="MCMC.OTU"; version="1.0.8"; sha256="1bdmvwxkm162m3237bgf42dm5kp3q0giwf0avrkla8qd834gqch0"; depends=[MCMCglmm ggplot2]; };
   MCMCpack = derive { name="MCMCpack"; version="1.3-3"; sha256="0s1j3047qp2fkwdix9galm05lp7jk7qxyic6lwpbd70hmj8ggs76"; depends=[coda MASS]; };
   mcmcplots = derive { name="mcmcplots"; version="0.4.1"; sha256="0japi78j1a9q6mb7j74d81lj45j8878mdby7765yz8xnjzwjpslb"; depends=[coda sfsmisc colorspace denstrip]; };
   MCMC_qpcr = derive { name="MCMC.qpcr"; version="1.1.3"; sha256="101pbg08p594ilcrrig9sqkddprpl6cd6g9y9rrk1rq6cy5cmrvr"; depends=[MCMCglmm ggplot2]; };
@@ -2735,15 +2893,15 @@ let self = _self // overrides; _self = with self; {
   McParre = derive { name="McParre"; version="1.0.1"; sha256="16bfca867drbknzc6bylg8paa8p72l23wgjpyvy4pd9z6lpgmhdy"; depends=[MASS]; };
   MCPerm = derive { name="MCPerm"; version="1.1.4"; sha256="0g65vzn43k6qrsglxd2kz245f662gl3c2gdz6qvvxa96v6q9lhh1"; depends=[metafor]; };
   MCPMod = derive { name="MCPMod"; version="1.0-7"; sha256="1iv4c3hsi69yhwch5mf88l27pni07yjnkjqr53kkq167axs7zklx"; depends=[mvtnorm lattice]; };
-  mcprofile = derive { name="mcprofile"; version="0.1-7"; sha256="0zjrm3bgr83pqlyjkhg6iwlw4xm4d9ad9gixbav417yw2n9h4p1l"; depends=[quadprog ggplot2 mvtnorm]; };
+  mcprofile = derive { name="mcprofile"; version="0.2-0"; sha256="1vcrszx0fzvvgn8fjja5ncsdvbkikxf2ri52c09xyqnq97r5hx68"; depends=[ggplot2 quadprog mvtnorm]; };
   mcr = derive { name="mcr"; version="1.2.1"; sha256="0237w41xichd418ax9xviq4wxbcc6c0cgr5gvzkca67nnqgc4jaz"; depends=[]; };
   mcsm = derive { name="mcsm"; version="1.0"; sha256="13sx7s3ywis5n4a70ld2szld9fb8jkfsc82dy6iskhy17vy8pml0"; depends=[MASS coda]; };
   McSpatial = derive { name="McSpatial"; version="2.0"; sha256="18nmdzhszqcb5z9g8r9whxgsa0w3g7fk7852sgbahzyw750k95n4"; depends=[lattice locfit maptools quantreg RANN SparseM]; };
   mda = derive { name="mda"; version="0.4-4"; sha256="18a12fnhcx911ii8wfqkyi8yxrhbiw2pi6mhywgxzsl3a09g8ghh"; depends=[class]; };
   mdatools = derive { name="mdatools"; version="0.5.3"; sha256="00zv97asyxp6m4fckkrzba2v1b24a3qzdh4f03nbv5nxdkmbpv4a"; depends=[]; };
-  mded = derive { name="mded"; version="0.1-0"; sha256="0r4pfkgndq71mbkk9yn8f3csa12kn20q7whiy24v875y8sg7w9gf"; depends=[]; };
+  mded = derive { name="mded"; version="0.1-1"; sha256="1r2sjg661abzsbqdyq2mlyacnv5rd60jfg2156cq5qyknxkin01m"; depends=[]; };
   MDM = derive { name="MDM"; version="1.3"; sha256="1bvjhl243rf19829ly1qc20ik937hb82lq23aiysj7ya55z8hdpf"; depends=[nnet]; };
-  MDPtoolbox = derive { name="MDPtoolbox"; version="4.0.1"; sha256="1iskq61zvv1n0k5akdiwkvkw2kb312cpf7rgjdi45shad6z33n4d"; depends=[Matrix linprog]; };
+  MDPtoolbox = derive { name="MDPtoolbox"; version="4.0.2"; sha256="04w0y5ib23l7nhj1947hwvfk6lpwwc11amqpyw1w53yj794g97wz"; depends=[Matrix linprog]; };
   MDR = derive { name="MDR"; version="1.2"; sha256="0g2fvvcwagml6635va87nc0ijzy0pypx5aqzz7mf5w13j0wpm24y"; depends=[lattice]; };
   meboot = derive { name="meboot"; version="1.4-3"; sha256="0n01g1mjm07pii1las7l2003kg705fqdi941l9lyvdkglnx0dkc6"; depends=[dynlm nlme]; };
   mederrRank = derive { name="mederrRank"; version="0.0.7"; sha256="08jbqmb418qb7v2x6lm4wig1pfzzfx6fhb49mbfhlkbmssbqsjfq"; depends=[BB numDeriv]; };
@@ -2752,9 +2910,10 @@ let self = _self // overrides; _self = with self; {
   medSTC = derive { name="medSTC"; version="1.0.0"; sha256="1f7w6jbxairqvghr5b7vgdllg3ian16a1fgi7vqlq0mhy2j6phan"; depends=[]; };
   MEET = derive { name="MEET"; version="5.1.1"; sha256="02xz2zkwqaf1wck9a3h1j6z8dasw4j0zqa88jg6h10wqzcrlp9ba"; depends=[seqinr Matrix ROCR Hmisc KernSmooth]; };
   mefa = derive { name="mefa"; version="3.2-5"; sha256="037vpnwclyj6xgycznh6g6qlirlgy3sjnkjqb1046q80b5ywv2ni"; depends=[]; };
-  mefa4 = derive { name="mefa4"; version="0.3-0"; sha256="1n56k8xr2qpmd57cj8z3n9w62h71g4aqsm8yis4dw2vsrfqp2jmf"; depends=[Matrix]; };
+  mefa4 = derive { name="mefa4"; version="0.3-1"; sha256="0zyjhq80krnb11wh8p8006qz0znrps3qsd2qnhkw7zwl5282i1zp"; depends=[Matrix]; };
   meifly = derive { name="meifly"; version="0.3"; sha256="1x3lhy7fmasss0rq60z5qp74ni32sahw62s8cnp2j431sp95pczc"; depends=[plyr leaps MASS]; };
-  mem = derive { name="mem"; version="1.3"; sha256="02q5awb7hh1rn2s54kl2pp935fbj7nq09z6pzhdjflxd0kw1340d"; depends=[sm boot]; };
+  mem = derive { name="mem"; version="1.4"; sha256="1d3fgllh7fhlfz3rz2jm31r8vn7msz4na4762iaw161qp2j101db"; depends=[sm boot]; };
+  memgene = derive { name="memgene"; version="1.0"; sha256="00b1mi2hvzzps542mh2p96s27kjqkpcic7djklfcwnfn1m4bz0i5"; depends=[ade4 raster gdistance vegan]; };
   memisc = derive { name="memisc"; version="0.96-9"; sha256="0nra47086z4cxwx2hj0w3rdc7zi7k05z9fm6mxw2gi19jgamwcma"; depends=[lattice MASS]; };
   memoise = derive { name="memoise"; version="0.2.1"; sha256="19wm4b3kq6xva43kga3xydnl7ybl5mq7b4y2fczgzzjz63jd75y4"; depends=[digest]; };
   MEMSS = derive { name="MEMSS"; version="0.9-2"; sha256="0wyw8yjs4miwgwdfcnfbzvkxrgv5r3jlg3cg8q2vy7s69wvhksmy"; depends=[lme4]; };
@@ -2762,25 +2921,28 @@ let self = _self // overrides; _self = with self; {
   MergeGUI = derive { name="MergeGUI"; version="0.2-1"; sha256="1hx03qv5jyjjmqdvylc3kz5dl5qsdqwlirjbrnxrw7grkgkhygap"; depends=[gWidgetsRGtk2 ggplot2 cairoDevice rpart]; };
   merror = derive { name="merror"; version="2.0.1"; sha256="09v62f7ycywasid3b7x52dhidplwdbx9fd0855b40jklfy469bkn"; depends=[]; };
   MESS = derive { name="MESS"; version="0.2-1"; sha256="1hqq615643iqhw6kvcxnxqlpzirdvq0hjm7j2n9x5zkr62syaql3"; depends=[geepack kinship2 mvtnorm]; };
-  meta = derive { name="meta"; version="3.5-0"; sha256="1ckyvvgi2q2gpdq6la0lwg787k3qv22f3jxd235l0f50lfvri7dn"; depends=[]; };
+  meta = derive { name="meta"; version="3.7-1"; sha256="0v8pi7lv645vkw6l13r251hh1rzvsklpx98kx6y3d0kwkbcj3p23"; depends=[]; };
   MetABEL = derive { name="MetABEL"; version="0.2-0"; sha256="0rqjv85mgswrbbp8b8ip6cdmz0cvfy9lm5mcr8a7h38rzgx3g3i3"; depends=[]; };
   MetabolAnalyze = derive { name="MetabolAnalyze"; version="1.3"; sha256="0cl76x6imx4a95wd74xx5s8i2vg8wq3inqgakvgzmkwxad6qhrqp"; depends=[mclust mvtnorm ellipse gtools gplots]; };
   metabolomics = derive { name="metabolomics"; version="0.1.3"; sha256="1i5wqpjqbl5rhmys6l3iqkrnni7hw7ihq6c5l49ibi7mfyhzq5j9"; depends=[crmn]; };
   metacom = derive { name="metacom"; version="1.3"; sha256="12asmqwaihm9j6p6qp79m1j93gfcj6rkwmpywhi6nv4g85c1shll"; depends=[vegan lattice]; };
   metacor = derive { name="metacor"; version="1.0-2"; sha256="04k3ph0yg3jp8x4g6l1h4m0qwl51mx0626xmm0fzr1pv4b4a1ypw"; depends=[rmeta gsl]; };
   MetaDE = derive { name="MetaDE"; version="1.0.5"; sha256="1ijg64bri5jn2d3d13q1gvvfyqmbh6gn0lk6dkihixf0jwvjdyqi"; depends=[survival combinat]; };
-  metafor = derive { name="metafor"; version="1.9-2"; sha256="1mk53g7jx4c62q4wmwsfmyki1s1g46hr9vhrmshlf6cgqhrmj90z"; depends=[Formula]; };
-  metagen = derive { name="metagen"; version="0.2"; sha256="1rhs11qv8vfh8wmh0ga7zsaxnkvk3cfsqip13a9k5x15ph7kpci9"; depends=[MASS lhs plyr BBmisc ParamHelpers BatchJobs BatchExperiments ggplot2 metafor]; };
+  metafolio = derive { name="metafolio"; version="0.1.0"; sha256="18s78lljwnn3j0l3mqc0svszcb3c8yzyzlpnimndbiq9yxagxnnf"; depends=[Rcpp plyr colorspace MASS]; };
+  metafor = derive { name="metafor"; version="1.9-4"; sha256="1kfj59jdns1b9m40xdpqyxjq592mkdr2f4i6nswkqga28ss8nk8w"; depends=[Formula Matrix]; };
+  metagen = derive { name="metagen"; version="1.0"; sha256="0jvbm22976aqvmfnjzs51n2w099yj5hpx6hd0pgvbia80jk7b9vk"; depends=[MASS lhs plyr BBmisc ParamHelpers BatchJobs BatchExperiments ggplot2 metafor]; };
   metaLik = derive { name="metaLik"; version="0.41.0"; sha256="08wiriq6cm02d0b0q34056y5249daidpjzkwzgjq6dh55v5fp2s4"; depends=[]; };
   metaMA = derive { name="metaMA"; version="2.1"; sha256="1hwhj3m4n48qb9vqix2qazsy1xnmwk8x37zm826xx9j0n5j2ilac"; depends=[SMVar]; };
   metamisc = derive { name="metamisc"; version="0.1.1"; sha256="1cvlsix3b857xdw6anqhqsrfwxpnf4rbzg4ybf6aw7vcdc05zgwd"; depends=[mvtnorm ellipse bbmle rjags coda]; };
-  metap = derive { name="metap"; version="0.5-1"; sha256="1bfm5lg38d6ma6vras98d81xy77d2dhswn6jfk5q4cyx0wnx155j"; depends=[]; };
+  metap = derive { name="metap"; version="0.6"; sha256="1iy5cmwrlsr70z0qnqn30n15knsfclg383815a2a8yqpg5gs4953"; depends=[]; };
   MetaPCA = derive { name="MetaPCA"; version="0.1.4"; sha256="14g4v3hyxnds4l2q36mpz282yqg8ahgdw3b0qmj0xg17krrf5l2s"; depends=[foreach]; };
   MetaQC = derive { name="MetaQC"; version="0.1.13"; sha256="11595ggjr46z6xiwmhiyx1sydaq68l18y7mgdwxsg81g03ck9x1r"; depends=[proto foreach iterators]; };
   metaRNASeq = derive { name="metaRNASeq"; version="0.4"; sha256="14xqgxvlip6il1gx9xvv37683qm7zmyswklbcgqw9rgqifi0plal"; depends=[]; };
+  metasens = derive { name="metasens"; version="0.1-0"; sha256="0hrrzn6p14p2vs7bllkh9yxg0a3x87dmniglhq05p23g4lymcmbl"; depends=[meta]; };
   MetaSKAT = derive { name="MetaSKAT"; version="0.40"; sha256="1jxs32hvsw6wzci9f1rc7sw1dfyazdm2d57wcmhkggfg3hkdn1vv"; depends=[SKAT]; };
   metatest = derive { name="metatest"; version="1.0-4"; sha256="0bz6gg2n4ffkr144jxk27y24xpqhp8awr09wkaijmv8902qx6qah"; depends=[]; };
   Metatron = derive { name="Metatron"; version="0.1-0"; sha256="0pfkb8wh1gbygbi7m9c5zi630clkn2bd1y9yrdxjlqifzvwx4dbi"; depends=[lme4 mpt Matrix]; };
+  meteoForecast = derive { name="meteoForecast"; version="0.31"; sha256="02rbl05i70ss65946w1aa2bg01l8hspqmmqz4w8j2jhs6dhgd429"; depends=[raster sp zoo ncdf rjson]; };
   meteogRam = derive { name="meteogRam"; version="1.0"; sha256="167gyxjnl4dyfqs3znv8sdpkvpqdxzdqi1g730s30gycrm9snap9"; depends=[ggplot2 RadioSonde]; };
   Meth27QC = derive { name="Meth27QC"; version="1.1"; sha256="0ad30svs2kjzmmyvcm0jmv64iyq7slp1x1xl35h2rv1b6zbd4658"; depends=[gplots]; };
   MethComp = derive { name="MethComp"; version="1.22"; sha256="0wp2v8z5y9nl3jalcl2a42z2fpkwkzkvl407farws0yih0hj8b8l"; depends=[nlme]; };
@@ -2788,10 +2950,10 @@ let self = _self // overrides; _self = with self; {
   Metrics = derive { name="Metrics"; version="0.1.1"; sha256="1yqhlsmhh9sl7qngl85b7qb980s54h13wwznpakyvvwlar64yqrw"; depends=[]; };
   metRology = derive { name="metRology"; version="0.9-17"; sha256="1g4gv3mpii71i6imfwqg9d5iwfx03bq4lizzhx7dy39b2mj7jd4q"; depends=[MASS numDeriv]; };
   metrumrg = derive { name="metrumrg"; version="5.55"; sha256="1y95j8chnm34svf4q7ijqm19778pnap8734a40v3zb17zbjvs3aj"; depends=[reshape lattice XML MASS]; };
-  mets = derive { name="mets"; version="0.2.7"; sha256="1lrxc9x3f9srfmjmr8hhzwvip71dvg7372q7ia6vs4i3asc8cxa3"; depends=[timereg lava numDeriv Rcpp]; };
+  mets = derive { name="mets"; version="0.2.8"; sha256="11mvd8bjd2h106d7kr60axp24pp38z21jkabgbpcigzc14mrd8y9"; depends=[timereg lava numDeriv Rcpp]; };
   MetSizeR = derive { name="MetSizeR"; version="0.99"; sha256="1msq0la89fvg9vfz5k8rzsnhpqa9b8cjyhggp7mp10rzh696sdap"; depends=[gWidgets cairoDevice pscl gtools MetabolAnalyze]; };
   MetStaT = derive { name="MetStaT"; version="1.0"; sha256="0400gx6i8xlkm51da98ap91c3hgrkgfgxswn0plaxfry3625khkp"; depends=[MASS abind pls]; };
-  mewAvg = derive { name="mewAvg"; version="0.2.0"; sha256="06vww6r04ig7m8d31y7ag6nr53ska5avy6m0h3lsv4lxygzsyyl1"; depends=[]; };
+  mewAvg = derive { name="mewAvg"; version="0.3.0"; sha256="16gc78ccjffp9qgc7rs622jql54ij83ygvph3hz19wpk22m96glm"; depends=[]; };
   MExPosition = derive { name="MExPosition"; version="2.0.3"; sha256="1l27wp0psfvlkk79fhb8ypf8awardjljg1f37yj42friy9pdfksz"; depends=[prettyGraphs ExPosition]; };
   MF = derive { name="MF"; version="4.3.2"; sha256="1arnhyqf1cjvngygcpqk2g4d52949rhkjmclbaskyxcrvp62qln0"; depends=[]; };
   MFDA = derive { name="MFDA"; version="1.1-4"; sha256="0zf21al8ivmsxlf1i7kc01w0jx3s6650a034cdynz7axnxx28ncx"; depends=[gss mvtnorm]; };
@@ -2800,42 +2962,45 @@ let self = _self // overrides; _self = with self; {
   mfp = derive { name="mfp"; version="1.4.9"; sha256="1xnx4jgkxccli1y852kvf26q04mdidczpic3ms916a8mkby7kg3k"; depends=[survival]; };
   MFSAS = derive { name="MFSAS"; version="1.0-0"; sha256="1vnhkr4bgwdn6ffzqfp8w7z45m0ghrfr6ib4agv23frk36ypmxxr"; depends=[]; };
   mfx = derive { name="mfx"; version="1.1"; sha256="1zhpk38k7vdq0pyqi1s858ns19qycs3nznpa00yv8sz9n798wnn5"; depends=[sandwich lmtest MASS betareg]; };
-  mgcv = derive { name="mgcv"; version="1.7-29"; sha256="0xnp6k5mscg3g7y09zzmphlzwzank01av5i69w8ags021pdazh5n"; depends=[nlme Matrix]; };
+  mgcv = derive { name="mgcv"; version="1.8-2"; sha256="01ml3lwwisg96mb9xs5z5igy4hl480zwbf3s4kpwzzg375ksn49v"; depends=[nlme Matrix]; };
   MGLM = derive { name="MGLM"; version="0.0.6"; sha256="00kz2l7xn9df8n0035i2rkgj6rlb99y9z68935q8px70njs8rl87"; depends=[ggplot2 plyr reshape2]; };
   mgpd = derive { name="mgpd"; version="1.99"; sha256="0cxpgza9i0hjm5w1i5crzlgh740v143120zwjn95cav8pk8n2wyb"; depends=[evd numDeriv corpcor fields]; };
   mgraph = derive { name="mgraph"; version="1.03"; sha256="0av2c0jvqsdfb3i0s0498wcms0n2mm0z3nnl98mx2fy7wz34z8b2"; depends=[rgdal]; };
+  MGRASTer = derive { name="MGRASTer"; version="0.9"; sha256="0jmf2900r56v60981sabflkhid3yrqd9xd7crb56vgfl1qkva9zp"; depends=[]; };
+  MGSDA = derive { name="MGSDA"; version="1.0"; sha256="1h4sz9csc5cvkr0jnwas28233yx4v0lwxsgl6vh4gxk8w81md25y"; depends=[glmnet]; };
   mGSZ = derive { name="mGSZ"; version="1.0"; sha256="08l98i75h2h8kx9ksvzp5qr8jhf0l6n4j7rg8fcn7hk8chn8v5zh"; depends=[GSA MASS ismev]; };
   MHadaptive = derive { name="MHadaptive"; version="1.1-8"; sha256="1w3bm82v8ahxrf0vqn0pznv7dqn212drinkz8y5kr1flx423l9ws"; depends=[MASS]; };
   mhsmm = derive { name="mhsmm"; version="0.4.12"; sha256="0k8qm447fcgfc5fmqn478dszr76jmin85k51ccqmhgk14jiz64bf"; depends=[mvtnorm]; };
   mht = derive { name="mht"; version="3.00"; sha256="143gmipx6v9nvg2lq1kbl7ns6qmvwpxf3gzmq4b6cfgamcljl05l"; depends=[glmnet]; };
   mhurdle = derive { name="mhurdle"; version="1.0-1"; sha256="1x631fgbq3ika05svyavzadyjd7vi9bcmsgb58wfhpf9xq6j5rcr"; depends=[Formula truncreg maxLik pbivnorm]; };
   mi = derive { name="mi"; version="0.09-18.03"; sha256="01cxkqy5g0i7bqr9rb86075p5gmwgcs7cvs4nfs00r5vjw1hgq61"; depends=[arm abind car foreign lme4 MASS Matrix nnet R2WinBUGS]; };
-  mice = derive { name="mice"; version="2.21"; sha256="1j3gn84ch5jw0z9bnyjbavqx064p2x2cd8jsfp368w1xngsf9ll1"; depends=[Rcpp lattice MASS nnet randomForest rpart]; };
-  miceadds = derive { name="miceadds"; version="0.11-121"; sha256="13w3jn99214gc0qx8cgpg1hmg5q9nv1kd2rkqzqqp2fif6hls9ll"; depends=[MASS mice mvtnorm pan sirt lme4 MBESS pls mitools bayesm Rcpp]; };
+  mice = derive { name="mice"; version="2.22"; sha256="1b7ivpa21ipzbmmwjn1ch968zpw6wydg30f7jdk95m40lrk2xs68"; depends=[Rcpp lattice MASS nnet randomForest rpart]; };
+  miceadds = derive { name="miceadds"; version="0.14-9"; sha256="0zfqs52kaj9sxdzc7j0zxbnaqnkz9a8pwgn2p0pz46qf7kgx6y16"; depends=[MASS mice mvtnorm pan sirt lme4 MBESS pls mitools bayesm Rcpp inline car foreign]; };
   micEcon = derive { name="micEcon"; version="0.6-12"; sha256="1kxhr3qqgswq8glrjfcjz0hyb163lwf303yhwlgrwjciqgp5dq17"; depends=[miscTools]; };
-  micEconAids = derive { name="micEconAids"; version="0.6-14"; sha256="0rjr9pf2imy6ywscqx3v6vwa8abd313p16b9chfc96sdxbkv2ch9"; depends=[lmtest micEcon systemfit miscTools]; };
+  micEconAids = derive { name="micEconAids"; version="0.6-16"; sha256="07hsabrlkwpdaalh0b7izraz2q5dlxn373ccijc5c4zsrkgk7kij"; depends=[lmtest micEcon systemfit miscTools]; };
   micEconCES = derive { name="micEconCES"; version="0.9-8"; sha256="06g6z8hf7y9d942w6gya0fd5aidzfjkx3280gjygdlwpv7nlpqzv"; depends=[minpack_lm DEoptim systemfit car micEcon miscTools]; };
   micEconSNQP = derive { name="micEconSNQP"; version="0.6-6"; sha256="1n3pxapc90iz1w3plaqflayd0b1jqd65yw5nbbm9xz0ih132dby9"; depends=[miscTools systemfit MASS]; };
   MiClip = derive { name="MiClip"; version="1.2"; sha256="0cszylg7sk88gs1f4dfshw74kdifjr4q069ssxzgss9k90rszp30"; depends=[moments VGAM]; };
   microbenchmark = derive { name="microbenchmark"; version="1.3-0"; sha256="1j0pif46bymmkgr61yf2xv2ymm0xwx52lyc46pgas4i9czygdc9v"; depends=[]; };
-  MicroDatosEs = derive { name="MicroDatosEs"; version="0.4"; sha256="14xrxf25a2w9h03sm0ppm38sa5cw2xpfxy4l056baafr9hilgvaf"; depends=[memisc Hmisc]; };
-  micromap = derive { name="micromap"; version="1.8"; sha256="0mqxqr0sx3351ln0hcr5xdijd4cg41ib7pslgbx58pwbnhy7g3pi"; depends=[ggplot2 maptools RColorBrewer rgdal]; };
+  MicroDatosEs = derive { name="MicroDatosEs"; version="0.6.3.1"; sha256="17ka9bdic8vdr0aabmgm216zm9a8jppxll042b5ric4vzplah17d"; depends=[memisc Hmisc]; };
+  micromap = derive { name="micromap"; version="1.9"; sha256="0scb79rrj11vy7qgq27hy8222ar22yagk31bq8b5z268zwfbw4fs"; depends=[ggplot2 maptools RColorBrewer rgdal]; };
   micromapST = derive { name="micromapST"; version="1.0.3"; sha256="182zhpsps8cx3wflc5j62njzsv108d5a30v9sb1wpxpcrnsyr343"; depends=[RColorBrewer]; };
   MicroStrategyR = derive { name="MicroStrategyR"; version="1.0-1"; sha256="0a6bk0wnwx8zy9081n7wb12lidgckrhn350r0q5m6aa82l6l8ihi"; depends=[gWidgetsRGtk2]; };
-  MicSim = derive { name="MicSim"; version="1.0.3"; sha256="0h7mhw6476yabl4avin6pkihplg0q8dh7k63rix65aanam07wj8q"; depends=[chron snowfall rlecuyer]; };
+  MicSim = derive { name="MicSim"; version="1.0.6"; sha256="01w9x3ld8b64m3d9qjbja6gbmgnsj2bna9l7lisa17add0i11744"; depends=[chron snowfall rlecuyer]; };
   midasr = derive { name="midasr"; version="0.3"; sha256="1gdfrf8p4wxz03bzdqrvj4ss14zy7dh5ac04ncvg4db2wcdxq6z5"; depends=[sandwich optimx MASS numDeriv Matrix]; };
   MIfuns = derive { name="MIfuns"; version="5.1"; sha256="1jhiaf9wrwgrlsl8s81qh0m8x1vpa01gnw2nxcfpshi7i9il3lw7"; depends=[reshape lattice XML MASS]; };
   MigClim = derive { name="MigClim"; version="1.6"; sha256="171pnalidyw0v2fcjdc3kyrq5kg035kwj5xl8zwgn3hlanpaljvp"; depends=[SDMTools raster]; };
-  migest = derive { name="migest"; version="1.5"; sha256="1n82z8cl6y3v5fappvslvlviz5r60bz7jx91khk04ygprrb5amgg"; depends=[]; };
+  migest = derive { name="migest"; version="1.6"; sha256="1mjjcba74nk10kdbsaphih3zdyaqmf02hrv13s34klwdwkp3nv0m"; depends=[]; };
   migration_indices = derive { name="migration.indices"; version="0.3.0"; sha256="0h0yjcj70wzpgrv3wl1f2h2wangh1klsllq0i0935plgzw736mwd"; depends=[calibrate]; };
   migui = derive { name="migui"; version="0.00-09"; sha256="0mrvsls9q039pay0vf59xwg6bbr7ahwl4x3iwvar6sbfg8606as8"; depends=[tkrplot mi foreign]; };
   MIICD = derive { name="MIICD"; version="1.1"; sha256="0d697mggax1yp7b4dfxdi25rqmwrq25gmmjqsag6sa5raqr96gc9"; depends=[mstate prodlim cmprsk riskRegression MASS survival]; };
   MILC = derive { name="MILC"; version="1.0"; sha256="14xsiw5al6kixwvf3ph0dlm8s13gsbqvzb92da6ng3x4iiyb1g0w"; depends=[]; };
-  mime = derive { name="mime"; version="0.1.1"; sha256="1kgm06n9flw2kh9f63h3i20wg663qscfdvs7dpyb68ic3c7aimci"; depends=[]; };
+  mime = derive { name="mime"; version="0.1.2"; sha256="0afndhp8sxvx689b0i9mx52ws9wynd41z8ij3kqnqcz0sa1n4ifb"; depends=[]; };
   MImix = derive { name="MImix"; version="1.0"; sha256="033gxr0z2xba0pgckiigblb1xa94wrfmpgv3j122cdynjch44j4r"; depends=[]; };
   MindOnStats = derive { name="MindOnStats"; version="0.8"; sha256="1fsswkbrxd3f0hz3nd25xvp36si292s4q2r52hw6rsps2mx6bgqi"; depends=[]; };
   minerva = derive { name="minerva"; version="1.3"; sha256="0ph65jfm05wck3zz0lh3bmaj0p4c9309nzkrjpjxqkcnrfdbw6wf"; depends=[]; };
   Miney = derive { name="Miney"; version="0.1"; sha256="0sgln0653rgglinr8rns5s2az0lgyp9slmynyhhhs265grkhrfj0"; depends=[]; };
+  miniCRAN = derive { name="miniCRAN"; version="0.0-16"; sha256="01f8cgvnzji56qd7d8cnhm5cp9mx45kyxfkqf46l10c8rhll6h3c"; depends=[XML]; };
   miniGUI = derive { name="miniGUI"; version="0.8.0"; sha256="1iq52x7wbcin7ya207jj3k9vym7mavm5z61vggyabdmr768pci39"; depends=[]; };
   minimax = derive { name="minimax"; version="1.0"; sha256="1g0d9q5h1avbb0yg7ajw5330820i3n5cgkpsif754l4j3ikya8p3"; depends=[]; };
   minpack_lm = derive { name="minpack.lm"; version="1.1-8"; sha256="0nvsxqwg3k9k3dqjzkz1vq2z0xla317011zm9ms8y1qvf75raz83"; depends=[]; };
@@ -2846,12 +3011,13 @@ let self = _self // overrides; _self = with self; {
   miP = derive { name="miP"; version="1.1"; sha256="17y2badm76iwidjp45flm9ln098lk9r5m6lgx3skzcq3hp075967"; depends=[VIM mi mice Amelia lattice vcd]; };
   MIPHENO = derive { name="MIPHENO"; version="1.2"; sha256="0hcaq66biv4izszdhqkgxgz91mgkjk1yrwq27fx07a2zmzj44sfv"; depends=[doBy gdata]; };
   miRada = derive { name="miRada"; version="1.13.8-8"; sha256="1m6rm65pv4r16r0s5ih69nr3v2rnpsvpdpk07pi7k4f7v9wck71v"; depends=[]; };
-  mirt = derive { name="mirt"; version="1.3"; sha256="15136xr7awf6p736g03dxz669rg7x98gfpipxw1fv4kg10zmnk5k"; depends=[lattice GPArotation Rcpp numDeriv]; };
-  miRtest = derive { name="miRtest"; version="1.6"; sha256="11jjrw539pgnqh509hba4i3s59hd7797mfcjaadb3jnjg5yxldmc"; depends=[corpcor MASS RepeatedHighDim]; };
+  mirt = derive { name="mirt"; version="1.4"; sha256="0ngm22lhwfv2l68nn7qrvjpyz49kcasdaj2jx46fcb4851xxahyw"; depends=[lattice GPArotation Rcpp numDeriv]; };
+  miRtest = derive { name="miRtest"; version="1.7"; sha256="0nqn3xrwlw2z9wjhf6rv0n9frqqviiv54syxyn1nkcn2d5lygwn3"; depends=[corpcor MASS RepeatedHighDim]; };
   misc3d = derive { name="misc3d"; version="0.8-4"; sha256="0qjzpw3h09qi2gfz52b7nhzd95p7yyxsd03fldc9wzzn6wi3vpkm"; depends=[]; };
   miscF = derive { name="miscF"; version="0.1-2"; sha256="195rb9acdirfhap0z35yvcci5xn4j84mlbafki4l1vfgqgnh0ajj"; depends=[MCMCpack mvtnorm Rcpp RcppArmadillo]; };
-  miscFuncs = derive { name="miscFuncs"; version="1.2-4"; sha256="0dql47pn0pq3rxybpc4x3c4m8d83h5j5a5zm0l4mqzjbhwd45src"; depends=[roxygen2 mvtnorm]; };
+  miscFuncs = derive { name="miscFuncs"; version="1.2-6"; sha256="1302k6pvf74a0b9bkdjdr2j1xl98842rbq7137h8hwldl50g48i7"; depends=[roxygen2 mvtnorm]; };
   MiscPsycho = derive { name="MiscPsycho"; version="1.6"; sha256="1zs6apivzzii7nln3jmhxggnhxk3j54cw84wbsc8hb279rv943il"; depends=[statmod]; };
+  miscset = derive { name="miscset"; version="0.3.1"; sha256="1x1948cwxjqkz23p14ilv5x381xbfkzg328n51fw3sqz11lb2h8g"; depends=[Rcpp xtable]; };
   miscTools = derive { name="miscTools"; version="0.6-16"; sha256="19mslb64lm8srrmml1v40rfkxhqw02bplw0yjv7qnkqj44hcqfw1"; depends=[]; };
   missForest = derive { name="missForest"; version="1.4"; sha256="0y02dhrbcx10hfkakg5ysr3kpyrsh2d9i5b0qzhj9x5x0d5q11gp"; depends=[randomForest foreach itertools]; };
   MissingDataGUI = derive { name="MissingDataGUI"; version="0.2-0"; sha256="18z25wjq4mcd7vv7wg1xz0hmac2dvd1ap91p22yxvpk1qjllzaq3"; depends=[gWidgetsRGtk2 ggplot2 GGally cairoDevice reshape]; };
@@ -2863,16 +3029,18 @@ let self = _self // overrides; _self = with self; {
   MitISEM = derive { name="MitISEM"; version="1.0"; sha256="03305ds3rgr29z4idaxzsm83igiygna2sqd5vpixklngsrp8w341"; depends=[mvtnorm]; };
   mitools = derive { name="mitools"; version="2.2"; sha256="08sbm17sw549ljid93x64lxg79f860as6j3vv0f8nh1zb9rabqh8"; depends=[foreign]; };
   mix = derive { name="mix"; version="1.0-8"; sha256="0zdbxrslj39cl272ggzvlc41gysj1inbcbmsa4ch7ss5xvk5vfbf"; depends=[]; };
-  mixAK = derive { name="mixAK"; version="3.5"; sha256="1lqazxr5l4a1dpap48b096xclr0b1bbdqyp70gisphblsg6aa9d6"; depends=[colorspace lme4 fastGHQuad mnormt]; };
+  mixAK = derive { name="mixAK"; version="3.6-1"; sha256="1khnxvmnd7qwk3lxld70dwxfdya2rq4ybdal89v0p7mxcv9abzdh"; depends=[colorspace lme4 fastGHQuad mnormt]; };
   mixcat = derive { name="mixcat"; version="1.0-3"; sha256="0xszngygd3yj61pvv6jrrb5j0sxgpxzhlic69xrd5mv5iyw0cmxd"; depends=[statmod]; };
   mixdist = derive { name="mixdist"; version="0.5-4"; sha256="100i9mb930mzvdha31m1srylmpa64wxyjv6pkw1g5lhm1hsclwm3"; depends=[]; };
   mixedQF = derive { name="mixedQF"; version="0.3"; sha256="037376k13qh0c5nw1nxx3fvffisl9kcdyjz5d4i6vn3gfj0yqccc"; depends=[nnet MASS]; };
+  MixedTS = derive { name="MixedTS"; version="1.0.1"; sha256="0ljal2jxscwrv439blavf5gjxbi3k3jfqqmwblzfvc05dqgvdk0b"; depends=[MASS]; };
   mixer = derive { name="mixer"; version="1.7"; sha256="0as9l0s646snli5pykh0i6zpz168f8i5wmxk07l5rhxnb74m0id2"; depends=[]; };
-  mixexp = derive { name="mixexp"; version="1.1.1"; sha256="176idz03m24czvzgviqjfwrlsj7iqj1j146x2a6n4nirdnarjwjd"; depends=[gdata lattice]; };
-  mixlm = derive { name="mixlm"; version="1.0.2"; sha256="03m3aqyy5bck4qf19y2lbfr6rqfwnsbkz0gbfvwgyg6bwrl564s1"; depends=[multcomp pls leaps lme4 car]; };
+  mixexp = derive { name="mixexp"; version="1.1.2"; sha256="11gzjmg0nifr18nikga1fx8bdgqn2kj1jsyk8q6vi9q9k952f746"; depends=[gdata lattice]; };
+  MixGHD = derive { name="MixGHD"; version="1.0"; sha256="008xbbvyc8lm1375yvbk7zvqz2hbf87jq7q9xv75zn65gxm8j93m"; depends=[Bessel MASS mvtnorm ghyp numDeriv]; };
+  mixlm = derive { name="mixlm"; version="1.0.5"; sha256="104rh4g7ik1ry0xb53n5b5fv1spvck6s2k2h4xjlp1ykazph073y"; depends=[multcomp pls leaps lme4 car]; };
   mixlow = derive { name="mixlow"; version="1.0.1"; sha256="12vnp3gl3ykxzgvc4bwhi4flmc1sl2y77yi0zi4by17q93a49akm"; depends=[nlme]; };
   MixMAP = derive { name="MixMAP"; version="1.3.1"; sha256="0m6m9wi0ain7z96s6z6kmwjisfqm3al6m459y5zr2l1cdbdpxfpv"; depends=[lme4]; };
-  mixOmics = derive { name="mixOmics"; version="5.0-1"; sha256="0y24z1kk1q9hpy7jm76yqybg29afyjfjayxasyxldvgk1k60634r"; depends=[MASS lattice RGCCA igraph rgl pheatmap]; };
+  mixOmics = derive { name="mixOmics"; version="5.0-2"; sha256="01xcmm9g80cn8bmq761h3v5az5pj0qldnbszgqx6b2bcrxkc0wg9"; depends=[MASS lattice RGCCA igraph rgl pheatmap]; };
   mixPHM = derive { name="mixPHM"; version="0.7.0"; sha256="0gyvccz205wwnmggh5zw90r6kmr5lv4s4zrdazi2ghjjrvv0gv6b"; depends=[survival lattice]; };
   mixRasch = derive { name="mixRasch"; version="1.1"; sha256="1r067pv7b54y1bz8p496wxv4by96dxfi2n1c99gziqf5ramx3qzp"; depends=[]; };
   mixreg = derive { name="mixreg"; version="0.0-5"; sha256="0wsb1z98ymhshw9nhsvlszsanflxv3alwpdsw8lr3v62bkwka8zr"; depends=[]; };
@@ -2880,11 +3048,11 @@ let self = _self // overrides; _self = with self; {
   MixSim = derive { name="MixSim"; version="1.0-9"; sha256="16kg12784z82x8f1vscv9d5yakmki2m8gqr4hy9417c31xfkk3zy"; depends=[MASS]; };
   mixsmsn = derive { name="mixsmsn"; version="1.0-9"; sha256="0pgip1xfgfrdy3g3197d7visn164zi7xnp6wlsgjwxdylvjsxkji"; depends=[mvtnorm]; };
   mixstock = derive { name="mixstock"; version="0.9.5.1"; sha256="05bnxz7xkr5j96r85r7pc47svc60nwfmfax76naplzbvn751mhkg"; depends=[coda plotrix abind lattice]; };
-  mixtools = derive { name="mixtools"; version="1.0.1"; sha256="16rw8dggz5944rl5ijfdzymxdp5kb08690ppagbqbjmadmrzafaf"; depends=[boot MASS segmented]; };
-  mixture = derive { name="mixture"; version="1.0"; sha256="17gbnz82ld4d3rd4nizc27qyj0j6ca4vlj9y7sam74h35g2xrkm1"; depends=[]; };
+  mixtools = derive { name="mixtools"; version="1.0.2"; sha256="0x809m6lbzprd5kq6wqk528x9apaj5df3sidzk9jiw06qklngwg8"; depends=[boot MASS segmented]; };
+  mixture = derive { name="mixture"; version="1.1"; sha256="09hp28fh1y2kllny6l0zciwbhhnjjgyipsx1vs55rq7rr0s94pkn"; depends=[]; };
   MixtureInf = derive { name="MixtureInf"; version="1.0-1"; sha256="1cq8zzhhb6vg545n9aw1b9fhx025zy75dd6pw161svsb5776py5d"; depends=[]; };
   mizer = derive { name="mizer"; version="0.2"; sha256="0cpal9lrjbvc923h499hbv4pqw3yjd4jvvhgayxgkak2lz2jzmcz"; depends=[plyr reshape2 ggplot2]; };
-  mkin = derive { name="mkin"; version="0.9-24"; sha256="0qg9110h8frva3l3gqy8d6c0nq4z5j9y5jqzpqv00fn5v2dw4zrd"; depends=[FME deSolve minpack_lm]; };
+  mkin = derive { name="mkin"; version="0.9-32"; sha256="1b1s1px4zcbpk2wl49qricxgjw4pvffhvf3ccyrjhxdrdpmcknyr"; depends=[minpack_lm rootSolve FME deSolve]; };
   MKLE = derive { name="MKLE"; version="0.05"; sha256="00hcihjn3xfkzy0lvb70hl2acjkwk6s3y7l4gprix24shnblvxzi"; depends=[]; };
   MKmisc = derive { name="MKmisc"; version="0.96"; sha256="1lcnmswvix290s63cqqlq4ls6wyzzb3f5ykcn4sch6nv71bn8x5x"; depends=[RColorBrewer robustbase]; };
   mkssd = derive { name="mkssd"; version="1.1"; sha256="1qqzy6fn6sc3lxahc19hzzf1hzxsyvxqi7npynw0vkknlrvh2ijp"; depends=[]; };
@@ -2905,10 +3073,10 @@ let self = _self // overrides; _self = with self; {
   mlogitBMA = derive { name="mlogitBMA"; version="0.1-6"; sha256="1wl8ljh6rr1wx7dxmd1rq5wjbpz3426z8dpg7pkf1x9wr94a2q25"; depends=[BMA abind maxLik]; };
   MLPAstats = derive { name="MLPAstats"; version="0.5-9"; sha256="0cy315kj2ivqwrdhg85ncp634mwx2bbwzs86w1pcjwf03v217wk9"; depends=[nlme boot tkrplot pixmap]; };
   mlPhaser = derive { name="mlPhaser"; version="0.01"; sha256="1s2mqlnbcjdkx0ghvr2sw9rzggqa4jy2vzi9vbyqkh6795lgck6n"; depends=[]; };
-  mlr = derive { name="mlr"; version="1.1-18"; sha256="07f68afywylml4qqnid90idvhnplxqlv3gh7shm6769s15cv992a"; depends=[ParamHelpers BBmisc parallelMap codetools]; };
+  mlr = derive { name="mlr"; version="2.1"; sha256="15czq70hgfbfr1j9lhbsrmmf2d5mqvy1zj9xkmnycfvk0zsh996j"; depends=[ParamHelpers BBmisc parallelMap codetools survival checkmate]; };
   MLRMPA = derive { name="MLRMPA"; version="1.0"; sha256="0gfbi70b15ivv76l3i0zlm14cq398nlny40aci3vqxxd0m2lyyx5"; depends=[ClustOfVar]; };
   MM = derive { name="MM"; version="1.6-2"; sha256="1z7i8ggd54qjmlxw9ks686hqgm272lwwhgw2s00d9946rxhb3ffi"; depends=[magic partitions emulator Oarray]; };
-  mmand = derive { name="mmand"; version="0.1.2"; sha256="00ag668nsl62g2dcndycfh3lljchal2rmbl4qpr8q03h8zjznln7"; depends=[reportr]; };
+  mmand = derive { name="mmand"; version="1.0.0"; sha256="10dqg99iaq5mfdz0x35z7f8xsf5fhw3jis0zgqxia8vzrw68q70v"; depends=[reportr Rcpp]; };
   mmap = derive { name="mmap"; version="0.6-12"; sha256="12ql03wzwj23h8lwd07rln6id44mfrgf9wcxn58y09wn3ky1rm6a"; depends=[]; };
   mmcm = derive { name="mmcm"; version="1.2-4"; sha256="16lh9ivnj3l01y28lgb5gykkxwa56cssadnh516qwhnv63c586sv"; depends=[mvtnorm]; };
   mmds = derive { name="mmds"; version="1.1"; sha256="0f5qzkfhi7vg8vsd8r41idmbwrrgc7qzfnp81adms2yzrza17wrw"; depends=[]; };
@@ -2919,19 +3087,19 @@ let self = _self // overrides; _self = with self; {
   mmm = derive { name="mmm"; version="1.4"; sha256="1nydian004nldqhyw3x15w6qfml2gkjc0x8ii54faz563byjv3d8"; depends=[gee]; };
   mmm2 = derive { name="mmm2"; version="1.2"; sha256="1h9pn5s3jjs4bydrr1qysjb4hv7vs4h3m7mvi22ggs2dzyz3b298"; depends=[gee]; };
   MMMS = derive { name="MMMS"; version="0.1"; sha256="1a71vs3k16j14zgqfd4v92dq9swrb44n9zww8na6di82nla8afck"; depends=[survival glmnet]; };
-  mmod = derive { name="mmod"; version="1.2"; sha256="1ln3srlaqn5bz72dych6gl0s0fswslsn74sg4zzpxh31473h6nrp"; depends=[adegenet pegas]; };
+  mmod = derive { name="mmod"; version="1.2.1"; sha256="0c2ijg5116hacq0f18xhkbxankjp0k34zfnw8q02ahzwd26ds0z7"; depends=[adegenet pegas]; };
   MMS = derive { name="MMS"; version="3.00"; sha256="06909912v2hr52s8k0a0830lbmdh05dcd7k47vydhbwq3rzf3ahg"; depends=[glmnet Matrix mht]; };
   MMST = derive { name="MMST"; version="0.6-1.1"; sha256="1gd7v34xi3wn2rjhk0ih0q2i2hb7c5x8kvv90g90ln803b5wvbhs"; depends=[]; };
   mnlogit = derive { name="mnlogit"; version="1.1.1"; sha256="0n6b5c14dcqv8pldrdgpjq8r2q956whwz2bxalphcf5da9r9jlc7"; depends=[]; };
   MNM = derive { name="MNM"; version="1.0-0"; sha256="0qab0qqhfjmaiji5yqdvd1lqz8f90q40sdwpcah923yi3g6alh2q"; depends=[ellipse ICS ICSNP SpatialNP mvtnorm survey]; };
-  mnormt = derive { name="mnormt"; version="1.4-7"; sha256="1nzf48sk9sqw4j9v6fq59qm22956jlad9acn705h4wzasmzbdic2"; depends=[]; };
+  mnormt = derive { name="mnormt"; version="1.5-1"; sha256="1msxbdlg4wb45lsg0m4hqf41qglnmbqw55815v8qvyfjkwrgns8b"; depends=[]; };
   MNP = derive { name="MNP"; version="2.6-4"; sha256="068lssg565dw673dm8f5k6dbxl2vblnszg8wibzy3ijf96hp03cw"; depends=[MASS]; };
   mobForest = derive { name="mobForest"; version="1.2"; sha256="198air7fplgiw86vs7m4dn4kai0gpnnmv14bykbw3lnaxk4fk8fd"; depends=[party lattice modeltools]; };
   Mobilize = derive { name="Mobilize"; version="2.16-2"; sha256="077s56cfb6cp2fiyrvva130c63nqr7nczfyfkykmkdsjsgs3ksp8"; depends=[Ohmage ggplot2 wordcloud reshape2]; };
   MOCCA = derive { name="MOCCA"; version="1.2"; sha256="04smpzn9x64w1vpw4szqa7dwnaak1ls6gpg7fgajs68mv5zivffa"; depends=[cclust clv]; };
+  Modalclust = derive { name="Modalclust"; version="0.6"; sha256="16h90d30jwdrla5627rva0yf69n0zib9z5fl3k5awlqfscz4fw26"; depends=[mvtnorm zoo class]; };
   modeest = derive { name="modeest"; version="2.1"; sha256="0l4y7yhkgsxycdd2lck0g8g6k2r059hwlrrcpl46md3rva4jgbnp"; depends=[]; };
   modehunt = derive { name="modehunt"; version="1.0.6"; sha256="15rq1yyrjhsn2rlkyiqj36jvji635hy6jsih845mfxdpn4vnssa3"; depends=[]; };
-  modelcf = derive { name="modelcf"; version="2.1.1"; sha256="04ls1rj6q06f64dsgpmas18i8m2a24655hhbcpdpikbdsx2sifvh"; depends=[]; };
   modelfree = derive { name="modelfree"; version="1.1-1"; sha256="0ammka2wxx90z31zfzypw9dk5n118l0vxhykxbx6srfig2vdyn82"; depends=[PolynomF SparseM]; };
   ModelGood = derive { name="ModelGood"; version="1.0.8"; sha256="1s86l7kcvfqm1lkpgp74b1bxj14a9r134waszw0da231zdsxfh3c"; depends=[prodlim]; };
   ModelMap = derive { name="ModelMap"; version="3.0.15"; sha256="1d7qn1p4fv94bdlr6if64vxl9yknavix4gzmpg3kxwlrxaz2g8a2"; depends=[randomForest raster gbm rgdal fields HandTill2001 PresenceAbsence]; };
@@ -2946,23 +3114,26 @@ let self = _self // overrides; _self = with self; {
   moments = derive { name="moments"; version="0.13"; sha256="05pa4gkmpmp744a5rsr2arqh7y5bgalwrwdn731jg6waqiniy024"; depends=[]; };
   Momocs = derive { name="Momocs"; version="0.2-6"; sha256="187w6xyswlg5nac6lbprcwvj63gka832n33vlj2ix810vqyxd0fk"; depends=[ade4 sp shapes jpeg spdep ape]; };
   mondate = derive { name="mondate"; version="0.10.01.02"; sha256="18v15y7fkll47q6kg7xzmj5777bz0yw4c7qfiw2bjp0f3b11qrd2"; depends=[]; };
-  MonetDB_R = derive { name="MonetDB.R"; version="0.9.2"; sha256="0iyyg5mbqb97pjlfj2xd2y9sd8h31d8vv0gnwgc33lwdjl65nsxx"; depends=[DBI digest]; };
-  monitoR = derive { name="monitoR"; version="1.0.1"; sha256="0rypa5r26sd3lrprh59384nzzyy2cbmq88qx6q5q647gy8w0kj1g"; depends=[tuneR]; };
+  MonetDB_R = derive { name="MonetDB.R"; version="0.9.4"; sha256="0ivymfng1959xw5wwmfl8l72dz4skarsb791ij54xcfn4v7c18np"; depends=[DBI digest]; };
+  monitoR = derive { name="monitoR"; version="1.0.2"; sha256="1nrw8xrp99p62w4bpsbca9ahdra9cid1piidwhjc4f6vqsbkp479"; depends=[tuneR]; };
   monmlp = derive { name="monmlp"; version="1.1.2"; sha256="14x6xz07hg2c5n36rc314z66jqvgmicjxi2vsqyy91vwjxs9akrm"; depends=[]; };
-  monomvn = derive { name="monomvn"; version="1.9-4"; sha256="0hdrwsadjgw1md5fmd5353sc4v2dwbz6qh6h85m755fyv0q1bh5v"; depends=[pls lars MASS]; };
+  monomvn = derive { name="monomvn"; version="1.9-5"; sha256="1fh0c1234hb5f3rwy85i4rlzc3n1851q5mivckcjs2vdm9rz25mg"; depends=[pls lars MASS]; };
   MonoPoly = derive { name="MonoPoly"; version="0.2-8"; sha256="0lpqqpahpss4q9iddh2p4h6klsrjhg3v6h1wfb70vy0miyhqb93h"; depends=[quadprog]; };
   monreg = derive { name="monreg"; version="0.1.2"; sha256="0qah7yw1xwk3pig413r7l8hhh645d45706mndv614fir738bv9pk"; depends=[]; };
   moonsun = derive { name="moonsun"; version="0.1.3"; sha256="1y8mwxmcy4iz444c2fayyi4i0jk1k561dp6cbjg2b3lmdml0whmi"; depends=[]; };
   mopsocd = derive { name="mopsocd"; version="0.5.1"; sha256="10hssnm1afqmxa9kw6ifqnz3p3yyjrmxgi98zlj31a5g4nis8wb1"; depends=[]; };
   morgenstemning = derive { name="morgenstemning"; version="1.0"; sha256="17y90cf8ajmkfwla0hm4jgkbkd1mxnym63ph2468sfxkhn0r3v88"; depends=[]; };
-  Morpho = derive { name="Morpho"; version="2.0.2"; sha256="0pfg01w918qfz8k75g4mbr67dp01a5s9nw1qi59ncrh79qy2zgin"; depends=[Rvcg rgl colorRamps foreach Matrix yaImpute doParallel Rcpp]; };
+  Morpho = derive { name="Morpho"; version="2.0.3-1"; sha256="0j2wfjxrk0myxk1j4g0jh68npg8wwia2i3a02dn9mxnmx90nbvaa"; depends=[Rvcg rgl colorRamps foreach Matrix yaImpute doParallel Rcpp]; };
+  morse = derive { name="morse"; version="1.0.2"; sha256="044aljv48mfq6yj9i77yqf03qa4qqkncaalzhph3wr9w4jvxpxn5"; depends=[plyr]; };
   MorseGen = derive { name="MorseGen"; version="1.2"; sha256="1kq35n00ky70zmxb20g4mwx0hn8c5g1hw3csmd5n6892mbrri8s9"; depends=[]; };
   MortalitySmooth = derive { name="MortalitySmooth"; version="2.3.2"; sha256="0r24v94nslavxjxvyc8a1f6dar3vm2lysg6qpxcgw6zgx8k0vk00"; depends=[svcm lattice]; };
-  mosaic = derive { name="mosaic"; version="0.8-18"; sha256="19qw4m8wvk0j6wjnzz8lc7sz07f9di8n52l739l8wzwzacjrlc6f"; depends=[lattice car Hmisc]; };
+  mosaic = derive { name="mosaic"; version="0.9-0"; sha256="0zmzx1mh6nhp6jz68abdl44hb918cyrpa1qj25m41c0x83rnwi0s"; depends=[car dplyr lattice ggplot2 reshape2 plyr Hmisc latticeExtra gridExtra ggdendro]; };
   moult = derive { name="moult"; version="1.3"; sha256="0mvzyildng2qs4jgws37wa2b8ms8bv7mmzs0dxbc1wcq56vfs9yj"; depends=[Formula]; };
   move = derive { name="move"; version="1.2.475"; sha256="0d542554bamgnc5qd7z497ssk885mz4m1wbaiqpi5cyxd24kwgii"; depends=[geosphere sp raster rgdal]; };
-  movMF = derive { name="movMF"; version="0.1-3"; sha256="0ad9ihvr63jgdxyr5fjbrf5cqjlcjaxfbygapb5li3lb1q0f01vl"; depends=[skmeans clue slam]; };
+  movMF = derive { name="movMF"; version="0.2-0"; sha256="1p9ay7w93gyx4janw23iwg2j0wkvnvzalaa20n1rlahhmh327g7i"; depends=[skmeans clue slam]; };
+  mp = derive { name="mp"; version="0.1"; sha256="13wsfhvxwpvz5qx95a720vp2l7807whvrv7dabqfajmnc45bdlj4"; depends=[]; };
   mpa = derive { name="mpa"; version="0.7.3"; sha256="0mhnsbgr77fkn957zfiw8skyvgd084rja1y4wk5zf08q5xjs2zvn"; depends=[network]; };
+  MPAgenomics = derive { name="MPAgenomics"; version="1.1.0"; sha256="0kf6vsxp6dcmqkl7yjyfjch9ms33pf9w7qrk76q05man5hn7y4fz"; depends=[R_utils changepoint glmnet cghseg]; };
   MPCI = derive { name="MPCI"; version="1.0.6"; sha256="1ngxx5363cm2cid3dl9amva016xy914sz49nfdkh88hjsxv3svjc"; depends=[]; };
   MPDiR = derive { name="MPDiR"; version="0.1-15"; sha256="1ga3dk9ncycsq30w6na4g7aik43v8q2kcrg7x6lpmiaa9qa2wn16"; depends=[]; };
   mph = derive { name="mph"; version="0.9"; sha256="11wcy23sv8x7aq6ky8wi0cq55yhjkkm9hn672qy803dwzzxv5y61"; depends=[]; };
@@ -2973,17 +3144,18 @@ let self = _self // overrides; _self = with self; {
   mpmcorrelogram = derive { name="mpmcorrelogram"; version="0.1-3"; sha256="0qgzsh744002whh3v1hrxs1i0xnk9zgfgkdgx2f0ffj00vvnwr97"; depends=[vegan]; };
   mpmi = derive { name="mpmi"; version="0.4"; sha256="0lfzw1bncp9nhsng5j5avvwi02grx8pmf39v5zav63s0lzmrj8a3"; depends=[KernSmooth]; };
   mpoly = derive { name="mpoly"; version="0.0.5"; sha256="1zhmd3lsa0n56yr3bdhg3r668zrmf35phm8g69c18a3rr5qmcdqg"; depends=[stringr rSymPy rJython rJava rjson partitions plyr]; };
-  MPSEM = derive { name="MPSEM"; version="0.2-3"; sha256="1shg2n2bsv14bc3i0z6d88gz1n813ad5xnz9z77b7q92v8dr6wn3"; depends=[ape MASS]; };
+  Mposterior = derive { name="Mposterior"; version="0.1.2"; sha256="16a7wvg41ld2bhbss480js5h12r41nl7jmc3y4jsbv1lr5py4ymy"; depends=[Rcpp]; };
+  MPSEM = derive { name="MPSEM"; version="0.2-5"; sha256="1jy459rg7i7x24ygdnlibwlh8rx7arpajjycqw414w5p9yy9ns1f"; depends=[ape MASS]; };
   mpt = derive { name="mpt"; version="0.4-1"; sha256="08drh66056pnvs43gc7dxhb62ajkdijbc9ca2y1hjrgvkssqk5xg"; depends=[]; };
-  MPTinR = derive { name="MPTinR"; version="1.3.5"; sha256="0igxmgf3r3d3nacz5nv95aikk4jqacbd75wdry14ahhn513h7qx5"; depends=[numDeriv Brobdingnag]; };
+  MPTinR = derive { name="MPTinR"; version="1.5.1"; sha256="0gy0jdzrkwcn1yvnrdb5dqrk1z96qa2ga41zhg63kz1b2m16q7i5"; depends=[numDeriv Brobdingnag Rcpp]; };
   MPV = derive { name="MPV"; version="1.29"; sha256="165sbayrp8p3aqwqrmf1g10agm0kdjksr6mr6p929j22kkf3k8gx"; depends=[]; };
   mQTL = derive { name="mQTL"; version="1.0"; sha256="0k80xvkr0b0mp3bj2s558fjxi2zf4k7ggnw6hsjm8lr84i108dks"; depends=[qtl MASS outliers]; };
   mra = derive { name="mra"; version="2.13"; sha256="1x282nzdz5bd3yji26mnzlvrkxszx15cra079k07rgdxqnixg2c8"; depends=[]; };
   mratios = derive { name="mratios"; version="1.3.17"; sha256="0a2pn4234ri5likaqbxgkw8xqmwchr6fak3nninral0yzd4rcal5"; depends=[mvtnorm]; };
   MRCE = derive { name="MRCE"; version="2.0"; sha256="0fnd7ykcxi04pv1af5zbmavsp577vkw6pcrh011na5pzy2xrc49z"; depends=[QUIC]; };
-  MRCV = derive { name="MRCV"; version="0.3-1"; sha256="0dr8mh1gf68qd88bx686r4j22nz5qr6nc65x6icv6idsy1q27xsn"; depends=[tables]; };
+  MRCV = derive { name="MRCV"; version="0.3-2"; sha256="061x9bnngm2f16bf6i0v00lf0g41wfg90ha0bjbphipcychzn3a3"; depends=[tables]; };
   mrdrc = derive { name="mrdrc"; version="1.0-6"; sha256="0kk6837hx4c7ixsrmib46ycvimv90ka8sj3w0310s4d7bzxvw1sc"; depends=[drc locfit]; };
-  mrds = derive { name="mrds"; version="2.1.5"; sha256="1zpp28v389r955d3y6d6b9mvjn08ayym2j0wmynjmsfqp3phfp3z"; depends=[optimx mgcv Rsolnp]; };
+  mrds = derive { name="mrds"; version="2.1.6"; sha256="14ab9pay3daqi2pcrcx98w8fzg1l5j0vr7vfybvrsjy5xd0c8f2q"; depends=[optimx mgcv Rsolnp]; };
   mreg = derive { name="mreg"; version="1.1"; sha256="06la0yy2yys161jhlzlcm5lcv0664wm6sa8gjdnpd1s1nx52jkqf"; depends=[]; };
   mritc = derive { name="mritc"; version="0.4-0"; sha256="02a8h1x3pk406zpn89gl5wkcd74qm5gqz8gqpckk3nv881pkayaz"; depends=[lattice misc3d fmri AnalyzeFMRI]; };
   mRm = derive { name="mRm"; version="1.1.5"; sha256="0sbpk7z4ij917nw8wyvnm87iav95ybqrzvmsjy3r8nyq55bjzyn7"; depends=[]; };
@@ -2991,10 +3163,10 @@ let self = _self // overrides; _self = with self; {
   mRMRe = derive { name="mRMRe"; version="2.0.4"; sha256="1ig78szk20s0cdj4pzrxxqa2hlx7126fh0jah8ym0563ps8hwill"; depends=[survival igraph]; };
   MRsurv = derive { name="MRsurv"; version="0.2"; sha256="148myzk6r8whkpv1yv59dmdlr2n8vdwmaww165aw696xfjxwq550"; depends=[survival mvtnorm]; };
   MRwarping = derive { name="MRwarping"; version="1.0"; sha256="13bcs7rlm4irx7yzdnib558w9014a4chh9xwc010m6pxvxv36qnv"; depends=[boa SemiPar]; };
-  msap = derive { name="msap"; version="1.1.5"; sha256="0y9dxj8g05w344rj3mfc4cafqbh59dxxg3z75nk8xjy2xsv60wxs"; depends=[ade4 scrime pegas cba ape]; };
-  msarc = derive { name="msarc"; version="1.3.2"; sha256="1y9yy8gzha2q8qicxj7j6r2iqy8bdbckdnqjakh74hlpp8jyqx5i"; depends=[gplots]; };
+  msap = derive { name="msap"; version="1.1.8"; sha256="0z5lm782jjb9w1h5vgz8bmxjdcrq9zb3xp1w5cb479jjc7krlgg3"; depends=[ade4 ape]; };
+  msarc = derive { name="msarc"; version="1.3.4"; sha256="0rgbrgdwjsybqcbfpf71b9z6qwwn8ph87z4hp0c1gmjrv8b9byld"; depends=[gplots]; };
   MsatAllele = derive { name="MsatAllele"; version="1.05"; sha256="1w489xjc7vxanam6hr4ym692j6a2skkmyzgqsmccy3101pzn522h"; depends=[]; };
-  MSBVAR = derive { name="MSBVAR"; version="0.7-2"; sha256="0gcbzc2pb14hvd1b1phjkm38l5nh4m3s8zdgwh9xvv4qmx255czw"; depends=[KernSmooth xtable coda bit mvtnorm lattice]; };
+  MSBVAR = derive { name="MSBVAR"; version="0.9-1"; sha256="1qd8v3n9nvyp1j1byb8dkmvkbmk5p2kgx7wjmsa9sh4siqbxzn4w"; depends=[KernSmooth xtable coda bit mvtnorm lattice]; };
   mseapca = derive { name="mseapca"; version="1.0"; sha256="115njdk8cv55zxd38hq9qaca686ykckni0f3xl8w3bn32gb5g9a7"; depends=[XML]; };
   MSeasy = derive { name="MSeasy"; version="5.3.3"; sha256="191mvg1imxfjlnd808ypn4lsjx7n6ydf16flax79hv01z7rcjylh"; depends=[amap clValid cluster fpc]; };
   MSeasyTkGUI = derive { name="MSeasyTkGUI"; version="5.3.3"; sha256="0ihz8vr2wbgy88bzssilgvlhkbr13jznfjvnqy73wpchqgwy0wy6"; depends=[MSeasy]; };
@@ -3004,36 +3176,35 @@ let self = _self // overrides; _self = with self; {
   msgpackR = derive { name="msgpackR"; version="1.1"; sha256="0a6vm4q1zfy8wlvhl9wfy09ig1iag9fvjasz5w9bll7idky4ldx5"; depends=[]; };
   msgps = derive { name="msgps"; version="1.3"; sha256="0nvxy9a41z5d111gqr1gh521imm795l1li70g1mzrag1gpg810c5"; depends=[]; };
   msir = derive { name="msir"; version="1.3"; sha256="0d7zxjmhr1ri3qz3fdkf56fi5dz2p9lb2vyqccrpn7js2ibkqhpl"; depends=[mclust]; };
-  msm = derive { name="msm"; version="1.3"; sha256="1imkzwk4f727g04p3q3h442wiw5ccg3n47skdgsxz3yy5nxlll8v"; depends=[survival mvtnorm expm]; };
-  msme = derive { name="msme"; version="0.4.4"; sha256="16j1xl0vn2ph7hbhlp9sdlm3dl4qygg97j13fwqn9slzhyr986sk"; depends=[MASS lattice]; };
+  msm = derive { name="msm"; version="1.4"; sha256="1x7ys6695jarwfkh3xv607mwm5l2y2gzq2mczjfdcs9mla2l96a5"; depends=[survival mvtnorm expm]; };
+  msme = derive { name="msme"; version="0.5.1"; sha256="1bkj10pgmv9q61384fwd2pxccclclc3knc5x212p42w4w49hnm1q"; depends=[MASS lattice]; };
   msos = derive { name="msos"; version="1.0.1"; sha256="0fbxi8x83sj8a6bahc7q28vql00pxqdia2vxb6ilsc459xaph6vc"; depends=[mclust tree]; };
   MSQC = derive { name="MSQC"; version="1.0.1"; sha256="1vs9kygjg9f4sr1m80hdn03gdhbdqfjamqxhbs9zha8smjrsgisw"; depends=[rgl]; };
   msr = derive { name="msr"; version="0.4.1"; sha256="1kfj6xq7l32ligc53akiym3s9if87087gan8nqz4w7d8nxp693s7"; depends=[Matrix class glmnet e1071 rgl RColorBrewer colorspace]; };
   msSurv = derive { name="msSurv"; version="1.1-2"; sha256="1nyadgzwdyf48qhqdx8sszvgkhxafacnccacg39ghm6gqv8b5j60"; depends=[class lattice]; };
-  mstate = derive { name="mstate"; version="0.2.6"; sha256="1kj2w9xqip1mn217ri2pa32bsmyfxndmda9r6j64xkz00lnynsff"; depends=[survival survival]; };
+  mstate = derive { name="mstate"; version="0.2.7"; sha256="0rys25cwr814k8z65206s12yv18dala66b3nlfq882dw5cfpaybl"; depends=[survival RColorBrewer]; };
   MSwM = derive { name="MSwM"; version="1.2"; sha256="01l23ia20y3nchykha4vz6sa757zmbvgx2315cacxfcqk9rgs08c"; depends=[nlme]; };
+  mtk = derive { name="mtk"; version="1.0"; sha256="0vq2xlxf86l92fl91qm8m4yfjyz1h8szmwxiics7sc9f0as0dkmy"; depends=[stringr XML sensitivity lhs rgl]; };
   MTS = derive { name="MTS"; version="0.32"; sha256="0jxa0madik1d317wsl1svb2bndi6mw125brbxpyf019lknh6yajy"; depends=[Rcpp fGarch mvtnorm]; };
   mtsdi = derive { name="mtsdi"; version="0.3.3"; sha256="1hx4m1jnfhkycxizxaklnd9illajqvv1nml8ajfn3kjmrb5z7qlp"; depends=[gam]; };
   MTurkR = derive { name="MTurkR"; version="0.4"; sha256="19hk6jgkj7rr4syad3chmyacn0q2m9lq0z3hdrfavcwqa203zgp9"; depends=[RCurl digest XML]; };
   MUCflights = derive { name="MUCflights"; version="0.0-3"; sha256="03ksvv5nyzlqiml1nz405r3yqb2cl35kpm1h61zcv2nqq8cxqshs"; depends=[XML geosphere sp RSQLite NightDay]; };
   MuFiCokriging = derive { name="MuFiCokriging"; version="1.2"; sha256="09p8wdmlsf21ibqyjigwdipcin3ij0naxcd035hqgfj76v20wiyv"; depends=[DiceKriging]; };
-  mugnet = derive { name="mugnet"; version="1.02.0"; sha256="0mr70iizs93awl6bzg3i4w3i35dyyq0ckpakph3psga1xqdq6gzm"; depends=[catnet]; };
-  muhaz = derive { name="muhaz"; version="1.2.5"; sha256="1vj33kg2mfr79y4ayybkjamxx0swykpf7iqbw502xclqyvd7a9hn"; depends=[survival]; };
-  multcomp = derive { name="multcomp"; version="1.3-3"; sha256="1cxlkvwr67k10l65ia1fgsvqaz1zh8rhbjim63a9zjha32cy1dcx"; depends=[mvtnorm survival TH_data sandwich]; };
+  muhaz = derive { name="muhaz"; version="1.2.6"; sha256="1b7gzygbb5qss0sf9kdwp7rnj8iz58yq9267n9ffqsl9gwiwa1b7"; depends=[survival]; };
+  multcomp = derive { name="multcomp"; version="1.3-5"; sha256="0zi3vxp0yfmf5qvp38l16d9lr12b86av0h4i6qzwaxbmnv14vzjd"; depends=[mvtnorm survival TH_data sandwich]; };
   multcompView = derive { name="multcompView"; version="0.1-5"; sha256="0vfgvqxqgxyifkqs3r5xxj7rfn8lfmby6wyyiqa5jv01073xchib"; depends=[]; };
   MultEq = derive { name="MultEq"; version="2.3"; sha256="0fshv7i97q8j7vzkxrv6f20kpqr1kp9v6pbw50g86h37l0jghj7r"; depends=[]; };
   multgee = derive { name="multgee"; version="1.4"; sha256="02h8zl79a8ad0q3inpb3aqjr9icjxjiph2b4rxnwa6kq8p3aagwn"; depends=[gnm VGAM]; };
   multibiplotGUI = derive { name="multibiplotGUI"; version="0.0-1"; sha256="0klslbj1v0j10hv8xgyxgp4d2rkm3l4gr0gyrr1g8lyj0gf43sb3"; depends=[rgl tkrplot RODBC]; };
   multic = derive { name="multic"; version="0.3.8.1"; sha256="06lc9kn0z3s7x00hz8vj903q0c6cncnj4v3ygvd2yvkgcbhfvjd0"; depends=[]; };
-  MultiChIPmixHMM = derive { name="MultiChIPmixHMM"; version="5.0"; sha256="07pyibxk7dccbjr02ahil0fmjx60aq214fid29zakvpn2qg7kjdq"; depends=[]; };
   Multiclasstesting = derive { name="Multiclasstesting"; version="1.3.9"; sha256="09y3gnarqv15wgmk545qrwpjwb2ilv2b2kc74cxzcb2p1lflfjzm"; depends=[]; };
   MultiCNVDetect = derive { name="MultiCNVDetect"; version="0.1-1"; sha256="0mfisblw3skm4y8phfg4wa0rdchl01wccarsq79hv63y78pfhh13"; depends=[]; };
   multicon = derive { name="multicon"; version="1.2"; sha256="0cjmh4q2yvv9pqmmnilzhzvmds2nzbipy4vd009zjfq4c925c7m0"; depends=[psych abind foreach mvtnorm sciplot]; };
   multicool = derive { name="multicool"; version="0.1-2"; sha256="1rs7q93lcr1crrx433zgil2db1rb3n4qw62r52nvpllqfwfx98dc"; depends=[]; };
-  multicore = derive { name="multicore"; version="0.1-7"; sha256="122qxzkb9zl81xj8y1w3dmb0vqz81js94x39fmkld9jw7ydiha8l"; depends=[]; };
+  multicore = derive { name="multicore"; version="0.2"; sha256="10ypgs6nzi9bv8xy97cprs3ffss8jdlba5nj2gwglqggb8ch9i9r"; depends=[]; };
   multiDimBio = derive { name="multiDimBio"; version="0.3.3"; sha256="1aj6yam31mr0abjb6m5m85r1w71snha4s7h4ikyw66sc73xkmb9m"; depends=[ggplot2 lme4 misc3d MASS RColorBrewer]; };
-  multigroup = derive { name="multigroup"; version="0.2"; sha256="1y4z6fwl68n3bk5klf3hz9jkvyx59pyq84d4brszs3hzb59ra39z"; depends=[]; };
-  MultiLCIRT = derive { name="MultiLCIRT"; version="2.6"; sha256="18c2wb9jf44vjiiz3a4ggksi0z7rgwyvpqhfb67rra304rp1gs4r"; depends=[MASS]; };
+  multigroup = derive { name="multigroup"; version="0.4"; sha256="13811j3g6wg11yrsz3pskis2n8d7svhq9vg95d7r3fi5bbivinh5"; depends=[]; };
+  MultiLCIRT = derive { name="MultiLCIRT"; version="2.7"; sha256="0i9ydhqw8a6rvds708vn1ypmfw5nrnpnfzjmg4s01gcm2xswvli0"; depends=[MASS limSolve]; };
   multilevel = derive { name="multilevel"; version="2.5"; sha256="0pzv5xc8p6cpzzv9iq3a3ib1dcan445mm12whf3d6qkz2k4778g6"; depends=[nlme MASS]; };
   multilevelPSA = derive { name="multilevelPSA"; version="1.2"; sha256="1wkywcnlvmf5li3ii7vhjsj390ay88gz9ll5agiyaj15gfd3mjls"; depends=[ggplot2 plyr psych reshape proto xtable xtable]; };
   multinbmod = derive { name="multinbmod"; version="1.0"; sha256="1c4jyzlcjkqdafj9b6hrqp6zs33q6qnp3wb3d7ldlij7ns9fhg71"; depends=[]; };
@@ -3045,86 +3216,95 @@ let self = _self // overrides; _self = with self; {
   multiplex = derive { name="multiplex"; version="1.2"; sha256="06wrzglgrvahavlcknf80cp0j4k840dhmclw9g6wqv51pq9brj2f"; depends=[]; };
   multipol = derive { name="multipol"; version="1.0-6"; sha256="1yjz0p4mcgzs98s61i8315wyhh986jxp8b0lq66375ckpr2ddcss"; depends=[abind]; };
   multisensi = derive { name="multisensi"; version="1.0-7"; sha256="1sq0jxkp33wsv6id27nka0764mr1jskqzsr2nhmqc4c8l312bkp6"; depends=[]; };
+  MultiSV = derive { name="MultiSV"; version="0.0-62"; sha256="05klka4y60q7d4yi47q784y64irgic6cwcj330zm96j1hf2dli16"; depends=[nlme reshape]; };
   multitable = derive { name="multitable"; version="1.6"; sha256="067bgl793wwvb1rhan70ih0ga3dxja2c6zx7fwzml5rqi6p728pr"; depends=[]; };
   multitaper = derive { name="multitaper"; version="1.0-8"; sha256="1x0a4nrngh1hs44h4gnmjfhx57kgxmkyzm431i5k288ydv57vvx0"; depends=[]; };
   multivator = derive { name="multivator"; version="1.1-4"; sha256="125ifkpm1pny4rjpzirnwpmpjfg0y8w0rygj0way0p1qwm0l207n"; depends=[emulator mvtnorm]; };
+  multiwayvcov = derive { name="multiwayvcov"; version="1.0.4"; sha256="1cn906qsffjnvi7ycbrvd91jawyxlph6gzf74yb4dpbbkyk4n8p1"; depends=[sandwich]; };
   multxpert = derive { name="multxpert"; version="0.1"; sha256="03mvf4m0kabm22vy4zkj1cfh884larpj8cbgg3p9l3pag20snf1l"; depends=[mvtnorm]; };
   muma = derive { name="muma"; version="1.4"; sha256="0midx3wzyvcz8rk9kvsfll3xg41pkz40si4jw2ps54ykkf9rkm99"; depends=[car pdist pls gplots mvtnorm robustbase gtools bitops caTools pcaPP rrcov]; };
-  MuMIn = derive { name="MuMIn"; version="1.9.13"; sha256="05q6hwjkgly0xzfjkd7ybycb0x1vwcfbzc4h1prn9kjllrlrwxw5"; depends=[]; };
+  MuMIn = derive { name="MuMIn"; version="1.10.5"; sha256="1pza894h6mjjv2i4ifx2z410bz7lw2a9b986z6x30sr2al4xvfkn"; depends=[]; };
   munfold = derive { name="munfold"; version="0.3-1"; sha256="0rjicbyhxp0xr375ryg7kb2a4rvh3giw62ypws63nc3l8iwsig2m"; depends=[memisc MASS]; };
   munsell = derive { name="munsell"; version="0.4.2"; sha256="1bi5yi0i80778bbzx2rm4f0glpc34kvh24pwwfhm4v32izsqgrw4"; depends=[colorspace]; };
+  munsellinterpol = derive { name="munsellinterpol"; version="1.0.1"; sha256="0q3n4z1z8sbqslzp97jw9xmdnypi66073g64ppk65r1aiq41hvac"; depends=[geometry]; };
   muRL = derive { name="muRL"; version="0.1-9"; sha256="0711hxq8l0zc8w8k3aj4f9sq8xl5mqqx70dvq0m66kahkh2pnhgb"; depends=[maps]; };
-  muscle = derive { name="muscle"; version="3.8.31-1"; sha256="0i5y54hnkbbzg2radp5cnznab3hk73nmmsp8n5v4ybmqr226kgqj"; depends=[]; };
+  muscle = derive { name="muscle"; version="3.8.31-4"; sha256="0pijc8x6pwsb6z4061v1r7iwq5lsnia5qn1bikwpxy8ir19nic72"; depends=[]; };
   muStat = derive { name="muStat"; version="1.7.0"; sha256="18727xj9i9hcnpdfnl1b9wd6cp7wl1g74byqpda2gsrcardl57wz"; depends=[]; };
   mutoss = derive { name="mutoss"; version="0.1-8"; sha256="13x49dk1xyn697yindg6m00nqbn2cb12544v2k14ckmnw07mp1gq"; depends=[mvtnorm plotrix multcomp]; };
   mutossGUI = derive { name="mutossGUI"; version="0.1-8"; sha256="1lpfz5d36v0szfg7vn7gdad27rvzxbx4w3651dmi2y1ff0d8j5z3"; depends=[rJava JavaGD CommonJavaJars plotrix mutoss multcomp]; };
   MVA = derive { name="MVA"; version="1.0-5"; sha256="18x075hjqhrjwxivvrixgs6yc67il3n5p1m7v2wymcf8h2mkki91"; depends=[HSAUR2]; };
-  mvabund = derive { name="mvabund"; version="3.8.4"; sha256="0qvyyi8r6z6qg30vpbbr0jcajaviygwwzsfs2fw0bjix1p2df43w"; depends=[Rcpp MASS]; };
+  mvabund = derive { name="mvabund"; version="3.9.1"; sha256="0v9chsc08a9gsj026kv99jv0d3ww5gxblbliscqghl4b36hzkx6r"; depends=[Rcpp MASS tweedie statmod]; };
   MVB = derive { name="MVB"; version="1.1"; sha256="0an8b594rknlcz6zxjva6br8f34sgwdi2jil3xh1xzb5fa55dw0f"; depends=[Rcpp RcppArmadillo]; };
   mvbutils = derive { name="mvbutils"; version="2.7.4.1"; sha256="1vs97yia78xh35sdfv5pj3ddqmy83qgamvyyh9gjg0vdznqhffzg"; depends=[]; };
   mvc = derive { name="mvc"; version="1.3"; sha256="0kmh6vp7c2y9jf71f4a29b0fxcl0h7m4p8wig4dk3fi7alhjf7ym"; depends=[rattle]; };
-  mvcwt = derive { name="mvcwt"; version="1.2"; sha256="0fk7jgf07cap3mjg317z8g6bv28mlnwcn0lrd7my31zqima78hm9"; depends=[foreach RColorBrewer]; };
+  mvctm = derive { name="mvctm"; version="1.0"; sha256="1naxjh2k3vv4wlpzzx0y2zwvbn4kdqyls8a8qx6bz609ynzay5r9"; depends=[Formula nlme MNM quantreg Rfit]; };
+  mvcwt = derive { name="mvcwt"; version="1.3"; sha256="0fqdyypmszm00rpl04z8kiiw6jd416a0b2rap3dqq3kchnz8h4s2"; depends=[foreach RColorBrewer]; };
+  mvglmmRank = derive { name="mvglmmRank"; version="1.0-2"; sha256="0gpp0ibgji86pxscqzcws0d1qn1ciqqvyfb0x2v18580r4cx8jv7"; depends=[Matrix numDeriv]; };
   mvinfluence = derive { name="mvinfluence"; version="0.6"; sha256="1cd5p6cl2zln8madjf3vsbmqlg4nsklzzy6ngdd5glj1a9qapd6c"; depends=[car heplots]; };
-  mvmeta = derive { name="mvmeta"; version="0.4.3"; sha256="1f4sb55ybsd3fa2951y4h2iyyiarndmgcbcikhcvd9dbnhxr6rdv"; depends=[]; };
+  mvmeta = derive { name="mvmeta"; version="0.4.5"; sha256="0faczanbz6i7794sqxm21a6v52cs5hrjjzdypdvi23bkl4mkxjrb"; depends=[]; };
   mvMORPH = derive { name="mvMORPH"; version="1.0.2"; sha256="1zzh2vmm3l6zvzg8b39ivkx2jmbw2g6n00jj4icp46w8jb26rlwa"; depends=[phytools ape corpcor subplex]; };
   MVN = derive { name="MVN"; version="3.4"; sha256="13cmb4xls3j366lcjl6a7vimx457q1a531sy23nrddmyw1g918l2"; depends=[nortest moments MASS]; };
   mvna = derive { name="mvna"; version="1.2-3"; sha256="1gwv17j6w9c38bqvnasv9kfigbdxiqkzwj89gqmkxgw715f9nnpp"; depends=[lattice]; };
+  mvnfast = derive { name="mvnfast"; version="0.1.2"; sha256="1pa0l6krk44pa3ndnh7wm77cg79x7m7n8r3ffz0w8jmzh59s9nr2"; depends=[Rcpp]; };
   mvngGrAd = derive { name="mvngGrAd"; version="0.1.3"; sha256="1c0rwywsa2dzhhphwc9prdxv6jyk1qdc655zvzyxif6ay3wnganf"; depends=[]; };
   mvnmle = derive { name="mvnmle"; version="0.1-11"; sha256="02mpmrr22cqb3v8x7kydgg715yl3lrdgzgdqpchmp0xrl2db8gq4"; depends=[]; };
   mvnormtest = derive { name="mvnormtest"; version="0.1-9"; sha256="1iaxjwp7bgxhaa4xqvgqb61316mq2fb0452d0pabhmbxkvmvdnj6"; depends=[]; };
-  mvoutlier = derive { name="mvoutlier"; version="2.0.4"; sha256="131nc6m0h21azdxdxirabmnzzbg4iyhsbf3lq79v7w1f30irlv0z"; depends=[sgeostat robCompositions robustbase]; };
-  mvpart = derive { name="mvpart"; version="1.6-1"; sha256="0bs87bfb48b8n4iqy4vl2dg7grz45imjr6yiz39ns9d0c7iqs88j"; depends=[]; };
+  mvoutlier = derive { name="mvoutlier"; version="2.0.5"; sha256="1n12wy2i9jkb6brrqc0ibw3wiyd25dm5jhyapf05cj8wi06jfrsf"; depends=[sgeostat robCompositions robustbase]; };
+  mvpart = derive { name="mvpart"; version="1.6-2"; sha256="1ddamzkv3j3a1niwqrrdpajn10v48s4li69n63mwlanrw9gdyzhn"; depends=[]; };
   MVPARTwrap = derive { name="MVPARTwrap"; version="0.1-9.2"; sha256="0kj89nlndfcddsx2i9isfd7lqzj8rlsd47anhca5cmj1nyjsb4w5"; depends=[mvpart Hmisc labdsv vegan fBasics ade4]; };
   MVpower = derive { name="MVpower"; version="2.0"; sha256="176g8jfn8gbbhyxcny9prvkn7gk23lmcr4pnxlf0a0pacxczsldr"; depends=[randomForest pamr kernlab class]; };
   mvProbit = derive { name="mvProbit"; version="0.1-0"; sha256="0fnrlralydlsf9iphq385f8hpqigfmi8rafvgp443gygvpq5b6g0"; depends=[mvtnorm maxLik abind bayesm miscTools]; };
   MVR = derive { name="MVR"; version="1.20.0"; sha256="1wwzws9116ck14g6xd1svmwc9wkr8piwb24bddnzri388p8qkgb4"; depends=[statmod]; };
   mvsf = derive { name="mvsf"; version="1.0"; sha256="1krvsxvj38c5ndvnsd1m18fkqld748kn5j2jbgdr3ca9m3i5nlwf"; depends=[nortest mvnormtest]; };
   mvShapiroTest = derive { name="mvShapiroTest"; version="1.0"; sha256="0zcv5l28gwipkmymk12l4wcj9v047pr8k8q5avljdrs2a37f74v1"; depends=[]; };
-  mvSLOUCH = derive { name="mvSLOUCH"; version="1.1"; sha256="1z9pkqv3yb84nsv17brm1pjf8l5vbqi0i4k0djr9qfjyva1shr9x"; depends=[ouch ape numDeriv mvtnorm corpcor]; };
-  mvtBinaryEP = derive { name="mvtBinaryEP"; version="1.0.1"; sha256="0bc5x50116bm437xmnrp3f12aaw54hna6dqf72cxnqls2k5x7gaf"; depends=[mvtnorm]; };
+  mvSLOUCH = derive { name="mvSLOUCH"; version="1.1.3"; sha256="1vkyhy6a12hdlkwsf64lgimpigri6r6l02vvy1b5r05j002baxgr"; depends=[ouch ape numDeriv mvtnorm corpcor]; };
   mvtmeta = derive { name="mvtmeta"; version="1.0"; sha256="0g0d4lrz854wkd0dz5aiad54i46aqkfhsq6cpbsfv0w5l2kwiqqz"; depends=[gtools]; };
-  mvtnorm = derive { name="mvtnorm"; version="0.9-99991"; sha256="0181qg1cnkach6p366i0qzlchjdzx8jjm9pd6l24j5qwzwr44kq6"; depends=[]; };
+  mvtnorm = derive { name="mvtnorm"; version="1.0-0"; sha256="0cm0dwqga7nnb2016jzacmaa233whr7vx75fffhmjzivrfg5vhy8"; depends=[]; };
   mvtsplot = derive { name="mvtsplot"; version="1.0-1"; sha256="0g5grrha77rsnkfasw5pxnpmkl7vgb728ms8apyg8xnbmgilg9vv"; depends=[RColorBrewer]; };
-  mwa = derive { name="mwa"; version="0.2"; sha256="10ksjic71qrsmqf5x532nzfd17040plzvrnhfcr3srczf4yp51ci"; depends=[cem rJava MASS]; };
+  mwa = derive { name="mwa"; version="0.3.2"; sha256="123xvm4vrwl7vfc9sas4jj7fn38m37c6h38j0aczpmygmx54bbmr"; depends=[cem rJava MASS]; };
+  mwaved = derive { name="mwaved"; version="1.0.1"; sha256="0c9hiwf7ldvgm3vh5s7wgvgl304cc2sbsyczbk1wqybcy17cs7s5"; depends=[Rcpp shiny]; };
   mxkssd = derive { name="mxkssd"; version="1.1"; sha256="0m9763dqrk8qkrvp18bsv96jv0xhc2m8sbxdk6x3w6kdjcl663p2"; depends=[]; };
+  MXM = derive { name="MXM"; version="0.2.1"; sha256="047whr0fly89i5vlyd4z8lj2nxyfkk9vvniasncnwls8vmmpf1jk"; depends=[]; };
   mycobacrvR = derive { name="mycobacrvR"; version="1.0"; sha256="1xd9ackzdd8db6bayza0bg4n256mi9rdqih0cdc0nl212c3iz75g"; depends=[]; };
   myepisodes = derive { name="myepisodes"; version="1.1.1"; sha256="0xk9bwgpl630nhc8qa2pc0rwqbqk3haxnp78gfxq6sn6z7i44k1p"; depends=[XML]; };
   Myrrix = derive { name="Myrrix"; version="1.1"; sha256="15w1dic6p983g2gajbm4pws743z68y0k2hxrdwx6ppnzn9rk07rs"; depends=[Myrrixjars rJava]; };
   Myrrixjars = derive { name="Myrrixjars"; version="1.0-1"; sha256="0dy82l0903pl4c31hbllscfmxrv3bd5my5b2kv5d3x5zq0x99df0"; depends=[rJava]; };
   nacopula = derive { name="nacopula"; version="0.8-1"; sha256="1g1kcs6vqagq0nisyc43040ri3a9iy3fv4bnjjjc5zrla52a20w5"; depends=[copula copula]; };
   NADA = derive { name="NADA"; version="1.5-6"; sha256="0y7njsvaypcarzygsqpqla20h5xmidzjmya4rbq39gg6gkc0ky27"; depends=[survival]; };
-  nadiv = derive { name="nadiv"; version="2.12"; sha256="0x63lanzhdwsfh8jnc2i5lj359c63q9kmm3savhk4sl1qx6kczv9"; depends=[Matrix]; };
+  nadiv = derive { name="nadiv"; version="2.13.2"; sha256="1r63z08k46b6hryxracicsw1hr91x4pgk2x58c9nijdni4my7kkc"; depends=[Matrix]; };
   namespace = derive { name="namespace"; version="0.9.1"; sha256="1bsx5q19l7m3q2qys87izvq06zgb22b7hqblx0spkvzgiiwlq236"; depends=[]; };
-  nanop = derive { name="nanop"; version="2.0-2"; sha256="1f24ykdjpwd7b9cc375bk6bz7m8brb7pgzakclgvdy0fj2mlwkd9"; depends=[distrEx geometry rgl]; };
+  nanop = derive { name="nanop"; version="2.0-3"; sha256="1dz06j292n7ppibmlp7pzjywcglv86hp7lsh07dz7j7p8gbbsza8"; depends=[distrEx rgl]; };
   NanoStringNorm = derive { name="NanoStringNorm"; version="1.1.17"; sha256="02jvrrz4cmr7l35s7xh0mmwmr5l5lga1vnph2rij2lb8124ardf5"; depends=[gdata]; };
-  NAPPA = derive { name="NAPPA"; version="1.0"; sha256="0l264w4kmfzp57j92az1my7xcrna4nix4yvngb69qynyipv683yx"; depends=[plyr]; };
+  NAPPA = derive { name="NAPPA"; version="2.0"; sha256="18yipic8xkf13jaaxnn388m49r5q2g7q7gb0mmw3gh7226lmz987"; depends=[plyr NanoStringNorm]; };
+  nasaweather = derive { name="nasaweather"; version="0.1"; sha256="05pqrsf2vmkzc7l4jvvqbi8wf9f46854y73q2gilag62s85vm9xb"; depends=[]; };
   nat = derive { name="nat"; version="1.4.10"; sha256="1200qxsrhlxassi8jyrcwfpknyck2p092sxv2gkc74vp62w2b0lp"; depends=[rgl RANN igraph filehash digest nat_utils]; };
   naturalsort = derive { name="naturalsort"; version="0.1.2"; sha256="0m8a8z0n5zmmgpmpn5w87j2jfsz1igz3x133z3q25h8jlyaxy750"; depends=[]; };
-  nat_utils = derive { name="nat.utils"; version="0.4"; sha256="1l3pzms5d7zagdzlq98bsr0yma90x57hykxlgyjyri4qncq32cmp"; depends=[]; };
-  NbClust = derive { name="NbClust"; version="1.4"; sha256="163ri75q8r0amcj38mg027frs47f9iindcf6fhzf0529b19wdcaw"; depends=[]; };
+  nat_utils = derive { name="nat.utils"; version="0.4.2"; sha256="0k5bdqwrbq82bb9ld90ia7b4vjaczba20h231a129rkszsy6sz9v"; depends=[]; };
+  NbClust = derive { name="NbClust"; version="2.0.1"; sha256="00b4h17pnvqsk0hvaz6dbrrys3dshy6zf0s371z7rr1n52xyy8ga"; depends=[]; };
   NBDdirichlet = derive { name="NBDdirichlet"; version="1.01"; sha256="07j9pcha6clrji8p4iw466hscgs6w43q0f7278xykqcdnk39gkyv"; depends=[]; };
   nbpMatching = derive { name="nbpMatching"; version="1.4.0"; sha256="0ncw8xihdh24cfz0rhcvvp2l5mhm2z7hllnkf45bhdhpams6yryp"; depends=[Hmisc MASS]; };
   NBPSeq = derive { name="NBPSeq"; version="0.3.0"; sha256="0l4ylxhs2k9ww21jjqs67fygk92avdchhx2y1ixzl7yr2yh1y9by"; depends=[]; };
   nCal = derive { name="nCal"; version="13.12-01"; sha256="06grlb7ac9vy3ncnqz5h63iarsh94z4mcb29bigkdvnbv9whj7mn"; depends=[drc gdata gWidgets xtable]; };
-  NCBI2R = derive { name="NCBI2R"; version="1.4.5"; sha256="0c7w74fj4pml9pg4xx0f99mw50rr73j2mcahz3s91nrgm0gfyd2v"; depends=[]; };
+  NCBI2R = derive { name="NCBI2R"; version="1.4.6"; sha256="1gsvc9v9005hf71nsqgybnfhlmdr3wwzm5ab7h8c8ly5waq2w9i7"; depends=[]; };
   ncbit = derive { name="ncbit"; version="2013.03.29"; sha256="0f07h8v68119rjvgm84b75j0j7dvcrl6dq62vp41adlm2hgjg024"; depends=[]; };
-  ncdf = derive { name="ncdf"; version="1.6.6"; sha256="0s4jx70kxdwifwzgwqc7yy3glsw19664hxnhhsay6sv68jdyhb8y"; depends=[]; };
-  ncdf4 = derive { name="ncdf4"; version="1.10"; sha256="1v3pncm865bysg38mas4584pbvh2gcv2dms8rjbn8h1cmkjhh2p9"; depends=[]; };
+  ncdf = derive { name="ncdf"; version="1.6.7"; sha256="14jqbr6xjq58zawc14j85advbafspfrn40al26zg0v3warwlfwfy"; depends=[]; };
+  ncdf4 = derive { name="ncdf4"; version="1.12"; sha256="110h4s0qg6rp0k1s3fl464g409mq5ajyhfb0cxvwbgz2dp32p8aj"; depends=[]; };
   ncdf4_helpers = derive { name="ncdf4.helpers"; version="0.3-3"; sha256="051akd7r6zx805a0xwcs95q5sd8alag0f1gzqjk3n188q8r3ji5j"; depends=[ncdf4 PCICt abind]; };
   ncdf_tools = derive { name="ncdf.tools"; version="0.7.1.291"; sha256="149d89kim67q77w17afc5x7hkvmk05gfkaw6cpl583j2zxingify"; depends=[RNetCDF chron abind plotrix raster RColorBrewer JBTools]; };
   nCDunnett = derive { name="nCDunnett"; version="1.0.0"; sha256="0n5zzsdrhra5xql110wrxbfdjm3fwa6qhvnpj89w9ph9nr4ad8gf"; depends=[]; };
   ncf = derive { name="ncf"; version="1.1-5"; sha256="03nbmg9swxhpwrmfjsanp6fj5l2nw160sys70mj10a0ljlaf904z"; depends=[]; };
   ncg = derive { name="ncg"; version="0.1.1"; sha256="1jzkzp61cc5jxmdnl867lcrjjm7y2iw9imzprbd098p1j3w8fvj7"; depends=[]; };
   NCmisc = derive { name="NCmisc"; version="1.1"; sha256="13nx9p6yq46lf2q92ximi33wynxfxah8ns18227xxm99d6fpb05v"; depends=[proftools]; };
-  ncvreg = derive { name="ncvreg"; version="3.1-0"; sha256="1q8ij64x03xmxn73s3dcwyq55936irv2jn9q5apgdy15myiigb49"; depends=[]; };
+  ncvreg = derive { name="ncvreg"; version="3.2-0"; sha256="0j53aj71lxz3pxh6a4vlgw0f9zk4gjh4xf5c7qsm5cp8nfpkplm5"; depends=[]; };
   ndl = derive { name="ndl"; version="0.2.16"; sha256="1l56kg3x4579hzr4sig3iwrd81rhm8nmmrqfs54zxqv5yxpk3hp4"; depends=[Rcpp MASS]; };
   ndtv = derive { name="ndtv"; version="0.5.1"; sha256="0cvqpr74als10zhdravbc7ykacy3ll7y5fx4n5jik0avwcaclgkc"; depends=[network networkDynamic animation sna MASS statnet_common]; };
   neariso = derive { name="neariso"; version="1.0"; sha256="1npfd5g5xqjpsm5hvhwy7y84sj5lqw9yzbnxk6aqi80gfxhfml4c"; depends=[]; };
-  NeatMap = derive { name="NeatMap"; version="0.3.6.1"; sha256="05x7dphddxns8gp7bfbsvqnbvwybhzq7qslsyaxbiib3000s3628"; depends=[ggplot2 rgl]; };
+  NeatMap = derive { name="NeatMap"; version="0.3.6.2"; sha256="186y06zrh87q6vixl2da2d6apvcj1zkk79c95k081zj5awmryr9b"; depends=[ggplot2 rgl]; };
   needy = derive { name="needy"; version="0.2"; sha256="1ixgpnwrg6ph1n5vy91qhl1mqirli9586nzkmfvzjrhdvrm0j5l0"; depends=[]; };
   NEff = derive { name="NEff"; version="1.0"; sha256="0ksnmxjy2ms2z7rq4rddnykydwlb4f9c13nak5f8m65pfjcgv3sk"; depends=[msm bit]; };
   negenes = derive { name="negenes"; version="1.0-1"; sha256="0g8m3idjm24cf9b1wngw2pv1axgnv9mk5wqs78zgwvn0m67ypsiz"; depends=[]; };
   neldermead = derive { name="neldermead"; version="1.0-9"; sha256="144liymq0cnd80cp2vn2d1j22g0izipnchc90r526gfpm2gklh7n"; depends=[optimbase optimsimplex]; };
+  Nemenyi = derive { name="Nemenyi"; version="1.1"; sha256="1hcliwbzy1ckyy49kh8qn0830s1ari40mqkvx9vj4hsdys9wjhnl"; depends=[]; };
   nephro = derive { name="nephro"; version="1.0"; sha256="0dv6gj1q6qrg9y6cpf230q1mksqk3nvzj3afavhrwz1fcz2w22f4"; depends=[]; };
   NestedCohort = derive { name="NestedCohort"; version="1.1-3"; sha256="10hsc6zik8sz2mp6ig3xr6z3bq0c6rlvqkn11pxny17a4n02wapp"; depends=[survival MASS]; };
   netClass = derive { name="netClass"; version="1.2.1"; sha256="04yrj71l5p83rpwd0iaxdkhm49z9qp3h6b7rp9cgav244q060m9y"; depends=[kernlab Matrix ROCR igraph samr]; };
@@ -3132,14 +3312,15 @@ let self = _self // overrides; _self = with self; {
   NetComp = derive { name="NetComp"; version="1.6"; sha256="11rxpdihn575diqfvc7yvxhlr2c19fig4v4a5c6jhqyfdsd60fsv"; depends=[gdata]; };
   NetData = derive { name="NetData"; version="0.3"; sha256="1jf05zwy0c6gmm7kvxlwvai61bz4wpsw7cl0h4i21ipzn1rqxmqj"; depends=[]; };
   NetIndices = derive { name="NetIndices"; version="1.4.3"; sha256="0ff57f5b12lccqbfin530ra373rn1wz6n42b0jnkyi2ra8hcm88f"; depends=[MASS]; };
-  netmeta = derive { name="netmeta"; version="0.4-3"; sha256="0a8z3wfdwqi2dazy94b46p3p8zrb5lvadklmpa4n7gczx0k0zqnx"; depends=[meta magic]; };
+  netmeta = derive { name="netmeta"; version="0.6-0"; sha256="0cwlwd4bms0kf6nicx7crjjighzrzjgfgmx5yl5v7am4v7kwhz2g"; depends=[meta magic]; };
   NetPreProc = derive { name="NetPreProc"; version="1.0"; sha256="1w0iih6pz8ci1y09xlzm2x3082s57znp1cxq44ckwh45hvzbxbmi"; depends=[]; };
   nets = derive { name="nets"; version="0.1"; sha256="0zshiavdi1z8mq6q93vsyb5wx5nq37qln9gcyvamvi2pgy5xg4k2"; depends=[igraph]; };
   NetSim = derive { name="NetSim"; version="0.9"; sha256="07h4qwz64k8zj8c2mx23cbnhg4rqrb4nfh20xw98kspz7cisdg6d"; depends=[Rcpp]; };
   netweavers = derive { name="netweavers"; version="1.0"; sha256="1k0i31h1wg3hk6m0w56jq14hqc4xpdmw7xy4mydars2nzfj41kzj"; depends=[igraph]; };
-  network = derive { name="network"; version="1.9.0"; sha256="1n88gz8ccrd9jq0xfywnj0yxlqq2nfp90vd18zjvf4yf3sylqril"; depends=[]; };
+  network = derive { name="network"; version="1.10.2"; sha256="1qdlwdhqyv1z4vhcbyqfx4iw207m76gly87pgyb85wqif4fifk0x"; depends=[]; };
   networkDynamic = derive { name="networkDynamic"; version="0.6.3"; sha256="0yb536q7v16wx491c5dmw7sf7h4f2rxs39bsdi0sknizgnmsqlv0"; depends=[network statnet_common]; };
   networkDynamicData = derive { name="networkDynamicData"; version="0.1.0"; sha256="1vln4n8jldqi1a6qb9j9aaxyjb8pfgwd8brnsqr8hp9lm3axd24b"; depends=[networkDynamic network]; };
+  networkreporting = derive { name="networkreporting"; version="0.0.1"; sha256="1vfvx5gf90p31gy6kcv7l2ibzbfl382gffa79dl8gascbsg6s8z8"; depends=[functional ggplot2 plyr reshape2 stringr]; };
   networksis = derive { name="networksis"; version="2.1-2"; sha256="05x0mp9ig7nff1js0zv7hq8p7jr7dqscs46zlbrxrrcy1waydb0s"; depends=[ergm network]; };
   networkTomography = derive { name="networkTomography"; version="0.3"; sha256="1hd7av231zz0d2f9ql5p6c95k7dj62hp0shdfshmyfjh8900amw7"; depends=[coda igraph KFAS limSolve plyr Rglpk]; };
   neuralnet = derive { name="neuralnet"; version="1.32"; sha256="0p9r5j8q0flv15wn5s6qi9if7npna107l1ffv37nzx1b4vgswnl9"; depends=[MASS]; };
@@ -3148,49 +3329,54 @@ let self = _self // overrides; _self = with self; {
   neuRosim = derive { name="neuRosim"; version="0.2-10"; sha256="1h6hhzf3rl8fnvdv8vw3lzzd23pbnv1shd9d8gpk41fgigjnxp1v"; depends=[deSolve]; };
   Newdistns = derive { name="Newdistns"; version="1.0"; sha256="1agg5v05x9qlg1w439aycfjfd5yap6ivn1kqgsc3ck148ar11wb2"; depends=[]; };
   nFactors = derive { name="nFactors"; version="2.3.3"; sha256="016d76yfxz7gx7zz5dgwjmj2c5m6kxdmqj0lln5w6d70r9g1kxg7"; depends=[MASS psych boot lattice]; };
+  ngram = derive { name="ngram"; version="1.1"; sha256="0p5wm55anch1i0y3478f5d4sivs7q8j3kwlg89nk3337win06499"; depends=[]; };
   ngramr = derive { name="ngramr"; version="1.4.3"; sha256="0j66v841xkb1yw2n4pa7p8kz574np2yj2ic71z6aq71npdbxgh9a"; depends=[httr RCurl plyr rjson stringr reshape2 ggplot2 scales]; };
   ngspatial = derive { name="ngspatial"; version="1.0-3"; sha256="1ph3yg8vcvij3ymw41dczjpzs68icm5lr0pxybmmfgggpmw5cjyb"; depends=[Rcpp batchmeans]; };
   NHEMOtree = derive { name="NHEMOtree"; version="1.0"; sha256="0ycprj2rz2fy6a7ps0bsr27iphmbfxi9pbvl8rcr6p8yagfb84mb"; depends=[partykit emoa sets rpart]; };
-  nhlscrapr = derive { name="nhlscrapr"; version="1.5"; sha256="1b3bi79gkax2cm4b1hq8gd5snxyh1z3flc3qipdkada9r794jxlw"; depends=[RCurl rjson biglm bitops]; };
+  nhlscrapr = derive { name="nhlscrapr"; version="1.5.1"; sha256="0gyg7yvjf9r6q4br17rnlm6c8hsxlm6raym1y3rrl05ss1a63jwx"; depends=[RCurl rjson biglm bitops]; };
   NHMMfdr = derive { name="NHMMfdr"; version="1.0.6"; sha256="10xwvmzqkx90zh88yjmf6d8gsbqil4vxp53d914080b3aygsvxm8"; depends=[MASS locfdr]; };
-  NHPoisson = derive { name="NHPoisson"; version="2.1"; sha256="147qxmgwpqa9i8w4syhmr9n0pnypdvhpcai45zkfd1wz49xx3lvr"; depends=[car]; };
+  NHPoisson = derive { name="NHPoisson"; version="3.0"; sha256="11gdfqfly3cvr6ndxvp06kbdd7aw6k25kz8kyxxybjpzszxbpmq8"; depends=[car]; };
   nice = derive { name="nice"; version="0.4"; sha256="1alq8n8pchn9v0fvwrifdisazkh519x109bqgnpgnwf79wblmnhy"; depends=[]; };
+  nicheROVER = derive { name="nicheROVER"; version="1.0"; sha256="0sa7wfpzkin78vz48vwa5iac82v5l1s3zczdxz8sc2kyg22fj0aw"; depends=[mvtnorm]; };
   NightDay = derive { name="NightDay"; version="1.0.1"; sha256="0vkpr2jwhgghiiiaiglaj1b9pz25fcsl628c9nsp9zyl67982wz1"; depends=[maps]; };
   Nippon = derive { name="Nippon"; version="0.5.3"; sha256="02m591aljlaxn95k7sl8gfsviv4ywqv9mrkjf6g19kfrc9pbgjqg"; depends=[maptools]; };
   NISTnls = derive { name="NISTnls"; version="0.9-13"; sha256="03a1c8a5dr5l5x4wbclnsh3vmx3dy7migfdzdx7d7p3s7hj3ibif"; depends=[]; };
   nlADG = derive { name="nlADG"; version="0.1-0"; sha256="0nvd5hzd1p81jwx5p7js86wblgg615vdnpbvy5rhmhf1ig583z1b"; depends=[ggm]; };
-  nleqslv = derive { name="nleqslv"; version="2.1.1"; sha256="1f15qql1hg5rirdl4lq0mpabz7nc9ki0yaham6n43i326cwmsxpn"; depends=[]; };
+  nleqslv = derive { name="nleqslv"; version="2.4"; sha256="114h883rvfz48f2mx88cz1mirz15hbx3c4c4n1jvddk93dmz45j4"; depends=[]; };
   nlme = derive { name="nlme"; version="3.1-117"; sha256="105zrprpgd4snwcy80qfnjzvd5m7g4cx8njji83gg7ynskhrhxj9"; depends=[lattice]; };
   nlmeODE = derive { name="nlmeODE"; version="1.1"; sha256="1zp1p98mzbfxidl87yrj2i9m21zlfp622dfnmyg8f2pyijhhn0y2"; depends=[deSolve nlme lattice]; };
   nlmeU = derive { name="nlmeU"; version="0.70-3"; sha256="05kxymgybziiijpb17bhcd9aq4awmp5km67l2py9ypakivi0hc6l"; depends=[nlme]; };
-  nlmrt = derive { name="nlmrt"; version="2013-8.10"; sha256="1b86kjmbspwj9whnmvbvhhgij2jn3j102szygjpzwmqgx4sfsgw7"; depends=[]; };
-  nloptr = derive { name="nloptr"; version="1.0.0"; sha256="169gvrywx0py2d5xvx61cz20pmrdf9xahanj4wxr5klgylbbrgd6"; depends=[]; };
-  NLP = derive { name="NLP"; version="0.1-2"; sha256="17b0bsh9ff0rzjpa4rj1mzimpb8iysk3ykk2lazajz2faz8xnsba"; depends=[]; };
+  nlmrt = derive { name="nlmrt"; version="2013-9.24"; sha256="1nqcxfgl5iplmar58015ixir2c7agdw91i0ndn2imdx0il1x2hra"; depends=[]; };
+  nloptr = derive { name="nloptr"; version="1.0.4"; sha256="1cypz91z28vhvwq2rzqjrbdc6a2lvfr2g16vid2sax618q6ai089"; depends=[]; };
+  NLP = derive { name="NLP"; version="0.1-3"; sha256="0mg2sa1f9i2rfhzggd55mi3gmsb9xz6y51ygrk8i27vgyr7x0h7w"; depends=[]; };
+  NLPutils = derive { name="NLPutils"; version="0.0-1"; sha256="036pafnjcbz7ihdgsjss4jq8fb420j8fmxyymv7kr4pr78wjysbx"; depends=[NLP SnowballC qdap]; };
   nlreg = derive { name="nlreg"; version="1.2-2"; sha256="1pi7057ldiqb12kw334iavb4i92ziy1kv4amcc4d1nfsjam03jxv"; depends=[statmod survival]; };
   NLRoot = derive { name="NLRoot"; version="1.0"; sha256="1x8mcdgqqrhyykr12bv4hl4wbh1zw2qgpnd2yrm68kb92iy95rh4"; depends=[]; };
   nlrwr = derive { name="nlrwr"; version="1.1-0"; sha256="1j9wfcjimvfhxiwxsxcp5dni70i7bj5iizd8dq3kamzp7319mryv"; depends=[alr3 car drc HydroMe lattice lmtest MASS NISTnls nlme nls2 nlstools NRAIA sandwich]; };
   nls2 = derive { name="nls2"; version="0.2"; sha256="0k46i865p6jk0jchy03jiq131pc20h9crn3hygzy305rdnqvaccq"; depends=[proto]; };
-  NLSdata = derive { name="NLSdata"; version="0.9"; sha256="0z98bnxbzlpgyz5qlzhjqbfhscz9khxq4prrkx2iv1d1jwf5nli2"; depends=[reshape2]; };
+  nlsMicrobio = derive { name="nlsMicrobio"; version="0.0-1"; sha256="0676n78265z00dacmq593c9l2239ii574djm9s7i7w8jk1kdhzx2"; depends=[nlstools]; };
   nlsmsn = derive { name="nlsmsn"; version="0.0-4"; sha256="1gvpy8rq020l64bdw6n7kv354l7gwa2rgxarm6k0mqq7z21fxf58"; depends=[]; };
-  nlstools = derive { name="nlstools"; version="0.0-15"; sha256="16a8v2hx2x92ak811psld0klanksd8p0l8w0ikhi3frfaps8g8vi"; depends=[]; };
+  nlstools = derive { name="nlstools"; version="1.0-0"; sha256="04y3yzpipr82fgafppp09fbi6invmwyalljirmmh01qnrzfimwna"; depends=[]; };
   NlsyLinks = derive { name="NlsyLinks"; version="1.302"; sha256="0m1qvrpdfwql4jdk3nbn80llq83wavimifw630gnazwmkgkcncai"; depends=[lavaan]; };
   nlt = derive { name="nlt"; version="2.1-3"; sha256="1j0xrrbr1hvfda8rvnc17lj96m6cz24faxvwn68ilf7j1ab2lkgn"; depends=[EbayesThresh adlift]; };
   nlts = derive { name="nlts"; version="0.2-0"; sha256="14kvzc1p4anj9f7pg005pcbmc4k0917r49pvqys9a0a51ira67vb"; depends=[locfit acepack]; };
+  nmcdr = derive { name="nmcdr"; version="0.3.0"; sha256="1557pdv7mqdjwpm6d9zw3zfbm1s8ai3rasd66nigscmlq102w745"; depends=[CDFt]; };
   NMF = derive { name="NMF"; version="0.20.5"; sha256="1j91vklzi4qjlix5sn9qh86dwx6vxnla2p4ag81apkr441jkvynr"; depends=[pkgmaker registry rngtools cluster stringr digest gridBase colorspace RColorBrewer foreach doParallel ggplot2 reshape2]; };
   NMFN = derive { name="NMFN"; version="2.0"; sha256="0n5fxqwyvy4c1lr0glilcz1nmwqdc9krkqgqh3nlyv23djby9np5"; depends=[]; };
   NMOF = derive { name="NMOF"; version="0.28-2"; sha256="0c22fpzg8qg6asd0glq5cz32mhw7607bcsl7cmrkfzwm8p4yarns"; depends=[]; };
-  NMRS = derive { name="NMRS"; version="1.0"; sha256="0cas9lxki0c1bjn2dciv4s3wpvgvi6wkg5v46dj6cj9br21gc7nj"; depends=[Rwave FTICRMS tkrplot]; };
   nnclust = derive { name="nnclust"; version="2.2"; sha256="1mr506ddvw4lslylpmm43wmd6mwv055zjzgb427nj3jl142dfyz2"; depends=[]; };
   nnet = derive { name="nnet"; version="7.3-8"; sha256="0nhbprhwkpnhzw6jls8y76xskfh9gq491kg8q8wnamjv3gnngfa5"; depends=[]; };
   nnls = derive { name="nnls"; version="1.4"; sha256="07vcrrxvswrvfiha6f3ikn640yg0m2b4yd9lkmim1g0jmsmpfp8f"; depends=[]; };
   nodeHarvest = derive { name="nodeHarvest"; version="0.6"; sha256="16151rwmqkf5vlyrlxlirz8s0nimxppx1f7f4pwfxi9vipwph125"; depends=[quadprog randomForest]; };
   noia = derive { name="noia"; version="0.96"; sha256="0f5gfb78vaj9iklj7gq3g85v78xh5izghjc7v3827jr1irfjivap"; depends=[]; };
   NominalLogisticBiplot = derive { name="NominalLogisticBiplot"; version="0.2"; sha256="0m9442d9i78x57gdwyl3ckwp1m6j27cam774zkb358dw5nmwxbmz"; depends=[mirt gmodels MASS]; };
+  noncensus = derive { name="noncensus"; version="0.1"; sha256="0cfj17bfzddfshhhzv2ijhrp9ylcscmsysswjcsjfxmy3gbkd00q"; depends=[]; };
   nonlinearTseries = derive { name="nonlinearTseries"; version="0.2.1"; sha256="1pq93g25arnc68kyvv6ymywdvbqv6620dvqzv1l43c1xssw364bc"; depends=[Matrix rgl tseries TSA]; };
   nonparaeff = derive { name="nonparaeff"; version="0.5-8"; sha256="1kkn68m7cqlzx3v539cjxw3x5a2y86lvmyv2k98s87m3yvqg0gdk"; depends=[lpSolve gdata Hmisc rms geometry psych pwt]; };
   NonpModelCheck = derive { name="NonpModelCheck"; version="1.0"; sha256="0mgbyp651jfqyfavpv12i9kwqf0cpk2mzh9m0b5k4n759710qv8f"; depends=[dr MASS]; };
   nonrandom = derive { name="nonrandom"; version="1.42"; sha256="0icm23hw593322z41wmjkwxqknh2pa9kpzbrch7xw1mhp93sd5ll"; depends=[lme4]; };
-  nontarget = derive { name="nontarget"; version="1.2"; sha256="0k3kmspzd7xz4y241yg5cdpg8lsavkzv0l9311d7ajf78hll15b0"; depends=[]; };
+  nontarget = derive { name="nontarget"; version="1.3"; sha256="0kg3b1xs7sfgkjj5wf536r4k9b9hgi2hlkymsw0spskvjg2sd3q0"; depends=[enviPat nontargetData mgcv]; };
+  nontargetData = derive { name="nontargetData"; version="1.1"; sha256="07cdbpmn64sg4jfhljdcx503d55azyz58x7nkji044z3jmdryzqw"; depends=[]; };
   nopp = derive { name="nopp"; version="1.0.3"; sha256="128c441l5fgapxwl143yhciz8jcak8fisypp6wq6csdxpbs8w21f"; depends=[mlogit MASS]; };
   nor1mix = derive { name="nor1mix"; version="1.1-4"; sha256="11ym6av7zykynkqvhkbnl7rwxgzrjhgjnbq7whxhkb6qbf6khfsx"; depends=[]; };
   nordklimdata1 = derive { name="nordklimdata1"; version="1.0"; sha256="0l50g09c102r8fz8ks42dfywg2vh2ad8lhqi7n3gc8nhad8rapqr"; depends=[]; };
@@ -3198,6 +3384,7 @@ let self = _self // overrides; _self = with self; {
   NormalGamma = derive { name="NormalGamma"; version="1.1"; sha256="0r3hhfscif0sx9v8f450yf119gpvf3ilpb8n3ziy4v4qf2jlcfnk"; depends=[optimx histogram]; };
   NormalLaplace = derive { name="NormalLaplace"; version="0.2-0"; sha256="1yrqfqhxkavczascwpq7z77jwpa1s2dn2cfi15vxfjyayhdxq4aa"; depends=[DistributionUtils GeneralizedHyperbolic]; };
   normalp = derive { name="normalp"; version="0.6.9"; sha256="1a2m7agcnqmf69mgbkjmmp7mvpx9r4gk13x98yfkg1dyh3b48rri"; depends=[]; };
+  NormPsy = derive { name="NormPsy"; version="1.0.1"; sha256="050cb4i3pb1jbi1scxnnnf1rwxwvr472m284gcjlzrcr5xzbx0gr"; depends=[lcmm]; };
   NORMT3 = derive { name="NORMT3"; version="1.0-3"; sha256="041s0qwmksy3c7j45n4hhqhq3rv2hncm2fi5srjpwf9fcj5wxypg"; depends=[]; };
   normtest = derive { name="normtest"; version="1.1"; sha256="073r2mwfs6c4vqh8921nlyygl0f20nhv997s0iwf00d3jckkc4pp"; depends=[]; };
   normwhn_test = derive { name="normwhn.test"; version="1.0"; sha256="1kr45bfydk40hgdg24i2f28cdaw65hg9gmsgv4lsvvr2m3r74vi6"; depends=[]; };
@@ -3206,43 +3393,47 @@ let self = _self // overrides; _self = with self; {
   notifyR = derive { name="notifyR"; version="1.02"; sha256="0jx76ic5r1crcgg0n0yqnka0gwniflfxakh838a98j9wb11wi6h5"; depends=[RCurl rjson]; };
   noweb = derive { name="noweb"; version="1.0-4"; sha256="17s65m1m8bj286l9m2h54a8j799xaqadwfrml11732f8vyrzb191"; depends=[]; };
   Nozzle_R1 = derive { name="Nozzle.R1"; version="1.1-1"; sha256="05sjip4sz12mwd3jcbvk342p83kdmrd4l2jrh17p18w4l7w4nn0z"; depends=[]; };
-  np = derive { name="np"; version="0.50-1"; sha256="0x1z0kgvqc8fj9snarl3rs4kf87x6w0jk5nnjqg2sxs2gxfpdzaz"; depends=[boot cubature]; };
+  np = derive { name="np"; version="0.60-2"; sha256="0zs1d4mmgns7s26qcplf9mlz9rkp6f9mv7abb0b9b2an23y6gmi5"; depends=[boot cubature]; };
   nparcomp = derive { name="nparcomp"; version="2.0"; sha256="154689lk1sd1smc3fyslrgz4rzg166n2d8nz7bhbjcrq2fhj8pj0"; depends=[multcomp mvtnorm]; };
   nparLD = derive { name="nparLD"; version="2.1"; sha256="1asq00lv1rz3rkz1gqpi7f83p5vhzfib3m7ka1ywpf2wfbfng27n"; depends=[MASS]; };
   npbr = derive { name="npbr"; version="1.0"; sha256="12s25vn4f0373y2ijmpam0an4p64xr3m71xgf20g5przmr77bm0a"; depends=[Rglpk Benchmarking]; };
   NPCD = derive { name="NPCD"; version="1.0-6"; sha256="1lnj55f73rpjy6amg1n5x7b0jsrmharp0fhcjcn0dflcrjwianxj"; depends=[BB R_oo R_methodsS3]; };
   NPCirc = derive { name="NPCirc"; version="2.0.0"; sha256="03b4lx7rkpjlxy9854dy16qw15x1cjwzyyvxn778n5xsva0c498b"; depends=[circular misc3d movMF plotrix rgl shape]; };
+  npcp = derive { name="npcp"; version="0.1-0"; sha256="1kkz7qnvmbbl2yfar8s23cn2jh2cqjwnrgjqw5a0wzli5ky613nl"; depends=[]; };
   npde = derive { name="npde"; version="2.0"; sha256="1cp4k7jvsw9rc6rrck902nqqjaf2c1nxjic7i9r3fd6yca1lgqb9"; depends=[mclust]; };
   NPHMC = derive { name="NPHMC"; version="2.2"; sha256="000x9y00gfkaj5lf00a55b9qx15x05yp3g3nmp8slyzsnfv66p5d"; depends=[survival smcure]; };
   nplplot = derive { name="nplplot"; version="4.5"; sha256="1dpbs0jb34gv0zj528357z1j2pwahjbp04rm7jir6qk0jhyaxxgh"; depends=[]; };
-  nplr = derive { name="nplr"; version="0.1"; sha256="1fqsvmkgw1nz7p0fb6hgiawp9lnkd6rzlm3cca8zrwy3r2m59l56"; depends=[]; };
+  nplr = derive { name="nplr"; version="0.1-1"; sha256="0br7flriqbig8frq0j4lxiv6i8bwgsj422faln85ga93hnlky0a1"; depends=[]; };
   NPMLEcmprsk = derive { name="NPMLEcmprsk"; version="1.0"; sha256="0yakcjkxqlbpzs8jdaahdl4lv5l2ffq7l7v00sl77sn9gflgprk3"; depends=[]; };
-  npmlreg = derive { name="npmlreg"; version="0.45-4"; sha256="142pbbmb5qpnzsc2kx99f1kb4dkzfzj8xf69a5pjn17lppd6qxna"; depends=[statmod]; };
+  npmlreg = derive { name="npmlreg"; version="0.45-5"; sha256="0jkj3wi435bgb1swll56bcwc1vzq00l503miy171232avy8qrpaf"; depends=[statmod]; };
   NPMPM = derive { name="NPMPM"; version="1.0"; sha256="14rjj48vfj4wv1na5v181jby016afx4ak1fs0f3g1fif4kbgbdx0"; depends=[]; };
   npmv = derive { name="npmv"; version="2.1"; sha256="0ivd3wm1fmmaq8i2h0kdd11z9k1czb61ms8fj0xb5xmfy0g1rphy"; depends=[Formula ggplot2]; };
   NPMVCP = derive { name="NPMVCP"; version="1.1"; sha256="13jpm46abwziq8859jhl6hg1znk3ws1q7g4vlr2jyri3qa6h22dd"; depends=[]; };
   nppbib = derive { name="nppbib"; version="1.0-0"; sha256="075jb13zckkh66jwdmdlq4d2drjcc3lkj26px3w79b91223yymf2"; depends=[]; };
-  npRmpi = derive { name="npRmpi"; version="0.50-1.1"; sha256="0ipz0gr65ya2vk51a89l3mmbys48sa0dzywmqlvxc92k3mfiavzm"; depends=[boot cubature]; };
+  npRmpi = derive { name="npRmpi"; version="0.60-2"; sha256="10gify91m9jsbghdgkwjz57qn6ybj4i239caflm9vkrfxsg6yx2d"; depends=[boot cubature]; };
   NPS = derive { name="NPS"; version="1.0"; sha256="1acg3367rd53dgwzqr8pnfr8z72s3699h2nhrhh2w9zdqipid89g"; depends=[]; };
   NPsimex = derive { name="NPsimex"; version="0.2-1"; sha256="1k9i1f5ckvzdns8f5qnm2zq7qs3wsgzsnfwdz21zmhmi6d0pwchm"; depends=[]; };
+  npsm = derive { name="npsm"; version="0.01"; sha256="1bx3l3sh5jvwngq05006mjyy5rs136wlg6wgshqy4d104zqwqjxk"; depends=[Rfit]; };
   npsp = derive { name="npsp"; version="0.2-4"; sha256="1lzdr958m00dxwzgd46x5fs07sx0gnzbyjrllfa6s7r9klg4i707"; depends=[quadprog]; };
   npst = derive { name="npst"; version="2.0"; sha256="1y5ij3nmh9pj6p97jpx75g26sk508mznr0l67cwj381zfb77hj1n"; depends=[]; };
   NRAIA = derive { name="NRAIA"; version="0.9-8"; sha256="16v8s9mqvr6sbiwwj93n3nyrm996wyw4f9l569mw2ykqpdkbp7hm"; depends=[lattice]; };
   nricens = derive { name="nricens"; version="1.2"; sha256="17h0vckchqlvcsa604cgbcw1akaxl30yx24x1d8201svyz9n0hhb"; depends=[survival]; };
   NSA = derive { name="NSA"; version="0.0.32"; sha256="0lnimyx3fpnw9zfhqm7y3ssvbpmvbmhcqy6fp83862imiwpl8i5r"; depends=[R_methodsS3 MASS matrixStats R_oo R_utils aroma_core aroma_affymetrix]; };
-  NScluster = derive { name="NScluster"; version="1.0.0"; sha256="1mzh0v8lh881pr7rqfa4aqp9mwvldn4w5hzfsp8bhzamdf7w112v"; depends=[]; };
+  nscancor = derive { name="nscancor"; version="0.6"; sha256="1wkk08h8yz2mzgvmq0vr30iiczpbp0304vjwxqgsa3h240m4awsm"; depends=[]; };
+  NScluster = derive { name="NScluster"; version="1.0.2"; sha256="1bvr44qx3bzbgsdpj70dfq9azkrsywkbvwvm3lwwgpn0spk8apld"; depends=[]; };
   nsga2R = derive { name="nsga2R"; version="1.0"; sha256="04jj0a3isfc348vg46il5x9l33cr7xawz5w0mm4pwr6djhd8nfhx"; depends=[mco]; };
   NSM3 = derive { name="NSM3"; version="1.1"; sha256="0xyx06pc9690akdm02597pgcchn29gvc4kzcgyc3ihsjj71xryi2"; depends=[combinat MASS partitions survival agricolae ash binom BSDA coin epitools fANCOVA gtools Hmisc km_ci metafor nortest np quantreg Rfit SemiPar SuppDists waveslim]; };
-  nsprcomp = derive { name="nsprcomp"; version="0.4.1"; sha256="01zy6fkfnv8csmdp485rm3g7lznf826z3kgpgx964zhsx2axxdzl"; depends=[]; };
+  nsprcomp = derive { name="nsprcomp"; version="0.5"; sha256="1rrjiwkpiaqlp27s5xfd6jwmmpzgxm5d7874gp33511wa0vrhnnf"; depends=[]; };
   nsRFA = derive { name="nsRFA"; version="0.7-11"; sha256="1mlm8fygzr8b03rflays78l63ld0nagprc8xbwny5f87vi00wwq4"; depends=[]; };
   nullabor = derive { name="nullabor"; version="0.2.1"; sha256="1pxxynfjjyqmgqvfb4fcs6jy63cf9bcbi9x1kz4f5b454q2g1raq"; depends=[MASS ggplot2 plyr]; };
   numbers = derive { name="numbers"; version="0.4-5"; sha256="0z69samkj7fvbk0wj2nbnkcw17y1sdha7hghkc7yhgkwx2z1pana"; depends=[gmp]; };
   numDeriv = derive { name="numDeriv"; version="2012.9-1"; sha256="09s00a1wddpq5556mz87vdmx045rhjrx1w8f2a37m8hljghy86k9"; depends=[]; };
-  numOSL = derive { name="numOSL"; version="1.3"; sha256="0jmf73199v5f20cz3xgv0askaqz8rslawjzsc8ibb562v5b29fg7"; depends=[]; };
+  numOSL = derive { name="numOSL"; version="1.5"; sha256="06lfy4jkk3myzlwivgh9j6ig1l0q9mgaa1zh3vxv2vdkzjd0l56b"; depends=[]; };
   nutshell = derive { name="nutshell"; version="2.0"; sha256="1v11g5wqyxnj29b7akl0cwa34hcqs79ijbiv735pg3df4ggyrzvm"; depends=[nutshell_bbdb nutshell_audioscrobbler]; };
   nutshell_audioscrobbler = derive { name="nutshell.audioscrobbler"; version="1.0"; sha256="10fvc5d22gnfb0bkgbww48f0vvcaja96g5gfv85kap939j11172j"; depends=[]; };
   nutshell_bbdb = derive { name="nutshell.bbdb"; version="1.0"; sha256="19c4047rjahyh6wa6kcf82pj09smskskvhka9lnpchj13br8rizw"; depends=[]; };
   nws = derive { name="nws"; version="1.7.0.1"; sha256="1fn92n6brjhh8hpvhax7211cphx2cn0rl99kjqksig6z7242c316"; depends=[]; };
+  nycflights13 = derive { name="nycflights13"; version="0.1"; sha256="15bqaphxwqpdzr4bkn6qgbjb3knja5hk34qxjd6xhpjzkgfs5c0b"; depends=[]; };
   OAIHarvester = derive { name="OAIHarvester"; version="0.1-7"; sha256="0wcl71y8i4s4fxpb90xg71sj6819kgl3d4gff66dan8i6y8sxmyk"; depends=[XML RCurl]; };
   Oarray = derive { name="Oarray"; version="1.4-5"; sha256="1w66vqxvqyrp2h6acnbg3xy7cp6j2dgvzmqqk564kvivbn40vyy4"; depends=[]; };
   objectProperties = derive { name="objectProperties"; version="0.6.5"; sha256="0wn19byb1ia5gsfmdi6cj05pnlxbr3zcrjabjg3g1d7b58nz7wlh"; depends=[objectSignals objectSignals]; };
@@ -3254,27 +3445,29 @@ let self = _self // overrides; _self = with self; {
   obsSens = derive { name="obsSens"; version="1.3"; sha256="1vfm1mzsycwkqa39vf3fcdv1s6adps9hw1rxlvl8v9kq746hcabw"; depends=[]; };
   oc = derive { name="oc"; version="0.93"; sha256="1nw594wrlnb0kkhkqfa14wxahh1yshpa2hz25nlnb42mi9pbrzg4"; depends=[pscl]; };
   occ = derive { name="occ"; version="1.0"; sha256="1gn8rg6k5lwwb6axfby7hiss5m64j2rh3hsmwwij58j5xda3jlbx"; depends=[]; };
-  oce = derive { name="oce"; version="0.9-13"; sha256="09aib8xz7gs0sdq0iikmxjdpga1jvl9z4a7qqwyz4jlv74g73xas"; depends=[mapproj]; };
+  oce = derive { name="oce"; version="0.9-14"; sha256="03vp83504pwjk6wbx5l4s31qvxfyd3g38snvfvp8b0pvnlv8f2fh"; depends=[mapproj]; };
   ocean = derive { name="ocean"; version="0.2-4"; sha256="1554iixfbw3k6w9xh3hgbiygszqvj5ci431cfmnx48jm27h2alqg"; depends=[ncdf4 proj4]; };
   OceanView = derive { name="OceanView"; version="1.0"; sha256="1x94zrvz45vval4qiim6755ispj23zp0d6qvzg3xd65y30gprni1"; depends=[plot3D plot3Drgl shape]; };
+  ocedata = derive { name="ocedata"; version="0.1.2"; sha256="0kic6m09a66zc5fxh9fkqk7rp3mnpf0p6i1qy2irh3bj9ccmdkvk"; depends=[]; };
   ODB = derive { name="ODB"; version="1.1.1"; sha256="1hha4rkbc2zh3karkqa0vn4v0nmcd7sljcymy1nh28bx1gx2ffgs"; depends=[DBI RJDBC]; };
   odfWeave = derive { name="odfWeave"; version="0.8.4"; sha256="1rp9j3snkkp0fqmkr6h6pxqd4cxkdfajgh4vlhpz56gr2l9j48q5"; depends=[lattice XML]; };
   odfWeave_survey = derive { name="odfWeave.survey"; version="1.0"; sha256="0cz7dxh1x4aflvfrdzhi5j64ma5s19ma8fk9q2m086j11a1dw3jn"; depends=[odfWeave survey]; };
-  ODMconverter = derive { name="ODMconverter"; version="1.2"; sha256="05s12rv5aplii2vix6vmxx9raidgsrrdn29yillld9p6dwklrrs8"; depends=[XML xlsx]; };
+  ODMconverter = derive { name="ODMconverter"; version="2.0"; sha256="1691fmkdjhk7rih8qk3rp6bykplz8hxsl7in8gjrc5ll0fkygm98"; depends=[XML xlsx]; };
   oem = derive { name="oem"; version="1.02.1"; sha256="0z9k0jhpp5dayyin6v8p26rgl8s983hnpsk195c9z458i7nbmrpd"; depends=[Rcpp]; };
   Ohmage = derive { name="Ohmage"; version="2.11-3"; sha256="16mm58yzh1r8s8x3jhdjwb01a1a8yjiay4v7gcj7j4r7z4mqr75c"; depends=[RCurl RJSONIO]; };
   OIdata = derive { name="OIdata"; version="1.0"; sha256="078khxrszwnrww2h0ag153bf59fnyhirxy4m56ssgr2gmfahaymf"; depends=[RCurl maps RCurl maps]; };
   OIsurv = derive { name="OIsurv"; version="0.2"; sha256="148mpjj5navc1vrl72y87krn4lf3awnd32z3g4qqaia404w5w7p7"; depends=[survival KMsurv]; };
-  OjaNP = derive { name="OjaNP"; version="0.9-6"; sha256="1xkwc1hca74jd74mczyvvfimm6726r4mdzw12llh4i82jcwrzzs2"; depends=[ICS ICSNP]; };
+  OjaNP = derive { name="OjaNP"; version="0.9-7"; sha256="1sf23q4qwvx1n8ny9rk4jcrjsb4hifn4ry12p5k29x4baaxmn3xg"; depends=[ICS ICSNP]; };
   okmesonet = derive { name="okmesonet"; version="0.1.4"; sha256="1fq17v1wx8hxvlk489vp6nlsx8ifs4491099zhikhn1fj7b1m346"; depends=[plyr]; };
   OligoSpecificitySystem = derive { name="OligoSpecificitySystem"; version="1.3"; sha256="0s76fxai1kgq0hcr5m18yz7i14algld97rjrax75cxm1ccylah71"; depends=[tkrplot]; };
   OLScurve = derive { name="OLScurve"; version="0.2.0"; sha256="1zqapfwgwy9rxnbhmlgplkphw1bdia4cyi9q6iwcppw3rjw75f1n"; depends=[lattice]; };
   omd = derive { name="omd"; version="1.0"; sha256="0s1wcgivqapbkzjammga8m12gqgw113729kzfzgn02nsfzmsxspv"; depends=[]; };
-  OmicKriging = derive { name="OmicKriging"; version="1.1"; sha256="07k23ar2garvkdzhi7qqwh3xbnl9ak8synvnsk2ycvgs1mgcwzsn"; depends=[SNPRelate doMC ROCR inline gdsfmt irlba Rcpp RcppEigen]; };
+  OmicKriging = derive { name="OmicKriging"; version="1.3"; sha256="1fj131684faj75jdipmsvb8s684x72is6zz79hwb5wszklk00ind"; depends=[doParallel ROCR irlba]; };
   oncomodel = derive { name="oncomodel"; version="1.0"; sha256="1jyyq9znffiv7rg26mjldbwc5yi2f4f8npsd2ykhxyacb3g96fp1"; depends=[ade4]; };
   Oncotree = derive { name="Oncotree"; version="0.3.3"; sha256="147rc9ci66lxbb91ys2ig40sgmldi15p604yysrd4ccbxpbk2zwf"; depends=[boot]; };
   OneHandClapping = derive { name="OneHandClapping"; version="1.5"; sha256="1j45qy4nwnmiqmjqnhzs4f6zspckzhr1rx56i9ddis4iahffqd19"; depends=[]; };
   onemap = derive { name="onemap"; version="2.0-4"; sha256="00xmhm5qy0ycw0mnlyl20vfw0wxmpb36f07k0jj92c4zbpwjiygx"; depends=[tkrplot]; };
+  ONETr = derive { name="ONETr"; version="0.1-1"; sha256="0jaxz8104xfdn2ys6lgg16vrbin73b5qfnrr81bgmdcpsk9ggix5"; depends=[XML RCurl]; };
   OneTwoSamples = derive { name="OneTwoSamples"; version="1.0-3"; sha256="0019rc2f4jmbm6sinkvalvjqwi822x78aiin88kg8qbbb5ml8l89"; depends=[]; };
   onion = derive { name="onion"; version="1.2-4"; sha256="0x3n9mwknxjwhpdg8an0ilix5cb8dyy5fqnb6nxx7ww885k0381a"; depends=[]; };
   OOmisc = derive { name="OOmisc"; version="1.2"; sha256="09vaxn5czsgn6wpr27lka40kzd76jzqgqxavf26ms3m9kkdf83g4"; depends=[]; };
@@ -3282,16 +3475,16 @@ let self = _self // overrides; _self = with self; {
   OPDOE = derive { name="OPDOE"; version="1.0-9"; sha256="0pf8rv5wydc8pl4x57g7bk2swjabaxdgijgsigjy5wihfcb48654"; depends=[gmp mvtnorm orthopolynom nlme crossdes polynom]; };
   OPE = derive { name="OPE"; version="0.7"; sha256="0ld3pr94ii1pmfk99qfwgria6ki2iz2hwmn7pj3cjwprv8jkcjji"; depends=[]; };
   opefimor = derive { name="opefimor"; version="1.1"; sha256="0xv57l38wx3w67h312g5xcpi9m7ggd6crqvqjh5gddq0g1g93bjq"; depends=[]; };
-  openair = derive { name="openair"; version="0.9-2"; sha256="051wj9s733w6i9hz8bj19m355ravd46kqzh49qhhm9vy8msvna7q"; depends=[plyr reshape2 mgcv lattice latticeExtra cluster RColorBrewer Rcpp]; };
+  openair = derive { name="openair"; version="1.0"; sha256="04swl74189ccbak0qw55gyw66v07ia0wg8xwiak81233wc0ins42"; depends=[plyr reshape2 mgcv lattice latticeExtra cluster RColorBrewer Rcpp]; };
   OpenCL = derive { name="OpenCL"; version="0.1-3"; sha256="0f7vis0jcp0nh808xbzc73vj7kdcjb0qqzzsh3gvgamzbjfslch8"; depends=[]; };
-  opencpu = derive { name="opencpu"; version="1.4.0"; sha256="1czgzzfhs4ik74vfxg9jf3r2yfb2jrbyki5047ac8f65skmhrz8r"; depends=[evaluate httpuv knitr jsonlite devtools httr brew pander]; };
+  opencpu = derive { name="opencpu"; version="1.4.3"; sha256="0515x95rvrp9hpxmc65hz6r35g8ql2hvlqhj94zapaa55ycw95jb"; depends=[evaluate httpuv knitr jsonlite devtools httr brew pander]; };
   openintro = derive { name="openintro"; version="1.4"; sha256="1k6pzlsrqikbri795vic9h191nf2j7v7hjybjfkrx6847c1r4iam"; depends=[]; };
   OpenMPController = derive { name="OpenMPController"; version="0.1-2"; sha256="1cpsbjmqql0fsjc1xv323pfkhfr9vrcv5g4j3p1qc5zn4z9pq7r6"; depends=[]; };
   openNLP = derive { name="openNLP"; version="0.2-3"; sha256="1d609hv24sxjppxpkgfvsl7p8vsajj0ivczcjixlnrly09j9ajrh"; depends=[NLP openNLPdata rJava]; };
   openNLPdata = derive { name="openNLPdata"; version="1.5.3-1"; sha256="1a048irgv56yi2lvhpqh8vh4dl7g7zfg934qypjxg8mcdcqi820y"; depends=[rJava]; };
   OpenRepGrid = derive { name="OpenRepGrid"; version="0.1.8"; sha256="1m71wb9i30vggbxpcv9ywbdi21ki8qivqw70i3rsrk8r1nx3zxq1"; depends=[colorspace plyr abind rgl GPArotation psych XML xlsx pvclust]; };
   OpenStreetMap = derive { name="OpenStreetMap"; version="0.3.1"; sha256="009xiqsbgqb3lba6msyzq7ncripmvpymxynkga8pqc8npv8g7fzb"; depends=[rJava raster rgdal rJava]; };
-  openxlsx = derive { name="openxlsx"; version="1.0.3"; sha256="02fq0viam2czjnjvj055a5hbwnmgcxf1n7pdbba2bx52cwfq7c9l"; depends=[Rcpp]; };
+  openxlsx = derive { name="openxlsx"; version="2.0.15"; sha256="0wnczn3bnmcp3z8qx1al9is903y2iv532kb2sxz45ld3313n2y5z"; depends=[Rcpp]; };
   operators = derive { name="operators"; version="0.1-6"; sha256="13lqxifbw8h4xn5gjf96bnzq9fzrncrj1g5lib8gvbpcbwn2smsl"; depends=[]; };
   operator_tools = derive { name="operator.tools"; version="1.3.0"; sha256="0y5f0ifj4gaq03gm44vdvslcs7lglk1p8kq47mdc0gc1yfa6l00c"; depends=[]; };
   OPI = derive { name="OPI"; version="1.6"; sha256="0d9863zs54chmdc74g508xpclj7gjk7q36amdnqq0bffp87bj9nq"; depends=[rJava]; };
@@ -3303,22 +3496,24 @@ let self = _self // overrides; _self = with self; {
   optBiomarker = derive { name="optBiomarker"; version="1.0-27"; sha256="1kkj602d4klwyd8kylawgfysg8dlp2g6j7afkppzv5x8mbhs5ji4"; depends=[rpanel rgl MASS randomForest e1071 ipred msm Matrix]; };
   optextras = derive { name="optextras"; version="2013-10.27"; sha256="0898dgl8div4hdhb4wyj39vak94nm2311x550b8k8ljbx0nmp9gh"; depends=[numDeriv]; };
   OptHedging = derive { name="OptHedging"; version="1.0"; sha256="0g7qaf5abvbcqv2h1dciwn3gwpz084ryqjjk0yabdm4ym0y38ddm"; depends=[]; };
-  OptimalCutpoints = derive { name="OptimalCutpoints"; version="1.1-1"; sha256="1rlbi0b4hfwnbfckjam5hxpv0bcmk6rb99jwqmpg8m6x9jhcjzb0"; depends=[]; };
+  OptimalCutpoints = derive { name="OptimalCutpoints"; version="1.1-2"; sha256="14qz1clckmgjqhcfmxknxb3vwplf107g8y4pd5bb3n7ska2p9g58"; depends=[]; };
   optimbase = derive { name="optimbase"; version="1.0-9"; sha256="0ivz24kf3yacgq5bl3s3az1pcyhsz0cza5f8vdksy5gchwqplm8n"; depends=[Matrix]; };
   optimsimplex = derive { name="optimsimplex"; version="1.0-5"; sha256="1aiq0w2zlra3k6x4hf2rglb6bj8w25yc8djnpgm508kkrbv3cc17"; depends=[optimbase]; };
-  optimx = derive { name="optimx"; version="2013.8.6"; sha256="0aq3pd33ln2dvvvj2wx7qdjs7a4hc3i3xalysa41a0j0dm7v90s9"; depends=[numDeriv]; };
+  optimx = derive { name="optimx"; version="2013.8.6"; sha256="04jzfb4y1g3lds9qybhb8ykkwcwy1585v3mqpa3mshgdz332wx95"; depends=[numDeriv]; };
   OptInterim = derive { name="OptInterim"; version="3.0.1"; sha256="1ks24yv5jjhlvscwjppad27iass59da1mls99hlif0li9mvkbvyk"; depends=[mvtnorm clinfun]; };
   optiRum = derive { name="optiRum"; version="0.33"; sha256="1324wmi6b2y9whacf9883k1f86bs9gvxp46gksiga1dwab53nlhv"; depends=[data_table]; };
-  optmatch = derive { name="optmatch"; version="0.9-1"; sha256="0j8xyb0vsd4rgl5kqwzgy88myby61qaild2bmgn2xban63xnc23j"; depends=[digest]; };
+  optiscale = derive { name="optiscale"; version="1.1"; sha256="1c263w9df66m7lgvzpdfm2zwx9nj8wcdpgh5gijachr2dzffmrp2"; depends=[lattice]; };
+  optmatch = derive { name="optmatch"; version="0.9-3"; sha256="143rkqajs9vc2idg7vs043njh3jgbl3v5x2jnnbxj6g3qlgzd5cb"; depends=[digest]; };
   optparse = derive { name="optparse"; version="1.2.0"; sha256="064grlajnmbcbyhmfgx58mbbmv94sxdkxdqqww0cbi7dg441sli2"; depends=[getopt]; };
   optpart = derive { name="optpart"; version="2.1-1"; sha256="0m2nsrynqbw9sj7cp7c37grx9g20dld2f26g0xzbj16wz7whgp02"; depends=[cluster labdsv MASS plotrix]; };
-  optR = derive { name="optR"; version="1.0.3"; sha256="1grzm4m0zs1i0p6z3v2acgfyp3lvjrrkfp5sbix4jbr9360fk8m3"; depends=[]; };
+  optR = derive { name="optR"; version="1.1.1"; sha256="1lr5n0g21jayb27b2j8zh16f1k28avzg7k2mwyc7rjhhxv8k9w1j"; depends=[]; };
   ora = derive { name="ora"; version="2.0-1"; sha256="0albxqma220rnrpfdq3z9cawr83q1a0zzczbbcy4nijjm4mswphy"; depends=[DBI ROracle]; };
   orca = derive { name="orca"; version="1.0"; sha256="0cqz1zmlzwdprhbxs4arjv2gx868dx47xg8jmjvzk7g2xc9prj62"; depends=[]; };
+  ORCI = derive { name="ORCI"; version="1.1"; sha256="0xy5lvz2scz06fphjyhqbdhp4bizmv87a8xykp9dbgx8b4ssnqgz"; depends=[BiasedUrn BlakerCI PropCIs]; };
   orclus = derive { name="orclus"; version="0.2-5"; sha256="0kkxhyqjxib862npinzf3mipqg5imgscdmb5wqm8wf2j2mbislsx"; depends=[]; };
-  ORCME = derive { name="ORCME"; version="1.2.1"; sha256="14jj69m52vvcpshb31pvj9k5fp506d9a5dgyj85qvn3m39p7akky"; depends=[]; };
+  ORCME = derive { name="ORCME"; version="2.0.1"; sha256="0wr4z19alyp2cvlpg4bs8sni6nrwnhk11bbr00ycqym39alr2wjw"; depends=[Iso]; };
   orcutt = derive { name="orcutt"; version="1.1"; sha256="0hz7aw4jpf4l7ihj4bjnjv1m8ynr71n4l12x046qj8y7mrnl9p4k"; depends=[]; };
-  ordBTL = derive { name="ordBTL"; version="0.7"; sha256="16x05iiqqxyx528070b5aakr8r93hklmdwcsi5rfg2k9h91f0p03"; depends=[caret VGAM wikibooks]; };
+  ordBTL = derive { name="ordBTL"; version="0.8"; sha256="09x3zfmss4fsh3rjghgmpv8y34dnkz4mw696b3k3nvlgk55a1423"; depends=[caret VGAM wikibooks gtools]; };
   orddom = derive { name="orddom"; version="3.1"; sha256="165axs15fvwhrp89xd87l81q3h2qjll1vrwcsap645cwvb85nwsh"; depends=[psych]; };
   ORDER2PARENT = derive { name="ORDER2PARENT"; version="1.0"; sha256="04c80vk6z227w6qsnfls89ig4vqyiiymdarhq1pxa0gpr8j2ssx5"; depends=[Matrix]; };
   orderbook = derive { name="orderbook"; version="1.03"; sha256="0dlvjrzdhhh8js4g1lvxs46q7fdxfxavxnb4nj6xlwca75i51675"; depends=[lattice hash]; };
@@ -3328,10 +3523,10 @@ let self = _self // overrides; _self = with self; {
   OrdMonReg = derive { name="OrdMonReg"; version="1.0.3"; sha256="1xca8pvvq79j484l2rmn4nva8ncx8z51g5diljikck231y8qjqaz"; depends=[]; };
   OrdNor = derive { name="OrdNor"; version="1.0"; sha256="1n6c0d4r1w3n016lzk2i5yyvawk9pgmsbzymbbyq7gx8a80iv32h"; depends=[mvtnorm corpcor Matrix GenOrd]; };
   ordPens = derive { name="ordPens"; version="0.2-1"; sha256="1kcxjfr2ncnqg293ph509hpgzzn5s4ih2kd8agl335zlxcksz3fp"; depends=[grplasso mgcv RLRsim]; };
-  OrgMassSpecR = derive { name="OrgMassSpecR"; version="0.4-3"; sha256="0mnwsrcsq54g34465ygfbnnmmqsl8aqx50qds20ldnnqxxq3iic1"; depends=[]; };
+  OrgMassSpecR = derive { name="OrgMassSpecR"; version="0.4-4"; sha256="046lr0piiy5w5lxjvyw7iqqclkghmc6zqymfypkw374gk73yrm76"; depends=[]; };
   ORIClust = derive { name="ORIClust"; version="1.0-1"; sha256="1biddddyls2zsg71w4innxl0ckfb80q2j9pmd56wvbc0qnbm0w3q"; depends=[]; };
   orientlib = derive { name="orientlib"; version="0.10.3"; sha256="1qi46hkz73b8722zc3w6wvsq1ydlk37yxn9rd1dqygqbs1svkmvv"; depends=[]; };
-  orloca = derive { name="orloca"; version="4.1"; sha256="1r9qx2q3djldgxr942g7rhi4i13dlmm2f8lcqgc1h35l4qdaam5n"; depends=[]; };
+  orloca = derive { name="orloca"; version="4.2"; sha256="14accc5kcvvin5qav6g3rx10by00r0b8970nd09w4c09nhwyblcd"; depends=[]; };
   orloca_es = derive { name="orloca.es"; version="4.1"; sha256="0nzhg7vzfxlmryw5ijww8z2b1g9cmgcgzi3gsgigsgn4shnc2hni"; depends=[orloca]; };
   ORMDR = derive { name="ORMDR"; version="1.3-2"; sha256="0y7b2aja3zvsd6lm7jal9pabcfxv16r2wh0kyzjkdfanvvgk3wmm"; depends=[]; };
   oro_dicom = derive { name="oro.dicom"; version="0.4.1"; sha256="0mxjqk7b0k4srkk5yqm21b2x67c5hyd7nwf3b1qlb9rvnfjhqyhk"; depends=[oro_nifti]; };
@@ -3341,16 +3536,16 @@ let self = _self // overrides; _self = with self; {
   orsk = derive { name="orsk"; version="1.0-1"; sha256="155wc9sfla3717b6xmhmsmvsnh2qbzzkffhibmj4xc0pd9lwwz2v"; depends=[BB BHH2]; };
   orthogonalsplinebasis = derive { name="orthogonalsplinebasis"; version="0.1.5"; sha256="060g2z8zx5gkk8v31cs0c6v5jzkd7hc9l2syx6hmvj6przr2cxi4"; depends=[]; };
   orthopolynom = derive { name="orthopolynom"; version="1.0-5"; sha256="1gvhqx6jlh06hjmkmbsl83gri0gncrm3rkliyzyzmj75m8vz993d"; depends=[polynom]; };
-  osDesign = derive { name="osDesign"; version="1.6"; sha256="0xbrdv6pyriqxjxcq6vbk5qycc78jailw99l5w0rvp0s9mygqaaq"; depends=[]; };
+  osDesign = derive { name="osDesign"; version="1.7"; sha256="0y68pnsmq4nlmfsn28306q2kxab200pirr6ha0w4himzpnw1sil3"; depends=[]; };
   osmar = derive { name="osmar"; version="1.1-7"; sha256="0q6d8nw7d580bnx66mjc282dx45zw9srczz90b520hjcli4w3i3r"; depends=[XML RCurl geosphere]; };
   ouch = derive { name="ouch"; version="2.8-4"; sha256="1kx6qjvc8zlcxihqfxs288hwwh9m05s5544w4c6m1wc02083b735"; depends=[subplex]; };
-  outbreaker = derive { name="outbreaker"; version="1.1-2"; sha256="1sh9h1l7iqx6ly78wfxi0dlif77xggwzr0mzdy2ii7di1dnlwzv0"; depends=[ape igraph adegenet]; };
-  OutbreakTools = derive { name="OutbreakTools"; version="0.1-0"; sha256="1930kgqwys452p1xq0i7r20gd1gv0i6q03h1shzlkd0qyw1cx6in"; depends=[ggplot2 network knitr RColorBrewer ape reshape2 sna plyr ggmap scales rjson networkDynamic]; };
+  outbreaker = derive { name="outbreaker"; version="1.1-3"; sha256="0ahkzcgicdlk6g8fd7rnni0n333wrixlfpck5wpznp4a1ny44zn4"; depends=[ape igraph adegenet]; };
+  OutbreakTools = derive { name="OutbreakTools"; version="0.1-11"; sha256="0m39wppck75mpcgdhwvw0nc0cgidzn80zl58hhs6x3svpnbssn0v"; depends=[ggplot2 network knitr RColorBrewer ape reshape2 sna plyr ggmap scales rjson networkDynamic]; };
   OutlierDC = derive { name="OutlierDC"; version="0.3-0"; sha256="1vm3zx4qmj9l0ddfqbksm1qyqzzqrxf93gh4kj52h68zlsfxwv41"; depends=[survival quantreg Formula]; };
   OutlierDM = derive { name="OutlierDM"; version="1.0-0"; sha256="1yphr47nswcaqa5pfamc3ksqcxwhxl388sdml2aqjjfd9w29lf2g"; depends=[quantreg MatrixModels outliers pcaPP]; };
   outliers = derive { name="outliers"; version="0.14"; sha256="0vcqfqmmv4yblyp3s6bd25r49pxb7hjzipiic5a82924nqfqzkmn"; depends=[]; };
-  OUwie = derive { name="OUwie"; version="1.42"; sha256="0491cvl2z95mygl6ys94akf288i2bmr58dfnfs2vpbpnq4ldfjm4"; depends=[ape nloptr numDeriv corpcor lattice phytools phangorn]; };
-  overlap = derive { name="overlap"; version="0.2.2"; sha256="19236r750wpbvy2a50wjh6sadvn9jwcf4fx51nd2gfydfq48an21"; depends=[]; };
+  OUwie = derive { name="OUwie"; version="1.43"; sha256="1ixyws6q9p8kms3smzj8rkmsry2y4s9al4vhxpqfmbgypigq7n9k"; depends=[ape nloptr numDeriv corpcor lattice phytools phangorn]; };
+  overlap = derive { name="overlap"; version="0.2.3"; sha256="0d41fhdbm009j53hq4cm2dz04wlh955c4q80dw1d1wcyjz627n49"; depends=[]; };
   oz = derive { name="oz"; version="1.0-20"; sha256="1d420606ldyw2rhl8dh5hpscvjx6vanbq0hrg81m7b6v0q5rkfri"; depends=[]; };
   p2distance = derive { name="p2distance"; version="1.0.1"; sha256="1ims8i5z5k97kjpdysgx8g7lgvnvf7amahcrssw7bk38bvbxawni"; depends=[]; };
   p3state_msm = derive { name="p3state.msm"; version="1.3"; sha256="0gbrka62ylxx64r3abpk60y92k2lk5smlf8na68qazph8llsl2rv"; depends=[survival]; };
@@ -3369,11 +3564,11 @@ let self = _self // overrides; _self = with self; {
   PairedData = derive { name="PairedData"; version="1.0.1"; sha256="025h5wjsh9c78bg6gmg6p6kvv2s6d5x7fzn3mp42mlybq0ry78p0"; depends=[MASS gld mvtnorm lattice ggplot2]; };
   pairheatmap = derive { name="pairheatmap"; version="1.0.1"; sha256="1awmqr5n9gbqxadkblpxwcjl9hm73019bwwfwy1f006jpn050d6l"; depends=[]; };
   PairViz = derive { name="PairViz"; version="1.2.1"; sha256="0mjp5p6n5azbhrm2hvb9xyqjfhd49pw9ia8k70749yc96ws1qqc7"; depends=[TSP gtools]; };
-  pairwise = derive { name="pairwise"; version="0.2.4"; sha256="177xmxrs4fkvssigc7gl7az2z1q6gi7wrmygfhc9h9w1f8qg3n5y"; depends=[]; };
+  pairwise = derive { name="pairwise"; version="0.2.5"; sha256="0r08v95f6f2safi6c0x84v5gib5qnkv46dmi97rdb9l2xzly249b"; depends=[]; };
   pairwiseCI = derive { name="pairwiseCI"; version="0.1-22"; sha256="1lgir9gcikx8c9pd2wdsqnik9rwr4qkymcf4ndp8s491vj6cm6sa"; depends=[MCPAN coin boot mratios binMto MASS]; };
   palaeoSig = derive { name="palaeoSig"; version="1.1-2"; sha256="0f5y69zzb32zi3kdy8jpcvz3i38nmmi0d9ajs44jrq4rkhhhwq3v"; depends=[rioja vegan TeachingDemos gstat fields mapproj]; };
   paleobioDB = derive { name="paleobioDB"; version="0.1"; sha256="0ax5mzfvrxwg82brc4589bkd7cl8iy254iq6sjs9cr3d7x0zyahz"; depends=[maps raster rjson gtools RCurl plyr scales]; };
-  paleofire = derive { name="paleofire"; version="1.1-2"; sha256="0sspqnj0p5m09mpb620ha0wy3m7xyhwrvqvs34xcma11kjav1xd6"; depends=[GCD rworldmap locfit gtools caTools pscl Imap RCurl devtools raster sp rgdal ggplot2 lattice RColorBrewer agricolae]; };
+  paleofire = derive { name="paleofire"; version="1.1.3"; sha256="0k46pq16chrp5gcp5gd5vph9zj17ci4yb1lgyrwrm8qnvydi1nkp"; depends=[GCD rworldmap locfit gtools caTools pscl Imap RCurl devtools raster sp rgdal ggplot2 lattice RColorBrewer agricolae plyr]; };
   paleoMAS = derive { name="paleoMAS"; version="2.0-1"; sha256="1hhb5wbj4m3ch8wnvd1zkl5bk6wa9nl6jl1dhm4z6yqkh29yn9z6"; depends=[MASS vegan lattice]; };
   paleotree = derive { name="paleotree"; version="2.0"; sha256="06bi9wikgb9szlhf747ijnqikv87svlf579w4hx9yplc8m44br1s"; depends=[ape phangorn]; };
   paleoTS = derive { name="paleoTS"; version="0.4-4"; sha256="19acfq5z42blk6ya7sj3sprddlgvhrzb9zqpvpy4q8siqkxxrjah"; depends=[mvtnorm]; };
@@ -3386,9 +3581,11 @@ let self = _self // overrides; _self = with self; {
   panelAR = derive { name="panelAR"; version="0.1"; sha256="1ka2rbl9gs65xh2y2m4aqwh5qj4szibjy101hqfmza9wmdh25gpq"; depends=[car]; };
   Paneldata = derive { name="Paneldata"; version="1.0"; sha256="00hk340x5d4mnpl3k0hy1nypgj55as2j7y2pgzfk3fpn3zls5zib"; depends=[]; };
   papeR = derive { name="papeR"; version="0.4-0"; sha256="0w1pqmgaa15x4vxr4msw5fwmd42kgrhniy2h7wvpyyvgzxfvb0s3"; depends=[car nlme lme4 survival gmodels]; };
+  ParallelForest = derive { name="ParallelForest"; version="1.1.0"; sha256="1xa9lfgrvzv7bvv1aaabcfk4372p8x5gxgj463h5ggf9x177lj5j"; depends=[]; };
   parallelize_dynamic = derive { name="parallelize.dynamic"; version="0.9-1"; sha256="03zypcvk1iwkgy6dmd5bxg3h2bqvjikxrbzw676804zi6y49mhln"; depends=[]; };
-  parallelMap = derive { name="parallelMap"; version="1.0-83"; sha256="1ykgvvcynpqnkz8s5shwfi0qmlxffmrfb7wfhjw7dyh1zvkdwjwn"; depends=[BBmisc]; };
-  ParamHelpers = derive { name="ParamHelpers"; version="1.1-36"; sha256="009y7dbm2g0c9jr9893vzxflf5bvirxwa38i6ma6bgkmhg7smja9"; depends=[BBmisc]; };
+  parallelMap = derive { name="parallelMap"; version="1.1"; sha256="1h3im52ia29m1qv4dcvw1zxciv3v9b9fq2difg6cs9apdn0fvlz8"; depends=[BBmisc checkmate fail]; };
+  parallelMCMCcombine = derive { name="parallelMCMCcombine"; version="1.0"; sha256="05krkd643awqhfrylq9lxr2cmgvnm1msn2x8p1l1483n2gzyklz7"; depends=[mvtnorm]; };
+  ParamHelpers = derive { name="ParamHelpers"; version="1.3"; sha256="15dbqsr5sp16wq0nqi07gkkqc1drb87s5yw54s3dv1mg6bn4az7k"; depends=[BBmisc checkmate]; };
   paramlink = derive { name="paramlink"; version="0.9-6"; sha256="0pazllkjbqzvl9vmpvr67lkcsd960mipcd1p1nf00y8hknrwh7qp"; depends=[kinship2 maxLik]; };
   paran = derive { name="paran"; version="1.5.1"; sha256="0nvgk01z2vypk5bawkd6pp0pnbgb54ljy0p8sc47c8ibk242ljqk"; depends=[MASS]; };
   parboost = derive { name="parboost"; version="0.1.3"; sha256="1ziqbbcxvhc3v0vjpf9y6jhk3rqbgn9cilwcfxlxjbw73jhvvclg"; depends=[mboost party iterators plyr caret glmnet doParallel]; };
@@ -3407,7 +3604,7 @@ let self = _self // overrides; _self = with self; {
   partitionMetric = derive { name="partitionMetric"; version="1.1"; sha256="1wry9d3s814yp79ayab7rzf8z5l2mwpgnrc5j7d2sac24vp4pd48"; depends=[]; };
   partitions = derive { name="partitions"; version="1.9-15"; sha256="0jgpknm4zah50w9i3fbq2f1whm4hywm2j72vxc3ignx1snx2z0gs"; depends=[gmp polynom]; };
   partsm = derive { name="partsm"; version="1.1-2"; sha256="0cv3lgkdkn97bc85iwlv9w5pmqwwwsgb717zxnbgb5mzf4xn3f3g"; depends=[]; };
-  party = derive { name="party"; version="1.0-13"; sha256="0l6s9wb7xy1jysfj2333xyl0z46bvcs35kamrw8n5riigqxxmqcm"; depends=[zoo sandwich strucchange modeltools survival coin]; };
+  party = derive { name="party"; version="1.0-15"; sha256="159k6pq5in9608m6y007vhlvlhd98z1m75i727c7k1vjj0rxsdf1"; depends=[zoo sandwich strucchange modeltools survival coin]; };
   partykit = derive { name="partykit"; version="0.8-0"; sha256="083lwaz38d40qdhlhf33vplykx1m3ham0q8r7pmwivj09nbfkmya"; depends=[survival]; };
   parviol = derive { name="parviol"; version="1.1"; sha256="1sfgic86ssd5wjf9ydss9kjd3m4jmm2d1v896sjsv8bydwymbpx3"; depends=[vioplot]; };
   PAS = derive { name="PAS"; version="1.2"; sha256="0q5g9j8xb9fl7r8f1w5gk5h83ll5w1r6m2gq9ilw8w8s96pm4xd8"; depends=[glmnet]; };
@@ -3422,51 +3619,54 @@ let self = _self // overrides; _self = with self; {
   pathmox = derive { name="pathmox"; version="0.2.0"; sha256="0hcllnpjjays35yngz309f1gcx9qg5z9h302kg9mhxs90470x4w0"; depends=[plspm tester]; };
   PatternClass = derive { name="PatternClass"; version="1.5"; sha256="1paw39xm2rqjnc7pnbya7gyl160kzl56nys9g0y1sa6cqycy3y5x"; depends=[SDMTools]; };
   pavo = derive { name="pavo"; version="0.5-1"; sha256="189kshc5dm02qv0rm1dlcxrhvga4yhlkn3yyj3rjhmrags4rmwcb"; depends=[rgl rcdd mapproj geometry]; };
-  pawacc = derive { name="pawacc"; version="1.1"; sha256="1w3mzqbazxyb45yh3xmn780mghjyw90rmivhbp9kcxhjd175i4lw"; depends=[SparseM]; };
+  pawacc = derive { name="pawacc"; version="1.2"; sha256="1a9dzym02rfymjqw1rnp0hri50ysdnax171x5whi5j7fmvmc9rk5"; depends=[SparseM]; };
   PAWL = derive { name="PAWL"; version="0.5"; sha256="1sx4g4qycba2j1fm0bvhz3hk6ghhdc37rz5zi1njqxrpmbnkqg04"; depends=[mvtnorm foreach reshape ggplot2]; };
-  pbapply = derive { name="pbapply"; version="1.1-0"; sha256="1a8qxxz8xj90a5ywdq0ggbp2n733qxd1a4xxkp0835xp1asjrsq7"; depends=[]; };
+  pbapply = derive { name="pbapply"; version="1.1-1"; sha256="1dshpnnmq1g2v223qy7pgbxydy9sqj04zwqxvzylm4mqc91ks4n2"; depends=[]; };
   pbatR = derive { name="pbatR"; version="2.2-9"; sha256="1p8rj0lzm4pp1svgy7xia2sclkngzfjbgbikq94s6v92d582wncw"; depends=[survival rootSolve]; };
   PBC = derive { name="PBC"; version="1.2"; sha256="1z08y5sn6i439811c9mq3bs78zqlzzkz0srmv4wld68bywhmwqj4"; depends=[igraph Rcpp copula]; };
-  PBD = derive { name="PBD"; version="0.9"; sha256="0a38f6p12234wp42k21hdf30lb5bbfy61h66gz1z9p05rvl9lg4d"; depends=[deSolve ade4 ape DDD]; };
+  PBD = derive { name="PBD"; version="1.0"; sha256="1q8ijjmcwxi8f3wgggpj4y522wmxady7f60frhlvvixhzfn2iml1"; depends=[deSolve ade4 ape DDD]; };
   pbdBASE = derive { name="pbdBASE"; version="0.2-3"; sha256="1zfz45fnjmp8yz4nlac9q1d49gpczkl2b0rz2s33jbv5i32z3yvs"; depends=[rlecuyer pbdMPI pbdSLAP]; };
   pbdDEMO = derive { name="pbdDEMO"; version="0.2-0"; sha256="0vilri4d25mb339zsgh1zypyqxv1vzfdc8b8ivqi5yz1nrzm05gz"; depends=[rlecuyer pbdMPI pbdSLAP pbdBASE pbdDMAT]; };
   pbdDMAT = derive { name="pbdDMAT"; version="0.2-3"; sha256="18x607r0gx1nnw9p305ci5sfcxbi5zdr2b6yf9y6vqjsckicnw62"; depends=[rlecuyer pbdMPI pbdSLAP pbdBASE]; };
-  pbdMPI = derive { name="pbdMPI"; version="0.2-2"; sha256="0xyjbf3snmx64l3l1v8zibsl84g61i8fgkzzmpxqmgyabl5izkhp"; depends=[rlecuyer]; };
-  pbdNCDF4 = derive { name="pbdNCDF4"; version="0.1-2"; sha256="101swavhc1l4bkaq6hi8sf6siyjlcca7pr3gz2wgqnbsrhddj8ry"; depends=[rlecuyer pbdMPI]; };
-  pbdPROF = derive { name="pbdPROF"; version="0.2-2"; sha256="0pjciwrx4ck7kr7667ma8mc3qrdkcwzmgb0ajx9lm7k5gm9s59pw"; depends=[ggplot2 gridExtra reshape2]; };
-  pbdSLAP = derive { name="pbdSLAP"; version="0.1-8"; sha256="1lwhr9lpa9cqbypa5hhcc9bqnf4xc6r1ixdbibvlgfk30q3nzjsg"; depends=[rlecuyer pbdMPI]; };
+  pbdMPI = derive { name="pbdMPI"; version="0.2-4"; sha256="035b1wg7an1sjfbk6giv4n8znhxg8l0rnqf14c982d9fbcfbxf47"; depends=[rlecuyer]; };
+  pbdNCDF4 = derive { name="pbdNCDF4"; version="0.1-4"; sha256="0fd29mnbns30ck09kkh53dgj24ddrqzks4xrrk2hh1wiy7ap1h95"; depends=[]; };
+  pbdPROF = derive { name="pbdPROF"; version="0.2-3"; sha256="0vk29vgsv7fhw240sagz0szg0wb649sqc05j1aj027zvz931vfl8"; depends=[ggplot2 gridExtra reshape2]; };
+  pbdSLAP = derive { name="pbdSLAP"; version="0.1-9"; sha256="118fy8316p3ahshq0wcwqj20v019dgbgx9wlz7vq35zg5i2fwccw"; depends=[rlecuyer pbdMPI]; };
   PBImisc = derive { name="PBImisc"; version="0.999"; sha256="0igwl78wj8w6jzmk5m8y9rf4j72qrcjyhb83kz44is72ddzsyss6"; depends=[MASS lme4 Matrix]; };
   pbivnorm = derive { name="pbivnorm"; version="0.5-1"; sha256="18ry0qz0ryazplv5iwdvbfngn0zv7frqp16nc2x70s0wf3izxkwr"; depends=[]; };
-  pbkrtest = derive { name="pbkrtest"; version="0.3-8"; sha256="0cz02ryzd44pkw3j3bwh1wvayy0i3kkafapjw0rnbwj85mm02dla"; depends=[MASS lme4 Matrix]; };
+  pbkrtest = derive { name="pbkrtest"; version="0.4-0"; sha256="1mpcqciqgljjw60yccpb368a0h1casxijqjdwp3s1wi03ixp8iqz"; depends=[MASS lme4 Matrix]; };
+  pbo = derive { name="pbo"; version="1.3.4"; sha256="0v522z36q48k4mx5gym564kgvhmf08fsadp8qs6amzbgkdx40yc4"; depends=[lattice]; };
   pbs = derive { name="pbs"; version="1.1"; sha256="0cpgs6k5h8y2cia01zs1p4ri8r7ljg2z4x8xcbx73s680dvnxa2w"; depends=[]; };
   PBSadmb = derive { name="PBSadmb"; version="0.68.104"; sha256="01akimdsp0bkvz3a5d75yyy3ph0mff85n8qsnr59fla5b5cm4qlj"; depends=[PBSmodelling]; };
-  PBSddesolve = derive { name="PBSddesolve"; version="1.10.25"; sha256="09206zbw7sfnf624bm6y8407g6nq2z49xd5z5jri9dlny0ssl7xw"; depends=[]; };
+  PBSddesolve = derive { name="PBSddesolve"; version="1.11.29"; sha256="13vprr66hh5d19xambpyw7k7fvqxb8mj5s9ba19ls7xgypw22cmm"; depends=[]; };
   PBSmapping = derive { name="PBSmapping"; version="2.67.60"; sha256="1n9c9fglsnch5jw248yyvy2vrq3wgca0wdkdwwhfc3n7yw83mwkr"; depends=[]; };
   PBSmodelling = derive { name="PBSmodelling"; version="2.66.264"; sha256="08plp74cjzmgv3dkaxgryqq1yqp0z7pdlz9jqgai8w89vwi0il35"; depends=[]; };
   pca3d = derive { name="pca3d"; version="0.2"; sha256="1x7fi9c4gijv34hr2bgsp872v5hknwidrh4q4blvvqknfl1w3clr"; depends=[rgl]; };
   pcaL1 = derive { name="pcaL1"; version="1.2.1"; sha256="00jfsbhnpq5mvnmpv066w1nhz2lhv55imgbl2z7dza9b8gxb88ry"; depends=[]; };
-  pcalg = derive { name="pcalg"; version="2.0-2"; sha256="1fkd0881x1cjbvym3dmy4gm8wk0r6x5k0v531a9cr22kyvpk5qkb"; depends=[abind igraph ggm corpcor robustbase vcd Rcpp]; };
+  pcalg = derive { name="pcalg"; version="2.0-3"; sha256="1vfrqm8hjdprsdqpik6a4zhv4yxyqyqa3dr2226qkm5ijblrcmwx"; depends=[abind igraph ggm corpcor robustbase vcd Rcpp]; };
   PCAmixdata = derive { name="PCAmixdata"; version="2.1"; sha256="12g6pkp9yffp1arqdvnx721cn34h0a7m3bm2ayd9fsrvbaqb7ci8"; depends=[]; };
   pcaPA = derive { name="pcaPA"; version="1.2"; sha256="1acfhv6225r0d8m45z7dlx78lmypdlh1cg4irvf8b3av0qv12g5x"; depends=[polycor ltm ggplot2 mc2d]; };
   pcaPP = derive { name="pcaPP"; version="1.9-49"; sha256="0yk97r0rwkppnzp0kc1j3hcp4n2dr8765mbmvlaikjgwhlhbby4q"; depends=[mvtnorm]; };
+  PCDSpline = derive { name="PCDSpline"; version="1.0"; sha256="15kmvcwvwlsr1107n7mfajvf9b1kcslnhsdx0drjjhsvq193qrqa"; depends=[nleqslv matrixcalc]; };
   pcenum = derive { name="pcenum"; version="1.0.1"; sha256="0jcwggxcnlbx75lwwpaldv28sgmhxa46rny94sji37hq3zil8yhw"; depends=[]; };
   pcg = derive { name="pcg"; version="1.1"; sha256="194j72hcp7ywq1q3dd493pwkn1fmdg647gmhxcd1jm6xgijhvv87"; depends=[]; };
-  PCGSE = derive { name="PCGSE"; version="0.1"; sha256="113ppp574ci08p18g6b3s4zjdyihnql6qmrw8bh420lmdnxcfd7x"; depends=[MASS]; };
+  PCGSE = derive { name="PCGSE"; version="0.2"; sha256="19bpnn1b8ihmf52zh9g9pc38130np1ki8l7wf0j5myw2cnw6fna8"; depends=[RMTstat MASS]; };
   PCICt = derive { name="PCICt"; version="0.5-4"; sha256="1g17hxs00dlnb6p0av6l7j99qy00555f80nk1i1i1x87fszp3axa"; depends=[]; };
   pcIRT = derive { name="pcIRT"; version="0.1"; sha256="0vfbbmnp4jyrbi5d9gz1krh707aazbrqfcgc3rjrwwyjld11wyzn"; depends=[combinat]; };
   PCIT = derive { name="PCIT"; version="1.04-5"; sha256="10fnkad09y7vh8j3c5kgkh64lwqn2nsl5818rzl9b8d51f951qjg"; depends=[]; };
-  pcnetmeta = derive { name="pcnetmeta"; version="1.1"; sha256="1h1kqjvb4fry9qkq8ryh73fk0wfd9l24pyv2l8f6056i8nwkm5qp"; depends=[R2jags network runjags]; };
-  PCovR = derive { name="PCovR"; version="2.4"; sha256="0wz1bqdsf8x50kbi0vgw7wz268qks56bpgf6s68lqry7zgngjnx1"; depends=[GPArotation ThreeWay MASS Matrix]; };
-  PCPS = derive { name="PCPS"; version="1.0"; sha256="0qgbxkpnn4d1ng085z6wf61dg0dgyfc8q95li24wbwnghyqx1d5c"; depends=[picante SYNCSA vegan]; };
+  pcnetmeta = derive { name="pcnetmeta"; version="1.2"; sha256="18ha74i6azgkb8wzjgs8c55fi386a1z9n5bm1llb8mk089h2gx8j"; depends=[R2jags network runjags]; };
+  PCovR = derive { name="PCovR"; version="2.5"; sha256="1as3qd2gqznfy95mil8k31nkqrf36sgpja5s9zdwvk0vpaxv1fr7"; depends=[GPArotation ThreeWay MASS Matrix]; };
+  PCPS = derive { name="PCPS"; version="1.0.1"; sha256="1av0mfv54ig1blq0228nlzgvjndrg711ip6xfq2886qhypcapgd5"; depends=[SYNCSA vegan ape picante phylobase plotrix]; };
   pcrcoal = derive { name="pcrcoal"; version="1.1"; sha256="17mm13xpmghachiqr7v2691jk39mbfsadpg028gs3iiwmh0pksa0"; depends=[ape ggplot2 phylosim]; };
   PCS = derive { name="PCS"; version="1.2"; sha256="0488h6s1yz6fwiqf88z2vgckn6i0kwls8cazmpw3wspnaqvl2n4s"; depends=[statmod]; };
   pcse = derive { name="pcse"; version="1.9"; sha256="04vprsvcmv1ivxqrrvd1f8ifg493byncqvmr84fmc0jw5m9jrk3j"; depends=[]; };
   pdc = derive { name="pdc"; version="0.5"; sha256="1fx8y2irhklpkhxljy6vkg28i2xhprnhzrfrmxvmggpfk8xca8by"; depends=[]; };
   pdfCluster = derive { name="pdfCluster"; version="1.0-2"; sha256="0kbci54dlzn736835fh18xnf2pmzqrdmwa3jim29xcnwa1r2gklb"; depends=[geometry]; };
-  pdfetch = derive { name="pdfetch"; version="0.1.3"; sha256="1zh9fq249g1xwznjdql4a53vmgnjfz5ggrp91sagy6mm7mgks2bw"; depends=[zoo xts RCurl XML lubridate jsonlite reshape2]; };
+  pdfetch = derive { name="pdfetch"; version="0.1.5"; sha256="16al3db30nv25b0559n1mia3ragc494pn96sqc8hw99p50mrqgab"; depends=[zoo xts RCurl XML lubridate jsonlite reshape2]; };
   pdist = derive { name="pdist"; version="1.2"; sha256="18nd3mgad11f2zmwcp0w3sxlch4a9y6wp8dfdyzvjn7y4b4bq0dd"; depends=[]; };
   pdmod = derive { name="pdmod"; version="1.0"; sha256="1czpaghp2lcad4j6wxswdfw0n9m0phngy966zr4fr3ciqpx3q129"; depends=[mco]; };
   PDSCE = derive { name="PDSCE"; version="1.2"; sha256="17lc6d8ly6jbvjijpzg45dvqrzrh5s1sp415nycazgpbg9ypwr2h"; depends=[]; };
+  peacots = derive { name="peacots"; version="1.0"; sha256="1wc2651n34jn88711g295hzyd04ay4gabigh1xcw3m9gpvqnag1k"; depends=[]; };
   Peaks = derive { name="Peaks"; version="0.2"; sha256="0a173p5cdm1jnm7bwsvjpxh4dccy593g02c4qjwky1cgzy5rvin2"; depends=[]; };
   pear = derive { name="pear"; version="1.2"; sha256="1ixmyzm72s18qrfv2m8xzh5503k1q90lhddq4sp46m0q7qyxb192"; depends=[]; };
   pearson7 = derive { name="pearson7"; version="1.0"; sha256="0dz5zf3k6bwj460gna6ak7hwdrsjinhv2ckkgqrycilfsx1w5h44"; depends=[]; };
@@ -3475,9 +3675,10 @@ let self = _self // overrides; _self = with self; {
   pec = derive { name="pec"; version="2.2.9"; sha256="0qvkmm8k2bg6sg42csrk6sn5qa1bvnmn8q485sxc11lqgxvic2jx"; depends=[prodlim survival rms foreach]; };
   pedantics = derive { name="pedantics"; version="1.5"; sha256="0m5jxzkf1pf657q2klv6idnywg18ki962666nj7sfyl4rq06xhsi"; depends=[MasterBayes MCMCglmm kinship2]; };
   PedCNV = derive { name="PedCNV"; version="0.1"; sha256="09qxcjzwdgzdkbj28rzmfv7k3q2qsiapnvx3m45a835r57h5gynp"; depends=[Rcpp RcppArmadillo ggplot2]; };
-  pedgene = derive { name="pedgene"; version="1.4"; sha256="1ad3ym5q43vxzb035sdf83vdm0v44jba8mb7zziwkc2ljqza3564"; depends=[Matrix CompQuadForm kinship2]; };
+  pedgene = derive { name="pedgene"; version="2.1"; sha256="0nmp1s0i5b4h45p3f4rvvixjz8sgv56as3c85rvv3a8xwfd1gcxq"; depends=[Matrix CompQuadForm survey kinship2]; };
   pedigree = derive { name="pedigree"; version="1.4"; sha256="1dqfvzcl6f15n4d4anjkd0h8vwsbxjg1lmlj33px8rpp3y8xzdgw"; depends=[Matrix HaploSim reshape]; };
-  pedigreemm = derive { name="pedigreemm"; version="0.3-1"; sha256="09gx7232ba72848icc305fkcqj6rl9xij0gmqglchr4fv8xcl4qx"; depends=[lme4 Matrix]; };
+  pedigreemm = derive { name="pedigreemm"; version="0.3-3"; sha256="1bpkba9nxbaxnivrjarf1p2p9dcz6smf9k2djawis1wq9dhylvsb"; depends=[lme4 Matrix]; };
+  pedometrics = derive { name="pedometrics"; version="0.1-9"; sha256="1szp3mp24y32kz24p1c8mzdljqdl61fwnd3q1d5kqwg85amifa12"; depends=[spsurvey xtable XML stringr sp car pbapply MASS plyr lattice latticeExtra VecStatGraphs2D mvtsplot]; };
   pegas = derive { name="pegas"; version="0.5-1"; sha256="0imn9n0y9nxp8vv1nz3qg9vmb5bdzxm596fxxg4hcgw7am6ap2sq"; depends=[ape adegenet]; };
   PEIP = derive { name="PEIP"; version="1.7"; sha256="1bagi1kr8vd3b3r524vrk747bqmd9insny1nxj8bdvdk0a9yr949"; depends=[bvls Matrix RSEIS pracma]; };
   PEMM = derive { name="PEMM"; version="1.0"; sha256="18dd9hsbdrnhrrff7gpdqrw2jv44j8lg0v3lkcdpbd4pppcaq84h"; depends=[]; };
@@ -3488,10 +3689,12 @@ let self = _self // overrides; _self = with self; {
   pendensity = derive { name="pendensity"; version="0.2.7"; sha256="1f7v0dqcip6mvza9h6j1ajkc6awjs0g8i07v529xn7fhygzwwccr"; depends=[lattice fda]; };
   penDvine = derive { name="penDvine"; version="0.2.2"; sha256="054vw99z68pk0bi4yzdmvx13x8n75sj2371l8w2yady1lqjj4qi7"; depends=[lattice quadprog TSP fda Matrix]; };
   PenLNM = derive { name="PenLNM"; version="1.0"; sha256="1xkz39cdp9dr8iq1cjiv862sda4zy737gvbwxxsykw15256lklmf"; depends=[remMap MASS Matrix]; };
+  penMSM = derive { name="penMSM"; version="0.97"; sha256="0jpmsc950mgnjwlbzy00zsw0xihmmml56nmlgmrxpfzaxq0657ay"; depends=[]; };
   pensim = derive { name="pensim"; version="1.2.9"; sha256="10nrnxwfs41bhybs7j6xgnx0pq3c802n9k8irngmh8iy4w3wbhrq"; depends=[penalized MASS]; };
   peperr = derive { name="peperr"; version="1.1-7"; sha256="01a6sxcmb8v2iz2xdwhdnr92k3w2vn3hr0hg9b6mkpzjf4n45q3k"; depends=[snowfall survival]; };
   peplib = derive { name="peplib"; version="1.5.1"; sha256="1bdgmwbk76ryl5gxcgf3slds92yilg9p1x1lx0hnzzwcgx99wif3"; depends=[]; };
-  peptider = derive { name="peptider"; version="0.1.2"; sha256="1q63i84ibrqw0rdd48z76lhldc9gfyhxg9x1r2yz8q73dm2cvkig"; depends=[discreteRV plyr]; };
+  PepPrep = derive { name="PepPrep"; version="1.0.0"; sha256="1nrf0q1w9xsv7yp8zm9gbbbn9wg8brbix45m64gvrb9izrx3p09k"; depends=[stringr]; };
+  peptider = derive { name="peptider"; version="0.1.5"; sha256="1jlvzfm1i7yyplwgsp08x3sx07gmkv24ri8jrlkz6jspj9w90dwq"; depends=[discreteRV plyr dplyr]; };
   Peptides = derive { name="Peptides"; version="0.4"; sha256="1841cfx6i2yc5142j1160aandvlrljvfxx79clylj5k9yavpj8rc"; depends=[seqinr]; };
   pequod = derive { name="pequod"; version="0.0-3"; sha256="14nag0bd2icg294y7n47c6xlw54rrdia887d2ni6achjqgwvffzh"; depends=[ggplot2 car]; };
   perARMA = derive { name="perARMA"; version="1.5"; sha256="1d9vrxv8r6qgxhaz3pv8n34c526gi5cd8w7wxy9qc914y8kplmzr"; depends=[corpcor gnm matlab Matrix signal]; };
@@ -3500,7 +3703,8 @@ let self = _self // overrides; _self = with self; {
   performanceEstimation = derive { name="performanceEstimation"; version="0.1.1"; sha256="1km2ljsy8hj9x6xr9am0f4wzihlhbyxhcss7kcxbimxvcv0a479n"; depends=[ggplot2]; };
   perm = derive { name="perm"; version="1.0-0.0"; sha256="0075awl66ynv10vypg63fcxk33qzvxddrp8mi4w08ysvimcyxijk"; depends=[]; };
   PermAlgo = derive { name="PermAlgo"; version="1.0"; sha256="1dc4b5pn77av80k6pgh9k0ksvv9lnjqiwdb2jv55nm0ndycw0qr4"; depends=[]; };
-  permGPU = derive { name="permGPU"; version="0.14.3"; sha256="1scw5jch1pa53p5jxy4k9nfpnbr2llw846vmzhq6qqk40snz5pj3"; depends=[RUnit foreach]; };
+  PerMallows = derive { name="PerMallows"; version="1.3"; sha256="08bgy8k2xcb61kyqxdskz8x0cfw27cypp1r470lvld544r4x0hp1"; depends=[Rcpp]; };
+  permGPU = derive { name="permGPU"; version="0.14.6"; sha256="1h01nfq8hn7i29xanma70q6s5mj83znbb2lg9x7bjgdrgj38vy2m"; depends=[RUnit foreach survival]; };
   permtest = derive { name="permtest"; version="1.2"; sha256="1sciyjs840h004zg8bwclq0j0n22anvjvx3fz62y4dzblrynhrci"; depends=[]; };
   permute = derive { name="permute"; version="0.8-3"; sha256="0zc3b3cl7q7y9pglc690ldg6p7bl7d1h7xkwnqqmvrpn7cq29rdb"; depends=[]; };
   PERregress = derive { name="PERregress"; version="1.0-8"; sha256="1rhridhfgvrz14h61psfyr5ll13fvxj4b9fwrnlnc6lyqi01wjlc"; depends=[]; };
@@ -3512,17 +3716,17 @@ let self = _self // overrides; _self = with self; {
   PF = derive { name="PF"; version="9.5"; sha256="1y99brdabj78s5kxyv0136s40kaaj3zya9lk4qd0kqk83z2gdawp"; depends=[xtable RColorBrewer gdata]; };
   pfa = derive { name="pfa"; version="1.0"; sha256="116mpfdmfyd0p5j33rjw1xwxyyaccagbrpw7jbh4x996s057mql4"; depends=[lars POET quantreg]; };
   pgam = derive { name="pgam"; version="0.4.12"; sha256="0vhac2mysd053bswy3xwpiz0q0qh260hziw6bygpf83vkj94qf2v"; depends=[]; };
-  pgirmess = derive { name="pgirmess"; version="1.5.8"; sha256="0ldfli5yam24m8w4y0jc4s2vxc4szh6yvmxc5gf6qib7qxhh8k1j"; depends=[boot nlme rgdal sp spdep splancs]; };
+  pgirmess = derive { name="pgirmess"; version="1.5.9"; sha256="1n58r5ghd2ppnid6787gd1n18f23pf0fk7yr3vagcqpzv4pk0wic"; depends=[boot nlme rgdal sp spdep splancs]; };
   pglm = derive { name="pglm"; version="0.1-2"; sha256="1arn2gf0bkg0s59a96hyhrm7adw66d33qs2al2s0ghln6fyk8674"; depends=[maxLik plm statmod]; };
   pGLS = derive { name="pGLS"; version="0.0-1"; sha256="1rlk8q09sikf4vpzsx0c7s6qqh2hxf8dy2bgcm4nnkbv2nfjz438"; depends=[MASS]; };
   PGM2 = derive { name="PGM2"; version="1.0"; sha256="18azh6k271p9dvc23q402pv7wrilr1yk02vqqy6qjppnvq6jxahg"; depends=[]; };
-  pgmm = derive { name="pgmm"; version="1.0"; sha256="1l8riigmhb64r9h6z2r2ll8i33vmlbwj58im9ir5cpkrgz2qsp4k"; depends=[]; };
+  pgmm = derive { name="pgmm"; version="1.1"; sha256="0ajdcnxxy18ifidid4xnq9a03bsrvcbh3dh2vhviggkhq8gji1dn"; depends=[]; };
   pgnorm = derive { name="pgnorm"; version="1.1"; sha256="0fxx9wvzinh17cxy74xms6dbabifav0wsi2cl0wdfykpbwalmszk"; depends=[]; };
   pgs = derive { name="pgs"; version="0.4-0"; sha256="1zf5sjn662sds3h06zk5p4g71qnpwp5yhw1dkjzs1rs48pxmagrx"; depends=[gsl R2Cuba]; };
   phalen = derive { name="phalen"; version="1.0"; sha256="0awj9a48dy0azkhqkkzf82q75hrsb2yw6dgbsvlsb0a71g4wyhlr"; depends=[sqldf]; };
   phangorn = derive { name="phangorn"; version="1.99-7"; sha256="1q6a6md52d2f9xlrs5wv9crncwxh9a4x6zfxmdbsvrlwmgsbzvcx"; depends=[ape quadprog igraph Matrix fastmatch]; };
   PharmPow = derive { name="PharmPow"; version="1.0"; sha256="0gabkd8p4zsig9p697lyk8m2jxb5abjk81rpzd5ih1yk1qanhsn5"; depends=[scatterplot3d]; };
-  phaseR = derive { name="phaseR"; version="1.2"; sha256="0qkvcnpmjvldk49m6xrb7pinah4xl0s7gnhpfiy1v7cjg88k23ys"; depends=[deSolve]; };
+  phaseR = derive { name="phaseR"; version="1.3"; sha256="1hwclb7lys00vc260y3z9428b5dgm7zq474i8yg0w07rxqriaq2h"; depends=[deSolve]; };
   PhaseType = derive { name="PhaseType"; version="0.1.3"; sha256="092dqyqfaxj8qpwxcjb5cayhnq597rfjz1xb93ps4nrczycqs0l6"; depends=[coda ggplot2 reshape]; };
   phcfM = derive { name="phcfM"; version="1.2"; sha256="0i1vr8rmq5zs34syz2vvy8c9603ifzr9s5v2izh1fh8xhzg7655x"; depends=[coda]; };
   pheatmap = derive { name="pheatmap"; version="0.7.7"; sha256="0zj6n6cjkim20apihl943rhzxlmkmpqwh00l6h2c8z04m3pv186v"; depends=[RColorBrewer]; };
@@ -3530,39 +3734,44 @@ let self = _self // overrides; _self = with self; {
   phenex = derive { name="phenex"; version="1.0-7"; sha256="0q563cv9lskikf3ls0idp56lirw9gxn71rgxp9xn8an05gwdg0xr"; depends=[]; };
   phenmod = derive { name="phenmod"; version="1.2-3"; sha256="0dxwx8c7zka29fq7svrvn8bghj8jh8grbrgsw4pvavx2439cldak"; depends=[gstat RColorBrewer lattice pheno]; };
   pheno = derive { name="pheno"; version="1.6"; sha256="0xdya1g1ap7h12c6zn3apbkxr725rjhcp4gbdchkvcnwz4y9vw8c"; depends=[nlme SparseM quantreg]; };
-  pheno2geno = derive { name="pheno2geno"; version="1.1.0"; sha256="0myvmirxh0a4h18ngj89vs7ai9a1fj7gsdc76386y5yw0qx2gg5a"; depends=[qtl VGAM mixtools]; };
-  phenology = derive { name="phenology"; version="3.63"; sha256="1n3bh9kdpimcl9i9wmy58j7lajf6syxv39yzgb1c36dcwbj2xyg9"; depends=[fields zoo coda shiny XML]; };
-  PHeval = derive { name="PHeval"; version="0.5"; sha256="1alz676q80jcbkykfccxq8k2irv1j7xcqxjyyczhqzall2i6fhk0"; depends=[survival]; };
+  pheno2geno = derive { name="pheno2geno"; version="1.2.1"; sha256="0rh4fzka453i5djsyv4c0z3x6d5r7fvyvxi6x1a1806nzy7w43hj"; depends=[qtl VGAM mixtools]; };
+  phenology = derive { name="phenology"; version="3.69"; sha256="0xyd53w162b9f2k4wkrkhi2m7fwj30ii4xjlp7l5px352x1nhylv"; depends=[fields zoo coda shiny]; };
+  PHeval = derive { name="PHeval"; version="0.5.1"; sha256="12vlfg2w27hc19f8dwvhl8r0xfwapp1r9bihq7ax3d9j7aayv217"; depends=[survival]; };
   phia = derive { name="phia"; version="0.1-5"; sha256="0vkl4ccsdx72dwis2959f6w9zg584wfkn58fh2slybdyg9p8886a"; depends=[car]; };
   phmm = derive { name="phmm"; version="0.7-5"; sha256="0dil0ha199yh85j1skwfdl0v02vxdmb0xcc1jdbayjr5jrn9m1zk"; depends=[survival lattice Matrix]; };
   phom = derive { name="phom"; version="1.0.3"; sha256="0x05p6fn4kycilal65k7dy6h3w5i3ca9w93ryp4gqd4lp50l1749"; depends=[Rcpp]; };
   phonR = derive { name="phonR"; version="0.4-2"; sha256="15hi15minbd756vplmcyf0987ppanr44kds13nny0v1h5yyv8kyx"; depends=[]; };
-  phonTools = derive { name="phonTools"; version="0.2-1.1"; sha256="1bclfz5nw3k9vzh24yai3xc748fd054b4i6a4mz23dg210csclc9"; depends=[]; };
+  phonTools = derive { name="phonTools"; version="0.2-2.0"; sha256="1wd1a5506p3ny6vi9pq6yg9gbz082fxw4l3cxsplkdpqgkhryrww"; depends=[]; };
+  phreeqc = derive { name="phreeqc"; version="1.0-8877"; sha256="0w529qpqrjcn619bqinkdd8f02vigiwy799h7i33p7iwbf15jvzj"; depends=[]; };
   phtt = derive { name="phtt"; version="3.1.1"; sha256="02fqg2djpvbm6id1dg8c8w1qccd2axxrhlfi4vrm8d1qcrbjkjm1"; depends=[pspline]; };
   PhViD = derive { name="PhViD"; version="1.0.6"; sha256="17mr8gj6ic4p0xvxiva046r1gmy9azvm1s95rinxqsdd7hiak72w"; depends=[MCMCpack]; };
   phyclust = derive { name="phyclust"; version="0.1-15"; sha256="1j643k0mjmswsvp9jyiawkjf2qhfrw6xf4s2viqv987zxif2kd7z"; depends=[ape]; };
   phyext = derive { name="phyext"; version="0.0.1"; sha256="07hmjgp4qb3x95rbgm83sh9zwhsxjl1v5rvs39m565sc0fax1qdi"; depends=[phylobase ape]; };
+  phylin = derive { name="phylin"; version="1.0"; sha256="10pbs4adsyp43i89jb3xi0m55sl1w7ifmc98v74iq9p8xa15sdci"; depends=[]; };
   phylobase = derive { name="phylobase"; version="0.6.8"; sha256="0xj7x4cdfp0yadvjhdkw1ai3yd081ri4gpdg0n5g0z13cjaa6mjh"; depends=[ade4 ape Rcpp]; };
   phyloclim = derive { name="phyloclim"; version="0.9-4"; sha256="0ngg8x192lrhd75rr6qbh72pqijbrhrpizl27q0vr6hp7n9ch3zx"; depends=[ape raster]; };
   phyloland = derive { name="phyloland"; version="1.0"; sha256="0r6rpwcq13bxa6289bfj0a0is67a49nj5npi5381090iarkwfvs7"; depends=[ape gsubfn]; };
-  phylolm = derive { name="phylolm"; version="2.0"; sha256="0ccrmkhh5sfnmjs4xidfim7nq79pzm5i89hh1s7amqzrdx00bcpj"; depends=[ape]; };
+  phylolm = derive { name="phylolm"; version="2.1"; sha256="0g0s9n0899gbh5hhk469b3c1z8zhp9il50srnbvmfhql0cf1v22c"; depends=[ape]; };
   phylosim = derive { name="phylosim"; version="2.1.1"; sha256="0rrz5c7zl2hjalwm6m8pydikiwmiq2dybx2yhzp0ps2bcsn02lhn"; depends=[R_oo ape compoisson ggplot2 R_methodsS3]; };
   phylotools = derive { name="phylotools"; version="0.1.2"; sha256="19w7xzk6sk1g9br7vwv338nvszzh0lk5rdzf0khiywka31bbsjyb"; depends=[seqRFLP ape picante spaa fields]; };
+  phyloTop = derive { name="phyloTop"; version="1.1.1"; sha256="046myyr01c4zc6sfy7r6p2vswkqqqd3w4k173gjbjazl1ims1sjs"; depends=[phylobase NHPoisson ape igraph]; };
   phyreg = derive { name="phyreg"; version="0.7"; sha256="0saynhq4yvd4x2xaljcsfmqk7da2jq3jqk26fm9qivg900z4kf35"; depends=[]; };
   PhysicalActivity = derive { name="PhysicalActivity"; version="0.1-1"; sha256="1aqyip7psf3pdrxkpidfldkk9naihvnc7s3n6w6vvr9h1l5mpmvc"; depends=[]; };
-  phytools = derive { name="phytools"; version="0.3-93"; sha256="18302vbpifwxcinriq0kgj9lr8ha3mz1a0w7ikwhndmybmn2ds9q"; depends=[ape maps rgl animation clusterGeneration mnormt msm numDeriv phangorn plotrix scatterplot3d]; };
+  phytools = derive { name="phytools"; version="0.4-21"; sha256="1mvksa62hanbnn7ndgpsgipl8ckdhnzvfsarpidpxzgsc7vwagz8"; depends=[ape maps animation clusterGeneration mnormt msm numDeriv phangorn plotrix scatterplot3d]; };
   pi0 = derive { name="pi0"; version="1.3-250"; sha256="1561zvf1hcd05iqy245c0z23mi8ypk6q3lkfldcr55cs67w4lmz6"; depends=[LowRankQP Matrix numDeriv limSolve rgl scatterplot3d Iso quadprog kernlab]; };
   picante = derive { name="picante"; version="1.6-2"; sha256="1zxpd8kh3ay6f3gdqkij1a6vnkr98dc1jib2r6br2kjyzshabcsd"; depends=[ape vegan nlme]; };
   PIGE = derive { name="PIGE"; version="0.9"; sha256="1x8ml25mm69dvlszm9p2ycph92nxcsgd52ydj7ha0dwrrpcv2law"; depends=[snowfall ARTP xtable survival]; };
   PIGShift = derive { name="PIGShift"; version="1.0.0"; sha256="15cgpi7j5cs4aqdq5cy7535x8ar916d9hd109kc01njrwxp1xr96"; depends=[ape mvtnorm]; };
   PIN = derive { name="PIN"; version="0.8"; sha256="1hymf5106zxgbg8dki9jb7gy4vh2mjwbvzh0n2d7qkr6rm8lpmag"; depends=[]; };
+  pipeR = derive { name="pipeR"; version="0.4"; sha256="1lvi2pxb5jl874hgqp7f4vbkr306slg0lrsmbicvwg569dz5262f"; depends=[]; };
   PIPS = derive { name="PIPS"; version="1.0.1"; sha256="1c5v3s6xys9p1q32k6mpsffhi9gwsq951rh12hs76dmak862yspc"; depends=[]; };
-  pitchRx = derive { name="pitchRx"; version="1.3"; sha256="1naz281vwlry4dsrq1klxc9lhs6rminps7w5z8xa1jh400n47bqw"; depends=[ggplot2 XML2R plyr MASS hexbin rgl mgcv lubridate]; };
-  PivotalR = derive { name="PivotalR"; version="0.1.16.2"; sha256="0n5250bbg3gmyx75h53xx82hwlyyxxm2aaih17dsnm1jfjybbf3z"; depends=[Matrix]; };
+  pitchRx = derive { name="pitchRx"; version="1.5"; sha256="17g7kx6gjaknb14h3l76zr128s6skgvj2i1pg83sqj5ipj55qzhr"; depends=[ggplot2 XML2R plyr MASS hexbin mgcv]; };
+  PivotalR = derive { name="PivotalR"; version="0.1.16.17"; sha256="079s4cs6awc8rbr82b1fm0096j34lbmzgnczrfclxnb2rwmn8biv"; depends=[Matrix]; };
   pixmap = derive { name="pixmap"; version="0.4-11"; sha256="04klxp6jndw1bp6z40v20fbmdmdpfca2g0czmmmgbkark9s1183g"; depends=[]; };
   PK = derive { name="PK"; version="1.3-2"; sha256="0162ri9wlm9inryljal48av8yxb326na94kckkigsrklfxb3wkp2"; depends=[]; };
-  PKfit = derive { name="PKfit"; version="1.2.1"; sha256="0j5zjkz053ckwgbh8d2wil0y6dd7g8afylxxbj120y3hxxh5zq0v"; depends=[deSolve minpack_lm]; };
-  pkgmaker = derive { name="pkgmaker"; version="0.20"; sha256="1wj3989gm3vbi579zd30sb6s40mx5h0avxgfxdbir7ppyd98040k"; depends=[registry codetools digest stringr xtable]; };
+  PKfit = derive { name="PKfit"; version="1.2.2"; sha256="04gix9yyzfsam2zql5q9rr45zzpdz5y7i6w1lf6rqf4fgnjwfjqs"; depends=[deSolve minpack_lm]; };
+  pkgKitten = derive { name="pkgKitten"; version="0.1.0"; sha256="17gf3yiy7hq6f53sjxajnf87cg6c7ialiyfw61bj4fjbhskw92ij"; depends=[]; };
+  pkgmaker = derive { name="pkgmaker"; version="0.22"; sha256="0vrqnd3kg6liqvpbd969jjsdx0f0rvmmxgdbwwrp6xfmdg0pib8r"; depends=[registry codetools digest stringr xtable]; };
   PKgraph = derive { name="PKgraph"; version="1.7"; sha256="0g36cdv5cblqx69j48irxjc5nlw2cl3p714mlsblnd3362z1brwn"; depends=[RGtk2 gWidgetsRGtk2 cairoDevice lattice rggobi ggplot2 proto RGtk2 gWidgetsRGtk2]; };
   pkgutils = derive { name="pkgutils"; version="0.6.0"; sha256="0pi1xaamirsv1bwlwcvyd1hvdgbjbdmw3vg3krawsb34mynbrcff"; depends=[]; };
   PKI = derive { name="PKI"; version="0.1-1"; sha256="1m4q43yq8ddig15k0j9yg9hq4yz3yplqp68zl3p9g2shkam60p6w"; depends=[base64enc]; };
@@ -3573,7 +3782,7 @@ let self = _self // overrides; _self = with self; {
   PKtools = derive { name="PKtools"; version="1.5-0"; sha256="0za6qgl9q9y4j87kfhvanpc9mfckzww6q2kjz7divbv8ygn5cd1m"; depends=[lattice nlme R2HTML xtable]; };
   plan = derive { name="plan"; version="0.4-2"; sha256="0vwiv8gcjdbnsxd8zqf0j1yh6gvbzm0b5kr7m47ha9z64d7wxch6"; depends=[]; };
   planar = derive { name="planar"; version="1.5"; sha256="1ph3q985xw1sg9cs5k1cqpr46f0svycdc1dg3pqmdrzqdi8a3gyx"; depends=[dielectric Rcpp RcppArmadillo statmod cubature reshape2 plyr]; };
-  planor = derive { name="planor"; version="0.1-12"; sha256="1mcas42i39p9sr9x38x97ki7269x27pmac6xhss2h56clc0safqb"; depends=[conf_design biganalytics bigmemory]; };
+  planor = derive { name="planor"; version="0.2-0"; sha256="0mvlkrggwgrc9fmp935kihj2v7gfnghw7smpkbb3pbrrv9zhjlgi"; depends=[conf_design]; };
   PlayerRatings = derive { name="PlayerRatings"; version="1.0-0"; sha256="0hjb05bdha00ggcpp3n4f86dxjlhzmlpwgsbbx3mhyv3qq1g32ky"; depends=[]; };
   playitbyr = derive { name="playitbyr"; version="0.2-1"; sha256="0pi0kji32ha6csff5w2xl8f76clrxlkwws60lzqzc83avrb0930n"; depends=[csound]; };
   playwith = derive { name="playwith"; version="0.9-54"; sha256="1zmm8sskchim3ba3l0zqfvxnrqfmiv94a8l6slcf3if3cf9kkzal"; depends=[lattice cairoDevice gWidgetsRGtk2 RGtk2 gWidgets gridBase]; };
@@ -3588,14 +3797,14 @@ let self = _self // overrides; _self = with self; {
   plot2groups = derive { name="plot2groups"; version="0.10"; sha256="00mp82vvx6inlc2zj2cqqnzyglrm9x9im2vrqqk8j2jn0hbgfymy"; depends=[ggplot2]; };
   plot3D = derive { name="plot3D"; version="1.0-1"; sha256="1zvvsl94azz3252c8f485zhzd4x23wfj08x85vq873fj36p82aaf"; depends=[misc3d]; };
   plot3Drgl = derive { name="plot3Drgl"; version="1.0"; sha256="109vsivif4hmw2hk3hi4y703d3snzxbr9pzhn1846imdclkl12yg"; depends=[rgl plot3D]; };
-  plotGoogleMaps = derive { name="plotGoogleMaps"; version="2.0"; sha256="1fh3qb06jwklznwrfim4jgii5bjh2zmxf4klbfbd0qrx5qlr1vbq"; depends=[sp rgdal maptools lattice]; };
-  plotKML = derive { name="plotKML"; version="0.4-3"; sha256="0rcn4fx8zicazbjrpc6hxhdmv6j92wrinvv8jfmk5r1rhyvq5h5k"; depends=[XML sp raster rgdal spacetime colorspace plotrix dismo aqp pixmap plyr stringr colorRamps scales gstat zoo RColorBrewer RSAGA classInt]; };
+  plotGoogleMaps = derive { name="plotGoogleMaps"; version="2.1"; sha256="1hymq35va75grxsjhd8sk7x4xfqsyfk5r5i1l3drwrajl1sx8b1a"; depends=[sp spacetime rgdal maptools lattice raster]; };
+  plotKML = derive { name="plotKML"; version="0.4-5"; sha256="1w8dxwx57a9lis775xis44c0s1qfzc0h9b43wygcbzndkcn1dsh7"; depends=[XML sp raster rgdal spacetime colorspace plotrix dismo aqp pixmap plyr stringr colorRamps scales gstat zoo RColorBrewer RSAGA classInt]; };
   plotMCMC = derive { name="plotMCMC"; version="2.0-0"; sha256="0i4kcx6cpqjd6i16w3i8s34siw44qigca2jbk98b9ligbi65qnqb"; depends=[coda gplots lattice]; };
   plotmo = derive { name="plotmo"; version="1.3-3"; sha256="0xr70di5dfxwy69y60vr88wbrhbxkm55z04qxbvbdf5b04l9lw77"; depends=[]; };
   plotpc = derive { name="plotpc"; version="1.0-2"; sha256="0z73wyhdnz5qv2jy8c0sby6sbjr1q9026h0bk2ykjkjvckggnabc"; depends=[]; };
   PlotRegionHighlighter = derive { name="PlotRegionHighlighter"; version="1.0"; sha256="0n1nkfr3sdaq6f5p9kgx4slrsvhpdbax3rinrkfkb1vnjj4swj77"; depends=[]; };
-  plotrix = derive { name="plotrix"; version="3.5-5"; sha256="0dqi4f1k5lrb1nxmlgcycxrjlpfxxy5gg3yf0fw2z2wlm2z42ikm"; depends=[]; };
-  plotSEMM = derive { name="plotSEMM"; version="1.0"; sha256="0i94l252m2d6akbwwaxq8j9w9503x6c16lwww3ni3rbimkbf8iqq"; depends=[]; };
+  plotrix = derive { name="plotrix"; version="3.5-7"; sha256="0c9airkyf7qj1bmjdkwjk0k1qwspsaw4rkd4bf2lfb8m67jvzk6n"; depends=[]; };
+  plotSEMM = derive { name="plotSEMM"; version="2.0"; sha256="0n30m1nz9fnilbgxg5jcmx2bsscdvz5mkjkyrgx7yr3alazkaimd"; depends=[plyr shiny MplusAutomation Rcpp plotrix]; };
   plRasch = derive { name="plRasch"; version="1.0"; sha256="1rnpvxw6pzl5f6zp4xl2wfndgvqz5l3kiv9sh4cpvhga0gl8zjaw"; depends=[survival]; };
   PLRModels = derive { name="PLRModels"; version="1.1"; sha256="0dwnzfw7a1cxz9s00kxf19jmjsc8cy6cc9q2mjqf8z7690wrg7hb"; depends=[]; };
   pls = derive { name="pls"; version="2.4-3"; sha256="114ka4766x8fx0zvvr7cylky1jsy542nj6s7sb2dwv8zjhbclkhn"; depends=[]; };
@@ -3604,8 +3813,8 @@ let self = _self // overrides; _self = with self; {
   plsgenomics = derive { name="plsgenomics"; version="1.2-6"; sha256="0f0pns20hd8hfc3v9m9vb8sng8qib6cry1k49nqs9gn09hhh26w9"; depends=[MASS]; };
   plspm = derive { name="plspm"; version="0.4.1"; sha256="00ibz69vhf0x3c73khkg57mzw49c3vq20yiqdqm9cpkdr9fczn2n"; depends=[amap diagram tester turner]; };
   plsRbeta = derive { name="plsRbeta"; version="0.1.8"; sha256="1gfwl659pmwjkif8n1vz7ljij3r8akzrlf389qwmhy57d6lhyb6w"; depends=[mvtnorm boot Formula plsdof MASS plsRglm betareg]; };
-  plsRcox = derive { name="plsRcox"; version="0.9.999"; sha256="1w4zdmb28hh98zasbagvnqp6ykk3468c576qz61v91gyjar03z9c"; depends=[boot plsRglm lars survival pls kernlab mixOmics]; };
-  plsRglm = derive { name="plsRglm"; version="0.8.3"; sha256="00wl6cqgb0f6qpa3ynlj15qrylp3ir74qh6lqr1543dld6avr4p0"; depends=[mvtnorm boot bipartite]; };
+  plsRcox = derive { name="plsRcox"; version="1.7.0"; sha256="08cnxbqgxwmvbyhp8hwa7b30bznxvj7qcpq9p8jgcfnrxwslv2k6"; depends=[survival plsRglm lars pls kernlab mixOmics risksetROC survAUC rms]; };
+  plsRglm = derive { name="plsRglm"; version="1.1.0"; sha256="0bh88rdlk09hh2zaiqgpv05d5kn656ckn3g0wfzhkb445xb84pqq"; depends=[mvtnorm boot bipartite]; };
   plugdensity = derive { name="plugdensity"; version="0.8-3"; sha256="1jdmq4kbs8yzgkf9f5dc7c8c52ia68fgavw7nsnc2hnz5ylw1qy9"; depends=[]; };
   plumbr = derive { name="plumbr"; version="0.6.9"; sha256="1avbclblqfy57pd72ximvj3zq92q1w8vszvyf6fw75j5rfwdaibk"; depends=[objectSignals]; };
   plus = derive { name="plus"; version="1.0"; sha256="1l7lvnq7vahj8m7knmr4q3wj00ar7iq89j45a2dqn2bh0qyj68ls"; depends=[]; };
@@ -3614,15 +3823,16 @@ let self = _self // overrides; _self = with self; {
   PMA = derive { name="PMA"; version="1.0.9"; sha256="11qwgw4sgzl3xhrm468bsza83h3mfn89157nfwnrassl7qr42xkq"; depends=[plyr]; };
   pmcgd = derive { name="pmcgd"; version="1.1"; sha256="1pybzvyjmzpcnxrjsas06diy3x83i1r5491s6ccyr63l56hs55d5"; depends=[mixture mnormt]; };
   pmclust = derive { name="pmclust"; version="0.1-6"; sha256="05zjx4psvk5zjmr0iwwwig990g6h04ajn5wi0xi8bqv046r47q3h"; depends=[rlecuyer pbdMPI MASS]; };
+  PMCMR = derive { name="PMCMR"; version="1.0"; sha256="07k98zp4s65vx7ybj75b0i1jhlnvfspwjqh10nxdn0zmixw9nywj"; depends=[]; };
   pmg = derive { name="pmg"; version="0.9-42"; sha256="16jkkhpjiwpk5gszr7fc133l3y50dfwqxb45flzihxvp1x42d70y"; depends=[lattice MASS proto foreign gWidgets gWidgetsRGtk2]; };
   pmlr = derive { name="pmlr"; version="1.0"; sha256="1z3hbw4wabpai1q8kbn77nzxqziag8y04cidlfiw7z969s4pkmgl"; depends=[]; };
-  pmml = derive { name="pmml"; version="1.4.1"; sha256="173d1wznc99gl5n1nxzcjd03pmc5aahs5ny6kn79g0wlyqxdqyrn"; depends=[XML survival]; };
-  pmmlTransformations = derive { name="pmmlTransformations"; version="1.2.1"; sha256="11i75dy9rci1jajirnq00mr24y36wss6w2krf1v63g5h0rbm3gmh"; depends=[]; };
-  pmr = derive { name="pmr"; version="1.2.3"; sha256="1f6s9n7bffsf0w82i6mgainbgllpvbmc1l5l05mqgybpa90mdl2y"; depends=[]; };
+  pmml = derive { name="pmml"; version="1.4.2"; sha256="0588sph67zs58knf4g3fd7c84i2yag81igr882jgbaxhfhxrpk6n"; depends=[XML survival]; };
+  pmmlTransformations = derive { name="pmmlTransformations"; version="1.2.2"; sha256="1p31lakhqwk0qhb565j2sjcfsjsx0i5v8kj8779ryjyvy7717m6m"; depends=[]; };
+  pmr = derive { name="pmr"; version="1.2.4"; sha256="15yrh533rj5i728nvcpjj3m5wa3jbspnfj941px3mf11h14npxpp"; depends=[]; };
   png = derive { name="png"; version="0.1-7"; sha256="0g2mcp55lvvpx4kd3mn225mpbxqcq73wy5qx8b4lyf04iybgysg2"; depends=[]; };
   pnmtrem = derive { name="pnmtrem"; version="1.3"; sha256="0053gg368sdpcw2qzydpq0c5v2cxdlwgf5k68cbw0yx41csjgvz0"; depends=[MASS]; };
   pnn = derive { name="pnn"; version="1.0.1"; sha256="1s6ib60sbdas4720hrsr5lsszsa474kfblqcalsb56c84gkl42ka"; depends=[]; };
-  pocrm = derive { name="pocrm"; version="0.7"; sha256="043jdsc34mvlsckwkqaz3w5rbpczm3mx85nxyksj09yxn04j14sr"; depends=[dfcrm nnet]; };
+  pocrm = derive { name="pocrm"; version="0.8"; sha256="04i9slfb9hmhhhq6m2iz7p3cm3v1v6nsvnr117dp55cxanfymd6f"; depends=[dfcrm nnet]; };
   POET = derive { name="POET"; version="1.0"; sha256="0drn9530b14hindim8si1828yabyqc85b0qi900ahi5rv1p38v82"; depends=[]; };
   poibin = derive { name="poibin"; version="1.2"; sha256="12dm1kdalbqy8k7dfldf89v6zw6nd0f73gcdx32xbmry2l2976sa"; depends=[]; };
   PoiClaClu = derive { name="PoiClaClu"; version="1.0.2"; sha256="1j593sc344h9iy7if1ppihx2qd73dv32d77d8ckac43i7b2lig24"; depends=[]; };
@@ -3632,15 +3842,16 @@ let self = _self // overrides; _self = with self; {
   PoissonSeq = derive { name="PoissonSeq"; version="1.1.2"; sha256="1hhx0gv06cp6hm6h36mqy411qn9x15y45crpzbyf8crfs85c6gbg"; depends=[combinat]; };
   poistweedie = derive { name="poistweedie"; version="1.0"; sha256="18992fafypds3qsb52c09fasm3hzlyh5zya6cw32wnhipmda643m"; depends=[]; };
   poLCA = derive { name="poLCA"; version="1.4.1"; sha256="0bknnndcxsnlq6z9k1vbhqiib1mlzlx4badz85kc7a3xbrdrfs9f"; depends=[scatterplot3d MASS]; };
-  pollstR = derive { name="pollstR"; version="1.0-0"; sha256="1nmhvbpfb64cbh317k09dran38410qcfhk4rl37rch3bz6vv17rd"; depends=[httr plyr jsonlite]; };
+  pollstR = derive { name="pollstR"; version="1.0.2"; sha256="1nnd62m0241ig725dx27f6msbj0nhgh149rij4rjy79w5w1zsa02"; depends=[httr plyr jsonlite]; };
   polspline = derive { name="polspline"; version="1.1.9"; sha256="1n08dhwpf53slk1zib491kii54x9h16g3jgr2kxxpyc5xfv4yj26"; depends=[]; };
   polyaAeppli = derive { name="polyaAeppli"; version="2.0"; sha256="0kyz3ap92xz7aqyviyrpggfmicy1gybrx7y19djsmixcwz53zqch"; depends=[]; };
   polyapost = derive { name="polyapost"; version="1.1-6"; sha256="1wk85nl2p9plnaavjdr4bqxxhjc84ynv53bh2v1rmq87jymw40b1"; depends=[boot]; };
-  polyclip = derive { name="polyclip"; version="1.2-0"; sha256="1rcygs7907r75hndfs3yyh0yfcw3q5dyfps57r3ygkq1rjl6pchb"; depends=[]; };
+  polyclip = derive { name="polyclip"; version="1.3-0"; sha256="05bbj4hy4h1hcb4pzg1mjp8k7k91kqq5rg2x0ns4hcs1h4zrspds"; depends=[]; };
   polycor = derive { name="polycor"; version="0.7-8"; sha256="0hvww5grl68dff23069smfk3isysyi5n2jm4qmaynrk0m3yvhxwn"; depends=[mvtnorm sfsmisc]; };
-  polyCub = derive { name="polyCub"; version="0.4-3"; sha256="08m1nmc8g8s69lpnah9aisva4himymv659kxw73xzh7rma50r415"; depends=[sp spatstat statmod]; };
+  polyCub = derive { name="polyCub"; version="0.5-0"; sha256="0ry7kfy99nzwpbs8ac138b05rs36n1whdc0gcvgdb1x76xsa36lr"; depends=[sp spatstat]; };
   polynom = derive { name="polynom"; version="1.3-8"; sha256="05lng88c8cwj65cav31hsrca9nbrqn5rmcz79b17issyk2j0g86p"; depends=[]; };
   PolynomF = derive { name="PolynomF"; version="0.94"; sha256="006ds50ivq91v2jyhgpm5rfaipxbzsnljrki6fjplcw07g0frz71"; depends=[]; };
+  PolyPatEx = derive { name="PolyPatEx"; version="0.9"; sha256="1y3jsy095kfp9ycjnj467s1y5abba7jkm83x2cajp5g2jdgp7cf6"; depends=[gtools]; };
   polysat = derive { name="polysat"; version="1.3-2"; sha256="1h1ixxa4z6qr3ixpphy70axd3kf4gnwiw1i22qzm4m06h4bdchva"; depends=[combinat]; };
   polySegratio = derive { name="polySegratio"; version="0.2-4"; sha256="05kvj475zhlrmp7rm691cfs28igp4ac2cn2xxf7axx09v1nq33db"; depends=[gdata]; };
   polySegratioMM = derive { name="polySegratioMM"; version="0.6-3"; sha256="1y4kzb1p3aw7ng8mv1hszpvb5hwwxy4vg34mhhk705ki4jy8jgvp"; depends=[polySegratio gtools coda lattice]; };
@@ -3649,36 +3860,38 @@ let self = _self // overrides; _self = with self; {
   pom = derive { name="pom"; version="1.1"; sha256="02jv19apn0kmp1ric2cxajlaad2fmsz4nm4izd2c3691vzas7l83"; depends=[matrixcalc]; };
   Pomic = derive { name="Pomic"; version="1.0.2"; sha256="1i3zsz7gc4n4vid3yi3srrv04qk1678wqyyw303pfibiyfd4m80q"; depends=[]; };
   PoMoS = derive { name="PoMoS"; version="1.1.1"; sha256="0j3iw6bcsr3rzwh15afcw3rglddq9bj7470xpnlpfpmd9nk0s18d"; depends=[RGtk2 cairoDevice igraph]; };
-  pomp = derive { name="pomp"; version="0.49-2"; sha256="0prhingisbg5j36qawxnhjwarxfrldghd95gxc963d1rvvq8xgg9"; depends=[mvtnorm subplex nloptr deSolve]; };
+  pomp = derive { name="pomp"; version="0.53-5"; sha256="1bfb2b1fdj673b43jnq9pzh36h1hfb8dsarf1dq6pwain7dnqjyp"; depends=[subplex nloptr mvtnorm deSolve coda]; };
   pooh = derive { name="pooh"; version="0.2-1"; sha256="1h8b5zwawhvq6h29dfznnhdb33al06hkvy05dphsmycd1lsha0jm"; depends=[]; };
   popbio = derive { name="popbio"; version="2.4"; sha256="12hvxkgbr6snypplxv404sj0ass6ab9i969bb00ipy10gny1w4ww"; depends=[quadprog]; };
-  PopED = derive { name="PopED"; version="0.1.0"; sha256="081sjx15fhaw4a04mf12g9430djgjkzd66ncqjwj9asrhzsy0pdc"; depends=[ggplot2 MASS mvtnorm]; };
+  popdemo = derive { name="popdemo"; version="0.1-4"; sha256="0syhmm8fnxbsdzj75y7dpahmpf453a6gwp3yljkvmfl0bfv1g1ng"; depends=[expm]; };
+  PopED = derive { name="PopED"; version="0.1.1"; sha256="0p5wiwl1d7ywjpq3zj5mkk12hqhi0xgcwf9sr3pdqyrczhl825d3"; depends=[ggplot2 MASS mvtnorm nlme]; };
   popgen = derive { name="popgen"; version="1.0-3"; sha256="00rgfwmmiharfxqlpy21n3jbxwr5whzdg8psqylkjf83ls2myqzm"; depends=[cluster]; };
   PopGenKit = derive { name="PopGenKit"; version="1.0"; sha256="0l4mbm0cyppgvcw2cbimrv29aiciyj00k8wfwcj5zr8sh7fgfhs4"; depends=[]; };
-  PopGenome = derive { name="PopGenome"; version="2.0.6"; sha256="1zykgf68fgbj83x26dvsh34izc02ic8rg9gh7r01bks3q5hqmlj0"; depends=[ff]; };
-  PopGenReport = derive { name="PopGenReport"; version="1.8"; sha256="0jzakqjbmbs3f67vhnzxwvc2xf0q2i83a8y73c5ysbv5gyl0q1sf"; depends=[adegenet mmod knitr lattice RgoogleMaps gap calibrate xtable plyr dismo reshape ggplot2 R_utils ade4 pegas genetics rgdal gdistance vegan sp raster]; };
-  popgraph = derive { name="popgraph"; version="1.3"; sha256="064nxda90qrm8pzmnshwqrda91nmwb4sg2pyk7k9q6kpvqq7pjs6"; depends=[ggplot2 MASS sp igraph Matrix]; };
-  poppr = derive { name="poppr"; version="1.0.6"; sha256="0dbkvdjh4f81kj6xv2civhhhfymjc16imnx0vf0cbc4hyqfgqnpp"; depends=[adegenet vegan ggplot2 phangorn ape igraph pegas]; };
+  PopGenome = derive { name="PopGenome"; version="2.0.8"; sha256="07s4b8v00m2fsja0ynri67ns240kskw7f0snzfcs94p1kaalj4jx"; depends=[ff]; };
+  PopGenReport = derive { name="PopGenReport"; version="2.0"; sha256="1bi7a2dbqr73andgzmq00x5hkbi06ylmhyfn12b4h2260v6w5mwk"; depends=[knitr adegenet raster lattice RgoogleMaps gap calibrate xtable plyr dismo reshape ggplot2 R_utils ade4 pegas genetics rgdal gdistance vegan sp mmod]; };
+  popgraph = derive { name="popgraph"; version="1.4"; sha256="1z6w6vj3vl2w10hvzwmkw4d475bqcd6ys92xnn445ag6vpq0cvxq"; depends=[ggplot2 igraph MASS sp Matrix sampling]; };
+  popKorn = derive { name="popKorn"; version="0.3-0"; sha256="1zcl6ms7ghbcjyjgfg35h37ma8nspg15rk2ik82yalqlzxjf7kxw"; depends=[boot]; };
+  poppr = derive { name="poppr"; version="1.1.2"; sha256="0qzqyrx8jqz9xhwq6v2ic2jm82g3csg6cs31g7hailx559axxi8i"; depends=[adegenet vegan ggplot2 phangorn ape igraph ade4 pegas reshape2]; };
   popRange = derive { name="popRange"; version="1.1.1"; sha256="1n8swfhnxk757n6nxsmn8dzx2h01xdr2s64wy2m4xq7wpdp9lajq"; depends=[]; };
   popReconstruct = derive { name="popReconstruct"; version="1.0-3"; sha256="1m4gj43bzsz8y4jay0bc5mvdfwqx5agha4l2r0svm6qg8cfl4lza"; depends=[coda]; };
   popsom = derive { name="popsom"; version="2.3"; sha256="0hdg1nx8mlpqw9aj2q08sb20frsc5jnbvqpfalf5kyvlygnhxdlc"; depends=[som fields]; };
-  portes = derive { name="portes"; version="2.1-1"; sha256="0kj35cr85j7fv6viy0q62jcplrs4rnryrb9kw8g3mhszh4da8ld2"; depends=[]; };
+  portes = derive { name="portes"; version="2.1-3"; sha256="0nqh6aync5igmvg7nr5inkv2cwgzd0zi6ky0vvrc3abchqsjm2ck"; depends=[]; };
   portfolio = derive { name="portfolio"; version="0.4-6"; sha256="0kaaincyzc2f4dm7n08y3vs1yd1r7pd997gf2wvfjydw7wkc5pin"; depends=[lattice nlme]; };
   portfolioSim = derive { name="portfolioSim"; version="0.2-7"; sha256="1vf46882ys06ia6gfiibxx1b1g81xrg0zzman9hvsj4iky3pwbar"; depends=[lattice portfolio]; };
+  PortRisk = derive { name="PortRisk"; version="1.0"; sha256="0vyzvi56lmdlhxpbxcxcfqa8271jv2l45w7x1kzzwl6q0wm4bjln"; depends=[zoo]; };
   postCP = derive { name="postCP"; version="1.7.2"; sha256="1zi3ns202rsfbjkblsmk3vzlygixgm81cp9kga64q1xgk40vq657"; depends=[MASS Segmentor3IsBack]; };
-  POT = derive { name="POT"; version="1.1-3"; sha256="0s8ifnvk2h3blw7m0widp9q10hik58y02v7rl8lqpppnd5y868vz"; depends=[]; };
   potts = derive { name="potts"; version="0.5-2"; sha256="1q4kvknxkrd8qbv8l3vmwrppgzq5bsysnqgm029lx7iys73x4fck"; depends=[]; };
-  PottsUtils = derive { name="PottsUtils"; version="0.2-3"; sha256="0mnly1xlpwzk3ryvgl2m0m6ygvx0i7k7gk3fdf4vmw5llyd6xg3s"; depends=[miscF]; };
+  PottsUtils = derive { name="PottsUtils"; version="0.3-2"; sha256="05ds0a7jq63zxr3jh66a0df0idzhis76qv6inydsjk2majadj3zv"; depends=[miscF]; };
   powell = derive { name="powell"; version="1.0-0"; sha256="160i4ki3ymvq08szaxshqlz7w063493j5zqvnw6cgjmxs7y0vj8y"; depends=[]; };
   PoweR = derive { name="PoweR"; version="1.0.1"; sha256="1m6y7f89kjhdmrdw1xb59cly0xjz79b1krhywkg9m7z73k1yx9h9"; depends=[]; };
-  Power2Stage = derive { name="Power2Stage"; version="0.0-8"; sha256="0ni7pp7wc22v01f2anp0932glxwvikwj57laq6f5vs6v12gz3wkv"; depends=[PowerTOST]; };
+  Power2Stage = derive { name="Power2Stage"; version="0.1-4"; sha256="1gdkrvmrss5x6m33y6lk8d397q64jj4d72hxvs9yj1wwngd635ah"; depends=[PowerTOST]; };
   powerAnalysis = derive { name="powerAnalysis"; version="0.2"; sha256="15ff3wnn37sjkiyycgh16g7gwl3l321fbw12kv621dad5bki14jl"; depends=[]; };
   powerGWASinteraction = derive { name="powerGWASinteraction"; version="1.0.0"; sha256="0ij843g95ypxc7cfhvi3pm57b5ry1xr2x0f944l9ncyy8d15jxc4"; depends=[]; };
-  poweRlaw = derive { name="poweRlaw"; version="0.20.2"; sha256="0nw52gwk9504i55852dik1kqqk6zg3wjgckc9rmw8gh2pz8i9nla"; depends=[VGAM]; };
+  poweRlaw = derive { name="poweRlaw"; version="0.20.5"; sha256="03s4kn01q4v2wx2y5pglqycjr37076g9alp9kz915h0ckfv1i42f"; depends=[VGAM]; };
   powerMediation = derive { name="powerMediation"; version="0.1.7"; sha256="1nysqyz5rbpn25k1pi9g7gwiarm8ncyw5xxal972wv8c70lsn4ir"; depends=[]; };
   powerpkg = derive { name="powerpkg"; version="1.5"; sha256="0mbk2fda2fvyp1h5lk5b1fg398xybbjv0z6kdx7w7xj345misf7l"; depends=[]; };
   powerSurvEpi = derive { name="powerSurvEpi"; version="0.0.6"; sha256="1jsbrj35m296mkk47zcpb2haain6bf23k0xzphnb4sq8f06cmq1p"; depends=[survival]; };
-  PowerTOST = derive { name="PowerTOST"; version="1.1-11"; sha256="0b2qnz1wivi2190gq2cwcnbk9cnrsj23zv41jaqs8p5319gr76jh"; depends=[mvtnorm]; };
+  PowerTOST = derive { name="PowerTOST"; version="1.1-13"; sha256="0w535rnwsdjad7fhrm0bxqkbci4y5qdgdy8rif3y5s5qkjhlqxnc"; depends=[mvtnorm]; };
   PP = derive { name="PP"; version="0.2-1"; sha256="0qrmlfjfsaj1jxbpzzbh1lnsw5c9b631b7q5jxrzvg675m0wy2mr"; depends=[]; };
   ppcor = derive { name="ppcor"; version="1.0"; sha256="18l5adjysack86ws61xh89z5xfr83v932a0pn6ad8i8py3nd85fj"; depends=[]; };
   ppiPre = derive { name="ppiPre"; version="1.5"; sha256="1d1567h2j0y4f8jkaiszxkq13xkxq9jb3bf0rmjmy1z263nnl4a1"; depends=[igraph e1071]; };
@@ -3686,49 +3899,50 @@ let self = _self // overrides; _self = with self; {
   ppmlasso = derive { name="ppmlasso"; version="1.0"; sha256="0f5wld45r874rmi5bvhiqhpi5jqgrg5lwqazfhkv1md0ac2klkqj"; depends=[spatstat]; };
   pps = derive { name="pps"; version="0.94"; sha256="0sirxpagqc2ghc01zc6q4dk691six9wkgknfbwaqxbxvda3hcmyq"; depends=[]; };
   ppstat = derive { name="ppstat"; version="0.9"; sha256="1mnlvdzvayz30sbiq95wm0ywmzc168lqx0l33397jadiq5zbsbkn"; depends=[processdata reshape2 ggplot2 Matrix]; };
-  PPtree = derive { name="PPtree"; version="2.2.0"; sha256="0pbfda0ab56ji1ms35msnpjxj7zrj9vif6vvsdajmlnnhncm757q"; depends=[MASS penalizedLDA]; };
+  PPtree = derive { name="PPtree"; version="2.3.0"; sha256="002qjdx52r2h90wzrf2r3kz8fv3nwx08qbp909whn6r4pbdl532v"; depends=[MASS penalizedLDA]; };
   pqantimalarials = derive { name="pqantimalarials"; version="0.1"; sha256="0q7knygxcv9s7lnpzn165dqvgff6zsz25ld44rh4fddgfzlwynn8"; depends=[shiny rms reshape2 RColorBrewer plyr]; };
   prabclus = derive { name="prabclus"; version="2.2-4"; sha256="1p4hhs002cyrmnmfc2s11zia2jcnafidmy41dl3bd8mqyq3d193z"; depends=[MASS mclust]; };
-  pracma = derive { name="pracma"; version="1.6.4"; sha256="0kqpz4pszcs0wh08cpwb19ahnbz1qnv423sl9dk9ii1j79n7rh7x"; depends=[]; };
-  PracTools = derive { name="PracTools"; version="0.0-1"; sha256="06xgyxpfczxs0vzjib6jpabj3ar143wkhi1q15c3nzjn8r33zi4h"; depends=[]; };
+  pracma = derive { name="pracma"; version="1.7.0"; sha256="1hi71m4hkyj8pvl01xl9675pza983ikigxp13i6i08bbpxsaclsm"; depends=[]; };
+  PracTools = derive { name="PracTools"; version="0.0-2"; sha256="1bigir9fv6qrj3r8bfff6zyvxi10c0qh56kvhqsclvwyg3hfk5yz"; depends=[]; };
   pragma = derive { name="pragma"; version="0.1.3"; sha256="1n30a346pph4d8cj4p4qx2l6fnwhkxa8yxdisx47pix376ljpjfx"; depends=[]; };
   praktikum = derive { name="praktikum"; version="0.1"; sha256="0kkydgglvqw371fxh46fi86fmdndhwq1n8qj0ynbh2gz1cn86aw1"; depends=[]; };
   predfinitepop = derive { name="predfinitepop"; version="1.0"; sha256="1x5ri1kvd1rd9bjp2ygqwl68yp6hyb6aly22bs5kdwv2vn9nlq9w"; depends=[]; };
   PredictABEL = derive { name="PredictABEL"; version="1.2-1"; sha256="18fmafl1d4nwf7mya9gh1rlv5936zzr2jm3fwn5r2m5fc034qqjx"; depends=[Hmisc ROCR epitools PBSmodelling]; };
   PredictiveRegression = derive { name="PredictiveRegression"; version="0.1-4"; sha256="15vkisj3q4hinc3d537s8inhj3wk62q67qhy050xmp9j563ainmd"; depends=[]; };
+  predictmeans = derive { name="predictmeans"; version="0.97"; sha256="1l5b85rw96mh3xvcv5iiiy7zh8s0hx0bw037a3p49vbsw3k9p5vb"; depends=[lme4 nlme ggplot2 lattice pbkrtest plyr]; };
   predmixcor = derive { name="predmixcor"; version="1.1-1"; sha256="0v99as0dzn0lqnbbzycq9j885rgsa1cy4qgbya37bbjd01b3pykd"; depends=[]; };
-  prefmod = derive { name="prefmod"; version="0.8-31"; sha256="19yglrj4nqsknhan9v2qyjbfwx0c796a0qn2sjnjwlc4vf9d94fn"; depends=[gnm colorspace]; };
-  PReMiuM = derive { name="PReMiuM"; version="3.0.24"; sha256="1i6bsp3bmzhb17nrxi6jj22s8rpck3ix7l6g1cx094im4hhgnb2k"; depends=[Rcpp ggplot2 cluster plotrix]; };
+  prefmod = derive { name="prefmod"; version="0.8-32"; sha256="0v5r195gzbfi6jbqz8r1x2fzj3anqxf4hxaxb9krm9rkwgphrwpi"; depends=[gnm colorspace]; };
+  PReMiuM = derive { name="PReMiuM"; version="3.0.28"; sha256="0cs18ig3ykd1s1hll7bq8ii1pbw4lr9ij8qyg7jh359k9vb6m5gy"; depends=[Rcpp ggplot2 cluster plotrix]; };
   PresenceAbsence = derive { name="PresenceAbsence"; version="1.1.9"; sha256="17qn4ggkr5aqml45nkihj1j35y479ywkm1xcfkb2g8ky66jb0c0s"; depends=[]; };
   PResiduals = derive { name="PResiduals"; version="0.1-0"; sha256="0g3div2i5sr4fbc7l6zzvaw72nbs80lkc1yv7p32w6g2cmyjhy7c"; depends=[Formula]; };
   prettyGraphs = derive { name="prettyGraphs"; version="2.1.5"; sha256="19jag5cymancxy5lvkj5mkhdbxr37pciqj4vdvmxr82mvw3d75m4"; depends=[]; };
-  prettyR = derive { name="prettyR"; version="2.0-7"; sha256="0ic0s8sqjlyn21s2zzrq2hrncsxqmgnl2xyvlicd5pvx3gfggjdi"; depends=[]; };
+  prettyR = derive { name="prettyR"; version="2.0-8"; sha256="1wz802mmsbm4011jskdvifm9p5vqjiq7x2cmxyvc6fi2g8s224rw"; depends=[]; };
   prevalence = derive { name="prevalence"; version="0.2.0"; sha256="0yab4ig0hwyr10fgcw50hs63hbdpch83500xws05h1srsd2kiq8f"; depends=[rjags coda]; };
   prevR = derive { name="prevR"; version="2.9"; sha256="1h0v52pwhrb9ib61wjqdcand5prc1h205nd2rl5qiiqcnq4xn582"; depends=[sp gstat GenKern rgdal fields]; };
-  prim = derive { name="prim"; version="1.0.13"; sha256="114n002jfiz99als8jny356frg6jamzfbrc2cqxl3fjjxijiy6hi"; depends=[]; };
+  prim = derive { name="prim"; version="1.0.14"; sha256="0ndzp2dj2rz6wffnc1a4bdn45vb5r6hf0niiixh0chrlakd5d4w7"; depends=[]; };
   primer = derive { name="primer"; version="1.0"; sha256="0vkq794a9qmz9klgzz7xz35msnmhdaq3f91lcix762wlchz6v7sg"; depends=[deSolve lattice]; };
-  primerTree = derive { name="primerTree"; version="1.0.0"; sha256="127i14bgb5kkd91yvd50bsib73lm01az80x3lm4d0fqirv7l715i"; depends=[directlabels gridExtra ggplot2 XML ape httr lubridate plyr scales stringr foreach]; };
+  primerTree = derive { name="primerTree"; version="1.0.1"; sha256="068j5a2rh8f1h1y7rv2xacnvkn2darzvp1adhi3hqkmwsb3znhjk"; depends=[directlabels gridExtra ggplot2 XML ape httr lubridate plyr scales stringr foreach]; };
   princurve = derive { name="princurve"; version="1.1-12"; sha256="19fprwpfhgv6n6ann978ilwhh58qi443q25z01qzxml4b5jzsd7w"; depends=[]; };
   prinsimp = derive { name="prinsimp"; version="0.8-8"; sha256="074a27ml0x0m23hlznv6qz6wvfqkv08qxh3v1sbkl9nxrc7ak4vn"; depends=[]; };
-  PRISMA = derive { name="PRISMA"; version="0.2-1"; sha256="09hpplm86d8f0v11jijj3nl4iaqbzhmz4wjdm81idmnfna83mmk0"; depends=[Matrix gplots ggplot2]; };
+  PRISMA = derive { name="PRISMA"; version="0.2-2"; sha256="0r4dhnp0f6q43iklmwjim20hy9wjijkh8q4gljx8sph47njc0xqd"; depends=[Matrix gplots ggplot2]; };
   PrivateLR = derive { name="PrivateLR"; version="1.1-69"; sha256="0harlkccxa51k75if5z1h29lnis1dinh2zsk2liicwyjxcnmx0ml"; depends=[]; };
   prLogistic = derive { name="prLogistic"; version="1.2"; sha256="1abwz7nqkz2qbyqyr603kl9a3rkad3f4vxhck6a9kl80xrmfrj9s"; depends=[boot lme4 Hmisc]; };
   prob = derive { name="prob"; version="0.9-5"; sha256="05skjqimzhnk99z864466dc8qx58pavrky320il91yqyr8b98j8b"; depends=[combinat fAsianOptions hypergeo VGAM]; };
   ProbForecastGOP = derive { name="ProbForecastGOP"; version="1.3.2"; sha256="0fnw3g19lx4vs8vmn4qdirvybkiy2cxkhwkn9qa3phz45iixnvx4"; depends=[RandomFields fields]; };
   probsvm = derive { name="probsvm"; version="1.00"; sha256="1k0zysym7ncmjy9h7whwi49qsfkpxfk7chfdjrydl6hn6pscis37"; depends=[kernlab]; };
-  pROC = derive { name="pROC"; version="1.7.2"; sha256="13yb6wypw1k34hddshwf67l72mkpqflbicy4c6pifq7m3jjz5v3w"; depends=[plyr Rcpp]; };
+  pROC = derive { name="pROC"; version="1.7.3"; sha256="1xbz50phi2ygrgvcv36vnbc2icga8abjiha2ap35bwffg5d2zmvi"; depends=[plyr Rcpp]; };
   processdata = derive { name="processdata"; version="0.8.2"; sha256="1rdb3chpm7c2acx5r262gcg5w02mplh6xgxlld070kb91i7drahj"; depends=[ggplot2 reshape2]; };
   ProDenICA = derive { name="ProDenICA"; version="1.0"; sha256="04gnsnd0xzw3bfbssdp06bar0lk305ry2c97pmwxgiz3ay88dfsj"; depends=[gam]; };
   prodlim = derive { name="prodlim"; version="1.4.3"; sha256="0y18ngb1gy8zdk4dfakb57pyjll8937acbaz2lynwhbabd6kg66l"; depends=[survival KernSmooth lava]; };
   PROFANCY = derive { name="PROFANCY"; version="1.0"; sha256="11a0fpsv1hy0djv36x2i2hv2j50ryy0x7g7nn7vv76m1sl6q6r4b"; depends=[Matrix lattice igraph]; };
   profdpm = derive { name="profdpm"; version="3.3"; sha256="07lhjavrx4fa5950w928mfpddmmnmvdapl5n6mv49m8h3bxs4nmy"; depends=[]; };
-  ProfessR = derive { name="ProfessR"; version="2.1"; sha256="1khgb3bbq44mskhrcni9yfg6cs35fdpgfakznna8d9rqy8wmw7ff"; depends=[RPMG]; };
+  ProfessR = derive { name="ProfessR"; version="2.3"; sha256="1y88as4xjvdm2v2ms5l7c6ziq7sll6qkrpgzdd4xnbcjx7c0g9w8"; depends=[RPMG]; };
   ProfileLikelihood = derive { name="ProfileLikelihood"; version="1.1"; sha256="16cdp1nimhg1sd2x0qbffm7clgk54p0838y688z8lnsrjaggmb0x"; depends=[nlme MASS]; };
   profileModel = derive { name="profileModel"; version="0.5-9"; sha256="1p9b9jr5842im195d60ja82pp7vbk85vs8b0r3fnf62j4b92aky9"; depends=[]; };
   profileR = derive { name="profileR"; version="0.2-1"; sha256="1hcydy7hqjac9mvbaim2g75ab1ziyvpbrkb4k21966m54zjk9kka"; depends=[ggplot2 MASS RColorBrewer reshape plyr]; };
   profr = derive { name="profr"; version="0.3.1"; sha256="1w06mm89apggy6wc273b2nsp95smajr8sf3dwshykivv7mhkxs5d"; depends=[stringr plyr]; };
   proftools = derive { name="proftools"; version="0.1-0"; sha256="1wzkrz7zr2pjw5id2sp6jdqm5pgrrh35zfwjrkr6mac22lniq4bv"; depends=[]; };
-  ProgGUIinR = derive { name="ProgGUIinR"; version="0.0-3"; sha256="1k441a5wmqhkmlm8cffvblp99c8sqq4z64qmb6a3mflkv89wd5si"; depends=[ggplot2 svMisc ggplot2 MASS]; };
+  ProgGUIinR = derive { name="ProgGUIinR"; version="0.0-4"; sha256="0srhk42ssx4i096sbs4jacqjsc1ffqjxjgvpplzshlqaby1h3795"; depends=[ggplot2 svMisc MASS]; };
   prognosticROC = derive { name="prognosticROC"; version="0.7"; sha256="0lscsyll41hpfzihdavygdzqw9xxjp48dmy4i17qsx5h01jl1h4i"; depends=[survival]; };
   proj4 = derive { name="proj4"; version="1.0-8"; sha256="06r3lavgixrsa52d1v31laqcbw6fb9xn23akv39hvaib78diglv9"; depends=[]; };
   ProjectTemplate = derive { name="ProjectTemplate"; version="0.5-1"; sha256="0fi5i9icac2rjrpmgvb9glqr6z5fr880bn8hz6djgi1n1bn2v1g8"; depends=[]; };
@@ -3741,21 +3955,22 @@ let self = _self // overrides; _self = with self; {
   protiq = derive { name="protiq"; version="1.2"; sha256="00hv6hmfba4is2q1s9h5csx42s7ry2qdmi7vasgcafp8s4fc999l"; depends=[mvtnorm]; };
   proto = derive { name="proto"; version="0.3-10"; sha256="03mvzi529y6kjcp9bkpk7zlgpcakb3iz73hca6rpjy14pyzl3nfh"; depends=[]; };
   protoclass = derive { name="protoclass"; version="1.0"; sha256="17d2m6r1shgb47v8mwdg1a7f5h29m5l7f5m0nsmv0xc90s9cpvk8"; depends=[class]; };
-  protoclust = derive { name="protoclust"; version="1.3"; sha256="01ri32w2l9w8k72hi22i8rwrzl2q1d14ikvzdkpysnr17sp00c1m"; depends=[]; };
   PROTOLIDAR = derive { name="PROTOLIDAR"; version="0.1"; sha256="0bz3071b0wlcvh40vl3dyiiixk5avsj6kjjnvlvx264i5g08rij4"; depends=[]; };
   protr = derive { name="protr"; version="0.2-1"; sha256="0kjvq7w2pg8vdv0f7lsc6f1ksbv9f9x7p61aqfzqignz9nh792dd"; depends=[]; };
-  protViz = derive { name="protViz"; version="0.1.76"; sha256="1zbi0h8vlgfpni3a10p6102llzpsx1yp0k8dnnbjcc357jj73zkk"; depends=[Rcpp]; };
+  protViz = derive { name="protViz"; version="0.1.98"; sha256="1lw9whid25pkprhw1ivb9fjaa5vx1w5mvj3dx299bp4dqg75dns6"; depends=[Rcpp]; };
   proxy = derive { name="proxy"; version="0.4-12"; sha256="1hjbx94c4m2v22fswdd2jkb43ixfv6qivx8qiyzm23g1965ynvii"; depends=[]; };
-  PSAboot = derive { name="PSAboot"; version="1.0"; sha256="1ddlxyvfcq186njqkxr8nbdssc6qnlq0c3gghsn87zc4jf9v83fi"; depends=[ggplot2 PSAgraphics Matching MatchIt modeltools party psych reshape2 rpart TriMatch]; };
+  pRSR = derive { name="pRSR"; version="3.0.2"; sha256="1s81mi172mwxhp786c1fl579cg87valppr0z958ssvxsvg5hbfxy"; depends=[]; };
+  pryr = derive { name="pryr"; version="0.1"; sha256="1vp63v1l4myahmmbphc043x1kpmvvdhs6dr640dxi0napvkdqlq6"; depends=[stringr codetools Rcpp]; };
+  PSAboot = derive { name="PSAboot"; version="1.1"; sha256="176sbjr906xk2ycl8653k7nch2h7ryxfisdy178k51f55qpvv4h9"; depends=[ggplot2 PSAgraphics Matching MatchIt modeltools party psych reshape2 rpart TriMatch]; };
   PSAgraphics = derive { name="PSAgraphics"; version="2.1.1"; sha256="05c0k94dxddyrhsnhnd4jcv6fxbbv9vdkss2hvlf3m3xc6jbwvh9"; depends=[rpart]; };
   psbcGroup = derive { name="psbcGroup"; version="1.0"; sha256="1l28sy0jys1g3nyfls9nl9vx9b6qh405a2nhx0qgxwb24l67x56n"; depends=[bayesm LearnBayes SuppDists mvtnorm]; };
-  PSCBS = derive { name="PSCBS"; version="0.40.4"; sha256="0hz0pw3ph0b03kqqpiwsg2vh6ia5k7wd0hxbx3kyg0cx4l0mmzwf"; depends=[R_methodsS3 R_oo R_utils R_cache matrixStats]; };
+  PSCBS = derive { name="PSCBS"; version="0.43.0"; sha256="1pv61ha8c2hx91hik9n6fz2gxdhijgcsdjhznaml5v1d5ba3vzjj"; depends=[R_methodsS3 R_oo R_utils R_cache matrixStats]; };
   pscl = derive { name="pscl"; version="1.04.4"; sha256="0mm8qak7cq8qks60wx6lslii79wnkh58a31izgns35wwlflg8g6n"; depends=[MASS mvtnorm coda gam vcd lattice]; };
   psd = derive { name="psd"; version="0.4-1"; sha256="1knfpgvmhrispfvlv94rnpbrjkyggqrmng65bjdjjigq83hhzywm"; depends=[fftw RColorBrewer signal zoo]; };
   psData = derive { name="psData"; version="0.1.2"; sha256="0w8kzivqrh1b6gq803rfd10drxdwgy0cxb5sff273m6jxzak52f2"; depends=[countrycode DataCombine foreign xlsx]; };
-  pse = derive { name="pse"; version="0.3.3"; sha256="0cr9bjh12qhglqygdnx7fx6wfdxq591vpck0g490svrh35bdbd5s"; depends=[Hmisc boot]; };
+  pse = derive { name="pse"; version="0.3.4"; sha256="1ni4rwskcr326x5z81hsh36nkcrpq5d7pkqh6xyh4fjm57wjwzbp"; depends=[Hmisc boot]; };
   pseudo = derive { name="pseudo"; version="1.1"; sha256="0dcx6b892cic47rwzazsbnsicpgyrbdcndr3q5s6z0j1b41lzknd"; depends=[KMsurv geepack]; };
-  psgp = derive { name="psgp"; version="0.3-5"; sha256="0w1pvx227fr897isl8ffampnz7rw8jsmmi24ily1nzb0xvrzhp0i"; depends=[intamap automap gstat]; };
+  psgp = derive { name="psgp"; version="0.3-6"; sha256="0h9gyadfy0djj32pgwhg8vy2gfn7i7yj5nnsm6pvfypc3k71s2wf"; depends=[intamap automap gstat]; };
   pSI = derive { name="pSI"; version="1.1"; sha256="0cvw38dqqlyx7cpl27hq33f5xns2d0019lyr98pwndcnbp09mx0b"; depends=[gdata]; };
   psidR = derive { name="psidR"; version="1.2"; sha256="14cpxk7z0inrpvhsdb3z6r5nrpyb4v8bv77mygxcf51rxihigzvj"; depends=[data_table RCurl foreign SAScii]; };
   PSM = derive { name="PSM"; version="0.8-10"; sha256="1s60fr85xn3ynpvsbc3nw7vgz6h6jxy3yii1w6jpkw3iwl4bgn84"; depends=[MASS numDeriv deSolve ucminf]; };
@@ -3766,9 +3981,9 @@ let self = _self // overrides; _self = with self; {
   PST = derive { name="PST"; version="0.84.1"; sha256="10cwlj8957sj5dag43v01fbq9lmcasfxp0lgllj0iv0lbfzd4g02"; depends=[TraMineR]; };
   PsumtSim = derive { name="PsumtSim"; version="0.4"; sha256="0079kb1bgsxs4cwmn33rbbk2jgq39rdjfgz9k9hc64iyzz0i6na3"; depends=[EffectsRelBaseline boot]; };
   psy = derive { name="psy"; version="1.1"; sha256="027whr670w65pf8f7x0vfk9wmadl6nn2idyi6z971069lf01wdlk"; depends=[]; };
-  psych = derive { name="psych"; version="1.4.4"; sha256="0ljb4xi9x2gpr8na1swa1ri855r8prxv669bmw4vnri4qrc7ijck"; depends=[]; };
+  psych = derive { name="psych"; version="1.4.8.11"; sha256="110j5d7xdaviklf3mv9jlnli3l4n5g4mxasgxdj6kw7f66fqh634"; depends=[]; };
   psychometric = derive { name="psychometric"; version="2.2"; sha256="1b7cx6icixh8k3bv60fqxjjks23qn09vlcimqfv2x3m3nkf8p1s9"; depends=[multilevel nlme multilevel nlme]; };
-  psychomix = derive { name="psychomix"; version="1.1-0"; sha256="1sw5w2na9pgmi63mqiv06v1lr7vlin8912dsy75yjxl9zrm3wavi"; depends=[flexmix psychotools lattice Formula modeltools]; };
+  psychomix = derive { name="psychomix"; version="1.1-1"; sha256="0p3kidbsmfm09s7c3p8nlj069wcyln1cxmjmj5nj7f618c407zyf"; depends=[flexmix psychotools lattice Formula modeltools]; };
   psychotools = derive { name="psychotools"; version="0.2-0"; sha256="13zpg4xi5hmr8yzjsri4kn0dy39ns5razdmchh4nwfr9gjn0h29b"; depends=[]; };
   psychotree = derive { name="psychotree"; version="0.13-0"; sha256="1jwya7glgaz4zb81i37bvxnm712b1y34dh5s3y64lms2bd98wc4b"; depends=[party psychotools modeltools sandwich strucchange]; };
   psyphy = derive { name="psyphy"; version="0.1-9"; sha256="1ndc6sy662wj2qfx7r97crlqjd8fdkfvfy59qmf34bcbzbg33riz"; depends=[]; };
@@ -3781,16 +3996,16 @@ let self = _self // overrides; _self = with self; {
   ptw = derive { name="ptw"; version="1.0-7"; sha256="195pa6hj3y9spyc7yxfgr8alkp48a7ccnyp64r6fyjwj6ds08b64"; depends=[]; };
   PubBias = derive { name="PubBias"; version="1.0"; sha256="0dr5dhfx57knrs05pbx9ngg4k2937n8gjzsgd0jfqd8dfxhy051k"; depends=[rmeta R_utils]; };
   pubmed_mineR = derive { name="pubmed.mineR"; version="1.0.1"; sha256="0d288hx98j5k4nmzj1vc3sfjwh9i4cljfgi6vklrsvgn5sx39x91"; depends=[RCurl XML NCBI2R boot R2HTML]; };
-  PubMedWordcloud = derive { name="PubMedWordcloud"; version="0.3"; sha256="1vqgd34hr0p2dm8mlnqw0ff26nszqrii0gxzi3pa01yvdr0bi4fd"; depends=[XML stringr RCurl wordcloud tm GOsummaries RColorBrewer]; };
+  PubMedWordcloud = derive { name="PubMedWordcloud"; version="0.3.1"; sha256="1bq2jswhc3vr84x6a9fspygirl54z7b1pdlcpnd7g4374ypvlrrz"; depends=[XML stringr RCurl wordcloud tm GOsummaries RColorBrewer]; };
   pumilioR = derive { name="pumilioR"; version="1.3"; sha256="1zmcdp978p73bh9fdshxlrzgfg18j007xgxgr439rq90bwiwva6j"; depends=[XML RCurl]; };
   PurBayes = derive { name="PurBayes"; version="1.3"; sha256="0nbm4cyrwfbwwbjbjkylr86cshaqbvbif6dkp4fag8kbcgyyx5qh"; depends=[rjags]; };
-  pushoverr = derive { name="pushoverr"; version="0.1.1"; sha256="0ybvrb406s0i8kr11187dkbpryw2gjz1h8k6f5bsxwhfhzxmfri1"; depends=[httr]; };
-  PVAClone = derive { name="PVAClone"; version="0.1-1"; sha256="1nscnh4ynijflvch0vp40a4hjdz34h58p61lpgda6b4rjaw6a7dy"; depends=[dcmle dclone]; };
+  pushoverr = derive { name="pushoverr"; version="0.1.3"; sha256="18bxipbrcv8anrvdmgff1674b735x0zp6bwf319cgxsgbs9nlwqi"; depends=[httr]; };
+  PVAClone = derive { name="PVAClone"; version="0.1-2"; sha256="0afl2il5wdcwzpyhjkgq8iz16q1086c3ndr4cjlyspgbss9h5l24"; depends=[dcmle dclone]; };
   pvar = derive { name="pvar"; version="1.0.9"; sha256="01bkva4kna1vfjlsss16s6501l8x2s95a5wh7wsmwq3spdgp1i2r"; depends=[]; };
-  pvclass = derive { name="pvclass"; version="1.0"; sha256="0zp2si1hby13s5qqkqzwmf3qi7fm2sghkiphdp1cp9r5h6zkdp13"; depends=[Matrix]; };
+  pvclass = derive { name="pvclass"; version="1.1"; sha256="0qaj71qrcj0kgwb1xravylqfc2b1ww5h8l4pdd2m0x33aygrm0kk"; depends=[Matrix]; };
   pvclust = derive { name="pvclust"; version="1.2-2"; sha256="152qwvk4lpdsrv96148bc3z51jqdaa7p95ql2zhpb7a2fvzs5ad5"; depends=[]; };
   PVR = derive { name="PVR"; version="0.2.1"; sha256="1p87pj9g0qlc8ja6xdj2amny9pbkaqb34x2y9nkl1nj1pkwjq2s5"; depends=[ape splancs]; };
-  pvsR = derive { name="pvsR"; version="0.1.1"; sha256="0bx8jbyr5d3p1x74z7zidw0dr61rcf3fsh3hxjx10m3ppd1lafvf"; depends=[XML nnet]; };
+  pvsR = derive { name="pvsR"; version="0.2"; sha256="1liykrh05k4qlfh1b61rafvgzx99fl9nh75a6mr5z5zczn8i00mv"; depends=[XML nnet httr]; };
   pwr = derive { name="pwr"; version="1.1.1"; sha256="1is6kqqjf3bzsddj4advj8qcp30rz2zlqc0g98072m96nmq5ywgn"; depends=[]; };
   PwrGSD = derive { name="PwrGSD"; version="2.000"; sha256="0qxvws9mfrnqw5s24qhqk6cbffjm13z7awyxdmnilazghpiq1p7s"; depends=[survival]; };
   pwt = derive { name="pwt"; version="7.1-1"; sha256="0926viwmwldmzlzbnjfijh00wrhgb0h4h0mlrls71pi5pjfldifa"; depends=[]; };
@@ -3798,30 +4013,35 @@ let self = _self // overrides; _self = with self; {
   pxR = derive { name="pxR"; version="0.40.0"; sha256="08s62kzdgak7mjzyhd32qn93q5l7sj01vhsk7fjg9nxjvm78xxka"; depends=[stringr reshape2 RJSONIO plyr]; };
   pyramid = derive { name="pyramid"; version="1.3"; sha256="1jmcqzgxqwvfa9aidayjx6j1s9f3kwqvivwldwpkf780i9wkdig9"; depends=[]; };
   qat = derive { name="qat"; version="0.72"; sha256="0vs7xc32h9s5p7486cafzzll7xaby7lbqmmpnshkn8mq021xlxkg"; depends=[ncdf gplots XML gdata moments boot fields]; };
-  QCA = derive { name="QCA"; version="1.1-2"; sha256="0fqhxwa7vjizis273sj8r6ssi1fx0kbchf3nrvvs7hhypnw39969"; depends=[lpSolve]; };
+  QCA = derive { name="QCA"; version="1.1-3"; sha256="083hc00d7srvxfkfax51ffngidbdhjqaxga3lln5gw53m2831v35"; depends=[lpSolve]; };
   QCA3 = derive { name="QCA3"; version="0.0-7"; sha256="0i9i2i633sjnzsywq51r2l7fkbd4ip217hp0vnkj78sfl7zf1270"; depends=[lpSolveAPI]; };
   QCAGUI = derive { name="QCAGUI"; version="1.9-6"; sha256="020ngni02j2w2ylhyidimm51d426pym2g1hg7gnpb7aplxx67n6x"; depends=[abind QCA]; };
-  qcc = derive { name="qcc"; version="2.3"; sha256="1hrv8ar58af4h0mkvx2l7kfmix3y91d158h8llbcfl5idffy8551"; depends=[MASS]; };
+  qcc = derive { name="qcc"; version="2.5"; sha256="1j2l4i1vy8wqsl64r0qmc8dflyn1abbmzhpqqsmhwldifcdbdsb9"; depends=[MASS]; };
   QCGWAS = derive { name="QCGWAS"; version="1.0-8"; sha256="1wn1kddgfmqv326pihnavbgsbd2yxrlq5s2xgi6kbprssxvj8bk1"; depends=[]; };
-  qdap = derive { name="qdap"; version="1.3.5"; sha256="1y05p93b1khagwsjqzfnhs4j9gfkvm574gyaizz9kxnmaamj32nf"; depends=[ggplot2 qdapDictionaries RColorBrewer chron gdata gridExtra igraph RCurl openNLP NLP plotrix reports reshape2 scales tm venneuler wordcloud xlsx XML]; };
-  qdapDictionaries = derive { name="qdapDictionaries"; version="0.0.4"; sha256="05a1w9hdwxnl7hzjnz2bn8krz60a2wayw5q9jv1pjb691rlsqqx1"; depends=[]; };
-  qdapTools = derive { name="qdapTools"; version="0.0.3"; sha256="0gvgb9xs8wz723ggv4xgn52ijcr28mf2dcqzmkacl8xap9ma392i"; depends=[chron RCurl]; };
+  qcr = derive { name="qcr"; version="0.1-18"; sha256="16dfda3rwivsdhp7j5izzbk2rzwfabfmxgpq4kjc4h7r90n2vly2"; depends=[qcc]; };
+  qdap = derive { name="qdap"; version="2.1.1"; sha256="1in345544gspj7wki82gdaiaxzn5qcp5jz73n522gjnybymllv2b"; depends=[ggplot2 qdapDictionaries qdapTools RColorBrewer chron dplyr gdata gridExtra igraph NLP openNLP plotrix RCurl reports reshape2 scales stringdist tm venneuler wordcloud xlsx XML]; };
+  qdapDictionaries = derive { name="qdapDictionaries"; version="1.0.2"; sha256="0s1dqp3hjllkvq638hvggcbfsdwks91r0ymynl7cdh7dr5pg91bc"; depends=[]; };
+  qdapTools = derive { name="qdapTools"; version="1.0.2"; sha256="1vvgcj0cymfc8yqw3i8jzr199hq04z7y86qgljdl86v4xvl44ggv"; depends=[chron data_table RCurl]; };
   qfa = derive { name="qfa"; version="0.0-10"; sha256="1c6yh5fa45fk3g9hi905b2cjswn6gmn53f0gb5v5byb9gr9bjf7s"; depends=[sp DEoptim]; };
-  qgraph = derive { name="qgraph"; version="1.2.4"; sha256="1dvw6ykprp9j5g62iimbr7nrabfvhag81031i57g6hk9jn3gjnyr"; depends=[psych ellipse lavaan sem plyr Hmisc igraph jpeg png colorspace BDgraph Matrix sna corpcor]; };
+  qgraph = derive { name="qgraph"; version="1.2.5"; sha256="1jgjxfds28kk03qrk01r8dla4xjpbqcqdwa1ifay2vqahwlkpz65"; depends=[psych ellipse lavaan sem plyr Hmisc igraph jpeg png colorspace Matrix sna corpcor reshape2 ggplot2 glasso huge]; };
   qiimer = derive { name="qiimer"; version="0.9.2"; sha256="08625hz2n7yk9zk1k9sa46n2ggbw5qs0mlqkmzyjjh3qlnb1354a"; depends=[pheatmap]; };
+  qlcMatrix = derive { name="qlcMatrix"; version="0.9.2"; sha256="1d8953bj69d0nia3qh3s1djf9m7wkvfdxqd234026gh1d3qchkr2"; depends=[Matrix]; };
   qLearn = derive { name="qLearn"; version="1.0"; sha256="1ilxmgazm8gjz8c1hhbp4fccibnvnalxrag8b0rn081zsqmhf094"; depends=[]; };
   qlspack = derive { name="qlspack"; version="2.2"; sha256="0b9sqvnvldhd8vymajrbql0vn70rml13jgsq5ihm6skzq5qms7y6"; depends=[geepack]; };
-  qmap = derive { name="qmap"; version="1.0-2"; sha256="1hb8bl51103fzyfcmz5bmf5aqqw2db8523li3ffw5asa9j9vhjwm"; depends=[fitdistrplus]; };
+  qmap = derive { name="qmap"; version="1.0-3"; sha256="1c7qvmd5whi446nzssqvhz1j2mpx22nlzzdrcql84v18ry0dr18m"; depends=[fitdistrplus]; };
+  qmethod = derive { name="qmethod"; version="1.1"; sha256="0ygmprfjwx1bi3pi9iqq15m243vy9f90znyf4qwp0zwbbpxyaqi5"; depends=[psych GPArotation]; };
   qmrparser = derive { name="qmrparser"; version="0.1.4"; sha256="1lw8sn4qsdv4bxf5p7gnkm0vmiymyj03svbl232zyyb0fh97i7nk"; depends=[]; };
+  QoLR = derive { name="QoLR"; version="1.0"; sha256="1ah6x1fcs4l571jvgm0c257cgxhhpkzfhqimwbb9j7xbz3h55lp3"; depends=[survival zoo]; };
   qp = derive { name="qp"; version="0.3-2"; sha256="1964bj2ggmpaqz0rnmc2zx5hyrzawlmawz3mh046cx1pdzlsqfwh"; depends=[]; };
-  qpcR = derive { name="qpcR"; version="1.3-7.1"; sha256="09vyhj144b1hs0kmyvh4r7zjasqas47jhacg86mkxgkcrzgzf1vf"; depends=[MASS minpack_lm rgl robustbase]; };
+  qpcR = derive { name="qpcR"; version="1.3-9"; sha256="1dbxy7al75d7zjwg8kgvmmddfklj13hq9nb1vyblmzcsa59rx91s"; depends=[MASS minpack_lm rgl robustbase Matrix]; };
   qPCR_CT = derive { name="qPCR.CT"; version="1.1"; sha256="19j41fsd2m7p2nxi2h2mj43rjxx6sz2jpf4sk0bfvl1gyj0iz3hi"; depends=[RColorBrewer]; };
+  qqman = derive { name="qqman"; version="0.1.1"; sha256="1j77i2lz2rp2kgsfsfv6zf9ai8ffylmkrfiq2rv53vmrq92h407c"; depends=[]; };
   qrfactor = derive { name="qrfactor"; version="1.4"; sha256="0f02lh8zrc36slwqy11x03yzfdy94p1lk5jar9h5cwa1dvi5k8gm"; depends=[mvoutlier mgraph pvclust cluster maptools]; };
-  QRM = derive { name="QRM"; version="0.4-9"; sha256="0ibkwkmlf3qvi6l46802y07v1zp0wkhn0vxki95kkir6fbbz4ndr"; depends=[gsl Matrix mvtnorm numDeriv timeSeries mgcv]; };
+  QRM = derive { name="QRM"; version="0.4-10"; sha256="1fkxjqyb9yqki4qwk393ra66wg5dnbr5b5sgypm8wk973crbhcj0"; depends=[gsl Matrix mvtnorm numDeriv timeSeries Rcpp mgcv]; };
   qrnn = derive { name="qrnn"; version="1.1.2"; sha256="01wsz9qcdiayi7gsyy2y09jyyapanyhlc4pdyman2f7z5nl9yv9i"; depends=[]; };
   QSARdata = derive { name="QSARdata"; version="1.3"; sha256="0dhldnh0jzzb4assycc0l14s45ymvha48w04jbnr34lrwgr9krh4"; depends=[]; };
   qtbase = derive { name="qtbase"; version="1.0.4"; sha256="02yilvywkcqn3y9ayix18cgkwhi0gh69fl3fcw28fs2zxf1hqy75"; depends=[]; };
-  qtl = derive { name="qtl"; version="1.31-9"; sha256="1pwmq7viwxa8g1f3iclfggz6ny006vlzvknbdrb37p8198x83xy3"; depends=[]; };
+  qtl = derive { name="qtl"; version="1.32-10"; sha256="0ywgsjfyjvnfisd2hnh2f5rqjhy0znnf2c1qjdqfx6g7vh3hblr1"; depends=[]; };
   qtlbim = derive { name="qtlbim"; version="2.0.7"; sha256="0nm7ky5bkzhmfr41fs1pvl51i2df1fz11j55q74ma2wzki5adfps"; depends=[qtl lattice coda MASS]; };
   qtlbook = derive { name="qtlbook"; version="0.18-1"; sha256="09b4w7kqdlmpf0vsjgwbi9sraafzchvk18yzrx72gs151v03nxlm"; depends=[qtl]; };
   qtlDesign = derive { name="qtlDesign"; version="0.941"; sha256="138yi85i5xiaqrns4v2hw46b731bdgnb301wg2h4cfrxvrw4l0d5"; depends=[]; };
@@ -3832,25 +4052,28 @@ let self = _self // overrides; _self = with self; {
   qtpaint = derive { name="qtpaint"; version="0.9.0"; sha256="06yqakg134mks8q7a40f5knjpcm1k2wdzchs0ywvfpwvpwgwig01"; depends=[qtbase qtbase]; };
   qtutils = derive { name="qtutils"; version="0.1-3"; sha256="018k9v3mab1mfcjh4mv1a1iish50fwdhb51mqn17k6fyrrrv7vs5"; depends=[qtbase qtbase]; };
   QuACN = derive { name="QuACN"; version="1.7.4"; sha256="1bcvnzycw7xvnms41rqsnfvggvcmpaw6byrsdzqmg7z0q754b1j4"; depends=[combinat Rmpfr igraph]; };
+  quad = derive { name="quad"; version="1.0"; sha256="0fak12l19f260k0ygh6zimx8dabzsv7a9i2njw8hnfcs3ndffhv5"; depends=[PearsonDS]; };
   quadprog = derive { name="quadprog"; version="1.5-5"; sha256="0jg3r6abmhp8r9vkbhpx9ldjfw6vyl1m4c5vwlyjhk1mi03656fr"; depends=[]; };
   quadrupen = derive { name="quadrupen"; version="0.2-4"; sha256="0gs565zi5qkccr9f65smvzgq2d97p7i5inksp2492bjvqhsbagxj"; depends=[Rcpp ggplot2 Matrix reshape2 scales]; };
+  qualCI = derive { name="qualCI"; version="0.1"; sha256="09mzsy5ryyrn1gz9ahrh95cpfk7g09pmjjy0m82fh4xc7j5w6kpf"; depends=[combinat]; };
   qualityTools = derive { name="qualityTools"; version="1.54"; sha256="0qrxf47fv56c86p0mmg3l3qvx8p3rvapffwhaw4yn4kbp7yiap5d"; depends=[]; };
   qualV = derive { name="qualV"; version="0.3"; sha256="0cr3jlp0y83nk6i965bd6v86sl8pjx47z1y20lcygrf5cb6m4ifw"; depends=[KernSmooth]; };
   Quandl = derive { name="Quandl"; version="2.3.2"; sha256="0dx6myf5gw7dvhglsc60hwq8nsj73zz3gcqcad1z3d27acv2q7m0"; depends=[RCurl RJSONIO zoo xts]; };
   quantchem = derive { name="quantchem"; version="0.13"; sha256="1ga5xa7lsk04flfp1syjzpnvj3i2ypzh1m49vq1xkdwpm6axdy8n"; depends=[MASS outliers]; };
-  QuantifQuantile = derive { name="QuantifQuantile"; version="0.1"; sha256="031plwf801rwczg4zprgpmsapvyf4mylrnbrxjkbza9dgddhwwy0"; depends=[rgl]; };
+  QuantifQuantile = derive { name="QuantifQuantile"; version="0.2"; sha256="0h0bc81y21zag0kgfr5i9rk74m32qg0x5a8n9pvm2f6c0126q7vi"; depends=[rgl]; };
   quantmod = derive { name="quantmod"; version="0.4-0"; sha256="12411ykj1f1ni5y00ma3kr5h5fsi0rqkshz7501wykj926js9v5j"; depends=[Defaults xts zoo TTR]; };
   QuantPsyc = derive { name="QuantPsyc"; version="1.5"; sha256="1i9bh88r8zxndzjqsj14qw64gnvm5a9kvhjhzk3qsrvl3qzjgh93"; depends=[boot MASS]; };
   quantreg = derive { name="quantreg"; version="5.05"; sha256="07djmdlmij9add2sgdsb1p6521hlnsfmll8lqs3x0z9gmr2wyx4f"; depends=[SparseM]; };
   quantregForest = derive { name="quantregForest"; version="0.2-3"; sha256="06c73f66nnw3vd2dv8h5skzyxbr89i3pyprbb0if721h5d7pm0s7"; depends=[randomForest]; };
-  quantregGrowth = derive { name="quantregGrowth"; version="0.1-2"; sha256="1lisnslvfhx1iyqiidw87a1gmqx5wwdzq2134jq01yiahp05kifj"; depends=[quantreg]; };
-  quantspec = derive { name="quantspec"; version="1.0-0"; sha256="1z2r9iq3pccba3k871cbbvssnrls0p2w2ax21nmy2z3g7n3fbwq7"; depends=[quantreg testthat abind zoo rje snowfall]; };
+  quantregGrowth = derive { name="quantregGrowth"; version="0.3-0"; sha256="0iyqd4gf780xqj2gcinlx0h6r6wy4vc7sp8r4qa1s638qcrp3qwa"; depends=[quantreg]; };
+  quantspec = derive { name="quantspec"; version="1.0-1"; sha256="1jfqga1kwdhfqmkgcdin84mddggi65x2s5w6krj5n5yafak21m87"; depends=[quantreg testthat abind zoo rje snowfall]; };
   QuasiSeq = derive { name="QuasiSeq"; version="1.0-4"; sha256="1vpk1l7dhbfdywncdfg1c29qpj3x0m5ddpyh13d0d3ic8rzhdivf"; depends=[Matrix mgcv]; };
-  questionr = derive { name="questionr"; version="0.4"; sha256="023q2d1p32p11pn1w37q5ax13sks462b5i1mmg7wwd7sjkmjq9f5"; depends=[shiny highr]; };
+  questionr = derive { name="questionr"; version="0.4.1"; sha256="1hiy1a7ijg2zs4zz9r4p4yqjxm66jhv4xsh29lhv10dlvhh4r4km"; depends=[shiny highr classInt]; };
   queueing = derive { name="queueing"; version="0.2.2"; sha256="1db8w9pzy4krgcc4xahfs9aw45gvvyl6kqm1hkklw21pfc0ka09f"; depends=[]; };
   QUIC = derive { name="QUIC"; version="1.1"; sha256="021bp9xbaih60qmss015ycblbv6d1dvb1z89y93zpqqnc2qhpv3c"; depends=[]; };
   quint = derive { name="quint"; version="1.0"; sha256="19dxrssy4dw7v3s4hhhy6yilbc7zb6pvcnh3mm1z6vv5a1wfr245"; depends=[partykit Formula rpart]; };
   quipu = derive { name="quipu"; version="1.9.0"; sha256="1py1qpbwp2smr5di8b3zmzxxhchfmr5qfhqkdiqig28mcnqcmp5n"; depends=[agricolae stringr pixmap shiny xtable]; };
+  qVarSel = derive { name="qVarSel"; version="1.0"; sha256="13x2hnqjsm0ifzmqkkl9ilhykrh80q04lhlkkp06hkysmh5w9rkx"; depends=[lpSolveAPI Rcpp]; };
   qvcalc = derive { name="qvcalc"; version="0.8-8"; sha256="0xmbn6p7ryr43yf978pqpdnlxdq84v965hxbff8dviqhxwgqv4aq"; depends=[]; };
   QZ = derive { name="QZ"; version="0.1-4"; sha256="1k657i1rf6ayavn0lgfvlh8am3kzypgb1jhf2by147gv103izkrz"; depends=[]; };
   R0 = derive { name="R0"; version="1.2-4"; sha256="1gg5jlmb20lqa4nismchffc65b02n0qmbsk8nwzkkl2zxkm9kx3k"; depends=[MASS]; };
@@ -3863,7 +4086,7 @@ let self = _self // overrides; _self = with self; {
   R2G2 = derive { name="R2G2"; version="1.0-2"; sha256="05d5vybvsi4pyr099916nk1l8sqszs9gaj2vhsx1jxxks8981na7"; depends=[]; };
   R2GUESS = derive { name="R2GUESS"; version="1.3"; sha256="1jqzh2f9qwwmcf16hjgnl3rgp49zx6m090r750p3n4ds3qr96zx7"; depends=[fields MCMCpack mixOmics mvtnorm snowfall]; };
   R2HTML = derive { name="R2HTML"; version="2.2.1"; sha256="11p0mg6b39z2w7k76j21hy09r8fm3rwkiby2lmhx5cgvnvxgrqf1"; depends=[]; };
-  R2jags = derive { name="R2jags"; version="0.04-01"; sha256="1df9663cn2hv02v7b3i3j38ajh66106fl8p175z116dz0byzk2z6"; depends=[rjags abind coda R2WinBUGS]; };
+  R2jags = derive { name="R2jags"; version="0.04-03"; sha256="0wygsz5zzng8fh82pzhqly3d532ljz0jj34h9nz7g3v5asv0kcqm"; depends=[rjags abind coda R2WinBUGS]; };
   r2lh = derive { name="r2lh"; version="0.7"; sha256="1kkyjv9x2klrjnaaw4a16sxdfqmpp9s5mlclzlczlqjypbf2aa6d"; depends=[]; };
   R2OpenBUGS = derive { name="R2OpenBUGS"; version="3.2-2.2"; sha256="0hnp46linvpnzifhyb3r13xmwvdc3psabs53xl6qxxm4snrl4bnd"; depends=[coda boot]; };
   R2STATS = derive { name="R2STATS"; version="0.68-38"; sha256="1v8mvkvs4fjch0dpjidr51jk6ynnw82zhhylyccyrad9f775j2if"; depends=[proto Matrix lattice lme4 cairoDevice gWidgets gWidgetsRGtk2 RGtk2Extras MASS latticeExtra statmod]; };
@@ -3871,44 +4094,47 @@ let self = _self // overrides; _self = with self; {
   R2SWF = derive { name="R2SWF"; version="0.8"; sha256="125r4drgl79cwda00g42m0l0dzqmi2n8p5cikx70jz67giq5blw2"; depends=[sysfonts]; };
   R2WinBUGS = derive { name="R2WinBUGS"; version="2.1-19"; sha256="03bvxv46lhhnbfjq3w5ig50icncwn1bdq7lsh6w1szdk90ah2zgh"; depends=[coda boot]; };
   R330 = derive { name="R330"; version="1.0"; sha256="01sprsg7kph62abhymm8zfqr9bd6dhihrfxzgr4pzi5wj3h80bjm"; depends=[s20x leaps rgl lattice]; };
-  R4CDISC = derive { name="R4CDISC"; version="0.1"; sha256="0sf57gx5sxsr958mjvmiggkfb6yyk2fwvqhpmagw8d54d6qxsl36"; depends=[XML]; };
+  R4CDISC = derive { name="R4CDISC"; version="0.2"; sha256="1g8n89y1l5jy3168qz9j0kz3dvyadhn5mhilpzlpn3pijvv2vndf"; depends=[XML]; };
   R4CouchDB = derive { name="R4CouchDB"; version="0.4"; sha256="15177dwwnhl6mfvb78knhmjqi34pb74dcgb9rf9j0rvy85vznzzm"; depends=[bitops RCurl RJSONIO]; };
   R4dfp = derive { name="R4dfp"; version="0.2-4"; sha256="02crzjphlq4hi2crh9lh8l0acmc1rgb3wr1x8sn56cwhq4xzqzcb"; depends=[]; };
-  r4ss = derive { name="r4ss"; version="1.20"; sha256="1nrxyqm570w5g9k7f9mj9rvv6pvwd00pansrrdfik2ciwcriyzz8"; depends=[coda gtools maps]; };
+  r4ss = derive { name="r4ss"; version="1.22.1"; sha256="1rjnglwa3i8rlzyqqr5h8yh7vglrh8zpd3829qcc1vfi4swcwwqw"; depends=[coda corpcor gplots gtools maps pso RCurl]; };
+  R6 = derive { name="R6"; version="1.0.1"; sha256="0q1ni6g0i3h2l7dj8fip1614likdki8apmrjs7ggma77qfc5jsaf"; depends=[]; };
   race = derive { name="race"; version="0.1.59"; sha256="13jprlnngribgvyr7fbg9d36i8qf3cax85n71dl71iv0y24al1cy"; depends=[]; };
   RAD = derive { name="RAD"; version="0.3"; sha256="0nmgsaykxavq2bskq5x0jvsxzsf4w2gqc0z80a59376li4vs9lpj"; depends=[mvtnorm MASS]; };
   RADami = derive { name="RADami"; version="1.0-3"; sha256="0rg07dsh2rlldajcj0gq5sgsl1i3qa28bsrmq88xcljg5hnr4iqn"; depends=[ape geiger phangorn]; };
   RadioSonde = derive { name="RadioSonde"; version="1.3"; sha256="1bvy281v278dni7ms4mq963463mwsj1bys9n2lvn6y8p7jhqvhdj"; depends=[]; };
-  RadOnc = derive { name="RadOnc"; version="1.0.7"; sha256="05d6fd4qj8crx0jip13ixqqra1l9y7j1nijzfq6w8hxhan7cgys7"; depends=[rgl geometry oro_dicom ptinpoly]; };
-  rags2ridges = derive { name="rags2ridges"; version="1.1"; sha256="0rvl9ygqxshlzgg1xlg91bximq5ws0vbzw4spf5hi9z718kj2ika"; depends=[expm GeneNet reshape ggplot2 igraph]; };
+  RadOnc = derive { name="RadOnc"; version="1.0.8"; sha256="1p74fbihbzfn6irc8khp4kvmsxd7scg3c2nkr7w0p7c75f76d9an"; depends=[rgl geometry oro_dicom ptinpoly]; };
+  rags2ridges = derive { name="rags2ridges"; version="1.3"; sha256="1dzpaxvlrbpj2hw2p2gfhqvrlg5jdpd5z6q0dzxjdxh8z7xjsklb"; depends=[GeneNet expm reshape ggplot2 igraph Hmisc]; };
   RAHRS = derive { name="RAHRS"; version="1.0.1"; sha256="068alq0mrfgcmpa5gfrrqgixpdadva11s9ammg7p6g9lfrjx6gcc"; depends=[pracma RSpincalc]; };
   rainbow = derive { name="rainbow"; version="3.2"; sha256="043qbbyb1i7b8n3vspr6rdwlpqg3wdn31rsq3hmlahvwrfqma70n"; depends=[MASS pcaPP hdrcde cluster colorspace ks]; };
-  raincpc = derive { name="raincpc"; version="0.1"; sha256="0l8b4s64ql3jj9m4mc4w21igq8pr7ky9ixzlgr76lhrbjnr7z7ig"; depends=[]; };
+  raincpc = derive { name="raincpc"; version="0.2"; sha256="02551m1rjws8h7shdms5q4rmskqdwijfx7306wp1cl7x0gjc800q"; depends=[SDMTools]; };
+  rainfreq = derive { name="rainfreq"; version="0.1"; sha256="1km77iks570w48xkad5giirw8yphlnnpv5j2fkh1nd9bqarwjxyb"; depends=[RCurl SDMTools]; };
   rAltmetric = derive { name="rAltmetric"; version="0.3"; sha256="0jq5w5yd1cps4npbm9wmrjb5vc36y89ib986ggqycd9jalmshxjd"; depends=[plyr RCurl reshape2 png ggplot2 RJSONIO]; };
   Rambo = derive { name="Rambo"; version="1.1"; sha256="1yc04xsfkc54y19g5iwambgnlc49ixjjvfrafsgis2zh5w6rjwv8"; depends=[sna]; };
   RAMpath = derive { name="RAMpath"; version="0.3.8"; sha256="1p1l6iirb314n5246kyyz0r3ja4v05xb5a6aq9k26wsb5m42x85k"; depends=[lavaan ellipse]; };
   ramps = derive { name="ramps"; version="0.6-12"; sha256="128lqfkgmcbcfvs210j14h54spqjcr4jdhk2rqgrwcjp5wjv209w"; depends=[coda maps Matrix nlme fields]; };
   randaes = derive { name="randaes"; version="0.3"; sha256="14803argy0xdd8mpn4v67gbp90qi2is4x6na9zw7i9pm504xji1x"; depends=[]; };
   random = derive { name="random"; version="0.2.2"; sha256="0h3vmd581i0srf9lfdgjv8kkinxf1kjg8aia0dhr5adghqvf5dck"; depends=[]; };
-  RandomFields = derive { name="RandomFields"; version="3.0.10"; sha256="02cvsyv5lfmm8axrhwmhhzcidhrj8bnkyas0vjsf51mzyfm0a9iv"; depends=[sp]; };
-  randomForest = derive { name="randomForest"; version="4.6-7"; sha256="02xyaz1rbvbsw6zl9kqv3qv32ni6rkgig38l1z0yy1rc4j5yh1l2"; depends=[]; };
-  randomForestSRC = derive { name="randomForestSRC"; version="1.4"; sha256="1a70i63l3iycns4zgbfrawchr5ysshy6ipbibh5wyc31yfjdlbsl"; depends=[]; };
+  RandomFields = derive { name="RandomFields"; version="3.0.35"; sha256="0m3hv7rmipc36059iv8igy3r783by8zi854c4gm8awzdav3wdv4a"; depends=[sp]; };
+  randomForest = derive { name="randomForest"; version="4.6-10"; sha256="0glj08w6sbabr3n71kzd5w3jb7vhrys8rq904j27a4xk0qp4s5lv"; depends=[]; };
+  randomForestSRC = derive { name="randomForestSRC"; version="1.5.4"; sha256="0bk7xg1lhi2mhqjnmgls4c0jf5d463pzzp1x4wkf0jal3yjgl4y3"; depends=[]; };
   randomGLM = derive { name="randomGLM"; version="1.02-1"; sha256="031338zxy6vqak8ibl2as0l37pa6qndln0g3i9gi4s6cvbdw3xrv"; depends=[MASS foreach doParallel]; };
   randomizationInference = derive { name="randomizationInference"; version="1.0.1"; sha256="1l4h9d0r199z775da0la30qijm8xikmbfnl7av7h1ar305ph6r2v"; depends=[permute matrixStats]; };
   randomizeBE = derive { name="randomizeBE"; version="0.3-1"; sha256="06hj614wp9lb348qwyqgw5zk2vn0m81bkwz4jprgjd72kpy8kv1h"; depends=[]; };
   randomLCA = derive { name="randomLCA"; version="0.8-7"; sha256="1xs2jh0parvqjm88cs2w2yb8r4ld6643fn84w35v8jsffbs98522"; depends=[lattice nlme boot]; };
   randomNames = derive { name="randomNames"; version="0.0-6"; sha256="18fyxpqj6xv933nyv4s59wv7pgl4wra123qmf0fa68gk1zj9l153"; depends=[data_table]; };
-  random_polychor_pa = derive { name="random.polychor.pa"; version="1.1.3.6"; sha256="0qcy3f8r31k57ylcmg7a45h9fhg7llc8jqxvdxfxnsm5wx20vxvg"; depends=[psych nFactors mvtnorm MASS sfsmisc]; };
+  random_polychor_pa = derive { name="random.polychor.pa"; version="1.1.4-1"; sha256="1051v7krrawdqnhz9q01rsknp2i7iv82d370q7m9i9d9i8wfnpk5"; depends=[psych nFactors boot MASS mvtnorm sfsmisc]; };
   randomSurvivalForest = derive { name="randomSurvivalForest"; version="3.6.4"; sha256="1k08q43rxlz822rqzz3nvy40646764c8ds25ylsvg6daan2qzzmv"; depends=[]; };
+  randomUniformForest = derive { name="randomUniformForest"; version="1.0.6"; sha256="0qmkg8nbz3pv11yvwp45kkl3vl7mn1bgqhp5j13vr9c1gc732pgh"; depends=[Rcpp doParallel foreach ggplot2 pROC gtools]; };
   randtests = derive { name="randtests"; version="0.3"; sha256="0v5hbbmx7cl1q8bfgk9141hqbimch5fkhcbr9xfxidydxyl9jqln"; depends=[]; };
-  randtoolbox = derive { name="randtoolbox"; version="1.14"; sha256="1pcbd626vkqakirzrvnz13k2h462hvf4ra7wvy1xx7k2vcm0ch78"; depends=[rngWELL]; };
+  randtoolbox = derive { name="randtoolbox"; version="1.15"; sha256="02knvk0ln6x0hlpbvvpll0dnb5d7s3n6zn5kdxih792y5yihiwbh"; depends=[rngWELL]; };
   RandVar = derive { name="RandVar"; version="0.9.2"; sha256="04hw4v2d9aa8z9f8wvwbzhbfy8zjl5q8mpl9b91q86fhh1yq5cz4"; depends=[distr distrEx]; };
   rangeMapper = derive { name="rangeMapper"; version="0.2-6"; sha256="1p4i677s7hc74snsk0vwswxp493ijwynsfmzjkrslzk819ng7zii"; depends=[RSQLite rgdal sp raster maptools RSQLite_extfuns lattice RColorBrewer classInt]; };
   RankAggreg = derive { name="RankAggreg"; version="0.4-3"; sha256="0m9wndpfgiy9cf2ss1vk7f09yl0qiqhx48kn1qid69vhv73nsyf3"; depends=[gtools clValid]; };
-  Rankcluster = derive { name="Rankcluster"; version="0.92"; sha256="0rlha3l588k9f4d24pb5vgd6q44ycb3qpjl6zk9llmi8x42wf5s2"; depends=[Rcpp]; };
+  Rankcluster = derive { name="Rankcluster"; version="0.92.9"; sha256="172jjsyc6a5y32s2fb8z6lgcq6rcwjbk3xnc5vvkhj64amlyxla6"; depends=[Rcpp]; };
   rankhazard = derive { name="rankhazard"; version="1.0"; sha256="1kylg8yjrixbv86i2ffhhn8f5shsj8kvi66k202ari0li92y7dsg"; depends=[survival]; };
   RankResponse = derive { name="RankResponse"; version="3.0.3"; sha256="0bl0w8dzwn73psiln4bkilq1l1bn1jnh4mmvblvb3wnms8srhrpv"; depends=[]; };
-  RANN = derive { name="RANN"; version="2.3.0"; sha256="1f23zs5wd214pvvd2na4kc2nxrqrx8q1ij6ga8whs7qgyc8072fm"; depends=[]; };
+  RANN = derive { name="RANN"; version="2.4.1"; sha256="13d2wi3r4b190f6s6y4zipqf43gy9c1h71b9j7qmc3lqca4nvzmd"; depends=[]; };
   RAP = derive { name="RAP"; version="1.1"; sha256="18dclijs72p6gxawpg8hk7n512ah4by5jfg2jnrp8mz79ajmdgir"; depends=[]; };
   RapidPolygonLookup = derive { name="RapidPolygonLookup"; version="0.1"; sha256="0m6r11ksryzcfcm265wr9fhwb867j9ppfhalvvygzig5j85sg92k"; depends=[sp RANN PBSmapping RgoogleMaps]; };
   RAPIDR = derive { name="RAPIDR"; version="0.1"; sha256="06lhsjy7s71p5bcpln999smvr6n1fp5qfbr7i8wjcn4p1ddcfdcm"; depends=[data_table PropCIs]; };
@@ -3917,6 +4143,8 @@ let self = _self // overrides; _self = with self; {
   rapport = derive { name="rapport"; version="0.51"; sha256="1qn45nrcawr8d9pkdnpmm37dg31l28gfbnwjl62fs7y691187cqp"; depends=[lattice plyr pander yaml reshape]; };
   rapportools = derive { name="rapportools"; version="1.0"; sha256="1sgv4sc737i12arh5dc3263kjsz3dzg06qihfmrqyax94mv2d01b"; depends=[reshape plyr pander]; };
   RArcInfo = derive { name="RArcInfo"; version="0.4-12"; sha256="1j1c27g2gmnxwslff4l0zivi48qxvpshmi7s9wd21cf5id0y4za4"; depends=[RColorBrewer]; };
+  rareGE = derive { name="rareGE"; version="0.1"; sha256="0v3a2wns77q923ilddicqzg0108f8kmfdnsff1n65icin7cfzsny"; depends=[MASS nlme survey]; };
+  rareNMtests = derive { name="rareNMtests"; version="1.0"; sha256="0axmxn4arw2iwsj64zsvy99hwcmkl2jy9vqnbwshl8hpaypbdxz9"; depends=[vegan]; };
   Rarity = derive { name="Rarity"; version="1.2-1"; sha256="16ds0s396f42qqmn4xrnmfk1j6v917p27dgi9iji976hn2q463hh"; depends=[]; };
   rARPACK = derive { name="rARPACK"; version="0.5-0"; sha256="0d4kd4fi6rvdamj5kvyba6zm0250ldm7nqrgnmapnc2q0wv0hik8"; depends=[Rcpp Matrix]; };
   RaschSampler = derive { name="RaschSampler"; version="0.8-6"; sha256="1ap5r8k4ydnsxqz5hvnnp9cbp0mdnx5bn8pn2wh0rp42897mfm4i"; depends=[]; };
@@ -3927,26 +4155,28 @@ let self = _self // overrides; _self = with self; {
   raters = derive { name="raters"; version="1.1"; sha256="0djpax59qvvqklph847wh4m2231y3zrzv2i7maq43pr8pyw9f2md"; depends=[]; };
   rationalfun = derive { name="rationalfun"; version="0.1-0"; sha256="15949vs9pdjz7426zhgqn7y87xzn79ikrpa2vyjnsid1igpyh0mp"; depends=[polynom]; };
   RAtmosphere = derive { name="RAtmosphere"; version="1.1"; sha256="0mk43bq28hlrjwaycsxca458k8xf00q58czgc17d8yx3kz17a5i0"; depends=[]; };
-  rattle = derive { name="rattle"; version="3.0.2"; sha256="19mscdb3snpj9z9zl8wg2zpr44l1x2agy108c086zqv8p1s7b8pv"; depends=[]; };
+  rattle = derive { name="rattle"; version="3.1.0"; sha256="01kknaxg2is1isl9yjgdqvsilgrv9z4awnnd99bavpwarrb0cvg0"; depends=[]; };
   rAverage = derive { name="rAverage"; version="0.3-6"; sha256="005gjk8bifvncl1yfazj4bs8l4k2pgygwdyfrkkd4xvcywar0p73"; depends=[foreign]; };
   rAvis = derive { name="rAvis"; version="0.1.1"; sha256="0iyhc24xm2655wc1dhg8vhd5yr7zx6hywpxczkfs0a7pifckfy4g"; depends=[stringr XML RCurl scrapeR gdata scales rgdal maptools raster sp]; };
   rawFasta = derive { name="rawFasta"; version="1.0.0"; sha256="0krvs8d1r8hggjg84n7g3ncdkifa3hipbma98f49kf81fzn2npip"; depends=[]; };
-  rbamtools = derive { name="rbamtools"; version="2.6.0"; sha256="1iank7vr6haczgrv2pkcpvg24c78m8fmh9y982bnb8zjq8q4wwwn"; depends=[]; };
+  rbamtools = derive { name="rbamtools"; version="2.9.14"; sha256="0kdbgl7yivhdf6xi2xp9rdvfmpb6d090ja10lj1385qzv3ym0zln"; depends=[]; };
   rbefdata = derive { name="rbefdata"; version="0.3.5"; sha256="12mcqz0pqgwfw5fmma0gwddj4zk0hpwmrsb74dvzqvgcvpfjnv98"; depends=[XML RCurl rjson wordcloud rtematres RColorBrewer]; };
   rbenchmark = derive { name="rbenchmark"; version="1.0.0"; sha256="010fn3qwnk2k411cbqyvra1d12c3bhhl3spzm8kxffmirj4p2al9"; depends=[]; };
   RBerkeley = derive { name="RBerkeley"; version="0.7-4"; sha256="0jslac7d0dyqxpy4lcg1i7kz9hdidnlxhf982lnsl5kx5fl0nmxi"; depends=[]; };
   rBeta2009 = derive { name="rBeta2009"; version="1.0"; sha256="0ljzxlndn9ba36lh7s3k4biim2qkh2mw9c0kj22a507qbzw1vgnq"; depends=[]; };
   rbhl = derive { name="rbhl"; version="0.1.0"; sha256="1m2n1qczhhdlv9pkmw9dlqi2wmdw8wac8d557c4rk0vnzwzgpgpi"; depends=[httr XML RJSONIO plyr]; };
-  RbioRXN = derive { name="RbioRXN"; version="1.1"; sha256="1q7nznv54s9wmma82pisbrwsx6b23v4ncrvh6l145ah1qfxp3r8c"; depends=[gdata CHNOSZ hash foreach]; };
+  RbioRXN = derive { name="RbioRXN"; version="1.3.1"; sha256="122h6pghpb8dfrqvdkvp25bp7dl8kc1aka13h6hp88vaj32pf4ij"; depends=[plyr RCurl gdata data_table stringr]; };
   rbiouml = derive { name="rbiouml"; version="1.4"; sha256="03zpchcwq4sn8cymcrzw6r6fkxh85b8mivy42jkd0knm6i7f9aa6"; depends=[RCurl RJSONIO]; };
   rbison = derive { name="rbison"; version="0.3.2"; sha256="04j0cq56b46d2nvvdl2sg49ffydbqv0bdzf9ccbh21y9z05s195a"; depends=[plyr httr mapproj ggplot2 gridExtra maptools sp data_table rjson]; };
   Rbitcoin = derive { name="Rbitcoin"; version="0.9"; sha256="1l9k0pkxsdfm7aay47755zgx6k2b3pwnwxbzn80q5q27s1062pjv"; depends=[data_table RJSONIO RCurl digest]; };
+  rbitcoinchartsapi = derive { name="rbitcoinchartsapi"; version="1.0.4"; sha256="0r272jvjh3rzch8dmn4s0a5n5k6dsir7pr4qswzfvafqjdiwjajz"; depends=[RJSONIO RCurl]; };
   rbmn = derive { name="rbmn"; version="0.9-2"; sha256="1zy832y399cmfmhpyfh7vfd293fylf1ylmp8w8krkmzkmyfa80f2"; depends=[MASS]; };
   rbounds = derive { name="rbounds"; version="2.0"; sha256="19xxz5dzzh706pp9391fq4v0g1fsd442x6mqqdvhkm51a9x0ih3p"; depends=[Matching]; };
   rbugs = derive { name="rbugs"; version="0.5-9"; sha256="1kvn7x931gjpxymrz0bv50k69s1x1x9mv34vkz54sdkmi08rgb3y"; depends=[]; };
+  rbundler = derive { name="rbundler"; version="0.3.7"; sha256="0wmahn59h9vqm6bq1gwnf6mvfkyhqh6xvdc5hraszn1419asy26f"; depends=[devtools]; };
   RC = derive { name="RC"; version="1.0.2.13"; sha256="0rhbmmihsk09k1nhxkbq0kgxnynl4wfz4lq2jc9cvq8afirxi7wx"; depends=[igraph bitops]; };
   RCA = derive { name="RCA"; version="1.4.5"; sha256="0s200s28a6gh3dggad52dgqnf0k2jsfrqv1hbg8w2529v4s3dc5i"; depends=[igraph]; };
-  R_cache = derive { name="R.cache"; version="0.9.0"; sha256="0a2x42rq2q0wzq2grwzc6ngs9hmw2lvz3nj1a4b3zh1r69qcn2vc"; depends=[R_methodsS3 R_oo R_utils]; };
+  R_cache = derive { name="R.cache"; version="0.10.0"; sha256="0y8q3w9z9cyzsg60x95kkc81ksc2d5vpdaqg5njq5bgjyw7yjqvs"; depends=[R_methodsS3 R_oo R_utils]; };
   RCALI = derive { name="RCALI"; version="0.2-6"; sha256="01zaks9mdgi9hcwsfvg3dwkihmb5ay5ilgg10fqcz2cssldj9x7x"; depends=[splancs]; };
   Rcapture = derive { name="Rcapture"; version="1.3-1"; sha256="1k6w5pyml5y2sdfjc1xpl2d5p6d8zj98kwndgir56hyrrrm7nxgx"; depends=[]; };
   rCarto = derive { name="rCarto"; version="0.8"; sha256="08813l4xfahjyn0jv48q8f6sy402n78dqsg01192pxl2dfc2i9ry"; depends=[RColorBrewer maptools classInt]; };
@@ -3959,12 +4189,14 @@ let self = _self // overrides; _self = with self; {
   Rcgmin = derive { name="Rcgmin"; version="2013-02.20"; sha256="1y6095vapb3r8p9i5hqa14gfpl4q3g2n82nb64429kl6w3mlfk8f"; depends=[numDeriv]; };
   Rchoice = derive { name="Rchoice"; version="0.1"; sha256="030x42jq6dd25g7isk5m9s0v9rfqkkj7i7286i9as1mpn73nlyz5"; depends=[maxLik Formula sandwich ggplot2 plotrix car lmtest]; };
   rChoiceDialogs = derive { name="rChoiceDialogs"; version="1.0.4"; sha256="12gzfw0r1ljk81j7hglgsmdm7xwa2n2w2f56sg684l26jyqsaw1z"; depends=[rJava]; };
+  rcicr = derive { name="rcicr"; version="0.2.1"; sha256="0676h5n4r7ymfjq4z0y9rxx842w2byn73335k6wqxxf9sy29lsgc"; depends=[matlab aspace jpeg]; };
   RCircos = derive { name="RCircos"; version="1.1.2"; sha256="0j7ww2djnhpra13vjr6y772sg64ikdmw1z68lpp9i7d0shlc3qx9"; depends=[]; };
   RClimMAWGEN = derive { name="RClimMAWGEN"; version="1.1"; sha256="0icy560llfd10mxlq0xmc6lbg6a030za9sygw1rpz8sk5j0lvb84"; depends=[climdex_pcic RMAWGEN]; };
-  rClinicalCodes = derive { name="rClinicalCodes"; version="1.0.0"; sha256="1cnrs2znd105fvrcsf8bylmwlwhdrrgxkkkqzjyry1n36cf8q7jk"; depends=[stringr RCurl XML rjson tm]; };
+  rClinicalCodes = derive { name="rClinicalCodes"; version="1.0.1"; sha256="1p4p8r2n0k8h9xdzbngb95rshjp3376f5lsx228biqmswhpkhvlf"; depends=[stringr RCurl XML rjson tm]; };
   Rclusterpp = derive { name="Rclusterpp"; version="0.2.3"; sha256="02s5gmmmd0l98wd1y884pjl3h289dyd9p9s7dh7yl2zaslqs2094"; depends=[Rcpp RcppEigen]; };
   rCMA = derive { name="rCMA"; version="1.0.0"; sha256="16d3cdxiaq65lwbvq8wjcp89vrfdp9kwrdl2jy9fynsg0v2lasvp"; depends=[rJava]; };
   Rcmdr = derive { name="Rcmdr"; version="2.0-4"; sha256="0py5qfr1zk83hgp06xvypz5b9nml5km5xwp2hzy3cf4fd2xjkl3q"; depends=[tcltk2]; };
+  RcmdrMisc = derive { name="RcmdrMisc"; version="1.0-0"; sha256="09798qhx6qcmwpqcmn3fmaww861i5lsbqbmsbq3kx58lmablxs53"; depends=[abind Hmisc MASS e1071 car]; };
   RcmdrPlugin_BCA = derive { name="RcmdrPlugin.BCA"; version="0.9-7"; sha256="1r4mib6r6qdhkbysxjs7s49j2l1qivlksaixzyz321jwsilpl411"; depends=[BCA car Rcmdr]; };
   RcmdrPlugin_coin = derive { name="RcmdrPlugin.coin"; version="1.0-21"; sha256="10fapjk74fpknym3pf2c0g25c4sk0pkfkakfy2c5fw9nw4a1j71f"; depends=[Rcmdr coin survival multcomp]; };
   RcmdrPlugin_depthTools = derive { name="RcmdrPlugin.depthTools"; version="1.3"; sha256="09mjn5jn4rdj1lh515vr3xlnk615flg13kcwbpk0an2si4xkgm9h"; depends=[Rcmdr depthTools]; };
@@ -3981,12 +4213,13 @@ let self = _self // overrides; _self = with self; {
   RcmdrPlugin_lfstat = derive { name="RcmdrPlugin.lfstat"; version="0.7"; sha256="009yj9c5cr34k8qa16q19sp7c5iwv95g9swbm004nr18mfah8x9w"; depends=[lfstat Rcmdr]; };
   RcmdrPlugin_MA = derive { name="RcmdrPlugin.MA"; version="0.0-1"; sha256="1l4nvwa0gq83ndkc190l7lba76d9gnf52k4p1z5jfpc9p9s6c20k"; depends=[MAd metafor Rcmdr]; };
   RcmdrPlugin_mosaic = derive { name="RcmdrPlugin.mosaic"; version="1.0-7"; sha256="0k6xaz2dfm9ch9lxqsh19jm8d4bbyjj2ffmjjxl57kanb3pvrrwv"; depends=[ENmisc vcd Hmisc Rcmdr]; };
-  RcmdrPlugin_MPAStats = derive { name="RcmdrPlugin.MPAStats"; version="1.1.4"; sha256="1ir0qh4gqa4zwhqvikak38gsxm0l4r63i0szvv6vgifmpj6sx008"; depends=[Rcmdr ordinal]; };
-  RcmdrPlugin_NMBU = derive { name="RcmdrPlugin.NMBU"; version="1.7.1"; sha256="1lvq7qmxjk5n78yjr5dj7dkv9d7kc8qzyrcapsxq8pydvva2223d"; depends=[mixlm MASS pls Rcmdr]; };
+  RcmdrPlugin_MPAStats = derive { name="RcmdrPlugin.MPAStats"; version="1.1.5"; sha256="0km6yglhn0128kk1xm2mnrkr2lkv3r9zndhlv7h1dkd16aph3vm3"; depends=[Rcmdr ordinal]; };
+  RcmdrPlugin_NMBU = derive { name="RcmdrPlugin.NMBU"; version="1.7.3"; sha256="07xghjyzpvlgav716fmm3xjk617h84m48qrjpj2nin1hkgbaab31"; depends=[mixlm MASS pls Rcmdr]; };
   RcmdrPlugin_orloca = derive { name="RcmdrPlugin.orloca"; version="4.1"; sha256="19qj6llr5sfw267dgbn2jvrsisb54qbjhgaiigfzymk6px33wwmg"; depends=[orloca orloca_es Rcmdr]; };
   RcmdrPlugin_plotByGroup = derive { name="RcmdrPlugin.plotByGroup"; version="0.1-0"; sha256="10wc7lnihsrldsynq2s0syr1aqmvfnj9rhgwh1nkk7jlrwcgj0z6"; depends=[Rcmdr lattice]; };
   RcmdrPlugin_pointG = derive { name="RcmdrPlugin.pointG"; version="0.6.6"; sha256="0sc3akbpdys353va05b40g3rq8qihw0pmhvv0kckkhsgrbr8mc07"; depends=[Rcmdr RColorBrewer]; };
   RcmdrPlugin_qual = derive { name="RcmdrPlugin.qual"; version="2.2.6"; sha256="00wznh0k909cd9vwdj1ag3224xkqnwjsad1bfkgxbszsx0w6xvy9"; depends=[Rcmdr]; };
+  RcmdrPlugin_ROC = derive { name="RcmdrPlugin.ROC"; version="1.0-16"; sha256="1pxv0izdkqjhvmbvln6n2lhr1mamfy4q20ld6dqkldxj9bivzckb"; depends=[Rcmdr pROC ROCR ResourceSelection PredictABEL]; };
   RcmdrPlugin_sampling = derive { name="RcmdrPlugin.sampling"; version="1.1"; sha256="0fx0s63wq0si1jydl9xyj9ny7iglg91zpvkyrnc05i5pan9l3xd9"; depends=[lpSolve sampling MASS Rcmdr]; };
   RcmdrPlugin_SCDA = derive { name="RcmdrPlugin.SCDA"; version="1.0"; sha256="0z43hhp798kga70xmiq4wzp5iad553rndn17g3va3dh6lz1k3y3h"; depends=[SCVA SCRT SCMA Rcmdr]; };
   RcmdrPlugin_seeg = derive { name="RcmdrPlugin.seeg"; version="1.0"; sha256="105c2rl3mrcv7r3iqa9d2zs6cys7vfpyydylkg2cggfqkghxgr95"; depends=[Rcmdr seeg spatstat sgeostat]; };
@@ -3996,14 +4229,14 @@ let self = _self // overrides; _self = with self; {
   RcmdrPlugin_StatisticalURV = derive { name="RcmdrPlugin.StatisticalURV"; version="1.0-1"; sha256="04pqqgy12rnhwm8l0752hb9p5h4l11mm7flm6n9kkcvbkvagsbrz"; depends=[agricolae multcomp car Rcmdr]; };
   RcmdrPlugin_survival = derive { name="RcmdrPlugin.survival"; version="1.0-4"; sha256="03rgr9klf2d1ml8i2avf9lncjr3bfcb4v7mcwg800wwdjzkwqkql"; depends=[survival date Rcmdr]; };
   RcmdrPlugin_TeachingDemos = derive { name="RcmdrPlugin.TeachingDemos"; version="1.0-7"; sha256="0d473p0df99x9a3jfwb49gxsrcvslcw9yandramwq82cwy3sdcxw"; depends=[rgl TeachingDemos Rcmdr]; };
-  RcmdrPlugin_temis = derive { name="RcmdrPlugin.temis"; version="0.6.2"; sha256="08ahxx2gw5bp647wh53vsq54l4p4sbyac3xv24gfq2gyqh6ad9qm"; depends=[tm slam zoo lattice Rcmdr ca R2HTML RColorBrewer latticeExtra]; };
+  RcmdrPlugin_temis = derive { name="RcmdrPlugin.temis"; version="0.7"; sha256="1h1s2r2vz4sjnw25hvm13laflhlva28shlkg5kq6qk98p802gr19"; depends=[tm NLP slam zoo lattice Rcmdr tcltk2 ca R2HTML RColorBrewer latticeExtra stringi]; };
   RcmdrPlugin_UCA = derive { name="RcmdrPlugin.UCA"; version="1.0-2"; sha256="11a8jaz5vycq8hnpxzrbv1g8vyh0ic1y48952ah633b2j1m1ay8i"; depends=[Rcmdr]; };
   Rcolombos = derive { name="Rcolombos"; version="1.5.0"; sha256="139ayyc94m6srbcccw1j8p4by5nxy7s52ahvdq2ag183hk91gjq4"; depends=[httr]; };
   RColorBrewer = derive { name="RColorBrewer"; version="1.0-5"; sha256="0y4ficfdjzrd7lkcaafjrdqr5r3jiha7rvg76h8m5yak396c9has"; depends=[]; };
-  Rcplex = derive { name="Rcplex"; version="0.3-1"; sha256="1z0kjrd6m8sas9vllwv3dvmc1f8ix5b4j45jp8qparzcqfkjj9yk"; depends=[slam]; };
+  Rcplex = derive { name="Rcplex"; version="0.3-2"; sha256="1hx9s327af7yawzyq5isvx8n6pvr0481lrfajgh8nihj7g69nmk7"; depends=[slam]; };
   RCPmod = derive { name="RCPmod"; version="1.4"; sha256="1psn1w8ws0n96jqvd98l0wl0l46w0691c5vm9aarql2pqnc73lw9"; depends=[numDeriv gtools]; };
-  Rcpp = derive { name="Rcpp"; version="0.11.1"; sha256="1ccsvdij6yym9dziqsjf5gr37968imz8i81334vi2fc69z5xzf30"; depends=[]; };
-  Rcpp11 = derive { name="Rcpp11"; version="3.1.0.1"; sha256="17ymlnpyq2pdc9jbd31hzdrc69rp7ccj4kg6k793chq322y12bfx"; depends=[]; };
+  Rcpp = derive { name="Rcpp"; version="0.11.2"; sha256="1b42kmm314xzcjldcqaljsqfxczh8czjzl9afds372vh7asjmjm1"; depends=[]; };
+  Rcpp11 = derive { name="Rcpp11"; version="3.1.1"; sha256="03a28n1nk9xrl055xnnzvla8qdq8k856bj7vim2fyws5kw9b8sbp"; depends=[]; };
   RcppBDT = derive { name="RcppBDT"; version="0.2.3"; sha256="0gnj4gz754l80df7w3d5qn7a57z9kq494n00wp6f7vr8aqgq8wi1"; depends=[Rcpp]; };
   rcppbugs = derive { name="rcppbugs"; version="0.1.4.1"; sha256="0wb5mzw1sdrr7lc6izilv60k5v0wcvy8q31a863b63a9jvh16g8d"; depends=[Rcpp]; };
   RcppClassic = derive { name="RcppClassic"; version="0.9.5"; sha256="193nsplyqd1fb7hwxsk0s7dz6rm6rw7lp04jff08mswcjdkh69g4"; depends=[Rcpp]; };
@@ -4012,9 +4245,11 @@ let self = _self // overrides; _self = with self; {
   RcppDE = derive { name="RcppDE"; version="0.1.2"; sha256="0ji5csfygqvrcahgx5gxy7dddpykckzw8hmqslsdl7l68wj60qkc"; depends=[Rcpp RcppArmadillo]; };
   RcppEigen = derive { name="RcppEigen"; version="0.3.2.1.2"; sha256="010a27jby8c61mgw2qb47zkln1v33gj0xcn8lf7sw0kb2mdh58yl"; depends=[Matrix Rcpp]; };
   RcppExamples = derive { name="RcppExamples"; version="0.1.6"; sha256="1jnqh9nii5nncsah0lrkls8dqqcka9fnbvfg8ikl4cqjri17rpbv"; depends=[Rcpp]; };
-  RcppGSL = derive { name="RcppGSL"; version="0.2.0"; sha256="0qdm5igjrifw8a0m36k9xrbnaj11j18236a1gvdz689vy6a4hfqz"; depends=[Rcpp]; };
+  RcppGSL = derive { name="RcppGSL"; version="0.2.2"; sha256="0f47bs3ll42wxday2bg7w5fnv8a4280yvmzkjzn3b36v8wvm44g8"; depends=[Rcpp]; };
+  RcppMLPACK = derive { name="RcppMLPACK"; version="1.0.9"; sha256="042pznzd9b43k8n57xlbl1k4w6pzn4miv44qv3cf7w5br2rk1ks7"; depends=[Rcpp]; };
   RcppOctave = derive { name="RcppOctave"; version="0.14.1"; sha256="0fdljr0jdnardcm2qm29ibz16xymal8xac3p4grscipa44vm1w0b"; depends=[Rcpp pkgmaker digest stringr]; };
   RcppProgress = derive { name="RcppProgress"; version="0.1"; sha256="1gvj51gadljaakm1nxdwgxzh723vv3ypzpzsgacsppxpj4rivxq4"; depends=[Rcpp]; };
+  RcppRedis = derive { name="RcppRedis"; version="0.1.1"; sha256="0q05m4vssvk9xyxskdvpgwm3mhif2xbwggpwkyxdn7frsfz2fpvm"; depends=[Rcpp RApiSerialize]; };
   RcppRoll = derive { name="RcppRoll"; version="0.1.0"; sha256="0xwm64z7pr2cjmq4kri7zzhy7wvq7aj9lq3xm2g830fn71qvj8x3"; depends=[Rcpp RcppArmadillo]; };
   RcppSMC = derive { name="RcppSMC"; version="0.1.4"; sha256="1gcqffb6rkw029cpzv7bzsxaq0a5b032zjvriw6yjzyrpi944ip7"; depends=[Rcpp]; };
   RcppXts = derive { name="RcppXts"; version="0.0.4"; sha256="143rhz97qh8sbr6p2fqzxz4cgigwprbqrizxpkjxyhq8347g8p4i"; depends=[Rcpp xts]; };
@@ -4022,22 +4257,21 @@ let self = _self // overrides; _self = with self; {
   rcqp = derive { name="rcqp"; version="0.3"; sha256="0vxcgchnxdsdamclcshjbkn00ysmfmqp586a36wsyv3zqrd6rg7p"; depends=[plyr]; };
   Rcsdp = derive { name="Rcsdp"; version="0.1.53"; sha256="0x91hyx6z9f4zd7djxlq7dnznmr9skyzwbbcbjyid9hxbcfyvhcp"; depends=[]; };
   rCUR = derive { name="rCUR"; version="1.3"; sha256="1f38xbc5n91k2y88cg0sv1z2p4g5vl7v2k1024f42f7526g2p2lx"; depends=[MASS Matrix lattice]; };
-  RCurl = derive { name="RCurl"; version="1.95-4.1"; sha256="1bphxniirak797rb2hjnv83i1sskdzcf3bl15lym171f79kx80w3"; depends=[bitops pkgs.curl]; };
+  RCurl = derive { name="RCurl"; version="1.95-4.3"; sha256="1gyjarnxwz3ldpm1vwq9ls6al66rvs7yshzhrl1fv9lbm1qi8yfg"; depends=[bitops]; };
   Rd2roxygen = derive { name="Rd2roxygen"; version="1.4"; sha256="09dxgp65zac5b9mxbjrvy3ihdwski98xva5afq659b8yfvkviq4g"; depends=[roxygen2 formatR]; };
   rda = derive { name="rda"; version="1.0.2-2"; sha256="1g2q7c0y138i9r7jgjrlpqznvwpqsj6f7vljqqfzh2l6kcj43vjj"; depends=[]; };
   rdatamarket = derive { name="rdatamarket"; version="0.6.4"; sha256="16a1yxvf841505a8gh7jf09fx6ipysymrpvsd4b07xdg5hvbzx25"; depends=[zoo RCurl RJSONIO]; };
   rdd = derive { name="rdd"; version="0.56"; sha256="1x61ik606mwn46x3qzgq8wk2f6d5qqr95h30bz6hfbjlpcxw3700"; depends=[sandwich lmtest AER Formula]; };
   rdetools = derive { name="rdetools"; version="1.0"; sha256="0pkl990viv7ifr7ihgdcsww93sk2wlzp2cg931wywagfp8dijd02"; depends=[]; };
-  R_devices = derive { name="R.devices"; version="2.8.2"; sha256="0qnprgdihp1nzpbqzwg1l5snqyd7hzx49k8sbcl55jhcssdi3rym"; depends=[R_methodsS3 R_oo R_utils base64enc]; };
+  R_devices = derive { name="R.devices"; version="2.9.2"; sha256="14nr2alx59xm2cagpqrzviw7lxwxdrv9y42wb60230439nh3gpla"; depends=[R_methodsS3 R_oo R_utils base64enc]; };
   RDIDQ = derive { name="RDIDQ"; version="1.0"; sha256="09gincmxv20srh4h82ld1ifwncaibic9b30i56zhy0w35353pxm2"; depends=[]; };
   RDieHarder = derive { name="RDieHarder"; version="0.1.3"; sha256="0wls7b0qfbi6hsq9xdywi4mdhim5b6mrzhvyrm9dxp9z1k7imz6m"; depends=[]; };
   Rdistance = derive { name="Rdistance"; version="1.1"; sha256="1rgjiks4s5l0vdj4svik9zz6kwwxsh9nj6q2ng7iblny6iqm6kbd"; depends=[]; };
   rDNA = derive { name="rDNA"; version="1.30.1"; sha256="12h83zirv55sryc1zww97ws8kvsym1z7p7y5d4w43nam8mi3fpcd"; depends=[rJava]; };
   Rdpack = derive { name="Rdpack"; version="0.4-14"; sha256="19vscr9l63c074n76b6a6jbl956sphjhz0d50yiwp3cvqf28yssf"; depends=[gbRd bibtex]; };
-  Rdrools = derive { name="Rdrools"; version="0.0.2"; sha256="0iwik7nx07vvn9im0p1lz7y7602jccrrwkgaab2qrlmfmh9cf3pm"; depends=[rJava Rdroolsjars rJava Rdroolsjars]; };
-  Rdroolsjars = derive { name="Rdroolsjars"; version="0.0.1"; sha256="108smksx7bm3dzyznv4h6vjgfh938wci787az0z0ba6mjm3za74c"; depends=[rJava rJava]; };
+  rdrobust = derive { name="rdrobust"; version="0.6"; sha256="074lj2nz0rqxdx6cyd5cf3c073b0ra6d3pxpvp5dhx6iqzmpwcdp"; depends=[]; };
   rdryad = derive { name="rdryad"; version="0.1.1"; sha256="0mqpkmwkznyxj0nn1v389p741dlc66dixcvljsn2rvg0q6p75fkj"; depends=[XML RCurl OAIHarvester ape gdata plyr stringr RJSONIO]; };
-  RDS = derive { name="RDS"; version="0.5"; sha256="1lr59lwblv7rr6s8bgzsyh45fa1qkid2njx1chzm5y5ddn8cwlqa"; depends=[ggplot2 gridExtra igraph scales reshape2]; };
+  RDS = derive { name="RDS"; version="0.6"; sha256="14zk511agqckriqjiaargglzsw14mch8q7zh97qd38xg0568mh73"; depends=[ggplot2 gridExtra rgexf igraph scales locfit Hmisc reshape2]; };
   Rdsm = derive { name="Rdsm"; version="2.0.2"; sha256="1wzfc72zjvqdffkyp19zflab88r9yb3qrd0d96k8453dgmz8aygp"; depends=[bigmemory]; };
   RDSTK = derive { name="RDSTK"; version="1.1"; sha256="07vfhsyah8vpvgfxfnmp5py1pxf4vvfzy8jk7zp1x2gl6dz2g7hq"; depends=[plyr rjson RCurl]; };
   rDVR = derive { name="rDVR"; version="0.1.1"; sha256="19a4f9k65bd49vkn3sxkjdmcpwyawk7gwmvancvqr745gfgs0wzg"; depends=[RCurl]; };
@@ -4048,34 +4282,36 @@ let self = _self // overrides; _self = with self; {
   reader = derive { name="reader"; version="1.0.1"; sha256="1320kmysri660p54l86n260nrxskpfrwn4zbbwvp7w9fcqa09zyn"; depends=[NCmisc]; };
   readMLData = derive { name="readMLData"; version="0.9-6"; sha256="15rb8hm60fc30xgxjwxl7v5blzf02s6cb8pk0p26cgn9liiavjhb"; depends=[XML]; };
   readMzXmlData = derive { name="readMzXmlData"; version="2.7"; sha256="1c4q2ghp7mr1i3547vdq3mhvhqz0y2il5za5milrwb72wpq1cdfi"; depends=[base64enc digest XML]; };
+  readODS = derive { name="readODS"; version="1.4"; sha256="00xcas8y0cq3scgi9vlfkrjalphmd7bsynlzpy7izxa5w9b7x79f"; depends=[XML]; };
   reams = derive { name="reams"; version="0.1"; sha256="07hqi0y59kv5lg0nl75xy8n48zw03y5m71zx58aiig94bf3yl95c"; depends=[leaps mgcv]; };
   Rearrangement = derive { name="Rearrangement"; version="1.0"; sha256="0biyg2m0ip2x4fwfw7c1ynidzb5cvdlr0gycx90w319jlz3rxqz0"; depends=[quantreg]; };
-  REBayes = derive { name="REBayes"; version="0.40"; sha256="0pvwxw3f1mn6ky3gxxvrvl37mqmhxbjxplxwa5v2y53vrw8p2sdk"; depends=[Rmosek Matrix SparseM]; };
+  REBayes = derive { name="REBayes"; version="0.45"; sha256="0r3adc98x84ynqh682ngr7ghf0bzqhqbjay7lq842iny2wqwi6yz"; depends=[Rmosek Matrix SparseM]; };
   rebird = derive { name="rebird"; version="0.1.1"; sha256="0s8wmp2sghs56ppca57fjfab7wngszmy1g8rd3hiwx6br0sjidcg"; depends=[RJSONIO httr RCurl plyr]; };
-  rebmix = derive { name="rebmix"; version="2.5.1"; sha256="1g1kjh48ssj2wvch8m0cgr10bd9wh1mmi1zf52pyrgsf7w75r985"; depends=[]; };
+  rebmix = derive { name="rebmix"; version="2.6.1"; sha256="0yh284z0mfa24m27r5sm1qlaagz5vvd83wq7jyc42ahnfm7cm8gv"; depends=[]; };
+  recalls = derive { name="recalls"; version="0.1.0"; sha256="121r2lf32x4yq8zxx6pbnphs7ygn382ns85qxws6jnqzy52q41vh"; depends=[RCurl RJSONIO]; };
   reccsim = derive { name="reccsim"; version="0.9-1"; sha256="17nsp91xq20vfwjfwav80qjs2wc7gwpmrdnwv7lc61baq0kkcs7k"; depends=[]; };
   ReCiPa = derive { name="ReCiPa"; version="3.0"; sha256="019vlvgxnqqlwghxygfqggzp2b4x2pqzdrbhaa703zdhm58k0n1g"; depends=[]; };
   recluster = derive { name="recluster"; version="2.5"; sha256="1hyq3nxbkah9jmly9a7ykzrf72r8yyd5ra5hf6d8fcprg15h8gg2"; depends=[vegan ape picante phangorn phytools cluster]; };
   recommenderlab = derive { name="recommenderlab"; version="0.1-4"; sha256="0ays9y3l7nj4vcbdraqv627lv0vf3wiqfszcqrh74h8jz9nnx78d"; depends=[Matrix registry arules proxy]; };
   recommenderlabBX = derive { name="recommenderlabBX"; version="0.1-0"; sha256="0dl79cxarsfp8l4nxnns05jwnjygigjhwpjrr4lzx4nvsfxmgsr2"; depends=[recommenderlab]; };
   recommenderlabJester = derive { name="recommenderlabJester"; version="0.1-0"; sha256="1m5jg8gs16cwwwcnjzqkyzwyip8fshrwhmqz8g7nlf6g3p9347rl"; depends=[recommenderlab]; };
-  RecordLinkage = derive { name="RecordLinkage"; version="0.4-1"; sha256="0q5wb8p4w3xc6p9z8vdv1vdq4rnq69vi37b1m2cqsp2n9mmg1wfb"; depends=[e1071 rpart ada ipred evd RSQLite data_table ff ffbase]; };
   Records = derive { name="Records"; version="1.0"; sha256="08y1g2m6bdrvv4rpkhd5v2lh7vprxy9bcx9ahp1f7p062bn2lwji"; depends=[]; };
   RECSO = derive { name="RECSO"; version="1.0"; sha256="1ipjfxk58wkrq6a0nqrg9b734xj1qa8xnr44xigbpjrpdqd5j3lm"; depends=[]; };
-  REdaS = derive { name="REdaS"; version="0.9.0"; sha256="0xs27ryiy1rvj23w2p9ms87knq5hz4sqmxm0lqikbap3knm2n7zb"; depends=[]; };
+  REdaS = derive { name="REdaS"; version="0.9.1"; sha256="0nd0d6cnx43k73cygbw0r6hdxpwkzwrlm4vr60s6hk227am15z68"; depends=[]; };
   REEMtree = derive { name="REEMtree"; version="0.90.3"; sha256="01sp36p12ky8vgsz6aik80w4abs70idr9sn4627lf94r92wwwsbc"; depends=[nlme rpart]; };
   ref = derive { name="ref"; version="0.99"; sha256="0f0yz08pqpg57mcm7rh4g0rbvlcvs5fbpjkfrq7fmj850z1ixvw0"; depends=[]; };
-  referenceIntervals = derive { name="referenceIntervals"; version="1.0"; sha256="0s0wxnykzp4ysg3x9jhyvpwv0wnldggs44aiqi1rm7774vgnla9h"; depends=[boot extremevalues]; };
-  RefFreeEWAS = derive { name="RefFreeEWAS"; version="1.2"; sha256="1xa75nigk683084f4c43v1gvlgpdhzw58ij1rs78m45y5hbsmagn"; depends=[isva]; };
+  referenceIntervals = derive { name="referenceIntervals"; version="1.1"; sha256="0lw233rsyii3bjzj262qq85sf3sgj3nq7r8siwfn115amjbi6r6r"; depends=[boot extremevalues car outliers]; };
+  RefFreeEWAS = derive { name="RefFreeEWAS"; version="1.3"; sha256="1cb1q2nki0d18ia4cmi1sp7qih9hv7g1jk1kyp7vya5gp572z3cd"; depends=[isva]; };
   refGenome = derive { name="refGenome"; version="1.2.0"; sha256="038v9pwh8fra31l14bwb2kyilmc9kqbvb9s1c0d79yxkx6znjc49"; depends=[RSQLite doBy]; };
-  RefManageR = derive { name="RefManageR"; version="0.8.1"; sha256="0rih1g7kw7c5cg37qh704wwniyi6ralrr2pqg8qwalq3pxc3y1qz"; depends=[XML RCurl RJSONIO plyr bibtex lubridate stringr]; };
-  refund = derive { name="refund"; version="0.1-9"; sha256="0yrjw2s1z8qa2zzasbiklvzs34zrhkj7iygi7bnp617fwvfj7jqs"; depends=[lattice boot mgcv fda MASS glmnet magic nlme wavethresh Matrix gamm4 matrixStats lme4 RLRsim]; };
+  RefManageR = derive { name="RefManageR"; version="0.8.3"; sha256="0ik85hgf1v347kypb7k97nhr0dm2nqz156k9lkf8dcjml3f00sk0"; depends=[XML RCurl RJSONIO plyr bibtex lubridate stringr]; };
+  refund = derive { name="refund"; version="0.1-11"; sha256="1afsxab1jivs4vj6diqh7352v98divna6az1dxsdn7lvw6cmph6y"; depends=[fda lattice boot mgcv MASS glmnet magic nlme wavethresh Matrix gamm4 matrixStats lme4 RLRsim]; };
+  refund_wave = derive { name="refund.wave"; version="0.1"; sha256="1vnhg7gi5r8scwivqjwhrv72sq8asnm4whx3jk39saphdxpk5hxv"; depends=[glmnet wavethresh]; };
   RegClust = derive { name="RegClust"; version="1.0"; sha256="1d9w74phw4fgafglc18j7dpmln96fvxnf1kdc9zddgj90p8yfx63"; depends=[]; };
   REGENT = derive { name="REGENT"; version="1.0.5"; sha256="1id1bkrr0q1nwja8y7glb5wsq1hkx6gf1d09vbmfl62hslqblqn8"; depends=[]; };
   registry = derive { name="registry"; version="0.2"; sha256="1ifv9sql70kylfj12cdb1j1zpk3ix728m8qj46sf1zyc5mhll01s"; depends=[]; };
   reglogit = derive { name="reglogit"; version="1.2-2"; sha256="0nq60s8l860z6nd52l6c77vamis7hl2j667gkxry0jir2pxsk4jp"; depends=[mvtnorm boot Matrix]; };
   regpro = derive { name="regpro"; version="0.1.0"; sha256="0d47ffsqx1633pmf3abi7wksyng2g71mz2z9nb2zqdak794l1n44"; depends=[denpro]; };
-  regress = derive { name="regress"; version="1.3-10"; sha256="1vfy8ynxcpans2xw74iax5gxfdj9ql41cbcp2rcp1q0zq099hhh1"; depends=[]; };
+  regress = derive { name="regress"; version="1.3-14"; sha256="0qnks28fr8siq95iiiqyvz82cbdg14i18rj7g9rqyjhiam12fshl"; depends=[]; };
   regRSM = derive { name="regRSM"; version="0.4"; sha256="1rg74jqj8rw69q6my0n4alflx7mgfwng35ff72bxwjhn9ghhj347"; depends=[]; };
   regsubseq = derive { name="regsubseq"; version="0.12"; sha256="0879r4r8kpr8jd6a3fa9cifm7cv0sqzz8z1alkm1b2fr1625md3g"; depends=[]; };
   regtest = derive { name="regtest"; version="0.05"; sha256="1wrrpp2hvkas0yc512gya3pvd0v97pn4v51k5jxkwyd1pp68zd1q"; depends=[]; };
@@ -4083,31 +4319,32 @@ let self = _self // overrides; _self = with self; {
   rela = derive { name="rela"; version="4.1"; sha256="00ksm7zh1mpd2d5c5d823id3sxj0h3x0ccg6a40fadibvr1ay3ny"; depends=[]; };
   relaimpo = derive { name="relaimpo"; version="2.2-2"; sha256="1rxjg2yw2gyshaij98w83cshxwscnq3ql7bg13n7v4nbjsi1l6zh"; depends=[MASS boot survey mitools corpcor]; };
   relations = derive { name="relations"; version="0.6-3"; sha256="1hw6g297h2az5f97q2rr3f6mb9d681wrgl9p8f2q1z3ww39b5vgw"; depends=[cluster slam sets]; };
-  RelativeRisk = derive { name="RelativeRisk"; version="1.1-1"; sha256="0ag7mdkrzixf334jfrkhkdzhsh90zzx013yih0fw3fywmy5h7lfk"; depends=[]; };
   relax = derive { name="relax"; version="1.3.15"; sha256="0cgvxw3pmy9kx8p81bb5n5nnbn6l9hm07k6hdy7p2j2gl15xxnpq"; depends=[]; };
   relaxnet = derive { name="relaxnet"; version="0.3-2"; sha256="1l83rk7r4vkcxbfljmibzm8lzpx0vf406hv4h5cy9x0k3rz2bfh0"; depends=[glmnet]; };
   relaxo = derive { name="relaxo"; version="0.1-2"; sha256="1rzmq7q3j271s6qwwrmwidv0vxcjpgjhyiqgr6fkczkai2lbnd8x"; depends=[lars]; };
   reldist = derive { name="reldist"; version="1.6-2"; sha256="0f5l74jmk8jxi43jyjxjv9cklk8359drjkjipz7972dm3a7i4rmw"; depends=[]; };
   relevent = derive { name="relevent"; version="1.0-3"; sha256="054x4kmc0h0s6a4svjqawy52sllzmaca46q6abnr5qhdzzmfh21n"; depends=[trust sna]; };
   Reliability = derive { name="Reliability"; version="0.0-2"; sha256="12zsicgbjqih3grbs62pw37x8wlkmnyc7g0yz6bqnfb4ym2yb7fg"; depends=[]; };
-  ReliabilityTheory = derive { name="ReliabilityTheory"; version="0.1.1"; sha256="0sfwax1qhjrwc5cy2yiycpppkzgs36wils23x3k6hjpzi3ybspn1"; depends=[igraph sfsmisc combinat FRACTION mcmc PhaseType actuar HI]; };
+  ReliabilityTheory = derive { name="ReliabilityTheory"; version="0.1.4"; sha256="1faab4z3rp0xqc0s0rrkw4kxgyc332xz3sjaz1wd4p6kiydds2hi"; depends=[igraph sfsmisc combinat FRACTION mcmc PhaseType actuar HI]; };
   reliaR = derive { name="reliaR"; version="0.01"; sha256="000nafjp386nzd0n57hshmjzippiha6s6c4nfrcwl059dzmi088i"; depends=[]; };
   relimp = derive { name="relimp"; version="1.0-3"; sha256="1isn2ns3qiz985wrg7992dmmqxwdq75a9yhfqnb64xhnzzpcpszq"; depends=[]; };
   relSim = derive { name="relSim"; version="0.1-47"; sha256="13asl14f3547nl50jwrk72pbm2vx140k27gz3b38j28cpmvi03mz"; depends=[DNAtools]; };
   relsurv = derive { name="relsurv"; version="2.0-4"; sha256="1da3sj7hks5azm18m23fh8r2g02p0nivgilayndxwwvd1i70ycrx"; depends=[survival date MASS]; };
+  RelValAnalysis = derive { name="RelValAnalysis"; version="1.0"; sha256="1jl1gfj44gfkmc1yp6g5wwn4miydwpvxwrg76rnkv9454zrc5pvp"; depends=[zoo]; };
   remix = derive { name="remix"; version="2.1"; sha256="0s1gaf7vj08xd4m7lc9qpwvk0mpamabbxk71970mfazx6hk24dr0"; depends=[plyr survival Hmisc ascii]; };
   rEMM = derive { name="rEMM"; version="1.0-8"; sha256="1d8nwranqfvr9c0g2ny7akawgqk5hjnr1mclk87gmbmwn9iwik34"; depends=[proxy MASS clusterGeneration igraph]; };
   remMap = derive { name="remMap"; version="0.1-0"; sha256="03jbrnk8nbaj6l8g428il5h6p2sszndd2bl4rvg8347pw7cp4kk1"; depends=[]; };
   Renext = derive { name="Renext"; version="2.1-0"; sha256="19920kb3qd97vm285zbxqarpq8dyyrx1k6sks990xjbgpy7vyj3y"; depends=[evd numDeriv]; };
   RenextGUI = derive { name="RenextGUI"; version="1.0-2"; sha256="0ghs8bwb6qdyvhghxvdy51cibylgm7bdbzgqsn1nbxam39yhvfv9"; depends=[gWidgets gWidgetstcltk Renext]; };
-  rentrez = derive { name="rentrez"; version="0.2.3"; sha256="0z25wbsf435izmhrsrrjc5dhx583x0ayhmp3398jqd3k9y0i7saz"; depends=[RCurl XML]; };
+  rentrez = derive { name="rentrez"; version="0.2.4"; sha256="00ixhzwk9s802n4msd63aika2g315cw8kppr0rq02wkch7a2nl3w"; depends=[RCurl XML]; };
   Reol = derive { name="Reol"; version="1.55"; sha256="0147x3fvafc47zd2chgv3b40k480pcjpji8vm1d741i1p6ml448p"; depends=[XML RCurl ape]; };
+  ReorderCluster = derive { name="ReorderCluster"; version="1.0"; sha256="0ss750frzvj0bm1w7zblmcsjpszhnbffwlkaw31sm003lbx9hy58"; depends=[gplots Rcpp]; };
   Reot = derive { name="Reot"; version="0.1.0"; sha256="0kpp5mg7dpfas77mw95ryfknjvdx7vwah42dip1kgyy7sxqqhn3h"; depends=[Rcpp raster foreach]; };
   RepeatedHighDim = derive { name="RepeatedHighDim"; version="2.0.0"; sha256="1n9w4jb25pm0mmsahlfhkp9jmhgp5b21l1g85gm2wbxqkjsg7g0g"; depends=[MASS nlme]; };
   repfdr = derive { name="repfdr"; version="1.0"; sha256="1rscfbnq739al5pac1y9szjw2g6f9z6qimkvhrkn9xfchjw3jvky"; depends=[locfdr]; };
-  repmis = derive { name="repmis"; version="0.2.8"; sha256="0g3k886x14hb0vih3rwv1rm1fjblsb21i7ixghj5c36h2a6d9a6q"; depends=[digest httr plyr R_cache]; };
+  repmis = derive { name="repmis"; version="0.2.9"; sha256="0ivk7sfnjia6xqsk7z0sqjdyhkrr894zpjfgm3l1sqnxam001rm2"; depends=[digest httr plyr R_cache xlsx]; };
   repolr = derive { name="repolr"; version="2.0"; sha256="10wg07sfxcxzswf3zh5sx2cm9dxjx11zymy82a4q9awnacb5gp9b"; depends=[gee]; };
-  ReporteRs = derive { name="ReporteRs"; version="0.5.2"; sha256="0jigylskv8k7610qpwchf60bf50bcxpdziw8dpqmff41q24wwj1h"; depends=[ReporteRsjars rJava base64 highlight]; };
+  ReporteRs = derive { name="ReporteRs"; version="0.5.5"; sha256="1g6dsdjzzc144z992cp9cd65naj4ll2b616562wlqz9983jzaap4"; depends=[ReporteRsjars rJava base64]; };
   ReporteRsjars = derive { name="ReporteRsjars"; version="0.0.1"; sha256="0y2kzlyw2yf65jvawrvwwqhwwp0yw3ssx8y4jwkcyqn66b6gzh8j"; depends=[rJava]; };
   reportr = derive { name="reportr"; version="1.1.2"; sha256="0lxnmay9vgg7dsa3scszx3v4lb6m3bv6kjl0dk7hrl7bd67azdrk"; depends=[]; };
   reportRx = derive { name="reportRx"; version="1.0"; sha256="0npiflql0lq8sqp6xgydxbw7xdr0zdxj1s2h4bnpmn4clc05r7m4"; depends=[reshape survival xtable aod cmprsk geoR stringr]; };
@@ -4122,59 +4359,60 @@ let self = _self // overrides; _self = with self; {
   reshape2 = derive { name="reshape2"; version="1.4"; sha256="0i3bim4clwyfdwwrmszsn9ga5gm4a2sh1i0jmpji3afbxc151yjp"; depends=[plyr stringr Rcpp]; };
   reshapeGUI = derive { name="reshapeGUI"; version="0.1.0"; sha256="0kb57isws8gw0nlr6v9lg06c8000hqw0fvhfjsjyf8w6zwbbq3zs"; depends=[reshape2 plyr gWidgets gWidgetsRGtk2]; };
   ResistorArray = derive { name="ResistorArray"; version="1.0-28"; sha256="055zr4rybgrvg3wsgd9vhyjpvzdskrlss68r0g7rnj4yxkix0kxz"; depends=[]; };
-  ResourceSelection = derive { name="ResourceSelection"; version="0.2-3"; sha256="0mhm8klc9bgf443gmx7zrc3vlclsygmb2al6glp2yd2awzfnn27a"; depends=[]; };
+  ResourceSelection = derive { name="ResourceSelection"; version="0.2-4"; sha256="01r1w03paazyix5jjxww89falba1qfiqcznx79a6fmsiv8gm2x5w"; depends=[]; };
   restlos = derive { name="restlos"; version="0.1-2"; sha256="14nbi8xqjs9plkzamg0ja1mx7klpbnnglk7p2nipz551b0nmzn7i"; depends=[som rgl ade4 geometry nnclust]; };
   restorepoint = derive { name="restorepoint"; version="0.1.5"; sha256="0xmpxprirnd1yavwk3vkc0cp715d187mn0amppya7kd47iw10wsy"; depends=[]; };
   retimes = derive { name="retimes"; version="0.1-2"; sha256="019sllyfahlqnqry2gqw4w5cy4cavrqnwpwrbb25cgjpdb19raja"; depends=[]; };
   reutils = derive { name="reutils"; version="0.1.2"; sha256="0f2c6zxk6x2plq649b1ml6b112j6y8ys074pn30yw35ncg3h86fa"; depends=[assertthat RCurl XML]; };
+  revealedPrefs = derive { name="revealedPrefs"; version="0.1"; sha256="1akinhrvw3rmsxircnj2ymfphsca50j2jda5v4kqcprpigf1i8j1"; depends=[Rcpp]; };
   review = derive { name="review"; version="2.5"; sha256="0qk4n6g0hp49rjqhpipgja777namdafk6yf4kcxdld1cghdikw31"; depends=[XML Hmisc]; };
   reweight = derive { name="reweight"; version="1.2.1"; sha256="0fv7q1zb3f4vplg3b5ykb1ydwbzmiajgd1ihrxl732ll8rkkfa4v"; depends=[]; };
   rexpokit = derive { name="rexpokit"; version="0.24.1"; sha256="143zi6qb0l8vbx87jf58v1zfxqmvv6x4im1knd6q4dpp9gffqs22"; depends=[SparseM Rcpp]; };
   Rfacebook = derive { name="Rfacebook"; version="0.4"; sha256="0f5wbd16a7wsw1fpficz6i2vrwyw3n75a1qm4dv5181jr6ik492p"; depends=[httr rjson]; };
   rFerns = derive { name="rFerns"; version="0.3.3"; sha256="0d0zkqqqv9l71a5bjps1m69mrpqxkzs77zlf6kbg70b053dzhiph"; depends=[]; };
   RFGLS = derive { name="RFGLS"; version="1.1"; sha256="13ggxj74h5b2hfhjyc50ndxznkvlg18j80m78hkzwh25d3948fsk"; depends=[bdsmatrix Matrix]; };
-  rfigshare = derive { name="rfigshare"; version="0.3-1"; sha256="10vjw3r4jwbbk3z9cm83k3hkg9vr6kh41d9h7cbxdw7v6d2mlc7f"; depends=[RJSONIO httr plyr yaml ggplot2 XML]; };
+  rfigshare = derive { name="rfigshare"; version="0.3.6"; sha256="1n6i5ppn3v93126gvva8sn85v1h4f7hgc43pxja9bwr1ypmzgr45"; depends=[RJSONIO httr httpuv plyr yaml ggplot2 XML]; };
   R_filesets = derive { name="R.filesets"; version="2.4.0"; sha256="1970x41g7wxspslfijmx021z06s3lfw5wz0mr8h5bk1y8sj0gsvk"; depends=[R_oo R_methodsS3 R_utils R_cache digest]; };
   RFinanceYJ = derive { name="RFinanceYJ"; version="0.3.1"; sha256="0qhmzsch7c2p0zckjkspsajzh8m10cf75ixjlgd0nj8rm41fngm3"; depends=[XML xts]; };
   rfishbase = derive { name="rfishbase"; version="0.2-2"; sha256="09pa5zpw9rclf5pqj1wjjhdcblca9sm9xcs9ka3xfa7azj7n9ljd"; depends=[XML RCurl]; };
   rfisheries = derive { name="rfisheries"; version="0.1"; sha256="1g0h3icj7cikfkh76yff84hil23rfshlnnqmgvnfbhykyr2zmk61"; depends=[httr data_table assertthat ggplot2 rjson]; };
-  Rfit = derive { name="Rfit"; version="0.17"; sha256="1gl7hf5qdk0s9pb2wwzwyn81wyw7vk2d892ppnaf3c076b7gfvjh"; depends=[quantreg]; };
+  Rfit = derive { name="Rfit"; version="0.18"; sha256="06zpk4nyhqcq9py5i8c4zvz02csax39r09ays97w5k24zrnwk0q9"; depends=[quantreg]; };
   RFLPtools = derive { name="RFLPtools"; version="1.5"; sha256="0j3cdjibmdhg1qsmbpw7zbw9jz6gy662z28849xsr7gppzm08xbw"; depends=[RColorBrewer]; };
   RfmriVC = derive { name="RfmriVC"; version="1.0.4"; sha256="15bzpwi01gb580wl0flvp7pwqf1sgk6fsdmfq4cqaprb979js79f"; depends=[mvtnorm mgcv Rniftilib]; };
   RFOC = derive { name="RFOC"; version="3.3-3"; sha256="101d7nf4zjni5kdk54w3afdaqnjzl7y90zygybkqpd0vi82q602b"; depends=[RPMG GEOmap RSEIS MASS splancs]; };
   RForcecom = derive { name="RForcecom"; version="0.7"; sha256="0rjav2rwanzqgi1yasbm9lj18f0mfxwd8w8x41skf656gfcpi0i4"; depends=[XML RCurl plyr]; };
-  rforensicbatwing = derive { name="rforensicbatwing"; version="1.1"; sha256="0nfqjnnky8gc4i9sfnnkxhc1n82hcbl9k68d8x8pclk57mbsqggi"; depends=[Rcpp]; };
-  rfPermute = derive { name="rfPermute"; version="1.5.2"; sha256="0pgi603c9izlhvadjw32sf4z449fnd4lbdszn3x24cvzpy4p94wg"; depends=[randomForest ggplot2 gridExtra]; };
+  rforensicbatwing = derive { name="rforensicbatwing"; version="1.3"; sha256="0ff4v7px4wm5rd4f4z8s4arh48hgayqjfpnni2997c92wlsq3d12"; depends=[Rcpp]; };
+  rfPermute = derive { name="rfPermute"; version="1.6.1"; sha256="1fpj0wjaxfqcp6z0azkmgqjsysgpm0vgg81pi6w9xs6a5nwa6wd1"; depends=[randomForest ggplot2 gridExtra]; };
   RFreak = derive { name="RFreak"; version="0.3-0"; sha256="1dmllxb6yjkfkn34f07j2g7w5m63b5d10lh9xsmxyfk23b8l3x0x"; depends=[rJava]; };
   rgabriel = derive { name="rgabriel"; version="0.7"; sha256="1c6awfppm1gqg7rm3551k6wyhqvjpyidqikjisg2p2kkhmyfkyzx"; depends=[]; };
   rgam = derive { name="rgam"; version="0.6.3"; sha256="0mbyyhhyr7ijv2sq9n7g0vaxivngwf4nbb5398xpsh7fxvgw5zdw"; depends=[Rcpp]; };
   rGammaGamma = derive { name="rGammaGamma"; version="1.0.12"; sha256="1051ah6q11qkxj1my4xybbzc8xcqkxfmps8mv2his5cyfllwidbs"; depends=[gsl]; };
   rgauges = derive { name="rgauges"; version="0.2.0"; sha256="0p42hh32wcjcchsalpsan52kvz6nd1gw28xnydqgfzkzcqkl22dd"; depends=[ggplot2 lubridate plyr httr reshape2 gridExtra scales data_table]; };
-  rgbif = derive { name="rgbif"; version="0.6.2"; sha256="1833f7zks2sbsavpzn0b1npyhxx07486ns3d28g2id9q4yhz5zan"; depends=[XML RCurl plyr ggplot2 maps httr maptools rgdal rgeos RJSONIO data_table stringr assertthat]; };
+  rgbif = derive { name="rgbif"; version="0.7.0"; sha256="123kcwpc6n7av5waf225cc98qrdzswf5nq0fb9g9zydfs5d2qn89"; depends=[XML RCurl plyr ggplot2 maps httr maptools rgdal rgeos sp RJSONIO data_table stringr assertthat whisker]; };
   Rgbp = derive { name="Rgbp"; version="1.0.6"; sha256="1j4j7g9z7p592f82k0yvibrydynkd9v1ldil2vf3ikc650bn2l02"; depends=[sn]; };
   RGCCA = derive { name="RGCCA"; version="2.0"; sha256="0mcp51z5jkn7yxmspp5cvmmvq0cwh7hj66g7wjmxsi74dwxcinvg"; depends=[MASS]; };
   rgcvpack = derive { name="rgcvpack"; version="0.1-4"; sha256="1vlvw9slrra18qaizqk2xglzky0i6z3bsan85x908wrg8drss4h5"; depends=[]; };
   rgdal = derive { name="rgdal"; version="0.8-16"; sha256="17qk7kd0l0l52nyf6drr0gv4b0ibkggyn6g3ky9flsjy05b3wg8j"; depends=[sp]; };
-  RGENERATE = derive { name="RGENERATE"; version="1.0"; sha256="17i9d4imv9fb2g2hvm2k35rhywym923niqy9fq4i88rfahn1c3j0"; depends=[RMAWGEN]; };
+  RGENERATE = derive { name="RGENERATE"; version="1.1"; sha256="1da3b50cfv5jb63ijzbnr226jadbww2bapcxzx8am7zydm6gqnss"; depends=[RMAWGEN]; };
   RGenetics = derive { name="RGenetics"; version="0.1"; sha256="0x5sspd67hh08qm62whlnnd838m0np29q3bfzgwp6j85lhil3jrx"; depends=[]; };
   rgenoud = derive { name="rgenoud"; version="5.7-12"; sha256="17gzkn4laylnksy8h2w8c0whcxpchsx7bwjzk1q5sfqxswclqq0g"; depends=[]; };
-  rgeos = derive { name="rgeos"; version="0.3-4"; sha256="13r09ihjlwg6scg0by79b73zcqac59x654azms1m80pg0gs30lsr"; depends=[sp]; };
+  rgeos = derive { name="rgeos"; version="0.3-6"; sha256="134cppgg5349i5qs9k2161fakd15l1fx1x6mgv28c5vic2xdm4wl"; depends=[sp]; };
   rgexf = derive { name="rgexf"; version="0.14.3.11"; sha256="16mil1csyzkaywcdrjzz5r60n4xhhinxawg30skc7d9awkf26qfa"; depends=[XML Rook igraph]; };
   rggobi = derive { name="rggobi"; version="2.1.20"; sha256="1a7l68h3m9cq14k7y96ijgh0iz3d6j4j2anxg50pykz20lnykr9g"; depends=[RGtk2]; };
   RGIFT = derive { name="RGIFT"; version="0.1-5"; sha256="1745fs4bq0ss39fiwljspvrmnkgbbpc1fjvhvcrsmp2iizq12sgn"; depends=[]; };
-  rgl = derive { name="rgl"; version="0.93.996"; sha256="1p0yx1iwfqcppb5ndwg97wki8jcj370afrpp33bk9fdl6nqvhlhc"; depends=[]; };
-  Rglpk = derive { name="Rglpk"; version="0.5-2"; sha256="1wvg5gv9qjkj22sn1y2ipizs89537n5wd8m0mh4y3w5g4n6rr02j"; depends=[slam]; };
+  rgl = derive { name="rgl"; version="0.93.1098"; sha256="1nc4s8a2zihd7vg8mfyfah02mickgyqxscbpd7njzv9xycvr7jv5"; depends=[]; };
+  Rglpk = derive { name="Rglpk"; version="0.6-0"; sha256="0g0s63skabr0yqk5s9p66p77z8v3pr3hbnirbgdddlvkpphi08xx"; depends=[slam]; };
   Rgnuplot = derive { name="Rgnuplot"; version="1.0.1"; sha256="1yag6ip2ppclhnpfc3mn6bsaylv2lk2k3jr8wgrgzrb7z22p7dk8"; depends=[]; };
   RgoogleMaps = derive { name="RgoogleMaps"; version="1.2.0.6"; sha256="1kd77617j2dz3dqjskv71vj8xv0yjgcysrpw7a615s0ys2hs91wp"; depends=[png RJSONIO]; };
-  rgp = derive { name="rgp"; version="0.4-0"; sha256="0qm1vwx06076i5xywkxdi5c7i58rv94xkkl1dxsb3dg1syssv422"; depends=[emoa]; };
+  rgp = derive { name="rgp"; version="0.4-1"; sha256="1p5qa46v0sli7ccyp39iysn04yvq80dy2w1hk4c80pfwrxc6n03g"; depends=[emoa]; };
   rgpui = derive { name="rgpui"; version="0.1-1"; sha256="0hp1z00n6jzi45j61hlp5qj26wpjvbzjz3nvpxvmcjdmkk3vjfyp"; depends=[rgp shiny emoa]; };
   rgr = derive { name="rgr"; version="1.1.9"; sha256="1fs8f0g1wm6virwjzlgabp1i89n8jpdiwnkvk5w1lggs36xc8q59"; depends=[MASS fastICA]; };
-  RGraphics = derive { name="RGraphics"; version="2.0-7"; sha256="0xf67gqfz41zp3474rq4v64nsyzxc001yzlgq754ps25c4w525nc"; depends=[lattice ggplot2]; };
+  RGraphics = derive { name="RGraphics"; version="2.0-9"; sha256="1y0rrhvpn92l8mb0m8ny8ddpwgv6wkd3a10zhbing541f3y754nn"; depends=[lattice ggplot2]; };
   rgrs = derive { name="rgrs"; version="0.3"; sha256="19whlp3i0jps4pdif03h6z79zliw4shiqh7ackhk2gwq5c28jsql"; depends=[questionr]; };
-  RGtk2 = derive { name="RGtk2"; version="2.20.27"; sha256="12ks3j1q8qzp4k4gyn34zzy5ac3rbdimagrkxb46qb4s3hn4x3b5"; depends=[]; };
+  RGtk2 = derive { name="RGtk2"; version="2.20.31"; sha256="1ilnlmsk9fis61pc5bn9sf7z4b7vc7f0a0zcy77kk4bns6iqjvyp"; depends=[]; };
   RGtk2Extras = derive { name="RGtk2Extras"; version="0.6.1"; sha256="19gjz2bk9dix06wrmlnq02yj1ly8pzhvr0riz9b08vbzlsv9gnk2"; depends=[RGtk2]; };
   RH2 = derive { name="RH2"; version="0.1-2.12"; sha256="1ig9yxpaza7lm0b20sp7jr024hp284c0zs3k06k3k1vw1dyw60fj"; depends=[chron RJDBC]; };
-  rHealthDataGov = derive { name="rHealthDataGov"; version="1.0.0"; sha256="15qk52bf389hlv9aihwc8398s989gw0r48909g45ipdhxala4a8a"; depends=[bit64 httr jsonlite]; };
+  rHealthDataGov = derive { name="rHealthDataGov"; version="1.0.1"; sha256="0lkjprss15yl6n9wgh79r4clip3jndly2ab1lv4iijzxnxay099d"; depends=[bit64 httr jsonlite]; };
   Rhh = derive { name="Rhh"; version="1.0.2"; sha256="0blxim8yrb0qnbkc1z2q24q6ryakggq2zhaa223swla99ahmsny3"; depends=[]; };
   RHive = derive { name="RHive"; version="2.0-0.0"; sha256="0r49irdwigxxqniidx7i3j7si8bw7zklw3n4zvhcmzfkvx0al91n"; depends=[rJava]; };
   RHmm = derive { name="RHmm"; version="2.0.3"; sha256="1mnsqkg419d1z0kyxpjj9md3aammvw0xfrd7dwymii2ql050v47b"; depends=[MASS nlme]; };
@@ -4186,6 +4424,7 @@ let self = _self // overrides; _self = with self; {
   RHT = derive { name="RHT"; version="1.0"; sha256="1gxf8nhj3y92h8al7l3fxa45wc568kb3cykrbdjlsy2zjacf7fcc"; depends=[]; };
   R_huge = derive { name="R.huge"; version="0.8.0"; sha256="00iiz1q6a5ywsidiwy6lnxjw0ig75ri914dqr7cbfccdf66fb840"; depends=[R_methodsS3 R_oo R_utils]; };
   ri = derive { name="ri"; version="0.9"; sha256="00y01n9cx95bjhdpnh7vi0xd5p6al3sxbjszbyxafn7m9mygmnhv"; depends=[]; };
+  RI2by2 = derive { name="RI2by2"; version="1.2"; sha256="0387ncq1nhpz8521nwsjybsdpncm56nrwkz68apgihmrbjlmp6m7"; depends=[gtools]; };
   rich = derive { name="rich"; version="0.3"; sha256="122xb729xlm8gyb7b3glw4sdvrh98wh89528kcbibpx83bp3frc0"; depends=[boot vegan permute]; };
   ridge = derive { name="ridge"; version="2.1-3"; sha256="0pdmybygf730dw73a5ncl9fw3kjnnpqqkanqxi97aj9n4cfcjn7z"; depends=[]; };
   RidgeFusion = derive { name="RidgeFusion"; version="1.0-2"; sha256="1izhq9vqj9kca3ddk91f5h8351qr3cnwig9i7d76rhlzawrl7ch9"; depends=[mvtnorm]; };
@@ -4193,99 +4432,106 @@ let self = _self // overrides; _self = with self; {
   RIFS = derive { name="RIFS"; version="0.1-5"; sha256="0705dhirh7bhy2yf3b1mpk3m7lggg4pwy640lvaspwaxkd6zac5w"; depends=[]; };
   RIGHT = derive { name="RIGHT"; version="0.1.2"; sha256="047g6gymrfzccnp56pvvk3s2r19p1czm9pjmpdn3fnx13d8lalaz"; depends=[shiny]; };
   RImageJROI = derive { name="RImageJROI"; version="0.1"; sha256="06x8p8wpzmsc6f2330m74x4dmh21dn0gqicand2l198knahp3kf7"; depends=[spatstat]; };
-  RImpala = derive { name="RImpala"; version="0.1.2"; sha256="0gg71zw9silq4j6zhhqzj5qvxv12mm6s7bl5kjn1i7ds93ixbfxn"; depends=[rJava]; };
-  rinat = derive { name="rinat"; version="0.1.1"; sha256="148hi13ax8fl853k3chv63aq5l2a3k5m0midyii3l9nfzqrc5g8n"; depends=[httr plyr jsonlite ggplot2 maps]; };
+  RImpala = derive { name="RImpala"; version="0.1.3"; sha256="108ykv3g17ymglcisawihlns0gzmzhx1xcbfwpa5pni4x9hxw0g9"; depends=[rJava]; };
+  rinat = derive { name="rinat"; version="0.1.4"; sha256="1m5k1wcinm6is3mf86314scgy3xfifz7ly7il5zgqyg9jkkpywbz"; depends=[httr plyr jsonlite ggplot2 maps]; };
   rindex = derive { name="rindex"; version="0.12"; sha256="1k9zihvrp955c4lh70zjlsssviy2app8w6mv5ln4nawackbz0six"; depends=[regtest]; };
   ringbuffer = derive { name="ringbuffer"; version="1.1"; sha256="1jj6zdvqlkc30bnxapg0sjl5ci5kq76611smqc4jc8adzhzwrh3f"; depends=[]; };
   ringscale = derive { name="ringscale"; version="0.1.2"; sha256="1gnnapkvxmkfws8dw41gj9h3svy3h6mi4zv413aykg9vrmy7d3rp"; depends=[FITSio]; };
   RInside = derive { name="RInside"; version="0.2.11"; sha256="09j4dpv30pp0q3h129ig15xxlp8yzxnk122iica4nv88niabjcaa"; depends=[Rcpp]; };
   RInSp = derive { name="RInSp"; version="1.0"; sha256="154ibjx5xyibaw8hhdh4hw5rbmwp340bplvz1174n6svg2dpl542"; depends=[]; };
   rio = derive { name="rio"; version="0.1.2"; sha256="0h80msbj1qcc9m4408qcckw238ydqdzzgr9frlmmc7qi4dyba4i4"; depends=[stringr foreign testthat]; };
-  rioja = derive { name="rioja"; version="0.8-5"; sha256="0x5384v523mmqj012c32nna6lznbj6pl1n4wdkx19r07liwjg5y4"; depends=[vegan]; };
+  rioja = derive { name="rioja"; version="0.8-7"; sha256="1164sxwv9wafqmprnkr9sdsd109ss8w2l1j8ir7kq8ya071k3zbl"; depends=[vegan]; };
+  ripa = derive { name="ripa"; version="2.0-2"; sha256="0n1gaga0d4bb9qdlm7gksa1nwi4y28kbgwr3icwqgihf1bfb9m81"; depends=[Rcpp]; };
   risaac = derive { name="risaac"; version="0.1"; sha256="1ndqxlq4l48iiaghx897bhr7q56csbia7y1a98fic8hzfp03811r"; depends=[]; };
   riskRegression = derive { name="riskRegression"; version="0.0.8"; sha256="0bjxwj4wrlcqkm1zf25p39h3jwf0f11zspzsk4b41axr3adlvmdw"; depends=[prodlim rms pec rms cmprsk survival]; };
   risksetROC = derive { name="risksetROC"; version="1.0.4"; sha256="1fh0jf8v536qzf1v3awx3f73wykzicli4r54yg1z926ccqb4h80l"; depends=[survival MASS]; };
   RISmed = derive { name="RISmed"; version="2.1.2"; sha256="1hi22sf6g047m2bq9yh6bwvi1x8bjw12vslfp6iyrim0w2pk96m1"; depends=[]; };
   Ritc = derive { name="Ritc"; version="1.0.1"; sha256="1h41s4jihzj0yj8xyan0zhhyyiq8m5567vw4gvmmr81p1qfzvva8"; depends=[minpack_lm]; };
   rite = derive { name="rite"; version="0.3.1"; sha256="0z12jxbmis9l82y0l98gf8hyxfwasj5lpznkmi8kwvvya3jw5ypf"; depends=[tcltk2 RCurl]; };
-  RItools = derive { name="RItools"; version="0.1-11"; sha256="08fhyzxszfpsdf3mfk3damwzf2rz5x470jaxsr0fk48c5gps57bj"; depends=[lattice SparseM xtable]; };
+  RItools = derive { name="RItools"; version="0.1-12"; sha256="0zdwj5y355d8jnwmjic3djwn6zy7h1iyl58j9hmnmc3m369cir0s"; depends=[lattice SparseM xtable svd abind]; };
   riv = derive { name="riv"; version="2.0-4"; sha256="1c9k62plqgxcgcm2j1s26hqvgww96n6bfjz2yk7m3p2wf8gkkyam"; depends=[MASS rrcov quantreg]; };
   riverplot = derive { name="riverplot"; version="0.2"; sha256="160xy3q7a7qfabambhq0h3mrx8wbiv88xvcfzkya3fkq5nac22c5"; depends=[]; };
-  rivervis = derive { name="rivervis"; version="0.38.3"; sha256="1zyw9z66j5ylikxd955b2r9f3176j565is3z52xsx64gwdc1sd4a"; depends=[]; };
+  rivervis = derive { name="rivervis"; version="0.39.4"; sha256="1al0ylmpvkxfhkv9i4j6pvrlqn13pdwmzs7s6vazmgmkl3iggav4"; depends=[]; };
   Rivivc = derive { name="Rivivc"; version="0.9"; sha256="0gl3040pp9nqm4g2ympnx80z64zfnn1hfsxka8ynd2cqhjn3b5i1"; depends=[signal]; };
   RJaCGH = derive { name="RJaCGH"; version="2.0.2"; sha256="1fy8wsnv7diwg2w7j61scm6vd35a5jb36i9pzh5m7jz6yqsank50"; depends=[]; };
   rjags = derive { name="rjags"; version="3-13"; sha256="0npfyphi8z25h7w4frplbyjgib1gawz7ib9gz5w6h2i0pricm53r"; depends=[coda]; };
   rJava = derive { name="rJava"; version="0.9-6"; sha256="008g6s6rcb5lnz5y2a2rs4iq85a4nl522g714s1w1r153qcc0jz0"; depends=[]; };
   rJavax = derive { name="rJavax"; version="0.3"; sha256="0sv2fjinp4wmdfvcpgm4hv8v3fkiiv84ywqyr4hz86j50ncd79km"; depends=[rJava]; };
-  RJDBC = derive { name="RJDBC"; version="0.2-3"; sha256="189cps0lvk756pcjx1xcigkchvahzp074f8973nx36q5s52pry0q"; depends=[DBI rJava]; };
-  rje = derive { name="rje"; version="1.7"; sha256="0p94nbcy0v83k0xbmqzg907iy4hkyjlnjm5v8d5b6asxwp3775r4"; depends=[]; };
+  RJDBC = derive { name="RJDBC"; version="0.2-4"; sha256="14nqz4gx24gcjmnd3hrhvfs5f68c3nqhb6nypv9gvk19dx1jayg0"; depends=[DBI rJava]; };
+  rje = derive { name="rje"; version="1.9"; sha256="1dyd34z6lb0p6zmyax5dpzflgc9a4saka33mvdfcxi5pj0rnygaz"; depends=[]; };
   Rjms = derive { name="Rjms"; version="0.0.5"; sha256="0bb07wynvk07p8i5x87hlxfavjs5wf5gasfggyjxycr54sphlg6z"; depends=[rJava Rjmsjars rJava Rjmsjars]; };
   Rjmsjars = derive { name="Rjmsjars"; version="0.0.1"; sha256="0xi42p1wgp7f15j3b74zisf0xrz86kgyn5anq3x5ahyb9cfrnmqx"; depends=[rJava rJava]; };
   rJPSGCS = derive { name="rJPSGCS"; version="0.2-6"; sha256="1x6mwy6232kjl8ssvkbamhfvxsc3rqbjsrlrprj0bprssm3pcr2g"; depends=[rJava]; };
   Rjpstatdb = derive { name="Rjpstatdb"; version="0.1"; sha256="0iwgsp3mblp7bsx88wfpqn09y1xrkingfkm3z9jsi2bwrnrjc2iv"; depends=[RCurl XML]; };
-  rjson = derive { name="rjson"; version="0.2.13"; sha256="0p04rlqn8y8ibk7r2f5q4hzapmqmphkf2hlsd1fjj8mj4ppr7kr4"; depends=[]; };
-  RJSONIO = derive { name="RJSONIO"; version="1.2-0.2"; sha256="1rg74ja9v6apwbk5fn8f91yfgz7ffdcs3fbcxbvqsjzqm7pcc7mq"; depends=[]; };
+  rjson = derive { name="rjson"; version="0.2.14"; sha256="0mrk2ahgb6pn7aq5lgixrxjkkpjmn4sbkazvg7bbfvyvxps1gm4k"; depends=[]; };
+  RJSONIO = derive { name="RJSONIO"; version="1.3-0"; sha256="1dwgyiy19sixhy6yclqcaaxswbmpq7digyjjxhy1qv0wfsvk94qi"; depends=[]; };
   RJSONLD = derive { name="RJSONLD"; version="1.0.3"; sha256="17myzigzmn6hd0fbzm7h4n65aiighklrzfr3irg1520aa35s6214"; depends=[RJSONIO formula_tools stringr lmtest]; };
   rJython = derive { name="rJython"; version="0.0-4"; sha256="13fpcw37cca738v9idqgi3gv9avfkfwfacxj54p2c4wyg46ghnah"; depends=[rJava rjson]; };
-  RKEA = derive { name="RKEA"; version="0.0-3"; sha256="0srjb8n2q2hv246q2mg9fzki121rk56sgxc6qk35bszy80f8yr5j"; depends=[rJava tm]; };
+  RKEA = derive { name="RKEA"; version="0.0-4"; sha256="0qkjnyy4b6vzdiapadx9hmw3h4gfgmbi4g5078rr6kq5kmwqlwgh"; depends=[rJava tm]; };
   rknn = derive { name="rknn"; version="1.2"; sha256="1c92cv3462f00p237fkh06hl66j912ssiav4hpc4jphvs01g30kz"; depends=[gmp]; };
   Rknots = derive { name="Rknots"; version="1.2.1"; sha256="1qv7l4c3n3zyz2s5whl5chi5yfb1j67kihk1c8gpjl291axmmi8w"; depends=[rgl rSymPy]; };
   rkt = derive { name="rkt"; version="1.3"; sha256="0d82id22xac84l5iqls0mlg1g9yn4hhkmf4ln7xlp0zinmmhym9m"; depends=[]; };
+  rkvo = derive { name="rkvo"; version="0.1"; sha256="0ci8jqf9nc8hb063nckxdnp0nlyr4ghby356lxm00anw44jlmw8v"; depends=[Rcpp]; };
   Rlab = derive { name="Rlab"; version="2.15.1"; sha256="1pb0pj84i1s4ckdmcglqxa8brhjha4y4rfm9x0na15n7d9lzi9ag"; depends=[]; };
   Rlabkey = derive { name="Rlabkey"; version="2.1.123"; sha256="0jz8x3n6byxmb10jcrcyznyj3zwab3bkp2g52n707w2jv0xvn8l5"; depends=[RCurl rjson]; };
-  rLakeAnalyzer = derive { name="rLakeAnalyzer"; version="1.3"; sha256="0f014z005nw0gr6h3k44v5446mqmvy6x90x1fis5rf0jviqhxwc3"; depends=[]; };
+  rLakeAnalyzer = derive { name="rLakeAnalyzer"; version="1.4"; sha256="1qs8f4sv044bxrf45wzfj444plkcq3i61353881x8shn13h3awas"; depends=[plyr]; };
   rlecuyer = derive { name="rlecuyer"; version="0.3-3"; sha256="1n0vny3k5s5152y0ggz9vfn4bqay9ncbdzkw9g4703pszrbwq7xh"; depends=[]; };
   rLindo = derive { name="rLindo"; version="8.0.1"; sha256="05qyc4wvpjgw8jxmwn2nwybi695fjn0cdilkprwmjg07c82f0q5n"; depends=[]; };
-  rlme = derive { name="rlme"; version="0.2"; sha256="1r92405mksiix3ngbjqxmbbxghacg1lwdmlv500k73aj336xs44i"; depends=[MASS quantreg nlme mgcv stringr magic]; };
-  RLRsim = derive { name="RLRsim"; version="2.1-3"; sha256="1cvvr33pgcdrmia1ixdbq9bnfbd9kwa70zwxkqgh68192bgaizv9"; depends=[mgcv]; };
+  rlist = derive { name="rlist"; version="0.3"; sha256="1l9iypqzdj8j6zg9a55xc6l31sp2lznyx17a1jsl6717bbh5bpmg"; depends=[stringdist data_table yaml jsonlite]; };
+  rlme = derive { name="rlme"; version="0.4"; sha256="02683sklihj3726a90jryybf855rvbz9v3dm9z9yhb32q9bfmy34"; depends=[MASS quantreg nlme mgcv stringr magic robustbase Rcpp]; };
+  RLRsim = derive { name="RLRsim"; version="3.0"; sha256=""; depends=[Rcpp mgcv]; };
   RM2 = derive { name="RM2"; version="0.0"; sha256="1v57nhwg8jrpv4zi22fhrphw0p0haynq13pg9k992sb0c72dx70a"; depends=[msm]; };
   rmaf = derive { name="rmaf"; version="2.0"; sha256="00qhdfzbjvmz83nicl73yhx7w8sv6j7x928j4vd6ll79098x4y84"; depends=[]; };
   RMallow = derive { name="RMallow"; version="1.0"; sha256="0prd5fc98mlxnwjhscmghw62jhq9rj5jk8qf4fnaa2a718yxf9b5"; depends=[combinat]; };
-  Rmalschains = derive { name="Rmalschains"; version="0.2-1"; sha256="1s48ryb3k4nakdb3r3qp6r6fykkx0hp57616jwr3256h9vlrar95"; depends=[Rcpp]; };
-  RMark = derive { name="RMark"; version="2.1.7"; sha256="1634ajwvqw523w1wpzcs3bci4c68325yi3zvzf53ha6dmk39c3jm"; depends=[snowfall matrixcalc msm coda]; };
-  rmatio = derive { name="rmatio"; version="0.9.0"; sha256="05dz0q3hjkfnblsnib5misxkn2fr891g0hsa2c4cxxqsgdzg6hbm"; depends=[Matrix lattice]; };
-  R_matlab = derive { name="R.matlab"; version="2.2.3"; sha256="1wzck1shsr62syyq61y3b1mq7r5pgfppprkwvlg110my9x7cgg85"; depends=[R_methodsS3 R_oo R_utils]; };
+  Rmalschains = derive { name="Rmalschains"; version="0.2-2"; sha256="1ki3igj78sk4kk1cvbzrgzjdvw6kbdb7dmqglh6ws2nmr5b6a7fx"; depends=[Rcpp]; };
+  RMark = derive { name="RMark"; version="2.1.8"; sha256="1g8zp1c6wdpi7rr0g4sfzxnvc56svl6qb2i971rvjh03ja3wzvi1"; depends=[snowfall matrixcalc msm coda]; };
+  rmatio = derive { name="rmatio"; version="0.10.0"; sha256="1p1gsv7fj14hynna4a7nnxbchd0i1db03yxah4pcz3sd3a9hqw0f"; depends=[Matrix lattice]; };
+  R_matlab = derive { name="R.matlab"; version="3.0.1"; sha256="0r8427bqr7kwrf1bp3chphpavpbaaq5yj3ad4jc40b75zg9dmi91"; depends=[R_methodsS3 R_oo R_utils]; };
   RMAWGEN = derive { name="RMAWGEN"; version="1.2.6.1"; sha256="1j8yb37sv2ycg3zgdj6hlxvlrsgvb9rh4yxd40bah2j1xgibr36z"; depends=[chron date vars]; };
   RMC = derive { name="RMC"; version="0.2"; sha256="1sc4nsjmaw2ajm8bka7r4mf73zxqhnvx23kl4v20pfpy9rhgd0h6"; depends=[]; };
   RMediation = derive { name="RMediation"; version="1.1.3"; sha256="07ck74dl1wwb88229fhkh2czlynddff7zvjyhisxk53qmdb0wvmw"; depends=[MASS lavaan e1071]; };
-  RMendeley = derive { name="RMendeley"; version="0.1-2"; sha256="10w8gqjm5qw79sfa22r27ykyg3j0sj7qfg478hwspkswans565wy"; depends=[RJSONIO RCurl]; };
-  RMessenger = derive { name="RMessenger"; version="0.1.4"; sha256="1y2zvd41rjd7khy4662zkkgy00lrk9kill57gnczrdgsyiwphivz"; depends=[Rcpp]; };
+  RMessenger = derive { name="RMessenger"; version="0.1.5"; sha256="1xsfvygf9bbfzbldpkmg399qhfai5s5fmc60xjpkjmxhjqh4vry1"; depends=[Rcpp]; };
   rmeta = derive { name="rmeta"; version="2.16"; sha256="1s3n185kk0ddv8v6c7mbc7cpj6yg532r7is6pjf9vda7317rxywy"; depends=[]; };
-  rmetasim = derive { name="rmetasim"; version="2.0.1"; sha256="18ri1j0ydw1syq33ydjqfk1blyifvg5a36zqhjkgmimdkpa5g1nz"; depends=[ape ade4 gtools]; };
+  rmetasim = derive { name="rmetasim"; version="2.0.4"; sha256="1a3bhiybzdvgqnnyh3d31d6vdsp4mi33sv8ks9b9xd9r369npk86"; depends=[ape ade4 gtools]; };
   R_methodsS3 = derive { name="R.methodsS3"; version="1.6.1"; sha256="1c3f64bvnpxfb3k2g7z3a6qms36z0n2hflw5w5952c82jx10cl0x"; depends=[]; };
-  rmgarch = derive { name="rmgarch"; version="1.2-6"; sha256="0fwmpadm1zlgdvja0b0ig9b971rzmicyvxi9i3gh2c49h8rg8s5j"; depends=[rugarch Rsolnp MASS Matrix zoo xts Bessel ff fftw shape pcaPP spd Rcpp]; };
+  rmgarch = derive { name="rmgarch"; version="1.2-8"; sha256="19q35kzyzzs19b4xgslrnl8ihlx1wlmrwfdimnq8racfx0y46lm5"; depends=[rugarch Rsolnp MASS Matrix zoo xts Bessel ff shape pcaPP spd Rcpp]; };
   rminer = derive { name="rminer"; version="1.3.1"; sha256="0rwjv5i4lr9611lyq55ps2yna7zzarakdnbj83xfs0kva63xn7fh"; depends=[nnet kknn kernlab rpart plotrix lattice]; };
   Rmisc = derive { name="Rmisc"; version="1.5"; sha256="1ijjhfy3v91fspid77rrkc5dkcb2lav37wc3f4k5lwrn24wzy5y8"; depends=[lattice plyr]; };
   Rmixmod = derive { name="Rmixmod"; version="2.0.2"; sha256="1qv6zymkgsbplrq4aa87lvcsv75dssj8qqq2h9665v31jsgx84lr"; depends=[Rcpp]; };
+  RmixmodCombi = derive { name="RmixmodCombi"; version="1.0"; sha256="0cwcyclq143938wby0aj265xyib6gbca1br3x09ijliaj3pjgdqi"; depends=[Rmixmod Rcpp]; };
   rmmseg4j = derive { name="rmmseg4j"; version="0.2-0"; sha256="1icc6a04hbqszzrs7sqp120v44g33rqgz2x926jvxvcishadnd90"; depends=[rJava]; };
-  rmngb = derive { name="rmngb"; version="0.3-1"; sha256="04x4fr4zrg7ihx8v76w32g2iaxigmlcr2qbxyq17fq306b4g0m0c"; depends=[]; };
+  rmngb = derive { name="rmngb"; version="0.4-1"; sha256="06ky3snnvg3rwz0cwi4j06w8spkl488rizn5ppph7ai5a92ydhx9"; depends=[]; };
   RMongo = derive { name="RMongo"; version="0.0.25"; sha256="1anybw64bcipwsjc880ywzj0mxkgcj6q0aszdad6zd4zlbm444pc"; depends=[rJava]; };
   rmongodb = derive { name="rmongodb"; version="1.6.5"; sha256="0y7vj1ci5k19qdh7jznm4izsqj2v6hfjarxq31xdmymajwi171rs"; depends=[jsonlite plyr]; };
   Rmosek = derive { name="Rmosek"; version="1.2.5.1"; sha256="1ki28357ijwzzxyb820lsf8l5x2i46shar0v71k15hvf9jn0h7zm"; depends=[Matrix]; };
   rmp = derive { name="rmp"; version="1.0"; sha256="1g0785fwjbwbj82sir3n7sg3idsjzdhrpxc7z88339cv9g4rl7ry"; depends=[]; };
-  Rmpfr = derive { name="Rmpfr"; version="0.5-4"; sha256="08mh9gp0cfaiqqds2sl5d1qd687lfby4ag834r5splpjzsx0sxs4"; depends=[gmp]; };
-  Rmpi = derive { name="Rmpi"; version="0.6-3"; sha256="16i11bdys39dlfyc4my3dmhr0sw56pzaiz74v0kmlmpfamwdh7cd"; depends=[]; };
+  Rmpfr = derive { name="Rmpfr"; version="0.5-5"; sha256="1ddyck28wb64gk3w0fph8aqsm021zv3z98jsbcdj0by77jaigmxj"; depends=[gmp]; };
+  Rmpi = derive { name="Rmpi"; version="0.6-5"; sha256="0i9z3c45jyxy86yh3f2nja5miv5dbnipm7fpm751i7qh630acykc"; depends=[]; };
+  RMRAINGEN = derive { name="RMRAINGEN"; version="1.0"; sha256="175kd803a44yblq2jw5mrn2qv4piiy249577lf684bmmajf4ird4"; depends=[copula RGENERATE RMAWGEN blockmatrix Matrix]; };
   rms = derive { name="rms"; version="4.2-0"; sha256="1kxifrypn6a0v2rbzhn3lch821d5w9qzj9rzvrsgac4fwskis65j"; depends=[Hmisc survival SparseM]; };
   rms_gof = derive { name="rms.gof"; version="1.0"; sha256="1n0h3nrp11f2x70mfjxpk2f3g4vwjaf4476pjjwy49smxxlxwz82"; depends=[]; };
   RMTstat = derive { name="RMTstat"; version="0.2"; sha256="1qp4msw8ikv6zr1j1ahxgwka7878v4av6zfqvj4j9w570v8afxvf"; depends=[]; };
   RMySQL = derive { name="RMySQL"; version="0.9-3"; sha256="1kmsrphzrk7a6f3i0pmpxlpj7w7yb5s2psx72lfv4zyd0aji83n1"; depends=[DBI]; };
+  rnaseqWrapper = derive { name="rnaseqWrapper"; version="1.0-1"; sha256="1fa3hmwrpccf09dlpginl31lcxpj5ypxspa0mlraynlfl5jrivch"; depends=[ecodist gplots gtools]; };
   RnavGraph = derive { name="RnavGraph"; version="0.1.6"; sha256="15f4az5wcmg1fv1sl34523lwcqpz6dv63z6yvnhx8hdac5ry9biw"; depends=[]; };
   RnavGraphImageData = derive { name="RnavGraphImageData"; version="0.0.3"; sha256="1mrh0p2ckczw4xr1kfmcf0ri2h2fhp7fmf8sn2h1capmm12i1q8f"; depends=[]; };
+  rnbn = derive { name="rnbn"; version="1.0.0"; sha256="1f3yv8cvrwlnzyk8g5b5sg5pvp6f15mi6bhfff44d0v1m6nwnp01"; depends=[RCurl RJSONIO]; };
   RNCBI = derive { name="RNCBI"; version="0.9.1"; sha256="1gvaizcm7ajblnxkqxvdalg5kws5kfa8186hw5rr7q3dc51gxm0i"; depends=[rJava XML RNCBIEUtilsLibs RNCBIAxis2Libs]; };
   RNCBIAxis2Libs = derive { name="RNCBIAxis2Libs"; version="0.9"; sha256="0lrvpka3bj6x6sqbjqwg8wlfgcjqq53ks4b48afqfzvqg9z8jk4d"; depends=[rJava]; };
   RNCBIEUtilsLibs = derive { name="RNCBIEUtilsLibs"; version="0.9"; sha256="1h1ywx8wxy6n2rbpmjbqw4c0djz29pbncisd0mlbshj1fw226jba"; depends=[rJava]; };
   RNCEP = derive { name="RNCEP"; version="1.0.6"; sha256="0z8fa7hgd6ss2yzpjn3d1ybqakgn76c7hp3h87ma0k03ilawxi09"; depends=[abind maps fields tgp fossil RColorBrewer]; };
   RND = derive { name="RND"; version="1.1"; sha256="1rbnjkfrsvm68xp90l4awixbvpid9nxnhg6i6fndpdmqwly2fwdp"; depends=[]; };
   rneos = derive { name="rneos"; version="0.2-7"; sha256="0vsifj6zfrdij1gjdp1dlh41cckwd04h41q30m7ard4pgyl9n7za"; depends=[RCurl XML]; };
-  RNetCDF = derive { name="RNetCDF"; version="1.6.1-2"; sha256="18cdknszrr3wm45vm7wrg32d1mybnfzaka9l45qm860yq13v84r3"; depends=[]; };
-  RNetLogo = derive { name="RNetLogo"; version="0.9-7"; sha256="0d7mw1wfid9qs18jr59qsnvw1l96wzbrjwhjz1yyjzdcg2xfs9gm"; depends=[rJava]; };
+  RNetCDF = derive { name="RNetCDF"; version="1.6.2-3"; sha256="0drylsg3nnlb060zg7vn3n24f908mhwqf7bbw8ys32chflrdvwl2"; depends=[]; };
+  RNetLogo = derive { name="RNetLogo"; version="1.0-0"; sha256="1378v70bdk69mri6n0770q2qlch1lzi7zr2i7s9vgpnc27hxxjcx"; depends=[rJava]; };
+  RNeXML = derive { name="RNeXML"; version="1.1.3"; sha256="1fcs1fwq66fb04zi2pwgn7xfljp8053s2vb0g4j5vzv0dq7nxy98"; depends=[ape XML plyr taxize reshape2 httr uuid]; };
   rngtools = derive { name="rngtools"; version="1.2.4"; sha256="1fcgfqrrb48z37xgy8sffx91p9irp39yqzxv7nqp1x2hnwsrh097"; depends=[pkgmaker stringr digest]; };
-  rngWELL = derive { name="rngWELL"; version="0.10-2"; sha256="1wsmagsssia02b6358mixpfgza32s1656f7s5pbfjgimjf7xwv5i"; depends=[]; };
+  rngWELL = derive { name="rngWELL"; version="0.10-3"; sha256="1wijscc0s6h1ipc1r8h179y94s1bzf409xlpiyr1njaxvvvpwvw1"; depends=[]; };
   rngwell19937 = derive { name="rngwell19937"; version="0.5-4"; sha256="1c6p0v673n328sdynvv780911yqxk2ayimb93k1f1h3ci915pixy"; depends=[]; };
   Rniftilib = derive { name="Rniftilib"; version="0.0-32"; sha256="1ck7ddhm759zha1iazg5razchq3gsfq3rzvfb8ichnl5l15z9ry2"; depends=[]; };
   RNiftyReg = derive { name="RNiftyReg"; version="1.1.2"; sha256="1g74qdx71wzyl0k7liwvl33rzhz7srmn15x55md5gyljxb5rqm6c"; depends=[reportr oro_nifti]; };
-  rnoaa = derive { name="rnoaa"; version="0.1.0"; sha256="0fr7s1x40y6fg5cfy6276557gp5c79df304hlk9sr3gssd2fdkw8"; depends=[httr lubridate plyr ggplot2 scales rgdal maptools stringr XML data_table]; };
-  rNOMADS = derive { name="rNOMADS"; version="1.3.0"; sha256="1h9rj42nsjnxydqsapg57gy1a1n5gn7y7hkqxfif4pvf3i5wsmhf"; depends=[scrapeR stringr fields XML GEOmap MBA]; };
+  rnoaa = derive { name="rnoaa"; version="0.2.0"; sha256="1v1yiwzsaqk95yxxla277bfdxs397p99y17yzh8z2m2xz54pn6sh"; depends=[httr lubridate plyr ggplot2 scales sp rgdal rgeos maptools stringr XML data_table assertthat jsonlite]; };
+  rNOMADS = derive { name="rNOMADS"; version="2.0.1"; sha256="1clycf5h7gf2dcs2x4k0nqn2qbhm94a38nwvk7v89zkwzbjiy083"; depends=[scrapeR stringr fields XML GEOmap MBA RCurl]; };
   ROAuth = derive { name="ROAuth"; version="0.9.3"; sha256="13h0q7dx4xx7fngi3zfm92ws5x4c6cfa2svq7smmci7c0z4kirb2"; depends=[RCurl digest]; };
   RobAStBase = derive { name="RobAStBase"; version="0.9"; sha256="1428xaplcjq6r0migbaqncfj0iz8hzzfabmabm167p44wa2bwbwh"; depends=[rrcov distr distrEx distrMod RandVar]; };
   robCompositions = derive { name="robCompositions"; version="1.8.0"; sha256="19j9x14kganramig349n5680r86f9dc83iz1h6n3626bp9da1j33"; depends=[robustbase rrcov car MASS pls]; };
@@ -4294,32 +4540,33 @@ let self = _self // overrides; _self = with self; {
   robfilter = derive { name="robfilter"; version="4.0"; sha256="1mj50531xjncg9lfidxzlyqrzwjm7pdsky88s3syspf70cjq6mg8"; depends=[robustbase MASS lattice]; };
   RobLox = derive { name="RobLox"; version="0.9"; sha256="1ws6bkzvg1y1cwmls71das0lih6gncx5w3ncd2siznapd4n44p69"; depends=[distrMod RobAStBase lattice RColorBrewer RandVar distr]; };
   RobLoxBioC = derive { name="RobLoxBioC"; version="0.9"; sha256="0ia7vn8x8whyp8kl7mpwd6fd0yv0y3pb1mppnh2329x7xdvcs5j4"; depends=[RobLox lattice RColorBrewer distr]; };
-  RobPer = derive { name="RobPer"; version="1.0"; sha256="00x64c6a3qdrcsh25xjnc1sfvlcd1glsb63gbhg06n6s46mpcnyy"; depends=[robustbase quantreg BB rgenoud]; };
+  RobPer = derive { name="RobPer"; version="1.1"; sha256="00299p918xkrh8ifgblj98gbkfj5c0qygjh842j715kbqfg7zbfz"; depends=[robustbase quantreg BB rgenoud]; };
   RobRex = derive { name="RobRex"; version="0.9"; sha256="0ii539mjq462n1lbnyv3whl8b1agvhvlz31wwyz911gb40isl639"; depends=[ROptRegTS]; };
   RobRSVD = derive { name="RobRSVD"; version="1.0"; sha256="07z5fw8j5lq7nyxgkvb9i4iwb5inddz2ib4m2bjx6q4c1ricpqz9"; depends=[]; };
-  RObsDat = derive { name="RObsDat"; version="13.09-1"; sha256="0iacmxrs2gbv96932ckpy5agzn0fdxw3wi0svm16q7nrsklj8r21"; depends=[xts zoo DBI vwr e1071]; };
+  RObsDat = derive { name="RObsDat"; version="14.04"; sha256="06454axywp5264cczhz8k31n7qmg95c2rnxv08frfgzwgm3cfzhr"; depends=[xts zoo DBI vwr e1071]; };
   robumeta = derive { name="robumeta"; version="1.1"; sha256="1b1pms0jmyfw1hmw2gllhxica4sds427y92by3w99kf3472im3d5"; depends=[]; };
-  robust = derive { name="robust"; version="0.4-15"; sha256="0v2vass0d10jbj2fkw9gdh3gcr746dfk3mhgyj0v9qlvy0p1h8ba"; depends=[fit_models MASS lattice robustbase rrcov robustbase]; };
+  robust = derive { name="robust"; version="0.4-16"; sha256="0psai9d6w7yi0wfm57cc7b2jd5i7wbk2xagrhnvhxknw0dwzf2jh"; depends=[fit_models MASS lattice robustbase rrcov]; };
   RobustAFT = derive { name="RobustAFT"; version="1.2"; sha256="156p5ic91f8qhc2g6zyrbipa58bvwq8xkpbbhnvx9kvrw8k62ibs"; depends=[robustbase survival]; };
   robustbase = derive { name="robustbase"; version="0.91-1"; sha256="1sf6dx2xjhp8ydxgv9hajjp064plr88ykg7fbglcqbl8apx9pr9h"; depends=[DEoptimR]; };
   robustfa = derive { name="robustfa"; version="1.0-5"; sha256="04nk5ipml54snsmiqf5sbhx490i46gnhs7yibf4wscrsj1bh2mqy"; depends=[rrcov]; };
   robustgam = derive { name="robustgam"; version="0.1.7"; sha256="0s1z7jylj757g91najbyi1aiqnssd207jfm9yhias746540qp3kw"; depends=[Rcpp RcppArmadillo mgcv robustbase]; };
   robustHD = derive { name="robustHD"; version="0.5.0"; sha256="14ql2k5880lbwkv1acydrli6jyh6dls32jjhimbz82zzkzfk2cxr"; depends=[ggplot2 perry robustbase MASS]; };
-  robustlmm = derive { name="robustlmm"; version="1.4-3"; sha256="09ylilxr7kc4j0j0vhzypbn9sxz2pv155kcrfa3dabd2s0i41iqn"; depends=[lme4 Matrix ggplot2 lattice nlme robustbase xtable]; };
+  robustlmm = derive { name="robustlmm"; version="1.6"; sha256="18lhbnmcd6nc0qr23a19mhw9k9r30li6z92g600dil6ll8s5m54z"; depends=[lme4 Matrix ggplot2 lattice nlme robustbase xtable]; };
   robustloggamma = derive { name="robustloggamma"; version="0.4-28"; sha256="0wwa7i2qw0fd5fiy45h7qiw7526zyyxx379ll4ha2n593dwhybx3"; depends=[robustbase]; };
   RobustRankAggreg = derive { name="RobustRankAggreg"; version="1.1"; sha256="1pslqyr1lji1zvcrwyax4zg2s81p1jnhfldz8mdfhsp5y7v8iar3"; depends=[]; };
   robustreg = derive { name="robustreg"; version="0.1-3"; sha256="0llnd6yzg0kg3049pcfwjzz4hnd40w06w59kvnh01q47p4c75bkj"; depends=[]; };
+  robustvarComp = derive { name="robustvarComp"; version="0.1-2"; sha256="187mcpih509hx15wjjr7z2h6h76mz2v0d8xgsxjd8wz7l3dnlp2f"; depends=[robustbase GSE numDeriv robust plyr]; };
   robustX = derive { name="robustX"; version="1.1-4"; sha256="1s2aav2jr22dgrl7xzk09yn9909k76kpiz271w5r1id6hpfprjwc"; depends=[robustbase]; };
   ROC632 = derive { name="ROC632"; version="0.6"; sha256="0vgv4rclvb79mfj1phs2hmxhwchpc5rj43hvsj6bp7wv8cahfg5g"; depends=[survival penalized survivalROC]; };
   rocc = derive { name="rocc"; version="1.2"; sha256="00yxbbphhwkg4sj2h7pd9vw86yavl711nk8yylwmjd3qv39qjml0"; depends=[ROCR]; };
   rockchalk = derive { name="rockchalk"; version="1.8.0"; sha256="17lmvdqk23jrhl8i3ygl7k49p7ckm3j5phvnxrivbnqysbz84pky"; depends=[MASS car]; };
   RockFab = derive { name="RockFab"; version="1.2"; sha256="1b5mhfll5vmqwl4pblmclyx9604vn07jyza02rm0jcsx915ms8sc"; depends=[rgl]; };
-  rococo = derive { name="rococo"; version="1.1.1"; sha256="1xmjfgkb2cg77zsi8lzrs67w1h2fsk0b2zhdb8cc31fh7rr1rrq0"; depends=[Rcpp]; };
-  rocplus = derive { name="rocplus"; version="1.0-0"; sha256="1abw9fly7kfraf2yw6nrlz92qljy2alzfcm876im4s9sm00h1vlj"; depends=[SuppDists]; };
+  rococo = derive { name="rococo"; version="1.1.2"; sha256="08204y3g3xd2srpcpnbkq1laqfr3wrhy73whlxf83gffw8j0iyv8"; depends=[Rcpp]; };
   ROCR = derive { name="ROCR"; version="1.0-5"; sha256="1zinan5hfvgg24imn0210m2lwqk5jxmmw8gz08l44j988lw8c2iw"; depends=[gplots]; };
   ROCt = derive { name="ROCt"; version="0.8"; sha256="1k0571gq7igg56qxwf9ibk28v763ji0w9183gs6qp95lpbyp5zwr"; depends=[date survival relsurv]; };
   ROCwoGS = derive { name="ROCwoGS"; version="1.0"; sha256="029nramxwhzqim315g1vkg1zsszzkic28w6ahwg9n7bk9d08adzk"; depends=[]; };
   RODBC = derive { name="RODBC"; version="1.3-10"; sha256="0zjvyg522xwd7957vg2gy6hb8bjagn5457250aqh8f1qnpp57c48"; depends=[]; };
+  RODBCext = derive { name="RODBCext"; version="0.2.3"; sha256="0j0774gpnd72mw3x9qv7shiwrk0s5rk8hf0wjq4iy42wwbvql7l6"; depends=[RODBC]; };
   RODM = derive { name="RODM"; version="1.1"; sha256="0cyi2y3lsw77gqxmawla5jlm4vnhsagh3ykdgb6izxslc4j2fszx"; depends=[RODBC]; };
   ROI = derive { name="ROI"; version="0.1-0"; sha256="01za8cxjf721m2lxnw352k8g32pglmllk50l7b8yhjwc49k8rl66"; depends=[registry slam]; };
   ROI_plugin_glpk = derive { name="ROI.plugin.glpk"; version="0.0-2"; sha256="10p3cq59app3xdv8dvqr24m937a36lzd274mdl2a9r4fwny2rssa"; depends=[ROI Rglpk]; };
@@ -4333,39 +4580,47 @@ let self = _self // overrides; _self = with self; {
   ROptRegTS = derive { name="ROptRegTS"; version="0.9.1"; sha256="1a8pbn63wh2w2n409yzbwvarvhphcn82rdqjh407ch3k3x6jz3r5"; depends=[ROptEstOld RandVar distr distrEx]; };
   ror = derive { name="ror"; version="1.2"; sha256="0n8mk35rm3rp0c7a3i961kij21a177znh9hkq4snqqlw9vf50hdg"; depends=[rJava ROI ROI_plugin_glpk igraph]; };
   ROracle = derive { name="ROracle"; version="1.1-11"; sha256="0q0sk5xl96s0d9c8jkd9rng0h03vyg98h7yq8x87r279pp1cp5y0"; depends=[DBI]; };
-  rorutadis = derive { name="rorutadis"; version="0.1.1"; sha256="1szv0v8dzyzhksc6ks01a5x2qg20vn180nywiih8whi4z2rq81by"; depends=[Rglpk ggplot2 gridExtra]; };
-  ROSE = derive { name="ROSE"; version="0.0-2"; sha256="0a7dx6hllrgynfvmp8jcvamr9q70dl0a79jgd4x42ga7alsi1i66"; depends=[]; };
+  rorutadis = derive { name="rorutadis"; version="0.1.3"; sha256="0ik0dpmsyb4g9wl1fb7mm0dry9s26nfvv1v91cslss82phhf16wd"; depends=[Rglpk ggplot2 gridExtra]; };
+  ROSE = derive { name="ROSE"; version="0.0-3"; sha256="12b9grh3rgaa07blbnxy8nvy5gvpd45m43bfqb3m4k3d0655jpk2"; depends=[]; };
   rotations = derive { name="rotations"; version="1.2"; sha256="13z5ysjqz3qkiw4nrp9dgy55kbmff5j7m3hfp2h0sj8x1saglf66"; depends=[ggplot2 Rcpp]; };
   Rothermel = derive { name="Rothermel"; version="1.1"; sha256="1bfmqw2f0dd4dlvd1v8wr2iq5cd0a48cyrakxl1hy5461gkxvxls"; depends=[GA ftsa]; };
-  RoughSets = derive { name="RoughSets"; version="1.0-0"; sha256="1mm1if706phyy48jl9q93ddp8x347i4pxgl2zshk6ijxjdlzryb5"; depends=[]; };
+  RoughSets = derive { name="RoughSets"; version="1.1-0"; sha256="0v6cb0xidx2rbkgb92fahrjyy974xiaizxqryzzj1z0nnqb5zadp"; depends=[]; };
+  rowr = derive { name="rowr"; version="1.0"; sha256="0ga955991ycs9sf5za1qrrf9yggnxy1yzh2mw900h124n23pj5rv"; depends=[]; };
   roxygen = derive { name="roxygen"; version="0.1-3"; sha256="0w2n4p4skwqr0yw49l06fxmncsplfj2q4gapdbc9wpm9w1g267fw"; depends=[digest gsubfn]; };
-  roxygen2 = derive { name="roxygen2"; version="4.0.0"; sha256="0y5jmryr7cvk0rafaqrmrxiid90nlm1na9qhm1c8b3g8d32557rb"; depends=[stringr brew digest Rcpp]; };
+  roxygen2 = derive { name="roxygen2"; version="4.0.1"; sha256="116zy31qbsqc0234g1f6n3w40awd4i8255ksyvisgk0nvmwjjs80"; depends=[stringr brew digest Rcpp]; };
   royston = derive { name="royston"; version="1.0"; sha256="1hhb1v1aqvvlzirxiyhv6zahz82w2pq4d6yp3rcakq0sw7dhawn6"; depends=[nortest moments]; };
   rpanel = derive { name="rpanel"; version="1.1-3"; sha256="1wm0dcbyvxz4ily8skz2yda44n74x2nmc4pg11ja0yvk038gjfns"; depends=[]; };
   rpart = derive { name="rpart"; version="4.1-8"; sha256="1vhmwvb7hsh75lvmsjmkab2zl136irca1dhr6p57s1yhmpw4cys0"; depends=[]; };
   rpartitions = derive { name="rpartitions"; version="0.1"; sha256="1gklsi4pqhk16xp9s49n1lr9ldm1vx61pvphjqsqkzrlxwcpx3j8"; depends=[hash]; };
   rpart_plot = derive { name="rpart.plot"; version="1.4-4"; sha256="0m7qngc9117yq69jj106svihy6s3f1byqg9qdls0bimj24insyxf"; depends=[rpart]; };
   rpartScore = derive { name="rpartScore"; version="1.0-1"; sha256="15zamlzbf6avir8zfw88531zg5c0a6sc5r9v5cy9h08ypf34xf4y"; depends=[rpart]; };
+  rpart_utils = derive { name="rpart.utils"; version="0.5"; sha256="00ahvmly6cdf7qhhcic0dbjlljqq8kbhx15rc7vrkd3hzd55c0im"; depends=[rpart]; };
   RPCLR = derive { name="RPCLR"; version="1.0"; sha256="03kpyszsjb656lfwx2yszv0a9ygxs1x1dla6mpkhcnqw00684fab"; depends=[MASS survival]; };
   Rpdb = derive { name="Rpdb"; version="2.2"; sha256="0gf6qab05a3ky8skbbjiadizi1gs4pcw3zp25qj5gn82lb6382pd"; depends=[rgl]; };
-  rpf = derive { name="rpf"; version="0.28"; sha256="1qwxhbpkzxn602bgcwgmlv3805dkgqw6c4ylvkqvifihpym2g863"; depends=[mvtnorm]; };
+  rpf = derive { name="rpf"; version="0.36"; sha256="13b6nakpbr8y4i52m8jmgavmqml99qyca8bs22s178jc72ndqyhq"; depends=[mvtnorm]; };
+  rpg = derive { name="rpg"; version="1.1"; sha256="17wfx0dfixdkw0lqh7xcq115ksj640av2jbqbpvd0l2xnpnk9sag"; depends=[Rcpp uuid RApiSerialize]; };
   rphast = derive { name="rphast"; version="1.5"; sha256="0r6bk0lbqpv60byhiv847ij5bxrflrs0nsla1zrn8ww7371czsgj"; depends=[]; };
   Rphylip = derive { name="Rphylip"; version="0.1-23"; sha256="0kpqmik4bhr74ib8yvaavr10z4v4w3li5vibdhz7lvz35jfirg9r"; depends=[ape]; };
   rPlant = derive { name="rPlant"; version="2.7"; sha256="0gqxb49d6qzkd533s9qp75byvz66v1csdlnmh3m2zg96aw32178r"; depends=[rjson RCurl seqinr knitcitations]; };
-  rplos = derive { name="rplos"; version="0.3.6"; sha256="1n9v106hlppizp0r8368vv5lvbbmva3wbn6y6wvv8rg67605a2yr"; depends=[ggplot2 RCurl RJSONIO XML plyr stringr googleVis httr lubridate reshape2]; };
-  rplotengine = derive { name="rplotengine"; version="1.0-3"; sha256="1a7s8yih9dywqn013bvayw1dvx6wdjj68fcy21xfscg799cpgshf"; depends=[xtable]; };
+  rplexos = derive { name="rplexos"; version="0.8"; sha256="0fgb878s68fmhdkgk8v9f3rrb1v1nd1w580vwa5bv0ix9kh7dfqq"; depends=[dplyr RSQLite RSQLite_extfuns Rcpp DBI lubridate plyr reshape2 assertthat]; };
+  rplos = derive { name="rplos"; version="0.4.1"; sha256="1v757v0b09mggdrgfzqmhvmf7yhqm3k42ml8sg8v4j74lscy653l"; depends=[ggplot2 RCurl RJSONIO XML plyr stringr googleVis httr lubridate reshape2 data_table whisker solr assertthat]; };
+  rplotengine = derive { name="rplotengine"; version="1.0-5"; sha256="1wwpfnr5vi8z26alm8y5gply0y4iniagimldzy2z696djzz8p8p8"; depends=[xtable]; };
   RPMG = derive { name="RPMG"; version="2.1-5"; sha256="1ck6bz72h1kwi7gg8vd0zw1q61pqv23rish84zri2p18z7nd9kvh"; depends=[]; };
   RPMM = derive { name="RPMM"; version="1.10"; sha256="0xhcf0a28zdxd6x495k9xddirkd37bzs8n99jbmsdxza19a7f0vz"; depends=[cluster]; };
   Rpoppler = derive { name="Rpoppler"; version="0.0-1"; sha256="01zsbm538yhwm1cyz5j6x2ngz05yqj16yxyvyxqhn6jp8d0885jh"; depends=[]; };
   rportfolios = derive { name="rportfolios"; version="1.0"; sha256="1zcv5ddmk15l0p03nlffimlhhpcc7l1c05xl2d1xlfk58rkvqns6"; depends=[]; };
   RPostgreSQL = derive { name="RPostgreSQL"; version="0.4"; sha256="0gpmbpiaiqvjzyl84l2l8v2jnz3h41v8jl99sp1qvvyrjrickra2"; depends=[DBI]; };
-  RPPanalyzer = derive { name="RPPanalyzer"; version="1.2.2"; sha256="072sag9szrx06g6b0q62am8gk0wx5w1pkfv7yy7pcdsnll4x91vp"; depends=[quantreg lattice gam gplots ggplot2 Hmisc]; };
+  RPPanalyzer = derive { name="RPPanalyzer"; version="1.3"; sha256="1jrij862nhwd1va54pis8shbcprjjzz22hlivzh3ifrkdf6rz4pg"; depends=[quantreg lattice gam gplots ggplot2 Hmisc]; };
+  rPref = derive { name="rPref"; version="0.1"; sha256="1mgal96qq907xj3nmzm00c9l1b1382i4p594c70wj690c4dknffp"; depends=[Rcpp dplyr igraph]; };
+  rprintf = derive { name="rprintf"; version="0.1-1"; sha256="0zdzxb3psdy51fy492rr4wnv1cw0qhyw1525aaz0lwbids1cxvwf"; depends=[stringr]; };
   RProtoBuf = derive { name="RProtoBuf"; version="0.4.1"; sha256="1992nz0dz4h802gakcri1c9dgacxc5nvg3h5lm2zv6yg748ha6nh"; depends=[Rcpp RCurl]; };
   rpsychi = derive { name="rpsychi"; version="0.8"; sha256="1h40kbqvvwwjkz5hrclj6j22zhav3yyfbbhqahs1whwjkksnam4w"; depends=[gtools]; };
   rpubchem = derive { name="rpubchem"; version="1.5.0.2"; sha256="0lvi7m8jb2izsfia3c0qigsd1k1x9r02gymlwfg29pb8k10lwcjf"; depends=[XML car RCurl RJSONIO]; };
+  RPublica = derive { name="RPublica"; version="0.1.1"; sha256="0m0wib0nijya228jmcl98l2hsx8l28dg6lvpwmx67jyhpvpplpkl"; depends=[XML RJSONIO RCurl]; };
   rpud = derive { name="rpud"; version="0.0.2"; sha256="03xddc6kh39wlcv8dvpnv4h0f5qx5cv327xip26zk7gg7pgrn05x"; depends=[]; };
-  rPython = derive { name="rPython"; version="0.0-4"; sha256="18pibmhjvc8aj6awmm1dz3mm2v82cwggrpjqwck9mj43w5fxd4hf"; depends=[RJSONIO]; };
-  RQDA = derive { name="RQDA"; version="0.2-5"; sha256="0zcc4l5rl0n7f14yaszadm38shg7lbh5xzvrzfkmmymwbzgjq46h"; depends=[RSQLite gWidgetsRGtk2 RGtk2 DBI igraph gWidgets]; };
+  RPushbullet = derive { name="RPushbullet"; version="0.0.2"; sha256="1234p26zrlvsniwaibj4795ds7j30aqkljlq9l06ivnz00rm8a5s"; depends=[RJSONIO]; };
+  rPython = derive { name="rPython"; version="0.0-5"; sha256="0d608v1x8walwnx7aa3m0n7999jlbiymhl7605z4n7ps6l1140mv"; depends=[RJSONIO]; };
+  RQDA = derive { name="RQDA"; version="0.2-6"; sha256="0d3jqr8bhphyi1ch9x5y0s14z86n9zspn748m9xxa15nhnyfmx3l"; depends=[RSQLite gWidgetsRGtk2 RGtk2 DBI igraph gWidgets]; };
   Rquake = derive { name="Rquake"; version="2.2"; sha256="0gkarqqhmiakc968ffwywkwy7npm1ly5gd6bbhr8fjfwdnhjam5n"; depends=[RPMG RSEIS GEOmap MBA minpack_lm rgl]; };
   RQuantLib = derive { name="RQuantLib"; version="0.3.12"; sha256="1ih7lkpa3p0ipgc8hs9miv500rk285ddc7pmn2qv03ibpsdlvjmq"; depends=[Rcpp]; };
   Rramas = derive { name="Rramas"; version="0.1-4"; sha256="191rm2ylvf3ffc9i4wpjvfbsinmw7s1m0wcq24j4qs4fxg8qqzyq"; depends=[diagram]; };
@@ -4376,42 +4631,46 @@ let self = _self // overrides; _self = with self; {
   rrcovNA = derive { name="rrcovNA"; version="0.4-4"; sha256="0zrzgnl83wfsaz0rma07hgb5jlmhvqwv06q7zkm65xd6mfsalqv0"; depends=[rrcov robustbase norm]; };
   rrdf = derive { name="rrdf"; version="2.0.2"; sha256="1m1dfxi720c0xyj1x41zc4vc3dhxs9flysm4xri8b7cibx44piyk"; depends=[rJava rrdflibs]; };
   rrdflibs = derive { name="rrdflibs"; version="1.3.0"; sha256="1qhi0diwvlw5icbym0nlg2yy8gibajycw55szsiipdxkjxj5r85l"; depends=[rJava]; };
+  Rrdrand = derive { name="Rrdrand"; version="0.1-9"; sha256="11j3zi27469nckh1irrhkm3386yagfqny7s6rh5gb7y0988194yy"; depends=[]; };
   rredis = derive { name="rredis"; version="1.6.8"; sha256="01kksak1hdlcc2q32rzs8i45flxb7shzyq785yr0kanr54pd874z"; depends=[]; };
   RRF = derive { name="RRF"; version="1.6"; sha256="1gp224mracrz53vnxwfvd7bln18v8x7w130wslhfgcdl0n4f2d28"; depends=[]; };
   rriskDistributions = derive { name="rriskDistributions"; version="2.0"; sha256="0278426m4v7b8qb9ydzxqncayq8z25b36n4livqg40zpazp3hy85"; depends=[mc2d eha msm tkrplot]; };
   rrlda = derive { name="rrlda"; version="1.1"; sha256="06n9jah190cz25n93jlb5zb0xrx91bjvxgswwdx9hdf0fmwrpkvz"; depends=[pcaPP mvoutlier glasso matrixcalc]; };
-  R_rsp = derive { name="R.rsp"; version="0.15.0"; sha256="163i2vl6ds4bqwk41xa44p72198j3b5rdwv4qy3yzm071lxdngaf"; depends=[R_oo R_methodsS3 R_utils R_cache]; };
+  R_rsp = derive { name="R.rsp"; version="0.19.0"; sha256="0qh9nd6zpiw4c86qlwys8g7rqvay20m1yfp2zrvah5bz51hixbd1"; depends=[R_methodsS3 R_oo R_utils R_cache]; };
   rrules = derive { name="rrules"; version="0.1-0"; sha256="0f9msp289akzricjrm8dvfbh2dihfbszr7ms4fld1cr30zssajin"; depends=[]; };
-  RSA = derive { name="RSA"; version="0.9"; sha256="167pdll03kbiwc632r83mqc0r50rkmzjfjxawm654zxslfxssbq9"; depends=[lavaan ggplot2 lattice gridExtra plyr RColorBrewer]; };
+  RSA = derive { name="RSA"; version="0.9.3"; sha256="132fqsr6zzv0q5maxgdh8amg6g0if3wdbhml0p0r668yy1wiq5l8"; depends=[lavaan ggplot2 lattice gridExtra plyr RColorBrewer]; };
   RSADBE = derive { name="RSADBE"; version="1.0"; sha256="1nzpm88rrzavk0n8iflsx8r3s1xcry15n80zqdw6jijjycz10w1q"; depends=[]; };
   rsae = derive { name="rsae"; version="0.1-5"; sha256="1f3ry3jwa6vg2vq2npx2pzzvfwadz8m48hjrqjk860nfjrymwgx5"; depends=[]; };
   RSAGA = derive { name="RSAGA"; version="0.93-6"; sha256="0wqiww0rx5fz4rbsb1x6pr2q0wz5dacj5fc0asj70igxwmh5x0p8"; depends=[gstat shapefiles plyr]; };
   RSAP = derive { name="RSAP"; version="0.9"; sha256="1sxirfabhpmfm0yiiazc9h1db70hqwva2is1dql6sjfanpl8qanl"; depends=[yaml reshape]; };
-  rSCA = derive { name="rSCA"; version="2.0"; sha256="0xcs1w4a8s83mvjp6hp474fmj9wr5mypa244a1lplx8jjwd0mf5b"; depends=[]; };
+  rSCA = derive { name="rSCA"; version="2.1"; sha256="1lpix8xsjzyhgksmigvqxpv2bvaka0b1q2kcvdyfrfcw713n19rw"; depends=[]; };
   RSclient = derive { name="RSclient"; version="0.7-2"; sha256="04ml4pynjl97295wrclvb61mpwacrkzc9x5pbwyfg1qr3l8hss93"; depends=[]; };
   rscproxy = derive { name="rscproxy"; version="2.0-5"; sha256="1bjdv7drlnffcnyc0j8r22j7v60k1xj58bw8nk9l8wvnmngrjz86"; depends=[]; };
   RSDA = derive { name="RSDA"; version="1.2"; sha256="06sa3x0abm2gnf4i4y3d5mlqj1wl7mzzal27sa1x65awzi6rs2kz"; depends=[sqldf XML scales FactoMineR ggplot2 glmnet abind scatterplot3d]; };
+  rsdepth = derive { name="rsdepth"; version="0.1-5"; sha256="064jbb6gnx0sm41w3sbi6mvsbzsfkjqfici6frk8sfm9ybvm591j"; depends=[]; };
   RSeed = derive { name="RSeed"; version="0.1.31"; sha256="0wljchzkp8800v9zcgjapkbildkb3p2xnkh1m6m7q6qqc9aw8mws"; depends=[sybil]; };
   rseedcalc = derive { name="rseedcalc"; version="1.2"; sha256="1di9bzwxyxm9gs14ks9z6sixi656hz9xwmq3aaqh53cjjr1ka0rc"; depends=[]; };
   RSEIS = derive { name="RSEIS"; version="3.3-3"; sha256="13fb4mx3sgnbrcn1kkxy0a490kikjrq49ii3x14xw2s8ci030wlr"; depends=[RPMG Rwave]; };
-  RSelenium = derive { name="RSelenium"; version="1.2.2"; sha256="14fhj04122x3bj7fbaa0m8mcy37hrlpjsw8pypf6s3b7fqjnn5bq"; depends=[RCurl RJSONIO caTools XML]; };
+  RSelenium = derive { name="RSelenium"; version="1.3.1"; sha256="0cp48ga35v82y34r362ghkargkhr0nqfn0p15yifmfmd65l9j5q5"; depends=[RCurl RJSONIO caTools XML]; };
   rsem = derive { name="rsem"; version="0.4.5"; sha256="02vccj03bxisi2jwl31rwi4gw9i26g70aagdgg5gk8z0bys78v4d"; depends=[MASS lavaan]; };
   Rserve = derive { name="Rserve"; version="1.7-3"; sha256="09rha4p86vak7ss721mwp5bm5ig09xam8zlqv63n9wf36v3kdmpn"; depends=[]; };
   rSFA = derive { name="rSFA"; version="1.03"; sha256="0bgapvlx5n0984ryyh1is0w88lhxj49gcar8gkwiw455jbzx7isp"; depends=[MASS]; };
   rsgcc = derive { name="rsgcc"; version="1.0.6"; sha256="12f8xsg6abmhdgkrrc8sfzmv4i1pycq1g0jfad664d17yciw7rhh"; depends=[biwt cairoDevice fBasics gplots gWidgets gWidgetsRGtk2 minerva parmigene stringr snowfall]; };
-  RSGHB = derive { name="RSGHB"; version="1.0.1"; sha256="1af32jsbiidjmnih7x7lgcr3kpnl6nipv5rgav7sk7k0x84d1dnl"; depends=[]; };
+  RSGHB = derive { name="RSGHB"; version="1.0.2"; sha256="0ffdx9lscbgknfqhvjdh3rwnlhiqxbpqa55jkn111a1vfv726v3d"; depends=[]; };
   RSiena = derive { name="RSiena"; version="1.1-232"; sha256="0qp3bqq5p19bg47m37s2dw8m4q91hnkc2zxwhsgb076q0xvvv9xq"; depends=[Matrix]; };
   rsig = derive { name="rsig"; version="1.0"; sha256="129k78i8kc30bzlphdb68vv3sw2k6xyiwrhw08vhzz6mf3jxlqsh"; depends=[survival BBmisc glmnet superpc Matrix]; };
+  RsimMosaic = derive { name="RsimMosaic"; version="1.0.1"; sha256="10xlmzsrc4m6lsinrvl4kw0zdrqmidqi2a9s87sx1rfilvzv0ri4"; depends=[jpeg fields RANN]; };
   RSiteCatalyst = derive { name="RSiteCatalyst"; version="1.3.3"; sha256="0z6yg403qg2b18261s3v406ji18wpsjmd7i8v7ilr94pwgx0xhcl"; depends=[digest httr rjson plyr stringr base64enc]; };
-  RSKC = derive { name="RSKC"; version="2.4"; sha256="0g05kkw07skbbvah7z9a49z0dv5jkwa2l5srcy1jvsxczkmkq91v"; depends=[flexclust]; };
+  RSKC = derive { name="RSKC"; version="2.4.1"; sha256="1dvzxf001a9dg71l4bh8z3aia7mymqy800268qf7qzy9n6552g59"; depends=[flexclust]; };
   rsm = derive { name="rsm"; version="2.06"; sha256="0pjkqdhzmnzfc400z5xpdb17v6qckpnx2qpia2hm51m7xjfhks5b"; depends=[]; };
-  RSNNS = derive { name="RSNNS"; version="0.4-4"; sha256="0xqgmzbs82a413qqpcmyk1jgrdi5zaj4mywajwfwj1nv06j3dn5w"; depends=[Rcpp]; };
+  RSNNS = derive { name="RSNNS"; version="0.4-5"; sha256="1wk91vjgf7q65n9q8hciv08bgzawpljnhaqgy9qdwpr82v8959i7"; depends=[Rcpp]; };
   rsnps = derive { name="rsnps"; version="0.1.0"; sha256="1wpbr2sjcw6hh9sq8h2jzgvc4xlygf0kcd91sqg89nmprfw73j6c"; depends=[plyr stringr httr RCurl XML]; };
-  RSocrata = derive { name="RSocrata"; version="1.4"; sha256="0yv0fhrxqjgkh8nsdhp42j2g17iig8labv5x2c68nhn95x25n3bj"; depends=[httr RJSONIO]; };
+  RSNPset = derive { name="RSNPset"; version="0.2"; sha256="0ivym4ysadvlfr9k4ikpw2diil9xd3hqx6xj8jcz482d3h8qcgq6"; depends=[fastmatch foreach doRNG Rcpp]; };
+  RSocrata = derive { name="RSocrata"; version="1.5"; sha256="0hbazn4c3bmx9kc030l19ciz9m0r5p6760ggyxl8f7sh8g3bqw32"; depends=[httr jsonlite]; };
   RSofia = derive { name="RSofia"; version="1.1"; sha256="0q931y9rcf6slb0s2lsxhgqrzy4yqwh8hb1124nxg0bjbxvjbihn"; depends=[Rcpp]; };
   Rsolnp = derive { name="Rsolnp"; version="1.14"; sha256="0i5d8133vg0939j5772nbw1wd4cyp6q4684iqnl12qkk30hnh94s"; depends=[truncnorm]; };
   Rsomoclu = derive { name="Rsomoclu"; version="1.3.1"; sha256="106cbp8vm5sx8h6k0ddlp51r65jl0d6c0bz29vp8z4adx8ikacsm"; depends=[Rcpp]; };
-  rspa = derive { name="rspa"; version="0.1-4"; sha256="1zvi39plbh4ya7523ckm9751mfirav6wa0zn5jd8c60g3rlcdkg5"; depends=[editrules]; };
+  rspa = derive { name="rspa"; version="0.1-5"; sha256="18p2q2q372vbf90dfilcah07w1ivb34mv7rm5882z2s1jlixa5dk"; depends=[editrules]; };
   rspear = derive { name="rspear"; version="0.1-2"; sha256="1rjg84plnvlcp3p2929f1afl43lb92d3bfsvlhsaw92z7iva1vad"; depends=[plyr]; };
   RSpincalc = derive { name="RSpincalc"; version="1.0.1"; sha256="0n751l329j9pgpdnqrdnf93i9l1qxfp2bl4v4ray3nrnjx8g5mc9"; depends=[]; };
   rsprng = derive { name="rsprng"; version="1.0"; sha256="1sfjwfm03pn73mcq4f2chsldjlhmpjxhqkpmaqf71jbmb7ph41ip"; depends=[]; };
@@ -4422,6 +4681,7 @@ let self = _self // overrides; _self = with self; {
   RStorm = derive { name="RStorm"; version="0.902"; sha256="1apk358jwzg5hkrcq8h39rax1prgz9bhkz9z51glmci88qrw1frv"; depends=[plyr]; };
   rstream = derive { name="rstream"; version="1.3.2"; sha256="1habswhdlx7l92s9p9554px4kf9f9mhk5vkdq2fv4wk3381c0fgi"; depends=[]; };
   rstudioapi = derive { name="rstudioapi"; version="0.1"; sha256="027482pbdxnfhcpdw2ns2qhpa18zri71nz8fk0svq6900m2237h8"; depends=[]; };
+  rsubgroup = derive { name="rsubgroup"; version="0.5"; sha256="1hrsp920gv0fr7s3w07vxish6wk3wnhd1rj04zvndd563fxvnl0l"; depends=[rJava foreign]; };
   Rsundials = derive { name="Rsundials"; version="1.6"; sha256="0vrvxsznbclgls4jljc59lyli6cw9k1a3wapfrs6xbkqi8865iif"; depends=[]; };
   RSurvey = derive { name="RSurvey"; version="0.8-0"; sha256="1kc07hvvpyk83ci0x6g0lmnxksd91y2ilfalbhlbp69jid111k1v"; depends=[sp rgeos MBA]; };
   RSvgDevice = derive { name="RSvgDevice"; version="0.6.4.4"; sha256="0vplac5jzg6bmvbpmj4nhiiimsr9jlbk8mzyifnnndk9iyf2lcmz"; depends=[]; };
@@ -4430,6 +4690,7 @@ let self = _self // overrides; _self = with self; {
   rSymPy = derive { name="rSymPy"; version="0.2-1.1"; sha256="1mrfpyalrq8b6yicy28jsj0xy7hlawa72imsfhabwd3hrx6ld150"; depends=[rJython]; };
   rtape = derive { name="rtape"; version="2.2"; sha256="0q7rs7pc1k1kayr734lvh367j5qig2nnq5mgak1wbpimhl7z3wm7"; depends=[]; };
   RTConnect = derive { name="RTConnect"; version="0.1.4"; sha256="1000jmmqzyhl6vh1ii75jdh88s9inaz52gvfwcin2k2zr7bi91ba"; depends=[]; };
+  RTDE = derive { name="RTDE"; version="0.1-0"; sha256="00hh1axipp2blrhjwl9mc4fkqv3l132gxlhi9hdy52w20yhwigin"; depends=[]; };
   rtematres = derive { name="rtematres"; version="0.2"; sha256="1d0vrprvnlk4hl2dbc6px9xn9kx9d1qvlqxd798hzda6qg5wwvf2"; depends=[XML RCurl plyr gdata]; };
   rTensor = derive { name="rTensor"; version="1.1"; sha256="0350cpafvdrjz5ibgk6bfw8j0kc3vr8vw84hw8jlbi96ia7p6w00"; depends=[]; };
   RTextTools = derive { name="RTextTools"; version="1.4.2"; sha256="1j3zfywq8xgax51mbizxz704i3ys4vzp8hyi5kkjzq6g2lw7ywq2"; depends=[SparseM randomForest tree nnet tm e1071 ipred caTools maxent glmnet tau]; };
@@ -4437,63 +4698,70 @@ let self = _self // overrides; _self = with self; {
   rtf = derive { name="rtf"; version="0.4-11"; sha256="04z0s5l9qjlbqahmqdaqv7mkqavsz4yz25swahh99xfwp9plknfl"; depends=[R_oo R_methodsS3]; };
   rtfbs = derive { name="rtfbs"; version="0.3.2"; sha256="1v26znlispc8304xid0dsflphiwzil6nrxlsgj8dkp4prh6hdb34"; depends=[rphast]; };
   rtiff = derive { name="rtiff"; version="1.4.4"; sha256="13cz35dfz735yk2lci8cmjmsg4ddm31lv98lpx8ymy3bwmzdmc3c"; depends=[pixmap]; };
-  RTisean = derive { name="RTisean"; version="3.0.14"; sha256="03c000anvdmj0bc0b1l4213ikvk9qwxw8aiwfflscigwbc77wa4r"; depends=[]; };
   RTOMO = derive { name="RTOMO"; version="1.1-2"; sha256="15swp7jx5xmj87hjcfdar3r5sqnnb795qclf8b7l4bvx80h9nh2i"; depends=[RPMG GEOmap RSEIS splancs]; };
   rtop = derive { name="rtop"; version="0.3-45"; sha256="0dh7jlnakk1hd27swspa0fj6pq6yddxhz32w3d7xq8jgr7xm8d70"; depends=[sp gstat]; };
+  RTriangle = derive { name="RTriangle"; version="1.6-0.6"; sha256="1g4dp792awbvsl35nvyd8gkx99p2njdcafin16qysfrjl43f5i4s"; depends=[]; };
   rts = derive { name="rts"; version="1.0-3"; sha256="0jqk0p2q1vx9l6zf9pbc5k3lsw4hg5x1r6p0f7wjiks50x55pbl4"; depends=[raster xts zoo]; };
-  Rttf2pt1 = derive { name="Rttf2pt1"; version="1.3"; sha256="0a5q5qx3cfwhic92qm64n0qggqpjgkxjhr9alhm205av1b5fldv2"; depends=[]; };
+  Rtsne = derive { name="Rtsne"; version="0.8"; sha256="153f02f6iizd9986d6hxvpdddrwhnjy9a9yyrch2zcmcbh63hfba"; depends=[Rcpp]; };
+  Rttf2pt1 = derive { name="Rttf2pt1"; version="1.3.1"; sha256="0hz7fgj2p410m19r88qqdm9cc5m729sgacinazfsi93qz9rp1r51"; depends=[]; };
+  rtype = derive { name="rtype"; version="0.1"; sha256="14x86lhy5fmh2k1463p4v0lhsy51q0fkyg0jgnh7g65sry41bd68"; depends=[]; };
   Ruchardet = derive { name="Ruchardet"; version="0.0-3"; sha256="0dgldi6fgp949c3455m9b4q6crqv530jph210xzph41vgw8a2q2v"; depends=[Rcpp]; };
-  rugarch = derive { name="rugarch"; version="1.3-1"; sha256="1rwigrmqkxikr1hwal2adqybhim8q2a30sci8fdabsyjc06giky1"; depends=[Rsolnp nloptr ks numDeriv spd xts zoo chron SkewHyperbolic expm Rcpp]; };
+  rugarch = derive { name="rugarch"; version="1.3-3"; sha256="16vjk4vmsp35dgyb17c43q29z2laq320x6g73p5jc7l6xdjd3v5b"; depends=[Rsolnp nloptr ks numDeriv spd xts zoo chron SkewHyperbolic expm Rcpp]; };
   RUnit = derive { name="RUnit"; version="0.4.26"; sha256="0glz0ag2za5g4k8fjnsr97504bfk9d6khly1rqrrngg4qxz5wlf0"; depends=[]; };
   Runiversal = derive { name="Runiversal"; version="1.0.2"; sha256="0667mspsjydmxi848c6wsf14gz72bmdj9b3lilma92b7fhqnv7ai"; depends=[]; };
-  runjags = derive { name="runjags"; version="1.2.0-7"; sha256="0b3awpbbjlf5lsp53sikl0az5ap35lzhzsjiwdapa3l6pgbvyhx4"; depends=[lattice coda]; };
+  runjags = derive { name="runjags"; version="1.2.1-0"; sha256="0rsqyrk9vzrnhw66c7hdqnbnvk6qsl882fshh2njzivaqxk2ibqq"; depends=[lattice coda]; };
   Runuran = derive { name="Runuran"; version="0.20.0"; sha256="1syzrmkw96gsw7vf10f1515zdqm9hdmq1v6yf1nbmipil1nkgsqs"; depends=[]; };
   RunuranGUI = derive { name="RunuranGUI"; version="0.1"; sha256="0wm91mzgd01qjinj94fr53m0gkxjvx7yjhmwbkrxsjn6mjklq72l"; depends=[Runuran rvgtest gWidgets gWidgetsRGtk2 cairoDevice]; };
-  R_utils = derive { name="R.utils"; version="1.29.8"; sha256="1rg9mgh0h566jar5542v5a5xb1frs167lphycvfka8gz0cj2ffv9"; depends=[R_oo R_methodsS3]; };
+  R_utils = derive { name="R.utils"; version="1.32.4"; sha256="12ypy8sxk5w1a3mpg4hi6k5db7ydrlj7qmp2lzh1rzcpbdg3wgka"; depends=[R_oo R_methodsS3]; };
   rv = derive { name="rv"; version="2.3.1"; sha256="0bjqwk7djl625fws3jlzr1naanwmrfb37hzkyy5szai52nqr2xij"; depends=[]; };
-  RVAideMemoire = derive { name="RVAideMemoire"; version="0.9-35"; sha256="005vfax1yhnrq6fy0yjxjl0ya31s7mwfany7pajy6ws61sjh9kc9"; depends=[ade4 boot car lme4 lsmeans MASS mixOmics multcomp statmod]; };
-  Rvcg = derive { name="Rvcg"; version="0.7.1"; sha256="0iw3vzibv7pdx6bzkb6kwqvs6lmp96fiyqb8lsh0dv94swagi9ax"; depends=[Rcpp]; };
+  RVAideMemoire = derive { name="RVAideMemoire"; version="0.9-38"; sha256=""; depends=[ade4 boot car lme4 lsmeans MASS mixOmics multcomp statmod]; };
+  rvalues = derive { name="rvalues"; version="0.2"; sha256="1zc4irq0s9mm7yz8pc3n9il0z508wwf2a2j741wyyw90f35fasi0"; depends=[]; };
+  Rvcg = derive { name="Rvcg"; version="0.8"; sha256="086r4vvqidwzikdmvij52nqgb1ka5z5f0k9c9qi6izn450lpf34y"; depends=[Rcpp]; };
   rvertnet = derive { name="rvertnet"; version="0.0-5"; sha256="1rj6csx2qb094wgkablrpzlbqb0hpzg5d29xrar2cy39gjmz40cj"; depends=[RCurl plyr RJSONIO httr ggplot2 maps]; };
   rvgtest = derive { name="rvgtest"; version="0.7.4"; sha256="1lhha5nh8fk42pckg4ziha8sa6g20m0l4p078pjj51kz0k8929ng"; depends=[]; };
-  rvHPDT = derive { name="rvHPDT"; version="2.0"; sha256="1swwciphxgyil10dncx0fx32w6gs4dnnwb4qsqk0fr044prd9v6g"; depends=[gregmisc]; };
+  rvHPDT = derive { name="rvHPDT"; version="3.0"; sha256="05nrfnyvb8ar7k2bmn227rn20w1yzkp1smwi4sysc00hyjrlyg8s"; depends=[gtools]; };
   RVideoPoker = derive { name="RVideoPoker"; version="0.3"; sha256="06s4dlw0pw8rcq5b31xxqdpdk396rf27mai2vpvmn585vbm1ib7a"; depends=[pixmap tkrplot rpanel]; };
   Rvmmin = derive { name="Rvmmin"; version="2013-11.11"; sha256="14gsdvw7qxcffwkh0ayj0vlm0cqyavqgl4rqn5ybjr0pkbsmz955"; depends=[optextras]; };
   RVowpalWabbit = derive { name="RVowpalWabbit"; version="0.0.6"; sha256="06f2lmls92qkbscss00c99xkzpx83mgjah6ds0sixv1b2qi216ap"; depends=[Rcpp]; };
   RVsharing = derive { name="RVsharing"; version="1.1.0"; sha256="0gcas4rb8pms470dhbm2c2x87an0j594xsziglgd84nqn4gq095d"; depends=[kinship2]; };
   rvTDT = derive { name="rvTDT"; version="1.0"; sha256="09c2fbqnlwkhaxfmgpsdprl0bb447ajk9xl7qdlda201fvxkdc8v"; depends=[CompQuadForm]; };
   RVtests = derive { name="RVtests"; version="1.2"; sha256="0k7w6ml981zvr5bix197qw4kaf7rz5jqnwqlxf7aryxbm39gk16c"; depends=[glmnet spls pls]; };
-  Rwave = derive { name="Rwave"; version="2.1"; sha256="0fiw3i8qwfhingxmdflfdld7zp61p7zxpj00zl5v7qf21kcmvkbx"; depends=[]; };
+  Rwave = derive { name="Rwave"; version="2.2"; sha256="1aqscnq7cr53nnddbjdqfjyrj8l76h9wcqr43i7fpa7g6hamvbwd"; depends=[]; };
   rWBclimate = derive { name="rWBclimate"; version="0.1.3"; sha256="0vs56hx7a85pw4jx8nb8bdlr9dbkl4zdhzhqsm0505xc3qz18vxh"; depends=[ggplot2 httr plyr rgdal jsonlite reshape2 sp]; };
+  RWBP = derive { name="RWBP"; version="1.0"; sha256="104vr2cdk185hh4zn3vmqvb14p1q8ifk11wdgvk7fli1m1zxxwdd"; depends=[RANN igraph lsa SnowballC]; };
   RWeather = derive { name="RWeather"; version="0.4"; sha256="1vm8w07gsxwxvg1gpdzn6mpnh8g9kp0ln9fxjw5rl2f1zz80bxpy"; depends=[XML]; };
-  RWebLogo = derive { name="RWebLogo"; version="1.0.1"; sha256="1qqvndvgb46hx02ixlh8zkwknkbxky598yalpsm47rrpzqwpkzdl"; depends=[raster jpeg findpython]; };
+  RWebLogo = derive { name="RWebLogo"; version="1.0.3"; sha256="1n65mlnr163ywjnyyngnigbj0wpgkr38c3nx8hw5r8mwjnf3d617"; depends=[findpython]; };
   RWeka = derive { name="RWeka"; version="0.4-23"; sha256="1p1kz6if5yhmjvjzvr0ig5i0l6g7bzp6z8q4jssrp2g07g576084"; depends=[RWekajars rJava]; };
-  RWekajars = derive { name="RWekajars"; version="3.7.11-1"; sha256="1p0i1lxkcvxvpwkrzl4dqdxr3mcc9a6qs76b7lbmpxh7gfiwq82c"; depends=[rJava]; };
+  RWekajars = derive { name="RWekajars"; version="3.7.11-1"; sha256="1w8y8xxsmm9b7hnnwknsbivkgbarnfqmv9666b7c5db9yra1hf7f"; depends=[rJava]; };
   RWiener = derive { name="RWiener"; version="1.2-0"; sha256="1ssh4xcyr4whgyd91p6bjsm9mq1ajqjqva0yyk13dnf5jfpsr0gs"; depends=[]; };
   Rwinsteps = derive { name="Rwinsteps"; version="1.0-1"; sha256="0kzngkan9vydibnr3xm4pyz4v6kz0r4h19f0ngqpri07fkhdsxzd"; depends=[]; };
   rwm = derive { name="rwm"; version="1.53"; sha256="0x19502xzc3x90iwvhvj24w36qab79v4y7mb37ax8a0n3pw6rah8"; depends=[]; };
   rworldmap = derive { name="rworldmap"; version="1.3-1"; sha256="0wrg6ap39bq88sv5axxd90yyqafn77amk5429pxd9v5a2hdm3g8w"; depends=[sp maptools fields]; };
   rworldxtra = derive { name="rworldxtra"; version="1.01"; sha256="183z01h316wf1r4vjvjhbj7cg4xarn4b8qbmnn5y7nrrdndzi163"; depends=[sp]; };
-  rwt = derive { name="rwt"; version="0.9.4"; sha256="0r80whjmq1d6248mzj16g0xn0k1c3kd6q4lhgjnqr81brbdmd3vg"; depends=[matlab]; };
+  rwt = derive { name="rwt"; version="1.0.0"; sha256="112wp682z4gkxsd3bqnlkdrh42bfzwnnhzyangxi2dh0qw63bgcr"; depends=[matlab]; };
   RxCEcolInf = derive { name="RxCEcolInf"; version="0.1-3"; sha256="04d6ffl4qs2vjbk0ibvyq17i2l26qnvxr72s6p3f8q4px33rh4kh"; depends=[MASS MCMCpack mvtnorm lattice]; };
   RXKCD = derive { name="RXKCD"; version="1.7-5"; sha256="0dsds1bv2vfq61gfppar2ai23dryh09ric5i6zaccms6q64z23md"; depends=[RJSONIO png jpeg plyr]; };
-  RXMCDA = derive { name="RXMCDA"; version="1.5.0"; sha256="1kp2hpkr88g3cdpbdyam9lgas1irda7s6dhkp0dhz5mrzdlvw2jd"; depends=[XML kappalab]; };
+  RXMCDA = derive { name="RXMCDA"; version="1.5.3"; sha256="1pc52kvihxzq12p95r4srmnawxcsvd4r7252dajby338p56d1lw8"; depends=[XML kappalab]; };
   RXshrink = derive { name="RXshrink"; version="1.0-8"; sha256="0l4aknr1vxrkxqsgkjcffs0731jskyzvl055a01vd8h4a0826n5s"; depends=[lars]; };
   Ryacas = derive { name="Ryacas"; version="0.2-11"; sha256="116ncg48ih1v3ra095k63ccqchfbvzixh3cfjb2bbc47a9zh8phc"; depends=[XML]; };
   RYoudaoTranslate = derive { name="RYoudaoTranslate"; version="1.0"; sha256="1i3iyqh97vpn02bm66kkmw52ni29js30v18n2aw8pvr88jpdgxm4"; depends=[RCurl rjson]; };
   ryouready = derive { name="ryouready"; version="0.3"; sha256="0nms3zfkis2fsxkyj3dr95vz3kk6pkm7l5ga7iz8pxy1ywrawj2i"; depends=[stringr car]; };
-  rysgran = derive { name="rysgran"; version="2.0"; sha256="11vh1sq267dva4gfg00xb3czcj2xymkg665pj895i7cn8hmy3q74"; depends=[soiltexture lattice]; };
+  rYoutheria = derive { name="rYoutheria"; version="1.0.0"; sha256="1yj66ars5a8mbv2axl6l5g7wflwz3j4mhwk3iz5w33rfhixixm9l"; depends=[plyr RJSONIO reshape2 RCurl]; };
+  rysgran = derive { name="rysgran"; version="2.1.0"; sha256="1l2mx297iyipap8cw2wcw5gm7jq4076bf4gvgvij4q35vp62m85z"; depends=[soiltexture lattice]; };
   Rz = derive { name="Rz"; version="0.9-1"; sha256="1cpsmfxijrfx06ydpjzbaak7gkad4jjk1ph9453l9zly1cwzgspj"; depends=[foreign memisc psych ggplot2 RGtk2 formatR]; };
   rzmq = derive { name="rzmq"; version="0.6.8"; sha256="0likcj1xivr0y42krnm5zynkr6slfc3yqq2nd90x79ldvbfdqxc6"; depends=[]; };
   s20x = derive { name="s20x"; version="3.1-10"; sha256="0hxi8d1pl0jgg66jxzz0z973sg3f4s1jf75smmizy99kd76rdnh0"; depends=[]; };
+  s2dverification = derive { name="s2dverification"; version="2.1.1"; sha256="1m3m5sbq96fhnl4slxgb2j0009kqfdivdn3nbb203pc0knjpflnq"; depends=[GEOmap geomapdata maps mapproj]; };
   s4vd = derive { name="s4vd"; version="1.0"; sha256="07pnkhyqf9iymj913813d93dmb3iqbdlcl0gsgacihyyinb4id5s"; depends=[biclust]; };
   sac = derive { name="sac"; version="1.0.1"; sha256="1rl5ayhg5y84fw9w3zf43dijjlw9x0g0w2z4haw5xmxfni72ms8w"; depends=[]; };
+  sads = derive { name="sads"; version="0.1.10"; sha256="02662vbbk3jikp506ljil9zqchs6bq3lsw4fwbbi2wgg7xvb260g"; depends=[MASS bbmle poilog VGAM untb]; };
   sae = derive { name="sae"; version="1.0-2"; sha256="0a9g07m1a8v4iw9pnzlws356kv4f77qkz5yc454i7130zfp2kxxi"; depends=[nlme MASS]; };
   saemix = derive { name="saemix"; version="1.2"; sha256="1whwn54iiapdfig6qpzji3z3skir6jrs34dq78zlynibgrg95hx6"; depends=[]; };
   SAFD = derive { name="SAFD"; version="0.4"; sha256="1zbja8bgva2j24ks4m14hbf4s0n674lj89nfxkkmwrljzsmjrjhv"; depends=[]; };
   safeBinaryRegression = derive { name="safeBinaryRegression"; version="0.1-3"; sha256="1g68r6pp5l41rbgyfqgcha1gpsisnl0ybdmdqr4ylr43f61dpgvd"; depends=[lpSolveAPI]; };
   SAM = derive { name="SAM"; version="1.0.5"; sha256="1fki43bp6kan6ls2rd6vrp1mcwvz92wzcr7x6sjirbmr03smcypr"; depends=[]; };
   SamplerCompare = derive { name="SamplerCompare"; version="1.2.5"; sha256="1p05fb6g0rwkzz0qp8hx88skxvfq265ndv9g694gc2h8vzwpan1y"; depends=[mvtnorm]; };
-  sampleSelection = derive { name="sampleSelection"; version="0.7-2"; sha256="11gqcls06imvlnbmc0nbypklz863xcp2ps170kd28j5wxfi8ybm7"; depends=[maxLik systemfit miscTools]; };
+  sampleSelection = derive { name="sampleSelection"; version="1.0-2"; sha256="1hzvvwvqp6v9d6ldm17kx3g8pbgngw2pxklny0b3man47zh5jshc"; depends=[maxLik miscTools systemfit Formula]; };
   samplesize = derive { name="samplesize"; version="0.1-8"; sha256="0w4aa6p0j7l9xykhgqv7yps2nxx11q1mrgivdnv4si8fbkqx148n"; depends=[]; };
   Sample_Size = derive { name="Sample.Size"; version="1.0"; sha256="1vfnb2gg3rax4sxd81xqznfvh300nv45nn7zjsyrdjyg1n3ym7nw"; depends=[]; };
   samplesize4surveys = derive { name="samplesize4surveys"; version="0.5.1"; sha256="0qinzr55ldg7ngsa9lzwwwysjfk3230xs7kcqkvimnrn5z4n898v"; depends=[TeachingSampling]; };
@@ -4501,57 +4769,58 @@ let self = _self // overrides; _self = with self; {
   SampleSizeProportions = derive { name="SampleSizeProportions"; version="1.0"; sha256="0mvkvx3nni0l8ys68sq3h2zlbjvksdcdzxqlf03k0ca5bbcmdf9l"; depends=[]; };
   sampling = derive { name="sampling"; version="2.6"; sha256="11r8p29kwc0ggycbv7sm1zmazmfm4p5207l764ad4znjib0cab6p"; depends=[MASS lpSolve]; };
   samplingbook = derive { name="samplingbook"; version="1.2.0"; sha256="1vynz6hsnz5d0vg66f8k67h24rb809k9chb4waymk6vwnp8lksz9"; depends=[pps sampling survey]; };
-  samplingEstimates = derive { name="samplingEstimates"; version="0.1-2"; sha256="14cgjixqj12www3jalq4dlsslcsbzaxinqdvss22b0qd3v9666xs"; depends=[samplingVarEst]; };
+  samplingEstimates = derive { name="samplingEstimates"; version="0.1-3"; sha256="1srdchlpxksfdqhf5qdvl7nz0qsxkxww7hzqj0q71asbzlq3am3p"; depends=[samplingVarEst]; };
   SamplingStrata = derive { name="SamplingStrata"; version="1.0-2"; sha256="04mb14hb328s4smpfidxf448mpa1cij9lbsfii7j0a0qx9nwapy2"; depends=[]; };
-  samplingVarEst = derive { name="samplingVarEst"; version="0.9-8"; sha256="0x9iwws272nzgx79rgdifqz51wm4k9hh38pi65qx6nwf21mjkxlj"; depends=[]; };
+  samplingVarEst = derive { name="samplingVarEst"; version="0.9-9"; sha256="04wgsq3sh69iy8p07ch210p22n5mds7cxp5s6zggzamqpf0hpnw7"; depends=[]; };
   sampSurf = derive { name="sampSurf"; version="0.7-2"; sha256="1bj1m5c8bx8i4jyk6kdgcfmgfj15iirxwg259r0c4fk7whcnfz59"; depends=[sp raster rasterVis boot]; };
   samr = derive { name="samr"; version="2.0"; sha256="0rsfca07pvmhfn7b49yk2ycw00wsq6dmrpv9haxz8q0xv7n5n2q9"; depends=[matrixStats]; };
   SAMURAI = derive { name="SAMURAI"; version="1.2.1"; sha256="02fipbjcsbp2b2957x6183z20icv1yly2pd1747nyww9bmpa7ycm"; depends=[metafor]; };
   sand = derive { name="sand"; version="1.0.2"; sha256="1y371ds86gcq2id996vp56h5dax2wm0mlk1ks2mp1k81n63l7wmf"; depends=[igraph igraphdata]; };
-  sandwich = derive { name="sandwich"; version="2.3-0"; sha256="0sa175wjnp6ji22f92shgbfg21029sw8cpbkrfr9q21vf33wvlyd"; depends=[zoo]; };
+  sandwich = derive { name="sandwich"; version="2.3-1"; sha256="1yjbqzsv742m74gz57bnj1jmjw5n5qqp057fkz490l7b65kj9nqn"; depends=[zoo]; };
+  sanitizers = derive { name="sanitizers"; version="0.1.0"; sha256="1c1831fnv1nzpq8nw9krgf9fm8v54w0gvcn4443b6jghnnbhn2n6"; depends=[]; };
   sanon = derive { name="sanon"; version="1.3"; sha256="0kh2gvcd7nxcgfswhspw9xw68sk0kcrcv86h8ysfrwxi35ln6a75"; depends=[]; };
   sapa = derive { name="sapa"; version="2.0-0"; sha256="04zf1xs4w7s28mvc272la8z3r1slnf50pw0k8zj335j3i56x6b9y"; depends=[ifultools splus2R]; };
-  SAPP = derive { name="SAPP"; version="1.0.3"; sha256="0bc6zjh7x541nng9cvv51v4gwgshwddykj91pmksvcjskhkzx3wy"; depends=[]; };
-  sas7bdat = derive { name="sas7bdat"; version="0.4"; sha256="152a1sx04rcd1hkr87q340nvxnj9dpmc4jwbzvjs2dl1zsrq2532"; depends=[chron]; };
+  SAPP = derive { name="SAPP"; version="1.0.4"; sha256="0a86vz390v2g5lz1r33qrmhgvak4rpfmpxy39shnivhagnrsarkl"; depends=[]; };
+  sas7bdat = derive { name="sas7bdat"; version="0.5"; sha256="0qxlapb6wdhzpwlmzlhscy3av7va3h6gkzsppn4sx5q960310an3"; depends=[]; };
   SAScii = derive { name="SAScii"; version="1.0"; sha256="0nq859xmrvpbifk8q1kbx3svg61rqdg8p8gr1pn85fr0j3w7h666"; depends=[]; };
   SASmixed = derive { name="SASmixed"; version="1.0-4"; sha256="0491x4a3fwiy26whclrc19alcdxccn40ghpsgwjkn9sxi8vj5wvm"; depends=[]; };
   SASPECT = derive { name="SASPECT"; version="0.1-1"; sha256="1d3yqxg76h9y485pl5mvlx6ls1076f80b320yvx4zxmqq9yxmaba"; depends=[]; };
-  SASxport = derive { name="SASxport"; version="1.3.6"; sha256="0rbjn2f3fs8q51rjkbiv4ha50s38rq1qnnfqq772c138k35ih4np"; depends=[chron]; };
-  SAVE = derive { name="SAVE"; version="0.9.3.8.4"; sha256="0ai5dfwvr9awccdinrcqxdn5sacw4nm4x7pim289q1lzrr7gnnrp"; depends=[coda DiceKriging]; };
+  SASxport = derive { name="SASxport"; version="1.5.0"; sha256="0sgxpjv9ilz2zb13kkb0fqjfbamrczxpy9rwvfhh46bmx4i038iq"; depends=[chron Hmisc]; };
+  SAVE = derive { name="SAVE"; version="0.9.3.9.2"; sha256="1faky3155vh54r450r4dndn5749kp09bilyq8n7n7rls0dl5k34m"; depends=[coda DiceKriging]; };
   saves = derive { name="saves"; version="0.5"; sha256="1b4mfi2851bwcp0frx079h5yl6y1bhc2s8ziigmr8kwy1y1cxw10"; depends=[]; };
   saws = derive { name="saws"; version="0.9-6.1"; sha256="0w40j6xczqs74z1z3na4510w06px7yn55s2mw9mddd6736l56fv1"; depends=[gee]; };
   sBF = derive { name="sBF"; version="1.1"; sha256="11yjw6y1k0fi95p68bc4481gac25lympmmdykh71ljg0hnrm0s53"; depends=[]; };
   sbgcop = derive { name="sbgcop"; version="0.975"; sha256="0f47mvwbsym4khwgl0ic3pqkw3jwdah9a48qi3q93d46p2xich61"; depends=[]; };
   sbioPN = derive { name="sbioPN"; version="1.1.0"; sha256="0yvg55xnkhm35hfl7rldy2grb26hm4a68jr4x9n45fs7hhdylxri"; depends=[]; };
+  SBRect = derive { name="SBRect"; version="0.26"; sha256="16g0ciy9q9irypsl8x36i0lavl41j3af13r2si0by8q6wj56pxi4"; depends=[rJava]; };
   SBSA = derive { name="SBSA"; version="0.2.3"; sha256="1v23lzzziyjlvgn5p2n1qcq2zv9hsyz2w15lbnfi5wvinxhlg8sc"; depends=[Rcpp]; };
   sca = derive { name="sca"; version="0.8-9"; sha256="024yxm1rlyz3hx9viv2nb6rapy938diaknc3nzkgq0ffky2gf0s3"; depends=[]; };
   scagnostics = derive { name="scagnostics"; version="0.2-4"; sha256="0fhc7d2nfhm8w6s6z1ls6i8d7c90h4q7rb92rz8pgq3xh031hpcf"; depends=[rJava]; };
   scaleboot = derive { name="scaleboot"; version="0.3-3"; sha256="0w3gwqxshiypbixrdjg3p5z3qfp0nf9gv838z9hlbf0xpzgk11xa"; depends=[]; };
   scales = derive { name="scales"; version="0.2.4"; sha256="08dryii8ibh16wxs61pam07b24rwhqvdcdhk09mij289l309192v"; depends=[RColorBrewer dichromat munsell plyr labeling]; };
   scalreg = derive { name="scalreg"; version="1.0"; sha256="06iqij1cyiw55ijzk2byrwh3m5iwsra7clx8l4v69rc236q8zbdi"; depends=[lars MASS]; };
-  scam = derive { name="scam"; version="1.1-6"; sha256="09y7gcmf40hc06cm8awjl40xbxs68b2lf916fywz2903bb6biai6"; depends=[mgcv Matrix]; };
+  scam = derive { name="scam"; version="1.1-7"; sha256="0wjpc5fcr4409gnanq7xnmlai51my86zndsxh5lw418ywdgcbyn4"; depends=[mgcv Matrix]; };
   scape = derive { name="scape"; version="2.2-0"; sha256="0dgbh65fg6i5x4lpfkshn382zcc4jk1wp62pwd2l2f59pyfb92a3"; depends=[coda Hmisc lattice]; };
-  scapeMCMC = derive { name="scapeMCMC"; version="1.1-3"; sha256="0gdranypjdzjdimmhs7k6pchvw9d3hr18rx1msll9bmaq1q2ffad"; depends=[coda lattice gplots]; };
   scar = derive { name="scar"; version="0.2-1"; sha256="04x42414qxrz8c7xrnmpr00r46png2jy5giwicdx6gx8jwrkzhzs"; depends=[]; };
   scaRabee = derive { name="scaRabee"; version="1.1-3"; sha256="1fdxmk2mbrynxh6zy0xjmcwa384n5bppl1vzmfj5rjw840f7hbrk"; depends=[neldermead lattice deSolve]; };
   scatterplot3d = derive { name="scatterplot3d"; version="0.3-35"; sha256="1w0r7cyz01rzmgcf2x7wa4xs88ga6fd67wksyjyzrh2pdcbc56yx"; depends=[]; };
   SCBmeanfd = derive { name="SCBmeanfd"; version="1.1"; sha256="0pcyrnzlnlyn4v3lyv7pv01v2lh4vig1x4x8g98lpccpi1bimd4z"; depends=[boot KernSmooth]; };
   SCEPtER = derive { name="SCEPtER"; version="0.1-0"; sha256="13jnqcgsz3rz5dis8jmbma1m6z72qphdjyjf3984c66clhazxnh9"; depends=[MASS]; };
   SCEPtERextras = derive { name="SCEPtERextras"; version="0.1-0"; sha256="1vv231h744c7j7rvcb2xaffmwdd9ms76yvvw2l3xcb72iwhl5dbw"; depends=[]; };
-  SCGLR = derive { name="SCGLR"; version="1.2"; sha256="0346gmqd5wakfwabq4rwqdpiylq29cgx6hg40dzm2v1alpaxs8va"; depends=[Matrix Formula expm ggplot2 stringr ROCR]; };
+  SCGLR = derive { name="SCGLR"; version="2.0"; sha256="0pgix9i520yj7gpby3fcykvk9nnq1pl8b0akyhdv5l6vax9d5bg4"; depends=[Matrix Formula expm ggplot2 ROCR]; };
   scholar = derive { name="scholar"; version="0.1.1"; sha256="1wlhxw5k28qypfl6dm07cjrpvpmvcbwn1fc7205xpj20f41jchra"; depends=[stringr plyr R_cache XML]; };
   schoolmath = derive { name="schoolmath"; version="0.4"; sha256="06gcmm294d0bs5whvknrq48sk7li961lzy4bcncjg052zbbpn67x"; depends=[]; };
   schoRsch = derive { name="schoRsch"; version="1.0"; sha256="15kjab5cpss2kkf3pd2nyszdsfn77840zx7yrbkry6n7xb4x8icn"; depends=[]; };
   schwartz97 = derive { name="schwartz97"; version="0.0.6"; sha256="0l34f30l75zrg3n377jp0cw7m88cqkgzy6ql78mrx8ra88aspfzn"; depends=[FKF mvtnorm RUnit]; };
-  SCI = derive { name="SCI"; version="1.0-0"; sha256="0ff35g0d7iq1mjr01bh5zdix8g9gg244zpkhvdcnyx7mchpv38la"; depends=[fitdistrplus lmomco]; };
+  SCI = derive { name="SCI"; version="1.0-1"; sha256="1m5a15a4n0zjqykq38pyw9133g2ih4ykbgak8c8khq8p0isnl8qb"; depends=[fitdistrplus lmomco]; };
   scidb = derive { name="scidb"; version="1.1-2"; sha256="1nkyzvjpacm4imv778nc6gc468419shkyhxb59hsaw9840wcs1na"; depends=[Matrix iterators RCurl zoo]; };
-  SciencesPo = derive { name="SciencesPo"; version="0.03.21"; sha256="0g6n8v7k2qk3nqfnw4i31qh03lckpm787j2ha3gskgchnydmn5ac"; depends=[data_table maptools]; };
+  SciencesPo = derive { name="SciencesPo"; version="0.05.21"; sha256="1x1b1fyy961nm5i54drkakn2qzlja17haa66dz9135h1lgj83y4s"; depends=[data_table xtable]; };
   scio = derive { name="scio"; version="0.6.1"; sha256="0h15sscv7k3j7qyr70h00n58i5f44k96qg263mxcdjk9mwqr0y65"; depends=[]; };
   sciplot = derive { name="sciplot"; version="1.1-0"; sha256="0na4qkslg3lns439q1124y4fl68dgqjck60a7yvgxc76p355spl4"; depends=[]; };
   SciViews = derive { name="SciViews"; version="0.9-5"; sha256="199waafpn0ndg7szwfhw2jlgcx1f0pv7j0vix2vzz60knwm698xb"; depends=[MASS ellipse]; };
   SCMA = derive { name="SCMA"; version="1.1"; sha256="0bims9l047xvbwp2r5ly5cgpd7fc0p2cik48gg42abwdqvppf542"; depends=[]; };
   SCORER2 = derive { name="SCORER2"; version="0.99.0"; sha256="1a28wga69ip9s98ch2dqgl0qkwa3w6frmaqcvhclc360ik813mxq"; depends=[]; };
-  scoring = derive { name="scoring"; version="0.5"; sha256="0yiqz642zcpza4ixyb7knaqlq75d0pyi6v7h1vj8qlscyw2vcz57"; depends=[]; };
+  scoring = derive { name="scoring"; version="0.5-1"; sha256="0vxjcbp43h2ipc428qc0gx7nh6my7202hixwhnmspl4f3kai3wkp"; depends=[]; };
   ScottKnott = derive { name="ScottKnott"; version="1.2-4"; sha256="0s2b74isklmjjz5qzb0sg2lzqxv3bka2wxcja1lg49npmv70kly7"; depends=[]; };
   scout = derive { name="scout"; version="1.0.3"; sha256="0wmjmk0ckd211cq5ykd0yzjschs7fkg04w67arl4pwma0z5z56lq"; depends=[glasso lars]; };
   SCperf = derive { name="SCperf"; version="1.0"; sha256="1v9l7d9lil2gy5bw6i7bzc24808m063xaw2spl005j0a9rh4ag41"; depends=[]; };
@@ -4564,19 +4833,19 @@ let self = _self // overrides; _self = with self; {
   scrypt = derive { name="scrypt"; version="0.1.0"; sha256="1hc1rziigwggdx2pvklldkw88mdzbwa8b8a2a0ip4cm1w6flsl9n"; depends=[Rcpp]; };
   scuba = derive { name="scuba"; version="1.7-0"; sha256="11mdc8pj552ag36ib4sfbjv8r0psa6wnb13spz0v3rbaslz25hpw"; depends=[]; };
   SCVA = derive { name="SCVA"; version="1.0"; sha256="0dphdrc069d9nggpipl97wj1vqwnnjlv3fs68pqygzb5kbd70nx3"; depends=[]; };
-  sda = derive { name="sda"; version="1.3.3"; sha256="044ah4xmhx0y8pzd0y517p1drbj8bikfvm0925ji0abfcfc1xfsb"; depends=[entropy corpcor fdrtool]; };
+  sda = derive { name="sda"; version="1.3.4"; sha256="0fbbiyh6sp23mg6lmzk9fm9sprqwvrv0fxxjykl5ww0pbl63rrmj"; depends=[entropy corpcor fdrtool]; };
   SDaA = derive { name="SDaA"; version="0.1-2"; sha256="03ijiqwvvqs79ql9p016hpn5dwxnys820k00aza29npm9k2bciww"; depends=[survey ggplot2]; };
   SDBP = derive { name="SDBP"; version="1.0"; sha256="18yk5zasxga58ny8n8kz3b8j0j8xznb9wqf5642xzfvcb9dd1kz2"; depends=[]; };
-  sdcMicro = derive { name="sdcMicro"; version="4.3.0"; sha256="18b7wqvid3y9lfm88jcpia6xk6kvjk49dbgzdjzhx5vdmg72vsll"; depends=[brew knitr data_table xtable car robustbase cluster MASS e1071 Rcpp sets]; };
+  sdcMicro = derive { name="sdcMicro"; version="4.4.0"; sha256="0ig43sdzn940mpv2d8v1v0k77nb5mwwsy8amkb6vdxs0rql7qvyy"; depends=[brew knitr data_table xtable car robustbase cluster MASS e1071 Rcpp sets]; };
   sdcMicroGUI = derive { name="sdcMicroGUI"; version="1.1.1"; sha256="0icxxbfxl65da07bpi7l2jzk85y990ndhl60lwyp077sjq5rd20q"; depends=[sdcMicro gWidgetsRGtk2 cairoDevice vcd foreign Hmisc]; };
-  sdcTable = derive { name="sdcTable"; version="0.16.0"; sha256="1balavfwg70zbqd0xnnm2paac7fd4an1hysv1fsh3iw9n8cycdpy"; depends=[stringr Rcpp Rglpk lpSolveAPI data_table]; };
+  sdcTable = derive { name="sdcTable"; version="0.17.1"; sha256="0wljdpggf8mhsjg0xrgb3xqd346zb4f8pk0jfgv38krhkfxz1ss5"; depends=[stringr Rcpp Rglpk lpSolveAPI data_table]; };
   SDD = derive { name="SDD"; version="1.1"; sha256="1bl9xlns6np26pgiiza25c54k4989knksdkkk653g8s8gmr4y34x"; depends=[Hmisc sm tseries rpanel rgl]; };
   SDDA = derive { name="SDDA"; version="1.0-5"; sha256="1lwp36bwx13cyiqyzh5jp2c0f0g2hvppqxnpjcflmcz7s23h5dp7"; depends=[MASS]; };
   sddpack = derive { name="sddpack"; version="0.9"; sha256="1963l8jbfwrqhqcpif73di9i5mb996r4f8smjyil6l7sdir7cg9l"; depends=[]; };
   sde = derive { name="sde"; version="2.0.10"; sha256="1wkgam394190zg1m0b9hg81h9mkqhqw8isk7xf5vdqxymjzsaxjm"; depends=[MASS fda zoo]; };
   sdef = derive { name="sdef"; version="1.5"; sha256="1xmx3nfjjfh6zw1vq7iip4rnshh40azja83xyvnz04jcv574vhxm"; depends=[]; };
-  SDMTools = derive { name="SDMTools"; version="1.1-20"; sha256="10j1dpzndja503jamrw6jgxm1szj53skj44kn41msza8iz7638nn"; depends=[R_utils]; };
-  sdmvspecies = derive { name="sdmvspecies"; version="0.1"; sha256="0nlkz7am9xfj7phlzglmar6bxfvkb1r95qhm5j951h7053hwyppw"; depends=[raster ggplot2]; };
+  SDMTools = derive { name="SDMTools"; version="1.1-221"; sha256="1kacrpamshv7wz83yn45sfbw4m9c44xrrngzcklnwx8gcxx2knm6"; depends=[R_utils]; };
+  sdmvspecies = derive { name="sdmvspecies"; version="0.3"; sha256="0xcgwj600a3r3v8hcy2xf1bkc60p44g2cjyq8qs2g3wqd7zyqj1b"; depends=[GPArotation ggplot2 psych raster]; };
   sdnet = derive { name="sdnet"; version="2.01.3"; sha256="1sr60ca2dn182nacsi1ix02cdjygf45jv51dcfz5744hj7afcvws"; depends=[]; };
   sdprisk = derive { name="sdprisk"; version="1.0-3"; sha256="0v490zz2c1qa0w9nfd0xs5xbbvd9g8vp39fp8x7k7cy598vby4yx"; depends=[numDeriv PolynomF rootSolve]; };
   sdtoolkit = derive { name="sdtoolkit"; version="2.33-1"; sha256="0pirgzcn8b87hjb35bmg082qp14idc5pfvm6dikpgkswag23hwh8"; depends=[]; };
@@ -4585,19 +4854,20 @@ let self = _self // overrides; _self = with self; {
   SearchTrees = derive { name="SearchTrees"; version="0.5.2"; sha256="11p81x1klkmxarypxpbisf78dlrmhzzg9y9hxpwz75pks1y56gqg"; depends=[]; };
   seas = derive { name="seas"; version="0.4-3"; sha256="1n0acg6fvaym4nx1ihw0vmb79csds0k4x9427qmcyxbl9hxxmllp"; depends=[]; };
   season = derive { name="season"; version="0.3-3"; sha256="0562qxc5bz9yjkz0zzighlp52ysv0gjn8xfycbxckmjxy3wrk9cz"; depends=[ggplot2 MASS mgcv survival coda]; };
-  seasonal = derive { name="seasonal"; version="0.50.0"; sha256="0bf2j6vy7aa081k24q25ldry9ah2kr59c9i7bd1rwh5pcj7zlqpj"; depends=[]; };
+  seasonal = derive { name="seasonal"; version="0.60.0"; sha256="0cs987gsh2brgwv30ildrzq2phj6pfrksl8dq3rdlx0a7411ll5i"; depends=[]; };
   seawaveQ = derive { name="seawaveQ"; version="1.0.0"; sha256="19vm1f0qkmkkbnfy1hkqnfz6x2a7g9902ka76bhpcscynl69iy56"; depends=[survival NADA lubridate]; };
   SEchart = derive { name="SEchart"; version="0.1"; sha256="19gqcd6xzwg37nzc67p88ip4i0v2f59ds85xfw9qq8lybvdm76k2"; depends=[JM]; };
   SECP = derive { name="SECP"; version="0.1-4"; sha256="0a4j0ggrbs0jzcph70hc4f5alln4kdn2mrkp3jbh321a6494kwl1"; depends=[SPSL]; };
   secr = derive { name="secr"; version="2.8.2"; sha256="0p885q2r8wy4n8j1dvmmd59p5nfds8f4l1mwiw4z3xwck3bwi776"; depends=[abind MASS nlme sp]; };
-  secrdesign = derive { name="secrdesign"; version="2.1.2"; sha256="0x9nf3qki5mr85ylmlcjz7zcsl4i1jlz50gh2391gfbpdhljwbbc"; depends=[secr abind]; };
+  secrdesign = derive { name="secrdesign"; version="2.1.3"; sha256="1gfkc5cdk9jg3db5yiq06k9li226m1sxd5r59283ci96sd6fh02s"; depends=[secr abind]; };
+  seedy = derive { name="seedy"; version="0.1"; sha256="16rg2i2g3ri882jsiyvqk4yw7xmg7f1hiirb77w1pqa30007gl7v"; depends=[]; };
   seeg = derive { name="seeg"; version="1.0"; sha256="1d45vl075p4qbd74gpaa8aw1h82p9n633fym10yp9bmcv4gwksg6"; depends=[car spatstat sgeostat]; };
   seem = derive { name="seem"; version="1.0"; sha256="0cjdi9c89bqvrx9gzxph958cfqicc1qfnzsair0gvsk3cxsrw6bf"; depends=[]; };
   SEER2R = derive { name="SEER2R"; version="1.0"; sha256="0lk0kkp8sv3nl19zwqd7449mmjxsj3pqpzdmqf70qf8xh2pqyvzd"; depends=[]; };
   SEERaBomb = derive { name="SEERaBomb"; version="2014.4.1"; sha256="1vlk6hcn05vdjfc7c8dhvsd1hc2yq1pdmhb7i48b689lkxg82igz"; depends=[RSQLite LaF]; };
   seewave = derive { name="seewave"; version="1.7.3"; sha256="1bgv90x1rc7xyril6qarbx5mza131admd75s9704s8l7n4zfy64k"; depends=[fftw tuneR]; };
-  seg = derive { name="seg"; version="0.4-1"; sha256="1wkkxzvv1dq6z5l3b27fb72dg70py2qzkxmfibjg44zvcxr3y79g"; depends=[sp splancs]; };
-  segmented = derive { name="segmented"; version="0.3-1.0"; sha256="0d7mijvjl9kmypp8mgayq1l4800jj7cnd6anrnrng4ma6cxg8cjf"; depends=[]; };
+  seg = derive { name="seg"; version="0.5-1"; sha256="0gsdbq7b5wpknhlilrw771japr63snvx4vpirvzph4fjyby1c7rg"; depends=[sp splancs]; };
+  segmented = derive { name="segmented"; version="0.4-0.0"; sha256="0dcr3s33j68ficbjgvi9hv5z2ihplljwp5zrqp82bc43qhbwsr6i"; depends=[]; };
   Segmentor3IsBack = derive { name="Segmentor3IsBack"; version="1.8"; sha256="00m6fvx6s8mz477c8b4dmgdh52jf6jx1lcqzf84l90b1xw93qnv7"; depends=[]; };
   SE_IGE = derive { name="SE.IGE"; version="1.0"; sha256="0gx3kdsdl3rjms6fxabxz51z84r9mcy4934l2g43ifrxbyphnias"; depends=[]; };
   Sejong = derive { name="Sejong"; version="0.01"; sha256="1d9gw42dbs74w7xi8r9bs6dhl23y16yxqzyhqqayvcm98q3l77nf"; depends=[]; };
@@ -4606,15 +4876,15 @@ let self = _self // overrides; _self = with self; {
   selectMeta = derive { name="selectMeta"; version="1.0.6"; sha256="0qv06x6q6p2lwr13fw8xc6mkpb23h41sqnc9wyq8xx37d2jgpcif"; depends=[DEoptim]; };
   selectr = derive { name="selectr"; version="0.2-2"; sha256="0hzj8ccs2jcfaqlpgrf59y6z7hrxsb2c85kkxflp6180rpqjrwq4"; depends=[XML stringr]; };
   SeleMix = derive { name="SeleMix"; version="0.9.1"; sha256="04gxgja35qs4k66iil014dzgl5bkx0qhr9w4v7qpmwv2bb07jwz3"; depends=[mvtnorm Ecdat xtable]; };
-  sem = derive { name="sem"; version="3.1-3"; sha256="1y311ywnad910m5v35ga7x4ip95663ibi8vb7l4fq0hqrwn9f0c9"; depends=[MASS matrixcalc]; };
+  sem = derive { name="sem"; version="3.1-5"; sha256="093kklhl9fnawpwj3km1q0px6fm40kc3vg7kw93y3yb6hniwla35"; depends=[matrixcalc]; };
   semdiag = derive { name="semdiag"; version="0.1.2"; sha256="0kjcflw7dn907zx6790w7hnf5db6bf549whfsc0c2r173kf13irp"; depends=[sem]; };
   semGOF = derive { name="semGOF"; version="0.2-0"; sha256="1lsv72yaza80jqadmah7v2cpfqfay57y12hcz6brvia6bmr5qagb"; depends=[sem MASS matrixcalc]; };
   semiArtificial = derive { name="semiArtificial"; version="1.2.0"; sha256="11pwdqpsf5d5g74s2b8ixmrh2khkha3d4akzlkn652s98qr55dpc"; depends=[CORElearn MASS nnet cluster mclust fpc timeSeries timeDate]; };
   SemiCompRisks = derive { name="SemiCompRisks"; version="1.0"; sha256="1q10bqws152vk7fpd9m8w16m0ns2i10q07wnmmbjladvfq4ja9il"; depends=[]; };
   SEMID = derive { name="SEMID"; version="0.1"; sha256="1bxdjdyqlvxz339jdgw90qi6kvfhjdmga38vhfl3ldlxfv2s9gfk"; depends=[igraph]; };
-  SemiMarkov = derive { name="SemiMarkov"; version="1.3"; sha256="0zg5yljfmhysx7r3r8ks5mfc10wbrxvfgys0zxfnspd3qb7pz0q2"; depends=[numDeriv MASS Rsolnp]; };
+  SemiMarkov = derive { name="SemiMarkov"; version="1.3.1"; sha256="0cqrwpg26m8paa1rnz5yd6min00kwvl9ifgf4x71y2ldzr2n52b8"; depends=[numDeriv MASS Rsolnp]; };
   SemiPar = derive { name="SemiPar"; version="1.0-4"; sha256="1gg80wpqa006qahpaxb5y7vnf4w0x9mhjwh6w3271j0b9znr1gs5"; depends=[MASS cluster nlme]; };
-  SemiParBIVProbit = derive { name="SemiParBIVProbit"; version="3.2-10"; sha256="0rc3l4bdrm0g3lkv2h9as400jlqsibd7py448815kljznic70vbm"; depends=[CDVine VGAM mgcv mvtnorm MASS magic polycor VineCopula survey trust matrixStats Matrix]; };
+  SemiParBIVProbit = derive { name="SemiParBIVProbit"; version="3.2-11"; sha256="1b1ywyax76893vp6s4ldjvk035vky4pbiagl8blzcwp7vhvy4ys7"; depends=[CDVine mgcv mvtnorm MASS magic polycor VineCopula VGAM survey trust matrixStats Matrix sn]; };
   SemiParSampleSel = derive { name="SemiParSampleSel"; version="1.1"; sha256="0b2vdrqi4mw4bp6r82b3c329cddjxwc39rcramq5nr8awv9ib0cf"; depends=[copula mgcv mvtnorm magic trust Matrix]; };
   semisupKernelPCA = derive { name="semisupKernelPCA"; version="0.1.5"; sha256="1v8wdq63b1gqicj8c9a24k0w7cc0bkg0mnc9z5mklsfcl7g0g6k9"; depends=[datautils irlba]; };
   SEMModComp = derive { name="SEMModComp"; version="1.0"; sha256="1za67470f13z8jsy3z588c7iiiz993d3vjqrb8v9fann2r6sf1md"; depends=[mvtnorm]; };
@@ -4624,18 +4894,20 @@ let self = _self // overrides; _self = with self; {
   sendmailR = derive { name="sendmailR"; version="1.1-2"; sha256="1d3rzcckrfqsilpzmpacwibhz858b8sw029vfz6mjh6q0ijswi2q"; depends=[base64enc]; };
   sendplot = derive { name="sendplot"; version="4.0.0"; sha256="0ia2xck94nwirwxi38nv0viz5wb8291yiak6f0wgwh84irsrfp1h"; depends=[rtiff]; };
   sensitivity = derive { name="sensitivity"; version="1.8-2"; sha256="1q30xpb1w5dnkivxh1ck53jz2m9kpjmzvr2yd739zxxlir5kx8gr"; depends=[boot]; };
-  SensitivityCaseControl = derive { name="SensitivityCaseControl"; version="1.0"; sha256="0dznwcicwlxlvsinqm4c64r9dp1c2mnf810svl34sd8ddnxrvvyl"; depends=[]; };
+  SensitivityCaseControl = derive { name="SensitivityCaseControl"; version="2.1"; sha256="00jqzqx7g0av9lw13is723gph486gb8ga0wgcmmzpmb24s5nya9z"; depends=[]; };
   sensitivitymv = derive { name="sensitivitymv"; version="1.2"; sha256="0h8lbl5yhxgzdrajjydb2ap9q3dnm1abxdk8gdhp84m1bv8pznkj"; depends=[]; };
+  sensitivitymw = derive { name="sensitivitymw"; version="1.1"; sha256="1bknnfkkqgmchabcjdfikm37sn5k41ar8lpnjw58i8qh7yzq237i"; depends=[]; };
   SensoMineR = derive { name="SensoMineR"; version="1.20"; sha256="1qw97cixndg2h29bbpssl0rqag3w8im4nm9964lr7r012y5wdqhx"; depends=[FactoMineR cluster KernSmooth]; };
-  sensR = derive { name="sensR"; version="1.3-1"; sha256="1v10zx1lydgmk8a6zsxxg1zzbblxn582ggcminrlvs7gwin7b0hn"; depends=[multcomp MASS numDeriv]; };
+  sensR = derive { name="sensR"; version="1.4-0"; sha256="19yddfcql1w154v81fsdm50wl15vl3vcx44iz3ss7in4gj1g884m"; depends=[multcomp MASS numDeriv]; };
   SenSrivastava = derive { name="SenSrivastava"; version="2012-04-0"; sha256="0ki0kl18cj8lkad6q48piyvslkirs8y5rnfa8bvgjxsisxg2ahhp"; depends=[]; };
   separationplot = derive { name="separationplot"; version="1.0"; sha256="1m8s531dsmzdam5s2yn0qyvm89zfxrzj8sh8r2gpcf31qrai7m26"; depends=[MASS RColorBrewer]; };
   seqCBS = derive { name="seqCBS"; version="1.2"; sha256="1kywi3kvvl9y6nm7cwf6fj8gz9gzznp5va336g1akzgy77k82d8v"; depends=[clue]; };
   seqDesign = derive { name="seqDesign"; version="1.0.1"; sha256="17zb8l5kasjvrsrgs2k0ih25ydlz7hpr9dcr1rm1akvscmk8np3d"; depends=[survival xtable]; };
+  SeqFeatR = derive { name="SeqFeatR"; version="0.1.5"; sha256="1cpb64h3pcp18zrly0hxy2wfn68x4pgyj0ywl4z2kadi6y3r0gyh"; depends=[tcltk2 plotrix ape plyr phangorn]; };
   SeqGrapheR = derive { name="SeqGrapheR"; version="0.4.8.3"; sha256="03plwa3sc1pg34p1szbz3d0z8y53w7iqm7qn9q6fj72rsnk5spxc"; depends=[igraph rggobi gWidgets gWidgetsRGtk2 cairoDevice]; };
   seqinr = derive { name="seqinr"; version="3.0-7"; sha256="0r54kvvwlp5i1fbk4vgbinj3zwzjppiyh7f5dy4kmja8m5lslc4x"; depends=[]; };
   seqMeta = derive { name="seqMeta"; version="1.4"; sha256="0wmwvw09fskwpvy727lc974aw9gvd495wgxf8k1ybi16bq2h080j"; depends=[survival Matrix coxme CompQuadForm]; };
-  seqminer = derive { name="seqminer"; version="3.0"; sha256="0wkd315vc4h8hdlz8z44w04mkvl8kyck736jhrswfrzc4b3xrfb4"; depends=[stringr]; };
+  seqminer = derive { name="seqminer"; version="3.1"; sha256="15b63j15bgqzix4vp57q1vi9jnqn5an2p8kmvacg95ahrv8w0a0m"; depends=[stringr]; };
   seqmon = derive { name="seqmon"; version="0.2"; sha256="075hc6vgl1w3nisrihf5w6mkkg9q601jsqxm9hk9yagyvvd7d78w"; depends=[]; };
   seqPERM = derive { name="seqPERM"; version="1.0"; sha256="1i8ai4gxybh08wxjh96m6xlqxhh7ch0xihjs879snmy4zqfi0pap"; depends=[]; };
   seqRFLP = derive { name="seqRFLP"; version="1.0.1"; sha256="1i98hm8wgwr8b6hd237y2i9i0xgn35w4n2rxy4lqc5zq71gkwkvk"; depends=[]; };
@@ -4654,55 +4926,56 @@ let self = _self // overrides; _self = with self; {
   severity = derive { name="severity"; version="2.0"; sha256="1mp19y2pn7nl9m8xfljc515kk5dirv0r2kypazpmd956lcivziqq"; depends=[]; };
   sExtinct = derive { name="sExtinct"; version="1.1"; sha256="1l6232z6c4z3cfl1da94wa6hlv9hj5mcb85fj1y0yparkvvl8249"; depends=[lattice]; };
   sfa = derive { name="sfa"; version="1.0-1"; sha256="1acqxgydf8j5csdkx0yf169x3yaa31r0ccdrqarh6vj1hacm89ad"; depends=[]; };
-  sfsmisc = derive { name="sfsmisc"; version="1.0-25"; sha256="1dz7m89a7agwxmi6hijmc8ynxl4vdm04n9wp7wzi683i6j74fs0k"; depends=[]; };
+  sfsmisc = derive { name="sfsmisc"; version="1.0-26"; sha256="0claxq1s1hkwwymx8iva650v51fjf4ly10zm17d42qhnn4b2whgd"; depends=[]; };
   sft = derive { name="sft"; version="1.0-1"; sha256="0pi6x66mcywc1lbkwnwldnfg64h5vpp65vlis6b9cqd8iyx8msp4"; depends=[fda]; };
   SGCS = derive { name="SGCS"; version="2.0"; sha256="1d7abq07f0702k33j334va7kc4swz7rdqqb4sw1wq6a671r7k5v6"; depends=[spatstat]; };
   sgeostat = derive { name="sgeostat"; version="1.0-25"; sha256="04zl932s6zb26r42h2l8qf3d43bmrq67281mrkh4spn4vcddv5da"; depends=[]; };
   SGL = derive { name="SGL"; version="1.1"; sha256="1wc430jqn3li102zpfmyyavfbab7x7ww9p89clxsndyigrrbjdr7"; depends=[]; };
-  sglasso = derive { name="sglasso"; version="1.0-0"; sha256="1pb8s1hbl3ygnd6w28d2vlhbd7rxga84cs77fanay4qgxmgayfkx"; depends=[Matrix]; };
+  sglasso = derive { name="sglasso"; version="1.0-1"; sha256="19f8qjhmv3jpx9p9wcnbzsifla0rccypxgwjykszr4gi7jl1s4z5"; depends=[Matrix]; };
   sglOptim = derive { name="sglOptim"; version="1.0.122.0"; sha256="07anc9ixbc82807ixr4k779src72gvbx0wsy3mr0mvzg9xq2fi1v"; depends=[Matrix]; };
   sglr = derive { name="sglr"; version="0.7"; sha256="11gjbvq51xq7xbmpziyzwqfzf4avyxj2wpiz0kp4vfdj3v7p4fp9"; depends=[ggplot2 shiny]; };
-  sgof = derive { name="sgof"; version="2.0.2"; sha256="1rami39hlgh72gkjwxd9nxva2kidw98pa02kmnh7scpip265jx06"; depends=[]; };
+  sgof = derive { name="sgof"; version="2.1"; sha256="1nipm2lf02g0j4f8kas99wi4wmwp5vx2a97jj5mg8mclkwpifnhr"; depends=[poibin discreteMTP]; };
   SGP = derive { name="SGP"; version="1.2-0.0"; sha256="0v4ljhvfrvl6izprcrw8w36474fjz0v1kpcsg0sx32359amd3zxz"; depends=[Cairo colorspace data_table doParallel foreach gridBase iterators jsonlite plyr quantreg reshape2 RSQLite sn]; };
   sGPCA = derive { name="sGPCA"; version="1.0"; sha256="16aa5jgvkabrlxaf1p7ngrls79mksarh6di3vp26kb3d3wx087dx"; depends=[Matrix fields]; };
   SGPdata = derive { name="SGPdata"; version="8.0-0.0"; sha256="0g25s2wcj47394fm16maygafnynizma3mgb3r65b5p9c27swk4v8"; depends=[]; };
-  sgr = derive { name="sgr"; version="1.0.4"; sha256="059gqq1pm7fz3kmfnlkcrlrw4v96460067kfa9frx19g3pij8ajp"; depends=[]; };
+  sgr = derive { name="sgr"; version="1.1"; sha256="1wbpxjv4g4jccih5xn2m7fqq4w1b4p05j56iwldkjp2r6paj5af1"; depends=[]; };
   shape = derive { name="shape"; version="1.4.1"; sha256="1s1yj7cqc9svqliv9f9k3fimkakblri9vwr785ihav58x5cn90qj"; depends=[]; };
   shapefiles = derive { name="shapefiles"; version="0.7"; sha256="08ghndihs45kylbzd9wnxffn8ixvxjhjnjldjyd526ai2sj8xcgf"; depends=[foreign]; };
   shapes = derive { name="shapes"; version="1.1-9"; sha256="044d4ci9lv6g9vbh8zn85f08d9n8f91vn8gn1wqv1lp0qjycpmjv"; depends=[scatterplot3d rgl MASS]; };
   SharpeR = derive { name="SharpeR"; version="0.1401"; sha256="1l55llafs81gl1mdhyyi6m02w7mx8g46y65jf1kw5mbrljgri8az"; depends=[matrixcalc xtable]; };
-  sharpshootR = derive { name="sharpshootR"; version="0.6-1"; sha256="0q5cy2mz98pc6dz7ixnr9cvlsl449zkz325h1m07adr97m52pl3p"; depends=[aqp ape igraph cluster lattice latticeExtra vegan sp reshape2 Hmisc scales circular RColorBrewer plyr]; };
-  sharx = derive { name="sharx"; version="1.0-3"; sha256="1a94s5r2ymif2l3ld101qqn5qkd4z4sj5scg0dsvdpdzkvnqpcyq"; depends=[Formula dcmle dclone]; };
-  sheldusr = derive { name="sheldusr"; version="0.1"; sha256="1q8d2cp177b574ml9z6mawpk8pyfdmwan4hc8srl3chq3yr44a45"; depends=[]; };
-  shiny = derive { name="shiny"; version="0.9.1"; sha256="15pnb87jap11myvlzppshswqwszjnkmcg27pp15askg1l71k1ci3"; depends=[httpuv caTools RJSONIO xtable digest]; };
+  sharpshootR = derive { name="sharpshootR"; version="0.6-3"; sha256="1dpcyd1wi022zcs9s48xg3wzy17dqcd0622ak0phvbwxgpwmz9j2"; depends=[aqp ape igraph cluster lattice latticeExtra vegan sp reshape2 Hmisc scales circular RColorBrewer plyr]; };
+  sharx = derive { name="sharx"; version="1.0-4"; sha256="1flcflx6w93s8bk4lcwcscwx8vacdl8900ikwkz358jbgywskd5n"; depends=[Formula dcmle dclone]; };
+  shiny = derive { name="shiny"; version="0.10.1"; sha256="1hd26n0mx62vsnvfvypkihj89hnbmvdwyw33h45x4vyiz5h1kd17"; depends=[httpuv caTools RJSONIO xtable digest htmltools]; };
   shinyAce = derive { name="shinyAce"; version="0.1.0"; sha256="1031hzh647ys0d5hkw7cqxj0wgry3rxgq95fgs7slbm0rgx9g6f7"; depends=[shiny]; };
   shinyBS = derive { name="shinyBS"; version="0.20"; sha256="1l95g2rzv53vwx5zcaqiqz8jirncwh1yb14y62x9phg4n5jfk9f8"; depends=[shiny]; };
+  shinyFiles = derive { name="shinyFiles"; version="0.3.2"; sha256="19qzsvk5pqq59hfmzw4fg5fds26y1hqwhgjqf1pkxbmbd337qdik"; depends=[shiny]; };
   shinyRGL = derive { name="shinyRGL"; version="0.1.0"; sha256="07llg1yg5vmsp89jk60ly695zvxky6n06ar77mjxzlyc294akwmy"; depends=[rgl shiny]; };
   SHIP = derive { name="SHIP"; version="1.0.2"; sha256="0b83cclibdz1r7sz968nmca4najwgps9wrdlsh4gxrl7fq40k4ln"; depends=[]; };
-  shotGroups = derive { name="shotGroups"; version="0.4"; sha256="036qa5xdsl10swj6wfjhppksxj351yb0gifif80flzhlw4yl7lca"; depends=[boot coin CompQuadForm energy KernSmooth mvoutlier robustbase]; };
+  shotGroups = derive { name="shotGroups"; version="0.5"; sha256="02v785p5lqjpdp5vn7snpg1wgr7whpp4s4vbiwyaxmfp6kwqk81q"; depends=[boot coin CompQuadForm energy KernSmooth mvoutlier robustbase]; };
   showtext = derive { name="showtext"; version="0.2"; sha256="18pr03n0v2dg93pnp3saar3664dpina33wzmhw13hqcx6nfjgzw7"; depends=[sysfonts]; };
-  shp2graph = derive { name="shp2graph"; version="0-1"; sha256="0bdvv9ygzq7jgbab6i3sclm48r373z9b2jlv9hdq0h4kmxv1wznd"; depends=[maptools igraph]; };
+  shp2graph = derive { name="shp2graph"; version="0-2"; sha256="09gbb7f9h3q2p56dwb2813mr36115ah70szq47jimpymzkd2x08m"; depends=[maptools igraph]; };
   shrink = derive { name="shrink"; version="1.1"; sha256="0avf3502mjz2apy1nnz8a6xp5n77vva5v1n84sn1qimjnz40g58d"; depends=[]; };
-  ShrinkCovMat = derive { name="ShrinkCovMat"; version="1.0.0"; sha256="0l6zf0iizcymdkykkyq81bna5wll0j6wjnkfi5i5lpblz6xh5ddr"; depends=[]; };
+  ShrinkCovMat = derive { name="ShrinkCovMat"; version="1.0.1"; sha256="08cb4r94vywpi5g6gbmjb197694553hyy0lb68wa11k6p3qnsh06"; depends=[]; };
   shuffle = derive { name="shuffle"; version="1.0"; sha256="037i45mfys1nr9sqmmsfb2yd3ba3aa22hc701f5j2zp8jx57qn3k"; depends=[]; };
   siar = derive { name="siar"; version="4.2"; sha256="1c4z72jr81dzkp9xqyrrkwjsalvvksl67pnbaadkc52v84fhzx3r"; depends=[hdrcde coda MASS bayesm mnormt spatstat]; };
   sideChannelAttack = derive { name="sideChannelAttack"; version="1.0-6"; sha256="1xcsy1h8gc8a4f9nzs7zv8x6v55g1pg8vy1kg64iqxm0gnz2f20l"; depends=[MASS corpcor mmap ade4 infotheo]; };
   sidier = derive { name="sidier"; version="2.3"; sha256="08w6xsncs4nbjgmfh1irfjrc7iflg7w4dx3shr9fh0vbsd35g8wl"; depends=[ape network igraph]; };
+  sievetest = derive { name="sievetest"; version="1.2.2"; sha256="0mbgkf014m6bc7qg60vf065i6mvl5n4a0bvg8vb7dw531vsw2771"; depends=[]; };
   sig = derive { name="sig"; version="0.0-4"; sha256="0q5bwaj15jlmcg4qqcdkkwbnqphwgwzcnfzga12xzr912rwjybjr"; depends=[]; };
   sigclust = derive { name="sigclust"; version="1.1.0"; sha256="0151v7lr4n4yyn93j0s06gzc9jh9xhdgvfw6kvpfy24jl6wdii7g"; depends=[]; };
   SightabilityModel = derive { name="SightabilityModel"; version="1.2"; sha256="1piw8i6c3bdwjj20329431is3b7mxij7f1g49g7qw00s197n8qha"; depends=[]; };
   signal = derive { name="signal"; version="0.7-4"; sha256="0sz8im7i46qy5wjpm34a2nqvrc1vipmqlw8ns3i2s1vhcvp7fjs1"; depends=[MASS]; };
   signalextraction = derive { name="signalextraction"; version="2.0.3"; sha256="0kxk32jfkcgkdcq4xfzdf24qr6wkkhl4yf2v4sjqxhviwml2g2aq"; depends=[]; };
+  signal_hsmm = derive { name="signal.hsmm"; version="1.0"; sha256="12v6frrhbaa8y9l3zy41fz8xkzalhp6afw33jad57c8hym4985nz"; depends=[seqinr shiny]; };
   sigora = derive { name="sigora"; version="0.9.2"; sha256="1s3c0xwxabr3n8sb6rjhzkkzbpvcczbgqq6b263yypwasqbg4mlb"; depends=[]; };
-  SigTree = derive { name="SigTree"; version="1.4"; sha256="0kh5fa5i5f8wik8rrwcfz2j66ywv89xhq3670srlli1j8vi4vfa8"; depends=[ape phylobase phyext RColorBrewer]; };
-  SigWinR = derive { name="SigWinR"; version="1.0.2"; sha256="0kwg2ly1lglksibgdh56zvmw7hk9py4kvln9flaf00j9d0f2lj0i"; depends=[]; };
+  SigTree = derive { name="SigTree"; version="1.6"; sha256="1z6z3s6gay3pcjazibb0schipc9qqpp3ahf0f56fq9mhk545125z"; depends=[ape phyext RColorBrewer]; };
   SII = derive { name="SII"; version="1.0.3"; sha256="1k9mvz6g25qs351c0vx7n5h77kb6k833jrcww14ni59yc9jgvsyg"; depends=[]; };
   simba = derive { name="simba"; version="0.3-5"; sha256="14kqxqavacckl5s1518iiwzrmlgbxz1lxy33y8c9qq7xaln41g9h"; depends=[vegan]; };
   simboot = derive { name="simboot"; version="0.2-5"; sha256="0slznwk8i3z76sxbfd4y5rp28jr6jv4i5ynnckpr10i59ba04wlq"; depends=[boot mvtnorm]; };
   SimComp = derive { name="SimComp"; version="1.9.0"; sha256="1qw1bm0pahmvjxwa15q42vifq71lg7rw3dij7vba14sy88746m3g"; depends=[mvtnorm multcomp mratios]; };
   SimCorMultRes = derive { name="SimCorMultRes"; version="1.2"; sha256="0wgi36sdpsippdbawdl7b9bvip0l8gp8xd1v85vznd1dibkfjr1r"; depends=[evd]; };
   simctest = derive { name="simctest"; version="2.4"; sha256="12qxav3qy1s6g8yr6ygbjp3jlrf2p0h3zvl8bnqpk6mx95zw5gh3"; depends=[]; };
-  Sim_DiffProc = derive { name="Sim.DiffProc"; version="2.6"; sha256="1cs9jmb1849kzs38nx8788al0jda2vbx0cry9g3gx4f7v39cc87d"; depends=[]; };
+  Sim_DiffProc = derive { name="Sim.DiffProc"; version="2.7"; sha256="03g70f5rpj1695abbkk0n73bj1hniw6gzckzg3g5zrjczg96xxs8"; depends=[]; };
   simecol = derive { name="simecol"; version="0.8-4"; sha256="0k83zcnvxq89m60d9157w3sn2gwyl6m7812qy1bgn260ac2nqv10"; depends=[deSolve]; };
   simex = derive { name="simex"; version="1.5"; sha256="01706vbmfgcg13w1kq8v5rnk5xggbd1n7fv50c6bvhdyc1dly313"; depends=[]; };
   simexaft = derive { name="simexaft"; version="1.0.7"; sha256="13w9m35qrrp8kkz4gqp7fg9jv8fs99y19n21bdxsd3f5mlkbvqgl"; depends=[mvtnorm survival]; };
@@ -4712,48 +4985,50 @@ let self = _self // overrides; _self = with self; {
   SIMMS = derive { name="SIMMS"; version="0.0.1"; sha256="0s53kc95jbav28kj35isc7j09qpjsk49za8p766z9yfaiw0higp7"; depends=[survival MASS]; };
   simMSM = derive { name="simMSM"; version="1.0.1"; sha256="0lway32vjajlsnkvi7j9hcsaz7bmhzmi1w3r2gr28y5mbkpfkgb2"; depends=[]; };
   simone = derive { name="simone"; version="1.0-2"; sha256="071krim64s7fjwvwq7bjr0pw33mw9am9wpyypcy4gs7g1hj8wcir"; depends=[mixer]; };
-  simPH = derive { name="simPH"; version="1.2"; sha256="1g6jq01ygx41q0giyqmw9adb7qljfqva66pr1rn18zgjnwh0d46f"; depends=[car DataCombine data_table dplyr ggplot2 gridExtra MASS mgcv plyr reshape2 stringr survival quadprog]; };
+  simPH = derive { name="simPH"; version="1.2.2"; sha256="0bhycpip0f06ddgvydr19pdw8hl1yw3rvl781yqpc1zid657wir9"; depends=[car DataCombine data_table dplyr ggplot2 gridExtra MASS mgcv plyr reshape2 stringr survival quadprog]; };
   simpleboot = derive { name="simpleboot"; version="1.1-3"; sha256="1qprjisfflhzg8ll12p3q1zcfdiyc45glic2j9cw9nhx5rb065fk"; depends=[boot]; };
   SimpleTable = derive { name="SimpleTable"; version="0.1-2"; sha256="1rkybrp7zlb7cj37799npss1ldic0yf519q5l7a6ikal4yl1afyb"; depends=[hdrcde locfit MCMCpack]; };
   simplexreg = derive { name="simplexreg"; version="1.0"; sha256="144kljh968i7n2d21r4204i4h952mfrkfc8b5r6x760msgjphxvh"; depends=[Formula plotrix]; };
-  simPopulation = derive { name="simPopulation"; version="0.4.1"; sha256="0vcci28ic6y4ih2l6cbgv0vwa5f7776pa3dvi13rmzbzdjblp1yj"; depends=[nnet POT lattice vcd]; };
   Simpsons = derive { name="Simpsons"; version="0.1.0"; sha256="1pm6wga1yxc35zgz72plzq23d3l4bbzfdvhszdxmkn1pkk64h8ms"; depends=[mclust]; };
-  SimRAD = derive { name="SimRAD"; version="0.93"; sha256="1n1457ckfcxrxi09qxvjrwv1rrqcr9608cas0qd3yhf8xv0zv1hm"; depends=[]; };
-  simsalapar = derive { name="simsalapar"; version="1.0-2"; sha256="0y45g3qvig4nzyd6lmcff3awz1i5jym8jxm96261d3g8fw7fp9vv"; depends=[sfsmisc gridBase colorspace]; };
+  SimRAD = derive { name="SimRAD"; version="0.94"; sha256="0jlq1bmq1xl5inh4s722jjxp54dh3dcpcvdncnzma6yb0inw8sj5"; depends=[]; };
+  simsalapar = derive { name="simsalapar"; version="1.0-3"; sha256="0svfa8xnc5r6xqkwxvlnhml4l708ksgaq8fmnqbr1hwvzc6shypl"; depends=[sfsmisc gridBase colorspace]; };
   simsem = derive { name="simsem"; version="0.5-3"; sha256="12y2jlyys3aq8k7wi13iarzlgiqisp7731vcnd5rvla3cn0bnzrw"; depends=[lavaan]; };
   SimSeq = derive { name="SimSeq"; version="1.0.0"; sha256="142qjkfz53q3g9k37nqhilsw1mcklsa9q05yqvyn9dvj9l06y11i"; depends=[fdrtool]; };
   simSummary = derive { name="simSummary"; version="0.1.0"; sha256="1ay2aq6ajf1rf6d0ag3qghxpwj0f8b3fhpr2k0imzmpbyag1i3gj"; depends=[abind svUnit gdata]; };
+  simTool = derive { name="simTool"; version="1.0"; sha256="005sq9pgmg80k67rn8y1qh88g1qh3hdi7adsrkf5hcbqzs6pzg30"; depends=[plyr reshape]; };
   SimuChemPC = derive { name="SimuChemPC"; version="1.3"; sha256="0ff454rvplr1ad5c9nmq4jbdbgfy5gzlvxfwhnyv2wzvdcyca6rk"; depends=[rcdk]; };
   SimultAnR = derive { name="SimultAnR"; version="1.1"; sha256="0jvmxwmbnx14h27b576dg9mw3c2z0w3m82f51f25zd1darcl06bj"; depends=[]; };
   SIN = derive { name="SIN"; version="0.6"; sha256="0vq80m3vl8spdnlkwvwy0gk3ziyybqzjp3scnfdcpn942ds7sgg9"; depends=[]; };
-  SINGLE = derive { name="SINGLE"; version="1.2"; sha256="13gxv0k7zd4d7ykgxjaf5x0w3c2sf7xsvm16irawm72mr0iwqxnj"; depends=[flsa igraph dse Matrix]; };
-  siplab = derive { name="siplab"; version="1.0"; sha256="1cbjrinnkmcysykp4cldmc8hj4jqfld9pr2bk9a0dqxs2ivwp097"; depends=[spatstat]; };
+  SINGLE = derive { name="SINGLE"; version="1.3"; sha256="0wd7jzys51rnwr5rhf2llpygqxydjrv0dill19v8sz9w0madkil4"; depends=[flsa igraph dse Matrix]; };
+  siplab = derive { name="siplab"; version="1.1"; sha256="1b5drhla4p7n1y1cp7kqwqzw0b286kgij9j6wsks5vjgy5qfal1x"; depends=[spatstat]; };
   sirad = derive { name="sirad"; version="2.0-7"; sha256="009icj1jil757vvsf88sgmdz40swrx1qvrhnx7wwj7p3dlh78pvw"; depends=[zoo ncdf RNetCDF raster]; };
-  sirt = derive { name="sirt"; version="0.44-48"; sha256="1a77yjddigm98j871l0h9c4x63pxv5iy1isipmnsp364468m8r0y"; depends=[MASS coda mvtnorm sfsmisc TAM CDM combinat ic_infer sm psych pbivnorm gtools Rcpp qgraph]; };
-  SIS = derive { name="SIS"; version="0.7-1"; sha256="0v3c5vbc9hl5siyqbv00q5xi79hywp45zv68ww005zmnxdfg2kvn"; depends=[glmnet ncvreg survival]; };
-  sisus = derive { name="sisus"; version="3.9-12"; sha256="0b1gpzhkvhajc6mqww01c5zk71h6q8kqwgaiiqimr5wh4hfbpxi0"; depends=[MASS RColorBrewer coda gtools moments polyapost rcdd]; };
-  sitar = derive { name="sitar"; version="1.0"; sha256="1psz68j2bjhs9zv6966xq25799zg4sxva5xl96ffwxb8mv8y01nd"; depends=[nlme]; };
+  siRSM = derive { name="siRSM"; version="1.1"; sha256="0fx6bfb5c8hdlgjxddwhhzr09ls53kfgn36hjk9zi5z8m14a7wbn"; depends=[rsm MASS foreach doSNOW]; };
+  sirt = derive { name="sirt"; version="0.46-15"; sha256="0r6qhv1mcxms231s7s1xscdjadj87qvbi0mkdf8krb7285x69k2y"; depends=[sfsmisc TAM CDM combinat ic_infer sm psych pbivnorm gtools Rcpp qgraph lavaan semPlot igraph coda mvtnorm MASS]; };
+  SIS = derive { name="SIS"; version="0.7-4"; sha256="0a8apfjzfwd5a2cvkviwvqlp26hqr34lba65cq5hxf9n05x2s7rx"; depends=[glmnet ncvreg survival]; };
+  sitar = derive { name="sitar"; version="1.0.1"; sha256="1ji8742f518fzg8xz0dy5irwdz7a0nymajh69zd2l53yvcsnlwdp"; depends=[nlme]; };
   sitools = derive { name="sitools"; version="1.4"; sha256="0c0qnvsv06g6v7hxad96fkp9j641v8472mbphvaxa60k3xc7ackb"; depends=[]; };
   SixSigma = derive { name="SixSigma"; version="0.8-1"; sha256="15jdr10a7a6wv50vz9y6qcrbhnddl8zh4j4d48xrarrqbjy6l4p7"; depends=[qcc lattice ggplot2 reshape2 nortest testthat]; };
   SiZer = derive { name="SiZer"; version="0.1-4"; sha256="0kiwvxrfa2b49r2iab5v2aysc2yzk5ck3h41f2hr0vq5pdnz0qy5"; depends=[boot]; };
   sjdbc = derive { name="sjdbc"; version="1.5.0-71"; sha256="0i9wdfadfcabayq78ilcn6x6y5csazbsgd60vssa2hdff0ncgvk1"; depends=[rJava]; };
-  sjPlot = derive { name="sjPlot"; version="1.4.1"; sha256="18mw0zvd8ll5n66wpyi9s1g2wjddsadkwwqp5n86bzfxazfqm5kd"; depends=[ggplot2 MASS car foreign lmtest plyr psych reshape2 scales]; };
+  sjPlot = derive { name="sjPlot"; version="1.4.2"; sha256="1vw66yz6j7inyb17krb0q830i9ik6wk3a1a1mn8gv1nhm48j8qlq"; depends=[ggplot2 MASS car foreign lmtest plyr psych reshape2 scales]; };
   SKAT = derive { name="SKAT"; version="0.95"; sha256="0jvcwckx7m5jc929ip2fqppgl1c9cx7bpybx986fs25gg7m808d4"; depends=[]; };
   skatMeta = derive { name="skatMeta"; version="1.4.3"; sha256="0bknv066ya4yl4hl4y02d9lglq2wkl9c2j1shzg3d64dg4sjvbak"; depends=[Matrix coxme survival CompQuadForm]; };
   skda = derive { name="skda"; version="0.1"; sha256="0a6mksr1d0j3pd0kz4jb6yh466gvl4fkrvgvnlmvivpv6b2gqs3q"; depends=[]; };
   SkewHyperbolic = derive { name="SkewHyperbolic"; version="0.3-2"; sha256="00l1bz3wxvs7qwl4sy814w6nrh0k79ldck5zd6c5alvg50hjwwk3"; depends=[DistributionUtils GeneralizedHyperbolic RUnit]; };
   skewt = derive { name="skewt"; version="0.1"; sha256="1xm00zfzjv53cq9drfcx7w2ri5dwsq7kajrk2hc1mvw0b6s4x2ix"; depends=[]; };
-  Skillings_Mack = derive { name="Skillings.Mack"; version="1.0-2"; sha256="02rmla48ls3fx4y5yshngsxijna2zrbpnvzb13r731l9lf9vxdv7"; depends=[MASS gregmisc matrixcalc gtools]; };
+  Skillings_Mack = derive { name="Skillings.Mack"; version="1.0-2"; sha256="1spf77ix9d264r126hnrjm7z8fw19v1bk5pqhqcf6lm93zlcgh8i"; depends=[MASS matrixcalc gtools]; };
   skmeans = derive { name="skmeans"; version="0.2-6"; sha256="1ncas6mx9w5saz28vvwni8g0wbm6m7gfv8a7azw4305pc64bawam"; depends=[slam clue cluster]; };
   slam = derive { name="slam"; version="0.1-32"; sha256="000636dwj4kmj5w1w5s6bqixh78m7262y3fgizj7rfhcnc2gz7ad"; depends=[]; };
   SLC = derive { name="SLC"; version="0.3"; sha256="0l0y1sjj0glsb7vwla99ijclcgaq2y85bgz1wqm348n4shsmm2rs"; depends=[]; };
   Sleuth2 = derive { name="Sleuth2"; version="1.0-7"; sha256="1zav2g1yqc6bvzap4r5xwy9abkdj8iswivj5y2lylc25nkxwcswg"; depends=[]; };
   Sleuth3 = derive { name="Sleuth3"; version="0.1-6"; sha256="0q8sgh2szqnxc289vgi5v0sljzz8yb803ijx9w5mswdxw87z2dq3"; depends=[]; };
+  slfm = derive { name="slfm"; version="0.1"; sha256="0s5q6ank6075sls9pkqhf7jlvi6gyvsbxa99c34d6ccrv88skyzq"; depends=[Rcpp coda]; };
   SLHD = derive { name="SLHD"; version="1.2-1"; sha256="0n5j20hp7kgi23gjprcwcaji8wdz5wwqqyc7i8dv0058fz2b5gzc"; depends=[]; };
+  slp = derive { name="slp"; version="1.0-3"; sha256="09jyrp6y3rigy043d8s5i7nh89pgpvn3cv51mr729c9ccr6jdjb1"; depends=[mgcv]; };
   sltl = derive { name="sltl"; version="1.0"; sha256="08bh76qs4if17iw51wic1r9v17wldyqgmbyfpccqp49x7ajxnwhq"; depends=[FitAR timeSeries lubridate]; };
   sm = derive { name="sm"; version="2.2-5.4"; sha256="0hnq5s2fv94gaj0nyqc1vjdjd64vsp9z23nqa8hxvjcaf996rwj9"; depends=[]; };
   smaa = derive { name="smaa"; version="0.2-2"; sha256="1xd5yd63j67w9kb3sl3jbxkvd76270c1wlg9r3k85dm2mjd0l38v"; depends=[]; };
-  smacof = derive { name="smacof"; version="1.2-3"; sha256="0n0j7w4kydnzd6hhnc6632waqzk63lgm8mwjwzp5nj3h1v4c528x"; depends=[polynom rgl scatterplot3d Hmisc colorspace]; };
+  smacof = derive { name="smacof"; version="1.5-0"; sha256="06csyz9fvdicxm11wh9mp6i4mvlgxyiclhlyg45grag0kqjgg6ha"; depends=[rgl polynom scatterplot3d Hmisc colorspace nnls]; };
   smam = derive { name="smam"; version="0.2-2"; sha256="1p6bzk4b9kpmfs4nxmcgc46hgdpldqg0pzpc0zhvs187z2nrfw75"; depends=[Matrix]; };
   smart = derive { name="smart"; version="1.0.1"; sha256="0ki3qn71zrw0nyv395qijcwahnxyv1p21j8x6cxr9spah2wzz8lb"; depends=[Matrix gplots gtools PMA elasticnet pcaPP igraph]; };
   SmarterPoland = derive { name="SmarterPoland"; version="1.2"; sha256="1ga2m9kbn269dx21k5q1drlw9hph99fsfdx2mfnajwlgpycgf6m9"; depends=[reshape rjson]; };
@@ -4773,7 +5048,7 @@ let self = _self // overrides; _self = with self; {
   smirnov = derive { name="smirnov"; version="1.0-1"; sha256="09mpb45wj8rfi6n6822h4c335xp2pl0xsyxgin1bkfw97yjcvrgk"; depends=[]; };
   SmithWilsonYieldCurve = derive { name="SmithWilsonYieldCurve"; version="1.0.1"; sha256="0qvhd1dn2wm9gzyp6k7iq057xqpkngkb4cfmvmjqmf0vhysp371w"; depends=[]; };
   SML = derive { name="SML"; version="0.1"; sha256="0pdj7321wy50v5l23hknlm30kp8cfgn072pbbifyp8qzmk0hyd8h"; depends=[glmnet Matrix lattice]; };
-  SMNCensReg = derive { name="SMNCensReg"; version="2.3"; sha256="0gyqv31isvn1xzwnzsi9c4ilj2j8h96a5z65yvf1l6bbrp140xw6"; depends=[Matrix PerformanceAnalytics]; };
+  SMNCensReg = derive { name="SMNCensReg"; version="2.4"; sha256="1q5yjc1njlm3hd33fdjv9d46jawr5l7r1zzj4m22spd2q5cpv04i"; depends=[Matrix PerformanceAnalytics]; };
   SmoothHazard = derive { name="SmoothHazard"; version="1.0.9"; sha256="01ipdkb51zwrwb1gj344y4gl0934y8j54738rdzffl2lq6r3w7kv"; depends=[prodlim mvtnorm]; };
   smoothHR = derive { name="smoothHR"; version="1.0.1"; sha256="02kjqkgnhjwhq1vmva9nmy36a7bc6zjj6g81dw9m4zd3y9nbb005"; depends=[survival]; };
   smoothie = derive { name="smoothie"; version="1.0-1"; sha256="12p4ig8fbmlsby5jjd3d27njv8j7aiwx0m2n1nmgvjj0n330s1kj"; depends=[]; };
@@ -4782,15 +5057,15 @@ let self = _self // overrides; _self = with self; {
   smoothtail = derive { name="smoothtail"; version="2.0.3"; sha256="0yr3j5mq1h9pd72kyi9z6wzly9cqkscim814yi710y79l03gp0fd"; depends=[logcondens]; };
   SMPracticals = derive { name="SMPracticals"; version="1.4-2"; sha256="0apmkmsv2fqmxpgq08n9k9dvcknj74s4cpp0myjcd6kibb7g9slq"; depends=[ellipse MASS nlme survival]; };
   SMR = derive { name="SMR"; version="1.0.0"; sha256="1479rkzwciw6h2r43wip52fmv5im33jrdphahcg38rfdqbx5ayrr"; depends=[]; };
-  sms = derive { name="sms"; version="2.2"; sha256="049wh6d44b9iy1cfzkqy2iqwn5n5hyzq4xvd6w92r70qhjj8km4i"; depends=[doParallel foreach]; };
+  sms = derive { name="sms"; version="2.3"; sha256="0grxyp590hj2rvw1fw3yidzkl8nqqp5a14bp9xfpdph2nyas61qq"; depends=[doParallel foreach]; };
   smss = derive { name="smss"; version="1.0-1"; sha256="17a0x92hxzn212yiz87n7ssyi3bdhnyawxk1kkmk46q1ss22a1pm"; depends=[]; };
   SMVar = derive { name="SMVar"; version="1.3.3"; sha256="17wr4lixy3p32gr4jq02d7zsr88yrbddjsvynzdsdrwbxf4mwqhp"; depends=[]; };
-  sn = derive { name="sn"; version="1.0-0"; sha256="1g4i49zsdas6bb1fbr8cpgqilb597jl2zypamf5m10nsd35y07kx"; depends=[mnormt numDeriv]; };
+  sn = derive { name="sn"; version="1.1-0"; sha256="0agilvhrg3x8xqysa098qjj0nzvfx6yps6v85jiwllhd1dp70fnl"; depends=[mnormt numDeriv]; };
   sna = derive { name="sna"; version="2.3-2"; sha256="1dmdv1bi22gg4qdrjkdzdc51qsbb2bg4hn47b50lxnrywdj1b5jy"; depends=[]; };
   snapshot = derive { name="snapshot"; version="0.1.2"; sha256="0cif1ybxxjpyp3spnh98qpyw1i5sgi1jlafcbcldbqhsdzfz4q10"; depends=[]; };
   SNFtool = derive { name="SNFtool"; version="2.1"; sha256="12kjxgjazb0qivcyg0lkqlvkdk7algpw3s1ir8p5if5c8cpicjyy"; depends=[]; };
   snow = derive { name="snow"; version="0.3-13"; sha256="1habq43ncac9609xky3nqfkbq52cz36dg8jbdihag269z1kazdnf"; depends=[]; };
-  SnowballC = derive { name="SnowballC"; version="0.5"; sha256="0cx73c7jpz8fxskkjp9ln003gb17qdxc9znhmsdkhqpdnahh3xaf"; depends=[]; };
+  SnowballC = derive { name="SnowballC"; version="0.5.1"; sha256="0kbg33hy6m2hv9jspyx6naqmk2q6h2zmvvczjmkwqvlhzlj0c5s4"; depends=[]; };
   snowfall = derive { name="snowfall"; version="1.84-6"; sha256="1n9v9m4c02pspgkxfmq7zdk41s2vjcsk06b0kz9km4xy1x7k0hsg"; depends=[snow]; };
   snowFT = derive { name="snowFT"; version="1.3-0"; sha256="10hhhzzzyz1ph7c8k08s79h4pdwq4jk8bh47y37ww0yjq0fd6gik"; depends=[snow]; };
   SNPassoc = derive { name="SNPassoc"; version="1.9-2"; sha256="113byj8zbg6xyxb1qzm76sqfyk3fap0sd90691zzm1x2pbfnb3mh"; depends=[haplo_stats survival mvtnorm]; };
@@ -4799,20 +5074,21 @@ let self = _self // overrides; _self = with self; {
   SNPmaxsel = derive { name="SNPmaxsel"; version="1.0-3"; sha256="0pjvixwqzjd3jwccc8yqq9c76afvbmfq0z1w0cwyj8bblrjpx13z"; depends=[mvtnorm combinat]; };
   SNPMClust = derive { name="SNPMClust"; version="1.0"; sha256="1vyag8axrl888qhjsbv7g84hzfsnvxh5ccdcdriamy50c2chkji8"; depends=[MASS mclust]; };
   snp_plotter = derive { name="snp.plotter"; version="0.5.1"; sha256="16apsqvkah5l0d5qcwp3lq2jspkb6n62wzr0wskmj84jblx483vv"; depends=[genetics]; };
-  SNPRelate = derive { name="SNPRelate"; version="0.9.19"; sha256="19cz0jlsiy4fhhb54bbsmd2lwhsq8jmw6ccc7ir1j57cw1lzrk64"; depends=[gdsfmt]; };
   snpStatsWriter = derive { name="snpStatsWriter"; version="1.5-6"; sha256="04qhng888yih8gc7yd6rrxvvqf98x3c2xxz22gkwqx59waqd4jlq"; depends=[colorspace]; };
   SNPtools = derive { name="SNPtools"; version="1.1"; sha256="0l29kiqz4048x7amxx1qzkaw2xnd6lpdsdp5nq3rck9amx2hw64a"; depends=[]; };
-  SNSequate = derive { name="SNSequate"; version="1.1-0"; sha256="1cmnq4glhwwxim6lrls3vd234w3klkrpsid61rhzrli43297sibw"; depends=[magic]; };
+  SNSequate = derive { name="SNSequate"; version="1.1-1"; sha256="1jgpjws5apysp55pwy3x8mbzy4zjvv39anp6j2x4lgczh5nf49b6"; depends=[magic]; };
   SOAR = derive { name="SOAR"; version="0.99-11"; sha256="1n38gx5sxpkqfkk4y6vpp6g19b8bs5bisni9wn6311s0csizp86m"; depends=[]; };
   soc_ca = derive { name="soc.ca"; version="0.7.1"; sha256="0lg1bpbd0crywa29xc79cn3kr614wq4hr09xpwk17nv7q8qw8cnh"; depends=[ggplot2 gridExtra ellipse scales]; };
+  SocialMediaMineR = derive { name="SocialMediaMineR"; version="0.1"; sha256="113nyjncl5yi61hz8i7k60b3f0f9a5vyrd3s72nbmc44cnvr8fci"; depends=[RCurl jsonlite httr]; };
   SocialNetworks = derive { name="SocialNetworks"; version="1.0"; sha256="0g6l1rf08qz0332fglc2gvkba55fjq9fiwf25rjqanh6spgk60fn"; depends=[Rcpp]; };
+  SOD = derive { name="SOD"; version="1.0"; sha256="0f0rh1qsjzxb3zzr440kvl6fnnj7dvc5apdzs5hpf6xrlfg863pk"; depends=[Rcpp]; };
   SoDA = derive { name="SoDA"; version="1.0-6"; sha256="0sh2dan4ga2k14rirnkvgzsvbksx1k4ika5gkf5cy247rjkqnpj0"; depends=[]; };
   SODC = derive { name="SODC"; version="1.0"; sha256="18s4rcp5dzchvwrzzbfhbs3x91zlg1rymjarxjk5i429mfrn0krx"; depends=[magic ppls psych MASS]; };
   softclassval = derive { name="softclassval"; version="1.0-20130317"; sha256="1ifqm4a3xxi9wd4l1q4l5h4q5f8hp0k28mqpszzj8k1czbph88ql"; depends=[arrayhelpers]; };
   SoftClustering = derive { name="SoftClustering"; version="0.14.02"; sha256="15j79h1ccvzfpi55prbv2d7bms1grgry0ka58cr757cvwavrnbb8"; depends=[]; };
   softImpute = derive { name="softImpute"; version="1.0"; sha256="0pkpr8pxvrrw4p95907bnhl3k54dxz5r2fk8zi56kilrarhzchqr"; depends=[Matrix]; };
   soilDB = derive { name="soilDB"; version="1.3-2"; sha256="0rpkj9rjk75nz4dp0hkp4xjmd5s4lwppabbdqppwc5xs0565rdb6"; depends=[RODBC aqp plyr Hmisc]; };
-  soilphysics = derive { name="soilphysics"; version="1.0"; sha256="1abw5b35g5fz12ka3sl8b84ffxf0x99dsv1d7ns8il2f5j0zxr7h"; depends=[rpanel]; };
+  soilphysics = derive { name="soilphysics"; version="1.1"; sha256="1a7dcdhqm4dfdyicbpwc1wlj13y1pwkicyqkam1pizd5wblhr97b"; depends=[rpanel MASS]; };
   soilprofile = derive { name="soilprofile"; version="1.0"; sha256="0sdfg6m2m6rb11hj017jx2lzcgk6llb01994x749s0qhzxmvx9mb"; depends=[aqp lattice munsell splancs]; };
   SoilR = derive { name="SoilR"; version="1.1-23"; sha256="1cryypgnbck5hvkc2izrd8r10q2b97f2p1s46x4dk8p099gck5wg"; depends=[deSolve RUnit]; };
   soil_spec = derive { name="soil.spec"; version="2.1.3"; sha256="17fm4hyx8g6pj7qv11xlnx459x1s41fapz6ck4my9br734gcm4ns"; depends=[KernSmooth wavelets hexView pls]; };
@@ -4830,69 +5106,73 @@ let self = _self // overrides; _self = with self; {
   soobench = derive { name="soobench"; version="1.0-73"; sha256="1y2r061pd4kr0kdgp8db3qy2aj07jdiyvy2py4fmwg6b8pcf9y0l"; depends=[]; };
   SortableHTMLTables = derive { name="SortableHTMLTables"; version="0.1-3"; sha256="1jgrqsm0cj8qlk0s4qn3b83w96mgpp5gmhgcg9q2glc72v8c4ljh"; depends=[testthat brew]; };
   sortinghat = derive { name="sortinghat"; version="0.1"; sha256="1wrxwhdp3gj1ra0rgldnmc0w019bnjb6z9j20c5p1ab09x4dmlny"; depends=[MASS bdsmatrix mvtnorm]; };
-  sorvi = derive { name="sorvi"; version="0.4.05"; sha256="1pp0pj4nkayx133qsrqcg8jhbhf1cfs8m6jxh1nl4vb43gvk43sw"; depends=[pxR RCurl rjson sp spdep RColorBrewer RgoogleMaps XML gdata ggplot2 maptools plyr png reshape reshape2 rgdal rgl]; };
+  sorvi = derive { name="sorvi"; version="0.6.23"; sha256="070g6kxnacqwzl4djhbb5zjvp71997xl2l53cfni05yf7mkm17as"; depends=[reshape pxR ggplot2 plyr RColorBrewer XML]; };
   sos = derive { name="sos"; version="1.3-8"; sha256="0vcgq8hpgdnlmkxc7qh1jqigr0gvm9x3w4ijbhma7x4i5fx3c2il"; depends=[brew]; };
   sos4R = derive { name="sos4R"; version="0.2-11"; sha256="0r4lficx8wr0bsd510z4cp6la32xf928rsiznbywpxghnypsrcgg"; depends=[XML RCurl sp]; };
   sotkanet = derive { name="sotkanet"; version="0.9.03"; sha256="1h8jmwv99hcrl5hkd99ypphvl8hx6k765vb8aphzp8a0vh42pkl1"; depends=[ggplot2 rjson]; };
   soundecology = derive { name="soundecology"; version="1.1.1"; sha256="0md33ipcqcsbl361s242c4wk9szsl8sywks6ikzljabrfpjy3bkp"; depends=[pracma oce ineq vegan tuneR seewave]; };
   source_gist = derive { name="source.gist"; version="1.0.0"; sha256="03bv0l4ccz9p41cjw18wlz081vbjxzfgq3imlhq3pgy9jdwcd8fp"; depends=[RCurl rjson]; };
   sp = derive { name="sp"; version="1.0-15"; sha256="1pzkh1zzp61x9qg7k466syip1bcmp8m2j9vr964nv0fha9cfq6aj"; depends=[lattice]; };
+  sp23design = derive { name="sp23design"; version="0.9"; sha256="1ihvcld19cxflq2h93m9k9yaidhwixvbn46fqqc1p3wxzplmh8bs"; depends=[mvtnorm survival]; };
   spa = derive { name="spa"; version="2.0"; sha256="1np50qiiy3481xs8w0xfmyfl3aypikl1i1w8aa5n2qr16ksxrnq3"; depends=[cluster MASS]; };
   SPA3G = derive { name="SPA3G"; version="1.0"; sha256="0fcbrg43c5r2n5p7bb8wslqzhl5h31paxr9rla583lkm0baxnmym"; depends=[]; };
   spaa = derive { name="spaa"; version="0.2.1"; sha256="0qlfbfvv97avbnixm5dz9il3dmd40wnpvv33jh7fa0mh740bircy"; depends=[]; };
   space = derive { name="space"; version="0.1-1"; sha256="1qigfz62xz47hqi43aii3yr4h7ddvaf11a5nil7rqprgkd0k6mv3"; depends=[]; };
-  SPACECAP = derive { name="SPACECAP"; version="1.0.6"; sha256="0nbvplcn4yhf3jgprvbil8cdcb8sx8h6l7djwn7pnv1dxprv71lg"; depends=[TeachingDemos coda lattice]; };
+  SPACECAP = derive { name="SPACECAP"; version="1.1.0"; sha256="1m5x2rydppib6fj7wlc6pq4gyvyvhw49yx9qgy4c2rk648wxnhrj"; depends=[coda]; };
   spaceExt = derive { name="spaceExt"; version="1.0"; sha256="0lp8qmb7vcgxqqpsi89zjy7kxpibg3x2mq205pjmsrbbh7saqzr4"; depends=[limSolve glasso]; };
   spacejam = derive { name="spacejam"; version="1.1"; sha256="1mdxmfa1aifh3h279cklm4inin0cx3h0z2lm738bai34j6hpvar7"; depends=[igraph Matrix]; };
   spacetime = derive { name="spacetime"; version="1.1-0"; sha256="0hmwlvam57i58lhfy9328ld1w4c5ilif6s1wvz6l9zvh036169zi"; depends=[sp zoo xts intervals lattice rgeos]; };
   spacodiR = derive { name="spacodiR"; version="0.13.0115"; sha256="0c0grrvillpwjzv6fixviizq9l33y7486ypxniwg7i5j6k36nkpl"; depends=[picante colorspace Rcpp]; };
   spacom = derive { name="spacom"; version="1.0-4"; sha256="1jfsbgy7b0mwl4n2pgrkkghx9p8b0wipvg4c5jar6v8ydby6qg94"; depends=[spdep foreach iterators lme4 nlme Matrix]; };
   spam = derive { name="spam"; version="0.41-0"; sha256="0pky172hycis2idq4274f9i4vhvj3lz7fpr869vm4qklb91j81sp"; depends=[]; };
-  spaMM = derive { name="spaMM"; version="1.1"; sha256="1jmp33ifnskwxziwkwkhb9zrq2mgl0nayzl2wrxadiqpjjad3603"; depends=[Matrix MASS lpSolveAPI]; };
+  spaMM = derive { name="spaMM"; version="1.2.0"; sha256="0q8gfy9f0hrf82yp4rnwmjpyh97dz4yx1bhxiww8lh3dsbaagjns"; depends=[Matrix MASS lpSolveAPI proxy geometry Rcpp]; };
   SPAr = derive { name="SPAr"; version="0.1"; sha256="068jlsvaxx80ih6n86286m2r75cvy6w0m51vpj4gfclhh38py4p4"; depends=[]; };
   sparc = derive { name="sparc"; version="0.9.0"; sha256="0jsirrkmvrfxav9sphk8a4n52fg0d1vnk3i8m804i4xl0s7lrg8s"; depends=[]; };
   sparcl = derive { name="sparcl"; version="1.0.3"; sha256="1348pi8akx1k6b7cf4bhpm4jqr5v8l5k086c7s6rbi5p6qlpsrvz"; depends=[]; };
-  sparkTable = derive { name="sparkTable"; version="0.9.6"; sha256="1q8xc672rr1yy7aaklcn7i93k09l8sxzf20i1nqwynwy3fb3kv66"; depends=[xtable Cairo Rglpk StatMatch gridExtra RGraphics ggplot2 pixmap]; };
+  sparkTable = derive { name="sparkTable"; version="0.11.0"; sha256="1293w8xyav7fqrsicx61g4hfq4v4pcd00msi2rm9y5y51b313pm1"; depends=[Cairo gridExtra ggplot2 shiny xtable StatMatch Rglpk pixmap RGraphics]; };
   sparktex = derive { name="sparktex"; version="0.1"; sha256="0r6jnn9fj166pdhnjbsaqmfmnkq0qr1cjprihlnln9jad05mrkjx"; depends=[]; };
   SPARQL = derive { name="SPARQL"; version="1.16"; sha256="0gak1q06yyhdmcxb2n3v0h9gr1vqd0viqji52wpw211qp6r6dcrc"; depends=[XML RCurl]; };
-  sparr = derive { name="sparr"; version="0.3-4"; sha256="1d0rbiwl6149i8izdjrp48fxgk23xk94xm3gbrwpjv37x8fhzy6y"; depends=[spatstat rgl MASS]; };
+  sparr = derive { name="sparr"; version="0.3-5"; sha256="0vyy4zvvmkdr285wmmd3c84mvkwsz367k44b2i1j0sfj62m9w7q2"; depends=[spatstat rgl MASS]; };
   sparseBC = derive { name="sparseBC"; version="1.0"; sha256="16x581pm9fkbb4kp8lvz95mnckgrjbiwj9zin8hzyxdl1nrg4c3m"; depends=[glasso]; };
   sparsediscrim = derive { name="sparsediscrim"; version="0.2"; sha256="0m8ccmqpg1np738njavf736qh917hd3blywyzc3vwa1xl59wqccl"; depends=[corpcor bdsmatrix mvtnorm]; };
   SparseGrid = derive { name="SparseGrid"; version="0.8.2"; sha256="057xbj2bhjm9i32kn39iscnqqdsvsmq0b8c92l8hnf9avf1sx10x"; depends=[]; };
   sparseHessianFD = derive { name="sparseHessianFD"; version="0.1.1"; sha256="15x9v7b40mxl1z9ncazxzfzz7igvzmck22wlgj2y7c2ja8jxi6n2"; depends=[Rcpp RcppEigen Matrix]; };
   sparseLDA = derive { name="sparseLDA"; version="0.1-6"; sha256="0k9v2pjx4q4nhvpjhv496v4gfr5h19w0h2h7za7j6zqfn6aygvz6"; depends=[lars elasticnet MASS mda]; };
   sparseLTSEigen = derive { name="sparseLTSEigen"; version="0.2.0"; sha256="11llmrkq0pnrdphgjvhmg269bq3xbbn4s7kd7xhvk62sigvspkcj"; depends=[robustHD Rcpp RcppEigen]; };
-  SparseM = derive { name="SparseM"; version="1.03"; sha256="11wwh7z8k1vdxfg0z1d71q6g5mx92xi3fdz3mzq64m78nhqa36ij"; depends=[]; };
+  SparseM = derive { name="SparseM"; version="1.05"; sha256="041mkl0dlydlar0v0a66n9s1n0klayr08hwzpmwr2hsr05z0z380"; depends=[]; };
   sparseMVN = derive { name="sparseMVN"; version="0.1.0"; sha256="1xcq1w80ypqdz4zxwhnnzc50lhja6qxfxxnrg5xkgzpmy1zvjbzq"; depends=[Matrix]; };
   sparsenet = derive { name="sparsenet"; version="1.2"; sha256="106a2q4syrcnmicrx92gnbsf2i5ml7pidwghrpl6926glj59j248"; depends=[glmnet shape]; };
-  spartan = derive { name="spartan"; version="1.3"; sha256="063nfxh8y0319y35lg3vlamjya0nsba81dijp2nahikwg1c1b67s"; depends=[]; };
+  spartan = derive { name="spartan"; version="2.0"; sha256="05xzhmyfx6krdsrqy2x8rsybvh3pc88nrggk955lqy7vwrdpf1j7"; depends=[]; };
   spatcounts = derive { name="spatcounts"; version="1.1"; sha256="0rp8054aiwc62r1m3l4v5dh3cavbs5h2yb01453bw9rwis1pj2qm"; depends=[]; };
   spate = derive { name="spate"; version="1.3"; sha256="17aiqi5cd17y9kaqx9yssk772ghcldk9i4s8nyafq8zp8d4r85i1"; depends=[mvtnorm truncnorm]; };
   spatgraphs = derive { name="spatgraphs"; version="2.62"; sha256="1h7sv6qc5zhaiaqlrzagrlc2mxlasdzilmi5q9nrd1vsdzsqxvb4"; depends=[]; };
   spatial = derive { name="spatial"; version="7.3-8"; sha256="1vc6pc5i7nbazbh5y3hhr9kgaq0gd9xi89xc8ah4n0lrivjbxfa8"; depends=[]; };
   spatialCovariance = derive { name="spatialCovariance"; version="0.6-8"; sha256="06z6jz9sadqc382w07ysnnlhqc96hxaasz9wncbhipd4cd1y4daa"; depends=[]; };
-  SpatialEpi = derive { name="SpatialEpi"; version="1.2"; sha256="1mf2ni9jbrhj14k8c5fm9hxzpralx3aszczn6p6lk7wbmjh8j29k"; depends=[sp MASS maps maptools shapefiles spdep gtools rgeos lattice Matrix nlme]; };
+  SpatialEpi = derive { name="SpatialEpi"; version="1.2.1"; sha256="02mvahpbrlcnxmf272fk46wykv9s2lcjqd5yhd80dfs78qjwly77"; depends=[sp Rcpp MASS maptools spdep]; };
   SpatialExtremes = derive { name="SpatialExtremes"; version="2.0-0"; sha256="0fjh4cjzljwzxk4bhcrff9wnkskaiawbj7z6swrj1xl35mq4dljx"; depends=[]; };
+  spatial_gev_bma = derive { name="spatial.gev.bma"; version="1.0"; sha256="1rjn0gsbgiv69brhnm0zj25ya3nyfh4yf6jizng85mvss3viv3hj"; depends=[SpatialExtremes msm coda]; };
   spatialkernel = derive { name="spatialkernel"; version="0.4-19"; sha256="0gbl6lrbaxzv2f975k0vd6ghrljgf1kjazld3hm7781kv1f87lji"; depends=[]; };
   SpatialNP = derive { name="SpatialNP"; version="1.1-1"; sha256="108gxk0gbbjck9bgxvqb9h216ww21lmh2by0hrhzwx5r63hhcbmd"; depends=[]; };
-  SpatialPack = derive { name="SpatialPack"; version="0.2"; sha256="1kvqsqgh627fmi3bdd0pcxv9byjraz47ax7c6w4jxdngfs7xpfzc"; depends=[]; };
+  SpatialPack = derive { name="SpatialPack"; version="0.2-3"; sha256="1gs0x3wj3hj663m6kszwhy3ibcx0lrslr127miy1rhz8683ij71c"; depends=[]; };
   spatialprobit = derive { name="spatialprobit"; version="0.9-10"; sha256="1z88nss69pixazqk3b6rpyc7mjryfznrgw9swfyfxky0bsdfj6mv"; depends=[Matrix spdep mvtnorm tmvtnorm]; };
   spatialsegregation = derive { name="spatialsegregation"; version="2.40"; sha256="0kpna2198nrj93bjsdgvj85wnjfj18psdq919fjnnhbzgzdkxs7l"; depends=[spatstat]; };
   spatialTailDep = derive { name="spatialTailDep"; version="1.0"; sha256="070jsz86jc4qvwa8j9gfksy23hf0wgj307w7jd5107ng1f42047v"; depends=[cubature mvtnorm SpatialExtremes]; };
-  spatial_tools = derive { name="spatial.tools"; version="1.3.8"; sha256="0lpkfr1h8bbpkgzpgav4258f23wzq45id8gbxd5cgk0s15g0rh1m"; depends=[iterators foreach rgdal raster mmap abind doParallel]; };
-  SpatialTools = derive { name="SpatialTools"; version="0.5.7"; sha256="1l6b895znww4g1ga88pskp1s6czg5qvl6wfzmifp866mbndsxmx7"; depends=[spBayes Rcpp]; };
-  SpatialVx = derive { name="SpatialVx"; version="0.2-0"; sha256="0amsdh5cwcd27ws6fcgv5rxhmw6kfg7vrmzrj62fi93ajp4aiq4y"; depends=[spatstat fields smoothie smatr turboEM distillery maps boot CircStats fastcluster waveslim]; };
+  spatial_tools = derive { name="spatial.tools"; version="1.4.8"; sha256="0qnsjfx974na87p3n7sp711sc13v6dmpvb2kjpvscixs8rsy03y1"; depends=[iterators foreach rgdal raster mmap abind doParallel]; };
+  SpatialTools = derive { name="SpatialTools"; version="0.5.8"; sha256="18zchr8bfjqdr9j6vh6365mhrj2n0ns1ixvmas5s0ppiim59jl7j"; depends=[spBayes Rcpp]; };
+  SpatialVx = derive { name="SpatialVx"; version="0.2-1"; sha256="0j6m698nyd9nq0qx1s2ykk05q2scj9jb0m813r0xyymf0sl0l90a"; depends=[spatstat fields smoothie smatr turboEM distillery maps boot CircStats fastcluster waveslim]; };
   SpatioTemporal = derive { name="SpatioTemporal"; version="1.1.7"; sha256="0rc5zf8cnjw59azgqmslfz2dl5i17dfmb7ls5c849qybp2gn2zdv"; depends=[Matrix MASS]; };
-  spatstat = derive { name="spatstat"; version="1.36-0"; sha256="0z4ls57328aagcx700zwhq1rawi21yiilms1rvpnshaa9gc2fy79"; depends=[mgcv deldir abind tensor polyclip]; };
-  spatsurv = derive { name="spatsurv"; version="0.9-1"; sha256="0hmhw90rsnv01cbs07z2w4ihhvwhrmrgv3nysk745vm57lpqy7bk"; depends=[survival flexsurv sp iterators RandomFields fields rgl Matrix FNN]; };
+  spatstat = derive { name="spatstat"; version="1.37-0"; sha256="1vz22y6k79xqbcl5qdbjn36qwlc7sh7jlcvrdq9v1sbmqvdj2j23"; depends=[mgcv deldir abind tensor polyclip]; };
+  spatsurv = derive { name="spatsurv"; version="0.9-6"; sha256="0gq0m27i96v3pasq8b4d6dyi6x3irxm648f3l2sw693dm12gcqrx"; depends=[survival sp iterators RandomFields fields rgl Matrix stringr]; };
   spBayes = derive { name="spBayes"; version="0.3-8"; sha256="0pmriffqnblqyd1332a2pqrjr7y3wllb17swb403h7c9dph6mzzv"; depends=[coda magic abind Formula]; };
+  spBayesSurv = derive { name="spBayesSurv"; version="1.0.0"; sha256="17di7irh9sad3jviw8adp3z0v1qi8j6rsh2wv0y6k59milflsdn9"; depends=[Rcpp survival]; };
   spc = derive { name="spc"; version="0.5.0"; sha256="0bh4a3dpavczckhpwqax1h5w73ai3mkf0nwq9nhlvkdrh6k6j6cy"; depends=[]; };
   spcadjust = derive { name="spcadjust"; version="0.1-2"; sha256="1i64hbslsmnap6ljwpzygrbcb2q1zp0jsm02x2a29nyxq05wwrrv"; depends=[]; };
   spcosa = derive { name="spcosa"; version="0.3-5"; sha256="15q0f2sfhm1b13zs5a50yfvqhgcn4fyncf0h5ivin2k9g5xvq4k4"; depends=[rJava ggplot2 sp]; };
   spcov = derive { name="spcov"; version="1.01"; sha256="1brmy64wbk56bwz9va7mc86a0ajbfy09qpjafyq2jv7gm7a35ph5"; depends=[]; };
-  spcr = derive { name="spcr"; version="1.1"; sha256="039m1y66j085381x39dhswzzmq5r2xkps93d4jj8yjc5bkplbxxy"; depends=[]; };
-  spd = derive { name="spd"; version="1.9"; sha256="1f2663rgc11knhiz529msjzpjgxv42cjxgwbvkkk62sq348mq65m"; depends=[KernSmooth]; };
-  spdep = derive { name="spdep"; version="0.5-71"; sha256="0nj4hh5nn595ghsvisc6g7p4hj5fjxbihc6gdc1afky8rchr22hl"; depends=[sp Matrix LearnBayes deldir boot coda nlme MASS]; };
+  spcr = derive { name="spcr"; version="1.2"; sha256="0xixl6b4h3iawpbfgdni6z2v7ch3ydn7s9fyr8g0sjr4svzqbyiv"; depends=[]; };
+  spd = derive { name="spd"; version="2.0-0"; sha256="0aznzj68gynhx295gdb4sb7xxjiya4vbdg3gshfs0mwg1qzrhxy9"; depends=[KernSmooth]; };
+  spdep = derive { name="spdep"; version="0.5-74"; sha256="0f9ahp57dfincwjazx0fgqzk4i2nc6fxra7dlfa8xvzwrp1yll05"; depends=[sp Matrix LearnBayes deldir boot coda nlme MASS]; };
+  spdynmod = derive { name="spdynmod"; version="1.0"; sha256="0az4y95j1x0kid6smc0k20w1q2bnjnr267rw8fk0j41rrm7njcai"; depends=[deSolve raster animation]; };
   spe = derive { name="spe"; version="1.1.2"; sha256="0xyx42n3gcsgqmy80nc9la6p6gq07anpzx0afwffyx9fv20fvys0"; depends=[]; };
   speccalt = derive { name="speccalt"; version="0.1.1"; sha256="0j7rbidmmx78vgwsqvqjbjjh92fnkf2sdx0q79xlpjl2dph7d6l6"; depends=[]; };
   SPECIES = derive { name="SPECIES"; version="1.0"; sha256="0p45llf2wjr467bqr4pbljfank9zz3fm42yl3i0r3jbkxgz0rjf0"; depends=[]; };
@@ -4908,7 +5188,7 @@ let self = _self // overrides; _self = with self; {
   SPEI = derive { name="SPEI"; version="1.6"; sha256="0mbz4nydnzwypfbi1d9fjy09x6133q096qbfrc913dbidzkvfpqv"; depends=[lmomco]; };
   sperich = derive { name="sperich"; version="1.5-5"; sha256="0xwzyfx3z06lapvhzdzrfr9hw2hm8d0cyfmc29p5fcplmjm24idh"; depends=[]; };
   sperrorest = derive { name="sperrorest"; version="0.2-1"; sha256="17jq8r98pq3hsyiinxg30lddxwpwi696srsvm3lfxrzk11076j6v"; depends=[ROCR rpart]; };
-  spfrontier = derive { name="spfrontier"; version="0.1.3"; sha256="14qi9kkgxsy6fc3cp4lmnmbg3hs8w6r200k2d7gyspc3v11cs1yh"; depends=[moments ezsim tmvtnorm mvtnorm Matrix]; };
+  spfrontier = derive { name="spfrontier"; version="0.1.10"; sha256="0x1f8g8lg1f5kp9m2pnj8qbv5pjk40kh40yd3s6iwgny4hjsmg60"; depends=[moments ezsim tmvtnorm mvtnorm Matrix]; };
   spgrass6 = derive { name="spgrass6"; version="0.8-3"; sha256="0syrm4fgyzslvl9k8szlha01iqkz02nla08whys3pvf4s9zjd4xl"; depends=[sp XML]; };
   spgwr = derive { name="spgwr"; version="0.6-24"; sha256="10yiyq704gs51h7i2nrd5r8730np7hvkcfnn3mly5wgaanrcb6n4"; depends=[sp]; };
   sphereplot = derive { name="sphereplot"; version="1.5"; sha256="1i1p20h95cgw5wqp9bwfs9nygm4dxzsggz08ncjs1xrsvhhq9air"; depends=[rgl]; };
@@ -4926,12 +5206,13 @@ let self = _self // overrides; _self = with self; {
   splm = derive { name="splm"; version="1.1-0"; sha256="1dhfasan5abr9gf6lfdl83cr47ckkj5sqjqgclnc6f6a2125q1fi"; depends=[MASS nlme spdep plm Matrix bdsmatrix spam ibdreg car lmtest Ecdat maxLik]; };
   spls = derive { name="spls"; version="2.2-1"; sha256="0zgk9qd825zqgikpkg13jm8hi6ncg48qw5f985bi145nwy9j19xs"; depends=[MASS nnet pls]; };
   splus2R = derive { name="splus2R"; version="1.2-0"; sha256="0kmyr1azyh0m518kzwvvgz7hv1x5myj37xn7w2gfn0vbn5xl8pv1"; depends=[]; };
-  splusTimeDate = derive { name="splusTimeDate"; version="2.0.0-117"; sha256="1cmjlxczckbv3imibnns9wzrlz0irgrnf1s9fqsymxf01bcs0hjc"; depends=[]; };
+  splusTimeDate = derive { name="splusTimeDate"; version="2.5.0-135"; sha256="0hghggdcr70vfjx4npj37nmd96qvgrp1gpwa9bznvjkvyfawwy6i"; depends=[]; };
   splusTimeSeries = derive { name="splusTimeSeries"; version="1.5.0-73"; sha256="1csk0ffgg1bi2k1m2bbxl6aqqqxf6i8sc8d4azip8ck7rn8vya46"; depends=[splusTimeDate]; };
   spMC = derive { name="spMC"; version="0.3.1"; sha256="12ymyyy77y7azbg983y091dfqcv68c7lpz2rcnnn384jqp7b2c4v"; depends=[]; };
   SPmlficmcm = derive { name="SPmlficmcm"; version="1.1"; sha256="02hg9dzfnxa8cz31kkq52707f7y5471cq78asfbrf397mfz82wbl"; depends=[numDeriv nleqslv boot]; };
   SPMS = derive { name="SPMS"; version="2.0"; sha256="150kb4gjiksp3kc7p9j5zqc4955rq4fb27as71z89h23mkswz5r5"; depends=[Matrix]; };
-  spocc = derive { name="spocc"; version="0.1.2"; sha256="14jcmdlllisxzaqw3y7jyg5mq6jwalf0y6450wck50nmwah9jixw"; depends=[ggplot2 rinat rbison rgbif ecoengine rebird AntWeb plyr ggmap maptools rworldmap sp rgeos lubridate RColorBrewer httr XML rgdal RJSONIO leafletR data_table assertthat]; };
+  spnet = derive { name="spnet"; version="0.9.0.1"; sha256="0fy19y155m1fmifdnsyb8y71xgnk3hyril28x68bwvn2v9d737k5"; depends=[sp shape]; };
+  spocc = derive { name="spocc"; version="0.2.0"; sha256="069yfksdk10779pb6xyg8cgq83ipbigi2zs9dymqyk8q6w1y8xhf"; depends=[ggplot2 rinat rbison rgbif ecoengine rebird AntWeb plyr ggmap maptools rworldmap sp rgeos lubridate RColorBrewer httr XML rgdal RJSONIO leafletR data_table assertthat whisker]; };
   SPODT = derive { name="SPODT"; version="0.9"; sha256="0r5zr0h5dgbkpn6dlvpj58s2wp3ngb7zb1xdapq1j25msmhwn5yy"; depends=[rgdal sp tree]; };
   sporm = derive { name="sporm"; version="1.1"; sha256="07sxz62h4jb7xlqg08sj4wpx121n9jfk65196mnxdvb36lqmb4hp"; depends=[]; };
   SportsAnalytics = derive { name="SportsAnalytics"; version="0.2"; sha256="1vb080ak1mfvr6d0q9i3r8hd547ba80bavjdcri0gclqqcjf1ach"; depends=[]; };
@@ -4941,31 +5222,33 @@ let self = _self // overrides; _self = with self; {
   spsmooth = derive { name="spsmooth"; version="1.1-3"; sha256="09b740586zyi8npq0bmy8qifs9rq0rzhs9c300fr6pjpc7134xn4"; depends=[mgcv]; };
   spsurvey = derive { name="spsurvey"; version="2.6"; sha256="1s48acqi502mdabhymhn0jjsghnlh2w6wnrfaa9gv0a7xjvjkydq"; depends=[sp deldir foreign MASS rgeos]; };
   spt = derive { name="spt"; version="1.13-8-8"; sha256="18s74pxfmsjaj92z2a34nq90caf61s84c616yv33a0xvfvp32qr5"; depends=[]; };
-  spTimer = derive { name="spTimer"; version="1.0-1"; sha256="0a1rzk2kini05xk4irkc3d4ywhghwzw73sn1p8jmjl31r352ajqk"; depends=[coda forecast spacetime]; };
-  spuRs = derive { name="spuRs"; version="1.0.5"; sha256="0k4ss65nq9imb1gcsl09xj33flryaihiq9blpc8sd4h9mdw64fca"; depends=[MASS lattice]; };
+  spTimer = derive { name="spTimer"; version="1.0-2"; sha256="1f0y0bzipk0j272w8d31rw8l0xvw5hj64d5j9cfvjzgbp9kzp56h"; depends=[coda forecast spacetime]; };
+  spuRs = derive { name="spuRs"; version="2.0.0"; sha256="0lbc3nny6idijdaxrxfkfrn40bxfyp9z3yl9mwb1k6cyd10v5mfj"; depends=[MASS lattice]; };
   sqldf = derive { name="sqldf"; version="0.4-7.1"; sha256="03pg1wrkbhh6yi794rf5a96kls0zixqz50ralznvgd0zyvmd3cz2"; depends=[gsubfn proto RSQLite RSQLite_extfuns DBI chron]; };
   sqliter = derive { name="sqliter"; version="0.1.0"; sha256="17jjljq60szz0m8p2wc5l56659aap7an5gknc848dp89ycjgj3zx"; depends=[stringr functional DBI RSQLite]; };
   sqlshare = derive { name="sqlshare"; version="1.0.3"; sha256="1qy8vlzi6i4wsr53i71jlsv1b7ww254mbk2qzsvmcrranf42zbp8"; depends=[RCurl]; };
   sqlutils = derive { name="sqlutils"; version="1.1.2"; sha256="1d3x4wid7f9h2y36avsajjvshzcszr2nby71ixfdq3iv8z01z4j3"; depends=[roxygen2 stringr DBI]; };
   SQN = derive { name="SQN"; version="1.0.5"; sha256="0kb8kf6g482zqdp4avwvhs3pqghfny757dbzfl1abaigmvwvx4qj"; depends=[mclust nor1mix]; };
   SQUAREM = derive { name="SQUAREM"; version="2012.7-1"; sha256="17d5b9h7h8ayasi4zg790b3a11rka8dkfcmvhrjg4rvlggwjda5j"; depends=[]; };
-  squash = derive { name="squash"; version="1.0.1"; sha256="1402m3jh84mfwkjwy2f898r3cfmf4sxyh90yv9gy60qx1v3hrzwc"; depends=[]; };
+  squash = derive { name="squash"; version="1.0.6"; sha256="16iplngzzlif999z821a9bwx9jlmikdvwnk6p6d9w75b1fsbc0pz"; depends=[]; };
   sra = derive { name="sra"; version="0.1"; sha256="165r1aiv17gdhln2374724nx04wjcdpillxwwkxgshz3kjyvajvj"; depends=[]; };
   sROC = derive { name="sROC"; version="0.1-2"; sha256="0cp6frhk9ndffb454dqp8fzjrla76dbz0mn4y8zz1nbq1jzmz0d3"; depends=[]; };
   SRPM = derive { name="SRPM"; version="0.1-7"; sha256="1c7mca1p0z48w5jbywqqfbdwzcimy24fm23h5n930mxbxgh51shk"; depends=[stashR filehash cacheSweave]; };
-  SRRS = derive { name="SRRS"; version="0.1"; sha256="1450asdvl160ww1jc3s61lypk48r7dlm8hxypkgbjx6kf2j29zc9"; depends=[tcltk2 gregmisc]; };
+  SRRS = derive { name="SRRS"; version="0.1.1"; sha256="0jv545a97q4pyl89lmhn3y0jhdzyq033mvx144x8lcgx59s7cyi3"; depends=[tcltk2 gtools]; };
   ss3sim = derive { name="ss3sim"; version="0.8.2"; sha256="1gj3kf4ccd5n2jr4sm50gny5x1zq4brkhqgw0nww41spnimascfr"; depends=[plyr r4ss gtools lubridate reshape2]; };
   ssanv = derive { name="ssanv"; version="1.0-2"; sha256="18ib0djqxjpp4xgvsffwqgxqljpwc24ysxj26phpr6p8kdl3hr2f"; depends=[]; };
-  SSDforR = derive { name="SSDforR"; version="1.4.3"; sha256="1r32kax83x0k80lmz1zj5p291qd0rrxfi9vqx1z27am3gn3s4xfj"; depends=[psych]; };
+  SSDforR = derive { name="SSDforR"; version="1.4.6"; sha256="1ab4z7zm08wgy9vm1bbfgrxhizly5wpwzk8ikqzkfpvy43fgv80m"; depends=[psych]; };
+  sse = derive { name="sse"; version="0.5-1"; sha256="0g0bwmgc585haqbb13366s3pv1vdh793hwwibz7im0avjs2ldsjq"; depends=[lattice]; };
   ssfit = derive { name="ssfit"; version="1.1"; sha256="1fais0msi2ppgfp0vbx3qri7s9zs51i7n90w36xkwwac4f46bq5y"; depends=[survey]; };
+  ssh_utils = derive { name="ssh.utils"; version="1.0"; sha256="08313zzzgcyvzkrkq0w0yf748ya1a9shx5xnan5891v0lah9v0b1"; depends=[stringr]; };
   ssize_fdr = derive { name="ssize.fdr"; version="1.1"; sha256="00y00cb0bhsk0qcq9f96dcmmzmy88k1qyhx9ampws34n133cl509"; depends=[]; };
   ssmrob = derive { name="ssmrob"; version="0.4"; sha256="1inndspir7571f54kalbj0h599v9k6dxdmp0n1l5r3a62vn45hd3"; depends=[sampleSelection robustbase mvtnorm MASS]; };
-  SSN = derive { name="SSN"; version="1.1.2"; sha256="0hm3r5lf7ah4v1pjaf13kjxxdncrp11gh0n81nsjkgsrqz6mmfl6"; depends=[RSQLite MASS igraph maptools lattice sp]; };
+  SSN = derive { name="SSN"; version="1.1.3"; sha256="0qn3yd5xg0irflh8dsifan455x4k7s63zva94843ihib12zf22cq"; depends=[RSQLite sp MASS igraph maptools lattice]; };
   sspline = derive { name="sspline"; version="0.1-6"; sha256="0d6ms8szyn39c7v0397d5ar2hrl8v1l2b7m8hlj37hgp70b9s55h"; depends=[]; };
   sss = derive { name="sss"; version="0.0-11"; sha256="0k7p1ws0w7wg9wyxcg1zpk8q6kr32l3jl6yd9r4qmzq04dwqrdgz"; depends=[plyr XML]; };
   SSsimple = derive { name="SSsimple"; version="0.6.4"; sha256="0p7d4hx7mhn5myq8ajcij6hhg79rjxigk5v8z93yfdw4gjcb5wad"; depends=[mvtnorm]; };
   ssvd = derive { name="ssvd"; version="1.0"; sha256="1fdpr38qi59ijrz16jixn6ii1hvmxfjirjqfcp7dxrqz9nx8x0sk"; depends=[]; };
-  ssym = derive { name="ssym"; version="1.2"; sha256="0nkmflb8pbb1m3prrh9i6zwi00kvrm2x7rqf06gf5avyf1lkm92b"; depends=[GIGrvg numDeriv gsl normalp]; };
+  ssym = derive { name="ssym"; version="1.3"; sha256="00bgqcf7l6mfjqxsvarh4g78hq21k4dq883c5yd7xkw609dp94pw"; depends=[GIGrvg numDeriv gsl normalp]; };
   st = derive { name="st"; version="1.2.2"; sha256="0dbs95iaac3zvcgrndqic6rwchyvkbda641pv0dvj7h64c3k8w24"; depends=[sda fdrtool]; };
   stab = derive { name="stab"; version="0.1.8"; sha256="1rbwfxdbdqb1l91xmnnz5z5m353z4rjihr0c1f7r77a0zl7sa3zj"; depends=[MASS reshape]; };
   stabledist = derive { name="stabledist"; version="0.6-6"; sha256="0s59jp3y5ks4rfj7x76vb9g3slbbn98lvki54lv96yxdfr8i7ry5"; depends=[]; };
@@ -4977,7 +5260,7 @@ let self = _self // overrides; _self = with self; {
   StandardizeText = derive { name="StandardizeText"; version="1.0"; sha256="0s267k2b109pcdiyd26gm4ag5afikrnnb55d3cs6g2fvzp744hfp"; depends=[]; };
   standGL = derive { name="standGL"; version="1.1"; sha256="1ffskpba30ih1sb1gscy4njgr4vv0642311hj1m7x7n5slisnysm"; depends=[]; };
   STAR = derive { name="STAR"; version="0.3-7"; sha256="1g78j4iyh78li1jaa3zz5qv4p41cg0imhmvbfakd34l32ppih4ll"; depends=[survival mgcv R2HTML gss codetools]; };
-  stargazer = derive { name="stargazer"; version="5.0"; sha256="1n4ksf1cvklrg6aqq348gh914j0ihnrzwfshnqgfw1x6q9bx6isl"; depends=[]; };
+  stargazer = derive { name="stargazer"; version="5.1"; sha256="0ar0qm289ncsns2pqkabpyjc90ws0il1q7fp5206wqghgsvqjcc0"; depends=[]; };
   STARSEQ = derive { name="STARSEQ"; version="1.02"; sha256="1gb763bb7z871hb443d29r0vvyl2inr0df0q0xxxg16scl4p4yvb"; depends=[CompQuadForm numDeriv vcf2geno]; };
   startupmsg = derive { name="startupmsg"; version="0.9"; sha256="1l75w4v1cf4kkb05akhgzk5n77zsj6h20ds8y0aa6kd2208zxd9f"; depends=[]; };
   stashR = derive { name="stashR"; version="0.3-5"; sha256="1lnpi1vb043aj4b9vmmy56anj4344709986b27hqaqk5ajzq9c3w"; depends=[filehash digest]; };
@@ -4985,80 +5268,89 @@ let self = _self // overrides; _self = with self; {
   StatDA = derive { name="StatDA"; version="1.6.7"; sha256="140hqg56axwg5ckfr4n4rr453ppsgf5bmmd7kg4mai1xnj4wmg8b"; depends=[geoR sgeostat cluster e1071 MASS MBA mgcv rgl robustbase xtable]; };
   StatDataML = derive { name="StatDataML"; version="1.0-25"; sha256="05s9kbrjl2wsfccgav34b02m06q62r3iyjd0ndr6xcqlw9x2w2ya"; depends=[XML]; };
   StateTrace = derive { name="StateTrace"; version="1.0-4"; sha256="1nmdqmg4az1afhprjyqb9qqcvd0xa6xdb8gzar5jrcdldxxbsw35"; depends=[KernSmooth coda fgui]; };
-  statfi = derive { name="statfi"; version="0.9.06"; sha256="1fkx8jszmhzsgn0w45479klq1qhlagpj5b7s83p1g9lxymj33f8p"; depends=[pxR]; };
-  StatMatch = derive { name="StatMatch"; version="1.2.1"; sha256="1vv7730fmncysm7sv96kgwwi5s50fks1pn4zgv4w54qwlf286dzz"; depends=[proxy clue survey RANN]; };
-  statmod = derive { name="statmod"; version="1.4.19"; sha256="1g0yws7vmclk0w0mrzbsf86fl3fwd920hfmllklzkzm57if8yapa"; depends=[]; };
+  statfi = derive { name="statfi"; version="0.9.8"; sha256="0kg9bj2mmd95ysg604rcg4szqx3whbqm14fwivnd110jgfy20gk2"; depends=[pxR]; };
+  StatMatch = derive { name="StatMatch"; version="1.2.2"; sha256="1ml88ssd2xrnxh6xbg25bbskqv9jrn5vczaq3a3v4bccimv65prh"; depends=[proxy clue survey RANN]; };
+  StatMethRank = derive { name="StatMethRank"; version="1.0"; sha256="0mcvwn1f3hylvyg46vigc5wnvhhig5v01ag3y9rap32v85f308zh"; depends=[MASS rjags pmr]; };
+  statmod = derive { name="statmod"; version="1.4.20"; sha256="11986yjry1lg28s09q6vv2671x51nnfin6j0mpscq2ygyi615jwz"; depends=[]; };
   statnet = derive { name="statnet"; version="2014.2.0"; sha256="0xp8xnqb32wzkxfm7f34z6mnsd9id8an5829n16czwldj9vv6s10"; depends=[network ergm sna networkDynamic tergm ergm_count latentnet statnet_common]; };
   statnet_common = derive { name="statnet.common"; version="3.1.1"; sha256="1fs38f4dxrvgm60xvn04jr2wwyrjg25h3rbdwrx7dx24fj7sx6wl"; depends=[]; };
   StatRank = derive { name="StatRank"; version="0.0.4"; sha256="0s0jc4hvrry9a884fqfk3gp1w4ww5wif2kh3m0f22nn7qb49if9p"; depends=[truncdist plyr]; };
   stellaR = derive { name="stellaR"; version="0.3-3"; sha256="098sz6b8pl3fyca3g6myp97nna368xhxf8krmibadnnsr49q5zs9"; depends=[]; };
   Stem = derive { name="Stem"; version="1.0"; sha256="1fr02mi5qyxbqavdh2hg8ggw4nfjh3vs7g0vh834h6y0v53l71r5"; depends=[mvtnorm MASS]; };
+  STEPCAM = derive { name="STEPCAM"; version="1.0"; sha256="0lgikdj0mghz5hjm3rlrnnddjhvf9cmm0hwklbdyl3h816gq1jci"; depends=[vcd FD gtools MASS]; };
   stepp = derive { name="stepp"; version="2.3-2"; sha256="1x7vbniwk83x9wn6a5ya053nkg9jmzqprqbg87zpp0fsn9z7qhyq"; depends=[cmprsk survival]; };
   stepPlr = derive { name="stepPlr"; version="0.92"; sha256="16j32sk7ri4jdgss7vw5zz7s42rxk7rs376iyxzzpy1zcc9b64rv"; depends=[]; };
   stepwise = derive { name="stepwise"; version="0.3"; sha256="1lbx1bxwkf9dw6q46w40pp7h5nkxgghmx8rkpaymm6iybc7gyir2"; depends=[]; };
-  StereoMorph = derive { name="StereoMorph"; version="1.0"; sha256="1gxkll2h1sm7cznm55z533v8z8gd52an3ac3dzcmnxbv30vj1s9m"; depends=[]; };
-  stilt = derive { name="stilt"; version="1.0"; sha256="192ild2i37apdzd03m2h3awjj09y07ws870v67cx4dih36mxgm5j"; depends=[fields]; };
+  StereoMorph = derive { name="StereoMorph"; version="1.1"; sha256="0yin0x6lwjzc04497p6xv4hckp1s4mvzq5jhplrc13xyv5121vwv"; depends=[bezier rjson shiny]; };
+  stilt = derive { name="stilt"; version="1.0.1"; sha256="1vrbbic0vqzgy574kzcr38iqyhax4wa6zl6w74n65z15map2fyma"; depends=[fields]; };
   stima = derive { name="stima"; version="1.1"; sha256="1i8l7pfnqxx660h3r2jf6a9bj5ikg9hw7v8apwk98ms8l7q77p5l"; depends=[rpart]; };
   stinepack = derive { name="stinepack"; version="1.3"; sha256="0kjpcjqkwndqs7cyc6w62z1nnkqmhkifz2w0bi341jh0ybmak4fq"; depends=[]; };
-  stm = derive { name="stm"; version="0.6.1"; sha256="18f62kkirkn60whaps4g1ccmh6hrnp81mlz4b0h5sicg8plzp91w"; depends=[matrixStats slam lda stringr]; };
+  stm = derive { name="stm"; version="0.6.24"; sha256="0hifw7m50sa2r82mj4zc65pfb0hcqr7wcqmps9a0q8y57k077y4a"; depends=[matrixStats slam lda stringr]; };
   StMoSim = derive { name="StMoSim"; version="2.2"; sha256="127nr488a9xx3pjzrncbzw58ims87jifnzhpvqrr74px6wv0yisc"; depends=[]; };
-  stocc = derive { name="stocc"; version="1.0-7"; sha256="1gnsmc30innh2yjwgbggb16kg9438g98kz8lgq87pkl24kmjbq0c"; depends=[truncnorm coda Matrix fields]; };
-  stochvol = derive { name="stochvol"; version="0.8-1"; sha256="0lrda9hkn8ysin02vqwy7vs9c4cbj34lf04bg9d8gdg7rqbcssh3"; depends=[coda Rcpp]; };
+  stocc = derive { name="stocc"; version="1.23"; sha256="183rv1l1hpa691f3xf455bv8dzdw6ac79zg3v99zksli6i7c8jdz"; depends=[truncnorm coda Matrix fields]; };
+  stochprofML = derive { name="stochprofML"; version="1.1"; sha256="0pxx0ws4zklf38kjvp68rkk5qfzrxhk38f8d1ib8dd0chb7avb01"; depends=[MASS numDeriv]; };
+  stochvol = derive { name="stochvol"; version="0.8-4"; sha256="1s79anyiczci9jhwqc3nslvc2k4gqzbwijhinbr9703qhhnm5qx0"; depends=[coda Rcpp]; };
   stockPortfolio = derive { name="stockPortfolio"; version="1.2"; sha256="0k5ss6lf9yhcvc4hwqmcfpdn6qkbq5kaw0arldkl46391kac3bd1"; depends=[]; };
   stoichcalc = derive { name="stoichcalc"; version="1.1-3"; sha256="0z9fnapibfp070jxg27k74fdxpgszl07xiqfj448dkydpg8ydkrb"; depends=[]; };
-  Storm = derive { name="Storm"; version="1.0"; sha256="0dmbgv78f598ihhks4wsfml3fxs6f5alzc9nm909qha5kzpb8m8a"; depends=[rjson]; };
-  stosim = derive { name="stosim"; version="0.0.11"; sha256="0fv5f9vvcsq86bis0hrb2k2ax78k1q8iwg7v1lj1l3qv5q6sq583"; depends=[tcltk2 Rcpp]; };
+  Storm = derive { name="Storm"; version="1.1"; sha256="118l03d6las9cvhh4d845r7z6mlqff6ixxdfrdf025jsiqagm395"; depends=[rjson]; };
+  stosim = derive { name="stosim"; version="0.0.12"; sha256="0c4sj5iirm542hx782izfdmy2m3kl5q28l10xjj0ib4xn5y6yx3c"; depends=[tcltk2 Rcpp]; };
+  STPGA = derive { name="STPGA"; version="1.0"; sha256="1kqxzjrxf194n006dr3h5kprb4l7qy8bgm2n6251p0sswpvr70j1"; depends=[]; };
   stpp = derive { name="stpp"; version="1.0-4"; sha256="04xl2745xr5r7yirbdmxaxqvl4gp73wr6xl08w21mcccsnpc3d1s"; depends=[splancs KernSmooth spatstat]; };
   stppResid = derive { name="stppResid"; version="1.1"; sha256="0hgzsyy5y0sqd4d2agdr7p2kq0w51vs8f63dvj6j49h8cvgiws2x"; depends=[deldir splancs cubature]; };
   StrainRanking = derive { name="StrainRanking"; version="1.1"; sha256="0q6k90if74320mrs2ccq2izynylr8zakciwbc2c6ms0v57aalwic"; depends=[]; };
-  strap = derive { name="strap"; version="1.1"; sha256="1396w7xk0vq5lhf1nph0za9c80zc9d9ycdrkafx475pqca2i8qlm"; depends=[ape geoscale]; };
+  strap = derive { name="strap"; version="1.3"; sha256="1f9whr9cg73q4lfqdygqd88f2lc08bb7qcalrr4dc00jjgy1r8rw"; depends=[ape geoscale]; };
   stratification = derive { name="stratification"; version="2.2-3"; sha256="0mjv5x47rc7ci4ca949pg6ixmv6bfdfph6yz31syqk5xrgm8zmxq"; depends=[]; };
   stratigraph = derive { name="stratigraph"; version="0.64"; sha256="1mi4s3wxbrmcxb7k18z02dy5dnvg7kka1dbg2hgyi4nm9y8casdl"; depends=[]; };
-  StratSel = derive { name="StratSel"; version="0.1"; sha256="0783ff6kxa3b2v3b5n55rfjy976mjph3w5yx1lxahahwp4yl8h1a"; depends=[mnormt memisc Formula]; };
+  StratSel = derive { name="StratSel"; version="1.0"; sha256="1kr7bl2qrj2ra3szvw5z5y6ra6zz5q3v9vx81p8r5618zffa8q3b"; depends=[mnormt memisc Formula]; };
   straweib = derive { name="straweib"; version="1.0"; sha256="0bh2f4n4i7fiki52sa57v96757qw1gn1lcn7vgxmc5hk5rzp2mi8"; depends=[]; };
-  stream = derive { name="stream"; version="0.2-0"; sha256="14bgmd7ab1gn7gvd3572l90rw725g9vyn46s65yll72b79s30cjp"; depends=[rJava proxy birch hash clue clusterGeneration MASS animation mlbench]; };
+  stream = derive { name="stream"; version="1.0-3"; sha256="14l1fdqzbvy8vxq0rmrwm2afwd4h85khc0a22r6vk488355wn9ps"; depends=[hash proxy animation clue cluster clusterGeneration fpc MASS mlbench]; };
   StreamingLm = derive { name="StreamingLm"; version="0.1"; sha256="079ks5gj6ydj2fqq8pwhkb24a0zbz2j400777fm6a39wjgbgdx1n"; depends=[biglm]; };
   StreamMetabolism = derive { name="StreamMetabolism"; version="1.0"; sha256="03pr7i1c3qddqwibfc2x08d2nh8fih02k7a1xhqs1awfs43x56is"; depends=[zoo chron maptools]; };
+  streamMOA = derive { name="streamMOA"; version="0.1-1"; sha256="12x9i0cr56s54b2z3wfblrv6f36z8k2pgrr5gaqyshl8rgvyvrzz"; depends=[stream rJava]; };
   streamR = derive { name="streamR"; version="0.2.1"; sha256="1ml33mj7zqlzfyyam23xk5d25jkm3qr7rfj2kc5j5vgsih6kr0gl"; depends=[RCurl rjson]; };
   stremo = derive { name="stremo"; version="0.2"; sha256="13b9xnd8ykxrm8gnakh0ixbsb7yppqv3isga8dsz473wzy82y6h1"; depends=[lavaan numDeriv MASS]; };
+  stressr = derive { name="stressr"; version="1.0.0"; sha256="00b93gfh1jd5r7i3dhsfqjidrczf693kyqlsa1krdndg8f0jkyj7"; depends=[xts XML lattice latticeExtra]; };
   StressStrength = derive { name="StressStrength"; version="1.0"; sha256="0m67rawgn6w49zh4mw951i3pk4ckp4bxz9yphw0klllazjxyd6qp"; depends=[]; };
-  stringdist = derive { name="stringdist"; version="0.7.2"; sha256="1f7d580al845iakdyhkpfzfk0m4b206gfpiz364d4qfws6rfq64y"; depends=[]; };
-  stringi = derive { name="stringi"; version="0.1-25"; sha256="1rr8wjq58yswgmpgn6awdkg02h800fqyhhw5651w9xra2w9673zp"; depends=[]; };
+  stringdist = derive { name="stringdist"; version="0.8.0"; sha256="16bmf81dv8xbvy1b5c8rrj6vja00m00cb14v2zl9syxs923dq94i"; depends=[]; };
+  stringi = derive { name="stringi"; version="0.2-5"; sha256="0yyqdapn0gqrwynv0sikq42b5vv166qq96w099rm3fispc037yb8"; depends=[]; };
   stringr = derive { name="stringr"; version="0.6.2"; sha256="0dv7dd0xsivlccnf9pr5kb7zirgqn9mc6lgw5hnmkbb0s1qrrz63"; depends=[]; };
   strucchange = derive { name="strucchange"; version="1.5-0"; sha256="17ikp36ahnsx1q3avqkz5r2n2yagzq7j6m515vdm8rxgv0538is3"; depends=[zoo sandwich]; };
   structSSI = derive { name="structSSI"; version="1.0.5"; sha256="0i832k8jf317m47kzzfhgla4qm8bqmj3azjm4iqndkym2ry3jiy4"; depends=[igraph Matrix RColorBrewer classInt]; };
-  strum = derive { name="strum"; version="0.2"; sha256="0ibylqy897xz8qp11ifiv8dg1kpm6bd9zkmn7c3qka07d4asxlgd"; depends=[pedigree MASS Rcpp]; };
-  strvalidator = derive { name="strvalidator"; version="1.1.0"; sha256="0kih7rsaivbaydm7prwjwh0r1kd061858w1pxy401baalj3f9bq6"; depends=[gtable ggplot2 gWidgets plyr scales gridExtra]; };
-  stsm = derive { name="stsm"; version="1.2"; sha256="1si2hyz4lbn2bpdxvgz4a21a4q9iqi8i46lfnjwn6qs4816pfcfs"; depends=[KFKSDS stsm_class]; };
-  stsm_class = derive { name="stsm.class"; version="1.1"; sha256="1bj7affkpn229q47kbsxyy3rysvp7491fbhacrvlnk60gjlvaxzg"; depends=[]; };
-  StVAR = derive { name="StVAR"; version="1.0"; sha256="072jwn02a7a9s23rda9m80klr7mla525dsf266khg2pb1y6anqyh"; depends=[MCMCpack numDeriv car fMultivar moments]; };
-  stylo = derive { name="stylo"; version="0.5.5-1"; sha256="0m4xkd0fpkfva9psxxvnaikqxscnhayyc50zmvpixa2p637hbp26"; depends=[tcltk2 ape pamr e1071 class lattice tsne]; };
+  strum = derive { name="strum"; version="0.4"; sha256="06y4bf2z55zl5k9snd7mgbrfx85irnbk316g9169m5mij4lca4g7"; depends=[pedigree MASS Rcpp]; };
+  strvalidator = derive { name="strvalidator"; version="1.3.0"; sha256="1sddiclnhdl935l27863617h8s2kgny68d80hnqw9a3ga0iri486"; depends=[gtable ggplot2 gWidgets plyr scales gridExtra]; };
+  stsm = derive { name="stsm"; version="1.4"; sha256="0j6kvsij6rsvkjc4q1m9vi9afvsib8x6zwjka1xwbp8g6fzamjq4"; depends=[KFKSDS stsm_class]; };
+  stsm_class = derive { name="stsm.class"; version="1.3"; sha256="19jrja5ff31gh5k2zqhqsyd7w2ivr4s6bkliash6x8fmd22h5zs8"; depends=[]; };
+  stylo = derive { name="stylo"; version="0.5.6"; sha256="0ga6kv4i0zsapnbiqinz4wy34c0kracxrd2cgyqp0dkhshsiw2jf"; depends=[tcltk2 ape pamr e1071 class lattice tsne]; };
   SubCultCon = derive { name="SubCultCon"; version="1.0"; sha256="08q6k4nsv3gl5qk87s87smdg047yc2a4i7kg0fp08i7q7h62jkvz"; depends=[]; };
+  subgroup = derive { name="subgroup"; version="1.1"; sha256="1n3qw7vih1rngmp4fwjbs050ngby840frj28i8x7d7aa52ha2syf"; depends=[]; };
   SubLasso = derive { name="SubLasso"; version="1.0"; sha256="12m7ynlqhikjhavd12bhsd04s9cpv8aq5xgm875i10mb3ldpd1bd"; depends=[glmnet psych gplots]; };
-  subplex = derive { name="subplex"; version="1.1-3"; sha256="04dy0alpida9h2zirn5b84arjir3gqfbb21s5nm7fx0dbm53a9p5"; depends=[]; };
+  subplex = derive { name="subplex"; version="1.1-4"; sha256="0c6y5ibyxh0mpn77f7kwrmkpb3mah10hbqhwqmz4i1lfv58mb4zk"; depends=[]; };
   subselect = derive { name="subselect"; version="0.12-3"; sha256="1m1vk8jgmw0cb9gmzvvpzdpjaqp56kwhalb2b2il20kc57czmymr"; depends=[]; };
+  subsemble = derive { name="subsemble"; version="0.0.9"; sha256="0vzjmxpdwagqb9p2r4f2xyghmrprx3nk58bd6zfskdgj0ymfgz5z"; depends=[SuperLearner]; };
   subtype = derive { name="subtype"; version="1.0"; sha256="1094q46j0njkkqv09slliclp3jf8hkg4147hmisggy433xwd19xh"; depends=[penalized ROCR]; };
-  sudoku = derive { name="sudoku"; version="2.5"; sha256="1wg86dv3bjz9v3p87ic6fnnkmal92q9klm445z8sf4cw059ghshz"; depends=[]; };
+  sudoku = derive { name="sudoku"; version="2.6"; sha256="13j7m06m38s654wn75kbbrin5nqda4faiawlsharxgrljcibcbrk"; depends=[]; };
   SUE = derive { name="SUE"; version="1.0"; sha256="0akv724s84v2zixvwywj1ydfnfvcjnaabv6gm0601nsrh6ij1mi6"; depends=[]; };
   sugaR = derive { name="sugaR"; version="0.0-5"; sha256="0lg0wm4fbf4f4vlsy2cnfwm18vnc3i6bd51pixpdb9m512pw761c"; depends=[]; };
+  summarytools = derive { name="summarytools"; version="0.1"; sha256="1qrn47z21ijgpp8kj20wviin2zldj8fpf4d759b05v3k0y3q27zr"; depends=[Hmisc pander timeDate]; };
+  Sunder = derive { name="Sunder"; version="0.0.2"; sha256="0fnxj4fi99f1jvlbir0wkqvf48msnz1rspzg17jsd1kp2ha5kq35"; depends=[RandomFields]; };
   SunterSampling = derive { name="SunterSampling"; version="1.0"; sha256="07s5sd6kf2jg276b5q1ns3h7849b1h0rx77kb3vs4j1svn8k9wxy"; depends=[]; };
   supclust = derive { name="supclust"; version="1.0-7"; sha256="0437pccagvqv6ikdsgzpif9yyiv6p24lhn5frk6yqby2asj09727"; depends=[rpart class]; };
   superbiclust = derive { name="superbiclust"; version="0.1"; sha256="0hzihmjjwk3axgy1y95ckq6m5gmb7ybjj7zscplgsnihi5256jnk"; depends=[biclust Matrix]; };
   superdiag = derive { name="superdiag"; version="1.1"; sha256="0pa3mv74riabpm7j4587zww2364fszzlw48ijj1apcgz8y6pyqbw"; depends=[coda boa]; };
-  SuperLearner = derive { name="SuperLearner"; version="2.0-10"; sha256="1axfpk63azffmzy2ag4xlbsxccw2232y5xxygkkiy6c54kgp6301"; depends=[nnls]; };
+  SuperLearner = derive { name="SuperLearner"; version="2.0-15"; sha256="1sk45419awk8aahylmqbardx8lglx0d7hrwc0k2prnksk5r3549l"; depends=[nnls]; };
   superMDS = derive { name="superMDS"; version="1.0.2"; sha256="0jxbwm3izk7bc3bd01ygisn6ihnapg9k5lr6nbkr96d3blpikk04"; depends=[]; };
   superpc = derive { name="superpc"; version="1.09"; sha256="1p3xlg2n7p57n54g2w4frfrng5vjh97kp6ax4mrgvj3pqmd1m69z"; depends=[survival]; };
   SuppDists = derive { name="SuppDists"; version="1.1-9.1"; sha256="1jqsv1lzjblc7sdb4gh8pkww9ar174bpbjl7mmdi59fixymwz87s"; depends=[]; };
-  support_BWS = derive { name="support.BWS"; version="0.1-1"; sha256="06ccv7qh75yra6imc20597wp3z3qcj5gkal4dwvh6dzkv48fcxs8"; depends=[]; };
-  support_CEs = derive { name="support.CEs"; version="0.3-1"; sha256="0rf5jrk104g133lckcvxbc5nmr2mvcrca67iv1vmmf9why3qv4gq"; depends=[DoE_base MASS simex]; };
+  support_BWS = derive { name="support.BWS"; version="0.1-2"; sha256="14p5b4b84x66lzn7qz1xy7sbb5i3wqwcsf6r6ap612nj83srjmqa"; depends=[]; };
+  support_CEs = derive { name="support.CEs"; version="0.3-2"; sha256="0q8n4w3p682165lv20m30m8p9mhd3wzrzg8aqizf9zc2m5w9ffyd"; depends=[DoE_base MASS simex]; };
   surface = derive { name="surface"; version="0.4-1"; sha256="0z7fh09hjmxfmqzi588gjwqqlpj1a475aixrnvy911lkx3zfk146"; depends=[ape ouch MASS geiger]; };
-  Surrogate = derive { name="Surrogate"; version="0.1-0"; sha256="1pc7vwh0q2gf7w7y7msfzwwb2ag4yf0kyaf7dn4s3mpf8rjrvws0"; depends=[MASS nlme msm lme4]; };
+  Surrogate = derive { name="Surrogate"; version="0.1-2"; sha256="07imwp725qwnxj4437qc2420n624vchnlaisd20ck8ygyvkb2mn0"; depends=[MASS nlme msm lme4]; };
   suRtex = derive { name="suRtex"; version="0.9"; sha256="0xcy3x1079v10bn3n3y6lxignb9n3h57w4hhrvzi5y14x05jjyda"; depends=[]; };
-  surv2sampleComp = derive { name="surv2sampleComp"; version="1.0-3"; sha256="036mkwvknvrlgp8pqrrjsvnsxv53c3l9qp23jihv0wl29k4jz2gi"; depends=[survival plotrix flexsurv survC1]; };
+  surv2sampleComp = derive { name="surv2sampleComp"; version="1.0-4"; sha256="1ihz71vzrkd5ksy7421myrgkbww0z5k0ywcb2bfalxx2bd2cs2wf"; depends=[survival plotrix flexsurv survC1]; };
   survAUC = derive { name="survAUC"; version="1.0-5"; sha256="0bcj982ib1h0sjql09zbvx3h1m96jy9q37krmk6kfzw25ms6bzzr"; depends=[survival]; };
   survBayes = derive { name="survBayes"; version="0.2.2"; sha256="08fbb2kyy7gcqlbzbliy4njkyk6jhr4nlfb4nbmh2kfdfcb6q62v"; depends=[survival coda]; };
   survC1 = derive { name="survC1"; version="1.0-2"; sha256="1bidjhq3k5ab7gqj1b2afngip7pp6c9c7q0m6ww7h7i2vg505l7v"; depends=[survival]; };
-  surveillance = derive { name="surveillance"; version="1.7-0"; sha256="0lih7vk3jghkyjknznj5fly3skdhjs2fpmbz73ql19lyark9896x"; depends=[Rcpp sp xtable polyCub MASS Matrix spatstat]; };
+  surveillance = derive { name="surveillance"; version="1.8-0"; sha256="043hdz4rfk5a50lzcb3q5sccn93r9r6ll79p1jxr0xhxlahgrp6i"; depends=[Rcpp sp xtable polyCub MASS Matrix spatstat]; };
   survexp_fr = derive { name="survexp.fr"; version="1.0"; sha256="12rjpnih0xld4dg5gl7gwxdxmrdmyzsymm7j05v98ynldd1jkjl8"; depends=[survival]; };
   survey = derive { name="survey"; version="3.29-5"; sha256="0qzg6h3m27d9v6iyh88pk7iq2glfnn8364jjl7z5d5cbw3ga3j81"; depends=[]; };
   surveydata = derive { name="surveydata"; version="0.1-14"; sha256="1zcp3wb7yhsa59cl4bdw7p08vpviypvfa9hggwc60w7ashpky73i"; depends=[stringr plyr]; };
@@ -5069,11 +5361,11 @@ let self = _self // overrides; _self = with self; {
   survivalROC = derive { name="survivalROC"; version="1.0.3"; sha256="0wnd65ff5w679hxa1zrpfrx9qg47q21pjxppsga6m3h4iq1yfj8l"; depends=[]; };
   survJamda = derive { name="survJamda"; version="1.1.2"; sha256="172mryz19n4nb9w20xh7yhn4pqaw9m98na2x235lps5rwcjk6x7b"; depends=[survival survivalROC ecodist survJamda_data]; };
   survJamda_data = derive { name="survJamda.data"; version="1.0.1"; sha256="1b8vy59hawgvpjds96q5wscggv8hffkbjw7zwfwf5g3firhb4gnq"; depends=[]; };
-  survMisc = derive { name="survMisc"; version="0.4"; sha256="0rrhq5hfi4y6x8gqdqavszqbif7nrmmc4n26hz2dli198gv5l2wp"; depends=[survival km_ci ggplot2 data_table gridExtra KMsurv combinat stringr Hmisc zoo gam]; };
+  survMisc = derive { name="survMisc"; version="0.4.2"; sha256="1mv503lrgjfbggasgsls2pqlxz3kj4hrw9qslgzxh3dizfqkb02c"; depends=[survival ggplot2 data_table rpart gridExtra combinat Hmisc zoo km_ci KMsurv gam]; };
   survPresmooth = derive { name="survPresmooth"; version="1.1-8"; sha256="1qva7yx4vv99mgh3wqxdnbasa1gy0ixxyxpqrfbn6827whjzf91m"; depends=[]; };
   survrec = derive { name="survrec"; version="1.2-2"; sha256="0b77ncr1wg2xqqg1bv1bvb48kmd9h3ja2dysiggvprzjrj7hdlmx"; depends=[boot]; };
   SurvRegCensCov = derive { name="SurvRegCensCov"; version="1.3"; sha256="1sl17x984ww07aakz6dambn5kznw4hvj4b8ahy2r4mr6wf2dpg5a"; depends=[survival numDeriv]; };
-  survsim = derive { name="survsim"; version="1.1.0"; sha256="0p4233n05mpaavdda5l69b6335vhlfd2jp0802vvr720fpxbaia1"; depends=[eha statmod]; };
+  survsim = derive { name="survsim"; version="1.1.2"; sha256="1pnzkw0hr0gpwh0v26k4fh7qjl0c6ps9y8gmfd46h8wz2fb25vqx"; depends=[eha statmod]; };
   survSNP = derive { name="survSNP"; version="0.21-7"; sha256="0fanya7ghd61pw7a21xkaxz4mgzdwjwkh1wm41h40wq1c529dzph"; depends=[survival Rcpp lattice foreach xtable]; };
   svapls = derive { name="svapls"; version="1.4"; sha256="12gk8wrgp556phdv89jqza22zmsnachsydr5vlz38s664d2lplbg"; depends=[class pls]; };
   svcm = derive { name="svcm"; version="0.1.2"; sha256="1lkik65md8xdxzkmi990dvmbkc6zwkyxv8maypv2vbi2x534jkhl"; depends=[Matrix]; };
@@ -5098,72 +5390,75 @@ let self = _self // overrides; _self = with self; {
   swamp = derive { name="swamp"; version="1.2.3"; sha256="1xpnq5yrmmsx3d48x411p7nx6zmwmfc9hz6m3v9avvpjkbc3glkg"; depends=[amap gplots MASS]; };
   SWATmodel = derive { name="SWATmodel"; version="0.5.9"; sha256="1i48g9nbjfn30ppwyzyz3k181nscv4wx773l8mzfdwhx0nlv4kyj"; depends=[EcoHydRology]; };
   SweaveListingUtils = derive { name="SweaveListingUtils"; version="0.6.1"; sha256="04xl7sw14x3ia5nsmkj1fhxvycl9wpim3frx83dd6kh8i0hpip54"; depends=[startupmsg]; };
-  sweSCB = derive { name="sweSCB"; version="0.3.4"; sha256="0fchrp8hsya0yxxnlcf01xklldc5kwkga9qd7wm0g53ahg86yyz9"; depends=[data_table stringr RJSONIO httr]; };
-  swirl = derive { name="swirl"; version="2.2.5"; sha256="1fvqv58aaywbfqajc33p0yb0zjy3zl1hcb8y7j5kg5qq7yads212"; depends=[stringr testthat httr yaml RCurl digest]; };
+  sweSCB = derive { name="sweSCB"; version="0.3.5"; sha256="1g6c73kqrnssycf4k239dpgkv8bvllbrxjwxga6fqdzb7jsnwh4y"; depends=[data_table stringr RJSONIO httr]; };
+  swfscMisc = derive { name="swfscMisc"; version="1.0.1"; sha256="0ya0ng6973mix9i0k817mgvfqwshpfqjlnn5xbs6vz2cw2xm8g6g"; depends=[mapdata maps]; };
+  swirl = derive { name="swirl"; version="2.2.15"; sha256="1r2hpkhcs040z3dmhc90cpznjjb1r4nnah27yz4vp58dx0aidcjl"; depends=[stringr testthat httr yaml RCurl digest]; };
   SwissAir = derive { name="SwissAir"; version="1.1.4"; sha256="1avc32q7nbwjkcbml7z05car6khv1ghcz3miw0krm8i53w032c6f"; depends=[]; };
   switchnpreg = derive { name="switchnpreg"; version="0.8-0"; sha256="1vaanz01vd62ds2g2xv4kjlnvp13h59n8yqikwx07293ixd4qhpw"; depends=[MASS fda expm HiddenMarkov]; };
-  sybil = derive { name="sybil"; version="1.2.5"; sha256="10i704mrnh51ibgd31cnnsjyxi5r27p4bmr3h0kfy8jm4qbm0z60"; depends=[Matrix lattice]; };
+  sybil = derive { name="sybil"; version="1.2.6"; sha256="1d7q0dvpqxay86dy4zbllv78dsh0amr8n7wl0vkrb8jbakq4afip"; depends=[Matrix lattice]; };
   sybilccFBA = derive { name="sybilccFBA"; version="1.0.0"; sha256="1fmhgyqzipddcqx2srms9bgigjmijasxhsmivv6c45ln23qjvgf5"; depends=[sybil Matrix]; };
-  sybilcycleFreeFlux = derive { name="sybilcycleFreeFlux"; version="1.0.0"; sha256="0wckkri37lvmcgrl8pj9d0zvczgfbklmkxx8yfn3w0k2dqp0wi47"; depends=[sybil Matrix MASS]; };
+  sybilcycleFreeFlux = derive { name="sybilcycleFreeFlux"; version="1.0.1"; sha256="0ffmgnr239xz8864vmrqlhwwc97fqzzib6kwrsm7bszdnw1kkv3r"; depends=[sybil Matrix MASS]; };
   sybilDynFBA = derive { name="sybilDynFBA"; version="0.0.2"; sha256="1sqk6dwwfrwvgkwk6mra0i1dszhhvcwm58ax6m89sxk8n0nbmr4b"; depends=[sybil]; };
   sybilEFBA = derive { name="sybilEFBA"; version="1.0.1"; sha256="1advbbsyig49av7sbpbvs47xzg6f8czjb1938ynd0n2yq1bgq5xm"; depends=[sybil Matrix]; };
-  sybilSBML = derive { name="sybilSBML"; version="2.0.7"; sha256="11wq9xbhmp3fjgdc507fhp0384xzwk5mn2dqm7w688dk8cidvwkx"; depends=[Matrix sybil]; };
+  sybilSBML = derive { name="sybilSBML"; version="2.0.8"; sha256="1sxp0naws7d1ak0xna1sy87zzjrravwax0qvcd6vy4p0f39z06ci"; depends=[Matrix sybil]; };
   symbolicDA = derive { name="symbolicDA"; version="0.4-1"; sha256="14lcxgbsizw0l1xcjrmz3jvfsbwlirkd0shp293hg3qi7gbzcms8"; depends=[clusterSim XML rgl shapes e1071 ade4]; };
   symbols = derive { name="symbols"; version="1.1"; sha256="1234rx3divhg60p0h0zn11viqn51fm6b8876m6rip2i6z8vrg319"; depends=[shape]; };
-  symmoments = derive { name="symmoments"; version="1.1"; sha256="0p0q9wbpwpzvr5cikqg9mjl2z7fan4v7isxj8hva3h8b6j48vdab"; depends=[mvtnorm]; };
+  symmoments = derive { name="symmoments"; version="1.2"; sha256="074k0285c0yri39zags420kjls6kjlvlhymg3r7y24h42zdy82d4"; depends=[mvtnorm cubature combinat multipol]; };
   synbreed = derive { name="synbreed"; version="0.9-7"; sha256="0v81q18dqr7zrh7830xfk30jq6kzgn0kcrp9zq6swk5laalkkqg4"; depends=[doBy BLR regress abind lattice igraph MASS LDheatmap qtl synbreedData]; };
   synbreedData = derive { name="synbreedData"; version="1.4"; sha256="0pfpvg4wvxfwpvxq8f93z1amfss98as66kwpj5mnvvlr33ffmka9"; depends=[]; };
   synchronicity = derive { name="synchronicity"; version="1.1.4"; sha256="0hcxwgf1irswwabgl0b6vb9q09nhxc1ljsm195lc8ql49sfj9mfz"; depends=[bigmemory_sri]; };
-  synchrony = derive { name="synchrony"; version="0.2.2"; sha256="1livac5ji5bk3ydnc4108csqbyhrlh06c35vv9ni95h38hp18llv"; depends=[]; };
+  synchrony = derive { name="synchrony"; version="0.2.3"; sha256="0fi9a3j8dfslf1nqx8d53fi635y3aq8isxw0dbjbpgk7rc71nzby"; depends=[]; };
   SynchWave = derive { name="SynchWave"; version="1.1.1"; sha256="127hllvig8kcs9gr2q14crswzhacv6v2s4zrgj50qdyprj14is18"; depends=[fields]; };
   SYNCSA = derive { name="SYNCSA"; version="1.3.2"; sha256="1m057lhfaf0n35rs3sipia04qgkp04hv7wf7rvnr7bhzic9f4vg3"; depends=[vegan mice FD]; };
   SynergizeR = derive { name="SynergizeR"; version="0.2"; sha256="0z32ylrjjvp8kr6lghhg57yq1laf9r0h8l3adysvis8bbpz2q2sj"; depends=[RJSONIO RCurl]; };
   SyNet = derive { name="SyNet"; version="2.0"; sha256="0mb9dscddkvmkf7l3bbcy4dlfmrvvy588vxdqy5dr783bpa5dkiw"; depends=[tkrplot]; };
-  synlik = derive { name="synlik"; version="0.1.0"; sha256="0b51wz4l3586g44m812d273q8x18glwxj4kd4g6qsqd4m1v35058"; depends=[Rcpp Matrix]; };
+  synlik = derive { name="synlik"; version="0.1.1"; sha256="0g4n78amydihsq4jg2i9barjm9g40zczasb31fj10yn6wir1dhv7"; depends=[Rcpp Matrix]; };
   Synth = derive { name="Synth"; version="1.1-5"; sha256="1cfvh91nz6skjk8jv04fhwv3ga9kcsfgq3mdy8lx75jkx16zr0pk"; depends=[kernlab optimx]; };
   sysfonts = derive { name="sysfonts"; version="0.2"; sha256="15wzb7c89645xxbhn29bh0djys73iklq05228qnhd5gx5sr43dd0"; depends=[]; };
   systemfit = derive { name="systemfit"; version="1.1-14"; sha256="0f33v96awyhxw3i6zr6whdz91hbfi7vwnfs0bz7xsrjcinqhm6h5"; depends=[Matrix car lmtest sandwich]; };
-  tab = derive { name="tab"; version="2.1.1"; sha256="006j43smk9gggfzyg75ah2dag16s82fwcq2kdznm5i8b410hjr3y"; depends=[survival gee]; };
+  tab = derive { name="tab"; version="2.1.2"; sha256="0g3wjl83k61xshbp813zvkapqiwjf9lr7i1bpxrjify2lqwis8k7"; depends=[survey survival gee]; };
   Table1Heatmap = derive { name="Table1Heatmap"; version="1.1"; sha256="1nrabjivfsdhaqmlq365pskkrp99jqsxn8vy03mdnqn5h5zv7wvx"; depends=[colorRamps]; };
-  table1xls = derive { name="table1xls"; version="0.3"; sha256="1av93a5h2br1js8146h9w5xqx7f9nfsjis5bdknayrajdanx5dc1"; depends=[XLConnect]; };
-  tableone = derive { name="tableone"; version="0.5.0"; sha256="0k9vpdn84wch4jr83imcx14ysgpdwi1x882k5q55n0hjcby007fd"; depends=[e1071 gmodels]; };
+  table1xls = derive { name="table1xls"; version="0.3.1"; sha256="0zd93wrdj4q0ph375qlgdhpqm3n8s941vks5h07ks9gc8id1bnx5"; depends=[XLConnect]; };
+  TableMonster = derive { name="TableMonster"; version="1.1"; sha256="1xflw719isy5hxvm0z67bip01cpafylnj76zssb3c174j912f7y3"; depends=[xtable]; };
+  tableone = derive { name="tableone"; version="0.6.2"; sha256="0jmii05kqd01bllc4wi9r38qa0dpxqlcpk572d3m7c009izsz8zl"; depends=[e1071 gmodels]; };
   tableplot = derive { name="tableplot"; version="0.3-5"; sha256="1jkkl2jw7lwm5zkx2yaiwnq1s3li81vidjkyl393g1aqm9jf129l"; depends=[]; };
-  tables = derive { name="tables"; version="0.7.64"; sha256="1ixiw267c4wfznk3cx4x71yjczv1828423q80wlx0gwdfjlhbmsm"; depends=[Hmisc]; };
+  tables = derive { name="tables"; version="0.7.79"; sha256="05f23y5ff961ksx4fnmwpf6zvc9573if8s2cmz9bwki66h2g9xb7"; depends=[Hmisc]; };
   TableToLongForm = derive { name="TableToLongForm"; version="1.3.0"; sha256="1dxis6gx0misvl18jzsaqxjajclc98xppgxil5xsz1lcq0fkn383"; depends=[]; };
   tabplot = derive { name="tabplot"; version="1.1"; sha256="0vyc6b6h540sqwhrza2ijg7ghw2x8rla827b8qy2sh0ckm0ybjrx"; depends=[ffbase]; };
   tabplotd3 = derive { name="tabplotd3"; version="0.3.3"; sha256="0mbj45vb17wlnndpkhvq7xaawsb814x7zxa4rqbfgidvbm1p3abv"; depends=[tabplot httpuv Rook brew RJSONIO]; };
   tabuSearch = derive { name="tabuSearch"; version="1.1"; sha256="0bri03jksm314xy537dldbdvgyq6sywfmpmj2g2acdcli31kkpq0"; depends=[]; };
-  TAHMMAnnot = derive { name="TAHMMAnnot"; version="2.0"; sha256="12ai0rn31shb7halgi00b54gn8s35h9zy1s0r95k931nxb6w4djg"; depends=[mnormt]; };
-  TAM = derive { name="TAM"; version="1.0-2.1"; sha256="01w2dwsrr6616xkgb6181gv2bhva37xyrxvaviksm7034xxq73gs"; depends=[MASS mvtnorm tensor sfsmisc GPArotation psych Rcpp]; };
+  TAM = derive { name="TAM"; version="1.0-3"; sha256="122wn95hbi7w41k1dbmwbr1q4rsrcskcy39ff64dclak70ackblm"; depends=[MASS mvtnorm tensor sfsmisc GPArotation psych Rcpp]; };
   TANOVA = derive { name="TANOVA"; version="1.0.0"; sha256="0c2mrahchwagisrkjl5l1s0mv0ny80kngq8dz0fjj9lwxwqwvwa5"; depends=[MASS]; };
+  TaoTeProgramming = derive { name="TaoTeProgramming"; version="1.0"; sha256="1b36s5mpm5vbhzcwmvm8g5pl7vpn6rsl5cnglfy8kgm1q9nnr7ff"; depends=[]; };
   TapeR = derive { name="TapeR"; version="0.3.2"; sha256="070zl7hqv5zprhs464gy1kmz0am58l0vig8xvdq6pbz94nrhvpj0"; depends=[nlme pracma]; };
   TAQMNGR = derive { name="TAQMNGR"; version="2014.01-2"; sha256="1szds8yyk3ldap785jxi8lj86rf4zlpzhd7rk2y8xwcq2fhs9h62"; depends=[]; };
-  taRifx = derive { name="taRifx"; version="1.0.5"; sha256="1jiyz8pawd203qmmdvnflrrfkrqmsdnf3yxiscgqgcz22c3k4hg4"; depends=[plyr reshape2]; };
-  taRifx_geo = derive { name="taRifx.geo"; version="1.0.4"; sha256="1xwfh4zl444n7k6mdy45jaqf2jj315879bcpf3vcihnnrdabq9na"; depends=[taRifx sp plyr reshape2]; };
-  tau = derive { name="tau"; version="0.0-17"; sha256="144v2azk6pw1gc6r1mivai24wzrw24aargi05v83aif0cddf9xwa"; depends=[]; };
+  taRifx = derive { name="taRifx"; version="1.0.6"; sha256="10kp06hkdx1qrzh2zs9mkrgcnn6d31cldjczmk5h9n98r34hmirx"; depends=[reshape2 plyr]; };
+  taRifx_geo = derive { name="taRifx.geo"; version="1.0.6"; sha256="0w7nwp3kvidqhwaxaiq267h99akkrj6xgkviwj0w01511m2lzghs"; depends=[taRifx sp rgdal RJSONIO rgeos RCurl]; };
+  tau = derive { name="tau"; version="0.0-18"; sha256="10akzwf0fi05vplgy4njzrb4jdqa079zhycri4014w8sihb5msan"; depends=[]; };
   TauP_R = derive { name="TauP.R"; version="1.1"; sha256="10sjvcv70fjrsl5nnk9gm4sy7nhwm6aaq57gr37cb10v079ykmk1"; depends=[]; };
-  tawny = derive { name="tawny"; version="2.1.0"; sha256="0y7l3pknsyppn3hzanl8gplfsdx6cr9z69ba2af4qgmw6j0glmgi"; depends=[tawny_types futile_matrix futile_logger PerformanceAnalytics quantmod]; };
-  tawny_types = derive { name="tawny.types"; version="1.1.1"; sha256="0il95rklqw0cg8kgijd2ca0maahjmhchkx41dw3h0jvfl40qfnfz"; depends=[lambda_r futile_logger futile_options futile_any zoo xts quantmod]; };
-  taxize = derive { name="taxize"; version="0.2.2"; sha256="1cbm7hifzarxhfh8rfw2kjikl67f2y0g21q5xmcc7qk65ljdcn1k"; depends=[XML RCurl stringr plyr httr RJSONIO foreach ape Taxonstand reshape2 data_table reshape vegan rgbif]; };
+  tawny = derive { name="tawny"; version="2.1.2"; sha256="0ihg3qlng8swak1dfpbnlx5xc45d1i9rgqawmqa97v5m91smfa71"; depends=[lambda_r lambda_tools futile_logger futile_matrix tawny_types zoo xts PerformanceAnalytics quantmod]; };
+  tawny_types = derive { name="tawny.types"; version="1.1.3"; sha256="1v0k6nn45rdczjn5ymsp2fqq0ijnlniyf3bc08ibd8yd1jcdyjnj"; depends=[lambda_r lambda_tools futile_logger futile_options zoo xts quantmod]; };
+  taxize = derive { name="taxize"; version="0.3.0"; sha256="1qixhiz92s0ys5sk61gjhq21855p739zih0sdxmhhah6x1m46agm"; depends=[XML RCurl stringr plyr httr RJSONIO foreach ape Taxonstand reshape2 data_table vegan assertthat]; };
   Taxonstand = derive { name="Taxonstand"; version="1.3"; sha256="0qfvsl2ywkagqn18iyjs3208szs0wm3xi39mssaw2l6rwyrx3kvd"; depends=[]; };
   tbart = derive { name="tbart"; version="0.9"; sha256="1iim4qshbazrb58ydhaxzp9xpy9w1ji2h4nh74scnmsxjdj3gfkg"; depends=[Rcpp sp]; };
   tbdiag = derive { name="tbdiag"; version="0.1"; sha256="1wr2whgdk84426hb2pf8iiyradh9c61gyazvcrnbkgx2injkz65q"; depends=[]; };
-  TBEST = derive { name="TBEST"; version="1.4"; sha256="1jgx78k2r8cp7mv17jmqp6hpswhjbmfz9j0ffb0p0klj29lv8mj3"; depends=[signal]; };
+  TBEST = derive { name="TBEST"; version="3.0"; sha256="1c4zbp4jsl8qsbx7bnqm7z7njm60qcc1yhxdbg75mw326brfvw1z"; depends=[signal fdrtool]; };
   TBSSurvival = derive { name="TBSSurvival"; version="1.1"; sha256="0hh0zpvwbkix8g9slf6bh4qzwmig5qif80q1ph6m5i496ywjcc80"; depends=[mcmc coda survival normalp R_utils BMS]; };
   TcGSA = derive { name="TcGSA"; version="0.9.8"; sha256="19gp3pj4p2svrfyviccvv13q82qj7584nck8zbba90hzv9g4xy86"; depends=[lme4 ggplot2 GSA reshape2 gtools gplots cluster stringr]; };
   tcltk2 = derive { name="tcltk2"; version="1.2-10"; sha256="0m648n028xc6gi3ypih0nyswczh787pwfq7ky2hsxabp958faflb"; depends=[]; };
   TDD = derive { name="TDD"; version="0.4"; sha256="193y8brybkjsajrbnlx1sdnw1wyyn9rhlm5wvp4aamqhvi8z13vn"; depends=[signal RSEIS pracma]; };
-  tdm = derive { name="tdm"; version="3.0.1"; sha256="0349k294n3ksm3mr3v78fmpslgm83lqsjzqqmqvzknhka6wwamm7"; depends=[rjags coda png]; };
-  TDMR = derive { name="TDMR"; version="1.0.1"; sha256="1m4vwxp5cvjkgwf6ajwfgfl6fi14cgrz6gy114ll9rcf36kgjp6f"; depends=[SPOT e1071]; };
+  tdm = derive { name="tdm"; version="3.0.2"; sha256="06k2dp5gf2k9q23mpswn2yh0525xaz0zznx6r7gn0gim2l7msbqj"; depends=[rjags coda png deSolve]; };
+  TDMR = derive { name="TDMR"; version="1.1"; sha256="15s1569435h7mlpvwg9k2584nk352sc4l6nqq2mk2hhj4brpa30l"; depends=[SPOT e1071]; };
   tdthap = derive { name="tdthap"; version="1.1-7"; sha256="0lqcw4bzjd995pwn2yrmzay82gnkxnmxxsqplpbn5gg8p6sf5qqk"; depends=[]; };
   TeachingDemos = derive { name="TeachingDemos"; version="2.9"; sha256="160xch4812darv77qk2xjblm6nfnna5x2rxy335bwdsdjzcx4x9m"; depends=[]; };
   TeachingSampling = derive { name="TeachingSampling"; version="3.2.1"; sha256="1diw8qz6yi3g7d1ysklrvxwbzda9ybi039yr6agzw0w0b2b59jj4"; depends=[]; };
   TeachNet = derive { name="TeachNet"; version="0.7"; sha256="1p39bsf846r7zwz4lrrv2bpyx9yrkqzrnacajwrz3jjqj6qpp6cn"; depends=[]; };
+  TED = derive { name="TED"; version="1.0"; sha256="0fzjfm9fjyn6h89vwgc912q8hx7ly4mqpacbz05iykhz3xdzfb9p"; depends=[foreach zoo fields animation geoR RcppArmadillo]; };
   teigen = derive { name="teigen"; version="2.0.1"; sha256="1lsx7cb6frfi0i2pg1w228kydfymrbxqd535hnrhhq9j1shhykk4"; depends=[]; };
   tempdisagg = derive { name="tempdisagg"; version="0.23"; sha256="1ym0cbvm8f1wvnkpdm34d5yzgbn3hig1kc3zv8b24pnx11ywv751"; depends=[]; };
   tensor = derive { name="tensor"; version="1.5"; sha256="19mfsgr6vz4lgwidm80i4yw0y1dr3n8i6qz7g4n2xa0k74zc5pp1"; depends=[]; };
   tensorA = derive { name="tensorA"; version="0.36"; sha256="1xpczn94a6vfkfibfvr71a7wccksg16pc22h0inpafna4qpygcwp"; depends=[]; };
-  TEQR = derive { name="TEQR"; version="2.0-0"; sha256="1s73qd6cdap9xjhjgf9q7b266l2z3zmrd1pv9dzw3yh4lg2w8mlb"; depends=[]; };
+  TEQR = derive { name="TEQR"; version="5.0-0"; sha256="04r26qzps7nnvs4s2xpvjf6q456wa29alhsds07xvyqhi972xhs6"; depends=[]; };
   TERAplusB = derive { name="TERAplusB"; version="1.0"; sha256="0mshx615awcf2arm39mgw2gzgpyn7a3f767484g7z4nqqlikwpgc"; depends=[]; };
   tergm = derive { name="tergm"; version="3.1.4"; sha256="0w5s4ziacxp9zdylmb8f7xrwvql58c6c9jvv27wjxdxpaf9iyp8h"; depends=[statnet_common ergm network networkDynamic robustbase coda nlme]; };
   termstrc = derive { name="termstrc"; version="1.3.7"; sha256="12bycwhjrhkadafcckc30jr0md0ssj21n4v75yjhy21yvqjx1d7a"; depends=[lmtest Rcpp rgl sandwich urca zoo]; };
@@ -5171,18 +5466,18 @@ let self = _self // overrides; _self = with self; {
   TESS = derive { name="TESS"; version="1.2.1"; sha256="15wrbbhrzj66j0z6xhnbf560qg0dzm1yqfbpmx070n3lsa2rdyij"; depends=[ape coda deSolve]; };
   tester = derive { name="tester"; version="0.1.7"; sha256="1x5m43abk3x3fvb2yrb1xwa7rb4jxl8wjrnkyd899ii1kh8lbimr"; depends=[]; };
   testit = derive { name="testit"; version="0.3"; sha256="142q0zwlzx3w69j0fsd06s3pihr76kw9yg21596aalazh7c2yfgi"; depends=[]; };
-  TestScorer = derive { name="TestScorer"; version="1.5"; sha256="1kz7qxm96f6f0sd9y68i8fx88n9p52hr66y1gl5kpf21ihmgj4by"; depends=[]; };
+  TestScorer = derive { name="TestScorer"; version="1.6"; sha256="11125i0dwh961q5xbg57lli5bzzls3y482iw5f0qwalwkppk7sv0"; depends=[]; };
   TestSurvRec = derive { name="TestSurvRec"; version="1.2.1"; sha256="05f5gc8hvz09hx015jzis6ikki9c1brdq7l7a9bxm9bqbcc9f2f9"; depends=[survrec boot]; };
   testthat = derive { name="testthat"; version="0.8.1"; sha256="1nja6yfcqyxi6nfs8mcwasslfw8mzlacjwj3kr65zmg58pm82ga4"; depends=[digest]; };
   texmex = derive { name="texmex"; version="2.1"; sha256="17x4xw2h4g9a10zk4mvi3jz3gf4rf81b29hg2g3gq6a6nrxsj8sy"; depends=[mvtnorm]; };
   TExPosition = derive { name="TExPosition"; version="2.6.10"; sha256="12rgijlclaipwjjiyng7nwilzixdy6lsvncigcg0vjydhgk97jn1"; depends=[prettyGraphs ExPosition]; };
-  texreg = derive { name="texreg"; version="1.32"; sha256="09s68fvxrj7h69fw99vsn7g6hvjw1sn09ygyyydwazkbsp7iw2wy"; depends=[]; };
-  textcat = derive { name="textcat"; version="1.0-1"; sha256="0qk3435pr6nga6c3jwyn5z50ddmrlk8kaz2bp42pd15n6hc2svl3"; depends=[tau slam]; };
+  texreg = derive { name="texreg"; version="1.33"; sha256="14x8q35w0w6p2zkqycqkpkan1637r9z6dl68d1dn4n5im7f2n4kw"; depends=[]; };
+  textcat = derive { name="textcat"; version="1.0-2"; sha256="0m8jbw8k8h6m9q9x25gvx0glzwhhpy73pjv4zivivna5zxapgi23"; depends=[tau slam]; };
   textir = derive { name="textir"; version="2.0-2"; sha256="19n14nqx7gcp5ypfqwmk80lxxwqc0dklm09z3f9czg68j6qv181i"; depends=[distrom gamlr Matrix]; };
-  textometry = derive { name="textometry"; version="0.1.2"; sha256="1p2fja00d0ipmzv1vgcaqhhbygqhgs72p8l4rz8xcpj5k3ngmfav"; depends=[]; };
-  TFDEA = derive { name="TFDEA"; version="0.8.3"; sha256="16vkvb5q7qyj35yl3hzdldmnjzb172qyjyx3anplrvh161lrhy5r"; depends=[lpSolveAPI]; };
+  textometry = derive { name="textometry"; version="0.1.3"; sha256="1a0dp1flx3yh7wqn0cmb5pq83qqnz94ynkqkmj4kw9ha5j8kcnwx"; depends=[]; };
+  TFDEA = derive { name="TFDEA"; version="0.9.4"; sha256="0376mzlfzf2ff6pnfsh4lf6gx9c1xdnl59pwm31zc73li4npy61h"; depends=[lpSolveAPI]; };
   tfer = derive { name="tfer"; version="1.1"; sha256="19d31hkxs6dc4hvj5495a3kmydm29mhp9b2wp65mmig5c82cl9ck"; depends=[]; };
-  TFMPvalue = derive { name="TFMPvalue"; version="0.0.4"; sha256="0lcldym9h4946sk9nj5ic50s5ynlvv26dgjflij0akj5sq1dbph1"; depends=[Rcpp]; };
+  TFMPvalue = derive { name="TFMPvalue"; version="0.0.5"; sha256="13bfcwfiyl61cv2ma23fcmv2cvbsyzdbg2pl6l6zg39l6scxf9na"; depends=[Rcpp]; };
   tfplot = derive { name="tfplot"; version="2014.2-2"; sha256="1jrkzccvqmwghp6nhxay0m1qx8r5wa96zb9r8v6qihryi9m3amhs"; depends=[tframe]; };
   tframe = derive { name="tframe"; version="2012.8-1"; sha256="0m6kwwn7y4n0vkk9zvwixn2jg67rsv9f9s2xma2mxdxl1f5lnfvh"; depends=[]; };
   tframePlus = derive { name="tframePlus"; version="2013.9-1"; sha256="070ad1g7yv1d5by6xrvshgn43jjxpq8waa339xhzc1am2qzb6mqr"; depends=[tframe timeSeries]; };
@@ -5191,16 +5486,19 @@ let self = _self // overrides; _self = with self; {
   tgram = derive { name="tgram"; version="0.2-2"; sha256="091g6j5ry1gmjff1kprk5vi2lirl8zbynqxkkywaqpifz302p39q"; depends=[zoo]; };
   TH_data = derive { name="TH.data"; version="1.0-3"; sha256="0f52x4ill5d4wpb1iyz0blj62jqzrzr6gl74bmy5hxh3f4f4kwq1"; depends=[]; };
   thgenetics = derive { name="thgenetics"; version="0.3-4"; sha256="1316nx0s52y12j9499mvi050p3qvp6b8i01v82na01vidl54b9c2"; depends=[]; };
-  Thinknum = derive { name="Thinknum"; version="1.2"; sha256="1chayv0mxmsvp05d2smb7y0fkvyppzn7a1s5amrq53qf4d0zknnl"; depends=[RCurl RJSONIO]; };
+  Thinknum = derive { name="Thinknum"; version="1.3.0"; sha256="0j48vgr4wsc2chm95aprq0xm0dk720xk5zmiijxasg92sfp0va6n"; depends=[RCurl RJSONIO]; };
+  threeboost = derive { name="threeboost"; version="1.1"; sha256="033vwn42ys81w6z90w5ii41xfihjilk61vdnsgap269l9l0c8gmn"; depends=[Matrix]; };
   ThreeWay = derive { name="ThreeWay"; version="1.1.2"; sha256="1vf71im3bs2b2v05j12l8qn181kah0mch4h13n71zqik1ykly6jf"; depends=[]; };
   threg = derive { name="threg"; version="1.0.2"; sha256="0wb9waj0j83zrj763d3fdnp3lp52gfdyzv23yrvxvd6zmk5clgi2"; depends=[survival Formula]; };
   ThresholdROC = derive { name="ThresholdROC"; version="1.0"; sha256="1w7bjw1w09skxyc5w3d72wivljlvnck6vbchihjx7m5k6djn7pxi"; depends=[]; };
   tibbrConnector = derive { name="tibbrConnector"; version="1.5.0-71"; sha256="0d8gy126hzzardcwr9ydagdb0dy9bdw30l8s2wwi7zaxx2lpii6q"; depends=[RCurl rjson]; };
+  tictoc = derive { name="tictoc"; version="1.0"; sha256="1zp2n8k2ax2jjw89dsri268asmm5ry3ijf32wbca5ji231y0knj7"; depends=[]; };
   TiddlyWikiR = derive { name="TiddlyWikiR"; version="1.0.1"; sha256="0vwwjdmfc8c0y2gfa8gls1mzvp29y39c9sxryrgpk253jj9px1kr"; depends=[]; };
   Tides = derive { name="Tides"; version="1.0"; sha256="10k8cmpfj9jjpzayyklslgazgl96078vfbn71ncgrn9bb98ahyqs"; depends=[]; };
+  tidyr = derive { name="tidyr"; version="0.1"; sha256="1rcf2cmd0zbjkvazkdfiv4sy50rxzj0fs4ldgmkz89vlffy5kdgc"; depends=[reshape2 dplyr]; };
   tiff = derive { name="tiff"; version="0.1-5"; sha256="0asf2bws3x3yd3g3ixvk0f86b0mdf882pl8xrqlxrkbgjalyc54m"; depends=[]; };
-  tiger = derive { name="tiger"; version="0.2.3"; sha256="1cci18g7mnyj687h5p3jr2m7pjh8bjgl9201fqbymv784886zfrm"; depends=[e1071 hexbin qualV klaR som]; };
-  tigerstats = derive { name="tigerstats"; version="0.1.3"; sha256="14cy7sz47ww5ag3h3i5yz44iy0g1n2hsdzvm9i2w4yhs40cqra8v"; depends=[lattice MASS]; };
+  tiger = derive { name="tiger"; version="0.2.3.1"; sha256="0xr56c46b956yiwkili6vp8rhk885pcmfyd3j0rr4h8sz085md6n"; depends=[e1071 hexbin qualV klaR som lattice]; };
+  tigerstats = derive { name="tigerstats"; version="0.1.6"; sha256="18gvmc4gfwi2x5nqj6jm7lddzlqmjvj0bf4h6r0yzvrp07wayvan"; depends=[lattice MASS]; };
   tightClust = derive { name="tightClust"; version="1.0"; sha256="0psyzk6d33qkql8v6hzkp8mfwb678r95vfycz2gh6fky7m5k3yyz"; depends=[]; };
   tikzDevice = derive { name="tikzDevice"; version="0.7.0"; sha256="12r6qk5qp4yvi3vqvdxp02799y6fhmg21qv6abp1s620n8hgva6d"; depends=[filehash]; };
   tileHMM = derive { name="tileHMM"; version="1.0-6"; sha256="18vqj7fdh4knnjk9s7yk2bgn3qwqz92fmm5fdny21gi0wl4qgdsd"; depends=[]; };
@@ -5212,14 +5510,14 @@ let self = _self // overrides; _self = with self; {
   TimeMachine = derive { name="TimeMachine"; version="1.2"; sha256="1dz0j777wmd8mpkm2ryiahpcw6w88w429zjcw6m67pi20r1992cb"; depends=[]; };
   timeordered = derive { name="timeordered"; version="0.9.6"; sha256="0h6y3asq1y788571c423bqkgdcx6k5i9jp6hp59x99g9l77y71sn"; depends=[igraph plyr]; };
   TimeProjection = derive { name="TimeProjection"; version="0.2.0"; sha256="04yr4cg2khkw9n3y3qk0ni1327k4pxm09zz2xg8mpjdvgi4p9yi3"; depends=[lubridate timeDate Matrix]; };
-  timereg = derive { name="timereg"; version="1.8.4"; sha256="1ar41dzl7pwh9rap87njyfqc5l4nvhzsv29xbysmcjflvgz15b4j"; depends=[survival prodlim]; };
+  timereg = derive { name="timereg"; version="1.8.5"; sha256="1ppmhx86cf276fl1nwmlpbjhh6ddvrcw2gc53ncqcyff0jg6r4c1"; depends=[survival prodlim]; };
   timeROC = derive { name="timeROC"; version="0.2"; sha256="1ikd2wr5cja784hihqdyk7mwky18czz58sl0xrvmzhc67153a4jz"; depends=[pec mvtnorm timereg]; };
   timesboot = derive { name="timesboot"; version="1.0"; sha256="1ixmcigi1bf42np93md8d3w464papg9hp85v0c3hg3vl4nsm2bji"; depends=[boot]; };
   timeSeries = derive { name="timeSeries"; version="3010.97"; sha256="0iv1jkh1h2qamsi22m7l3pdx0mgz96lafwjdxc99i558l2gdp2s3"; depends=[timeDate]; };
-  timetools = derive { name="timetools"; version="1.5.2"; sha256="1w6c4c31mnm5px3mrpwlrigqzr53nqpkk8myaa3vsv88ay6xsj0d"; depends=[]; };
+  timetools = derive { name="timetools"; version="1.6.0"; sha256="1ynapbzbnxyyqs1lkb482jp3yfjmnbqqv80ksc6vasi6gm0fmx7h"; depends=[]; };
   TimeWarp = derive { name="TimeWarp"; version="1.0-7"; sha256="1qjr3kfdd1ym0fi4hgjqm32gigchbchxy4xyxmsyl8y7jh2jk9qj"; depends=[]; };
   TIMP = derive { name="TIMP"; version="1.11.0"; sha256="0l8n3xg5ds1lbndd993nijny26s9p36n3j128527y53fs4915lxn"; depends=[fields vcd gplots colorspace gclus nnls deSolve minpack_lm MASS]; };
-  timsac = derive { name="timsac"; version="1.3.0"; sha256="1rndm71ia82g7jy717xqlwdmq0rklcaivd2qvxx3crad1zhh6zwc"; depends=[]; };
+  timsac = derive { name="timsac"; version="1.3.3"; sha256="0jg9mjzzfl94z4dqb2kz0aiccpclnbyf9p08x3a3cw1y6wqmzrmy"; depends=[]; };
   Tinflex = derive { name="Tinflex"; version="1.0"; sha256="0zvh2nfx4kqf90mmrpdm2fzlzn7s7gs09i8zin604hqxjir6p3ny"; depends=[]; };
   TInPosition = derive { name="TInPosition"; version="0.13.6"; sha256="1cxxrfpbiyknaivv6gyp79lz0rxwhrndcd054smksxq8zcfz0v7c"; depends=[prettyGraphs TExPosition ExPosition InPosition]; };
   tipom = derive { name="tipom"; version="1.0.2-1"; sha256="1gdfv0g5dw742j6ycmi0baqh6xcchp3yf2n1g8vn7jmqgz5mlhdr"; depends=[]; };
@@ -5230,24 +5528,25 @@ let self = _self // overrides; _self = with self; {
   tlemix = derive { name="tlemix"; version="0.1.3"; sha256="0c4mvdxlhbmyxj070xyipx4c27hwxlb3c5ps65ipm6gi8v8r6spj"; depends=[]; };
   tlmec = derive { name="tlmec"; version="0.0-2"; sha256="1gak8vxmfjf05bhaj6lych7bm8hgav1x3h14k2ra7236v82rqbw7"; depends=[mvtnorm]; };
   tlnise = derive { name="tlnise"; version="2.0"; sha256="1vh998vqj359249n9zmw04rsivb7nlbdfgzf20pgh2sndm3rh8qz"; depends=[]; };
-  tm = derive { name="tm"; version="0.5-10"; sha256="0gmlgayilnmq9pav0qk1jjv5i054wvmmkb03jaw9grv6x5k4c28i"; depends=[slam]; };
+  tm = derive { name="tm"; version="0.6"; sha256="004hswgswz3gdrpa6j61hl4rls843bxnsp5qac5kyxvfmwalsgr8"; depends=[NLP slam]; };
+  tmap = derive { name="tmap"; version="0.6"; sha256="10aw79k3vdi3f20i4clsbvdlfylg34z02ah36wz5yj7y68fm5ijh"; depends=[rgeos gridBase sp rgdal classInt RColorBrewer igraph fields vegan]; };
   tmle = derive { name="tmle"; version="1.2.0-4"; sha256="11hjp2vak1zv73326yzzv99wg8a2xyvfgvbyvx3jfxkgk33mybbm"; depends=[SuperLearner]; };
   tmle_npvi = derive { name="tmle.npvi"; version="0.8.1"; sha256="1vxkhf17x3zsf4fvx458qyqn0xi460db6kw6zmaw6jhagjk5yaj0"; depends=[R_utils MASS sgeostat]; };
-  tm_plugin_alceste = derive { name="tm.plugin.alceste"; version="1.0"; sha256="08gf1gk9r030cngqz2sj8xkdiwq8qdpca205jqz0p6ilgciq17qs"; depends=[tm]; };
-  tm_plugin_dc = derive { name="tm.plugin.dc"; version="0.2-6"; sha256="1agw9rgyrjd9a7dwsmsd6fa88xzss27awr338a0c0zfm43pa1bn3"; depends=[DSL tm slam]; };
-  tm_plugin_europresse = derive { name="tm.plugin.europresse"; version="1.0.1"; sha256="0cscwdxm59rldgkl5jdjs9va4clfwn0c1svms4vd2ldri7nh7h52"; depends=[tm XML]; };
-  tm_plugin_factiva = derive { name="tm.plugin.factiva"; version="1.3"; sha256="0yaw77azjzzf5raks7yf0blnx3jnby1mdf1wkgnq4ygmfbmrq9yg"; depends=[tm XML]; };
-  tm_plugin_lexisnexis = derive { name="tm.plugin.lexisnexis"; version="1.0"; sha256="0mlgvkivlsjlgcxxpxgc697xxmy6k0rdrhdsy8cni8z11m9jabrr"; depends=[tm XML ISOcodes]; };
-  tm_plugin_mail = derive { name="tm.plugin.mail"; version="0.0-7"; sha256="1054gl9hlfkilhi7wi1kwbyl9rllm31mnb35nlr78c1nqi3qj5hx"; depends=[tm]; };
-  tm_plugin_webmining = derive { name="tm.plugin.webmining"; version="0.9"; sha256="0xcq8frpd2cfjp7vy7h5hadi90jrssq803p2mif4jjqggdr63z4c"; depends=[tm RCurl XML boilerpipeR RJSONIO]; };
+  tm_plugin_alceste = derive { name="tm.plugin.alceste"; version="1.1"; sha256="0wid51bbbx01mjfhnaiv50vfyxxmjxw8alb73c1hq9wlsh3x3vjf"; depends=[NLP tm]; };
+  tm_plugin_dc = derive { name="tm.plugin.dc"; version="0.2-7"; sha256="1ikkxp5jdr385yqvhknvkvs97039jw964pcm6dl1k66nbdv1q59i"; depends=[DSL tm NLP slam]; };
+  tm_plugin_europresse = derive { name="tm.plugin.europresse"; version="1.1"; sha256="1rjpnr3x9nngvbx3vlzqsha9zg7ikqfxmqsalb3gvgph0bamdbbp"; depends=[NLP tm XML]; };
+  tm_plugin_factiva = derive { name="tm.plugin.factiva"; version="1.5"; sha256="06s75rwx9fzld1dw0nw6q5phc1h0zsdzhy1dcdcvmsf97d4s2qdr"; depends=[NLP tm XML]; };
+  tm_plugin_lexisnexis = derive { name="tm.plugin.lexisnexis"; version="1.1"; sha256="1hx0micnma1i6bys6jhwcxjsb7rlzac5kwwnrsgk7i1ynq7bh3zp"; depends=[NLP tm XML ISOcodes]; };
+  tm_plugin_mail = derive { name="tm.plugin.mail"; version="0.1"; sha256="0ca2w2p5zv3qr4zi0cj3lfz36g6xkgkbck8pdxq5k65kqi5ndzyp"; depends=[NLP tm]; };
+  tm_plugin_webmining = derive { name="tm.plugin.webmining"; version="1.2"; sha256="1qwzglv40vry2nsqnvpz2pr2bqyb3iibh3dx2yn51xshgqs3p2d8"; depends=[NLP tm boilerpipeR RCurl XML RJSONIO]; };
   tmvtnorm = derive { name="tmvtnorm"; version="1.4-9"; sha256="1dacdhqv6bb29a81bmxp8hxy4hragpg8mb5kql4cp59q08zmizyi"; depends=[mvtnorm Matrix gmm]; };
   tnet = derive { name="tnet"; version="3.0.11"; sha256="00hifb145w0a9f5qi3gx16lm1qg621jp523vswb8h86jqmxcczbc"; depends=[igraph survival]; };
   toaster = derive { name="toaster"; version="0.2.5"; sha256="0yybv6lq22mzawyvywh1dpg5p5mx5qqqssdhgd3ff78cqp7j298r"; depends=[RODBC plyr reshape2 ggplot2 scales RColorBrewer wordcloud ggmap]; };
   tolerance = derive { name="tolerance"; version="0.5.3"; sha256="058gl3vsqq4ylxrafj6fd70xsw4jbxjlxl30h8pd2dyv1h70b5zf"; depends=[rgl]; };
-  topicmodels = derive { name="topicmodels"; version="0.2-0"; sha256="1y5i0m46ci85d84b8sqyysgmha595raa5av41zdd1ck6a00kdwix"; depends=[modeltools slam tm]; };
-  TopKLists = derive { name="TopKLists"; version="1.0.1"; sha256="009i18qf3a06503gxbmm65dkkpji0pqi8140nli9ddckq4gwljx2"; depends=[Hmisc gplots]; };
+  topicmodels = derive { name="topicmodels"; version="0.2-1"; sha256="1if1pdx4jnfx3xi37xs411qv3h449vkwxzzqd7krxaxbj3gqq7n9"; depends=[modeltools slam tm]; };
+  TopKLists = derive { name="TopKLists"; version="1.0.2"; sha256="0hsfa465rw7mjwgp9nk2aa9gqrwc61r867n4kfix6fbngqr11m5k"; depends=[Hmisc gplots]; };
   topmodel = derive { name="topmodel"; version="0.7.2-2"; sha256="1nqa8fnpxcn373v6qcd9ma8qzcqwl2md347yql3c8bpqlm9ggz16"; depends=[]; };
-  topologyGSA = derive { name="topologyGSA"; version="1.4.3"; sha256="0m6qw47jlg0yf66nd46lkji342303v2jf0a6zbkf7hb6zf3rgkfv"; depends=[gRbase fields]; };
+  topologyGSA = derive { name="topologyGSA"; version="1.4.4"; sha256="092f57gpm8jlb2y4j74a6dx1lwqjdgcm3yrm1yzy4511j6vg0axh"; depends=[gRbase fields]; };
   topsis = derive { name="topsis"; version="1.0"; sha256="056cgi684qy2chh1rvhgkxwhfv9nnfd7dfzc05m24gy2wyypgxj3"; depends=[]; };
   tosls = derive { name="tosls"; version="1.0"; sha256="03nqwahap504yvcksvxdhykplbzmf5wdwgpzm7svn8bymdc472v2"; depends=[Formula]; };
   tourr = derive { name="tourr"; version="0.5.3"; sha256="0jsj2r9lhy0pa4kxnfb1cpf28c8q26rcprssax765n5ip1w9ycra"; depends=[]; };
@@ -5263,18 +5562,22 @@ let self = _self // overrides; _self = with self; {
   TraMineR = derive { name="TraMineR"; version="1.8-8"; sha256="12zbk7bq4ff4dzq86zbh9pspl1b9a69k0rw9lg8sh3mmc0f09m8j"; depends=[RColorBrewer boot]; };
   TraMineRextras = derive { name="TraMineRextras"; version="0.2.2"; sha256="0sb072ssg5q3kncb3b1a0nrnapjq8rly0ibh3gdrld9fdbdbjx68"; depends=[TraMineR RColorBrewer combinat survival]; };
   TRAMPR = derive { name="TRAMPR"; version="1.0-7"; sha256="135ylhijhpdxpznfdbdzwfsvy8bhw1yx28c3520a3lyrqvinpawg"; depends=[]; };
-  translate = derive { name="translate"; version="0.1"; sha256="0lpgpwwfgwg7mcgf6k460l4z2q4s6i2hqwbyb8l82qgcyvbf3ddb"; depends=[RCurl RJSONIO functional lisp]; };
+  translate = derive { name="translate"; version="0.1.2"; sha256="1w0xrg1xxwfdanlammmixf06hwq700ssbjlc3cfigl50p87dbc5x"; depends=[RCurl RJSONIO functional lisp]; };
+  translateR = derive { name="translateR"; version="1.0"; sha256="11kh9hjpsj5rfmzybnh345n1gzb0pdksrjp04nzlv948yc0mg5gm"; depends=[RJSONIO RCurl textcat httr]; };
+  transmission = derive { name="transmission"; version="0.2.0"; sha256="0cp3fb05kj3zj1x3i7icisaswdqbn9mhx5vi778x44r68h2lap17"; depends=[Rcpp ggplot2 reshape2 plyr]; };
   transnet = derive { name="transnet"; version="0.1"; sha256="0apsb67dxcnnsjnldr1vsjpc7xwy4cipybk9d86rf86l6cmirci6"; depends=[rJava plyr reshape2]; };
+  transport = derive { name="transport"; version="0.6-2"; sha256="038p40jp654w0jbgzxy1sj4258g9lzdfzija1mfz6nc6ibycviyj"; depends=[]; };
   trapezoid = derive { name="trapezoid"; version="2.0-0"; sha256="0f6rwmnn61bj97xxdgbydi94jizv1dbq0qycl60jb4dsxvif8l3n"; depends=[]; };
-  TreatmentSelection = derive { name="TreatmentSelection"; version="1.1.1"; sha256="1l4k33cs3wy2hh5chkh7bb4kdh2vmqrp14nrbv639y5h16n3msba"; depends=[ggplot2]; };
+  TreatmentSelection = derive { name="TreatmentSelection"; version="1.1.2"; sha256="1mvrb72yz51gmwqlfg5gsjbi65lqk5j24agddw1br53ymdvjgzq4"; depends=[ggplot2]; };
   tree = derive { name="tree"; version="1.0-35"; sha256="1k8c2kjk53gix68frprlyx5ww7cm373vz1xg2r2jxbzxg1y4v691"; depends=[]; };
   treebase = derive { name="treebase"; version="0.0-7.1"; sha256="0kj1cyk14j4qzm31f47a8g7qh4842rqkzr0fqh9i5c8kzrqxbc0g"; depends=[ape XML RCurl reshape2 data_table]; };
-  treecm = derive { name="treecm"; version="1.2"; sha256="0085d3rq8c31g8mh6qjvmll13ikvii58ky0dcva7kmv7ac54nlqk"; depends=[plyr]; };
+  treeclim = derive { name="treeclim"; version="1.0.7"; sha256="1l2m4pq5wcb3wkxy9mkay87vzdcn8rxgsknsb72ahdb3zim0yg0v"; depends=[Rcpp abind plyr ggplot2 lmtest lmodel2 np boot]; };
+  treecm = derive { name="treecm"; version="1.2.1"; sha256="02al6iz25pay7y1qmbpy04nw8dj9c5r7km6q5k3v3jdkfal6cm6k"; depends=[plyr]; };
   treelet = derive { name="treelet"; version="1.0"; sha256="16g4lmp4yrfg328d0qwrp101y1qnwcrff7kna60cjmqdpvg3wm15"; depends=[]; };
   treemap = derive { name="treemap"; version="2.2"; sha256="0h4wkjw12n9awqsvrs72nmsxq3d5as3zjy8kyhw7715h1cvry769"; depends=[colorspace data_table ggplot2 gridBase igraph RColorBrewer shiny]; };
-  TreePar = derive { name="TreePar"; version="2.5"; sha256="0x53s39gypg9dfi671i1lam1lpirm7kg4qvxgi5yrj6n8zaa788g"; depends=[ape Matrix subplex TreeSim deSolve]; };
-  TreeSim = derive { name="TreeSim"; version="1.9.1"; sha256="0kds8zwm7l4ljsfz32gwl4mg1gf2r5ixbpfdadpbamr0xn34hj3x"; depends=[ape geiger]; };
-  TreeSimGM = derive { name="TreeSimGM"; version="1.1"; sha256="01jgcdwnammznrq6ccy5bhhp27pzh4lb2i7ak096z996hf96xa77"; depends=[TreeSim]; };
+  TreePar = derive { name="TreePar"; version="3.0"; sha256="12i3y2wmja0xrq3h43fi4r8991q328l1p51q5nbz17crd44pds31"; depends=[ape Matrix subplex TreeSim deSolve]; };
+  TreeSim = derive { name="TreeSim"; version="2.0"; sha256="0kzmvay0ai0acjhcr4w7674gvln9sgg7n4qc3rg5kfcdqj4q8whp"; depends=[ape geiger laser]; };
+  TreeSimGM = derive { name="TreeSimGM"; version="1.2"; sha256="0y6hadwx3apw11jy5d4al3dav3his8b4xvkv7s5d5rd92l7yrw0r"; depends=[TreeSim]; };
   treethresh = derive { name="treethresh"; version="0.1-7"; sha256="0757w8y7hqki9znn726h7ry1hdrhnfj9ps179jmh5cl0gb5p2qin"; depends=[EbayesThresh wavethresh]; };
   TrialSize = derive { name="TrialSize"; version="1.3"; sha256="1hikhw2l7d3c7cg4p7zzrgdwhy9g4rv06znpw5mc6kwinyakp75q"; depends=[]; };
   TRIANG = derive { name="TRIANG"; version="1.2"; sha256="09hfvfmqrmx8dphlk46ga0y9s986kb32qdhgiq95faqfhpirf0qa"; depends=[]; };
@@ -5293,17 +5596,18 @@ let self = _self // overrides; _self = with self; {
   truncgof = derive { name="truncgof"; version="0.6-0"; sha256="0b499i9zjwvva5jfl9fj02jjrgy8myxqfjwa0cjg0jrpgxczgwg8"; depends=[MASS]; };
   truncnorm = derive { name="truncnorm"; version="1.0-7"; sha256="1qac05z50618y4bw1d7yznsli1bv82s0g8h37iacrjrdkv87bmy7"; depends=[]; };
   truncreg = derive { name="truncreg"; version="0.2-1"; sha256="0qvdfj93phk1s2p4n0rmpf8x9gj5n1j75h4z424mrg10r24699rd"; depends=[maxLik]; };
-  truncSP = derive { name="truncSP"; version="1.2.1"; sha256="144ypplkxpnarab8zcc4kc3c62pvc117bnhrsjv5ln3vlsvp05y6"; depends=[truncreg boot]; };
+  truncSP = derive { name="truncSP"; version="1.2.2"; sha256="1hdi518j3sg9273g01l1jqlmqya3ppim82ma7zakwqpmsjmzw18q"; depends=[truncreg boot]; };
   trust = derive { name="trust"; version="0.1-6"; sha256="1jghgwnazhqgyn2k0b3x4n8swncyy6dzlkv86chv98zw4s3bnlak"; depends=[]; };
   trustOptim = derive { name="trustOptim"; version="0.8.3"; sha256="04pkni5053r9czmf81jaq3y1kvw902g237pa6d3jgkvlqaznqwg3"; depends=[Rcpp RcppEigen Matrix]; };
   TSA = derive { name="TSA"; version="1.01"; sha256="0cm97hwxm6vfgy9mc3kgwq6dnmn86p8a4avnfjbai048qnwrn6hx"; depends=[leaps locfit mgcv tseries]; };
   TSAgg = derive { name="TSAgg"; version="1.0.1"; sha256="01s0grwfbhhfipqdnc0932rjsz4k52rln2bs8dsvrk6f8wps7h1k"; depends=[lubridate]; };
-  tsbridge = derive { name="tsbridge"; version="1.0"; sha256="0frp6whd5c8gxw0nv1y1qngifxbvpakyagbx3i80c19ic3hk6q8p"; depends=[mvtnorm tsbugs]; };
+  tsbridge = derive { name="tsbridge"; version="1.1"; sha256="0mry3ia54cdfydpzm8asrq1ldj70gnpb5dqzj51w0jiyps2zlw6f"; depends=[mvtnorm tsbugs]; };
   tsbugs = derive { name="tsbugs"; version="1.2"; sha256="130v4x6cfy7ddvhijsnvipm4ycrispkj1j0z5f326yb4v5lrk91x"; depends=[]; };
   TSclust = derive { name="TSclust"; version="1.2.1"; sha256="1ixawrs686p5g8kdaiqpf4y8ndpz0vgz9ji1ahja8i6nscfzasd9"; depends=[wmtsa pdc cluster locpol KernSmooth dtw longitudinalData]; };
   TScompare = derive { name="TScompare"; version="2013.9-1"; sha256="1gghr7xsg524sc9lhy1ymlhigaz6pi69fnccgn784ff2hl3w6d8w"; depends=[TSdbi tframe tfplot]; };
   TSdata = derive { name="TSdata"; version="2013.9-1"; sha256="1r3x6w17517if2jpcz2mr8jk5i080dkx4nlffblrcsxjhfvlz0xh"; depends=[]; };
   TSdbi = derive { name="TSdbi"; version="2013.9-1"; sha256="12v9dv7hrq626q44v3lws950m241fq5fsfsnmgvfbbyya5ixis86"; depends=[DBI tframe]; };
+  TSdist = derive { name="TSdist"; version="1.2"; sha256="103wv6wy5gjim2cf14d6afinyla85p6dncchi17fr0s4vqkmx3m5"; depends=[proxy zoo xts]; };
   tsDyn = derive { name="tsDyn"; version="0.9-33"; sha256="080bzbxvjfwayq9j7r1ghalvjcql9sk7ryzj880k2by4179fhnkk"; depends=[mnormt mgcv nnet tseriesChaos tseries vars urca forecast MASS Matrix foreach]; };
   TSEN = derive { name="TSEN"; version="1.0"; sha256="1pn313g2ylbjc37rqcakd797vffnh7v0rgg1xl5wjyvcgmm5mxix"; depends=[ncdf]; };
   tseries = derive { name="tseries"; version="0.10-32"; sha256="0jz8a3z3hx2ps7krmpg6m10jvz5ddgmcrmnd38jpxb6ndnhh3pzw"; depends=[quadprog zoo]; };
@@ -5313,13 +5617,15 @@ let self = _self // overrides; _self = with self; {
   TSgetSymbol = derive { name="TSgetSymbol"; version="2013.9-1"; sha256="1hn78xrfdnwhjrgcnn71ihvdgv4qwdxhpjwcqp0pbkgbxj3q5w3k"; depends=[TSdbi quantmod DBI zoo tframe tframePlus]; };
   TShistQuote = derive { name="TShistQuote"; version="2013.9-1"; sha256="06din7frxmbk4qxkpv0z5srh8nh0wkmrfl9lz17y7cwsmldl4hvr"; depends=[TSdbi DBI tframe tframePlus zoo tseries]; };
   TSHRC = derive { name="TSHRC"; version="0.1-3"; sha256="18ygg7bqwg1pdqi52l1lf33gcd277895rlf5853yzh7ln2ivssmi"; depends=[]; };
+  tsintermittent = derive { name="tsintermittent"; version="1.3"; sha256="10ch3ssfgdxhxg0l5m4jp2mryj7s23crwnj0nwnc9w3yarl9mxjy"; depends=[MAPA]; };
   TSjson = derive { name="TSjson"; version="2014.4-1"; sha256="1rkxc4dm7hdva0hiqbka8isfszjy26if9hnarsm51cflk8b60zhk"; depends=[TSdbi findpython DBI tframe tframePlus rjson]; };
   tslars = derive { name="tslars"; version="1.0"; sha256="0ylpn4jxmrck7hna3j420kw2yhsrklrq2664w85z30xij3zrrrci"; depends=[]; };
   tsModel = derive { name="tsModel"; version="0.6"; sha256="0mkmhzj4g38ngzfcfx0zsiqpxs2qpw82kgmm1b8gl671s4rz00zs"; depends=[]; };
   TSMySQL = derive { name="TSMySQL"; version="2013.9-1"; sha256="1ls3mpp5xq707vgv8l14cfbw1vn4ygy4d9n19nw5mnl3izz4p0pk"; depends=[TSdbi RMySQL DBI tframe TSsql]; };
   tsne = derive { name="tsne"; version="0.1-2"; sha256="12q5s79r2949zhm61byd4dbgw6sz3bmxzcwr8b0wlp8g1xg4bhy6"; depends=[]; };
   TSodbc = derive { name="TSodbc"; version="2013.9-1"; sha256="0s0bgid5slvyqlsrc0jvybqd73qjbs7qb0klws4ynk51rw6rilml"; depends=[TSdbi RODBC DBI tframe tframePlus TSsql]; };
-  TSP = derive { name="TSP"; version="1.0-8"; sha256="1yk4ivxa835l4808m1yiv3gqm0bdd5shwf9i5k8ngnmirj30d67j"; depends=[]; };
+  tsoutliers = derive { name="tsoutliers"; version="0.4"; sha256="08b8ssd8ha2n96la1kc64w2r1616c2d417vr6292g8m60fvlcq48"; depends=[forecast polynom stsm stsm_class KFKSDS]; };
+  TSP = derive { name="TSP"; version="1.0-9"; sha256="122y008gy7b2yscl9n2nwdb81fzjnpimipy3cvbnmk4i6v8nibjx"; depends=[]; };
   Tsphere = derive { name="Tsphere"; version="1.0"; sha256="0xgxw2hfj40k5s0b54dcmz7savl8wy4midmmgc7lq4pyb8vd58xx"; depends=[glasso rms]; };
   tspmeta = derive { name="tspmeta"; version="1.1"; sha256="11kr5avf67v2cxy3k1yrpv9lcbmiprd0w43w7zvizhsij58h13vm"; depends=[ggplot2 TSP MASS BBmisc fpc vegan stringr splancs]; };
   TSPostgreSQL = derive { name="TSPostgreSQL"; version="2013.9-1"; sha256="0ihfz0q1faxb7mk4jm10czfb9fz168x4z8890vql98djsxzjxpz4"; depends=[TSdbi RPostgreSQL DBI tframe tframePlus TSsql]; };
@@ -5329,7 +5635,7 @@ let self = _self // overrides; _self = with self; {
   TSxls = derive { name="TSxls"; version="2013.8-2"; sha256="1a0cmw41jf9jqibg25s4s04lawdb86c5r4bkxp8bznzkkhihpxn1"; depends=[TSdbi DBI tframe tframePlus gdata]; };
   TSzip = derive { name="TSzip"; version="2013.9-1"; sha256="09fqjsppj7qmbiiy19s64j77kf6drqfiphk5dfz25w5df1lzdw0f"; depends=[TSdbi DBI tframe tframePlus gdata]; };
   TTAinterfaceTrendAnalysis = derive { name="TTAinterfaceTrendAnalysis"; version="1.5.1"; sha256="1i9p5s7xj3py8465yjjaqs2m7krjxzzqd86lkpbgzxnxjdnxcx5i"; depends=[Hmisc pastecs reshape wq e1071 timeSeries fBasics relimp multcomp nlme lubridate tcltk2]; };
-  tth = derive { name="tth"; version="4.3-1"; sha256="0mdcwialbr0s3hzh0vf0wildra4xxxhmka35avnkj1jc8igpax3h"; depends=[]; };
+  tth = derive { name="tth"; version="4.3-2"; sha256="1gs8xjljklvs0pavvn9f59y09hw7x2da58a46b5x01g08i0j8h1d"; depends=[]; };
   TTR = derive { name="TTR"; version="0.22-0"; sha256="0aackwmmakjcynpq4nxi8xw1x3688rkg6kypgd5jiprzzdhsz5rq"; depends=[xts]; };
   ttScreening = derive { name="ttScreening"; version="1.3"; sha256="1ixy3s0a1vwr5qf1w24n8bhbq6qbwraal8xb8ypbvpjkrl0d14z2"; depends=[matrixStats corpcor]; };
   ttutils = derive { name="ttutils"; version="1.0-1"; sha256="18mk30070mcplybg320vjbk9v5flxnbqi5gx0yyr1z6ymjmnrxbc"; depends=[]; };
@@ -5337,20 +5643,24 @@ let self = _self // overrides; _self = with self; {
   TukeyC = derive { name="TukeyC"; version="1.1-4"; sha256="0p6wiyk6k2jabbf1s8fgzd547f3c0paf8d9hfa9aan5vwfcfyld6"; depends=[]; };
   TunePareto = derive { name="TunePareto"; version="2.4"; sha256="0pljl3q5s9yqc4ph70y66ff9ci9w8gwj8jsy8srxqkgqvahc8arf"; depends=[]; };
   tuneR = derive { name="tuneR"; version="1.2.1"; sha256="1f6mdkfwfy6r62sbwq37sylvcji6f3mj9w13sgicxjn6swbszf57"; depends=[signal]; };
+  tuple = derive { name="tuple"; version="0.3-06"; sha256="025fkyiv5gn5gajk0fdknp00vc6z2b9f7j9p025cl8jyxgpyv4xy"; depends=[]; };
   turboEM = derive { name="turboEM"; version="2012.2-1"; sha256="1vv7bjkkqm96qkqqz6gzhz7ii4yzr252r8wf37dgv5qfh1jlbvp2"; depends=[numDeriv quantreg foreach]; };
+  turfR = derive { name="turfR"; version="0.8-4"; sha256="0fqzwnrwxlighxbapmnarxzh91s6khjbb26xs8gqzz3f8xwmj9dy"; depends=[dplyr]; };
   turner = derive { name="turner"; version="0.1.7"; sha256="1xckb750hbfmzhvabj0lzrsscib7g187b44ag831z58zvawwh772"; depends=[tester]; };
+  TurtleGraphics = derive { name="TurtleGraphics"; version="1.0-4"; sha256="10zdwpfd2a0w995v4w2rvbvcczg53cb2kpm6bcyvrj8j5nqzmgqf"; depends=[]; };
   TUWmodel = derive { name="TUWmodel"; version="0.1-2"; sha256="1k3gdsl8rv10ipa82rgyhjh4pqf4n2d2dj68s9r5pkv362kzk1ra"; depends=[]; };
   tvm = derive { name="tvm"; version="0.2"; sha256="1fwa37xnp3idal8v1xxlc9gr25595f644i7a3h8xpd0k086sp1dg"; depends=[ggplot2 reshape2]; };
   twang = derive { name="twang"; version="1.4-0"; sha256="0r9n0s421dhvsr3ppzhdxsq4viz18mbi9mglhyyl5r6slzyb4m0x"; depends=[gbm survey xtable latticeExtra]; };
-  tweedie = derive { name="tweedie"; version="2.1.7"; sha256="1ivyfpksxds9p26lmi67kxc2fldc7869lj58l81wrnnjzh0jpq8w"; depends=[statmod]; };
+  tweedie = derive { name="tweedie"; version="2.2.1"; sha256="1fsi0qf901bvvwa8bb6qvp90fkx1svzswljlvw4zirdavy65w0iq"; depends=[]; };
   twiddler = derive { name="twiddler"; version="0.5-0"; sha256="0r16nfk2afcw7w0j0n3g0sjs07dnafrp88abwcqg3jyvldp3kxnx"; depends=[]; };
   twitteR = derive { name="twitteR"; version="1.1.7"; sha256="0zkz44brvkrsp1g7i90j2lvnj462vav706vqyxv0jfkp52f0s1z4"; depends=[ROAuth RCurl rjson]; };
   TwoCop = derive { name="TwoCop"; version="1.0"; sha256="1ycxq8vbp68z82r2dfg2wkc9zk3bn33d94xay20g2p55lnzl2ifd"; depends=[]; };
   twoStageGwasPower = derive { name="twoStageGwasPower"; version="0.99.0"; sha256="1xvy6v444v47i29aw54y29xiizkmryv8p3mjha93xr3xq9bx2mq7"; depends=[]; };
-  twostageTE = derive { name="twostageTE"; version="1.0"; sha256="18dkf92zc6l2s41hwp0kic64q313j9hrnkld65sh015l2lfinrq7"; depends=[isotone]; };
+  twostageTE = derive { name="twostageTE"; version="1.2"; sha256="05k9lvkailv06cah71p71hnx8in045nxz6waplsccznplhgqg5ar"; depends=[isotone]; };
   TwoStepCLogit = derive { name="TwoStepCLogit"; version="1.2.2"; sha256="0z3jg0hl7v2g1bral94gn3b1d11dzrlnzc912yh52vrcawbkmckq"; depends=[survival]; };
   txtplot = derive { name="txtplot"; version="1.0-3"; sha256="1949ab1bzvysdb79g8x1gaknj0ih3d6g63pv9512h5m5l3a6c31h"; depends=[]; };
   UBCRM = derive { name="UBCRM"; version="1.0"; sha256="1lkj0pg3pmj91s8i9xzs3bpizpmvjn85bs89wl54whjjhfnnfynk"; depends=[]; };
+  ucbthesis = derive { name="ucbthesis"; version="1.0"; sha256="0l855if3a7862lxlnkbx52qa617mby634sbb2gkprj21rwd7lcbp"; depends=[knitr stringr]; };
   ucminf = derive { name="ucminf"; version="1.1-3"; sha256="19gmbz32rhrdagvhf2s901lvi1r6273wzznry5daryq6w1jx5z3v"; depends=[]; };
   udunits2 = derive { name="udunits2"; version="0.6"; sha256="1dlxcx7yw7yqpimnfikdraqcmjsjz7js0j24li0879dzwrqa27ja"; depends=[]; };
   ump = derive { name="ump"; version="0.5-4"; sha256="05nd9bnysp8gaw916h7hk425banffcm0xfygalbp7brl71q0zby6"; depends=[]; };
@@ -5364,7 +5674,7 @@ let self = _self // overrides; _self = with self; {
   upclass = derive { name="upclass"; version="1.0"; sha256="0ga49pcxib4lp0pq1ljj1fjbrg7jz4vpjp5hq0c1v1hw2p7a3giy"; depends=[mclust classifly gclus]; };
   uplift = derive { name="uplift"; version="0.3.5"; sha256="11xikfmg6dg8mhwqq6wq9j9aw4ljh84vywpm9v0fk8r5a1wyy2f6"; depends=[RItools MASS coin tables penalized]; };
   urca = derive { name="urca"; version="1.2-8"; sha256="0gyjb99m6w6h701vmsav16jpfl5276vlyaagizax8k20ns9ddl4b"; depends=[nlme]; };
-  UScancer = derive { name="UScancer"; version="0.1-1"; sha256="0x7hr7rwplbs8bny7qr8m1rljdzwm27v0nddd2jj0v4561ljkih2"; depends=[rgdal]; };
+  UScancer = derive { name="UScancer"; version="0.1-2"; sha256="0p1kxw1phqq598ljk3njznc9kmgscc8gmwdrvx1scba9rr6n61kl"; depends=[rgdal]; };
   UScensus2000blkgrp = derive { name="UScensus2000blkgrp"; version="0.03"; sha256="196hpqrc3rq0m6ra6qinlhz1yknplx08pfp57l6yalni26c8pia0"; depends=[maptools sp foreign]; };
   UScensus2000cdp = derive { name="UScensus2000cdp"; version="0.03"; sha256="143hqnzdla3p31n422ddzaaa34wc6xnnhil4y53m4qydyg407700"; depends=[maptools sp foreign]; };
   UScensus2000tract = derive { name="UScensus2000tract"; version="0.03"; sha256="11ppw75k8zghj7xphx5xyl3azsdsyd142avp0la2g941w6f8l2n1"; depends=[maptools sp foreign]; };
@@ -5372,8 +5682,9 @@ let self = _self // overrides; _self = with self; {
   usdm = derive { name="usdm"; version="1.1-12"; sha256="0padc9ppfisnjg1nzw5csv2zki6dby7487lis8pixf1hhbinsnci"; depends=[raster]; };
   useful = derive { name="useful"; version="1.1.8"; sha256="1lzl7rr9qxqa0ga6ml7qi7wi02fd4isgpfskvi3igy10iw1zv3hb"; depends=[ggplot2 plyr scales]; };
   userfriendlyscience = derive { name="userfriendlyscience"; version="0.1-2"; sha256="1b2ypga0kzf8qsl160by1vfp8p6z2mczn3w1qgk042y83kiaiawx"; depends=[ggplot2 plyr psych pwr fBasics e1071 ltm MBESS foreign knitr xtable GGally lavaan]; };
-  UsingR = derive { name="UsingR"; version="0.1-18"; sha256="1mk1dnz9ssnn9k5plq4wxbqbb73ma7d3b89lv2jbzh2iglbn0r0s"; depends=[MASS]; };
-  usl = derive { name="usl"; version="1.2.2"; sha256="03kx14fs0qi8zjb29xp7pnjh124z290sr7biim8kal1w4a4s946p"; depends=[boot nlmrt]; };
+  UsingR = derive { name="UsingR"; version="2.0-1"; sha256="1z6kiprivam0apdw5qfxyixjwcqpjlap6adccn35cwilgz7ab55i"; depends=[MASS HistData Hmisc aplpack quantreg]; };
+  usl = derive { name="usl"; version="1.3.1"; sha256="1d5xq0iwjp9zdn7xc6vjh74gb0w7fym50qyfd0fn362q5g3jsyk0"; depends=[nlmrt]; };
+  ustyc = derive { name="ustyc"; version="1.0.0"; sha256="1267bng2dz3229cbbq47w22i2yq2ydpw26ngqa1nbi3ma6hwqsv4"; depends=[XML plyr]; };
   utility = derive { name="utility"; version="1.2"; sha256="10dwmf4gcz0jbakwnvgm475sjjilqj1gf3zisil22pk0rcm51kgj"; depends=[]; };
   uuid = derive { name="uuid"; version="0.1-1"; sha256="1b35h2n86233zb6dwkgxxlvnlld8kmv0j6j3m31xjbpmc3ppr7w3"; depends=[]; };
   UWHAM = derive { name="UWHAM"; version="1.0"; sha256="1qaj8anaxqnx4nc6vvzda9hhhzqk9qp8q7bxm26qgia4hgascnrv"; depends=[trust]; };
@@ -5382,22 +5693,26 @@ let self = _self // overrides; _self = with self; {
   varComp = derive { name="varComp"; version="0.1-317"; sha256="16nmhipi0nlh0igc3g9jbv1pqvigmgxy8f395xx6hbzyg87x2ha9"; depends=[quadprog Matrix MASS CompQuadForm RLRsim SPA3G mvtnorm nlme]; };
   varcompci = derive { name="varcompci"; version="1.0.1"; sha256="11fxb63479cha4apakfd1rs89ngrpfhy0h1412wxyn4k8kbibkk4"; depends=[]; };
   vardiag = derive { name="vardiag"; version="0.2-0"; sha256="0avj900zx4nr67dk08n0n6arxx2cb2ymm0kd5xxnzsmyrmwm40mm"; depends=[]; };
+  vardpoor = derive { name="vardpoor"; version="0.2.0.9.2"; sha256="0snc0fcmkppca4rcgdyac0mzg235gm7zira5691mnmamrn4f7ikm"; depends=[data_table laeken reshape2 foreach lpSolve plyr gdata]; };
   VarEff = derive { name="VarEff"; version="1.0"; sha256="0zp024z5xl43z2z67fq5ryfiamfvdbbbv1iaaiyw3shjbg2bp8dp"; depends=[mcmc]; };
   VaRES = derive { name="VaRES"; version="1.0"; sha256="0gw05jiqgirhz3c8skbb07y4h44r6vi68gnd5y7ql455v0c2raza"; depends=[]; };
-  VAR_etp = derive { name="VAR.etp"; version="0.2"; sha256="1782x49mmx5cchndrcvcm4ffccszjv7kd4yzngk18j0ql1asx92s"; depends=[]; };
+  VAR_etp = derive { name="VAR.etp"; version="0.4"; sha256="0pzxmm41l6sci2jcsnlljymb2vb9b6n9lmj3kjs177cfsd6lp9z1"; depends=[]; };
   VariABEL = derive { name="VariABEL"; version="0.9-2"; sha256="0vlr6zxl75i49p35jxrc5fwfrb55n91hqdan2ikcix3r2k4qs5k0"; depends=[]; };
   VarianceGamma = derive { name="VarianceGamma"; version="0.3-1"; sha256="01jv5qrfw8y8yyd3jy3058bpnfyzz7d0m4rx0iibs79gv2rvq5sn"; depends=[DistributionUtils GeneralizedHyperbolic RUnit]; };
   vars = derive { name="vars"; version="1.5-2"; sha256="1q45z5b07ww4nafrvjl48z0w1zpck3cd8fssgwgh4pw84id3dyjh"; depends=[MASS strucchange urca lmtest sandwich]; };
   varSelectIP = derive { name="varSelectIP"; version="0.2-1"; sha256="180lzsg48hnlcmhpk0a5yzmy2syw8yr7f5npnyspx3897hjag1vp"; depends=[MASS mvtnorm]; };
   varSelRF = derive { name="varSelRF"; version="0.7-3"; sha256="11am1hdcaxh58mqa1v16siip6adg61pjxhdyl8mlgnnmffslnpq9"; depends=[randomForest]; };
   VarSwapPrice = derive { name="VarSwapPrice"; version="1.0"; sha256="12q2wp2cqi9q47mzbb7sc250zkjqkhs9z0h93ik0h63dv339abgj"; depends=[]; };
+  vartors = derive { name="vartors"; version="0.2.6"; sha256="04dynqs903clllk9nyynh3dr7msxn5rr5jmw6ql86ppd5w3da0rl"; depends=[]; };
   vbdm = derive { name="vbdm"; version="0.0.4"; sha256="1rbff0whhbfcf6q5wpr3ws1n4n2kcr79yifcni12vxg69a3v6dd3"; depends=[]; };
   VBLPCM = derive { name="VBLPCM"; version="2.4.3"; sha256="0aibjkqlc8l3f17m52ifb25s639gkydvgdj2gkijk5mk0g681qdj"; depends=[ergm sna mclust]; };
-  VBmix = derive { name="VBmix"; version="0.2.16"; sha256="1sb67bhvarf39v0sj0ccy0hss74iv923mdj6gnn64w63k3iw644z"; depends=[lattice pixmap mnormt]; };
-  vcd = derive { name="vcd"; version="1.3-1"; sha256="1sci4p9q45dfc12zihgismkjmp7fivvdf88jizfivvq2i4qk7f56"; depends=[MASS colorspace]; };
-  vcdExtra = derive { name="vcdExtra"; version="0.6-0"; sha256="16lvrjawm3b07614fqi3vg9g2zdx6s6k261zpn89mz3kr7hsxgih"; depends=[vcd gnm MASS]; };
+  VBmix = derive { name="VBmix"; version="0.2.17"; sha256="0fhx2vk5ffq147kfgsqjbqwgv64m7z9mbz4gchj90440ih7kyxa5"; depends=[lattice pixmap mnormt]; };
+  vbsr = derive { name="vbsr"; version="0.0.5"; sha256="1avskbxxyinjjdga4rnghcfvd4sypv4m39ysfaij5avvmi89bx3b"; depends=[]; };
+  vcd = derive { name="vcd"; version="1.3-2"; sha256="1ww69sgg178aqcs90mm599nlr6hnxn54d2wzyhddgx1z3qxhzwjd"; depends=[MASS colorspace]; };
+  vcdExtra = derive { name="vcdExtra"; version="0.6-1"; sha256="11f7my59v4wkj1hbpx4vg1bim93i3ajix24iic5jsrk0gi0431x4"; depends=[vcd gnm MASS]; };
   vcf2geno = derive { name="vcf2geno"; version="2.3"; sha256="1ib9g3162d4mlwrk77fhzsgkcbrbvygav0ycl8527nxbdiyb77f1"; depends=[]; };
   VDA = derive { name="VDA"; version="1.3"; sha256="063mpwbyykx4f46wzfvrgnlq73ar7i06gxr4mjzbhqcfrsybi72b"; depends=[rgl]; };
+  vdg = derive { name="vdg"; version="1.0"; sha256="1agikw9w9rnn3b2q8lp9y3bxjrf8vx24j624wf19bvx5s3ghqc36"; depends=[ggplot2 quantreg proxy]; };
   Vdgraph = derive { name="Vdgraph"; version="2.1-3"; sha256="1vyx6q7h2xj9qipyh7pdnd0mh6cs379irxqaylnn2m9rcrmj191q"; depends=[]; };
   VdgRsm = derive { name="VdgRsm"; version="1.01"; sha256="01hywwjmyvl9ls6gn2vl5z5cv2zlnxl2rfr3k1pachz3gq0yhdc1"; depends=[DoE_wrapper AlgDesign permute]; };
   vec2dtransf = derive { name="vec2dtransf"; version="1.0"; sha256="0hi7x38f3lyxqgwzjz86ld4snva4ci5rinbqhap04d5hcr2sdpzi"; depends=[sp]; };
@@ -5409,23 +5724,23 @@ let self = _self // overrides; _self = with self; {
   vegclust = derive { name="vegclust"; version="1.6.3"; sha256="0l6j4sgzfqvcypx2dszpnsd1sivk33pixlgf9abqifp45skpkwfg"; depends=[vegan sp]; };
   vegdata = derive { name="vegdata"; version="0.6-6"; sha256="0fwilqdzfhmdp8v0i6swmd6600g7mf5pdmz7r5076k0qzapalb3r"; depends=[foreign XML]; };
   vegetarian = derive { name="vegetarian"; version="1.2"; sha256="15ys1m8p3067dfsjwz6ds837n6rqd19my23yj8vw78xli3qmn445"; depends=[]; };
-  VennDiagram = derive { name="VennDiagram"; version="1.6.5"; sha256="1zkxriznnfwxvg7rjq84jrhd990ldq0lyi5dmcbzsszql463lbla"; depends=[]; };
+  VennDiagram = derive { name="VennDiagram"; version="1.6.7"; sha256="0n291hg4qfjx9z5bhna6blzp7zwi6il2s3vg6600nd2rd7nfx98h"; depends=[]; };
   venneuler = derive { name="venneuler"; version="1.1-0"; sha256="10fviqv9vr7zkmqm6iy2l9bjxglf2ljb7sx423vi4s9vffcxjp17"; depends=[rJava]; };
-  verification = derive { name="verification"; version="1.38"; sha256="1nhyhpz427i122nxqrf7lyrvwp5mjj9kvy182rf329zws76hfwfq"; depends=[fields boot CircStats MASS dtw]; };
-  VGAM = derive { name="VGAM"; version="0.9-3"; sha256="1g1w0zh87cavpa8w80mvcyp440v5nxhp82lrbswfhmhlq9vzscmy"; depends=[]; };
-  VGAMdata = derive { name="VGAMdata"; version="0.9-3"; sha256="1fvmgblqwgg9diy2bdk5hcrp1rdj77hnqk27n13ld74lkx5637m7"; depends=[]; };
+  verification = derive { name="verification"; version="1.40"; sha256="19nhpv41s024cqd3qzx0d2sc9234x73s6k8nfj6wf5jvbc5z0xv4"; depends=[fields boot CircStats MASS dtw]; };
+  VGAM = derive { name="VGAM"; version="0.9-4"; sha256="1mpi73vxz6dzmr1g7d1mnybb18zpn7klaqb7x3cq8j2c37b9ywq4"; depends=[]; };
+  VGAMdata = derive { name="VGAMdata"; version="0.9-4"; sha256="0swmq2pi987pln24pyxrrqr8smqk2290j06wfj1ldpa5g4yjzqmr"; depends=[]; };
   VHDClassification = derive { name="VHDClassification"; version="0.3"; sha256="1ij4h3gzxb9mm9q743kc3sg2q609mnqz6mhlrbim1wcjji2b7bv4"; depends=[e1071 lattice]; };
-  VideoComparison = derive { name="VideoComparison"; version="0.9-4"; sha256="0xbsivqzxqciwi7zx78v5s4mrpp2zld1dkddx7n4z61r0mfk547c"; depends=[RJSONIO RCurl zoo pracma Rcpp]; };
+  VideoComparison = derive { name="VideoComparison"; version="0.11"; sha256="04jc9br4ddck2sh9bhy02jx34cqxvh904lr46sid6dnmaqfn80l7"; depends=[RJSONIO RCurl zoo pracma Rcpp]; };
   VIF = derive { name="VIF"; version="1.0"; sha256="0yvg6ikrcs7mhg0pavhcywrfysv7ylvnhxpc5sam86dbp69flx9x"; depends=[]; };
   VIM = derive { name="VIM"; version="4.0.0"; sha256="1w62x5vvbpn3h1zwh0jvvy3lpwai1d708jq18zq99bh1qn8n6bfg"; depends=[colorspace car robustbase sp vcd MASS nnet e1071 Rcpp glmnet]; };
-  vimcom = derive { name="vimcom"; version="0.9-93"; sha256="1yy67s3pkwg3hj2ry0wfqknxnq2wg8n4yh14dmmig00m6cg0gswy"; depends=[]; };
   VIMGUI = derive { name="VIMGUI"; version="0.9.0"; sha256="195lakyik597sjkq6c5v3881p35111gzmj2r5f5nr53vi6bn4pzm"; depends=[tkrplot VIM survey gWidgetsRGtk2 foreign RGtk2 Cairo Hmisc]; };
   VineCopula = derive { name="VineCopula"; version="1.3"; sha256="1vxm7bk7p452p4kbm5q3ricxcd4f74zzlibxx13wj0cbza5p49nl"; depends=[MASS mvtnorm igraph copula]; };
-  vines = derive { name="vines"; version="1.0.11"; sha256="0rvrb03v696z3r2ybgkzdx3bzcdd3a6pid29j8zlrdg96zjwnqgr"; depends=[copula ADGofTest cubature TSP]; };
+  vines = derive { name="vines"; version="1.1.0"; sha256="1cf06i2vci0hwszdlpcig90klxgd7l2k79dln71lc9y0xrzxz9lf"; depends=[copula ADGofTest cubature TSP]; };
   violinmplot = derive { name="violinmplot"; version="0.2.1"; sha256="1j3hb03y988xa704kp25v1z1pmpxw5k1502zfqjaf8cy4lr3kzsc"; depends=[lattice]; };
   vioplot = derive { name="vioplot"; version="0.2"; sha256="16wkb26kv6qr34hv5zgqmgq6zzgysg9i78pvy2c097lr60v087v0"; depends=[sm]; };
   viopoints = derive { name="viopoints"; version="0.2-1"; sha256="0cpbkkzm1rxch8gnvlmmzy8g521f5ang3nhlcnin419gha0w6avf"; depends=[]; };
-  visreg = derive { name="visreg"; version="2.0-4"; sha256="0ba673182kh6ds0s3mvc4qqaxiasl95090algrjqp3dabp1j4hkq"; depends=[lattice]; };
+  visova = derive { name="visova"; version="1.0"; sha256="1w547nbhd69k6y5k0wv51crykwnlzhms2v6xjwp62n8idjlg81ai"; depends=[RJSONIO]; };
+  visreg = derive { name="visreg"; version="2.0-5"; sha256="0pnq8irvsmcb0v77s0vhfldv7myg202fm3wdgssnpsihbz747gcc"; depends=[lattice]; };
   visualFields = derive { name="visualFields"; version="0.4"; sha256="07pkaccnk8c9zzizpcdw82vcbqdng2bi9aczpa68i7fz24bvcfan"; depends=[gridBase flip matrixStats Hmisc]; };
   visualizationTools = derive { name="visualizationTools"; version="0.2.05"; sha256="08ry8bz2278ncjx0sdrg19mv448i0n497l5abpv9f8xhsfsqyrpf"; depends=[]; };
   visualize = derive { name="visualize"; version="4.2"; sha256="1jgk7j0f3p72wbqnmplrgpy7hlh7k2cmvx83gr2zfnbhygdi22mk"; depends=[]; };
@@ -5433,18 +5748,20 @@ let self = _self // overrides; _self = with self; {
   vitality = derive { name="vitality"; version="1.0"; sha256="0di72khz1mwqlirx78a86lwqhjmbbgmxm6vmlwq546dwvs6q071g"; depends=[IMIS]; };
   VizOR = derive { name="VizOR"; version="0.7-9"; sha256="1xw06y86nsrwpri6asrwh8kccjsqzzidgbpld6d6l7vrglp8m6sr"; depends=[lattice rms]; };
   VLF = derive { name="VLF"; version="1.0"; sha256="1il8zhm80mc22zj16dpsy4s6s9arj21l9ik0vccyrpnlr8ws3d3l"; depends=[]; };
-  VLMC = derive { name="VLMC"; version="1.3-13"; sha256="16zi2sx4hhibviqi5j0jv271zvhzgwhyddjiazwa5v0252fmy93d"; depends=[MASS]; };
+  VLMC = derive { name="VLMC"; version="1.3-14"; sha256="073v7wvcfksc224994vp4xswpl5yl37mgrr2gl95566ncbgdm29q"; depends=[MASS]; };
+  VNM = derive { name="VNM"; version="1.0"; sha256="0wng71bxgi1z70cjrkn8dixg86bxhvbhimlrnqjxbwds6z3ds4pz"; depends=[]; };
   Voss = derive { name="Voss"; version="0.1-4"; sha256="056izh1j26vqjhjh01fr7nwiz1l6vwr5z4fll87w99nc5wc4a467"; depends=[fields]; };
   vowels = derive { name="vowels"; version="1.2"; sha256="07w2jv5sswwwzrsc9hdnjh5kj5lqqmpmjn5ihrdj0xpmnhcm4vhp"; depends=[]; };
   vows = derive { name="vows"; version="0.2-1"; sha256="0aqk09y45l4p814x83l07smy1m2aypsf0c341j56di5bsc55vl2m"; depends=[fda gamm4 RLRsim Rniftilib rpanel shape stringr tkrplot]; };
   VoxR = derive { name="VoxR"; version="0.5.1"; sha256="07lsp6lrkq0gv55m84dl9w7gz5246d9avypqnkz96n3rbbgd0w5z"; depends=[]; };
   VPdtw = derive { name="VPdtw"; version="2.1-10"; sha256="1sipiqbk766czd1jxam3bc2hfq7wsn72x51j5ssn2s2q0gvpl7m1"; depends=[]; };
   vrmlgen = derive { name="vrmlgen"; version="1.4.9"; sha256="0lifhhf41yml4k83wpkssl14jgn8jaw1lcknwbci1sd8s1c4478l"; depends=[]; };
-  vrtest = derive { name="vrtest"; version="0.96"; sha256="1sg1w8n0729h2kxazg5lk2vjaraqhlwjbm9w276pa7dqh6iw2fa6"; depends=[]; };
+  vrtest = derive { name="vrtest"; version="0.97"; sha256="00hdgb0r18nwv3qay97b09kqqw9xqsbya06rrjyddqh9r6ggx1y0"; depends=[]; };
   vscc = derive { name="vscc"; version="0.2"; sha256="1p14v8vd8kckd44g4dvzh51gdkd8jvsc4bkd2i4csx8vjiwrni5w"; depends=[teigen mclust]; };
-  VSURF = derive { name="VSURF"; version="0.8.1"; sha256="07j2qvk5zj4jdj5cwvc4q3sjjv3pnr0sq0alvqpbdmahd3ifsm3w"; depends=[randomForest rpart doParallel]; };
+  VSURF = derive { name="VSURF"; version="0.8.2"; sha256="1d9irh8s49i8i9q8psmfl41jnr95wvm3libxin0ir8r297rq82z3"; depends=[randomForest rpart doParallel]; };
   vwr = derive { name="vwr"; version="0.3.0"; sha256="1h790vjcdfngs1siwldvqz8jrxpkajl3266lzadfnmchfan1x7xv"; depends=[stringdist lattice latticeExtra]; };
   W2CWM2C = derive { name="W2CWM2C"; version="1.0"; sha256="14q1y4vpmrx8qz5nav8bbjkxqsqk646zcwr8h7yzi7cfa85b4cxz"; depends=[waveslim wavemulcor]; };
+  W3CMarkupValidator = derive { name="W3CMarkupValidator"; version="0.1-0"; sha256="1p2i45clmkygf8yxg3kmb4qbad2dnmbbldcxm8i6hhsc87mfb18g"; depends=[XML RCurl]; };
   waffect = derive { name="waffect"; version="1.2"; sha256="0r5dvm0ggyxyv81hxdr1an658wkqkhqq2xaqzqpnh4sh4wbak35a"; depends=[Rcpp]; };
   waldwolf = derive { name="waldwolf"; version="0.1"; sha256="0gig3dqs8f44kdzr3abmm4wcnby2ifgqs72ck5wvny6gkwyfdvys"; depends=[]; };
   walkscoreAPI = derive { name="walkscoreAPI"; version="1.2"; sha256="1c2gfkl5yl3mkviah8s8zjnqk6lnzma1yilxgfxckdh5wywi39fx"; depends=[]; };
@@ -5452,7 +5769,7 @@ let self = _self // overrides; _self = with self; {
   wasim = derive { name="wasim"; version="1.1.2"; sha256="1zydzw7cihhdwv0474fnc4lgaq5fwrv8jinz79vkbidbgcy7i2fd"; depends=[MASS qualV tiger fast]; };
   waterData = derive { name="waterData"; version="1.0.3"; sha256="1vwawyn1hzfd9mknpfnysf2whskyg88hl70sgny0zbd2fy1287q5"; depends=[lattice latticeExtra XML]; };
   waterfall = derive { name="waterfall"; version="0.9.9.20121030"; sha256="140s5639ayd9qgn4i1s1qk541vi34ndzdcqpaps7q53g42n8akfw"; depends=[lattice]; };
-  Wats = derive { name="Wats"; version="0.2-9"; sha256="0cx8806d946bbcc5my7mcyn0qvh766yy6lv9cb0afl6h4dlf3fsb"; depends=[boot colorspace ggplot2 lubridate plyr RColorBrewer scales testit zoo]; };
+  Wats = derive { name="Wats"; version="0.2-16"; sha256="1wbyyllmjsmh8wb8npzizlfn3hsvfpqp9p3b5wx3zpsavqw839wy"; depends=[colorspace ggplot2 lubridate plyr RColorBrewer testit zoo]; };
   waveband = derive { name="waveband"; version="4.6"; sha256="1y2qi2zb8l2ap6f8ihnpq2yavic464bl5mp5yv1dscbk0nmfn966"; depends=[wavethresh]; };
   WaveCD = derive { name="WaveCD"; version="1.0"; sha256="0gracn8lknw96nnir1m8fg5va3f45vvbiy69rxx8vibnfdg1q3l9"; depends=[waveslim lattice]; };
   waved = derive { name="waved"; version="1.1-2"; sha256="17pr9qhz0dbbcr78vwm964d9zd7yrfrqvadr1lwf756bsrscmlg3"; depends=[]; };
@@ -5460,11 +5777,11 @@ let self = _self // overrides; _self = with self; {
   wavemulcor = derive { name="wavemulcor"; version="1.2"; sha256="1039y5rakjkx2mvfmykg2z4jpkpbcj7rclyg7ab19wnxmdm8ls81"; depends=[waveslim]; };
   waveslim = derive { name="waveslim"; version="1.7.3"; sha256="0lkq8lcg8cd4iw95jb0r5iwl2habngzzzwcxfic05gbpj5gfmapk"; depends=[]; };
   wavethresh = derive { name="wavethresh"; version="4.6.6"; sha256="1ykhfw1bdibvq2b3rrgqszvwqmzkd3fgxqg7p36ms1cxph68g2r9"; depends=[MASS]; };
-  wbs = derive { name="wbs"; version="1.1"; sha256="04hbmvhlmfv96s80riam7acjyaazdcr5dn7hb8f7qwadvlycrwsw"; depends=[]; };
+  wbs = derive { name="wbs"; version="1.2"; sha256="1mnbx0ik4bakf818nbpgi4zgb8y4ljvz5yq602h3crsc4b32kq1k"; depends=[]; };
   wccsom = derive { name="wccsom"; version="1.2.8"; sha256="0dnqcmrrnzqys4mr1md7f0k0h434x25mdc576j00s3pmjjjh873a"; depends=[class MASS]; };
   WCQ = derive { name="WCQ"; version="0.2"; sha256="1yhkr2iazd7lh9r68xz1lh32z6r1sdnmqrjshcrm4rbwai0j3lkr"; depends=[]; };
   WDI = derive { name="WDI"; version="2.4"; sha256="0ih6d9znq6b2prb4nvq5ypyjv1kpi1vylm3zvmkdjvx95z1qsinf"; depends=[RJSONIO]; };
-  weatherData = derive { name="weatherData"; version="0.4"; sha256="0ka0mj59ivj073bwdinpwh44m3pkj44zzassw5175xj5fz8jvdxc"; depends=[plyr]; };
+  weatherData = derive { name="weatherData"; version="0.4.1"; sha256="19ynb9w52ay15awaf4bqm9lj2w6pk70lyaipn46jrspwxqsvfhlc"; depends=[plyr]; };
   weathermetrics = derive { name="weathermetrics"; version="1.0"; sha256="1ay4gcxpblqnn6zqkdnr0mgnm9r42wlmpb6k3smhbz4zca4kjfzy"; depends=[]; };
   WebDevelopR = derive { name="WebDevelopR"; version="1.0"; sha256="0q4plv5nh6xp35j53xl207d7x0l8041ipi7k7rjrspv9vx7ncgvl"; depends=[]; };
   webvis = derive { name="webvis"; version="0.0.2"; sha256="1cdn9jrpg2sbx4dsj0xf7m0daqr7fqiw3xy1lg0i0qn9cpvi348f"; depends=[]; };
@@ -5475,10 +5792,9 @@ let self = _self // overrides; _self = with self; {
   weights = derive { name="weights"; version="0.80"; sha256="147fgs99sg1agq081ikj2fhb4b2vzsppdg1h1w036bb92vsjb0g5"; depends=[Hmisc gdata]; };
   weirs = derive { name="weirs"; version="0.23"; sha256="1kp49r5ba7ii1mr1nszbssx3fn0c2hcfpawm3a1kbh4rmhvy3frs"; depends=[]; };
   wesanderson = derive { name="wesanderson"; version="0.3"; sha256="169phanzwz3mgzqncwxc5kdshhmj922nzlbq8gz6grvh51bc7aaa"; depends=[]; };
-  wethepeople = derive { name="wethepeople"; version="0.6.1"; sha256="1qa3dla1fmzw80z0qly3vcqvyk86iylvr09h4awgdilihizf0007"; depends=[rjson ggplot2 plyr reshape tm wordcloud RColorBrewer RCurl]; };
-  wfe = derive { name="wfe"; version="1.2"; sha256="0pdjd3n4cbw995sbka4w75pha7wfdzzp66h8838dc3xqx0l4pfss"; depends=[arm Matrix MASS]; };
+  wfe = derive { name="wfe"; version="1.3"; sha256="16b39i60x10kw6yz44ff19h638s9lsgnz8azc76zl9b8s64jliya"; depends=[arm Matrix MASS]; };
   wgaim = derive { name="wgaim"; version="1.4-0"; sha256="0rm9p7c7kxzzpakcm6wc7viisn2y6rwayc0r0hgpiv8fkv3n1sai"; depends=[qtl lattice]; };
-  WGCNA = derive { name="WGCNA"; version="1.34"; sha256="08695i1fp70vkx4sj0wahvy4pmlf0h5x1ri1gj6xvrsl4qm40cgm"; depends=[dynamicTreeCut flashClust Hmisc reshape foreach doParallel matrixStats]; };
+  WGCNA = derive { name="WGCNA"; version="1.41-1"; sha256="0ljqlxrkfxqb7fjdapfx9wrr7115z9rh7lms07vc94z3k1y2qdlw"; depends=[dynamicTreeCut flashClust matrixStats Hmisc foreach doParallel reshape]; };
   wgsea = derive { name="wgsea"; version="1.8"; sha256="1114wik011sm2n12bwm2bhqvdxagbhbscif45k4pgxdkahy2abpi"; depends=[]; };
   WhatIf = derive { name="WhatIf"; version="1.5-6"; sha256="02lqvirnf24jn8b2s08z5fjmpilp2z08lww1s793n3pn783adbky"; depends=[lpSolve]; };
   whisker = derive { name="whisker"; version="0.3-2"; sha256="0z4cn115gxcl086d6bnqr8afi67b6a7xqg6ivmk3l4ng1x8kcj28"; depends=[]; };
@@ -5497,60 +5813,62 @@ let self = _self // overrides; _self = with self; {
   wmtsa = derive { name="wmtsa"; version="2.0-0"; sha256="0y2bv166xwwpb1wf6897qybyf84f34qjsmygdbv90r637c050yk5"; depends=[splus2R ifultools MASS]; };
   wnominate = derive { name="wnominate"; version="0.98"; sha256="1c3g89f7xl781m8lqy730vlb6p5dxq16vgll80jmsx8p7fsy6pb4"; depends=[pscl]; };
   wombsoft = derive { name="wombsoft"; version="2.0"; sha256="11ri29vj1yg2lpr6vf1i45w20hqh8dswj04ylbq0vy27cwmxqljd"; depends=[]; };
-  wordcloud = derive { name="wordcloud"; version="2.4"; sha256="0jdkbks4dxazwgz9862kfpkgnc4zlfc7vhzp7rib8ww7w0kandm3"; depends=[Rcpp RColorBrewer slam]; };
+  wordcloud = derive { name="wordcloud"; version="2.5"; sha256="1ajqdkm8h1wid3d41zd8v7xzf2swid998w31zrghd45a5lcp7qcm"; depends=[RColorBrewer slam Rcpp]; };
   wordmatch = derive { name="wordmatch"; version="1.0"; sha256="0zscp361qf79y1zsliga18hc7wj36cnydshrqb9pv67b65njrznz"; depends=[plyr reshape2]; };
   wordnet = derive { name="wordnet"; version="0.1-9"; sha256="1cwrdfdv1ma429na9y2yci9vrms8vfqqwj9qkcq8hzkm02yzkdsf"; depends=[rJava]; };
   WordPools = derive { name="WordPools"; version="1.0-2"; sha256="1izs4cymf2xy1lax85rvsgsgi05ygf0ibi9gzxc96sbgvy4m78kf"; depends=[]; };
   wpp2008 = derive { name="wpp2008"; version="1.0-1"; sha256="0gd3vjw1fpzhp3qlf1jpc24f76i0pxsjs5pb1v3k2si6df7q4msd"; depends=[]; };
   wpp2010 = derive { name="wpp2010"; version="1.2-0"; sha256="1h87r1cn4lnx80dprvawsyzfkriscqjgr27gvv7n19wvsx8qd57k"; depends=[]; };
-  wpp2012 = derive { name="wpp2012"; version="2.0-0"; sha256="0yqqkj3dj5x784k375xdcxkmg5z12h11jc0cassicyaa3zmwlhzv"; depends=[]; };
-  wppExplorer = derive { name="wppExplorer"; version="1.2-0"; sha256="0hvw6nxl0fvw0sspksgfab3m5y6aq4q60wiz8qlz20qzb4bhw5h5"; depends=[shiny plyr reshape2 googleVis wpp2012 Hmisc ggplot2]; };
-  wq = derive { name="wq"; version="0.3-11"; sha256="0asdkagnaqn9danry972i4n845ljfap8fy7hdm3z1aggx2fd3zw1"; depends=[zoo]; };
+  wpp2012 = derive { name="wpp2012"; version="2.2-0"; sha256="1wsdx1vywydbwd53fai4sapisln10qxi6jj9yvyy92gg14hcx3ff"; depends=[]; };
+  wppExplorer = derive { name="wppExplorer"; version="1.3-0"; sha256="0bki4s6ihl752d7y4ckvb056jlvcpqmp8fc7a7rvdbxw0d66sfh4"; depends=[shiny plyr reshape2 googleVis wpp2012 Hmisc ggplot2]; };
+  wq = derive { name="wq"; version="0.4-1"; sha256="0a46islpzpbkx6c7mbn6q787mh9mb6sy4k46lz8s63fh2h7p0szk"; depends=[zoo]; };
   WrightMap = derive { name="WrightMap"; version="1.1"; sha256="0dmximp549gr37ps56vz8mnlii7753dc5v0wl3s78cymjmnmyr0z"; depends=[]; };
   write_snns = derive { name="write.snns"; version="0.0-4.2"; sha256="0sxg7z8rnh4lssbivkrfxldv4ivy37wkndzzndpbvq2gbvbjnp4l"; depends=[]; };
   WriteXLS = derive { name="WriteXLS"; version="3.5.0"; sha256="0b5md3jy18wrigadqjzfnrpvm35nn0aa62zsq5d72k5fr7lbh3gr"; depends=[]; };
   wrspathrow = derive { name="wrspathrow"; version="0.1"; sha256="1xkh12aal85qhk8d0pdj2qbi6pp4jnr6zbxkhdw2zwav57ly3f4i"; depends=[wrspathrowData sp raster rgeos rgdal]; };
   wrspathrowData = derive { name="wrspathrowData"; version="1.0"; sha256="0a1aggcll0fmkwfg4h7rs4j5h3v1bh95dkbriwrb0bx0cikg63x3"; depends=[]; };
-  wsrf = derive { name="wsrf"; version="1.3.0"; sha256="0n4mzj3a0brs5mxynh34qwgqd7hkrsvv9p0vsviy6d4l4lh3rny6"; depends=[Rcpp]; };
+  wskm = derive { name="wskm"; version="1.4.11"; sha256="1pmsir4msy95x080k463f34ms4vm8nayr21g2cd50mmzffbm5mwl"; depends=[lattice latticeExtra clv]; };
+  wsrf = derive { name="wsrf"; version="1.4.0"; sha256="1b9ifswv0civaavmpzi2r3fdbccxg4akzvklqri0hj49kr4cw5pa"; depends=[Rcpp]; };
   wSVM = derive { name="wSVM"; version="0.1-7"; sha256="0c7rblzgagwfb8mmddkc0nd0f9rv6kapw8znpwapv3fv0j2qzq7h"; depends=[MASS quadprog]; };
-  wtcrsk = derive { name="wtcrsk"; version="1.2"; sha256="067ac52i22s6zban9x6dh4z956n76d22jxsrxbm2k1ms3zk9s4yp"; depends=[]; };
+  wtcrsk = derive { name="wtcrsk"; version="1.3"; sha256="1viddyms2d9q2hb9z788fcs8vp7gp6vzlsszcnyxgganfjsd85zy"; depends=[]; };
   WWGbook = derive { name="WWGbook"; version="1.0.1"; sha256="0q8lnd1fp4rmz715x0lf61py3xw8wg55yq3gvswaqwy68dlqrzjc"; depends=[]; };
   x12 = derive { name="x12"; version="1.5.0"; sha256="0z5hsq0rv71jl9102fqci2wyklmqxly0nc4h7ky845dpvqfrg9yv"; depends=[stringr]; };
   x12GUI = derive { name="x12GUI"; version="0.12.0"; sha256="0vks6m0jck6sl17z9qcw1p1wv5iqdblnmssmfrfjqv626sb9jsn6"; depends=[x12 Hmisc RGtk2 cairoDevice lattice stringr]; };
-  XBRL = derive { name="XBRL"; version="0.99.11"; sha256="1rz2cyw028zkpj969mf4viqxgdbqzknx23dw2ikx3cyxqiiyvh7f"; depends=[Rcpp]; };
+  XBRL = derive { name="XBRL"; version="0.99.12"; sha256="0n51hmhzgx2j1xff5v57p3n30sab580hwdjsqr0vaghqaa6xwpwg"; depends=[Rcpp]; };
+  xergm = derive { name="xergm"; version="1.1"; sha256="132g3gyzfasiv58dxni893ikj5dy1pzbff2rnjyqijd10zngw9rg"; depends=[ergm statnet statnet_common network sna texreg Matrix boot coda ROCR igraph vegan lme4]; };
   xgobi = derive { name="xgobi"; version="1.2-15"; sha256="03ym5mm16rb1bdwrymr393r3xgprp0ign45ryym3g0x2zi8dy557"; depends=[]; };
   xgrid = derive { name="xgrid"; version="1.0-1"; sha256="1xg3frzybck2lmqsxnw448rw4si55k3ygwdkn88d1zfc6llswz9p"; depends=[]; };
+  xhmmScripts = derive { name="xhmmScripts"; version="1.1"; sha256="1qryyb34jx9c64l8bnwp40b08y81agdj5w0icj8dk052x50ip1hl"; depends=[gplots plotrix]; };
   XiMpLe = derive { name="XiMpLe"; version="0.03-21"; sha256="1j387jzxh0z9dmhvc0kpjjjzf781sgrw57nwzdqwx6bn09bw509d"; depends=[]; };
   xkcd = derive { name="xkcd"; version="0.0.3"; sha256="086kdy4dp7312pxv7zpx3qf8rk91lv0snrhipzcmcn1m4q77q9z2"; depends=[Hmisc ggplot2]; };
-  XLConnect = derive { name="XLConnect"; version="0.2-7"; sha256="15vqjlcdh51y3riqaifvj1gk8sfl657dyicbwagnwqq4vsniqihi"; depends=[rJava]; };
-  xlsx = derive { name="xlsx"; version="0.5.5"; sha256="0dl0j0rk9m0chv9yxx92gbbfv9mf5igvk75jrpm2105l2cq5j8jc"; depends=[rJava xlsxjars]; };
+  XLConnect = derive { name="XLConnect"; version="0.2-8"; sha256="026ilqji5kck0azxi9zxry5032kakinjgqsmzxd8z0cwhgmfgq1k"; depends=[XLConnectJars rJava]; };
+  XLConnectJars = derive { name="XLConnectJars"; version="0.2-8"; sha256="1ak0wi07hk8bwi418jy43x5pq57a709xqg6njkc4f394jf8rr60s"; depends=[rJava]; };
+  xlsx = derive { name="xlsx"; version="0.5.7"; sha256="0qxkdpf1dvi0x7fy65abjx2j60rdx7fv5yi8l2wdm0f2631pnwin"; depends=[rJava xlsxjars]; };
   xlsxjars = derive { name="xlsxjars"; version="0.6.0"; sha256="0mjfvd433iz742gn3avaq48172yi5hhd0ajc3v22y1j4k9w82pr7"; depends=[rJava]; };
-  XML = derive { name="XML"; version="3.98-1.1"; sha256="0n9i6746211wihglbpsgalj2cyvggn4rv6a4fbavqwnjw3h1hwwl"; depends=[ pkgs.libxml2 ]; };
+  Xmisc = derive { name="Xmisc"; version="0.1.0"; sha256="1iyv9gp7fw3r7s3v9srd799nhwgpn5851v3n2xfwpcvj9kczrd5r"; depends=[]; };
+  XML = derive { name="XML"; version="3.98-1.1"; sha256="0n9i6746211wihglbpsgalj2cyvggn4rv6a4fbavqwnjw3h1hwwl"; depends=[]; };
   XML2R = derive { name="XML2R"; version="0.0.6"; sha256="0azfh950r2b7ck3n1vzk3mdll7zy844nx3mbk676jxnj8gg7nxk5"; depends=[XML RCurl plyr]; };
   XNomial = derive { name="XNomial"; version="1.0.1"; sha256="134bwglqhgah7v3w6ir65dch2dwp5h4vldw521ba74l5v9b2j2h4"; depends=[]; };
   xoi = derive { name="xoi"; version="0.61-1"; sha256="0ypy0rb0f0bns41vjzyln04k3hypgr3wysqbdi0b0r14ip5rb47k"; depends=[qtl]; };
-  xpose4 = derive { name="xpose4"; version="4.4.1"; sha256="0jl7786rmc8yyvd6vpyyk4s318z647p432cyhpb5lp8vh0rmawl5"; depends=[xpose4data xpose4generic xpose4specific xpose4classic]; };
-  xpose4classic = derive { name="xpose4classic"; version="4.4.1"; sha256="09syj51ahccwkxyqmmg55s80hldy5r2mq4ly6dbjh0q75r5fpmm8"; depends=[lattice xpose4data xpose4generic xpose4specific]; };
-  xpose4data = derive { name="xpose4data"; version="4.4.1"; sha256="0c8ki1hlqqynl4v2g0mqin9swncaq89cg9ixd756gxyhshrcd9mc"; depends=[]; };
-  xpose4generic = derive { name="xpose4generic"; version="4.4.1"; sha256="0m2g3d3d8vydxjvphcydph6wlq1y7540dm1bgix7binm244789fc"; depends=[lattice xpose4data]; };
-  xpose4specific = derive { name="xpose4specific"; version="4.4.1"; sha256="13sffp76q9kvix4y6azcn75mldqz3spc6x1bvlpxz06lbv0ddfwq"; depends=[lattice gam xpose4data xpose4generic Hmisc survival]; };
+  xpose4 = derive { name="xpose4"; version="4.5.0"; sha256="136a1lq9raba731rxy55dy9mw8rs1rha0940b85ljr70mvpmzmqd"; depends=[lattice gam Hmisc survival]; };
   xtable = derive { name="xtable"; version="1.7-3"; sha256="1rsfq0acf1pvpci3jq9fbhsv6ws4d46yap8m2xjk1cr463m9gdcc"; depends=[]; };
   xtermStyle = derive { name="xtermStyle"; version="2.2-4"; sha256="0m1lwr7smym7aczcqqgqj5bx46j38ymmljilxl54bby188qhfcyz"; depends=[]; };
   xts = derive { name="xts"; version="0.9-7"; sha256="163hzcnxrdb4lbsnwwv7qa00h4qlg4jm289acgvbg4jbiywpq7zi"; depends=[zoo]; };
   yacca = derive { name="yacca"; version="1.1"; sha256="0wg2wgvh1najmccmgzyigj11mshrdb8w4r2pqq360dracpn0ak6x"; depends=[]; };
-  yaImpute = derive { name="yaImpute"; version="1.0-21"; sha256="1lrxlxy3zq1cfmrcwv1qd18d6bihlsdfchbn64mss06y4pjvr0qj"; depends=[]; };
+  yaImpute = derive { name="yaImpute"; version="1.0-22"; sha256="1yg26f1q1i6vl1jvdff126025rimkvpj8dhr12d8ld8ryl1qghr3"; depends=[]; };
   YaleToolkit = derive { name="YaleToolkit"; version="4.1"; sha256="1r1vf0gldvcfqa7ln87q5d4sc75d8b99v6zaynvbq02rggzzynmy"; depends=[lattice vcd MASS colorspace barcode gpairs]; };
-  yaml = derive { name="yaml"; version="2.1.11"; sha256="049kdmz6md5gx6x9sgfmi4sx67gz5ln4hdcsc2qbpgrzr085m4gm"; depends=[]; };
+  yaml = derive { name="yaml"; version="2.1.13"; sha256="18kz5mfn7qpif5pn91w4vbrc5bkycsj85vwm5wxwzjlb02i9mxi6"; depends=[]; };
   ycinterextra = derive { name="ycinterextra"; version="0.1"; sha256="0hr37izbbmxqkjy6a7q8vcn0vs8an1ck9y8xfjpl5z0rygi8xc1v"; depends=[mcGlobaloptim]; };
   yhat = derive { name="yhat"; version="2.0-0"; sha256="0vdhkknmms7zy7iha894jn1hr1h5w67pr53r0q67m7p404w21iza"; depends=[yacca miscTools plotrix boot]; };
-  yhatr = derive { name="yhatr"; version="0.8.1"; sha256="16fcsmxzlkxa0kaavsi9qvfnspjlcan6pp96k7hkmmpm2wkdx2v9"; depends=[httr RCurl rjson plyr]; };
+  yhatr = derive { name="yhatr"; version="0.12.1"; sha256="1rps8y7i5fg0xrkjigjx0xa5cwj5b4xf9186dv8valzhbqkvvba1"; depends=[httr RCurl rjson plyr jsonlite stringr]; };
   YieldCurve = derive { name="YieldCurve"; version="4.1"; sha256="0w47j8v2lvarrclnixwzaq98nv1xh2m48q5xvnmk7j9nsv2l3p68"; depends=[xts]; };
   ykmeans = derive { name="ykmeans"; version="1.0"; sha256="0xfji2fmslvc059kk3rwkv575ffzl787sa9d4vw5hxnsmkn8lq50"; depends=[plyr foreach]; };
   YourCast = derive { name="YourCast"; version="1.6.1"; sha256="03aq01amg4cxnxcxnsd1hxkx63w323f8ldkibl1f826gd7lbcqf1"; depends=[ggplot2 gridExtra lattice foreign reshape2]; };
   YplantQMC = derive { name="YplantQMC"; version="0.5"; sha256="0x3ndpamj1ayy1svh9q8pwmfnar9zyw5i6h1k1hqwc92h0k6jsmz"; depends=[rgl geometry LeafAngle devtools]; };
   YPmodel = derive { name="YPmodel"; version="1.1"; sha256="036f5y8qrcxglblgnaa15xzlz9pxbhbysrbr2gl66h9dvcd6kavr"; depends=[]; };
-  YuGene = derive { name="YuGene"; version="1.1.1"; sha256="1shxvhdhf6ba8746p663s3xml0827vfcavqkx6xa4bmfj96br2l0"; depends=[]; };
-  yuima = derive { name="yuima"; version="1.0.10"; sha256="0rn2wr4xyvabx4nqzqafmayd5j8g1la2m9bvacp9h54w5z00zra4"; depends=[zoo expm]; };
+  YuGene = derive { name="YuGene"; version="1.1.2"; sha256="0sy0bh49l0fajh1z88mpb4f0k3hsf3kd1vxv731qhpxcrc3pz09b"; depends=[mixOmics]; };
+  yuima = derive { name="yuima"; version="1.0.24"; sha256="1lr43man9cv8xknwbmaqkz54p3g5znwqyvxjwd75hyj82fa63j60"; depends=[zoo expm]; };
+  zCompositions = derive { name="zCompositions"; version="1.0.1"; sha256="1kjg03cgpi6xjqg0hnjqragyn7yy56pzf2wfwpkrxb5vy92kyjpq"; depends=[MASS NADA truncnorm]; };
   ZeBook = derive { name="ZeBook"; version="0.5"; sha256="1djwda6hzx6kpf4dbmw0fkfq39fqh80aa3q9c6p41qxzcpim27dw"; depends=[triangle deSolve]; };
   Zelig = derive { name="Zelig"; version="4.2-1"; sha256="1hhr9jx25fdnkqwyj2bkgrvqlah4z2drphmb5mdn1an2p2g23v9z"; depends=[boot MASS sandwich]; };
   ZeligChoice = derive { name="ZeligChoice"; version="0.8-1"; sha256="1ql9yq83ipf0vpv63fpckylwq4jrcbfjgjm77f5ndkd83gqjzrmg"; depends=[Zelig VGAM]; };
@@ -5558,13 +5876,14 @@ let self = _self // overrides; _self = with self; {
   ZeligMultilevel = derive { name="ZeligMultilevel"; version="0.7-1"; sha256="00zlambykds4z1c5kx3rpla1kllyp96cxwvbc5lalwdb9i48pp3s"; depends=[Zelig lme4]; };
   zendeskR = derive { name="zendeskR"; version="0.4"; sha256="06cjwk08w3x6dx717123psinid5bx6c563jnfn890373jw6xnfrk"; depends=[RCurl rjson]; };
   zic = derive { name="zic"; version="0.8.1"; sha256="05mn894qdx6k7158dbsjy2b49n0gz5xnmlixr2dhkxc12ydj6zs5"; depends=[Rcpp RcppArmadillo coda]; };
-  ZIM = derive { name="ZIM"; version="1.0"; sha256="0s72xazpcxxv87fy0m7xal41xgng58ilmkk37qarnpnfcd50acq8"; depends=[MASS]; };
-  zipcode = derive { name="zipcode"; version="1.0"; sha256="0amzj2x103zxjv4iqjag226jmlzcrm52883xmkkrrvm4y4h5jqld"; depends=[]; };
+  ZIM = derive { name="ZIM"; version="1.0.1"; sha256="1y3vlxw4ybl2s269r3sbi156y4ffg83kfs152fsxc8q4caygc379"; depends=[MASS]; };
+  zipcode = derive { name="zipcode"; version="1.0"; sha256="1lvlf1h5fv412idpdssjfh4fki933dm5nhr41ppl1mf45b9j7azn"; depends=[]; };
   zipfR = derive { name="zipfR"; version="0.6-6"; sha256="1y3nqfjg5m89mdvcmqwjmwlc8p3hpcqnwv4ji1a7ggg4n63lwl3j"; depends=[]; };
   zoeppritz = derive { name="zoeppritz"; version="1.0-4"; sha256="0mjg55jc5b8h2jj6cy8b34a4q7jhhx73xns0v2dpfkq4kmilsv5p"; depends=[]; };
+  zoib = derive { name="zoib"; version="1.0"; sha256="0mxd9j5sbwyv3bhhrly2ikbfqgk3cgkl6jzai9q6lq3lbg55mh9a"; depends=[rjags coda matrixcalc Formula]; };
   zoo = derive { name="zoo"; version="1.7-11"; sha256="0fp726rp9mqsfmm391bmckk76lqsvzwd39ffvb355wf2spl8nzvf"; depends=[lattice]; };
   zooimage = derive { name="zooimage"; version="3.0-5"; sha256="1r3slmyw0dyqfa40dr5xga814z09ibhmmby8p1cii5lh61xm4c39"; depends=[svMisc svDialogs mlearning filehash jpeg png]; };
   zoom = derive { name="zoom"; version="2.0.4"; sha256="03f5rxfr6ncf1j6vpn7pip21q7ylj4bx0a5xphqb6x6i33lxf1g5"; depends=[]; };
-  zyp = derive { name="zyp"; version="0.10-1"; sha256="0f1fqqxysf3psnvn08s5qly2c958h1hhznjjj8mvpjr5g6hqlr1k"; depends=[Kendall]; };
+  zyp = derive { name="zyp"; version="0.10-1"; sha256="0f1fqqxysf3psnvn08s5qly2c958h1hhznjjj8mvpjr5g6hqlr1k"; depends=[Kendall]; }; 
 
 }; in self

From 4402eb30616f7343850bfcfc6e341ae795d1fd19 Mon Sep 17 00:00:00 2001
From: Adam Vogt <vogt.adam@gmail.com>
Date: Wed, 13 Aug 2014 12:26:08 -0400
Subject: [PATCH 0071/1453] manually fix dplyr and png cran-packages

---
 pkgs/development/r-modules/cran-packages.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix
index 5d71581c7ae2..1113acdb0546 100644
--- a/pkgs/development/r-modules/cran-packages.nix
+++ b/pkgs/development/r-modules/cran-packages.nix
@@ -71,6 +71,10 @@ let self = _self // overrides; _self = with self; {
     meta.hydraPlatforms = R.meta.hydraPlatforms;
   };
 
+  /* Needed to add one more entry to depends: */
+  dplyr = derive { name="dplyr"; version="0.2"; sha256="04kby4n2qvngfdmpqarhizavpy9mr99zpwfxpknqbnbpbya5px1q"; depends=[assertthat Rcpp magrittr Lahman hflights BH]; };
+  png = derive { name="png"; version="0.1-7"; sha256="0g2mcp55lvvpx4kd3mn225mpbxqcq73wy5qx8b4lyf04iybgysg2"; depends=[ pkgs.libpng ]; };
+
 /* not sure if the above customization is needed, or if the
    generated RccArmadillo below will work too:
 
@@ -1275,7 +1279,6 @@ let self = _self // overrides; _self = with self; {
   dpcR = derive { name="dpcR"; version="0.1.2-1"; sha256="1czkwyqnly7lwn00mifm0apnh8ahfv4v9iwzvfwcamfl7qkwbvx6"; depends=[qpcR binom chipPCR e1071 dgof pracma rateratio_test signal shiny spatstat]; };
   dpglasso = derive { name="dpglasso"; version="1.0"; sha256="1mx28xbm2z2bxyp33wv2v6vgn1yfsdsa0bzjjdxasgd6lvr51myf"; depends=[]; };
   dplR = derive { name="dplR"; version="1.6.0"; sha256="1rjb10adhycp16xav7z5c93jfcjwpcrp8cdiyab8skrijgzbp0vx"; depends=[gmp digest lattice stringr XML]; };
-  dplyr = derive { name="dplyr"; version="0.2"; sha256="04kby4n2qvngfdmpqarhizavpy9mr99zpwfxpknqbnbpbya5px1q"; depends=[assertthat Rcpp magrittr Lahman hflights]; };
   dpmixsim = derive { name="dpmixsim"; version="0.0-8"; sha256="0paa2hmpd6bqf0m7p9j7l2h3j18lm64ya6ya8zvp55wm8pf7xgqg"; depends=[oro_nifti cluster]; };
   DPpackage = derive { name="DPpackage"; version="1.1-6"; sha256="01qdl6cp6wkddl9fwwpxwvyhb7lpjxis6wnbm2s288y2n9wi4j24"; depends=[MASS nlme survival]; };
   DPw = derive { name="DPw"; version="1.1.2"; sha256="0waprp6xql67ijwwsy0z8f0fnazkzci0nzwiajwkvy7vbwcch5bx"; depends=[]; };
@@ -3829,7 +3832,6 @@ let self = _self // overrides; _self = with self; {
   pmml = derive { name="pmml"; version="1.4.2"; sha256="0588sph67zs58knf4g3fd7c84i2yag81igr882jgbaxhfhxrpk6n"; depends=[XML survival]; };
   pmmlTransformations = derive { name="pmmlTransformations"; version="1.2.2"; sha256="1p31lakhqwk0qhb565j2sjcfsjsx0i5v8kj8779ryjyvy7717m6m"; depends=[]; };
   pmr = derive { name="pmr"; version="1.2.4"; sha256="15yrh533rj5i728nvcpjj3m5wa3jbspnfj941px3mf11h14npxpp"; depends=[]; };
-  png = derive { name="png"; version="0.1-7"; sha256="0g2mcp55lvvpx4kd3mn225mpbxqcq73wy5qx8b4lyf04iybgysg2"; depends=[]; };
   pnmtrem = derive { name="pnmtrem"; version="1.3"; sha256="0053gg368sdpcw2qzydpq0c5v2cxdlwgf5k68cbw0yx41csjgvz0"; depends=[MASS]; };
   pnn = derive { name="pnn"; version="1.0.1"; sha256="1s6ib60sbdas4720hrsr5lsszsa474kfblqcalsb56c84gkl42ka"; depends=[]; };
   pocrm = derive { name="pocrm"; version="0.8"; sha256="04i9slfb9hmhhhq6m2iz7p3cm3v1v6nsvnr117dp55cxanfymd6f"; depends=[dfcrm nnet]; };

From 4669d7ca61a61054e26a0f989fd5bb315f0f6f5c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 15 Aug 2014 13:16:28 +0200
Subject: [PATCH 0072/1453] r-RcppArmadillo: update to version 0.4.300.0

---
 pkgs/development/r-modules/cran-packages.nix | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix
index 1113acdb0546..4aba7cac092d 100644
--- a/pkgs/development/r-modules/cran-packages.nix
+++ b/pkgs/development/r-modules/cran-packages.nix
@@ -61,10 +61,10 @@ in
 let self = _self // overrides; _self = with self; {
 
   RcppArmadillo = buildRPackage {
-    name="RcppArmadillo-0.4.300.0";
+    name = "RcppArmadillo-0.4.320.0";
     src = fetchurl {
-      url = "mirror://cran/src/contrib/RcppArmadillo_0.4.300.0.tar.gz";
-      sha256="01xsj98sgidlv47bswwaa41kqaz6k6yy57pssr1rkicnf5xg7abj";
+      url = "mirror://cran/src/contrib/RcppArmadillo_0.4.320.0.tar.gz";
+      sha256 ="0cicjn63w9awr9cd5wj09s2rsr83j7rn45cnqlflgx5wmh512jwm";
     };
     propagatedBuildInputs = [Rcpp];
     patchPhase = "patchShebangs configure";
@@ -75,12 +75,6 @@ let self = _self // overrides; _self = with self; {
   dplyr = derive { name="dplyr"; version="0.2"; sha256="04kby4n2qvngfdmpqarhizavpy9mr99zpwfxpknqbnbpbya5px1q"; depends=[assertthat Rcpp magrittr Lahman hflights BH]; };
   png = derive { name="png"; version="0.1-7"; sha256="0g2mcp55lvvpx4kd3mn225mpbxqcq73wy5qx8b4lyf04iybgysg2"; depends=[ pkgs.libpng ]; };
 
-/* not sure if the above customization is needed, or if the
-   generated RccArmadillo below will work too:
-
-  RcppArmadillo = derive { name="RcppArmadillo"; version="0.4.320.0"; sha256="0cicjn63w9awr9cd5wj09s2rsr83j7rn45cnqlflgx5wmh512jwm"; depends=[Rcpp]; };
-*/
-
   A3 = derive { name="A3"; version="0.9.2"; sha256="01s7znhph2mr3snpscci3y7nbcisa6kg6hy7im3742r6ah0z3jv7"; depends=[xtable pbapply]; };
   abc = derive { name="abc"; version="2.0"; sha256="0fs6hxyk95c61mn3p642xs3ib9wfjii2v9a74pf488iaywc1kd7d"; depends=[nnet quantreg MASS locfit]; };
   abcdeFBA = derive { name="abcdeFBA"; version="0.4"; sha256="1rxjripy8v6bxi25vdfjnbk24zkmf752qbl73cin6nvnqflwxkx4"; depends=[Rglpk rgl corrplot lattice]; };

From d306fdd88eede0a751f62634cd476328b2849640 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 15 Aug 2014 13:16:46 +0200
Subject: [PATCH 0073/1453] cran-packages.nix: added missing sha256 fields

---
 pkgs/development/r-modules/cran-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix
index 4aba7cac092d..b8feba5ae31c 100644
--- a/pkgs/development/r-modules/cran-packages.nix
+++ b/pkgs/development/r-modules/cran-packages.nix
@@ -4475,7 +4475,7 @@ let self = _self // overrides; _self = with self; {
   rLindo = derive { name="rLindo"; version="8.0.1"; sha256="05qyc4wvpjgw8jxmwn2nwybi695fjn0cdilkprwmjg07c82f0q5n"; depends=[]; };
   rlist = derive { name="rlist"; version="0.3"; sha256="1l9iypqzdj8j6zg9a55xc6l31sp2lznyx17a1jsl6717bbh5bpmg"; depends=[stringdist data_table yaml jsonlite]; };
   rlme = derive { name="rlme"; version="0.4"; sha256="02683sklihj3726a90jryybf855rvbz9v3dm9z9yhb32q9bfmy34"; depends=[MASS quantreg nlme mgcv stringr magic robustbase Rcpp]; };
-  RLRsim = derive { name="RLRsim"; version="3.0"; sha256=""; depends=[Rcpp mgcv]; };
+  RLRsim = derive { name="RLRsim"; version="3.0"; sha256="16bqsp15b8ikgix18p63k6sf81d1al4djbb51r08imjs4z9jppg4"; depends=[Rcpp mgcv]; };
   RM2 = derive { name="RM2"; version="0.0"; sha256="1v57nhwg8jrpv4zi22fhrphw0p0haynq13pg9k992sb0c72dx70a"; depends=[msm]; };
   rmaf = derive { name="rmaf"; version="2.0"; sha256="00qhdfzbjvmz83nicl73yhx7w8sv6j7x928j4vd6ll79098x4y84"; depends=[]; };
   RMallow = derive { name="RMallow"; version="1.0"; sha256="0prd5fc98mlxnwjhscmghw62jhq9rj5jk8qf4fnaa2a718yxf9b5"; depends=[combinat]; };
@@ -4710,7 +4710,7 @@ let self = _self // overrides; _self = with self; {
   RunuranGUI = derive { name="RunuranGUI"; version="0.1"; sha256="0wm91mzgd01qjinj94fr53m0gkxjvx7yjhmwbkrxsjn6mjklq72l"; depends=[Runuran rvgtest gWidgets gWidgetsRGtk2 cairoDevice]; };
   R_utils = derive { name="R.utils"; version="1.32.4"; sha256="12ypy8sxk5w1a3mpg4hi6k5db7ydrlj7qmp2lzh1rzcpbdg3wgka"; depends=[R_oo R_methodsS3]; };
   rv = derive { name="rv"; version="2.3.1"; sha256="0bjqwk7djl625fws3jlzr1naanwmrfb37hzkyy5szai52nqr2xij"; depends=[]; };
-  RVAideMemoire = derive { name="RVAideMemoire"; version="0.9-38"; sha256=""; depends=[ade4 boot car lme4 lsmeans MASS mixOmics multcomp statmod]; };
+  RVAideMemoire = derive { name="RVAideMemoire"; version="0.9-38"; sha256="02683sklihj3726a90jryybf855rvbz9v3dm9z9yhb32q9bfmy34"; depends=[ade4 boot car lme4 lsmeans MASS mixOmics multcomp statmod]; };
   rvalues = derive { name="rvalues"; version="0.2"; sha256="1zc4irq0s9mm7yz8pc3n9il0z508wwf2a2j741wyyw90f35fasi0"; depends=[]; };
   Rvcg = derive { name="Rvcg"; version="0.8"; sha256="086r4vvqidwzikdmvij52nqgb1ka5z5f0k9c9qi6izn450lpf34y"; depends=[Rcpp]; };
   rvertnet = derive { name="rvertnet"; version="0.0-5"; sha256="1rj6csx2qb094wgkablrpzlbqb0hpzg5d29xrar2cy39gjmz40cj"; depends=[RCurl plyr RJSONIO httr ggplot2 maps]; };

From d612cbdccfc10ec2db649545ca10c23bacbb0e30 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 15 Aug 2014 13:17:02 +0200
Subject: [PATCH 0074/1453] cran-packages.nix: drop trailing whitespace

---
 pkgs/development/r-modules/cran-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix
index b8feba5ae31c..3e41d00c234c 100644
--- a/pkgs/development/r-modules/cran-packages.nix
+++ b/pkgs/development/r-modules/cran-packages.nix
@@ -5880,6 +5880,6 @@ let self = _self // overrides; _self = with self; {
   zoo = derive { name="zoo"; version="1.7-11"; sha256="0fp726rp9mqsfmm391bmckk76lqsvzwd39ffvb355wf2spl8nzvf"; depends=[lattice]; };
   zooimage = derive { name="zooimage"; version="3.0-5"; sha256="1r3slmyw0dyqfa40dr5xga814z09ibhmmby8p1cii5lh61xm4c39"; depends=[svMisc svDialogs mlearning filehash jpeg png]; };
   zoom = derive { name="zoom"; version="2.0.4"; sha256="03f5rxfr6ncf1j6vpn7pip21q7ylj4bx0a5xphqb6x6i33lxf1g5"; depends=[]; };
-  zyp = derive { name="zyp"; version="0.10-1"; sha256="0f1fqqxysf3psnvn08s5qly2c958h1hhznjjj8mvpjr5g6hqlr1k"; depends=[Kendall]; }; 
+  zyp = derive { name="zyp"; version="0.10-1"; sha256="0f1fqqxysf3psnvn08s5qly2c958h1hhznjjj8mvpjr5g6hqlr1k"; depends=[Kendall]; };
 
 }; in self

From 69390c184bad8d05134bdeb80922563c99c5c2bc Mon Sep 17 00:00:00 2001
From: Nathaniel Baxter <nathaniel.baxter@gmail.com>
Date: Fri, 15 Aug 2014 22:41:31 +1000
Subject: [PATCH 0075/1453] flexget: Updated to 1.2.161, with additional
 dependancies added. Also made deluge plugin support conditional on deluge
 being installed, and added similar conditional support for the transmission
 plugin.

---
 pkgs/top-level/python-packages.nix | 67 +++++++++++++++++++++++++++---
 1 file changed, 62 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 00c9d0e41510..3a576921f13c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3235,17 +3235,24 @@ rec {
   };
 
   flexget = buildPythonPackage rec {
-    name = "FlexGet-1.1.121";
+    name = "FlexGet-1.2.161";
 
     src = fetchurl {
       url = "https://pypi.python.org/packages/source/F/FlexGet/${name}.tar.gz";
-      md5 = "44521bcbc2c1e941b656ecfa358adcaa";
+      md5 = "f7533e7b1df49cc8027fc4a2cde0290d";
     };
 
     buildInputs = [ nose ];
-    propagatedBuildInputs = [ beautifulsoup4 pyrss2gen feedparser pynzb html5lib dateutil
-        beautifulsoup flask jinja2 requests sqlalchemy pyyaml cherrypy progressbar deluge
-        python_tvrage jsonschema ];
+    # dateutil dependancy: requirement is dateutil !=2.0 and != 2.2,
+    # dateutil_1_5 is used as it's supported, but a newer version could be used
+    propagatedBuildInputs = [ paver feedparser sqlalchemy pyyaml rpyc
+	    beautifulsoup4 html5lib pyrss2gen pynzb progressbar jinja2 flask
+	    cherrypy requests dateutil_1_5 jsonschema python_tvrage tmdb3 ]
+	# enable deluge and transmission plugin support, if they're installed
+	++ stdenv.lib.optional (pkgs.config.pythonPackages.deluge or false)
+	    pythonpackages.deluge
+	++ stdenv.lib.optional (pkgs.transmission != null)
+	    pythonPackages.transmissionrpc;
 
     meta = {
       homepage = http://flexget.com/;
@@ -6975,6 +6982,24 @@ rec {
 
   });
 
+  rpyc = buildPythonPackage rec {
+    name = "rpyc-${version}";
+    version = "3.3.0";
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/r/rpyc/${name}.tar.gz";
+      md5 = "6931cb92c41f547591b525142ccaeef1";
+    };
+
+    propagatedBuildInputs = [ nose plumbum ];
+
+    meta = {
+      description = "Remote Python Call (RPyC), a transparent and symmetric RPC library";
+      homepage = http://rpyc.readthedocs.org;
+      license = stdenv.lib.licenses.mit;
+    };
+  };
+
   rsa = buildPythonPackage rec {
     name = "rsa-3.1.2";
 
@@ -7939,6 +7964,21 @@ rec {
     };
   };
 
+  tmdb3 = buildPythonPackage rec {
+    name = "tmdb3-${version}";
+    version = "0.6.17";
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/t/tmdb3/${name}.zip";
+      md5 = "cd259427454472164c9a2479504c9cbb";
+    };
+
+    meta = {
+      description = "Python implementation of the v3 API for TheMovieDB.org, allowing access to movie and cast information.";
+      homepage = http://pypi.python.org/pypi/tmdb3;
+      license = stdenv.lib.licenses.bsd3;
+    };
+  };
 
   # TODO
   # Installs correctly but fails tests that involve simple things like:
@@ -8010,6 +8050,23 @@ rec {
     };
   };
 
+  transmissionrpc = buildPythonPackage rec {
+    name = "transmissionrpc-${version}";
+    version = "0.11";
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/t/transmissionrpc/${name}.tar.gz";
+      md5 = "b2f918593e509f0e66e2e643291b436d";
+    };
+
+    propagatedBuildInputs = [ six ];
+
+    meta = {
+      description = "Python implementation of the Transmission bittorent client RPC protocol.";
+      homepage = http://pypi.python.org/pypi/transmissionrpc/;
+      license = stdenv.lib.licenses.mit;
+    };
+  };
 
   eggdeps  = buildPythonPackage rec {
      name = "eggdeps-${version}";

From 5f14d3ccebced36f8f3bad3145a207e00eb89700 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Fri, 15 Aug 2014 10:29:39 +0200
Subject: [PATCH 0076/1453] Fix for hdevtools: update patch to build with ghc
 7.8.3

---
 pkgs/development/tools/haskell/hdevtools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/haskell/hdevtools/default.nix b/pkgs/development/tools/haskell/hdevtools/default.nix
index 9565478d11b6..15c9127e38a2 100644
--- a/pkgs/development/tools/haskell/hdevtools/default.nix
+++ b/pkgs/development/tools/haskell/hdevtools/default.nix
@@ -2,11 +2,11 @@
 
 cabal.mkDerivation (self: {
   pname = "hdevtools";
-  version = "0.1.0.5";
+  version = "0.1.0.6-pre-github-schell-9e34f7dd";
   sha256 = "1a218m817q35f52fv6mn28sfv136i6fm2mzgdidpm24pc0585gl7";
   isLibrary = false;
   isExecutable = true;
-  patches = [ (fetchpatch { url = "https://github.com/bitc/hdevtools/pull/28.patch"; sha256 = "1rlv5zskg4ns9ba791x72gycxrr52lhy8x164q38gpq600gh5n40"; }) ];
+  patches = [ (fetchpatch { url = "https://github.com/ts468/hdevtools/pull/2.patch"; sha256 = "0sr62fr1f3cxx86vgd6a56bcjhr02if7n1scj6nbndpfsf9kzadd"; }) ];
   buildDepends = [ cmdargs ghcPaths network syb time ];
   meta = {
     homepage = "https://github.com/bitc/hdevtools/";

From 33c7f791d869269095f24a8083a35505906f8856 Mon Sep 17 00:00:00 2001
From: Matthew Brown <matt@ederoyd.co.uk>
Date: Fri, 15 Aug 2014 14:17:40 +0100
Subject: [PATCH 0077/1453] Added haskell hex protobuf packages

---
 .../libraries/haskell/hex/default.nix         | 14 +++++++++++
 .../libraries/haskell/protobuf/default.nix    | 25 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  4 +++
 3 files changed, 43 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/hex/default.nix
 create mode 100644 pkgs/development/libraries/haskell/protobuf/default.nix

diff --git a/pkgs/development/libraries/haskell/hex/default.nix b/pkgs/development/libraries/haskell/hex/default.nix
new file mode 100644
index 000000000000..235d617e96b2
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hex/default.nix
@@ -0,0 +1,14 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "hex";
+  version = "0.1.2";
+  sha256 = "1v31xiaivrrn0q2jz8919wvkjplv1kxna5ajhsj701fqxm1i5vhj";
+  meta = {
+    description = "Convert strings into hexadecimal and back";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/protobuf/default.nix b/pkgs/development/libraries/haskell/protobuf/default.nix
new file mode 100644
index 000000000000..be437c7410de
--- /dev/null
+++ b/pkgs/development/libraries/haskell/protobuf/default.nix
@@ -0,0 +1,25 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, cereal, dataBinaryIeee754, deepseq, hex, HUnit, mtl
+, QuickCheck, tagged, tasty, tastyHunit, tastyQuickcheck, text
+, unorderedContainers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "protobuf";
+  version = "0.2.0.3";
+  sha256 = "0jcrnym0j8w4vjrdmvn88x8ddp8wf809wviy1vkz94p2nyp6l2hw";
+  buildDepends = [
+    cereal dataBinaryIeee754 deepseq mtl text unorderedContainers
+  ];
+  testDepends = [
+    cereal hex HUnit mtl QuickCheck tagged tasty tastyHunit
+    tastyQuickcheck text unorderedContainers
+  ];
+  meta = {
+    homepage = "https://github.com/alphaHeavy/protobuf";
+    description = "Google Protocol Buffers via GHC.Generics";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 38de9fb17585..a1e1a1c5856f 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1079,6 +1079,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   heredoc = callPackage ../development/libraries/haskell/heredoc {};
 
   hexpat = callPackage ../development/libraries/haskell/hexpat {};
+  
+  hex = callPackage ../development/libraries/haskell/hex {};
 
   hgal = callPackage ../development/libraries/haskell/hgal {};
 
@@ -1913,6 +1915,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   prologGraphLib = callPackage ../development/libraries/haskell/prolog-graph-lib {};
   prologGraph = callPackage ../development/libraries/haskell/prolog-graph {};
 
+  protobuf = callPackage ../development/libraries/haskell/protobuf {};
+  
   protocolBuffers = callPackage ../development/libraries/haskell/protocol-buffers {};
 
   protocolBuffersDescriptor = callPackage ../development/libraries/haskell/protocol-buffers-descriptor {};

From 6ded64bd05049ec5b0973131e5cf3eedeaad558c Mon Sep 17 00:00:00 2001
From: Hoang Xuan Phu <phuhimself@phunehehe.net>
Date: Fri, 15 Aug 2014 22:14:23 +0800
Subject: [PATCH 0078/1453] add HaskellNet-SSL

---
 .../libraries/haskell/HaskellNet-SSL/default.nix   | 14 ++++++++++++++
 pkgs/top-level/haskell-packages.nix                |  1 +
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/HaskellNet-SSL/default.nix

diff --git a/pkgs/development/libraries/haskell/HaskellNet-SSL/default.nix b/pkgs/development/libraries/haskell/HaskellNet-SSL/default.nix
new file mode 100644
index 000000000000..820159bb05f2
--- /dev/null
+++ b/pkgs/development/libraries/haskell/HaskellNet-SSL/default.nix
@@ -0,0 +1,14 @@
+{ cabal, connection, dataDefault, HaskellNet, network, tls }:
+
+cabal.mkDerivation (self: {
+  pname = "HaskellNet-SSL";
+  version = "0.2.4";
+  sha256 = "0rwj69rz8i84qj6n1zd9fllp4333azfxppd7blzd486bczzkgkbb";
+  buildDepends = [ connection dataDefault HaskellNet network tls ];
+  meta = {
+    homepage = "https://github.com/dpwright/HaskellNet-SSL";
+    description = "Helpers to connect to SSL/TLS mail servers with HaskellNet";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 38de9fb17585..326c68724c9f 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1047,6 +1047,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   haskellNames = callPackage ../development/libraries/haskell/haskell-names {};
 
   HaskellNet = callPackage ../development/libraries/haskell/HaskellNet {};
+  HaskellNetSSL = callPackage ../development/libraries/haskell/HaskellNet-SSL {};
 
   haskellPackages = callPackage ../development/libraries/haskell/haskell-packages {};
 

From 2815cdb8a77c632dacaa9d1d9228af8019d2e4d2 Mon Sep 17 00:00:00 2001
From: Boris Sukholitko <boriss@gmail.com>
Date: Fri, 15 Aug 2014 17:51:50 +0300
Subject: [PATCH 0079/1453] tigervnc: fix xkb configuration for Xvnc

Without those fixes, Xvnc doesn't work at all.
---
 pkgs/tools/admin/tigervnc/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix
index 3d5abd074d96..71e1f29cf1c1 100644
--- a/pkgs/tools/admin/tigervnc/default.nix
+++ b/pkgs/tools/admin/tigervnc/default.nix
@@ -57,7 +57,12 @@ stdenv.mkDerivation rec {
       patch -p1 < $a
     done
     autoreconf -vfi
-    ./configure $configureFlags --disable-xinerama --disable-xvfb --disable-xnest --disable-xorg --disable-dmx --disable-dri --disable-dri2 --disable-glx --prefix="$out" --disable-unit-tests
+    ./configure $configureFlags --disable-xinerama --disable-xvfb --disable-xnest \
+        --disable-xorg --disable-dmx --disable-dri --disable-dri2 --disable-glx \
+        --prefix="$out" --disable-unit-tests \
+        --with-xkb-path=${xkeyboard_config}/share/X11/xkb \
+        --with-xkb-bin-directory=${xkbcomp}/bin \
+        --with-xkb-output=$out/share/X11/xkb/compiled
     make TIGERVNC_SRCDIR=`pwd`/../..
     popd
   '';

From f39f67b8717a5d27eb6e7672bd913c5990260f93 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 15 Aug 2014 18:37:09 +0200
Subject: [PATCH 0080/1453] haskell-HaskellNet-SSL: re-generate with cabal2nix

---
 pkgs/development/libraries/haskell/HaskellNet-SSL/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/haskell/HaskellNet-SSL/default.nix b/pkgs/development/libraries/haskell/HaskellNet-SSL/default.nix
index 820159bb05f2..d5cc70855382 100644
--- a/pkgs/development/libraries/haskell/HaskellNet-SSL/default.nix
+++ b/pkgs/development/libraries/haskell/HaskellNet-SSL/default.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, connection, dataDefault, HaskellNet, network, tls }:
 
 cabal.mkDerivation (self: {

From 610f31fe92ddebeda9f752658f45edcdcafd76eb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 15 Aug 2014 18:51:47 +0200
Subject: [PATCH 0081/1453] RcmdrPlugin_ROC: remove broken package

This build goes into an endless loop and produces gigabytes of useless
output. :-(
---
 pkgs/development/r-modules/cran-packages.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix
index 3e41d00c234c..dcffbccb510a 100644
--- a/pkgs/development/r-modules/cran-packages.nix
+++ b/pkgs/development/r-modules/cran-packages.nix
@@ -4215,7 +4215,6 @@ let self = _self // overrides; _self = with self; {
   RcmdrPlugin_plotByGroup = derive { name="RcmdrPlugin.plotByGroup"; version="0.1-0"; sha256="10wc7lnihsrldsynq2s0syr1aqmvfnj9rhgwh1nkk7jlrwcgj0z6"; depends=[Rcmdr lattice]; };
   RcmdrPlugin_pointG = derive { name="RcmdrPlugin.pointG"; version="0.6.6"; sha256="0sc3akbpdys353va05b40g3rq8qihw0pmhvv0kckkhsgrbr8mc07"; depends=[Rcmdr RColorBrewer]; };
   RcmdrPlugin_qual = derive { name="RcmdrPlugin.qual"; version="2.2.6"; sha256="00wznh0k909cd9vwdj1ag3224xkqnwjsad1bfkgxbszsx0w6xvy9"; depends=[Rcmdr]; };
-  RcmdrPlugin_ROC = derive { name="RcmdrPlugin.ROC"; version="1.0-16"; sha256="1pxv0izdkqjhvmbvln6n2lhr1mamfy4q20ld6dqkldxj9bivzckb"; depends=[Rcmdr pROC ROCR ResourceSelection PredictABEL]; };
   RcmdrPlugin_sampling = derive { name="RcmdrPlugin.sampling"; version="1.1"; sha256="0fx0s63wq0si1jydl9xyj9ny7iglg91zpvkyrnc05i5pan9l3xd9"; depends=[lpSolve sampling MASS Rcmdr]; };
   RcmdrPlugin_SCDA = derive { name="RcmdrPlugin.SCDA"; version="1.0"; sha256="0z43hhp798kga70xmiq4wzp5iad553rndn17g3va3dh6lz1k3y3h"; depends=[SCVA SCRT SCMA Rcmdr]; };
   RcmdrPlugin_seeg = derive { name="RcmdrPlugin.seeg"; version="1.0"; sha256="105c2rl3mrcv7r3iqa9d2zs6cys7vfpyydylkg2cggfqkghxgr95"; depends=[Rcmdr seeg spatstat sgeostat]; };

From 8700f46a8f731e9e2ab29dd6a85d53870d24da31 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Fri, 15 Aug 2014 19:45:32 +0200
Subject: [PATCH 0082/1453] Vim-plugins: add vim-pathogen

---
 pkgs/misc/vim-plugins/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 78c4bb0ede65..648ddb1b4305 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -635,4 +635,14 @@ in rec
     path = "tmux-navigator";
   };
 
+  pathogen = simpleDerivation {
+    name = "vim-pathogen-git-3de98bfc";
+    src = fetchgit {
+      url = "https://github.com/tpope/vim-pathogen.git";
+      rev = "91e6378908721d20514bbe5d18d292a0a15faf0c";
+      sha256 = "24c1897d6b58576b2189c90050a7f8ede72a51343c752e9d030e833dbe5cac6f";
+     };
+    path = "pathogen";
+  };
+
 }

From 61960858c46cac7275a8d8164cbba3dfa4cd8186 Mon Sep 17 00:00:00 2001
From: Daniel Bergey <bergey@alum.mit.edu>
Date: Fri, 15 Aug 2014 18:42:13 +0000
Subject: [PATCH 0083/1453] update haskellPackages.imm to 0.6.0.2

Uses latest version of tls; builds without patching
---
 pkgs/development/libraries/haskell/imm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/imm/default.nix b/pkgs/development/libraries/haskell/imm/default.nix
index 24a96ba028a9..5529f27eb5e9 100644
--- a/pkgs/development/libraries/haskell/imm/default.nix
+++ b/pkgs/development/libraries/haskell/imm/default.nix
@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "imm";
-  version = "0.6.0.1";
-  sha256 = "11m6937wafl6nic69mbibrjnxib503907y21n9zmsxc8vnjl3pps";
+  version = "0.6.0.2";
+  sha256 = "0bawp8zqpkxig33ybv0yxv6bh51rfhsyp0q7l0lh61gy17rx0gsa";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 23da6f9ca42a988bd393eeb93425bd842ab2a7c9 Mon Sep 17 00:00:00 2001
From: Nathan Bijnens <nathan@nathan.gs>
Date: Fri, 15 Aug 2014 21:16:33 +0200
Subject: [PATCH 0084/1453] mailutils: fix for sendmail path

---
 lib/maintainers.nix                         | 1 +
 pkgs/tools/networking/mailutils/default.nix | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 pkgs/tools/networking/mailutils/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index b1c3f6bcdd23..184fd7036a0f 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -68,6 +68,7 @@
   modulistic = "Pablo Costa <modulistic@gmail.com>";
   mornfall = "Petr Ročkai <me@mornfall.net>";
   msackman = "Matthew Sackman <matthew@wellquite.org>";
+  nathan-gs = "Nathan Bijnens <nathan@nathan.gs>";
   notthemessiah = "Brian Cohen <brian.cohen.88@gmail.com>";
   ocharles = "Oliver Charles <ollie@ocharles.org.uk>";
   offline = "Jaka Hudoklin <jakahudoklin@gmail.com>";
diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix
old mode 100644
new mode 100755
index 0453567c449b..4c1001310ae1
--- a/pkgs/tools/networking/mailutils/default.nix
+++ b/pkgs/tools/networking/mailutils/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, gettext, gdbm, libtool, pam, readline
-, ncurses, gnutls, mysql, guile, texinfo, gnum4, dejagnu }:
+, ncurses, gnutls, mysql, guile, texinfo, gnum4, dejagnu, sendmailPath ? "/var/setuid-wrappers/sendmail" }:
 
 /* TODO: Add GNU SASL, GNU GSSAPI, and FreeBidi.  */
 
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
 
   patches = [ ./path-to-cat.patch ./no-gets.patch ];
 
+  configureFlags = "--with-path-sendmail=${sendmailPath}";
+
   buildInputs =
    [ gettext gdbm libtool pam readline ncurses
      gnutls mysql guile texinfo gnum4 ]

From fea19a1fd68c10a8076ad880cf2ddb9a55101993 Mon Sep 17 00:00:00 2001
From: Brian Cohen <brian.cohen.88@gmail.com>
Date: Fri, 15 Aug 2014 21:26:11 -0400
Subject: [PATCH 0085/1453] Added implicit and storableEndian to
 haskellPackages for ImplicitCAD

---
 .../libraries/haskell/implicit/default.nix    | 25 +++++++++++++++++++
 .../haskell/storable-endian/default.nix       | 15 +++++++++++
 pkgs/top-level/haskell-packages.nix           |  4 +++
 3 files changed, 44 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/implicit/default.nix
 create mode 100644 pkgs/development/libraries/haskell/storable-endian/default.nix

diff --git a/pkgs/development/libraries/haskell/implicit/default.nix b/pkgs/development/libraries/haskell/implicit/default.nix
new file mode 100644
index 000000000000..39013aff28f6
--- /dev/null
+++ b/pkgs/development/libraries/haskell/implicit/default.nix
@@ -0,0 +1,25 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, blazeBuilder, blazeMarkup, blazeSvg, deepseq, filepath
+, JuicyPixels, mtl, NumInstances, optparseApplicative, parallel
+, parsec, storableEndian, text, unorderedContainers, vectorSpace
+}:
+
+cabal.mkDerivation (self: {
+  pname = "implicit";
+  version = "0.0.3";
+  sha256 = "0zsd25gd0c4sp1ipjnsbn1gbdl6s0y2vy8n4nwn3dxgrv75cd1l9";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    blazeBuilder blazeMarkup blazeSvg deepseq filepath JuicyPixels mtl
+    NumInstances optparseApplicative parallel parsec storableEndian
+    text unorderedContainers vectorSpace
+  ];
+  meta = {
+    homepage = "https://github.com/colah/ImplicitCAD";
+    description = "Math-inspired programmatic 2&3D CAD: CSG, bevels, and shells; gcode export..";
+    license = "GPL";
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/storable-endian/default.nix b/pkgs/development/libraries/haskell/storable-endian/default.nix
new file mode 100644
index 000000000000..9fdbdb5a6b07
--- /dev/null
+++ b/pkgs/development/libraries/haskell/storable-endian/default.nix
@@ -0,0 +1,15 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, byteorder }:
+
+cabal.mkDerivation (self: {
+  pname = "storable-endian";
+  version = "0.2.5";
+  sha256 = "04j1nk0wga4dqrqvhm8yd9h9194db1n3yrnhg8s3gsc0jk7yw1p2";
+  buildDepends = [ byteorder ];
+  meta = {
+    description = "Storable instances with endianness";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 3fc3aa5ffe1d..0bbacbd36b0b 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1321,6 +1321,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   imm = callPackage ../development/libraries/haskell/imm {};
 
+  implicit = callPackage ../development/libraries/haskell/implicit {};
+
   indents = callPackage ../development/libraries/haskell/indents {};
 
   indexed = callPackage ../development/libraries/haskell/indexed {};
@@ -2302,6 +2304,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   storableComplex = callPackage ../development/libraries/haskell/storable-complex {};
 
+  storableEndian = callPackage ../development/libraries/haskell/storable-endian {};
+
   storableRecord = callPackage ../development/libraries/haskell/storable-record {};
 
   Stream = callPackage ../development/libraries/haskell/Stream {};

From 947d1945fbfea29c6ce827ee791f24a847762af0 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Fri, 15 Aug 2014 20:26:13 -0700
Subject: [PATCH 0086/1453] add the Haskell algebra library

---
 .../libraries/haskell/algebra/default.nix     | 21 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/algebra/default.nix

diff --git a/pkgs/development/libraries/haskell/algebra/default.nix b/pkgs/development/libraries/haskell/algebra/default.nix
new file mode 100644
index 000000000000..10cb8d71e564
--- /dev/null
+++ b/pkgs/development/libraries/haskell/algebra/default.nix
@@ -0,0 +1,21 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, adjunctions, distributive, mtl, nats, semigroupoids
+, semigroups, tagged, transformers, void
+}:
+
+cabal.mkDerivation (self: {
+  pname = "algebra";
+  version = "4.0";
+  sha256 = "0gz02f8747xri6ng2pm9if48875rjz7j3f5klzsxi4d93y8q7qn6";
+  buildDepends = [
+    adjunctions distributive mtl nats semigroupoids semigroups tagged
+    transformers void
+  ];
+  meta = {
+    homepage = "http://github.com/ekmett/algebra/";
+    description = "Constructive abstract algebra";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 3fc3aa5ffe1d..8cce905408b3 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -151,6 +151,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   aesonUtils = callPackage ../development/libraries/haskell/aeson-utils {};
 
+  algebra = callPackage ../development/libraries/haskell/algebra {};
+
   alsaCore = callPackage ../development/libraries/haskell/alsa-core {};
 
   alsaMixer = callPackage ../development/libraries/haskell/alsa-mixer {};

From 4fd15eb279725ea6fd0f0947634daa8caf415335 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Fri, 15 Aug 2014 20:42:43 -0700
Subject: [PATCH 0087/1453] update Algebra to v4.1

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

diff --git a/pkgs/development/libraries/haskell/algebra/default.nix b/pkgs/development/libraries/haskell/algebra/default.nix
index 10cb8d71e564..1e054a1cdb4f 100644
--- a/pkgs/development/libraries/haskell/algebra/default.nix
+++ b/pkgs/development/libraries/haskell/algebra/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "algebra";
-  version = "4.0";
-  sha256 = "0gz02f8747xri6ng2pm9if48875rjz7j3f5klzsxi4d93y8q7qn6";
+  version = "4.1";
+  sha256 = "1wcwpngaqnr9w89p5dycmpsaihdwqqrs2vjap6jfwrscq16yyyc6";
   buildDepends = [
     adjunctions distributive mtl nats semigroupoids semigroups tagged
     transformers void

From dc285e6895e97355f769fdd6341b3e9c0cce2cf9 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 13 Aug 2014 22:38:32 -0400
Subject: [PATCH 0088/1453] cabal.mkDerivation: Use defaultMain if no
 Setup.{l,}hs exists.

This mirrors the default behaviour of cabal-install for the Simple build type
---
 pkgs/build-support/cabal/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix
index 69423004d65f..7147b287faeb 100644
--- a/pkgs/build-support/cabal/default.nix
+++ b/pkgs/build-support/cabal/default.nix
@@ -182,6 +182,12 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version;
               for i in Setup.hs Setup.lhs; do
                 test -f $i && ghc --make $i
               done
+              if [ ! -f Setup ]; then
+                  ghc --make ${builtins.toFile "Setup.hs" ''
+                    import Distribution.Simple
+                    main = defaultMain
+                  ''} -o Setup -odir $TMPDIR
+              fi
 
               for p in $extraBuildInputs $propagatedNativeBuildInputs; do
                 if [ -d "$p/lib/ghc-${ghc.ghc.version}/package.conf.d" ]; then

From cfc70c60ab1171edd30f2731b3f595b5a40aa168 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Sat, 16 Aug 2014 00:10:40 -0500
Subject: [PATCH 0089/1453] coq_HEAD: 8.5pre-fff9e2f7 -> 8.5pre-8bc01590

---
 pkgs/applications/science/logic/coq/HEAD.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/logic/coq/HEAD.nix b/pkgs/applications/science/logic/coq/HEAD.nix
index c103b8b47697..8e6fde6bc240 100644
--- a/pkgs/applications/science/logic/coq/HEAD.nix
+++ b/pkgs/applications/science/logic/coq/HEAD.nix
@@ -3,7 +3,7 @@
 {stdenv, fetchgit, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null}:
 
 let 
-  version = "8.5pre-fff9e2f7";
+  version = "8.5pre-8bc01590";
   buildIde = lablgtk != null;
   ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
   idePath = if buildIde then ''
@@ -16,8 +16,8 @@ stdenv.mkDerivation {
 
   src = fetchgit {
     url = git://scm.gforge.inria.fr/coq/coq.git;
-    rev = "21994cc4c617582f4f94577c1c582a7b51b7770b";
-    sha256 = "12kadlmyh9bspn9kds36pwrq77d0widrk5q43wyrgb8y9zrnyz61";
+    rev = "8bc0159095cb0230a50c55a1611c8b77134a6060";
+    sha256 = "1cp4hbk9jw78y03vwz099yvixax161h60hsbyvwiwz2z5czjxzcv";
   };
 
   buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ];

From 28d898ed0758e9d792ac58bfb817576e89b46777 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Sat, 16 Aug 2014 00:11:57 -0500
Subject: [PATCH 0090/1453] texlive: Fix build for users of Mavericks

---
 pkgs/tools/typesetting/tex/texlive/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index b5589cf943b3..c2840fd843ff 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -22,6 +22,7 @@ rec {
   setupHook = ./setup-hook.sh;
 
   doMainBuild = fullDepEntry ( stdenv.lib.optionalString stdenv.isDarwin ''
+    export MACOSX_DEPLOYMENT_TARGET=10.9
     export DYLD_LIBRARY_PATH="${poppler}/lib"
   '' + ''
     mkdir -p $out

From cd89cc018f113b994ba7819185e8cd6145262db4 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Sat, 16 Aug 2014 00:12:35 -0500
Subject: [PATCH 0091/1453] haskell-aeson: Add version 0.7.0.6

---
 .../libraries/haskell/aeson/0.7.0.6.nix       | 28 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  1 +
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/aeson/0.7.0.6.nix

diff --git a/pkgs/development/libraries/haskell/aeson/0.7.0.6.nix b/pkgs/development/libraries/haskell/aeson/0.7.0.6.nix
new file mode 100644
index 000000000000..b5626f63932a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/aeson/0.7.0.6.nix
@@ -0,0 +1,28 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, attoparsec, blazeBuilder, deepseq, dlist, hashable, HUnit
+, mtl, QuickCheck, scientific, syb, testFramework
+, testFrameworkHunit, testFrameworkQuickcheck2, text, time
+, unorderedContainers, vector
+}:
+
+cabal.mkDerivation (self: {
+  pname = "aeson";
+  version = "0.7.0.6";
+  sha256 = "0vsf9msz9iv7xvsnys5c0kbkldb0pvhiai02vz50b0d1kdsk2mb4";
+  buildDepends = [
+    attoparsec blazeBuilder deepseq dlist hashable mtl scientific syb
+    text time unorderedContainers vector
+  ];
+  testDepends = [
+    attoparsec HUnit QuickCheck testFramework testFrameworkHunit
+    testFrameworkQuickcheck2 text time unorderedContainers vector
+  ];
+  meta = {
+    homepage = "https://github.com/bos/aeson";
+    description = "Fast JSON parsing and encoding";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 3fc3aa5ffe1d..e1bde090676b 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -142,6 +142,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   AES = callPackage ../development/libraries/haskell/AES {};
 
   aeson_0_7_0_4 = callPackage ../development/libraries/haskell/aeson/0.7.0.4.nix { blazeBuilder = null; };
+  aeson_0_7_0_6 = callPackage ../development/libraries/haskell/aeson/0.7.0.6.nix { blazeBuilder = null; };
   aeson_0_8_0_0 = callPackage ../development/libraries/haskell/aeson/0.8.0.0.nix { blazeBuilder = null; };
   aeson = self.aeson_0_8_0_0;
 

From 072d128e43d2b85a948c633822de53f4fab36378 Mon Sep 17 00:00:00 2001
From: Aycan iRiCAN <iricanaycan@gmail.com>
Date: Sat, 16 Aug 2014 10:20:44 +0300
Subject: [PATCH 0092/1453] Bump haskellPackages.hdaemonize to 0.5.0.0

---
 pkgs/development/libraries/haskell/hdaemonize/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hdaemonize/default.nix b/pkgs/development/libraries/haskell/hdaemonize/default.nix
index 97133920389d..ba5d00e3845b 100644
--- a/pkgs/development/libraries/haskell/hdaemonize/default.nix
+++ b/pkgs/development/libraries/haskell/hdaemonize/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hdaemonize";
-  version = "0.4.5.0";
-  sha256 = "1b9aic08pgmp95qy74qcrmq9dn33k6knycy7mn1dg8c5svmchb2w";
+  version = "0.5.0.0";
+  sha256 = "15dyaa9rbmsjp3sg9yxg1i90kfy9rvlzmwg5kl8kwal69ajzjjgv";
   buildDepends = [ extensibleExceptions filepath hsyslog mtl ];
   meta = {
     homepage = "http://github.com/madhadron/hdaemonize";
@@ -14,3 +14,4 @@ cabal.mkDerivation (self: {
     platforms = self.ghc.meta.platforms;
   };
 })
+

From 9115ce22d47efaa67621257cd6e3ce8494707973 Mon Sep 17 00:00:00 2001
From: Aycan iRiCAN <iricanaycan@gmail.com>
Date: Sat, 16 Aug 2014 10:22:21 +0300
Subject: [PATCH 0093/1453] Remove empty line.

---
 pkgs/development/libraries/haskell/hdaemonize/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/hdaemonize/default.nix b/pkgs/development/libraries/haskell/hdaemonize/default.nix
index ba5d00e3845b..e342773775d0 100644
--- a/pkgs/development/libraries/haskell/hdaemonize/default.nix
+++ b/pkgs/development/libraries/haskell/hdaemonize/default.nix
@@ -14,4 +14,3 @@ cabal.mkDerivation (self: {
     platforms = self.ghc.meta.platforms;
   };
 })
-

From 3dbdd263f412035acd269d70e9e58a10cf05723e Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Sat, 16 Aug 2014 09:08:18 +0100
Subject: [PATCH 0094/1453] haskell-haskore: update to 0.2.0.4

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

diff --git a/pkgs/development/libraries/haskell/haskore/default.nix b/pkgs/development/libraries/haskell/haskore/default.nix
index 5f7812686d55..cf0b3504e1be 100644
--- a/pkgs/development/libraries/haskell/haskore/default.nix
+++ b/pkgs/development/libraries/haskell/haskore/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "haskore";
-  version = "0.2.0.3";
-  sha256 = "0vg4m2cmy1fabfnck9v22jicflb0if64h0wjvyrgpn2ykb9wwbpa";
+  version = "0.2.0.4";
+  sha256 = "0hhsiazdz44amilcwfxl0r10yxzhql83pgd21k89fmg1gkc4q46j";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From babec1351f6757dde228f27c7d49cb2c0e555402 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Sat, 16 Aug 2014 11:46:53 +0100
Subject: [PATCH 0095/1453] haskell-bits-extras: add version 0.1.3

---
 .../libraries/haskell/bits-extras/default.nix  | 18 ++++++++++++++++++
 pkgs/top-level/haskell-packages.nix            |  2 ++
 2 files changed, 20 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/bits-extras/default.nix

diff --git a/pkgs/development/libraries/haskell/bits-extras/default.nix b/pkgs/development/libraries/haskell/bits-extras/default.nix
new file mode 100644
index 000000000000..3876eabfcaf7
--- /dev/null
+++ b/pkgs/development/libraries/haskell/bits-extras/default.nix
@@ -0,0 +1,18 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "bits-extras";
+  version = "0.1.3";
+  sha256 = "0sy9dksmdx0773bsn8yi5hw4qpgn16g8aqqj888w1x75cbsxr997";
+  isLibrary = true;
+  isExecutable = true;
+  configureFlags = "--ghc-option=-lgcc_s";
+  meta = {
+    description = "Efficient high-level bit operations not found in Data.Bits";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index a04a50844cca..e68f2d290cfa 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -267,6 +267,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   bitsAtomic = callPackage ../development/libraries/haskell/bits-atomic {};
 
+  bitsExtras = callPackage ../development/libraries/haskell/bits-extras {};
+
   bktrees = callPackage ../development/libraries/haskell/bktrees {};
 
   blazeBuilder = callPackage ../development/libraries/haskell/blaze-builder {};

From 631e4097a6f1e0e6015106ecdffaa95c70de73e6 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Sat, 16 Aug 2014 11:47:14 +0100
Subject: [PATCH 0096/1453] haskell-base32-bytestring: add version 0.2.1.0

---
 .../haskell/base32-bytestring/default.nix      | 18 ++++++++++++++++++
 pkgs/top-level/haskell-packages.nix            |  2 ++
 2 files changed, 20 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/base32-bytestring/default.nix

diff --git a/pkgs/development/libraries/haskell/base32-bytestring/default.nix b/pkgs/development/libraries/haskell/base32-bytestring/default.nix
new file mode 100644
index 000000000000..d6f91424da23
--- /dev/null
+++ b/pkgs/development/libraries/haskell/base32-bytestring/default.nix
@@ -0,0 +1,18 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, bitsExtras, cpu, hspec, QuickCheck }:
+
+cabal.mkDerivation (self: {
+  pname = "base32-bytestring";
+  version = "0.2.1.0";
+  sha256 = "0z0q3fw3jzprgxmq9b2iz98kf4hwl3nydrzlaiwk81aplisfdgkl";
+  buildDepends = [ bitsExtras cpu ];
+  testDepends = [ hspec QuickCheck ];
+  meta = {
+    homepage = "https://github.com/pxqr/base32-bytestring";
+    description = "Fast base32 and base32hex codec for ByteStrings";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index e68f2d290cfa..3b88d80aa1e5 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -221,6 +221,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   base16Bytestring = callPackage ../development/libraries/haskell/base16-bytestring {};
 
+  base32Bytestring = callPackage ../development/libraries/haskell/base32-bytestring {};
+
   base64String = callPackage ../development/libraries/haskell/base64-string {};
 
   base64Bytestring = callPackage ../development/libraries/haskell/base64-bytestring {};

From 953643bb0f77b629f751c391aaf8d5c7a6aea221 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sat, 16 Aug 2014 12:53:12 +0200
Subject: [PATCH 0097/1453] elasticsearch: fix darwin, needs getopt

---
 pkgs/servers/search/elasticsearch/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/search/elasticsearch/default.nix b/pkgs/servers/search/elasticsearch/default.nix
index 569ec87c4cb0..967eae40bb1a 100644
--- a/pkgs/servers/search/elasticsearch/default.nix
+++ b/pkgs/servers/search/elasticsearch/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, jre, utillinux }:
+{ stdenv, fetchurl, makeWrapper, jre, utillinux, getopt }:
 
 with stdenv.lib;
 
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
 
   patches = [ ./es-home.patch ];
 
-  buildInputs = [ makeWrapper jre ] ++ optional (!stdenv.isDarwin) utillinux;
+  buildInputs = [ makeWrapper jre ] ++
+    (if (!stdenv.isDarwin) then [utillinux] else [getopt]);
 
   installPhase = ''
     mkdir -p $out
@@ -24,10 +25,13 @@ stdenv.mkDerivation rec {
     # set ES_CLASSPATH and JAVA_HOME
     wrapProgram $out/bin/elasticsearch \
       --prefix ES_CLASSPATH : "$out/lib/${name}.jar":"$out/lib/*":"$out/lib/sigar/*" \
-      ${optionalString (!stdenv.isDarwin) ''--prefix PATH : "${utillinux}/bin/"''} \
+      ${if (!stdenv.isDarwin)
+        then ''--prefix PATH : "${utillinux}/bin/"''
+        else ''--prefix PATH : "${getopt}/bin"''} \
       --set JAVA_HOME "${jre}"
     wrapProgram $out/bin/elasticsearch-plugin \
-      --prefix ES_CLASSPATH : "$out/lib/${name}.jar":"$out/lib/*":"$out/lib/sigar/*" --set JAVA_HOME "${jre}"
+      --prefix ES_CLASSPATH : "$out/lib/${name}.jar":"$out/lib/*":"$out/lib/sigar/*" \
+      --set JAVA_HOME "${jre}"
   '';
 
   meta = {

From 8db9e77d7822b98779025e9369edb0ddc0858d3d Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Sat, 16 Aug 2014 04:02:41 +0100
Subject: [PATCH 0098/1453] haskell-ghc-heap-view: mark as broken for 7.8.3

---
 .../libraries/haskell/ghc-heap-view/default.nix            | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/ghc-heap-view/default.nix b/pkgs/development/libraries/haskell/ghc-heap-view/default.nix
index 1df6885280c7..704c820797ef 100644
--- a/pkgs/development/libraries/haskell/ghc-heap-view/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-heap-view/default.nix
@@ -8,13 +8,16 @@ cabal.mkDerivation (self: {
   sha256 = "1qi7f3phj2j63x1wd2cvk36945cxd84s12zs03hlrn49wzx2pf1n";
   buildDepends = [ binary transformers ];
   postInstall = ''
-    mkdir -p "$out/share/ghci"
+    ensureDir "$out/share/ghci"
     ln -s "$out/share/$pname-$version/ghci" "$out/share/ghci/$pname"
   '';
   meta = {
     description = "Extract the heap representation of Haskell values and thunks";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = with self.stdenv.lib.maintainers; [ andres ];
+    hydraPlatforms = self.stdenv.lib.platforms.none;
+    broken = self.stdenv.lib.versionOlder "7.7" self.ghc.version;
+
   };
 })

From 9b68de6ba0c0b7eb6181d52cb48ce338e081d177 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Sat, 16 Aug 2014 04:22:50 +0100
Subject: [PATCH 0099/1453] haskell-ghc-vis: don't build on Hydra (broken dep)

---
 pkgs/development/libraries/haskell/ghc-vis/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/ghc-vis/default.nix b/pkgs/development/libraries/haskell/ghc-vis/default.nix
index 2a4badd91e3e..741523011eca 100644
--- a/pkgs/development/libraries/haskell/ghc-vis/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-vis/default.nix
@@ -12,9 +12,8 @@ cabal.mkDerivation (self: {
     cairo deepseq fgl ghcHeapView graphviz gtk mtl svgcairo text
     transformers xdot
   ];
-  jailbreak = true;
   postInstall = ''
-    mkdir -p "$out/share/ghci"
+    ensureDir "$out/share/ghci"
     ln -s "$out/share/$pname-$version/ghci" "$out/share/ghci/$pname"
   '';
   meta = {
@@ -22,6 +21,7 @@ cabal.mkDerivation (self: {
     description = "Live visualization of data structures in GHCi";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = with self.stdenv.lib.maintainers; [ andres ];
+    hydraPlatforms = self.stdenv.lib.platforms.none;
   };
 })

From 44a0db4f0f49197e761bbe4eb09ebcc9910eef54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 16 Aug 2014 18:47:20 +0200
Subject: [PATCH 0100/1453] ntfs3g: update to latest stable (2-year bump)

---
 pkgs/tools/filesystems/ntfs-3g/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix
index f6177fd89764..718e941ec648 100644
--- a/pkgs/tools/filesystems/ntfs-3g/default.nix
+++ b/pkgs/tools/filesystems/ntfs-3g/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   pname = "ntfs-3g";
-  version = "2012.1.15";
+  version = "2014.2.15";
   name = "${pname}-${version}";
 
   buildInputs = [libuuid] ++ stdenv.lib.optionals crypto [gnutls libgcrypt];
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://tuxera.com/opensource/ntfs-3g_ntfsprogs-${version}.tgz";
-    sha256 = "09gvfgvqm4dswzxmwvg3r23bv39cp8y8b6qs2jcwmrqd032i25kg";
+    sha256 = "0mjv98m2j0kdzkjiqd2ra1akhb8milx8nwcx7hd26jxi1i09jc2c";
   };
 
   patchPhase = ''
@@ -34,10 +34,12 @@ stdenv.mkDerivation rec {
       ln -sv mount.ntfs-3g $out/sbin/mount.ntfs
     '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.tuxera.com/community/;
     description = "FUSE-base NTFS driver with full write support";
-    maintainers = [ stdenv.lib.maintainers.urkud ];
-    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ maintainers.urkud ];
+    platforms = platforms.linux;
+    license = licenses.gpl2Plus; # and (lib)fuse-lite under LGPL2+
   };
 }
+

From d75cf6fffbb1238f0a8d6b0efe40a5ca743ed7d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 16 Aug 2014 18:58:51 +0200
Subject: [PATCH 0101/1453] meld: update to latest stable

---
 pkgs/applications/version-management/meld/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix
index 29094f1efce4..951ea29a7fca 100644
--- a/pkgs/applications/version-management/meld/default.nix
+++ b/pkgs/applications/version-management/meld/default.nix
@@ -1,8 +1,8 @@
 {stdenv, fetchurl, pygtk, python, intltool, scrollkeeper, makeWrapper }:
 
 let
-  minor = "1.6";
-  version = "${minor}.1";
+  minor = "1.8";
+  version = "${minor}.6";
 in
 
 stdenv.mkDerivation {
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://gnome/sources/meld/${minor}/meld-${version}.tar.xz";
-    sha256 = "00rsff0yl5qwzh0igkdns6ry2xsbxad70avpqpkbd2bldi94v76y";
+    sha256 = "19g86rksrs77hd58zhs3zwbjmmhqc98v2ly8451avwsbiwmni5mg";
   };
 
   buildInputs = [ pygtk python intltool scrollkeeper makeWrapper ];

From 9c48f5160c4a6106a3bc5bbaf733ca35c29a93a0 Mon Sep 17 00:00:00 2001
From: Nathaniel Baxter <nathaniel.baxter@gmail.com>
Date: Sat, 16 Aug 2014 18:34:09 +1000
Subject: [PATCH 0102/1453] teamspeak_client: Remove qt.conf to stop segfaults
 teamspeak_client: Use the quazip library provided by teamspeak
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit should be squashed before being commited to nixpkgs!

Signed-off-by: Domen Kožar <domen@dev.si>
---
 .../instant-messengers/teamspeak/client.nix   | 22 ++++---------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
index e7791d762c5e..eb052af13690 100644
--- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
+++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
@@ -10,24 +10,9 @@ let
   deps =
     [ zlib glib libpng freetype xorg.libSM xorg.libICE xorg.libXrender
       xorg.libXrandr xorg.libXfixes xorg.libXcursor xorg.libXinerama xlibs.libxcb
-      fontconfig xorg.libXext xorg.libX11 alsaLib qt5 pulseaudio quazip
+      fontconfig xorg.libXext xorg.libX11 alsaLib qt5 pulseaudio
     ];
 
-  quazip = stdenv.mkDerivation {
-    name = "quazip-0.7";
-
-    src = fetchurl {
-      url = "mirror://sourceforge/project/quazip/quazip/0.7/quazip-0.7.tar.gz";
-      sha256 = "193lfvhcpqgl2jmxxa4q3asc4xh1mqp2j2l0h8lmm2zrpzwygxca";
-    };
-
-    buildInputs = [ qt4 ];
-
-    preBuild = ''
-      qmake PREFIX="$out"
-    '';
-  };
-
 in
 
 stdenv.mkDerivation rec {
@@ -68,7 +53,8 @@ stdenv.mkDerivation rec {
   installPhase =
     ''
       # Delete unecessary libraries - these are provided by nixos.
-      rm *.so.*
+      rm libQt*.so.*
+      rm qt.conf
 
       # Install files.
       mkdir -p $out/lib/teamspeak
@@ -79,7 +65,7 @@ stdenv.mkDerivation rec {
       ln -s $out/lib/teamspeak/ts3client $out/bin/ts3client
 
       wrapProgram $out/bin/ts3client \
-        --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
+        --set LD_PRELOAD "${libredirect}/lib/libredirect.so:$out/lib/teamspeak/libquazip.so.1" \
         --set QT_PLUGIN_PATH "$out/lib/teamspeak/platforms" \
         --set NIX_REDIRECTS /usr/share/X11/xkb=${xkeyboard_config}/share/X11/xkb
     '';

From fecd0095cafe7e4688c06088366f389a9b10b96f Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Sun, 17 Aug 2014 00:11:43 +0200
Subject: [PATCH 0103/1453] Upgrade: Intel microcodes -> 20160624

---
 pkgs/os-specific/linux/microcode/intel.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix
index 8de75fbc734e..b72194548e07 100644
--- a/pkgs/os-specific/linux/microcode/intel.nix
+++ b/pkgs/os-specific/linux/microcode/intel.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, microcode2ucode }:
 
-let version = "20140122"; in
+let version = "20140624"; in
 
 stdenv.mkDerivation {
   name = "microcode-intel-${version}";
 
   src = fetchurl {
-    url = "http://downloadmirror.intel.com/23574/eng/microcode-${version}.tgz";
-    sha256 = "0r5ldb1jvrf0b6b112v3wdr7ikf2zky2jgby2lnqi1xwd34x42k8";
+    url = "http://downloadmirror.intel.com/23984/eng/microcode-${version}.tgz";
+    sha256 = "0dza0bdlx7q88yhnynvfgkrhgf7ycrq6mlp6hwnpp2j3h33jlrml";
   };
 
   buildInputs = [ microcode2ucode ];

From a9fad501813562d08096440fb466a1ccd623de97 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 16 Aug 2014 17:37:16 +0200
Subject: [PATCH 0104/1453] cabal: minor code re-factoring of shleavy's patch
 that allows building packages without a Setup.hs file

https://github.com/NixOS/nixpkgs/pull/3585
---
 pkgs/build-support/cabal/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix
index 7147b287faeb..0669b85c724b 100644
--- a/pkgs/build-support/cabal/default.nix
+++ b/pkgs/build-support/cabal/default.nix
@@ -18,6 +18,11 @@ let
   optionals             = stdenv.lib.optionals;
   optionalString        = stdenv.lib.optionalString;
   filter                = stdenv.lib.filter;
+
+  defaultSetupHs        = builtins.toFile "Setup.hs" ''
+                            import Distribution.Simple
+                            main = defaultMain
+                          '';
 in
 
 # Cabal shipped with GHC 6.12.4 or earlier doesn't know the "--enable-tests configure" flag.
@@ -179,15 +184,10 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version;
 
               ${optionalString self.jailbreak "${jailbreakCabal}/bin/jailbreak-cabal ${self.pname}.cabal"}
 
-              for i in Setup.hs Setup.lhs; do
-                test -f $i && ghc --make $i
+              for i in Setup.hs Setup.lhs ${defaultSetupHs}; do
+                test -f $i && break
               done
-              if [ ! -f Setup ]; then
-                  ghc --make ${builtins.toFile "Setup.hs" ''
-                    import Distribution.Simple
-                    main = defaultMain
-                  ''} -o Setup -odir $TMPDIR
-              fi
+              ghc --make -o Setup -odir $TMPDIR $i
 
               for p in $extraBuildInputs $propagatedNativeBuildInputs; do
                 if [ -d "$p/lib/ghc-${ghc.ghc.version}/package.conf.d" ]; then

From 462e067f45614bd78014a375be5e7a88f973037f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 16 Aug 2014 17:37:42 +0200
Subject: [PATCH 0105/1453] cabal: cosmetic

---
 pkgs/build-support/cabal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix
index 0669b85c724b..a55de86cb155 100644
--- a/pkgs/build-support/cabal/default.nix
+++ b/pkgs/build-support/cabal/default.nix
@@ -205,10 +205,10 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version;
               done
 
               ${optionalString (self.enableSharedExecutables && self.stdenv.isLinux) ''
-                configureFlags+=" --ghc-option=-optl=-Wl,-rpath=$out/lib/${ghc.ghc.name}/${self.pname}-${self.version}";
+                configureFlags+=" --ghc-option=-optl=-Wl,-rpath=$out/lib/${ghc.ghc.name}/${self.pname}-${self.version}"
               ''}
               ${optionalString (self.enableSharedExecutables && self.stdenv.isDarwin) ''
-                configureFlags+=" --ghc-option=-optl=-Wl,-headerpad_max_install_names";
+                configureFlags+=" --ghc-option=-optl=-Wl,-headerpad_max_install_names"
               ''}
 
               echo "configure flags: $extraConfigureFlags $configureFlags"

From 817c0e41443a5176baf6dd9b422878fdccecd266 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 16 Aug 2014 17:42:11 +0200
Subject: [PATCH 0106/1453] cabal: enable multi-threaded builds with GHC 7.8.x
 or later

https://github.com/NixOS/nixpkgs/issues/3220
---
 pkgs/build-support/cabal/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix
index a55de86cb155..d73b4a1f364c 100644
--- a/pkgs/build-support/cabal/default.nix
+++ b/pkgs/build-support/cabal/default.nix
@@ -210,6 +210,9 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version;
               ${optionalString (self.enableSharedExecutables && self.stdenv.isDarwin) ''
                 configureFlags+=" --ghc-option=-optl=-Wl,-headerpad_max_install_names"
               ''}
+              ${optionalString (versionOlder "7.8" ghc.version) ''
+                configureFlags+=" --ghc-option=-j$NIX_BUILD_CORES"
+              ''}
 
               echo "configure flags: $extraConfigureFlags $configureFlags"
               ./Setup configure --verbose --prefix="$out" --libdir='$prefix/lib/$compiler' \

From 7f875a328fd15c13f3f8b461cf23dd0f23771888 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 16 Aug 2014 17:26:10 +0200
Subject: [PATCH 0107/1453] haskell-happy-meta: update to version 0.2.0.6

---
 pkgs/development/tools/haskell/happy-meta/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/haskell/happy-meta/default.nix b/pkgs/development/tools/haskell/happy-meta/default.nix
index dc5c1f203ba4..e490763ffe2e 100644
--- a/pkgs/development/tools/haskell/happy-meta/default.nix
+++ b/pkgs/development/tools/haskell/happy-meta/default.nix
@@ -4,14 +4,12 @@
 
 cabal.mkDerivation (self: {
   pname = "happy-meta";
-  version = "0.2.0.5";
-  sha256 = "103hi87azqv11l8lq1rv0v9v88sl227g31snvkn8db6b4cfrwrxk";
+  version = "0.2.0.6";
+  sha256 = "1q6sd5zaxzx85z3zcy99b6qrf8fj93ryy33y1g6rdzfw07dwf4lh";
   buildDepends = [ haskellSrcMeta mtl ];
   meta = {
     description = "Quasi-quoter for Happy parsers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
   };
 })

From c552ae1c95b5d5fde50ca4360b778cfde3016e4d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 16 Aug 2014 17:26:32 +0200
Subject: [PATCH 0108/1453] haskell-loop: add version 0.2.0

---
 .../libraries/haskell/loop/default.nix           | 16 ++++++++++++++++
 pkgs/top-level/haskell-packages.nix              |  2 ++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/loop/default.nix

diff --git a/pkgs/development/libraries/haskell/loop/default.nix b/pkgs/development/libraries/haskell/loop/default.nix
new file mode 100644
index 000000000000..88edb1909a5d
--- /dev/null
+++ b/pkgs/development/libraries/haskell/loop/default.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, hspec, mtl }:
+
+cabal.mkDerivation (self: {
+  pname = "loop";
+  version = "0.2.0";
+  sha256 = "11ifqahlg9ky5klid1fhsyfvfb6w8yb0dsy43s0cxcmldbw3qv5x";
+  testDepends = [ hspec mtl ];
+  meta = {
+    homepage = "https://github.com/nh2/loop";
+    description = "Fast loops (for when GHC can't optimize forM_)";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 6561c436b07a..aeeb4dc36641 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1509,6 +1509,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   logict = callPackage ../development/libraries/haskell/logict {};
 
+  loop = callPackage ../development/libraries/haskell/loop {};
+
   lushtags = callPackage ../development/libraries/haskell/lushtags {};
 
   lzmaEnumerator = callPackage ../development/libraries/haskell/lzma-enumerator {};

From 253f2825e21663d7576ef7acea827a1baa4690ec Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 16 Aug 2014 17:26:45 +0200
Subject: [PATCH 0109/1453] haskell-haddock-library: add version 1.1.0

---
 .../haskell/haddock-library/default.nix         | 17 +++++++++++++++++
 pkgs/top-level/haskell-packages.nix             |  2 ++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/haddock-library/default.nix

diff --git a/pkgs/development/libraries/haskell/haddock-library/default.nix b/pkgs/development/libraries/haskell/haddock-library/default.nix
new file mode 100644
index 000000000000..aece9e35873e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/haddock-library/default.nix
@@ -0,0 +1,17 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, baseCompat, deepseq, hspec, QuickCheck }:
+
+cabal.mkDerivation (self: {
+  pname = "haddock-library";
+  version = "1.1.0";
+  sha256 = "0apqm9nxgxbpvcphaim93q4z67c1cd0vdjz0i1cbr67ymffl69nd";
+  buildDepends = [ deepseq ];
+  testDepends = [ baseCompat deepseq hspec QuickCheck ];
+  meta = {
+    homepage = "http://www.haskell.org/haddock/";
+    description = "Library exposing some functionality of Haddock";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index aeeb4dc36641..5c958947da75 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2864,6 +2864,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   haddock_2_14_3 = callPackage ../development/tools/documentation/haddock/2.14.3.nix {};
   haddock = self.haddock_2_14_3;
 
+  haddockLibrary = callPackage ../development/libraries/haskell/haddock-library {};
+
   HandsomeSoup = callPackage ../development/libraries/haskell/HandsomeSoup {};
 
   happy_1_18_4 = callPackage ../development/tools/parsing/happy/1.18.4.nix {};

From d49f5283d71d75a1e0d60c7915640755110e8654 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 16 Aug 2014 17:26:57 +0200
Subject: [PATCH 0110/1453] haskell-packages.nix: drop trailing whitespace

---
 pkgs/top-level/haskell-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 5c958947da75..6f4edeafa9d9 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1087,7 +1087,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   heredoc = callPackage ../development/libraries/haskell/heredoc {};
 
   hexpat = callPackage ../development/libraries/haskell/hexpat {};
-  
+
   hex = callPackage ../development/libraries/haskell/hex {};
 
   hgal = callPackage ../development/libraries/haskell/hgal {};
@@ -1928,7 +1928,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   prologGraph = callPackage ../development/libraries/haskell/prolog-graph {};
 
   protobuf = callPackage ../development/libraries/haskell/protobuf {};
-  
+
   protocolBuffers = callPackage ../development/libraries/haskell/protocol-buffers {};
 
   protocolBuffersDescriptor = callPackage ../development/libraries/haskell/protocol-buffers-descriptor {};

From ee4d02d60a7652e0654753482bebe0f856b149b4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 16 Aug 2014 17:27:08 +0200
Subject: [PATCH 0111/1453] haskell-data-fin: update to version 0.1.1.3

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

diff --git a/pkgs/development/libraries/haskell/data-fin/default.nix b/pkgs/development/libraries/haskell/data-fin/default.nix
index 3c0d77e1a7a8..73fa4488d9f8 100644
--- a/pkgs/development/libraries/haskell/data-fin/default.nix
+++ b/pkgs/development/libraries/haskell/data-fin/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "data-fin";
-  version = "0.1.1.2";
-  sha256 = "13qgqx3b01a8bm7jw7fkv7nyyzg2jkgg27zv2wp57g0nd5aw5hpn";
+  version = "0.1.1.3";
+  sha256 = "02n3dr4gj73z549vwq5h7h1kvmx2j8vaxjcggpdlppps9wl6flry";
   buildDepends = [
     lazysmallcheck preludeSafeenum QuickCheck reflection smallcheck
     tagged

From 1c35120228e604b8ca138abddc2768445051ccd5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 16 Aug 2014 17:27:10 +0200
Subject: [PATCH 0112/1453] haskell-dynamic-cabal: update to version 0.3.2

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

diff --git a/pkgs/development/libraries/haskell/dynamic-cabal/default.nix b/pkgs/development/libraries/haskell/dynamic-cabal/default.nix
index 18dd0e2b8254..40f52b50904c 100644
--- a/pkgs/development/libraries/haskell/dynamic-cabal/default.nix
+++ b/pkgs/development/libraries/haskell/dynamic-cabal/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "dynamic-cabal";
-  version = "0.3.1";
-  sha256 = "0jjhz6h1ggznbvi4qgv0p5x1s7j0fgv1xvkfgid57jrjvdvd4gic";
+  version = "0.3.2";
+  sha256 = "0f0g4kml17j1j101gnpjjpdmny4m2wgr0dbjq18fw1s3nxc3jagm";
   buildDepends = [
     dataDefault filepath ghcPaths haskellGenerate haskellSrcExts time
     void

From dba2a6de23f5d9137e84b23569113e051a6694ab Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 16 Aug 2014 17:27:11 +0200
Subject: [PATCH 0113/1453] haskell-implicit: update to version 0.0.3

---
 pkgs/development/libraries/haskell/implicit/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/implicit/default.nix b/pkgs/development/libraries/haskell/implicit/default.nix
index 39013aff28f6..a2fd8cd438e4 100644
--- a/pkgs/development/libraries/haskell/implicit/default.nix
+++ b/pkgs/development/libraries/haskell/implicit/default.nix
@@ -1,8 +1,8 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, blazeBuilder, blazeMarkup, blazeSvg, deepseq, filepath
-, JuicyPixels, mtl, NumInstances, optparseApplicative, parallel
-, parsec, storableEndian, text, unorderedContainers, vectorSpace
+, JuicyPixels, mtl, optparseApplicative, parallel, parsec
+, storableEndian, text, unorderedContainers, vectorSpace
 }:
 
 cabal.mkDerivation (self: {
@@ -13,8 +13,8 @@ cabal.mkDerivation (self: {
   isExecutable = true;
   buildDepends = [
     blazeBuilder blazeMarkup blazeSvg deepseq filepath JuicyPixels mtl
-    NumInstances optparseApplicative parallel parsec storableEndian
-    text unorderedContainers vectorSpace
+    optparseApplicative parallel parsec storableEndian text
+    unorderedContainers vectorSpace
   ];
   meta = {
     homepage = "https://github.com/colah/ImplicitCAD";

From eb34b99f68c4de268a850d4c4c9b448a262ec573 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 16 Aug 2014 17:27:13 +0200
Subject: [PATCH 0114/1453] haskell-markov-chain: update to version 0.0.3.3

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

diff --git a/pkgs/development/libraries/haskell/markov-chain/default.nix b/pkgs/development/libraries/haskell/markov-chain/default.nix
index 8b8138d1dd1a..00f283208c65 100644
--- a/pkgs/development/libraries/haskell/markov-chain/default.nix
+++ b/pkgs/development/libraries/haskell/markov-chain/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "markov-chain";
-  version = "0.0.3.2";
-  sha256 = "0shld9b6vdi5274wyhwpw5ggfm6xi5j7m3ag989bxarhrfzjxgdk";
+  version = "0.0.3.3";
+  sha256 = "1y9fjsf6dg6a9ha75w2szq4gi5fhq89l1r7wqb20hmadkcjjplx8";
   buildDepends = [ random transformers ];
   meta = {
     homepage = "http://code.haskell.org/~thielema/markov-chain/";

From 7522c35ce853498f729bc0b4cd6c130936bb5f8e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 16 Aug 2014 17:27:15 +0200
Subject: [PATCH 0115/1453] haskell-matrix: update to version 0.3.4.0

---
 pkgs/development/libraries/haskell/matrix/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/matrix/default.nix b/pkgs/development/libraries/haskell/matrix/default.nix
index 2cec14dd87f6..2d1ec8aa45ff 100644
--- a/pkgs/development/libraries/haskell/matrix/default.nix
+++ b/pkgs/development/libraries/haskell/matrix/default.nix
@@ -1,14 +1,14 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, deepseq, primitive, QuickCheck, tasty, tastyQuickcheck
-, vector
+{ cabal, deepseq, loop, primitive, QuickCheck, tasty
+, tastyQuickcheck, vector
 }:
 
 cabal.mkDerivation (self: {
   pname = "matrix";
-  version = "0.3.3.0";
-  sha256 = "01h1c7w1fc6z05wpvy8wri19h0lkqbdbqfnkds2qvxdy171brkvj";
-  buildDepends = [ deepseq primitive vector ];
+  version = "0.3.4.0";
+  sha256 = "16a633llf7nh70s92cn8i8sdish9vryy4xh62rimvmn91ivvjay1";
+  buildDepends = [ deepseq loop primitive vector ];
   testDepends = [ QuickCheck tasty tastyQuickcheck ];
   meta = {
     description = "A native implementation of matrix operations";

From cd6b6ed85dbe41ddbb8ba69f526e76ab0c5900ee Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 16 Aug 2014 17:27:17 +0200
Subject: [PATCH 0116/1453] haskell-pandoc-citeproc: update to version 0.4

---
 .../libraries/haskell/pandoc-citeproc/default.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix b/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix
index 48a45e560973..65c21868144f 100644
--- a/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix
+++ b/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix
@@ -1,21 +1,20 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, aeson, aesonPretty, attoparsec, filepath, hexpat
-, hsBibutils, HTTP, mtl, network, pandoc, pandocTypes, parsec
-, rfc5051, split, syb, tagsoup, temporary, texmath, text, time
-, vector, yaml
+, hsBibutils, mtl, pandoc, pandocTypes, parsec, rfc5051, split, syb
+, tagsoup, temporary, texmath, text, time, vector, yaml
 }:
 
 cabal.mkDerivation (self: {
   pname = "pandoc-citeproc";
-  version = "0.3.1";
-  sha256 = "06ck5qfajzwdsmcqvkcs85andxxrifvsfsybf14m7jd6r8y4bg26";
+  version = "0.4";
+  sha256 = "11syrig4qbc88ddjbb5qc4c9yf5rzq0gyjz42dis8j4gf5hyg4f0";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    aeson aesonPretty attoparsec filepath hexpat hsBibutils HTTP mtl
-    network pandoc pandocTypes parsec rfc5051 split syb tagsoup
-    temporary texmath text time vector yaml
+    aeson aesonPretty attoparsec filepath hexpat hsBibutils mtl pandoc
+    pandocTypes parsec rfc5051 split syb tagsoup temporary texmath text
+    time vector yaml
   ];
   testDepends = [
     aeson filepath pandoc pandocTypes temporary text yaml

From 670990ebfc99bcefc52eb1b8c0b2f3a4d185d62e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 16 Aug 2014 17:27:18 +0200
Subject: [PATCH 0117/1453] haskell-pandoc: update to version 1.13

---
 .../libraries/haskell/pandoc/default.nix      | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix
index 16cc7b737b6b..472bc58c1ae5 100644
--- a/pkgs/development/libraries/haskell/pandoc/default.nix
+++ b/pkgs/development/libraries/haskell/pandoc/default.nix
@@ -1,10 +1,11 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, aeson, alex, ansiTerminal, attoparsec, base64Bytestring
-, binary, blazeHtml, blazeMarkup, dataDefault, Diff
-, extensibleExceptions, filepath, happy, highlightingKate, hslua
-, HTTP, httpConduit, httpTypes, HUnit, mtl, network, pandocTypes
-, parsec, QuickCheck, random, scientific, syb, tagsoup, temporary
+{ cabal, aeson, alex, ansiTerminal, base64Bytestring, binary
+, blazeHtml, blazeMarkup, dataDefault, deepseqGenerics, Diff
+, executablePath, extensibleExceptions, filepath, haddockLibrary
+, happy, highlightingKate, hslua, HTTP, httpClient, httpClientTls
+, httpTypes, HUnit, JuicyPixels, mtl, network, pandocTypes, parsec
+, QuickCheck, random, scientific, SHA, syb, tagsoup, temporary
 , testFramework, testFrameworkHunit, testFrameworkQuickcheck2
 , texmath, text, time, unorderedContainers, vector, xml, yaml
 , zipArchive, zlib
@@ -12,23 +13,23 @@
 
 cabal.mkDerivation (self: {
   pname = "pandoc";
-  version = "1.12.4.2";
-  sha256 = "0ibzladj0xm0xnsphd26lzndxzkawz73pfd7rnlnmllqckrzairg";
+  version = "1.13";
+  sha256 = "09zmh7yvasxybcr4rnnqf9bx8njhi8hwgzsik6db691j5j5yxg6l";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    aeson alex attoparsec base64Bytestring binary blazeHtml blazeMarkup
-    dataDefault extensibleExceptions filepath happy highlightingKate
-    hslua HTTP httpConduit httpTypes mtl network pandocTypes parsec
-    random scientific syb tagsoup temporary texmath text time
+    aeson alex base64Bytestring binary blazeHtml blazeMarkup
+    dataDefault deepseqGenerics extensibleExceptions filepath
+    haddockLibrary happy highlightingKate hslua HTTP httpClient
+    httpClientTls httpTypes JuicyPixels mtl network pandocTypes parsec
+    random scientific SHA syb tagsoup temporary texmath text time
     unorderedContainers vector xml yaml zipArchive zlib
   ];
   testDepends = [
-    ansiTerminal Diff filepath highlightingKate HUnit pandocTypes
-    QuickCheck syb testFramework testFrameworkHunit
-    testFrameworkQuickcheck2 text
+    ansiTerminal Diff executablePath filepath highlightingKate HUnit
+    pandocTypes QuickCheck syb testFramework testFrameworkHunit
+    testFrameworkQuickcheck2 text zipArchive
   ];
-  buildTools = [ alex happy ];
   jailbreak = true;
   doCheck = false;
   meta = {

From 15919f23b97bcc017bd2122e70136fdbdf150948 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 16 Aug 2014 17:27:20 +0200
Subject: [PATCH 0118/1453] haskell-streaming-commons: update to version
 0.1.4.2

---
 .../libraries/haskell/streaming-commons/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/streaming-commons/default.nix b/pkgs/development/libraries/haskell/streaming-commons/default.nix
index 4e6811593916..3f0d47dfc2a4 100644
--- a/pkgs/development/libraries/haskell/streaming-commons/default.nix
+++ b/pkgs/development/libraries/haskell/streaming-commons/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "streaming-commons";
-  version = "0.1.4.1";
-  sha256 = "0n5xm2j5hz0hbify0yanhcrkc3pni9s2c53h22alc7pcaimdmalc";
+  version = "0.1.4.2";
+  sha256 = "0ghm3a64q84bfyp1qp452jw4ns52nd5jz8fk308vljfpakv30qyf";
   buildDepends = [
     blazeBuilder network random stm text transformers zlib
   ];

From e6628b04e607873ba087d30c9f4c04cefe8410b0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 16 Aug 2014 17:27:22 +0200
Subject: [PATCH 0119/1453] haskell-texmath: update to version 0.8

---
 .../libraries/haskell/texmath/default.nix           | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix
index 725b029d4633..fdcc5a6af3bc 100644
--- a/pkgs/development/libraries/haskell/texmath/default.nix
+++ b/pkgs/development/libraries/haskell/texmath/default.nix
@@ -1,17 +1,20 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, pandocTypes, parsec, syb, xml }:
+{ cabal, filepath, mtl, pandocTypes, parsec, split, syb, temporary
+, text, utf8String, xml
+}:
 
 cabal.mkDerivation (self: {
   pname = "texmath";
-  version = "0.6.6.3";
-  sha256 = "1sly6acnb4299wd8380fkgnb7lzjrwml5lljyv73si84b3v0bnw2";
+  version = "0.8";
+  sha256 = "1j0i9594fqhl2fzxyndyy6fvrpaqdarq817pxdar0hmccy55b7gb";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ pandocTypes parsec syb xml ];
+  buildDepends = [ mtl pandocTypes parsec syb xml ];
+  testDepends = [ filepath split temporary text utf8String xml ];
   meta = {
     homepage = "http://github.com/jgm/texmath";
-    description = "Conversion of LaTeX math formulas to MathML or OMML";
+    description = "Conversion between formats used to represent mathematics";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
   };

From 598cc032d461ac440321b58d3884230f86fe1eca Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 16 Aug 2014 17:27:23 +0200
Subject: [PATCH 0120/1453] haskell-warp: update to version 3.0.0.8

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

diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix
index 703a7cf907a6..56d561ea7296 100644
--- a/pkgs/development/libraries/haskell/warp/default.nix
+++ b/pkgs/development/libraries/haskell/warp/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "warp";
-  version = "3.0.0.7";
-  sha256 = "16zsad273lz49lac00pwg701lyr70kv4cwmk258szhmnjvkcnbb7";
+  version = "3.0.0.8";
+  sha256 = "0fqv3hch1dd2n0r8gzhgcs3i1v20aysniml7wnj10zsmz048hrk8";
   buildDepends = [
     autoUpdate blazeBuilder caseInsensitive hashable httpDate httpTypes
     network simpleSendfile streamingCommons text unixCompat void wai

From 0f78da88782f90f1556552f4c5820f796391c463 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 16 Aug 2014 17:27:25 +0200
Subject: [PATCH 0121/1453] haskell-cabal-bounds: update to version 0.8.3

---
 .../development/tools/haskell/cabal-bounds/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/haskell/cabal-bounds/default.nix b/pkgs/development/tools/haskell/cabal-bounds/default.nix
index fa258f95094a..3c46cb85a4dc 100644
--- a/pkgs/development/tools/haskell/cabal-bounds/default.nix
+++ b/pkgs/development/tools/haskell/cabal-bounds/default.nix
@@ -1,13 +1,14 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, Cabal, cabalLenses, cmdargs, either, filepath, Glob, lens
-, strict, tasty, tastyGolden, transformers, unorderedContainers
+{ cabal, Cabal, cabalInstall, cabalLenses, cmdargs, either
+, filepath, Glob, lens, strict, tasty, tastyGolden, transformers
+, unorderedContainers
 }:
 
 cabal.mkDerivation (self: {
   pname = "cabal-bounds";
-  version = "0.8.1";
-  sha256 = "19z596niwvjbjs8cp06zqkd29kn7chqkf60cdbr0ikyw8v4dcjw7";
+  version = "0.8.3";
+  sha256 = "0nzb2knp1cazq54arfddy6k53v8spq1mq0vp5n4c3zn6m2x68j6z";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -15,6 +16,7 @@ cabal.mkDerivation (self: {
     unorderedContainers
   ];
   testDepends = [ filepath Glob tasty tastyGolden ];
+  buildTools = [ cabalInstall ];
   jailbreak = true;
   doCheck = false;
   meta = {

From 6a540466a048c23400023a056f639006b46ffded Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 16 Aug 2014 18:01:20 +0200
Subject: [PATCH 0122/1453] haskell-transformers-compat: don't build version
 0.3.3.4 on Hydra; the package requires a newer version of transformers than
 we can offer

---
 .../libraries/haskell/transformers-compat/0.3.3.4.nix            | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/transformers-compat/0.3.3.4.nix b/pkgs/development/libraries/haskell/transformers-compat/0.3.3.4.nix
index 6ee2a6a25afb..d0dc4ae024d2 100644
--- a/pkgs/development/libraries/haskell/transformers-compat/0.3.3.4.nix
+++ b/pkgs/development/libraries/haskell/transformers-compat/0.3.3.4.nix
@@ -12,5 +12,6 @@ cabal.mkDerivation (self: {
     description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms.";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
   };
 })

From a6c02d58aff769dfe91154b5dbce20252a702b3e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 17 Aug 2014 00:17:10 +0200
Subject: [PATCH 0123/1453] haskell-hakyll: mark broken as the package won't
 compile with recent versions of pandoc

https://github.com/jaspervdj/hakyll/issues/280
---
 pkgs/development/libraries/haskell/hakyll/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix
index abaf74db6524..1bb23f07bdbb 100644
--- a/pkgs/development/libraries/haskell/hakyll/default.nix
+++ b/pkgs/development/libraries/haskell/hakyll/default.nix
@@ -33,5 +33,7 @@ cabal.mkDerivation (self: {
     description = "A static website compiler library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
+    broken = true;
   };
 })

From 2696dd8c014afb2fbd23f8b0c9a5d5c543982e77 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 17 Aug 2014 00:18:20 +0200
Subject: [PATCH 0124/1453] haskell-gitit: mark broken as the package won't
 compile with recent versions of pandoc

---
 pkgs/development/libraries/haskell/gitit/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix
index 50388662001c..44a04cc53807 100644
--- a/pkgs/development/libraries/haskell/gitit/default.nix
+++ b/pkgs/development/libraries/haskell/gitit/default.nix
@@ -26,5 +26,7 @@ cabal.mkDerivation (self: {
     description = "Wiki using happstack, git or darcs, and pandoc";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
+    broken = true;
   };
 })

From a14aa9618f1427b6e12fb00f7353db5831a14925 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 17 Aug 2014 00:18:58 +0200
Subject: [PATCH 0125/1453] haskell-Graphalyze: jailbreak to fix build with
 recent versions of pandoc

---
 pkgs/development/libraries/haskell/Graphalyze/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/Graphalyze/default.nix b/pkgs/development/libraries/haskell/Graphalyze/default.nix
index 974103e16c5a..8e42eaa01d01 100644
--- a/pkgs/development/libraries/haskell/Graphalyze/default.nix
+++ b/pkgs/development/libraries/haskell/Graphalyze/default.nix
@@ -11,6 +11,7 @@ cabal.mkDerivation (self: {
   buildDepends = [
     bktrees fgl filepath graphviz pandoc random text time
   ];
+  jailbreak = true;
   meta = {
     description = "Graph-Theoretic Analysis library";
     license = "unknown";

From bce3730a3ceaa00376313f17fc59091885b0f6dc Mon Sep 17 00:00:00 2001
From: Vincent Laporte <vincent.laporte@gmail.com>
Date: Sun, 17 Aug 2014 00:31:35 +0200
Subject: [PATCH 0126/1453] =?UTF-8?q?Adds=20ocaml=20library=20=E2=80=9Ccsv?=
 =?UTF-8?q?=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is a pure OCaml library to read and write CSV files, including all
extensions used by Excel — eg. quotes, newlines, 8 bit
characters in fields, "0 etc.

Homepage: https://forge.ocamlcore.org/projects/csv/
---
 .../development/ocaml-modules/csv/default.nix | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/csv/default.nix

diff --git a/pkgs/development/ocaml-modules/csv/default.nix b/pkgs/development/ocaml-modules/csv/default.nix
new file mode 100644
index 000000000000..7178452e3dda
--- /dev/null
+++ b/pkgs/development/ocaml-modules/csv/default.nix
@@ -0,0 +1,27 @@
+{stdenv, fetchurl, ocaml, findlib}:
+stdenv.mkDerivation {
+
+  name = "ocaml-csv-1.3.3";
+
+  src = fetchurl {
+    url = "https://forge.ocamlcore.org/frs/download.php/1376/csv-1.3.3.tar.gz";
+    sha256 = "19qsvw3n7k4xpy0sw7n5s29kzj91myihjljhr5js6xcxwj4cydh2";
+  };
+
+  buildInputs = [ ocaml findlib ];
+
+  createFindlibDestdir = true;
+
+  configurePhase = "ocaml setup.ml -configure --prefix $out";
+
+  buildPhase = "ocaml setup.ml -build";
+
+  installPhase = "ocaml setup.ml -install";
+
+  meta = {
+    description = "A pure OCaml library to read and write CSV files";
+    homepage = "https://forge.ocamlcore.org/projects/csv/";
+    license = stdenv.lib.licenses.lgpl21;
+    platforms = ocaml.meta.platforms;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 10a2735f082a..0ad9d8b70f2b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3203,6 +3203,8 @@ let
 
     cryptokit = callPackage ../development/ocaml-modules/cryptokit { };
 
+    csv = callPackage ../development/ocaml-modules/csv { };
+
     deriving = callPackage ../development/tools/ocaml/deriving { };
 
     easy-format = callPackage ../development/ocaml-modules/easy-format { };

From cfbc0defdeffd5190e8cfdaaf3100184963cf406 Mon Sep 17 00:00:00 2001
From: Nathaniel Baxter <nathaniel.baxter@gmail.com>
Date: Fri, 8 Aug 2014 08:58:18 +1000
Subject: [PATCH 0127/1453] obconf: Added obconf - A gui configuration tool for
 openbox

---
 pkgs/tools/X11/obconf/default.nix | 26 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  4 ++++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/tools/X11/obconf/default.nix

diff --git a/pkgs/tools/X11/obconf/default.nix b/pkgs/tools/X11/obconf/default.nix
new file mode 100644
index 000000000000..589b684e69b3
--- /dev/null
+++ b/pkgs/tools/X11/obconf/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, pkgconfig, gtk, libglade, openbox,
+  imlib2, libstartup_notification, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "obconf-${version}";
+  version = "2.0.4";
+
+  src = fetchurl {
+    url = "http://openbox.org/dist/obconf/obconf-${version}.tar.gz";
+    sha256 = "1fanjdmd8727kk74x5404vi8v7s4kpq48l583d12fsi4xvsfb8vi";
+  };
+
+  buildInputs = [
+    pkgconfig gtk libglade openbox imlib2 libstartup_notification makeWrapper
+  ];
+
+  postInstall = ''
+    wrapProgram $out/bin/obconf --prefix XDG_DATA_DIRS : ${openbox}/share/
+  '';
+
+  meta = {
+    description = "GUI configuration tool for openbox";
+    homepage = "http://openbox.org/wiki/ObConf";
+    license = stdenv.lib.licenses.gpl2;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 312959fdb247..8712cce4985f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9391,6 +9391,10 @@ let
 
   nvpy = callPackage ../applications/editors/nvpy { };
 
+  obconf = callPackage ../tools/X11/obconf {
+    inherit (gnome) libglade;
+  };
+
   ocrad = callPackage ../applications/graphics/ocrad { };
 
   offrss = callPackage ../applications/networking/offrss { };

From 1916bc0412ac4e92a7dd55d57ac5eec6d437230d Mon Sep 17 00:00:00 2001
From: Linquize <linquize@yahoo.com.hk>
Date: Sun, 17 Aug 2014 06:18:38 +0200
Subject: [PATCH 0128/1453] git: Update to 2.1.0

---
 .../version-management/git-and-tools/git/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index fb1734c47ee1..a3c543d9e1e7 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -10,7 +10,7 @@
 
 let
 
-  version = "2.0.2";
+  version = "2.1.0";
 
   svn = subversionClient.override { perlBindings = true; };
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    sha256 = "1hk9xxnqiyxii4cfl0j88kws5h1w8xavmfp8a2qb3as5jwnc5y5w";
+    sha256 = "19q1as2bjh4yifmgw6cciwfw0dswxppaf5iq8h8934i33bf15mwd";
   };
 
   patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ./cert-path.patch ];

From 6ebe4a6a523bbab3388453ac119ab08e295a7e06 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 17 Aug 2014 06:46:41 +0200
Subject: [PATCH 0129/1453] nixos-install: Fix copying symlink resolv.conf.

On some non-NixOS systems (for example those using "resolvconf"),
/etc/resolv.conf is a symlink. So let's dereference when copying hasts
and resolv.conf.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/modules/installer/tools/nixos-install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh
index 9d62ba131dc7..a55eda1cb8fd 100644
--- a/nixos/modules/installer/tools/nixos-install.sh
+++ b/nixos/modules/installer/tools/nixos-install.sh
@@ -81,7 +81,7 @@ mount -t tmpfs -o "mode=0755" none $mountPoint/var/setuid-wrappers
 rm -rf $mountPoint/var/run
 ln -s /run $mountPoint/var/run
 rm -f $mountPoint/etc/{resolv.conf,hosts}
-cp -f /etc/resolv.conf /etc/hosts $mountPoint/etc/
+cp -Lf /etc/resolv.conf /etc/hosts $mountPoint/etc/
 
 
 if [ -n "$runChroot" ]; then

From 7d4cd20ea489d1858e152f6b5d068e73902fbd75 Mon Sep 17 00:00:00 2001
From: Nathaniel Baxter <nathaniel.baxter@gmail.com>
Date: Sun, 17 Aug 2014 16:10:10 +1000
Subject: [PATCH 0130/1453] nixos manual: Fix instruction for getting booted
 kernel confix

---
 nixos/doc/manual/configuration.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/nixos/doc/manual/configuration.xml b/nixos/doc/manual/configuration.xml
index 051f0fb8c1e0..d35a5fff4aa4 100644
--- a/nixos/doc/manual/configuration.xml
+++ b/nixos/doc/manual/configuration.xml
@@ -1499,10 +1499,11 @@ are specific to the kernel version, such as the NVIDIA video drivers.
 This ensures that driver packages are consistent with the
 kernel.</para>
 
-<para>The default Linux kernel configuration should be fine for most
-users.  You can see the configuration of your current kernel in
-<filename>/run/booted-system/kernel-modules/config</filename>.  If you
-want to change the kernel configuration, you can use the
+<para>The default Linux kernel configuration should be fine for most users. You can see the configuration of your current kernel with the following command:
+<programlisting>
+cat /proc/config.gz | gunzip
+</programlisting>
+If you want to change the kernel configuration, you can use the
 <option>packageOverrides</option> feature (see <xref
 linkend="sec-customising-packages" />).  For instance, to enable
 support for the kernel debugger KGDB:

From 4d8ee7d8cb2a96deb8b952bc8c80c87911460c4f Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 17 Aug 2014 08:40:47 +0200
Subject: [PATCH 0131/1453] dbus: Don't search for Xlibs if useX11 is false.

This particularily fails when using non-chrooted builds.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/development/libraries/dbus/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index b6aaa0c03329..a4505c5ae544 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -57,7 +57,7 @@ let
       "--sysconfdir=/etc"
       "--with-session-socket-dir=/tmp"
       "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
-    ];
+    ] ++ lib.optional (!useX11) "--without-x";
 
     enableParallelBuilding = true;
 

From 03a37d58512cde5b2808c017b0cde7f4700345e6 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Sun, 17 Aug 2014 11:54:25 +0100
Subject: [PATCH 0132/1453] Add Japanese to default tesseract languages

---
 pkgs/applications/graphics/tesseract/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/tesseract/default.nix b/pkgs/applications/graphics/tesseract/default.nix
index eaf6dd4ba248..83aff09e2aae 100644
--- a/pkgs/applications/graphics/tesseract/default.nix
+++ b/pkgs/applications/graphics/tesseract/default.nix
@@ -9,7 +9,7 @@ let
         url = "http://tesseract-ocr.googlecode.com/files/tesseract-ocr-${majVersion}.${lang}.tar.gz";
         inherit sha256;
       };
-    in 
+    in
       "tar xfvz ${src} -C $out/share/ --strip=1";
 
   extraLanguages = ''
@@ -19,6 +19,7 @@ let
     ${f "nld" "162acxp1yb6gyki2is3ay2msalmfcsnrlsd9wml2ja05k94m6bjy"}
     ${f "eng" "1y5xf794n832s3lymzlsdm2s9nlrd2v27jjjp0fd9xp7c2ah4461"}
     ${f "slv" "0rqng43435cly32idxm1lvxkcippvc3xpxbfizwq5j0155ym00dr"}
+    ${f "jpn" "07v8pymd0iwyzh946lxylybda20gsw7p4fsb09jw147955x49gq9"}
   '';
 in
 

From ec42370aeed91ca614f069ec028b3258aa216980 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 17 Aug 2014 06:35:40 -0500
Subject: [PATCH 0133/1453] nginx: 1.6.0 -> 1.6.1

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/servers/http/nginx/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix
index 8f748078dcf0..903cf038d6e7 100644
--- a/pkgs/servers/http/nginx/default.nix
+++ b/pkgs/servers/http/nginx/default.nix
@@ -9,10 +9,10 @@
 with stdenv.lib;
 
 let
-  version = "1.6.0";
+  version = "1.6.1";
   mainSrc = fetchurl {
     url = "http://nginx.org/download/nginx-${version}.tar.gz";
-    sha256 = "06pwmg4qyd1sirpyl47s6qp94qc8a36dlkaw5pgv7s63l5bxffll";
+    sha256 = "0rv0hds8dhanh8fz8qv5jj7p96q4sl158w6aq814dvxfl61fdkzm";
   };
 
   rtmp-ext = fetchgit {

From 655db00a78f0d73309b6b5f08c27e21cbf4c10de Mon Sep 17 00:00:00 2001
From: Tino Breddin <tino@daogames.com>
Date: Sun, 17 Aug 2014 14:10:51 +0200
Subject: [PATCH 0134/1453] elixir: bump to 0.15.1

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

diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix
index 00fe490d494a..59629eb2f59c 100644
--- a/pkgs/development/interpreters/elixir/default.nix
+++ b/pkgs/development/interpreters/elixir/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, erlang, rebar, makeWrapper, coreutils }:
 
 let
-  version = "0.13.3";
+  version = "0.15.1";
 in
 stdenv.mkDerivation {
   name = "elixir-${version}";
 
   src = fetchurl {
     url = "https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz";
-    sha256 = "17nb8qfyjc67g62x10l2gq0z1501xa4wry906br0w2rm8bf4j8rf";
+    sha256 = "8e608abf90a6e9a25ef5fb7e45dfd04e2cb7e1fecb4ac260bf6652885a7f0c50";
   };
 
   buildInputs = [ erlang rebar makeWrapper ];

From 5979946c41e9b5fd9527eda1724761452d054b42 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 17 Aug 2014 17:07:05 +0200
Subject: [PATCH 0135/1453] chromium: Fix build

This works around ld-wrapper's --sysroot filter not working on '@'
command lines.

Fixes #3642.
---
 pkgs/applications/networking/browsers/chromium/browser.nix | 2 ++
 pkgs/applications/networking/browsers/chromium/common.nix  | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix
index ffc23a9d968d..daab75c74ff9 100644
--- a/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -30,6 +30,8 @@ mkChromiumDerivation (base: rec {
     done
   '';
 
+  preHook = "unset NIX_ENFORCE_PURITY";
+
   meta = {
     description = "An open source web browser from Google";
     homepage = http://www.chromium.org/;
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 311257952712..b9011c0236f3 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -108,7 +108,7 @@ let
       nspr udev
       (if useOpenSSL then openssl else nss)
       utillinux alsaLib
-      gcc bison gperf krb5
+      bison gperf krb5
       glib gtk dbus_glib
       libXScrnSaver libXcursor libXtst mesa
       pciutils protobuf speechd libXdamage

From 5dfcfefec271fe2755fb0523c2fc45535c706c61 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 17 Aug 2014 10:39:23 -0700
Subject: [PATCH 0136/1453] firmware-linux-nonfree: 0.41 -> 0.43

---
 .../firmware-linux-nonfree/default.nix        | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
index 5afa2cbe4ebf..04823ffeda0c 100644
--- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
+++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
@@ -6,27 +6,27 @@
 { stdenv, fetchurl, dpkg }:
 
 let
-  version = "0.41";
+  version = "0.43";
 
   packages = [
-    { name = "adi"; sha256 = "19dm96djp34g6l84g9shwbmqbmfd15c24frcy1zh5nz8x12phgm4"; }
-    { name = "atheros"; sha256 = "0vrdyxiq7nx89h6ykdrs8s3l9frn3hmcfb9vsz68i12975y8ib5n"; }
-    { name = "bnx2"; sha256 = "12l3l54q69n1ky8lp7bmzscfqysabjrgmswwj57ryc6l82s7081y"; }
-    { name = "bnx2x"; sha256 = "10m9p479dq2ylpj5mw6d5vyfh9hybmh5xgs5sxma065v7r3c3v31"; }
-    { name = "brcm80211"; sha256 = "0l2lg5pshb1kb829hfq9w791scwa8biikrfzsx9wvlvkyxfdh187"; }
-    { name = "intelwimax"; sha256 = "13jqm8ik0mm8vnsskbbp63idpjqazzp2x4gaq7786jg5yj3zh1cf"; }
-    { name = "ipw2x00"; sha256 = "1hvxrzqbc75phxdbmqfh7ky36m0qna2pncwxpfdircy9i6fx7ipy"; }
-    { name = "ivtv"; sha256 = "0ckw1ynzfqnkwlmwpzfbdfx4s6bsl4nwp097g8khaavqxk94n88v"; }
-    { name = "iwlwifi"; sha256 = "1djazi2qsi5z6q0izirprxgfpg8vh55skab2nijyfl66drlcha72"; }
-    { name = "libertas"; sha256 = "1yj9dd9pwd98gknx5mvblfcbr6k347xzi8l6bk0pr4570j8ss8y3"; }
-    { name = "linux"; sha256 = "0vc4cbrq73y5hibx5k3gbfqaqxvaa3g8rv9kzwks2zl3hdxm6xaq"; }
-    { name = "linux-nonfree"; sha256 = "05vv8yq7kix5cw9s4agz4vgya6i3ff88jp3rxln1ssznhvzrjzx9"; }
-    { name = "myricom"; sha256 = "1idfvdfw7z4jbbjyq40hd2bpllvw7jz0ah7k3iwljxp8l2lf2nmf"; }
-    { name = "netxen"; sha256 = "0fdgllv8i7j9qbk5hi14zvw6fcn4nd1isr1486d8fv7nf2bf1mxx"; }
-    { name = "qlogic"; sha256 = "12w1qnqhs24am2psdfmv0ligczzxh9crllmp7r4y3vqghyvwax7i"; }
-    { name = "ralink"; sha256 = "1ryplg9shi7nam79zd86z7a0qzp0f9m7q89nq989z57qiysbrra4"; }
-    { name = "realtek"; sha256 = "1l867724qrw7nwksdv4k0hkz7nrjjs9vq2s3937wyaa0r2r66mg6"; }
-    { name = "ti-connectivity"; sha256 = "00cl9gyxa7795a57zwcvl26kxfl4qzppi4z8ksg5friv3db8sm1p"; }
+    { name = "adi"; sha256 = "13cwnbispivpd73k928l1i818ylhpahp6xh7d6pw59sswrsx6inw"; }
+    { name = "atheros"; sha256 = "0sw9d52k3ynx1cxg7cq49pmm8y6vlqyhb9843hbyf6nbmjqj72bx"; }
+    { name = "bnx2"; sha256 = "1r8scys27qj5shdbgl8ag9vi4hiidx4bp8yw4n4dcp288d9x7bbh"; }
+    { name = "bnx2x"; sha256 = "03jx4vnn8irlwswydf4h3ya1kf064jkaj67jry2hr6qwpd4l8pgq"; }
+    { name = "brcm80211"; sha256 = "01mkmjkg16kdd26pwlg4a1s1717fh0j602mwqhwh46k8zakg2lkh"; }
+    { name = "intelwimax"; sha256 = "1avls6sx0pbsffrcs267r2r2rqlx2xrv8j9znc7ix1bi8g4fx91v"; }
+    { name = "ipw2x00"; sha256 = "19zqc30hsz7snw020izm81qbap3xsygggnmbspxndw7jihz0amjs"; }
+    { name = "ivtv"; sha256 = "1f2004lpw5nr9rxj3cl4ba0jdm51wkvsrbiy4drakawpjwh5y4qw"; }
+    { name = "iwlwifi"; sha256 = "1538r751mx8nhg3xibnnrhnflvf3kl5y9rnm7rpl4wyrfgx61amd"; }
+    { name = "libertas"; sha256 = "0svkqlsiqgmh970r38nh0c1pjx41zdfql2k2k5djw99fscjklacd"; }
+    { name = "linux"; sha256 = "0j62v6vbh2287j3x5c9i0xspmhyh5k1z8dyajgix7k37xi4jvpy2"; }
+    { name = "linux-nonfree"; sha256 = "1f5x72rzicivwm0sn9l6wjkx7z9a0b8n6c9m60xrqg36ly7mizzp"; }
+    { name = "myricom"; sha256 = "17cdl885jlnja5m60l35xr2f84hv8z4cvg3d25vpp171s1vf1ks1"; }
+    { name = "netxen"; sha256 = "122nava9ld1v8gcnqbdpx0kffv0rxm9glp4xg09ssvldy4myfgl7"; }
+    { name = "qlogic"; sha256 = "02pgmprz1qwij7lw1lgmb8clgxj8v3mx0fyy1l4z7bffnpvip863"; }
+    { name = "ralink"; sha256 = "0yw9gf9gm3jxmsndr8kcsf6829smm88kshfb4c8jn0n6f4yy9l7x"; }
+    { name = "realtek"; sha256 = "0gay9x47pimdqj665sr1416l3bdyca9grsqpj0s9n6k1lmywrqx1"; }
+    { name = "ti-connectivity"; sha256 = "1m6yk0827991hs46l8pp8iiwh1ms0rwlmwn64k2wr725k5yzg29b"; }
   ];
 
   fetchPackage =

From 5f64a6ffe0e87ba1135f6986219cdcae3782bcc3 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 17 Aug 2014 11:19:41 -0700
Subject: [PATCH 0137/1453] speedtest-cli: 0.2.7 -> 0.3.1

---
 pkgs/tools/networking/speedtest-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/speedtest-cli/default.nix b/pkgs/tools/networking/speedtest-cli/default.nix
index 7162e29e1eac..f655639ceaf1 100644
--- a/pkgs/tools/networking/speedtest-cli/default.nix
+++ b/pkgs/tools/networking/speedtest-cli/default.nix
@@ -2,11 +2,11 @@
 
 pythonPackages.buildPythonPackage rec {
   name = "speedtest-cli-${version}";
-  version = "0.2.7";
+  version = "0.3.1";
   
   src = fetchurl {
     url = "https://pypi.python.org/packages/source/s/speedtest-cli/speedtest-cli-${version}.tar.gz";
-    sha256 = "00r3mjr8852glwryfj9f86pikqg1v0f0xivy25cj86n526wdpy95";
+    sha256 = "0ln2grbskh39ph79lhcim2axm7hp4xhzbrag8xfqbfihq7jdm6ya";
   };
 
   meta = with stdenv.lib; {

From f513e383efbbf7ab7a7d2c0222cfe93e22360da7 Mon Sep 17 00:00:00 2001
From: Tino Breddin <tino@daogames.com>
Date: Sun, 17 Aug 2014 21:08:45 +0200
Subject: [PATCH 0138/1453] golang: bump to 1.3.1

---
 pkgs/development/compilers/go/1.3.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/go/1.3.nix b/pkgs/development/compilers/go/1.3.nix
index fafa045e5621..06decd16190a 100644
--- a/pkgs/development/compilers/go/1.3.nix
+++ b/pkgs/development/compilers/go/1.3.nix
@@ -7,11 +7,11 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "go-1.3";
+  name = "go-1.3.1";
 
   src = fetchurl {
-    url = https://storage.googleapis.com/golang/go1.3.src.tar.gz;
-    sha256 = "10jkqgzlinzynciw3wr15c7n2vw5q4d2ni65hbs3i61bbdn3x67b";
+    url = https://storage.googleapis.com/golang/go1.3.1.src.tar.gz;
+    sha256 = "fdfa148cc12f1e4ea45a5565261bf43d8a2e7d1fad4a16aed592d606223b93a8";
   };
 
   buildInputs = [ bison bash makeWrapper ] ++ lib.optionals stdenv.isLinux [ glibc ] ;

From b8866772d8667f84b0510eb891f709397627799d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 17 Aug 2014 21:16:43 +0200
Subject: [PATCH 0139/1453] nixUnstable: Update to 1.8pre3746_c160ead

---
 pkgs/tools/package-management/nix/unstable.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix
index afcceb30474b..f96a40aeca8a 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-1.8pre3718_51485dc";
+  name = "nix-1.8pre3746_c160ead";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/13025632/download/5/${name}.tar.xz";
-    sha256 = "69f3a0729b6df1adcbfc7c13df405ce7f3f7904b0cbcdd7f6ad3a0af45f4024c";
+    url = "http://hydra.nixos.org/build/13462413/download/5/${name}.tar.xz";
+    sha256 = "26cddc4836ebaeafeabdddc03aff3bcca3090cdfc1d0033bfb9d0eca2da36c96";
   };
 
   nativeBuildInputs = [ perl pkgconfig ];

From ce3e86702ff00c2f9d9a1d2a61d7d92771eb7540 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Sun, 17 Aug 2014 23:00:03 +0200
Subject: [PATCH 0140/1453] prefetch-git: output human-readable rev to stderr

that way, the stdout stays compatible with nix-prefetch-{bzr,svn,hg}
---
 pkgs/build-support/fetchgit/nix-prefetch-git | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git
index fcb012627834..b3cd3488735c 100755
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@@ -219,7 +219,7 @@ clone_user_rev() {
 
     local full_revision=$(cd $dir && (git rev-parse $rev 2> /dev/null || git rev-parse refs/heads/fetchgit) | tail -n1)
     echo "git revision is $full_revision"
-    echo "git human-readable version is $(cd $dir && (git describe $full_revision 2> /dev/null || git describe --tags $full_revision 2> /dev/null || echo -- none --))"
+    echo "git human-readable version is $(cd $dir && (git describe $full_revision 2> /dev/null || git describe --tags $full_revision 2> /dev/null || echo -- none --))" >&2
 
     # Allow doing additional processing before .git removal
     eval "$NIX_PREFETCH_GIT_CHECKOUT_HOOK"

From f06419e1a856fd17d2bc3f835696dc3459f0c3f1 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 17 Aug 2014 23:12:37 +0200
Subject: [PATCH 0141/1453] inotify-tools: update from 3.13 to 3.14 and add
 myself to maintainers note: project has moved to github on 23 November 2009

---
 .../tools/misc/inotify-tools/default.nix        | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/tools/misc/inotify-tools/default.nix b/pkgs/development/tools/misc/inotify-tools/default.nix
index 086f4b5fed33..3402c2060e7f 100644
--- a/pkgs/development/tools/misc/inotify-tools/default.nix
+++ b/pkgs/development/tools/misc/inotify-tools/default.nix
@@ -1,17 +1,18 @@
 { stdenv, fetchurl }:
 
-stdenv.mkDerivation {
-  name = "inotify-tools-3.13";
+stdenv.mkDerivation rec {
+  name = "inotify-tools-${version}";
+  version = "3.14";
 
   src = fetchurl {
-    url = mirror://sourceforge/inotify-tools/inotify-tools/3.13/inotify-tools-3.13.tar.gz;
+    url = "http://github.com/downloads/rvoicilas/inotify-tools/inotify-tools-${version}.tar.gz";
     sha256 = "0icl4bx041axd5dvhg89kilfkysjj86hjakc7bk8n49cxjn4cha6";
   };
 
-  meta = {
-    homepage = http://sourceforge.net/projects/inotify-tools/;
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.marcweber ];
-    platforms = stdenv.lib.platforms.linux;
+  meta = with stdenv.lib; {
+    homepage = https://github.com/rvoicilas/inotify-tools/wiki;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ marcweber pSub ];
+    platforms = platforms.linux;
   };
 }

From fba7d7c4b80eebfeb8d5c2c3ad0f965969e85769 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 18 Aug 2014 02:18:20 +0400
Subject: [PATCH 0142/1453] Add Firejail cheap-sandbox-building package

---
 pkgs/os-specific/linux/firejail/default.nix   | 37 +++++++++++++++++++
 .../linux/firejail/default.upstream           |  3 ++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 42 insertions(+)
 create mode 100644 pkgs/os-specific/linux/firejail/default.nix
 create mode 100644 pkgs/os-specific/linux/firejail/default.upstream

diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix
new file mode 100644
index 000000000000..c1fa2c26205a
--- /dev/null
+++ b/pkgs/os-specific/linux/firejail/default.nix
@@ -0,0 +1,37 @@
+{stdenv, fetchurl}:
+let
+  s = # Generated upstream information
+  rec {
+    baseName="firejail";
+    version="0.9.8.1";
+    name="${baseName}-${version}";
+    hash="0wjanz42k301zdwv06ylnzqrabxy424j0k9dh4i4aqhvihvxr83x";
+    url="mirror://sourceforge/project/firejail/firejail/firejail-0.9.8.1.tar.bz2";
+    sha256="0wjanz42k301zdwv06ylnzqrabxy424j0k9dh4i4aqhvihvxr83x";
+  };
+  buildInputs = [
+  ];
+in
+stdenv.mkDerivation {
+  inherit (s) name version;
+  inherit buildInputs;
+  src = fetchurl {
+    inherit (s) url sha256;
+  };
+
+  preConfigure = ''
+    sed -e 's@/bin/bash@${stdenv.shell}@g' -i $( grep -lr /bin/bash .)
+    sed -e '/void fs_var_run(/achar *vrcs = get_link("/var/run/current-system")\;' -i ./src/firejail/fs_var.c
+    sed -e '/ \/run/iif(vrcs!=NULL){symlink(vrcs, "/var/run/current-system")\;free(vrcs)\;}' -i ./src/firejail/fs_var.c
+  '';
+
+  meta = {
+    inherit (s) version;
+    description = ''Namespace-based sandboxing tool for Linux'';
+    license = stdenv.lib.licenses.gpl2Plus ;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+    homepage = "http://l3net.wordpress.com/projects/firejail/";
+    downloadPage = "http://sourceforge.net/projects/firejail/files/firejail/";
+  };
+}
diff --git a/pkgs/os-specific/linux/firejail/default.upstream b/pkgs/os-specific/linux/firejail/default.upstream
new file mode 100644
index 000000000000..4a0037e8aa4b
--- /dev/null
+++ b/pkgs/os-specific/linux/firejail/default.upstream
@@ -0,0 +1,3 @@
+url http://sourceforge.net/projects/firejail/files/firejail/
+version_link '[.]tar[.][a-z0-9]+/download$'
+SF_redirect
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 10a2735f082a..5047bd59f34a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7218,6 +7218,8 @@ let
 
   fbterm = callPackage ../os-specific/linux/fbterm { };
 
+  firejail = callPackage ../os-specific/linux/firejail {};
+
   fuse = callPackage ../os-specific/linux/fuse { };
 
   fxload = callPackage ../os-specific/linux/fxload { };

From c3c9e2d9bcaec85f59c34edac88f1a15e89658f8 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 17 Aug 2014 23:06:51 -0400
Subject: [PATCH 0143/1453] Update dropbox

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/applications/networking/dropbox/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index e0700cf55c9d..9ddcc5629b12 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -25,9 +25,9 @@ let
     else if stdenv.system == "i686-linux" then "ld-linux.so.2"
     else throw "Dropbox client for: ${stdenv.system} not supported!";
 
-  version = "2.10.27";
-  sha256 = if stdenv.system == "x86_64-linux" then "0l5fkmcr5jc0sm9xm4gshhdn3a7c9ff8qf60vjbiz3gn3n7asjvv"
-    else if stdenv.system == "i686-linux" then "0gn1lx97z4wr1clyjd3y8r6bvwni47rc84zl20s3lsalmm25srh7"
+  version = "2.10.28";
+  sha256 = if stdenv.system == "x86_64-linux" then "0jrg9xy03yc7npjhng9wiyzidbq7s5n8g4fwynnm1yqfd69r3yac"
+    else if stdenv.system == "i686-linux" then "17vbikhdp5l2s8cnqmk8dln4dfzvrvgqls7av3ngf71bx3bj0fij"
     else throw "Dropbox client for: ${stdenv.system} not supported!";
 
   # relative location where the dropbox libraries are stored
@@ -57,8 +57,7 @@ in stdenv.mkDerivation {
   src = fetchurl {
     name = "dropbox-${version}.tar.gz";
     
-    # I found the URLs here: https://forums.dropbox.com/topic.php?id=118678
-    url = "https://d1ilhw0800yew8.cloudfront.net/client/dropbox-lnx.${arch}-${version}.tar.gz";
+    url = "https://dl-web.dropbox.com/u/17/dropbox-lnx.${arch}-${version}.tar.gz";
     inherit sha256;
   };
 

From 7a8cdc66a4cb132b26028ec0d1128c47572d9fac Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Sun, 10 Aug 2014 21:14:41 -0300
Subject: [PATCH 0144/1453] MPV: update to 0.5.0

Many thanks matejc for the commit!
---
 pkgs/applications/video/mpv/default.nix | 18 ++++++++++--------
 pkgs/top-level/all-packages.nix         |  7 ++++---
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 4eec9afdbf3d..db1ced49166e 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fetchgit, freetype, pkgconfig, freefont_ttf, ffmpeg, libass
 , lua, perl, libpthreadstubs
 , lua5_sockets
-, python3, docutils, which
+, python3, docutils, which, lib
 , x11Support ? true, libX11 ? null, libXext ? null, mesa ? null, libXxf86vm ? null
 , xineramaSupport ? true, libXinerama ? null
 , xvSupport ? true, libXv ? null
@@ -20,8 +20,9 @@
 # For screenshots
 , libpngSupport ? true, libpng ? null
 # for Youtube support
-, quviSupport? false, libquvi ? null
-, cacaSupport? false, libcaca ? null
+, quviSupport ? false, libquvi ? null
+, cacaSupport ? false, libcaca ? null
+, vaapiSupport ? false, libva ? null
 }:
 
 assert x11Support -> (libX11 != null && libXext != null && mesa != null && libXxf86vm != null);
@@ -57,11 +58,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "mpv-${version}";
-  version = "0.4.1";
+  version = "0.5.0";
 
   src = fetchurl {
     url = "https://github.com/mpv-player/mpv/archive/v${version}.tar.gz";
-    sha256 = "0wqjyzw3kk854zj263k7jyykzfaz1g27z50aqrd26hylg8k135cn";
+    sha256 = "17mmc6xm8yir2p379h00q3wy7rplz2s31h6sxswmzbh72xf10g96";
   };
 
   buildInputs = with stdenv.lib;
@@ -84,6 +85,7 @@ stdenv.mkDerivation rec {
     ++ optional quviSupport libquvi
     ++ optional sdl2Support SDL2
     ++ optional cacaSupport libcaca
+    ++ optional vaapiSupport libva
     ;
 
   nativeBuildInputs = [ python3 lua perl ];
@@ -97,7 +99,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   configurePhase = ''
-    python3 ${waf} configure --prefix=$out
+    python3 ${waf} configure --prefix=$out ${lib.optionalString vaapiSupport "--enable-vaapi"}
     patchShebangs TOOLS
   '';
 
@@ -124,9 +126,9 @@ stdenv.mkDerivation rec {
   };
 }
 
-# Heavily based on mplayer2 expression
+# Many thanks @matejc for this update: 0.5.0 and vaapi (experimental)
 
 # TODO: Wayland support
-# TODO: investigate libquvi support
+# TODO: investigate libquvi problems (related to Youtube support)
 # TODO: investigate caca support
 # TODO: investigate lua5_sockets bug
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 312959fdb247..43301c91d54f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9273,9 +9273,10 @@ let
 
   mpv = callPackage ../applications/video/mpv {
     lua = lua5_1;
-    bs2bSupport = true;
-    quviSupport = true;
-    cacaSupport = true;
+    bs2bSupport = config.mpv.bs2bSupport or true;
+    quviSupport = config.mpv.quviSupport or false;
+    cacaSupport = config.mpv.cacaSupport or true;
+    vaapiSupport = config.mpv.vaapiSupport or false;
   };
 
   mrxvt = callPackage ../applications/misc/mrxvt { };

From 7c4591d010ad827f9927ce84b2e1bd2db8762f92 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 18 Aug 2014 14:21:45 +0200
Subject: [PATCH 0145/1453] Don't barf if /var/log doesn't support ACLs

http://hydra.nixos.org/build/13462892
---
 nixos/modules/system/boot/systemd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 455c40693b00..e353e9246b0e 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -744,7 +744,7 @@ in
         # Make all journals readable to users in the wheel and adm
         # groups, in addition to those in the systemd-journal group.
         # Users can always read their own journals.
-        ${pkgs.acl}/bin/setfacl -nm g:wheel:rx,d:g:wheel:rx,g:adm:rx,d:g:adm:rx /var/log/journal
+        ${pkgs.acl}/bin/setfacl -nm g:wheel:rx,d:g:wheel:rx,g:adm:rx,d:g:adm:rx /var/log/journal || true
       '';
 
     # Target for ‘charon send-keys’ to hook into.

From e4752d7877e4adcca25ca6228f1d36b58a83e8a5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 18 Aug 2014 14:33:09 +0200
Subject: [PATCH 0146/1453] linux: Enable ACLs in ext3

http://hydra.nixos.org/build/13462892
---
 pkgs/os-specific/linux/kernel/common-config.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index a4b2c221b81a..7a6ba94eb9fe 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -141,8 +141,10 @@ with stdenv.lib;
   # ACLs for all filesystems that support them.
   EXT2_FS_XATTR y
   EXT2_FS_POSIX_ACL y
-  EXT2_FS_SECURITY y # Ext2 Security Labels
+  EXT2_FS_SECURITY y
   EXT2_FS_XIP y # Ext2 execute in place support
+  EXT3_FS_POSIX_ACL y
+  EXT3_FS_SECURITY y
   EXT4_FS_POSIX_ACL y
   EXT4_FS_SECURITY y
   REISERFS_FS_XATTR? y

From 26a57189577c5980e326d21d44f5d50715864cd9 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 18 Aug 2014 08:29:16 -0500
Subject: [PATCH 0147/1453] Add haskell-network-uri-2.6.0.0

---
 .../libraries/haskell/network-uri/default.nix | 22 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/network-uri/default.nix

diff --git a/pkgs/development/libraries/haskell/network-uri/default.nix b/pkgs/development/libraries/haskell/network-uri/default.nix
new file mode 100644
index 000000000000..e6259b09c244
--- /dev/null
+++ b/pkgs/development/libraries/haskell/network-uri/default.nix
@@ -0,0 +1,22 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, HUnit, network, parsec, testFramework, testFrameworkHunit
+, testFrameworkQuickcheck2
+}:
+
+cabal.mkDerivation (self: {
+  pname = "network-uri";
+  version = "2.6.0.0";
+  sha256 = "0dnprscb5nxidg56i7j6q783nwsrn3dabfsij3vjlvjn4f0sg11l";
+  buildDepends = [ parsec ];
+  testDepends = [
+    HUnit network testFramework testFrameworkHunit
+    testFrameworkQuickcheck2
+  ];
+  meta = {
+    homepage = "https://github.com/haskell/network-uri";
+    description = "URI manipulation";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 6f4edeafa9d9..cecb7a6e4d99 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1706,6 +1706,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   networkTransportTests = callPackage ../development/libraries/haskell/network-transport-tests {};
 
+  networkUri = callPackage ../development/libraries/haskell/network-uri {};
+
   newtype = callPackage ../development/libraries/haskell/newtype {};
 
   nonNegative = callPackage ../development/libraries/haskell/non-negative {};

From 628ae1c63e471a29005229a354d1d1883c881e06 Mon Sep 17 00:00:00 2001
From: Igor Pashev <pashev.igor@gmail.com>
Date: Wed, 13 Aug 2014 14:22:38 +0200
Subject: [PATCH 0148/1453] jq: make sure libjq is in library search path

Fixes runtime error:

jq: error while loading shared libraries: libjq.so.1:
cannot open shared object file: No such file or directory
---
 pkgs/development/tools/jq/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/tools/jq/default.nix b/pkgs/development/tools/jq/default.nix
index 514aa8746c66..8194ffc22a81 100644
--- a/pkgs/development/tools/jq/default.nix
+++ b/pkgs/development/tools/jq/default.nix
@@ -18,6 +18,11 @@ stdenv.mkDerivation {
   src = fetchurl {
     inherit (s) url sha256;
   };
+
+  # jq is linked to libjq:
+  configureFlags = [
+    "LDFLAGS=-Wl,-rpath,\\\${libdir}"
+  ];
   meta = {
     inherit (s) version;
     description = ''A lightweight and flexible command-line JSON processor'';

From edfc77044ad0dca9ca6c068dbbc08cf63bf6a060 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 18 Aug 2014 16:24:45 +0200
Subject: [PATCH 0149/1453] adom: various fixes

- make chrooted download work
- add shebang
- nix style and meta conventions
---
 pkgs/games/adom/default.nix | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/pkgs/games/adom/default.nix b/pkgs/games/adom/default.nix
index 9041fc225b01..e83f50df1b78 100644
--- a/pkgs/games/adom/default.nix
+++ b/pkgs/games/adom/default.nix
@@ -1,5 +1,5 @@
-{stdenv, patchelf, zlib, libmad, libpng12, libcaca, mesa, alsaLib, pulseaudio,
-xlibs, plowshare}:
+{ stdenv, patchelf, zlib, libmad, libpng12, libcaca, mesa, alsaLib, pulseaudio
+, xlibs, plowshare }:
 
 let
 
@@ -8,25 +8,22 @@ let
   lpath = "${stdenv.gcc.gcc}/lib64:" + stdenv.lib.makeSearchPath "lib" [
       zlib libmad libpng12 libcaca libXext libX11 mesa alsaLib pulseaudio];
 
-in 
+in
 assert stdenv.is64bit;
 stdenv.mkDerivation rec {
 
-  name = "adom-1.20-noteye";
+  name = "adom-1.2.0-noteye";
 
+  # couldn't make fetchurl appear non-robot, even with --user-agent
   src = stdenv.mkDerivation {
-    name = "adom-1.20-noteye.tar.gz";
+    name = "adom-1.2.0-noteye.tar.gz";
     buildCommand = ''
       ${plowshare}/bin/plowdown "http://www30.zippyshare.com/v/39200582/file.html"
-      ls -lh
       F=`ls *tar.gz`
-      echo "Checking $F"
-      sha256sum -c <<EOF
-      1f825845d5007e676a4d1a3ccd887904b959bdddbcb9f241c42c2dac34037669 $F
-      EOF
-      echo "Moving $F into $out..."
       mv $F $out
     '';
+    outputHashAlgo = "sha256";
+    outputHash = "1f825845d5007e676a4d1a3ccd887904b959bdddbcb9f241c42c2dac34037669";
   };
 
   buildCommand = ''
@@ -52,16 +49,17 @@ stdenv.mkDerivation rec {
 
     mkdir $out/bin
     cat >$out/bin/adom <<EOF
+    #! ${stdenv.shell}
     (cd $out; $out/adom ; )
     EOF
     chmod +x $out/bin/adom
   '';
 
-  meta = {
-    description = "Adom (Ancient Domains Of Mystery) is a rogue-like game with nice graphical interface";
+  meta = with stdenv.lib; {
+    description = "A rogue-like game with nice graphical interface";
     homepage = http://adom.de/;
-    license = "unfree-redistributable";
-    maintainers = [stdenv.lib.maintainers.smironov];
+    license = licenses.unfreeRedistributable;
+    maintainers = [maintainers.smironov];
 
     # Please, notify me (smironov) if you need the x86 version
     platforms = ["x86_64-linux"];

From c5c1a243fada84cf6be63f2e1507a549f2c3049b Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Mon, 18 Aug 2014 16:44:51 +0200
Subject: [PATCH 0150/1453] nixUnstable: Update to nix-1.8pre3748_02843ba

---
 pkgs/tools/package-management/nix/unstable.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix
index f96a40aeca8a..731965d9a7cf 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-1.8pre3746_c160ead";
+  name = "nix-1.8pre3748_02843ba";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/13462413/download/5/${name}.tar.xz";
-    sha256 = "26cddc4836ebaeafeabdddc03aff3bcca3090cdfc1d0033bfb9d0eca2da36c96";
+    url = "http://hydra.nixos.org/build/13483092/download/5/${name}.tar.xz";
+    sha256 = "074k5spq07bz6ljbiiwfzsnnnpqlwssigxirkyrcamcyjmig4v34";
   };
 
   nativeBuildInputs = [ perl pkgconfig ];

From ab7b973b3368baa68ac53d47fe20e4ea4e2fe919 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Mon, 18 Aug 2014 15:57:24 +0100
Subject: [PATCH 0151/1453] haskellPackages.xlsx: New expression

---
 .../libraries/haskell/xlsx/default.nix        | 26 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/xlsx/default.nix

diff --git a/pkgs/development/libraries/haskell/xlsx/default.nix b/pkgs/development/libraries/haskell/xlsx/default.nix
new file mode 100644
index 000000000000..98d729efb2fe
--- /dev/null
+++ b/pkgs/development/libraries/haskell/xlsx/default.nix
@@ -0,0 +1,26 @@
+{ cabal, conduit, dataDefault, digest, HUnit, lens, smallcheck
+, tasty, tastyHunit, tastySmallcheck, text, time, transformers
+, utf8String, xmlConduit, xmlTypes, zipArchive, zlib
+}:
+
+cabal.mkDerivation (self: {
+  pname = "xlsx";
+  version = "0.1.0.2";
+  sha256 = "0m9ph34mpnc6vj1d3x80y0gaya5bqdhfa193jn0a8clw4qz88sbr";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    conduit dataDefault digest lens text time transformers utf8String
+    xmlConduit xmlTypes zipArchive zlib
+  ];
+  testDepends = [
+    HUnit smallcheck tasty tastyHunit tastySmallcheck time
+  ];
+  meta = {
+    homepage = "https://github.com/qrilka/xlsx";
+    description = "Simple and incomplete Excel file parser/writer";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.ocharles ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 6f4edeafa9d9..f6adedf2e07d 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2952,6 +2952,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   yiContrib = callPackage ../applications/editors/yi/yi-contrib.nix {};
 
+  xlsx = callPackage ../development/libraries/haskell/xlsx {};
+
   xmobar = callPackage ../applications/misc/xmobar {};
 
   xmonad = callPackage ../applications/window-managers/xmonad {};

From e7860f04c2ab813d696d876bcdcfd9331cedfa2e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 18 Aug 2014 13:46:54 +0200
Subject: [PATCH 0152/1453] nixos-container: Add status command

---
 nixos/modules/virtualisation/nixos-container.pl | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/nixos-container.pl b/nixos/modules/virtualisation/nixos-container.pl
index c6a5ecde9e32..90a6986be4f7 100644
--- a/nixos/modules/virtualisation/nixos-container.pl
+++ b/nixos/modules/virtualisation/nixos-container.pl
@@ -21,6 +21,7 @@ Usage: nixos-container list
        nixos-container destroy <container-name>
        nixos-container start <container-name>
        nixos-container stop <container-name>
+       nixos-container status <container-name>
        nixos-container login <container-name>
        nixos-container root-login <container-name>
        nixos-container run <container-name> -- args...
@@ -155,7 +156,11 @@ my $profileDir = "/nix/var/nix/profiles/per-container/$containerName";
 my $gcRootsDir = "/nix/var/nix/gcroots/per-container/$containerName";
 my $confFile = "/etc/containers/$containerName.conf";
 if (!-e $confFile) {
-    exit 0 if $action eq "destroy";
+    if ($action eq "destroy") {
+        exit 0;
+    } else {
+        print "gone\n";
+    }
     die "$0: container ‘$containerName’ does not exist\n" ;
 }
 
@@ -190,6 +195,10 @@ elsif ($action eq "stop") {
     stopContainer;
 }
 
+elsif ($action eq "status") {
+    print isContainerRunning() ? "up" : "down", "\n";
+}
+
 elsif ($action eq "update") {
     my $nixosConfigFile = "$root/etc/nixos/configuration.nix";
 

From 2337a85fc3a0228ede448d74ed8a29e2b1190f8f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 18 Aug 2014 14:04:39 +0200
Subject: [PATCH 0153/1453] Autostart containers at boot time

---
 nixos/modules/virtualisation/containers.nix | 22 +++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 7f545a9d3031..01f63315b9cb 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -292,5 +292,27 @@ in
 
     environment.systemPackages = [ nixos-container ];
 
+    # Start containers at boot time.
+    systemd.services.all-containers =
+      { description = "All Containers";
+
+        wantedBy = [ "multi-user.target" ];
+
+        serviceConfig.Type = "oneshot";
+
+        script =
+          ''
+            res=0
+            for i in /etc/containers/*.conf; do
+              AUTO_START=
+              source "$i"
+              if [ "$AUTO_START" = 1 ]; then
+                systemctl start "container@$(basename "$i" .conf).service" || res=1
+              fi
+            done
+            exit $res
+          ''; # */
+      };
+
   };
 }

From b10a3e91458817b5e12f1e81241ef6272cb1175f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 18 Aug 2014 15:56:27 +0200
Subject: [PATCH 0154/1453] nixos-container: Allow auto-starting containers

---
 nixos/modules/virtualisation/nixos-container.pl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/nixos-container.pl b/nixos/modules/virtualisation/nixos-container.pl
index 90a6986be4f7..3975e4b62f23 100644
--- a/nixos/modules/virtualisation/nixos-container.pl
+++ b/nixos/modules/virtualisation/nixos-container.pl
@@ -17,7 +17,7 @@ umask 0022;
 sub showHelp {
     print <<EOF;
 Usage: nixos-container list
-       nixos-container create <container-name> [--config <string>] [--ensure-unique-name]
+       nixos-container create <container-name> [--config <string>] [--ensure-unique-name] [--auto-start]
        nixos-container destroy <container-name>
        nixos-container start <container-name>
        nixos-container stop <container-name>
@@ -32,11 +32,13 @@ EOF
 }
 
 my $ensureUniqueName = 0;
+my $autoStart = 0;
 my $extraConfig;
 
 GetOptions(
     "help" => sub { showHelp() },
     "ensure-unique-name" => \$ensureUniqueName,
+    "auto-start" => \$autoStart,
     "config=s" => \$extraConfig
     ) or exit 1;
 
@@ -123,6 +125,7 @@ if ($action eq "create") {
     push @conf, "PRIVATE_NETWORK=1\n";
     push @conf, "HOST_ADDRESS=$hostAddress\n";
     push @conf, "LOCAL_ADDRESS=$localAddress\n";
+    push @conf, "AUTO_START=$autoStart\n";
     write_file($confFile, \@conf);
 
     close($lock);

From 6dc5db3850a2ef5d01e871ec36f1d31457fc64da Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 18 Aug 2014 16:32:00 +0200
Subject: [PATCH 0155/1453] Fix setting an empty password

---
 nixos/modules/config/update-users-groups.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/config/update-users-groups.pl b/nixos/modules/config/update-users-groups.pl
index 2b9bfb764a8b..197b65e27c4b 100644
--- a/nixos/modules/config/update-users-groups.pl
+++ b/nixos/modules/config/update-users-groups.pl
@@ -211,7 +211,7 @@ foreach my $line (-f "/etc/shadow" ? read_file("/etc/shadow") : ()) {
     my ($name, $password, @rest) = split(':', $line, -9);
     my $u = $usersOut{$name};;
     next if !defined $u;
-    $password = $u->{hashedPassword} if $u->{hashedPassword} && !$spec->{mutableUsers}; # FIXME
+    $password = $u->{hashedPassword} if defined $u->{hashedPassword} && !$spec->{mutableUsers}; # FIXME
     push @shadowNew, join(":", $name, $password, @rest) . "\n";
     $shadowSeen{$name} = 1;
 }
@@ -219,7 +219,7 @@ foreach my $line (-f "/etc/shadow" ? read_file("/etc/shadow") : ()) {
 foreach my $u (values %usersOut) {
     next if defined $shadowSeen{$u->{name}};
     my $password = "!";
-    $password = $u->{hashedPassword} if $u->{hashedPassword};
+    $password = $u->{hashedPassword} if defined $u->{hashedPassword};
     # FIXME: set correct value for sp_lstchg.
     push @shadowNew, join(":", $u->{name}, $password, "1::::::") . "\n";
 }

From 32b977d4a7f4615859827780513fdcd7cb21ade7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 12 Aug 2014 02:33:30 +0200
Subject: [PATCH 0156/1453] Containers: Fix reboot and poweroff

Previously "machinectl reboot/poweroff" brutally killed the container,
as did "systemctl stop/restart". And reboot didn't actually work. Now
everything is fine.
---
 nixos/modules/virtualisation/containers.nix | 39 +++++++++++++++------
 1 file changed, 29 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 01f63315b9cb..6131d75e478f 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -168,6 +168,9 @@ in
 
         preStart =
           ''
+            # Clean up existing machined registration.
+            machinectl terminate "$INSTANCE" 2> /dev/null || true
+
             mkdir -p -m 0755 $root/var/lib
 
             # Create a named pipe to get a signal when the container
@@ -205,6 +208,7 @@ in
               fi
             ''}
 
+            EXIT_ON_REBOOT=1 \
             exec ${config.systemd.package}/bin/systemd-nspawn \
               --keep-unit \
               -M "$INSTANCE" -D "$root" $extraFlags \
@@ -242,23 +246,38 @@ in
 
         preStop =
           ''
-            machinectl poweroff "$INSTANCE"
+            machinectl poweroff "$INSTANCE" || true
           '';
 
         restartIfChanged = false;
         #reloadIfChanged = true; # FIXME
 
-        serviceConfig.ExecReload = pkgs.writeScript "reload-container"
-          ''
-            #! ${pkgs.stdenv.shell} -e
-            SYSTEM_PATH=/nix/var/nix/profiles/system
-            echo $SYSTEM_PATH/bin/switch-to-configuration test | \
-              ${pkgs.socat}/bin/socat unix:$root/var/lib/run-command.socket -
-          '';
+        serviceConfig = {
+          ExecReload = pkgs.writeScript "reload-container"
+            ''
+              #! ${pkgs.stdenv.shell} -e
+              SYSTEM_PATH=/nix/var/nix/profiles/system
+              echo $SYSTEM_PATH/bin/switch-to-configuration test | \
+                ${pkgs.socat}/bin/socat unix:$root/var/lib/run-command.socket -
+            '';
 
-        serviceConfig.SyslogIdentifier = "container %i";
+          SyslogIdentifier = "container %i";
 
-        serviceConfig.EnvironmentFile = "-/etc/containers/%i.conf";
+          EnvironmentFile = "-/etc/containers/%i.conf";
+
+          # Note that on reboot, systemd-nspawn returns 10, so this
+          # unit will be restarted. On poweroff, it returns 0, so the
+          # unit won't be restarted.
+          Restart = "on-failure";
+
+          # Hack: we don't want to kill systemd-nspawn, since we call
+          # "machinectl poweroff" in preStop to shut down the
+          # container cleanly. But systemd requires sending a signal
+          # (at least if we want remaining processes to be killed
+          # after the timeout). So send an ignored signal.
+          KillMode = "mixed";
+          KillSignal = "WINCH";
+        };
       };
 
     # Generate a configuration file in /etc/containers for each

From a7a08188bf650ababa36300a9a6f34169e2a73bf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 12 Aug 2014 02:51:20 +0200
Subject: [PATCH 0157/1453] Containers: Don't remount /

---
 nixos/modules/system/boot/stage-2-init.sh         | 4 +++-
 nixos/modules/virtualisation/container-config.nix | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh
index fcefdfa88a36..6fff776f8581 100644
--- a/nixos/modules/system/boot/stage-2-init.sh
+++ b/nixos/modules/system/boot/stage-2-init.sh
@@ -29,7 +29,9 @@ setPath "@path@"
 # Normally, stage 1 mounts the root filesystem read/writable.
 # However, in some environments, stage 2 is executed directly, and the
 # root is read-only.  So make it writable here.
-mount -n -o remount,rw none /
+if [ "$container" != systemd-nspawn ]; then
+    mount -n -o remount,rw none /
+fi
 
 
 # Likewise, stage 1 mounts /proc, /dev and /sys, so if we don't have a
diff --git a/nixos/modules/virtualisation/container-config.nix b/nixos/modules/virtualisation/container-config.nix
index b81f97f2b4ec..84e3aa283520 100644
--- a/nixos/modules/virtualisation/container-config.nix
+++ b/nixos/modules/virtualisation/container-config.nix
@@ -89,6 +89,8 @@ with lib;
         restartIfChanged = false;
       };
 
+    systemd.services.systemd-remount-fs.enable = false;
+
   };
 
 }

From ceb67cc9ef9c4e2e825a2a192c564e8208e263eb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 12 Aug 2014 03:05:27 +0200
Subject: [PATCH 0158/1453] Containers: Clean up veth interfaces

---
 nixos/modules/virtualisation/containers.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 6131d75e478f..21ef0d0ff966 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -168,9 +168,13 @@ in
 
         preStart =
           ''
-            # Clean up existing machined registration.
+            # Clean up existing machined registration and interfaces.
             machinectl terminate "$INSTANCE" 2> /dev/null || true
 
+            if [ "$PRIVATE_NETWORK" = 1 ]; then
+              ip link del dev "ve-$INSTANCE" 2> /dev/null || true
+            fi
+
             mkdir -p -m 0755 $root/var/lib
 
             # Create a named pipe to get a signal when the container

From 11d99048c1dc992a68579da7a2958ec57e718ac1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 13 Aug 2014 00:45:36 +0200
Subject: [PATCH 0159/1453] Containers: Use systemd-nspawn startup notification

---
 nixos/modules/virtualisation/containers.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 21ef0d0ff966..99329c1f1dda 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -230,12 +230,6 @@ in
 
         postStart =
           ''
-            # This blocks until the container-startup-done service
-            # writes something to this pipe.  FIXME: it also hangs
-            # until the start timeout expires if systemd-nspawn exits.
-            read x < $root/var/lib/startup-done
-            rm -f $root/var/lib/startup-done
-
             if [ "$PRIVATE_NETWORK" = 1 ]; then
               ifaceHost=ve-$INSTANCE
               ip link set dev $ifaceHost up
@@ -246,6 +240,12 @@ in
                 ip route add $LOCAL_ADDRESS dev $ifaceHost
               fi
             fi
+
+            # This blocks until the container-startup-done service
+            # writes something to this pipe.  FIXME: it also hangs
+            # until the start timeout expires if systemd-nspawn exits.
+            read x < $root/var/lib/startup-done
+            rm -f $root/var/lib/startup-done
           '';
 
         preStop =
@@ -269,6 +269,8 @@ in
 
           EnvironmentFile = "-/etc/containers/%i.conf";
 
+          Type = "notify";
+
           # Note that on reboot, systemd-nspawn returns 10, so this
           # unit will be restarted. On poweroff, it returns 0, so the
           # unit won't be restarted.

From 2c899859bffc3018d3e8fd625647edda01130913 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 18 Aug 2014 16:57:05 +0200
Subject: [PATCH 0160/1453] Containers: Use systemd startup notification

Systemd in a container will call sd_notify when it has finished
booting, so we can use that to signal that the container is
ready. This does require some fiddling with $NOTIFY_SOCKET.
---
 nixos/modules/virtualisation/containers.nix | 26 +++++++++------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 99329c1f1dda..847c1eddab2a 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -32,7 +32,10 @@ let
         fi
       fi
 
-      exec "$1"
+      # Start the regular stage 1 script, passing the bind-mounted
+      # notification socket from the host to allow the container
+      # systemd to signal readiness to the host systemd.
+      NOTIFY_SOCKET=/var/lib/private/host-notify exec "$1"
     '';
 
   system = config.nixpkgs.system;
@@ -174,18 +177,12 @@ in
             if [ "$PRIVATE_NETWORK" = 1 ]; then
               ip link del dev "ve-$INSTANCE" 2> /dev/null || true
             fi
-
-            mkdir -p -m 0755 $root/var/lib
-
-            # Create a named pipe to get a signal when the container
-            # has finished booting.
-            rm -f $root/var/lib/startup-done
-            mkfifo -m 0600 $root/var/lib/startup-done
          '';
 
         script =
           ''
             mkdir -p -m 0755 "$root/etc" "$root/var/lib"
+            mkdir -p -m 0700 "$root/var/lib/private"
             if ! [ -e "$root/etc/os-release" ]; then
               touch "$root/etc/os-release"
             fi
@@ -212,13 +209,16 @@ in
               fi
             ''}
 
-            EXIT_ON_REBOOT=1 \
+            # Run systemd-nspawn without startup notification (we'll
+            # wait for the container systemd to signal readiness).
+            EXIT_ON_REBOOT=1 NOTIFY_SOCKET= \
             exec ${config.systemd.package}/bin/systemd-nspawn \
               --keep-unit \
               -M "$INSTANCE" -D "$root" $extraFlags \
               --bind-ro=/nix/store \
               --bind-ro=/nix/var/nix/db \
               --bind-ro=/nix/var/nix/daemon-socket \
+              --bind=/run/systemd/notify:/var/lib/private/host-notify \
               --bind="/nix/var/nix/profiles/per-container/$INSTANCE:/nix/var/nix/profiles" \
               --bind="/nix/var/nix/gcroots/per-container/$INSTANCE:/nix/var/nix/gcroots" \
               --setenv PRIVATE_NETWORK="$PRIVATE_NETWORK" \
@@ -240,12 +240,6 @@ in
                 ip route add $LOCAL_ADDRESS dev $ifaceHost
               fi
             fi
-
-            # This blocks until the container-startup-done service
-            # writes something to this pipe.  FIXME: it also hangs
-            # until the start timeout expires if systemd-nspawn exits.
-            read x < $root/var/lib/startup-done
-            rm -f $root/var/lib/startup-done
           '';
 
         preStop =
@@ -271,6 +265,8 @@ in
 
           Type = "notify";
 
+          NotifyAccess = "all";
+
           # Note that on reboot, systemd-nspawn returns 10, so this
           # unit will be restarted. On poweroff, it returns 0, so the
           # unit won't be restarted.

From a0c60b76ec258ea158bebaea53d6d39055cdf857 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 18 Aug 2014 17:18:50 +0200
Subject: [PATCH 0161/1453] gcc: Revive the no-sys-dirs patch

For now, we don't NATIVE_SYSTEM_HEADER_DIR because it breaks the
build. However, it points to Glibc in the Nix store (not /usr/include)
so it's kind of okay.
---
 pkgs/build-support/gcc-wrapper/gcc-wrapper.sh |  1 -
 pkgs/build-support/gcc-wrapper/ld-wrapper.sh  |  3 --
 .../development/compilers/gcc/4.8/default.nix |  1 +
 .../compilers/gcc/4.8/no-sys-dirs.patch       | 28 +++++++++++++++++++
 4 files changed, 29 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/compilers/gcc/4.8/no-sys-dirs.patch

diff --git a/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh b/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh
index c53fd44207d0..2ad7783a442c 100644
--- a/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh
+++ b/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh
@@ -77,7 +77,6 @@ if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE"; then
         n=$((n + 1))
     done
     params=("${rest[@]}")
-    NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE --sysroot=/var/empty"
 fi
 
 
diff --git a/pkgs/build-support/gcc-wrapper/ld-wrapper.sh b/pkgs/build-support/gcc-wrapper/ld-wrapper.sh
index 822c4a03a218..51803e12a4ea 100644
--- a/pkgs/build-support/gcc-wrapper/ld-wrapper.sh
+++ b/pkgs/build-support/gcc-wrapper/ld-wrapper.sh
@@ -32,9 +32,6 @@ if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE" \
             # We cannot skip this; barf.
             echo "impure path \`$p' used in link" >&2
             exit 1
-        elif test "${p:0:9}" = "--sysroot"; then
-            # Our ld is not built with sysroot support (Can we fix that?)
-            :
         else
             rest=("${rest[@]}" "$p")
         fi
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 7b73559ba9c0..7985b445ae06 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -64,6 +64,7 @@ let version = "4.8.3";
     patches = []
       ++ optional enableParallelBuilding ./parallel-bconfig.patch
       ++ optional (cross != null) ./libstdc++-target.patch
+      ++ optional noSysDirs ./no-sys-dirs.patch
       # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its
       # target libraries and tools.
       ++ optional langAda ./gnat-cflags.patch
diff --git a/pkgs/development/compilers/gcc/4.8/no-sys-dirs.patch b/pkgs/development/compilers/gcc/4.8/no-sys-dirs.patch
new file mode 100644
index 000000000000..36df51904acf
--- /dev/null
+++ b/pkgs/development/compilers/gcc/4.8/no-sys-dirs.patch
@@ -0,0 +1,28 @@
+diff -ru -x '*~' gcc-4.8.3-orig/gcc/cppdefault.c gcc-4.8.3/gcc/cppdefault.c
+--- gcc-4.8.3-orig/gcc/cppdefault.c	2013-01-10 21:38:27.000000000 +0100
++++ gcc-4.8.3/gcc/cppdefault.c	2014-08-18 16:20:32.893944536 +0200
+@@ -35,6 +35,8 @@
+ # undef CROSS_INCLUDE_DIR
+ #endif
+ 
++#undef LOCAL_INCLUDE_DIR
++
+ const struct default_include cpp_include_defaults[]
+ #ifdef INCLUDE_DEFAULTS
+ = INCLUDE_DEFAULTS;
+diff -ru -x '*~' gcc-4.8.3-orig/gcc/gcc.c gcc-4.8.3/gcc/gcc.c
+--- gcc-4.8.3-orig/gcc/gcc.c	2014-03-23 12:30:57.000000000 +0100
++++ gcc-4.8.3/gcc/gcc.c	2014-08-18 13:19:32.689201690 +0200
+@@ -1162,10 +1162,10 @@
+ /* Default prefixes to attach to command names.  */
+ 
+ #ifndef STANDARD_STARTFILE_PREFIX_1
+-#define STANDARD_STARTFILE_PREFIX_1 "/lib/"
++#define STANDARD_STARTFILE_PREFIX_1 ""
+ #endif
+ #ifndef STANDARD_STARTFILE_PREFIX_2
+-#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/"
++#define STANDARD_STARTFILE_PREFIX_2 ""
+ #endif
+ 
+ #ifdef CROSS_DIRECTORY_STRUCTURE  /* Don't use these prefixes for a cross compiler.  */

From 6f2bd70fd015436eb3ea3ff118aedfe8b4975284 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Mon, 18 Aug 2014 11:36:34 -0400
Subject: [PATCH 0162/1453] Remove old comment, and delete confusing
 LaunchDaemon

---
 pkgs/servers/x11/xorg/default.nix    | 15 ---------------
 pkgs/servers/x11/xquartz/default.nix |  1 +
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 806cbf01b855..6945d6559fbb 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1984,21 +1984,6 @@ let
     buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ];
   }) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ;};
 
-  # TODO:
-  # With the current state of ./generate-expr-from-tarballs.pl,
-  # this will get overwritten when next invoked.
-  # Could add a special case to ./generate-expr-from-tarballs.pl,
-  # or perhaps there's a cleaner solution.
-  #xquartz = (mkDerivation "xquartz" {
-  #  name = "xorg-server-1.14.6";
-  #  builder = ./builder.sh;
-  #  src = fetchurl {
-  #    url = mirror://xorg/individual/xserver/xorg-server-1.14.6.tar.bz2;
-  #    sha256 = "0c57vp1z0p38dj5gfipkmlw6bvbz1mrr0sb3sbghdxxdyq4kzcz8";
-  #  };
-  #  buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ];
-  #}) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ;};
-
   xorgsgmldoctools = (mkDerivation "xorgsgmldoctools" {
     name = "xorg-sgml-doctools-1.11";
     builder = ./builder.sh;
diff --git a/pkgs/servers/x11/xquartz/default.nix b/pkgs/servers/x11/xquartz/default.nix
index abcae211f425..98fe2a51cc24 100644
--- a/pkgs/servers/x11/xquartz/default.nix
+++ b/pkgs/servers/x11/xquartz/default.nix
@@ -110,6 +110,7 @@ in stdenv.mkDerivation {
     cp ${installer} $out/bin/xquartz-install
 
     rm -r $out/LaunchAgents
+    rm -r $out/LaunchDaemons
 
     fontsConfPath=$out/etc/X11/fonts.conf
     cp ${fontsConf} $fontsConfPath

From 99b0271712e3258427c802d006bd8a32e9a8bd7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 18 Aug 2014 17:54:33 +0200
Subject: [PATCH 0163/1453] pulseaudio: fix CVE-2014-3970 by upstream patch

---
 pkgs/servers/pulseaudio/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index 0665222a9e04..2c6f6c104931 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gnum4, gdbm, libtool, glib, dbus, avahi
+{ stdenv, fetchurl, fetchpatch, pkgconfig, gnum4, gdbm, libtool, glib, dbus, avahi
 , gconf, gtk, intltool, gettext, alsaLib, libsamplerate, libsndfile, speex
 , bluez, sbc, udev, libcap, json_c
 , jackaudioSupport ? false, jack2 ? null
@@ -15,6 +15,13 @@ stdenv.mkDerivation rec {
     sha256 = "0fgrr8v7yfh0byhzdv4c87v9lkj8g7gpjm8r9xrbvpa92a5kmhcr";
   };
 
+  patches = [(fetchpatch {
+    name = "CVE-2014-3970.patch";
+    url = "http://cgit.freedesktop.org/pulseaudio/pulseaudio/patch/"
+      + "?id=26b9d22dd24c17eb118d0205bf7b02b75d435e3c";
+    sha256 = "13vxp6520djgfrfxkzy5qvabl94sga3yl5pj93xawbkgwzqymdyq";
+  })];
+
   # Since `libpulse*.la' contain `-lgdbm' and `-lcap', it must be propagated.
   propagatedBuildInputs
     = [ gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ];

From 32739cffdec41bd810ec5ab9362162057abe5db3 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Mon, 18 Aug 2014 01:27:27 +0100
Subject: [PATCH 0164/1453] haskell-json-rpc: add 0.2.0.1

---
 .../libraries/haskell/json-rpc/default.nix    | 27 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/json-rpc/default.nix

diff --git a/pkgs/development/libraries/haskell/json-rpc/default.nix b/pkgs/development/libraries/haskell/json-rpc/default.nix
new file mode 100644
index 000000000000..4bb33b628e33
--- /dev/null
+++ b/pkgs/development/libraries/haskell/json-rpc/default.nix
@@ -0,0 +1,27 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, aeson, async, conduit, conduitExtra, deepseq, hashable
+, mtl, QuickCheck, stm, stmConduit, testFramework
+, testFrameworkQuickcheck2, text, unorderedContainers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "json-rpc";
+  version = "0.2.0.1";
+  sha256 = "0kk2wpgnkdhphf9za2whmn4f6qlly5hzr071bx7xjqwqbpfhwplm";
+  buildDepends = [
+    aeson async conduit conduitExtra deepseq hashable mtl stm
+    stmConduit text unorderedContainers
+  ];
+  testDepends = [
+    aeson async conduit conduitExtra deepseq hashable mtl QuickCheck
+    stm stmConduit testFramework testFrameworkQuickcheck2 text
+    unorderedContainers
+  ];
+  meta = {
+    homepage = "https://github.com/xenog/json-rpc";
+    description = "Fully-featured JSON-RPC 2.0 library";
+    license = self.stdenv.lib.licenses.publicDomain;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index bde3c46429ca..754a53f1cb99 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1393,6 +1393,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   jsonAssertions = callPackage ../development/libraries/haskell/json-assertions {};
 
+  jsonRpc = callPackage ../development/libraries/haskell/json-rpc {};
+
   jsonSchema = callPackage ../development/libraries/haskell/json-schema {};
 
   jsonTypes = callPackage ../development/libraries/haskell/jsonTypes {};

From 4cf5ef541f1ccf22202f90f148c2acb2ed5d061a Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Mon, 18 Aug 2014 01:25:51 +0100
Subject: [PATCH 0165/1453] haskell-haskoin: add 0.1.0.2

---
 .../libraries/haskell/haskoin/default.nix     | 27 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/haskoin/default.nix

diff --git a/pkgs/development/libraries/haskell/haskoin/default.nix b/pkgs/development/libraries/haskell/haskoin/default.nix
new file mode 100644
index 000000000000..120111f35f0b
--- /dev/null
+++ b/pkgs/development/libraries/haskell/haskoin/default.nix
@@ -0,0 +1,27 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, aeson, async, binary, byteable, cryptohash, deepseq
+, either, HUnit, jsonRpc, mtl, pbkdf, QuickCheck, split
+, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, text
+}:
+
+cabal.mkDerivation (self: {
+  pname = "haskoin";
+  version = "0.1.0.2";
+  sha256 = "0l3h2wvi56k0dcfjambqyjrd45hb7bj0brp8nzrrcfn7fbpyjg8c";
+  buildDepends = [
+    aeson binary byteable cryptohash deepseq either jsonRpc mtl pbkdf
+    split text
+  ];
+  testDepends = [
+    aeson async binary byteable cryptohash deepseq either HUnit jsonRpc
+    mtl pbkdf QuickCheck split testFramework testFrameworkHunit
+    testFrameworkQuickcheck2 text
+  ];
+  meta = {
+    homepage = "http://github.com/haskoin/haskoin";
+    description = "Implementation of the Bitcoin protocol";
+    license = self.stdenv.lib.licenses.publicDomain;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 754a53f1cb99..d7d4ca05ada0 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1070,6 +1070,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   haskintex = callPackage ../development/libraries/haskell/haskintex {};
 
+  haskoin = callPackage ../development/libraries/haskell/haskoin {};
+
   haskore = callPackage ../development/libraries/haskell/haskore {};
 
   hastache = callPackage ../development/libraries/haskell/hastache {};

From 35945027bf2c788d31c5b59338b67ca39f47eb2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Tue, 19 Aug 2014 09:32:07 +0800
Subject: [PATCH 0166/1453] nixos/xfce: don't set a bloated GST_PLUGIN_PATH

---
 nixos/modules/services/x11/desktop-managers/xfce.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix
index a72eea76239f..a31f66176cc9 100644
--- a/nixos/modules/services/x11/desktop-managers/xfce.nix
+++ b/nixos/modules/services/x11/desktop-managers/xfce.nix
@@ -34,10 +34,6 @@ in
             # Set GTK_DATA_PREFIX so that GTK+ can find the Xfce themes.
             export GTK_DATA_PREFIX=${config.system.path}
 
-            # Necessary to get xfce4-mixer to find GST's ALSA plugin.
-            # Ugly.
-            export GST_PLUGIN_PATH=${config.system.path}/lib
-
             exec ${pkgs.stdenv.shell} ${pkgs.xfce.xinitrc}
           '';
       };

From 22541ebdaa616a8eabe04c919deee650aff617f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Tue, 19 Aug 2014 09:34:52 +0800
Subject: [PATCH 0167/1453] nixos/environment: do not set
 GST_PLUGIN_SYSTEM_PATH

---
 nixos/modules/programs/environment.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix
index 80c3e83fe812..e7bde81fb23e 100644
--- a/nixos/modules/programs/environment.nix
+++ b/nixos/modules/programs/environment.nix
@@ -47,7 +47,6 @@ in
         TERMINFO_DIRS = [ "${i}/share/terminfo" ];
         PERL5LIB = [ "${i}/lib/perl5/site_perl" ];
         ALSA_PLUGIN_DIRS = [ "${i}/lib/alsa-lib" ];
-        GST_PLUGIN_SYSTEM_PATH = [ "${i}/lib/gstreamer-0.10" ];
         KDEDIRS = [ "${i}" ];
         STRIGI_PLUGIN_PATH = [ "${i}/lib/strigi/" ];
         QT_PLUGIN_PATH = [ "${i}/lib/qt4/plugins" "${i}/lib/kde4/plugins" ];

From 22eccacb6ce0e1763c87d36f9b4d70a3e318446d Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Sun, 17 Aug 2014 00:16:27 -0700
Subject: [PATCH 0168/1453] update minecraft-server to 1.7.10

---
 pkgs/games/minecraft-server/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix
index 40ae606934d6..12497579bdce 100644
--- a/pkgs/games/minecraft-server/default.nix
+++ b/pkgs/games/minecraft-server/default.nix
@@ -4,11 +4,11 @@ with import <nixpkgs> {};
 
 stdenv.mkDerivation rec {
   name    = "minecraft-server-${version}";
-  version = "1.7.9";
+  version = "1.7.10";
 
   src  = fetchurl {
     url    = "http://s3.amazonaws.com/Minecraft.Download/versions/${version}/minecraft_server.${version}.jar";
-    sha256 = "088aqqifgzz8g6aars3kvsdvvrjp0lqxw9qmai48rky20l6ibfgp";
+    sha256 = "1z7kf8wm27yq10rnlwlig7c2vc45x3sfbxslw4lxh9201kq70267";
   };
 
   installPhase = ''

From 8f1623b38bd3569dba6d86cf7281deef0c7758c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Tue, 19 Aug 2014 09:57:30 +0800
Subject: [PATCH 0169/1453] xfce4-mixer: use wrapper to set
 GST_PLUGIN_SYSTEM_PATH

---
 pkgs/desktops/xfce/applications/xfce4-mixer.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/xfce/applications/xfce4-mixer.nix b/pkgs/desktops/xfce/applications/xfce4-mixer.nix
index 2b0f729c0a35..f486373ee17d 100644
--- a/pkgs/desktops/xfce/applications/xfce4-mixer.nix
+++ b/pkgs/desktops/xfce/applications/xfce4-mixer.nix
@@ -1,5 +1,7 @@
-{ stdenv, fetchurl, pkgconfig, intltool, glib, gstreamer, gst_plugins_base, gtk
-, libxfce4util, libxfce4ui, xfce4panel, xfconf, libunique?null }:
+{ stdenv, fetchurl, pkgconfig, intltool, makeWrapper
+, glib, gstreamer, gst_plugins_base, gtk
+, libxfce4util, libxfce4ui, xfce4panel, xfconf, libunique ? null
+}:
 
 let
   # The usual Gstreamer plugins package has a zillion dependencies
@@ -23,13 +25,13 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ pkgconfig intltool glib gstreamer gst_plugins_minimal gtk
-      libxfce4util libxfce4ui xfce4panel xfconf libunique
+      libxfce4util libxfce4ui xfce4panel xfconf libunique makeWrapper
     ];
 
   postInstall =
     ''
-      mkdir -p $out/nix-support
-      echo ${gst_plugins_minimal} > $out/nix-support/propagated-user-env-packages
+      wrapProgram "$out/bin/xfce4-mixer" \
+        --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"
     '';
 
   meta = {

From 6870cb88ae6ad2c80022ff68e346b51db5219c01 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Tue, 19 Aug 2014 03:42:12 +0100
Subject: [PATCH 0170/1453] haskell-gtk3: add 0.13.0.0

---
 .../libraries/haskell/gtk3/default.nix        | 23 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  4 ++++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/gtk3/default.nix

diff --git a/pkgs/development/libraries/haskell/gtk3/default.nix b/pkgs/development/libraries/haskell/gtk3/default.nix
new file mode 100644
index 000000000000..99d76c03c526
--- /dev/null
+++ b/pkgs/development/libraries/haskell/gtk3/default.nix
@@ -0,0 +1,23 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, cairo, gio, glib, gtk2hsBuildtools, gtk3, mtl, pango, text
+, time, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "gtk3";
+  version = "0.13.0.0";
+  sha256 = "0aq58gf6bcwnk085in0xilg7p8zyd2v079aqk1c47gjyrcg7p78f";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ cairo gio glib mtl pango text time transformers ];
+  buildTools = [ gtk2hsBuildtools ];
+  pkgconfigDepends = [ glib gtk3 ];
+  meta = {
+    homepage = "http://projects.haskell.org/gtk2hs/";
+    description = "Binding to the Gtk+ graphical user interface library";
+    license = self.stdenv.lib.licenses.lgpl21;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index d7d4ca05ada0..283f0fa0304e 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -990,6 +990,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
     libc = pkgs.stdenv.gcc.libc;
   };
 
+  gtk3 = callPackage ../development/libraries/haskell/gtk3 {
+    inherit (pkgs) gtk3;
+  };
+
   gtkglext = callPackage ../development/libraries/haskell/gtkglext { gtkglext = pkgs.gnome2.gtkglext; };
 
   gtk2hsBuildtools = callPackage ../development/libraries/haskell/gtk2hs-buildtools {};

From ff6057d686866878c01a6002f5190da5d251cd3f Mon Sep 17 00:00:00 2001
From: Ryan Newton <rrnewton@gmail.com>
Date: Tue, 19 Aug 2014 02:36:57 -0400
Subject: [PATCH 0171/1453] Add parallel functional compiler, Manticore

---
 .../compilers/manticore/builder.sh            | 24 ++++++++++++++++
 .../compilers/manticore/default.nix           | 28 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 54 insertions(+)
 create mode 100755 pkgs/development/compilers/manticore/builder.sh
 create mode 100644 pkgs/development/compilers/manticore/default.nix

diff --git a/pkgs/development/compilers/manticore/builder.sh b/pkgs/development/compilers/manticore/builder.sh
new file mode 100755
index 000000000000..8fb4ab850eb1
--- /dev/null
+++ b/pkgs/development/compilers/manticore/builder.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+source $stdenv/setup
+echo "Building Manticore research compiler."
+set -xe
+
+PATH=$smlnj/bin:$PATH
+
+mkdir -p $out/bin
+
+# Manticore seems to use the MLB files from the build tree,
+# so for now we copy the whole build tree into the store:
+cd $out/
+tar xf $src
+mv manticore* repo_checkout
+cd repo_checkout/
+# TODO: At the very least, this could probably be cut down to a subset
+# of the repo.
+
+${autoconf}/bin/autoheader -Iconfig
+${autoconf}/bin/autoconf -Iconfig
+./configure --prefix=$out
+make build -j
+make install
diff --git a/pkgs/development/compilers/manticore/default.nix b/pkgs/development/compilers/manticore/default.nix
new file mode 100644
index 000000000000..a954591de44e
--- /dev/null
+++ b/pkgs/development/compilers/manticore/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, coreutils, autoconf, automake, smlnj }:
+
+stdenv.mkDerivation rec {
+  name = "manticore-${version}";
+  version = "2014.08.18";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = https://github.com/rrnewton/manticore_temp_mirror/archive/snapshot-20140818.tar.gz; 
+    sha256 = "1x52xpj5gbcpqjqm6aw6ssn901f353zypj3d5scm8i3ad777y29d";
+  };
+  inherit stdenv coreutils autoconf automake smlnj;
+
+  meta = {
+    description = "Manticore: a parallel, pure variant of Standard ML";
+
+    longDescription = '' 
+      Manticore is a high-level parallel programming language aimed at
+      general-purpose applications running on multi-core
+      processors. Manticore supports parallelism at multiple levels:
+      explicit concurrency and coarse-grain parallelism via CML-style
+      constructs and fine-grain parallelism via various light-weight
+      notations, such as parallel tuple expressions and NESL/Nepal-style
+      parallel array comprehensions.  
+    '';
+
+    homepage = http://manticore.cs.uchicago.edu/;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3810074111cf..200881c916a6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3122,6 +3122,8 @@ let
   });
   llvmPackagesSelf = import ../development/compilers/llvm/3.4 { inherit newScope fetchurl; isl = isl_0_12; stdenv = libcxxStdenv; };
 
+  manticore = callPackage ../development/compilers/manticore { };
+
   mentorToolchains = recurseIntoAttrs (
     callPackage_i686 ../development/compilers/mentor {}
   );

From 23db49cf98d6553c56aca99c174c90d84249a2e5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 19 Aug 2014 10:06:16 +0200
Subject: [PATCH 0172/1453] Containers: Fix all-containers.service start

Fixes #3662.
---
 nixos/modules/virtualisation/containers.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 847c1eddab2a..292b96e6eb24 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -319,11 +319,14 @@ in
 
         wantedBy = [ "multi-user.target" ];
 
+        unitConfig.ConditionDirectoryNotEmpty = "/etc/containers";
+
         serviceConfig.Type = "oneshot";
 
         script =
           ''
             res=0
+            shopt -s nullglob
             for i in /etc/containers/*.conf; do
               AUTO_START=
               source "$i"

From a82e9e4b5c0faaeb4b3366e21b32f589b59c0b23 Mon Sep 17 00:00:00 2001
From: Georges Dubus <georges.dubus@compiletoi.net>
Date: Tue, 19 Aug 2014 11:00:46 +0200
Subject: [PATCH 0173/1453] Added e2fsprogs to docker dependencies.

Otherwise, it complains about mkfs.ext4 not being present at service
start (and stops).
---
 pkgs/applications/virtualization/docker/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 4a488a381abf..4571e979c6c7 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, makeWrapper, go, lxc, sqlite, iproute, bridge_utils, devicemapper,
-btrfsProgs, iptables, bash}:
+btrfsProgs, iptables, bash, e2fsprogs}:
 
 stdenv.mkDerivation rec {
   name = "docker-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "1pa6k3gx940ap3r96xdry6apzkm0ymqra92b2mrp25b25264cqcy";
   };
 
-  buildInputs = [ makeWrapper go sqlite lxc iproute bridge_utils devicemapper btrfsProgs iptables ];
+  buildInputs = [ makeWrapper go sqlite lxc iproute bridge_utils devicemapper btrfsProgs iptables e2fsprogs];
 
   dontStrip = true;
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     install -Dm755 ./bundles/${version}/dynbinary/docker-${version} $out/bin/docker
     install -Dm755 ./bundles/${version}/dynbinary/dockerinit-${version} $out/bin/dockerinit
-    wrapProgram $out/bin/docker --prefix PATH : "${iproute}/sbin:sbin:${lxc}/bin:${iptables}/sbin"
+    wrapProgram $out/bin/docker --prefix PATH : "${iproute}/sbin:sbin:${lxc}/bin:${iptables}/sbin:${e2fsprogs}/sbin"
 
     # systemd
     install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service

From fe270c011ce246bb7e95a0deec9106f1a04fe8d0 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Mon, 18 Aug 2014 10:08:18 -0300
Subject: [PATCH 0174/1453] Fluxbox: new package (1.3.5)

---
 .../window-managers/fluxbox/default.nix       | 39 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/applications/window-managers/fluxbox/default.nix

diff --git a/pkgs/applications/window-managers/fluxbox/default.nix b/pkgs/applications/window-managers/fluxbox/default.nix
new file mode 100644
index 000000000000..6c91e773376f
--- /dev/null
+++ b/pkgs/applications/window-managers/fluxbox/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchurl, pkgconfig
+, freetype, fribidi
+, libXext, libXft, libXpm, libXrandr, libXrender, xextproto
+, libXinerama
+, imlib2
+}:
+
+stdenv.mkDerivation rec {
+
+  name = "fluxbox-${version}";
+  version = "1.3.5";
+
+  buildInputs = [
+    pkgconfig
+    freetype fribidi
+    libXext libXft libXpm libXrandr libXrender xextproto
+    libXinerama
+    imlib2
+  ];
+
+  src = fetchurl {
+    url = "mirror://sourceforge/fluxbox/${name}.tar.bz2";
+    sha256 = "164dd7bf59791d09a1e729a4fcd5e7347a1004ba675629860a5cf1a271c32983";
+  };
+
+  meta = {
+    description = "Full-featured, light-resource X window manager.";
+    longDescription = ''
+      Fluxbox is a X window manager based on Blackbox 0.61.1 window manager sources.
+      It is very light on resources and easy to handle but yet full of features to make an easy,
+      and extremely fast, desktop experience. It is written in C++ and licensed under MIT license.
+    '';
+    homepage = http://fluxbox.org/;
+    license = stdenv.lib.licenses.mit;
+    maintainers = [ stdenv.lib.maintainers.AndersonTorres ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
+# Many thanks Jack Ryan from Nix-dev mailing list!
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5047bd59f34a..6600cb1ae4c7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8707,6 +8707,8 @@ let
     debug = config.flashplayer.debug or false;
   };
 
+  fluxbox = callPackage ../applications/window-managers/fluxbox { };
+
   freecad = callPackage ../applications/graphics/freecad {
     opencascade = opencascade_6_5;
     inherit (pythonPackages) matplotlib pycollada;

From c37057240fa89339f570043b0ade28fe4517de5a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 19 Aug 2014 11:46:08 +0200
Subject: [PATCH 0175/1453] man-pages: Update to 3.70

---
 pkgs/data/documentation/man-pages/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix
index 5fc0b4752bc4..d4c0b4a6461a 100644
--- a/pkgs/data/documentation/man-pages/default.nix
+++ b/pkgs/data/documentation/man-pages/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "man-pages-3.64";
+  name = "man-pages-3.70";
 
   src = fetchurl {
     url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz";
-    sha256 = "1p9zk130c852gqci6dyw57yaqx4v871n8n82kkccdpj7y63xr4bl";
+    sha256 = "1qnhlicshlcz2da9k9czp75cfj7a6y90m0bhik7gzxa3s3b4f43j";
   };
 
   preBuild =

From 033c9bd18c2b90d8c7c5ad38712f3aff55b0d7b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=BCdiger=20Sonderfeld?= <ruediger@c-plusplus.de>
Date: Tue, 19 Aug 2014 15:19:06 +0200
Subject: [PATCH 0176/1453] mplayer: Update to 1.1.1.

---
 pkgs/applications/video/mplayer/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix
index f3cef6db69f1..2103cdbe3872 100644
--- a/pkgs/applications/video/mplayer/default.nix
+++ b/pkgs/applications/video/mplayer/default.nix
@@ -78,7 +78,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "mplayer-1.1";
+  name = "mplayer-1.1.1";
 
   src = fetchurl {
     # Old kind of URL:
@@ -89,8 +89,8 @@ stdenv.mkDerivation rec {
     #url = http://www.mplayerhq.hu/MPlayer/releases/mplayer-export-snapshot.tar.bz2;
     #sha256 = "cc1b3fda75b172f02c3f46581cfb2c17f4090997fe9314ad046e464a76b858bb";
 
-    url = "http://www.mplayerhq.hu/MPlayer/releases/MPlayer-1.1.tar.xz";
-    sha256 = "173cmsfz7ckzy1hay9mpnc5as51127cfnxl20b521d2jvgm4gjvn";
+    url = "http://www.mplayerhq.hu/MPlayer/releases/MPlayer-1.1.1.tar.xz";
+    sha256 = "ce8fc7c3179e6a57eb3a58cb7d1604388756b8a61764cc93e095e7aff3798c76";
   };
 
   prePatch = ''

From af09d3ebd8908dcde1d28f0e1dff0a7a554af4f1 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <emery@vfemail.net>
Date: Thu, 10 Jul 2014 14:08:38 -0400
Subject: [PATCH 0177/1453] siproxd: initial service expression

---
 nixos/modules/misc/ids.nix              |   2 +
 nixos/modules/module-list.nix           |   1 +
 nixos/modules/services/misc/siproxd.nix | 180 ++++++++++++++++++++++++
 3 files changed, 183 insertions(+)
 create mode 100644 nixos/modules/services/misc/siproxd.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index fa81ff8a8398..9f509ba8cb94 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -141,6 +141,7 @@
       unifi = 131;
       gdm = 132;
       dhcpd = 133;
+      siproxd = 134;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -256,6 +257,7 @@
       docker = 131;
       gdm = 132;
       tss = 133;
+      siproxd = 134;
 
       # When adding a gid, make sure it doesn't match an existing uid. And don't use gids above 399!
 
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 453899175e01..1fc2959bd8a0 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -159,6 +159,7 @@
   ./services/misc/nix-ssh-serve.nix
   ./services/misc/rippled.nix
   ./services/misc/rogue.nix
+  ./services/misc/siproxd.nix
   ./services/misc/svnserve.nix
   ./services/misc/synergy.nix
   ./services/monitoring/apcupsd.nix
diff --git a/nixos/modules/services/misc/siproxd.nix b/nixos/modules/services/misc/siproxd.nix
new file mode 100644
index 000000000000..9e8fb6c228f2
--- /dev/null
+++ b/nixos/modules/services/misc/siproxd.nix
@@ -0,0 +1,180 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.siproxd;
+
+  conf = ''
+    daemonize = 0
+    rtp_proxy_enable = 1
+    user = siproxd
+    if_inbound  = ${cfg.ifInbound}
+    if_outbound = ${cfg.ifOutbound}
+    sip_listen_port = ${toString cfg.sipListenPort}
+    rtp_port_low    = ${toString cfg.rtpPortLow}
+    rtp_port_high   = ${toString cfg.rtpPortHigh}
+    rtp_dscp        = ${toString cfg.rtpDscp}
+    sip_dscp        = ${toString cfg.sipDscp}
+    ${optionalString (cfg.hostsAllowReg != []) "hosts_allow_reg = ${concatStringsSep "," cfg.hostsAllowReg}"}
+    ${optionalString (cfg.hostsAllowSip != []) "hosts_allow_sip = ${concatStringsSep "," cfg.hostsAllowSip}"}
+    ${optionalString (cfg.hostsDenySip != []) "hosts_deny_sip  = ${concatStringsSep "," cfg.hostsDenySip}"}
+    ${if (cfg.passwordFile != "") then "proxy_auth_pwfile = ${cfg.passwordFile}" else ""}
+    ${cfg.extraConfig}
+  '';
+
+  confFile = builtins.toFile "siproxd.conf" conf;
+
+in
+{
+  ##### interface
+
+  options = {
+
+    services.siproxd = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to enable the Siproxd SIP 
+	  proxy/masquerading daemon.
+        '';
+      };
+
+      ifInbound = mkOption {
+        type = types.str;
+        example = "eth0";
+        description = "Local network interface";
+      };
+
+      ifOutbound = mkOption {
+        type = types.str;
+        example = "ppp0";
+        description = "Public network interface";
+      };
+
+      hostsAllowReg = mkOption {
+        type = types.listOf types.str;
+	default = [ ];
+        example = [ "192.168.1.0/24" "192.168.2.0/24" ];
+	description = ''
+          Acess control list for incoming SIP registrations.
+        '';
+      };
+
+      hostsAllowSip = mkOption {
+        type = types.listOf types.str;
+	default = [ ];
+        example = [ "123.45.0.0/16" "123.46.0.0/16" ];
+	description = ''
+          Acess control list for incoming SIP traffic.
+        '';
+      };
+
+      hostsDenySip = mkOption {
+        type = types.listOf types.str;
+	default = [ ];
+        example = [ "10.0.0.0/8" "11.0.0.0/8" ];
+	description = ''
+          Acess control list for denying incoming
+	   SIP registrations and traffic.
+        '';
+      };
+
+      sipListenPort = mkOption {
+        type = types.int;
+        default = 5060;
+        description = ''
+	  Port to listen for incoming SIP messages.
+        '';
+      };
+
+      rtpPortLow = mkOption {
+        type = types.int;
+        default = 7070;
+        description = ''
+         Bottom of UDP port range for incoming and outgoing RTP traffic
+        '';
+      };
+
+      rtpPortHigh = mkOption {
+        type = types.int;
+        default = 7089;
+        description = ''
+         Top of UDP port range for incoming and outgoing RTP traffic
+        '';
+      };
+
+      rtpTimeout = mkOption {
+        type = types.int;
+        default = 300;
+        description = ''
+          Timeout for an RTP stream. If for the specified 
+          number of seconds no data is relayed on an active
+          stream, it is considered dead and will be killed.
+        '';
+      };
+
+      rtpDscp = mkOption {
+        type = types.int;
+        default = 46;
+        description = ''
+          DSCP (differentiated services) value to be assigned
+          to RTP packets. Allows QOS aware routers to handle 
+          different types traffic with different priorities.
+        '';
+      };
+
+      sipDscp = mkOption {
+        type = types.int;
+        default = 0;
+        description = ''
+          DSCP (differentiated services) value to be assigned
+          to SIP packets. Allows QOS aware routers to handle 
+          different types traffic with different priorities.
+        '';
+      };
+
+      passwordFile = mkOption {
+        type = types.str;
+        default = "";
+        description = ''
+          Path to per-user password file.
+        '';
+      };
+
+      extraConfig = mkOption {
+        type = types.lines;
+        default = "";
+        description = ''
+          Extra configuration to add to siproxd configuration.
+        '';
+      };
+
+    };
+
+  };
+
+  ##### implementation
+
+  config = mkIf cfg.enable {
+
+    users.extraUsers = singleton {
+      name = "siproxyd";
+      uid = config.ids.uids.siproxd;
+    };
+
+    systemd.services.siproxd = {
+      description = "SIP proxy/masquerading daemon";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
+      serviceConfig = {
+        ExecStart = "${pkgs.siproxd}/sbin/siproxd -c ${confFile}";
+      };
+    };
+
+  };
+
+}

From 4de6b9a0c79e6881ed688ef8bab45ce5d1fb9c9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=BCdiger=20Sonderfeld?= <ruediger@c-plusplus.de>
Date: Tue, 19 Aug 2014 16:24:58 +0200
Subject: [PATCH 0178/1453] mplayer: Add GNU FriBiDi support.

This is required by new versions of SMPlayer and other distros seem to
enable it by default now as well.
---
 pkgs/applications/video/mplayer/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix
index 2103cdbe3872..07bcb26569e9 100644
--- a/pkgs/applications/video/mplayer/default.nix
+++ b/pkgs/applications/video/mplayer/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, pkgconfig, freetype, yasm
 , fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? null
+, fribidiSupport ? true, fribidi ? null
 , x11Support ? true, libX11 ? null, libXext ? null, mesa ? null
 , xineramaSupport ? true, libXinerama ? null
 , xvSupport ? true, libXv ? null
@@ -25,6 +26,7 @@
 
 assert fontconfigSupport -> (fontconfig != null);
 assert (!fontconfigSupport) -> (freefont_ttf != null);
+assert fribidiSupport -> (fribidi != null);
 assert x11Support -> (libX11 != null && libXext != null && mesa != null);
 assert xineramaSupport -> (libXinerama != null && x11Support);
 assert xvSupport -> (libXv != null && x11Support);
@@ -100,6 +102,7 @@ stdenv.mkDerivation rec {
   buildInputs = with stdenv.lib;
     [ pkgconfig freetype ]
     ++ optional fontconfigSupport fontconfig
+    ++ optional fribidiSupport fribidi
     ++ optionals x11Support [ libX11 libXext mesa ]
     ++ optional alsaSupport alsaLib
     ++ optional xvSupport libXv
@@ -150,6 +153,7 @@ stdenv.mkDerivation rec {
       ${if pulseSupport then "--enable-pulse" else "--disable-pulse"}
       ${optionalString (useUnfreeCodecs && codecs != null) "--codecsdir=${codecs}"}
       ${optionalString (stdenv.isi686 || stdenv.isx86_64) "--enable-runtime-cpudetection"}
+      ${optionalString fribidiSupport "--enable-fribidi"}
       --disable-xanim
       --disable-ivtv
       --disable-xvid --disable-xvid-lavc
@@ -160,6 +164,7 @@ stdenv.mkDerivation rec {
 
   NIX_LDFLAGS = with stdenv.lib;
        optional  fontconfigSupport "-lfontconfig"
+    ++ optional  fribidiSupport "-lfribidi"
     ++ optionals x11Support [ "-lX11" "-lXext" ]
     ;
 

From e59a29df13d04fb30180021ff69ae2978658b625 Mon Sep 17 00:00:00 2001
From: Ryan Newton <rrnewton@gmail.com>
Date: Tue, 19 Aug 2014 10:27:20 -0400
Subject: [PATCH 0179/1453] manticore: Remove name from description

---
 pkgs/development/compilers/manticore/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/manticore/default.nix b/pkgs/development/compilers/manticore/default.nix
index a954591de44e..983f86531dc9 100644
--- a/pkgs/development/compilers/manticore/default.nix
+++ b/pkgs/development/compilers/manticore/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   inherit stdenv coreutils autoconf automake smlnj;
 
   meta = {
-    description = "Manticore: a parallel, pure variant of Standard ML";
+    description = "a parallel, pure variant of Standard ML";
 
     longDescription = '' 
       Manticore is a high-level parallel programming language aimed at

From d809e775e868a6b095d09607e3f279d8f015d3d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=BCdiger=20Sonderfeld?= <ruediger@c-plusplus.de>
Date: Tue, 19 Aug 2014 16:34:51 +0200
Subject: [PATCH 0180/1453] git: Add git-prompt.sh to /etc/bash_completion.d.

This will make the git-prompt.sh features available to bash users when
completions are enabled.  It is done in this way in Debian/Ubuntu as well.
---
 .../version-management/git-and-tools/git/default.nix             | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index a3c543d9e1e7..a4d16e460607 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -66,6 +66,7 @@ stdenv.mkDerivation {
       ln -s "$out/share/git/contrib/emacs/"*.el $out/share/emacs/site-lisp/
       mkdir -p $out/etc/bash_completion.d
       ln -s $out/share/git/contrib/completion/git-completion.bash $out/etc/bash_completion.d/
+      ln -s $out/share/git/contrib/completion/git-prompt.sh $out/etc/bash_completion.d/
 
       # grep is a runtime dependency, need to patch so that it's found
       substituteInPlace $out/libexec/git-core/git-sh-setup \

From 775b4a39e68d9839d56bddbad92beb87c7157528 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=BCdiger=20Sonderfeld?= <ruediger@c-plusplus.de>
Date: Tue, 19 Aug 2014 17:03:49 +0200
Subject: [PATCH 0181/1453] tmux: Install bash completion script.

---
 pkgs/tools/misc/tmux/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix
index 5b656cc13e72..4acbabb50f98 100644
--- a/pkgs/tools/misc/tmux/default.nix
+++ b/pkgs/tools/misc/tmux/default.nix
@@ -14,6 +14,12 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ ncurses libevent ];
 
+  postInstall =
+    ''
+      mkdir -p $out/etc/bash_completion.d
+      cp -v examples/bash_completion_tmux.sh $out/etc/bash_completion.d/tmux
+    '';
+
   meta = {
     homepage = http://tmux.sourceforge.net/;
     description = "tmux is a terminal multiplexer";

From f932910323bf7188f70c49789ce85392c36e06b4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 19 Aug 2014 13:13:51 +0200
Subject: [PATCH 0182/1453] =?UTF-8?q?types.nix:=20Add=20=E2=80=98either?=
 =?UTF-8?q?=E2=80=99=20type?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/types.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/types.nix b/lib/types.nix
index f5700ab0269a..0e2b6515e165 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -200,6 +200,12 @@ rec {
       merge = mergeOneOption;
     };
 
+    either = t1: t2: mkOptionType {
+      name = "${t1.name} or ${t2.name}";
+      check = x: t1.check x || t2.check x;
+      merge = mergeOneOption;
+    };
+
     # Obsolete alternative to configOf.  It takes its option
     # declarations from the ‘options’ attribute of containing option
     # declaration.

From ddd8f0cf661e2c1818eb19476a2d62a417de4873 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 19 Aug 2014 15:47:51 +0200
Subject: [PATCH 0183/1453] nixos-container --create: Add option --system-path

This allows creating a container from an existing system store path,
which is especially nice for NixOps-deployed hosts because they don't
need a Nixpkgs tree anymore.
---
 .../modules/virtualisation/nixos-container.pl | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/virtualisation/nixos-container.pl b/nixos/modules/virtualisation/nixos-container.pl
index 3975e4b62f23..06839874ef02 100644
--- a/nixos/modules/virtualisation/nixos-container.pl
+++ b/nixos/modules/virtualisation/nixos-container.pl
@@ -17,7 +17,7 @@ umask 0022;
 sub showHelp {
     print <<EOF;
 Usage: nixos-container list
-       nixos-container create <container-name> [--config <string>] [--ensure-unique-name] [--auto-start]
+       nixos-container create <container-name> [--system-path <path>] [--config <string>] [--ensure-unique-name] [--auto-start]
        nixos-container destroy <container-name>
        nixos-container start <container-name>
        nixos-container stop <container-name>
@@ -31,6 +31,7 @@ EOF
     exit 0;
 }
 
+my $systemPath;
 my $ensureUniqueName = 0;
 my $autoStart = 0;
 my $extraConfig;
@@ -39,6 +40,7 @@ GetOptions(
     "help" => sub { showHelp() },
     "ensure-unique-name" => \$ensureUniqueName,
     "auto-start" => \$autoStart,
+    "system-path=s" => \$systemPath,
     "config=s" => \$extraConfig
     ) or exit 1;
 
@@ -132,11 +134,6 @@ if ($action eq "create") {
 
     print STDERR "host IP is $hostAddress, container IP is $localAddress\n";
 
-    mkpath("$root/etc/nixos", 0, 0755);
-
-    my $nixosConfigFile = "$root/etc/nixos/configuration.nix";
-    writeNixOSConfig $nixosConfigFile;
-
     # The per-container directory is restricted to prevent users on
     # the host from messing with guest users who happen to have the
     # same uid.
@@ -145,10 +142,21 @@ if ($action eq "create") {
     $profileDir = "$profileDir/$containerName";
     mkpath($profileDir, 0, 0755);
 
-    system("nix-env", "-p", "$profileDir/system",
-           "-I", "nixos-config=$nixosConfigFile", "-f", "<nixpkgs/nixos>",
-           "--set", "-A", "system") == 0
-        or die "$0: failed to build initial container configuration\n";
+    # Build/set the initial configuration.
+    if (defined $systemPath) {
+        system("nix-env", "-p", "$profileDir/system", "--set", $systemPath) == 0
+            or die "$0: failed to set initial container configuration\n";
+    } else {
+        mkpath("$root/etc/nixos", 0, 0755);
+
+        my $nixosConfigFile = "$root/etc/nixos/configuration.nix";
+        writeNixOSConfig $nixosConfigFile;
+
+        system("nix-env", "-p", "$profileDir/system",
+               "-I", "nixos-config=$nixosConfigFile", "-f", "<nixpkgs/nixos>",
+               "--set", "-A", "system") == 0
+            or die "$0: failed to build initial container configuration\n";
+    }
 
     print "$containerName\n" if $ensureUniqueName;
     exit 0;

From b18f503f1a1323908d662f27411d2c0febe761bb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 19 Aug 2014 16:57:02 +0200
Subject: [PATCH 0184/1453] nixos-container: Add command show-host-key

This is used by nixops.
---
 nixos/modules/virtualisation/nixos-container.pl | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/nixos-container.pl b/nixos/modules/virtualisation/nixos-container.pl
index 06839874ef02..bf6f16fc6c77 100644
--- a/nixos/modules/virtualisation/nixos-container.pl
+++ b/nixos/modules/virtualisation/nixos-container.pl
@@ -27,6 +27,7 @@ Usage: nixos-container list
        nixos-container run <container-name> -- args...
        nixos-container set-root-password <container-name> <password>
        nixos-container show-ip <container-name>
+       nixos-container show-host-key <container-name>
 EOF
     exit 0;
 }
@@ -169,7 +170,7 @@ my $confFile = "/etc/containers/$containerName.conf";
 if (!-e $confFile) {
     if ($action eq "destroy") {
         exit 0;
-    } else {
+    } elsif ($action eq "status") {
         print "gone\n";
     }
     die "$0: container ‘$containerName’ does not exist\n" ;
@@ -264,6 +265,12 @@ elsif ($action eq "show-ip") {
     print "$1\n";
 }
 
+elsif ($action eq "show-host-key") {
+    my $fn = "$root/etc/ssh/ssh_host_ecdsa_key.pub";
+    exit 1 if ! -f $fn;
+    print read_file($fn);
+}
+
 else {
     die "$0: unknown action ‘$action’\n";
 }

From 90874bfc442693f25db0d0d4d62ec425b9510451 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 19 Aug 2014 18:36:06 +0200
Subject: [PATCH 0185/1453] gdm-3.12: disable parallel building

Reason:
gdm-client-glue.h:7:0: error: unterminated #ifndef
http://hydra.nixos.org/build/13488683
---
 pkgs/desktops/gnome-3/3.12/core/gdm/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix
index f5dc7639f3a5..965a8a05f16f 100644
--- a/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
                   gobjectIntrospection libX11 gtk
                   libcanberra_gtk3 pam libtool ];
 
-  enableParallelBuilding = true;
+  #enableParallelBuilding = true; # problems compiling
 
   preBuild = ''
     substituteInPlace daemon/gdm-simple-slave.c --replace 'BINDIR "/gnome-session' '"${gnome_session}/bin/gnome-session'

From 559c7cc2dad4a971f0519c9f4861259fca55c3d1 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <vincent.laporte@gmail.com>
Date: Tue, 19 Aug 2014 18:39:45 +0200
Subject: [PATCH 0186/1453] yojson: propagate build inputs (as in PR #3404)

---
 pkgs/development/ocaml-modules/yojson/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/ocaml-modules/yojson/default.nix b/pkgs/development/ocaml-modules/yojson/default.nix
index 9237db080d67..562d25550dae 100644
--- a/pkgs/development/ocaml-modules/yojson/default.nix
+++ b/pkgs/development/ocaml-modules/yojson/default.nix
@@ -4,16 +4,18 @@ let
   version = "1.1.8";
   webpage = "http://mjambon.com/${pname}.html";
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
 
-  name = "${pname}-${version}";
+  name = "ocaml-${pname}-${version}";
 
   src = fetchurl {
-    url = "http://mjambon.com/releases/${pname}/${name}.tar.gz";
+    url = "http://mjambon.com/releases/${pname}/${pname}-${version}.tar.gz";
     sha256 = "0ayx17dimnpavdfyq6dk9xv2x1fx69by85vc6vl3nqxjkcv5d2rv";
   };
 
-  buildInputs = [ ocaml findlib cppo easy-format biniou ];
+  buildInputs = [ ocaml findlib ];
+
+  propagatedBuildInputs = [ cppo easy-format biniou ];
 
   createFindlibDestdir = true;
 

From e8d2f8f1092e71c951b95f5a6e1b2227e4d185a9 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <vincent.laporte@gmail.com>
Date: Tue, 19 Aug 2014 18:42:13 +0200
Subject: [PATCH 0187/1453] merlin: update to 1.7

---
 pkgs/development/tools/ocaml/merlin/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix
index c0882439f5c5..8efb90a9ceff 100644
--- a/pkgs/development/tools/ocaml/merlin/default.nix
+++ b/pkgs/development/tools/ocaml/merlin/default.nix
@@ -1,14 +1,14 @@
-{stdenv, fetchurl, ocaml, findlib, easy-format, biniou, yojson, menhir}:
+{stdenv, fetchurl, ocaml, findlib, yojson, menhir}:
 stdenv.mkDerivation {
 
-  name = "merlin-1.6";
+  name = "merlin-1.7";
 
   src = fetchurl {
-    url = "https://github.com/the-lambda-church/merlin/archive/v1.6.tar.gz";
-    sha256 = "0wq75hgffaszazrhkl0nfjxgx8bvazi2sjannd8q64hvax8hxzcy";
+    url = "https://github.com/the-lambda-church/merlin/archive/v1.7.tar.gz";
+    sha256 = "0grprrykah02g8va63lidbcb6n8sd18l2k9spb5rwlcs3xhfw42b";
   };
 
-  buildInputs = [ ocaml findlib biniou yojson menhir easy-format ];
+  buildInputs = [ ocaml findlib yojson menhir ];
 
   prefixKey = "--prefix ";
 

From 464ec2a8e5226992c92fbeb17ab6d8621b1b8914 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 19 Aug 2014 19:26:24 +0200
Subject: [PATCH 0188/1453] silver-searcher: update from 0.21.0 to 0.24.1

---
 pkgs/tools/text/silver-searcher/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/silver-searcher/default.nix b/pkgs/tools/text/silver-searcher/default.nix
index fa780b11f688..ba17d1865db0 100644
--- a/pkgs/tools/text/silver-searcher/default.nix
+++ b/pkgs/tools/text/silver-searcher/default.nix
@@ -1,13 +1,13 @@
 {stdenv, fetchgit, autoreconfHook, pkgconfig, pcre, zlib, lzma}:
 
-let release = "0.21.0"; in
+let release = "0.24.1"; in
 stdenv.mkDerivation {
   name = "silver-searcher-${release}";
 
   src = fetchgit {
     url = "https://github.com/ggreer/the_silver_searcher.git";
     rev = "refs/tags/${release}";
-    sha256 = "bd49c6cadabeaf7bde130e5d2d0083367ae2d19cfedb40e45f5bb1ff9f4a3e51";
+    sha256 = "1cwav217mkbwyg8isiak0wynydiil2j9gy4sx79harbcql0f3nl3";
   };
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";

From c38a27df7730914d4492873fd39a99671a9356ad Mon Sep 17 00:00:00 2001
From: Bodil Stokke <bodil@bodil.org>
Date: Tue, 19 Aug 2014 19:43:48 +0100
Subject: [PATCH 0189/1453] Update to ponysay version 3.0.2.

---
 pkgs/tools/misc/ponysay/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/ponysay/default.nix b/pkgs/tools/misc/ponysay/default.nix
index 031264f1edd0..42495a457560 100644
--- a/pkgs/tools/misc/ponysay/default.nix
+++ b/pkgs/tools/misc/ponysay/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, python3, texinfo, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "ponysay-3.0.1";
+  name = "ponysay-3.0.2";
 
   src = fetchurl {
-    url = "https://github.com/erkin/ponysay/archive/3.0.1.tar.gz";
-    sha256 = "ab281f43510263b2f42a1b0a9097ee7831b3e33a9034778ecb12ccb51f6915ee";
+    url = "https://github.com/erkin/ponysay/archive/3.0.2.tar.gz";
+    sha256 = "03avcbl96rv718lgg6yyrq5mvg3xxzccrnnb6brf4g9mcrwqmsb9";
   };
 
   buildInputs = [ python3 texinfo makeWrapper ];

From 477eb18d18843d91c2004f72d5377c7a5edac941 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Mon, 18 Aug 2014 19:48:17 -0700
Subject: [PATCH 0190/1453] nvidia-x11: update to 340.32 (close #3365)

Also close #3634.
---
 pkgs/os-specific/linux/nvidia-x11/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 7176cb2b941f..5cd1bf180d67 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -12,7 +12,7 @@ assert (!libsOnly) -> kernel != null;
 
 let
 
-  versionNumber = "340.24";
+  versionNumber = "340.32";
 
 in
 
@@ -25,12 +25,12 @@ stdenv.mkDerivation {
     if stdenv.system == "i686-linux" then
       fetchurl {
         url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
-        sha256 = "0c5iix6rihbx7mbfhznz0jjbc3kkccwyfxi56p76fvrbyan9dvam";
+        sha256 = "1xcm8czz4bmnlzkl3al58flw6jmbrg1y77cxjjdjqcsvbk1qj10x";
       }
     else if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run";
-        sha256 = "04yy26722fjf9k7y6r909g68nqnsglfd9xs1dk1nain1021p70iq";
+        sha256 = "1nfrpx73817y1z0wkqqh02xjg65r0f05h9801mqm8ki2gxqv9vq0";
       }
     else throw "nvidia-x11 does not support platform ${stdenv.system}";
 

From 708e16e675848c4e75807e7fc49b017639a9b7b6 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Tue, 19 Aug 2014 16:03:10 -0500
Subject: [PATCH 0191/1453] ssreflect: 1.4 -> 1.5

---
 pkgs/applications/science/logic/ssreflect/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/logic/ssreflect/default.nix b/pkgs/applications/science/logic/ssreflect/default.nix
index 6377db9c8955..a784e5fe1b6e 100644
--- a/pkgs/applications/science/logic/ssreflect/default.nix
+++ b/pkgs/applications/science/logic/ssreflect/default.nix
@@ -6,7 +6,7 @@
 
 let
   pname = "ssreflect";
-  version = "1.4";
+  version = "1.5";
   name = "${pname}-${version}";
   webpage = http://www.msr-inria.inria.fr/Projects/math-components;
 in
@@ -15,8 +15,8 @@ stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
-    url = "http://ssr.msr-inria.inria.fr/FTP/${name}-coq8.4.tar.gz";
-    sha256 = "1ysx29xw09i86lq0d92z9cnyx133jfgq4qddy3501000fn7xwi7h";
+    url = "http://ssr.msr-inria.inria.fr/FTP/${name}.tar.gz";
+    sha256 = "0hm1ha7sxqfqhc7iwhx6zdz3nki4rj5nfd3ab24hmz8v7mlpinds";
   };
 
   buildInputs = [ ocaml camlp5 coq makeWrapper ];

From 2c0610fb6f670dba93326b7def6d431e3c0cde1a Mon Sep 17 00:00:00 2001
From: Emil Rangden <emil.rangden@chas.se>
Date: Mon, 18 Aug 2014 19:50:18 +0200
Subject: [PATCH 0192/1453] updated taffybar

---
 pkgs/applications/misc/taffybar/default.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/misc/taffybar/default.nix b/pkgs/applications/misc/taffybar/default.nix
index d2e7d84e3144..6b282116343d 100644
--- a/pkgs/applications/misc/taffybar/default.nix
+++ b/pkgs/applications/misc/taffybar/default.nix
@@ -1,21 +1,21 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, cairo, dbus, dyre, filepath, gtk, gtkTraymanager
-, HStringTemplate, HTTP, mtl, network, parsec, split, stm, text
-, time, transformers, utf8String, X11, xdgBasedir, xmonad
-, xmonadContrib
+{ cabal, cairo, dbus, dyre, enclosedExceptions, filepath, gtk
+, gtkTraymanager, HStringTemplate, HTTP, mtl, network, parsec, safe
+, split, stm, text, time, transformers, utf8String, X11, xdgBasedir
+, xmonad, xmonadContrib
 }:
 
 cabal.mkDerivation (self: {
   pname = "taffybar";
-  version = "0.3.0";
-  sha256 = "02vpfbwfprca997ykk746ih7id0ls3i5pnb33gj3nrfgc59fkz7v";
+  version = "0.4.0";
+  sha256 = "1l6zl5mlpkdsvs3id6ivh4b74p65n6jr17k23y2cdwj2fr9prvr8";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    cairo dbus dyre filepath gtk gtkTraymanager HStringTemplate HTTP
-    mtl network parsec split stm text time transformers utf8String X11
-    xdgBasedir xmonad xmonadContrib
+    cairo dbus dyre enclosedExceptions filepath gtk gtkTraymanager
+    HStringTemplate HTTP mtl network parsec safe split stm text time
+    transformers utf8String X11 xdgBasedir xmonad xmonadContrib
   ];
   pkgconfigDepends = [ gtk ];
   meta = {

From e15036dbd00f09e07aa0d57786d902545a1c7087 Mon Sep 17 00:00:00 2001
From: Emil Rangden <emil.rangden@chas.se>
Date: Mon, 18 Aug 2014 20:06:28 +0200
Subject: [PATCH 0193/1453] haskell fix - fay

Remove explicit old aeson version and update to latest
---
 pkgs/development/libraries/haskell/fay/default.nix | 6 +++---
 pkgs/top-level/haskell-packages.nix                | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/fay/default.nix b/pkgs/development/libraries/haskell/fay/default.nix
index 8c09bf444ee4..edbf19bda62e 100644
--- a/pkgs/development/libraries/haskell/fay/default.nix
+++ b/pkgs/development/libraries/haskell/fay/default.nix
@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "fay";
-  version = "0.20.1.1";
-  sha256 = "0jcvq880xnkm8aqr69ihwf7by55fc1bbd8wk8152zqgkih74qzc4";
+  version = "0.20.1.2";
+  sha256 = "1ssii9wkml8jn8kcdq8h6sxrq4gap4asyglakvif2zawl3sqrdji";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -21,7 +21,7 @@ cabal.mkDerivation (self: {
     utf8String vector
   ];
   meta = {
-    homepage = "http://fay-lang.org/";
+    homepage = "https://github.com/faylang/fay/wiki";
     description = "A compiler for Fay, a Haskell subset that compiles to JavaScript";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 283f0fa0304e..a27d1acded39 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -779,7 +779,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   Extra = callPackage ../development/libraries/haskell/Extra {};
 
-  fay = callPackage ../development/libraries/haskell/fay { aeson = self.aeson_0_7_0_4; };
+  fay = callPackage ../development/libraries/haskell/fay {};
 
   fayBase = callPackage ../development/libraries/haskell/fay-base {};
 

From 817fc96ae22ce26d5ec5b150880ebdfb798b4af1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 19 Aug 2014 15:22:06 +0200
Subject: [PATCH 0194/1453] haskell-xlsx: re-generate with cabal2nix

---
 pkgs/development/libraries/haskell/xlsx/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/xlsx/default.nix b/pkgs/development/libraries/haskell/xlsx/default.nix
index 98d729efb2fe..779814c05dd8 100644
--- a/pkgs/development/libraries/haskell/xlsx/default.nix
+++ b/pkgs/development/libraries/haskell/xlsx/default.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, conduit, dataDefault, digest, HUnit, lens, smallcheck
 , tasty, tastyHunit, tastySmallcheck, text, time, transformers
 , utf8String, xmlConduit, xmlTypes, zipArchive, zlib
@@ -21,6 +23,6 @@ cabal.mkDerivation (self: {
     description = "Simple and incomplete Excel file parser/writer";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.ocharles ];
+    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
   };
 })

From 56d15045fa80a33ad05387280fe22c6573ea1e9e Mon Sep 17 00:00:00 2001
From: Ryan Newton <rrnewton@gmail.com>
Date: Fri, 15 Aug 2014 00:33:09 -0400
Subject: [PATCH 0195/1453] Bump ghc-head to latest.

---
 pkgs/development/compilers/ghc/head.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 312f79e97a5a..a5b4aeaff393 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ghc, perl, gmp, ncurses, happy, alex }:
 
 stdenv.mkDerivation rec {
-  version = "7.9.20140608";
+  version = "7.9.20140814";
   name = "ghc-${version}";
 
   src = fetchurl {
-    url = "http://deb.haskell.org/dailies/2014-06-08/ghc_${version}.orig.tar.bz2";
-    sha256 = "0x3hgh4zfns2m6bbq9xwwlafav0a29azl0xh8549za256clz97w1";
+    url = "http://deb.haskell.org/dailies/2014-08-14/ghc_${version}.orig.tar.bz2";
+    sha256 = "05vmlbzbfv72z570xmlh8n003z9xc4l5hixjqvczyyyisdvmyaa3";
   };
 
   buildInputs = [ ghc perl gmp ncurses happy alex ];

From fd1ec088d27bc8ab76e0b4b1288ae0aad52b897d Mon Sep 17 00:00:00 2001
From: Carlo Nucera <meditans@gmail.com>
Date: Tue, 19 Aug 2014 13:47:14 +0200
Subject: [PATCH 0196/1453] Added monadSupply (monad-supply) to haskellPackages

---
 .../libraries/haskell/monad-supply/default.nix    | 15 +++++++++++++++
 pkgs/top-level/haskell-packages.nix               |  2 ++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/monad-supply/default.nix

diff --git a/pkgs/development/libraries/haskell/monad-supply/default.nix b/pkgs/development/libraries/haskell/monad-supply/default.nix
new file mode 100644
index 000000000000..dc6c90bcd977
--- /dev/null
+++ b/pkgs/development/libraries/haskell/monad-supply/default.nix
@@ -0,0 +1,15 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, mtl }:
+
+cabal.mkDerivation (self: {
+  pname = "monad-supply";
+  version = "0.4";
+  sha256 = "0qvv9j55hw1lrfqnz1aric4mvg62c2vqaf5wirn69gvh74slqyj8";
+  buildDepends = [ mtl ];
+  meta = {
+    description = "Stateful supply monad";
+    license = "unknown";
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index a27d1acded39..b6885a1a0480 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1611,6 +1611,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   monadStm = callPackage ../development/libraries/haskell/monad-stm {};
 
+  monadSupply = callPackage ../development/libraries/haskell/monad-supply {};
+
   monadsTf = callPackage ../development/libraries/haskell/monads-tf {};
 
   monadUnify = callPackage ../development/libraries/haskell/monad-unify {};

From 08bb0c8a8177dafc5c2a39e7c53d546728b2ed09 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 19 Aug 2014 15:33:44 +0200
Subject: [PATCH 0197/1453] haskell-happy-meta: update to version 0.2.0.7

---
 pkgs/development/tools/haskell/happy-meta/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/haskell/happy-meta/default.nix b/pkgs/development/tools/haskell/happy-meta/default.nix
index e490763ffe2e..8241bf121033 100644
--- a/pkgs/development/tools/haskell/happy-meta/default.nix
+++ b/pkgs/development/tools/haskell/happy-meta/default.nix
@@ -1,12 +1,13 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, haskellSrcMeta, mtl }:
+{ cabal, happy, haskellSrcMeta, mtl }:
 
 cabal.mkDerivation (self: {
   pname = "happy-meta";
-  version = "0.2.0.6";
-  sha256 = "1q6sd5zaxzx85z3zcy99b6qrf8fj93ryy33y1g6rdzfw07dwf4lh";
+  version = "0.2.0.7";
+  sha256 = "12599233lh0ffmvlim0gs5jzg8lly1g11i1cg44lb37bz3l7psh9";
   buildDepends = [ haskellSrcMeta mtl ];
+  buildTools = [ happy ];
   meta = {
     description = "Quasi-quoter for Happy parsers";
     license = self.stdenv.lib.licenses.bsd3;

From d788370727fa32d3c21ccd04a27755942122639b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 19 Aug 2014 15:33:50 +0200
Subject: [PATCH 0198/1453] haskell-DAV: update to version 1.0.1

---
 .../libraries/haskell/DAV/default.nix          | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/haskell/DAV/default.nix b/pkgs/development/libraries/haskell/DAV/default.nix
index b8f6fbf3401d..30289ed9d086 100644
--- a/pkgs/development/libraries/haskell/DAV/default.nix
+++ b/pkgs/development/libraries/haskell/DAV/default.nix
@@ -1,21 +1,21 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, caseInsensitive, either, errors, httpClient, httpClientTls
-, httpTypes, lens, liftedBase, monadControl, mtl, network
-, optparseApplicative, transformers, transformersBase, xmlConduit
-, xmlHamlet
+{ cabal, caseInsensitive, dataDefault, either, errors, exceptions
+, httpClient, httpClientTls, httpTypes, lens, mtl, network
+, optparseApplicative, transformers, transformersBase, utf8String
+, xmlConduit, xmlHamlet
 }:
 
 cabal.mkDerivation (self: {
   pname = "DAV";
-  version = "0.8";
-  sha256 = "0khjid5jaaf4c3xn9cbph8ay4ibqr7pg3b3w7d0kfvci90ksc08r";
+  version = "1.0.1";
+  sha256 = "0j8z7hi5dykimv6da584zgyn8xlvfhg1k9sbhj5ay7ncxszb134k";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    caseInsensitive either errors httpClient httpClientTls httpTypes
-    lens liftedBase monadControl mtl network optparseApplicative
-    transformers transformersBase xmlConduit xmlHamlet
+    caseInsensitive dataDefault either errors exceptions httpClient
+    httpClientTls httpTypes lens mtl network optparseApplicative
+    transformers transformersBase utf8String xmlConduit xmlHamlet
   ];
   jailbreak = true;
   meta = {

From 899cdd9de188ad492bf27c239adfea27f9348cd1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 19 Aug 2014 15:33:53 +0200
Subject: [PATCH 0199/1453] haskell-amqp: update to version 0.10.1

---
 pkgs/development/libraries/haskell/amqp/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/amqp/default.nix b/pkgs/development/libraries/haskell/amqp/default.nix
index 3b9883dc04a3..d91d4e1bdb8a 100644
--- a/pkgs/development/libraries/haskell/amqp/default.nix
+++ b/pkgs/development/libraries/haskell/amqp/default.nix
@@ -1,19 +1,19 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, binary, clock, connection, dataBinaryIeee754, hspec
-, hspecExpectations, monadControl, network, split, text, vector
-, xml
+, hspecExpectations, monadControl, network, networkUri, split, text
+, vector, xml
 }:
 
 cabal.mkDerivation (self: {
   pname = "amqp";
-  version = "0.10";
-  sha256 = "0606grl2149phzqf0aww8264f9xaw4486ps5jw47ar57mcnxsml6";
+  version = "0.10.1";
+  sha256 = "1a2d17h1zhd2yv1zhd0vvr4g1v6nr188gwv12qwljs1v9y4jkbmc";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     binary clock connection dataBinaryIeee754 monadControl network
-    split text vector xml
+    networkUri split text vector xml
   ];
   testDepends = [
     binary clock connection dataBinaryIeee754 hspec hspecExpectations

From 8f68ec2bf2b83b3bea725961c383135171ee2fde Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 19 Aug 2014 15:33:56 +0200
Subject: [PATCH 0200/1453] haskell-authenticate: update to version 1.3.2.10

---
 .../libraries/haskell/authenticate/default.nix            | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/authenticate/default.nix b/pkgs/development/libraries/haskell/authenticate/default.nix
index 3c22e1b9d698..af966ebe7bfd 100644
--- a/pkgs/development/libraries/haskell/authenticate/default.nix
+++ b/pkgs/development/libraries/haskell/authenticate/default.nix
@@ -1,18 +1,18 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, aeson, attoparsec, blazeBuilder, caseInsensitive, conduit
-, httpConduit, httpTypes, monadControl, network, resourcet
+, httpConduit, httpTypes, monadControl, networkUri, resourcet
 , tagstreamConduit, text, transformers, unorderedContainers
 , xmlConduit
 }:
 
 cabal.mkDerivation (self: {
   pname = "authenticate";
-  version = "1.3.2.9";
-  sha256 = "09vg7m2sh3566q7jgi85djc5jrq2y06swlbj1fbym6yf4cmk8gdr";
+  version = "1.3.2.10";
+  sha256 = "1dy38k5jpms3xrkw1zh7vjmx06yr5iibgh50m5i2wky2wmryqkf4";
   buildDepends = [
     aeson attoparsec blazeBuilder caseInsensitive conduit httpConduit
-    httpTypes monadControl network resourcet tagstreamConduit text
+    httpTypes monadControl networkUri resourcet tagstreamConduit text
     transformers unorderedContainers xmlConduit
   ];
   meta = {

From 66eeadf8b4dbf569effd1958e828a3a13c8480cc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 19 Aug 2014 15:33:58 +0200
Subject: [PATCH 0201/1453] haskell-aws: update to version 0.10.2

---
 .../libraries/haskell/aws/default.nix         | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/haskell/aws/default.nix b/pkgs/development/libraries/haskell/aws/default.nix
index 139e9e2b27e6..8ba55efce051 100644
--- a/pkgs/development/libraries/haskell/aws/default.nix
+++ b/pkgs/development/libraries/haskell/aws/default.nix
@@ -1,24 +1,30 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, aeson, base16Bytestring, base64Bytestring, blazeBuilder
-, byteable, caseInsensitive, cereal, conduit, conduitExtra
-, cryptohash, dataDefault, filepath, httpConduit, httpTypes
-, liftedBase, monadControl, mtl, network, resourcet, text, time
-, transformers, unorderedContainers, utf8String, vector, xmlConduit
+{ cabal, aeson, attoparsec, base16Bytestring, base64Bytestring
+, blazeBuilder, byteable, caseInsensitive, cereal, conduit
+, conduitExtra, cryptohash, dataDefault, errors, filepath
+, httpConduit, httpTypes, liftedBase, monadControl, mtl, network
+, QuickCheck, quickcheckInstances, resourcet, safe, scientific
+, tagged, tasty, tastyQuickcheck, text, time, transformers
+, unorderedContainers, utf8String, vector, xmlConduit
 }:
 
 cabal.mkDerivation (self: {
   pname = "aws";
-  version = "0.9.3";
-  sha256 = "11g8i6kfq7n1v5nvj8bkhrgsiyzfz0vwk4lh8sljnfd5pyjawx7h";
+  version = "0.10.2";
+  sha256 = "15yr06z54wxnl37a94515ajlxrb7z9kii5dd0ssan32izh4nfrl2";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    aeson base16Bytestring base64Bytestring blazeBuilder byteable
-    caseInsensitive cereal conduit conduitExtra cryptohash dataDefault
-    filepath httpConduit httpTypes liftedBase monadControl mtl network
-    resourcet text time transformers unorderedContainers utf8String
-    vector xmlConduit
+    aeson attoparsec base16Bytestring base64Bytestring blazeBuilder
+    byteable caseInsensitive cereal conduit conduitExtra cryptohash
+    dataDefault filepath httpConduit httpTypes liftedBase monadControl
+    mtl network resourcet safe scientific tagged text time transformers
+    unorderedContainers utf8String vector xmlConduit
+  ];
+  testDepends = [
+    aeson errors mtl QuickCheck quickcheckInstances tagged tasty
+    tastyQuickcheck text transformers
   ];
   meta = {
     homepage = "http://github.com/aristidb/aws";

From e22176e3314bfe0b691c34aae6bd6eef13b50604 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 19 Aug 2014 15:34:01 +0200
Subject: [PATCH 0202/1453] haskell-clientsession: update to version 0.9.0.5

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

diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix
index 30875e90062c..cee91c51be0c 100644
--- a/pkgs/development/libraries/haskell/clientsession/default.nix
+++ b/pkgs/development/libraries/haskell/clientsession/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "clientsession";
-  version = "0.9.0.3";
-  sha256 = "0w7mkyrd8gx5d6mcqprn7ll05414vm2j5fbyi6pj9cxd2m4qc9b1";
+  version = "0.9.0.5";
+  sha256 = "0l11wpxr3cgd8q708ay7957mdzq7nhm7c6z3p9iwl0lp3pkcl810";
   buildDepends = [
     base64Bytestring cereal cipherAes cprngAes cryptoApi cryptoRandom
     entropy skein tagged

From fc168cd69e1133e0fade31d68eff87f77820c586 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 19 Aug 2014 15:34:04 +0200
Subject: [PATCH 0203/1453] haskell-conduit-extra: update to version 1.1.3.2

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

diff --git a/pkgs/development/libraries/haskell/conduit-extra/default.nix b/pkgs/development/libraries/haskell/conduit-extra/default.nix
index 35fd7c42d0eb..1cb2b0efe6cf 100644
--- a/pkgs/development/libraries/haskell/conduit-extra/default.nix
+++ b/pkgs/development/libraries/haskell/conduit-extra/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "conduit-extra";
-  version = "1.1.3.1";
-  sha256 = "1glw734nm5gra5zw31lg3ia74dp4b2ik931jmk52b8f62ysg2vx0";
+  version = "1.1.3.2";
+  sha256 = "15flywjw5ha8cgn4yznwlnx31ls4y82gfmvbniby0d51y4x8dmgq";
   buildDepends = [
     attoparsec blazeBuilder conduit filepath monadControl network
     primitive resourcet stm streamingCommons text transformers

From 87004f8a155674a2b2260424086689bb102771fc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 19 Aug 2014 15:34:06 +0200
Subject: [PATCH 0204/1453] haskell-contravariant: update to version 1.2

---
 .../libraries/haskell/contravariant/default.nix          | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/contravariant/default.nix b/pkgs/development/libraries/haskell/contravariant/default.nix
index 91a586e56b22..73a874c0a157 100644
--- a/pkgs/development/libraries/haskell/contravariant/default.nix
+++ b/pkgs/development/libraries/haskell/contravariant/default.nix
@@ -1,13 +1,14 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, semigroups, tagged, transformers, transformersCompat }:
+{ cabal, semigroups, tagged, transformers, transformersCompat, void
+}:
 
 cabal.mkDerivation (self: {
   pname = "contravariant";
-  version = "1.1";
-  sha256 = "0j2q6gl9f8jgknjqr2qzzxkb4fl7m9n5zjavnzan2arlv4viznhh";
+  version = "1.2";
+  sha256 = "0gzk9b3xig48jvqz9983a7kziyb2n9z329kn6cqw1k0p8w2h3l8f";
   buildDepends = [
-    semigroups tagged transformers transformersCompat
+    semigroups tagged transformers transformersCompat void
   ];
   meta = {
     homepage = "http://github.com/ekmett/contravariant/";

From ce3596fc07aedd00ebf21fdfd98e3697edafc2f1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 19 Aug 2014 15:34:09 +0200
Subject: [PATCH 0205/1453] haskell-ekg: update to version 0.4.0.2

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

diff --git a/pkgs/development/libraries/haskell/ekg/default.nix b/pkgs/development/libraries/haskell/ekg/default.nix
index 4b639df3b7d4..07c522b98188 100644
--- a/pkgs/development/libraries/haskell/ekg/default.nix
+++ b/pkgs/development/libraries/haskell/ekg/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "ekg";
-  version = "0.4.0.1";
-  sha256 = "09pjsd9jr91whdhv36fkb36ivvvcr415g90a798i86vl8mklgnyx";
+  version = "0.4.0.2";
+  sha256 = "0svw43dnlg93nyaxiq310sp5csbf0w68ipbhqkxm052yvc9k6fv9";
   buildDepends = [
     aeson ekgCore filepath network snapCore snapServer text time
     transformers unorderedContainers

From 9afddcaf1abd87d81c67364018f6b0dec37387b8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 19 Aug 2014 15:34:12 +0200
Subject: [PATCH 0206/1453] haskell-github: update to version 0.10.0

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

diff --git a/pkgs/development/libraries/haskell/github/default.nix b/pkgs/development/libraries/haskell/github/default.nix
index 31e4ea86ddf9..b35055b77198 100644
--- a/pkgs/development/libraries/haskell/github/default.nix
+++ b/pkgs/development/libraries/haskell/github/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "github";
-  version = "0.9";
-  sha256 = "19ff9srvm03n9iz7mf6wadydfw0xs0j9ayvr86dmmp9blmjkqc0d";
+  version = "0.10.0";
+  sha256 = "1llwzkhyw5wazczpiv3w8dq4l7j3q49ii64yh7cxwakkp2h5yiwb";
   buildDepends = [
     aeson attoparsec caseInsensitive conduit dataDefault failure
     hashable HTTP httpConduit httpTypes network text time

From e63c4eee987ac9333acaf1b206e0fa017d56e239 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 19 Aug 2014 15:34:14 +0200
Subject: [PATCH 0207/1453] haskell-gtk-traymanager: update to version 0.1.5

---
 .../development/libraries/haskell/gtk-traymanager/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/gtk-traymanager/default.nix b/pkgs/development/libraries/haskell/gtk-traymanager/default.nix
index fe55c93c52d4..53613255c324 100644
--- a/pkgs/development/libraries/haskell/gtk-traymanager/default.nix
+++ b/pkgs/development/libraries/haskell/gtk-traymanager/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "gtk-traymanager";
-  version = "0.1.4";
-  sha256 = "0dprxds49ljn0n94ca423gvh5ks2jmb4qx3lkqwpxqbcp0j8il7p";
+  version = "0.1.5";
+  sha256 = "0hzl9pa5vx04vslb2visx35wwjagzzi1j5gyk5acy8pym8ly50hm";
   buildDepends = [ glib gtk ];
   pkgconfigDepends = [ gtk x11 ];
   jailbreak = true;

From cc6dbaa402b5702283ba4aa833b1651b13573309 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 19 Aug 2014 15:34:17 +0200
Subject: [PATCH 0208/1453] haskell-hcltest: update to version 0.3.4

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

diff --git a/pkgs/development/libraries/haskell/hcltest/default.nix b/pkgs/development/libraries/haskell/hcltest/default.nix
index bc2c01268bbe..af598965498e 100644
--- a/pkgs/development/libraries/haskell/hcltest/default.nix
+++ b/pkgs/development/libraries/haskell/hcltest/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hcltest";
-  version = "0.3.3";
-  sha256 = "191fpvcr5hg902akcvq9wcsy801drqwrl7xqk0bqy003ffrv4228";
+  version = "0.3.4";
+  sha256 = "0p8skabp6z4i5xr22qxk1sij2ayla2iqylvlzxfxa8yw1fxs8wsq";
   buildDepends = [
     dlist either filepath free lens mmorph monadControl mtl
     optparseApplicative randomShuffle split stm tagged tasty temporary

From 9be0a34a6fad42a7ac9b723ff1954b5d5df3f8f4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 19 Aug 2014 15:34:19 +0200
Subject: [PATCH 0209/1453] haskell-pandoc-citeproc: update to version 0.4.0.1

---
 .../libraries/haskell/pandoc-citeproc/default.nix      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix b/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix
index 65c21868144f..e567bd82059b 100644
--- a/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix
+++ b/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix
@@ -2,19 +2,19 @@
 
 { cabal, aeson, aesonPretty, attoparsec, filepath, hexpat
 , hsBibutils, mtl, pandoc, pandocTypes, parsec, rfc5051, split, syb
-, tagsoup, temporary, texmath, text, time, vector, yaml
+, tagsoup, temporary, text, time, vector, yaml
 }:
 
 cabal.mkDerivation (self: {
   pname = "pandoc-citeproc";
-  version = "0.4";
-  sha256 = "11syrig4qbc88ddjbb5qc4c9yf5rzq0gyjz42dis8j4gf5hyg4f0";
+  version = "0.4.0.1";
+  sha256 = "1z21mdxa2hrwqdclriyn3s1qqij3ccbkg7hb0acxrk3pzgidcinx";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     aeson aesonPretty attoparsec filepath hexpat hsBibutils mtl pandoc
-    pandocTypes parsec rfc5051 split syb tagsoup temporary texmath text
-    time vector yaml
+    pandocTypes parsec rfc5051 split syb tagsoup temporary text time
+    vector yaml
   ];
   testDepends = [
     aeson filepath pandoc pandocTypes temporary text yaml

From 80d5fb1d18f3328673526c7dee5de4ebf053be33 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 19 Aug 2014 15:34:22 +0200
Subject: [PATCH 0210/1453] haskell-pcre-light: update to version 0.4.0.3

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

diff --git a/pkgs/development/libraries/haskell/pcre-light/default.nix b/pkgs/development/libraries/haskell/pcre-light/default.nix
index e7c92e60fc5a..49e0d5fffadc 100644
--- a/pkgs/development/libraries/haskell/pcre-light/default.nix
+++ b/pkgs/development/libraries/haskell/pcre-light/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pcre-light";
-  version = "0.4.0.2";
-  sha256 = "0baq46d3k376mhh98gkfi6phndk8ba25c2kll9zms1y07mn3bnnx";
+  version = "0.4.0.3";
+  sha256 = "0l1df2sk5qwf424bvb8mbdkr2xjg43fi92n5r22yd7vm1zz0jqvf";
   extraLibraries = [ pcre ];
   meta = {
     homepage = "https://github.com/Daniel-Diaz/pcre-light";

From f700bcaf0619cf83739ecb1b7feb05e1e02430d1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 19 Aug 2014 15:34:24 +0200
Subject: [PATCH 0211/1453] haskell-cabal-bounds: update to version 0.8.4

---
 pkgs/development/tools/haskell/cabal-bounds/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/haskell/cabal-bounds/default.nix b/pkgs/development/tools/haskell/cabal-bounds/default.nix
index 3c46cb85a4dc..213ba6f9d132 100644
--- a/pkgs/development/tools/haskell/cabal-bounds/default.nix
+++ b/pkgs/development/tools/haskell/cabal-bounds/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cabal-bounds";
-  version = "0.8.3";
-  sha256 = "0nzb2knp1cazq54arfddy6k53v8spq1mq0vp5n4c3zn6m2x68j6z";
+  version = "0.8.4";
+  sha256 = "00vj6ca9liqlqg69d4ziacsxz6x9365sbyc1ag6g18bhibyinsh2";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From afd1ed90c9abbffd89cdafcf507d7cabce1aefe2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 19 Aug 2014 20:43:22 +0200
Subject: [PATCH 0212/1453] haskell-uri-encode: update to version 1.5.0.3

---
 pkgs/development/libraries/haskell/uri-encode/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/uri-encode/default.nix b/pkgs/development/libraries/haskell/uri-encode/default.nix
index 3a2d786cd8f0..7a86bcd2f65c 100644
--- a/pkgs/development/libraries/haskell/uri-encode/default.nix
+++ b/pkgs/development/libraries/haskell/uri-encode/default.nix
@@ -1,14 +1,14 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, network, text, utf8String }:
+{ cabal, networkUri, text, utf8String }:
 
 cabal.mkDerivation (self: {
   pname = "uri-encode";
-  version = "1.5.0.2";
-  sha256 = "1lsj9y3sw9wlpsw7j20frvv9a165mcqx7x7vrp2gamka1120pkym";
+  version = "1.5.0.3";
+  sha256 = "115wnc7x7gx57qza5az4c1wy0n2f40634529jk0vpxw6bb9b1mzn";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ network text utf8String ];
+  buildDepends = [ networkUri text utf8String ];
   meta = {
     description = "Unicode aware uri-encoding";
     license = "unknown";

From 3fad02dab8be74ad61141f74c330ed7715d7d3f8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 19 Aug 2014 20:43:26 +0200
Subject: [PATCH 0213/1453] haskell-git-annex: update to version 5.20140817

---
 .../git-and-tools/git-annex/default.nix       | 55 ++++++++-----------
 1 file changed, 24 insertions(+), 31 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
index 8fe78d6f825d..62132271ec99 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
@@ -3,45 +3,38 @@
 { cabal, aeson, async, blazeBuilder, bloomfilter, bup, byteable
 , caseInsensitive, clientsession, cryptoApi, cryptohash, curl
 , dataDefault, dataenc, DAV, dbus, dlist, dns, editDistance
-, exceptions, extensibleExceptions, fdoNotify, feed, filepath, git
-, gnupg1, gnutls, hamlet, hinotify, hS3, hslogger, HTTP, httpClient
-, httpConduit, httpTypes, IfElse, json, liftedBase, lsof, MissingH
-, monadControl, mtl, network, networkInfo, networkMulticast
-, networkProtocolXmpp, openssh, optparseApplicative, pathPieces
-, perl, QuickCheck, random, regexTdfa, rsync, SafeSemaphore
-, securemem, SHA, shakespeare, stm, tasty, tastyHunit
-, tastyQuickcheck, tastyRerun, text, time, transformers, unixCompat
-, utf8String, uuid, wai, waiExtra, warp, warpTls, which, xmlTypes
-, yesod, yesodCore, yesodDefault, yesodForm, yesodStatic
-, fsnotify
+, exceptions, fdoNotify, feed, filepath, git, gnupg1, gnutls
+, hamlet, hinotify, hS3, hslogger, httpClient, httpConduit
+, httpTypes, IfElse, json, lsof, MissingH, monadControl, mtl
+, network, networkInfo, networkMulticast, networkProtocolXmpp
+, openssh, optparseApplicative, pathPieces, perl, QuickCheck
+, random, regexTdfa, rsync, SafeSemaphore, securemem, SHA
+, shakespeare, stm, tasty, tastyHunit, tastyQuickcheck, tastyRerun
+, text, time, transformers, unixCompat, utf8String, uuid, wai
+, waiExtra, warp, warpTls, which, xmlTypes, yesod, yesodCore
+, yesodDefault, yesodForm, yesodStatic
 }:
 
 cabal.mkDerivation (self: {
   pname = "git-annex";
-  version = "5.20140717";
-  sha256 = "199gqp85f6xnyg3svs23n3r6q4pflvz4zy5y376klay9mzzp0rbl";
+  version = "5.20140817";
+  sha256 = "0cly19rd250qiikzszgad2r5xz570kr00vcb8ij6icbm53pw3hxc";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
     aeson async blazeBuilder bloomfilter byteable caseInsensitive
-    clientsession cryptoApi cryptohash dataDefault dataenc DAV
-    dlist dns editDistance exceptions extensibleExceptions
-    feed filepath gnutls hamlet hS3 hslogger HTTP httpClient
-    httpConduit httpTypes IfElse json liftedBase MissingH monadControl
-    mtl network networkInfo networkMulticast networkProtocolXmpp
-    optparseApplicative pathPieces QuickCheck random regexTdfa
-    SafeSemaphore securemem SHA shakespeare stm tasty tastyHunit
-    tastyQuickcheck tastyRerun text time transformers unixCompat
-    utf8String uuid wai waiExtra warp warpTls xmlTypes yesod yesodCore
-    yesodDefault yesodForm yesodStatic
-  ] ++ (if self.stdenv.isDarwin then [
-    fsnotify
-  ] else [
-    dbus fdoNotify hinotify
-  ]);
+    clientsession cryptoApi cryptohash dataDefault dataenc DAV dbus
+    dlist dns editDistance exceptions fdoNotify feed filepath gnutls
+    hamlet hinotify hS3 hslogger httpClient httpConduit httpTypes
+    IfElse json MissingH monadControl mtl network networkInfo
+    networkMulticast networkProtocolXmpp optparseApplicative pathPieces
+    QuickCheck random regexTdfa SafeSemaphore securemem SHA shakespeare
+    stm tasty tastyHunit tastyQuickcheck tastyRerun text time
+    transformers unixCompat utf8String uuid wai waiExtra warp warpTls
+    xmlTypes yesod yesodCore yesodDefault yesodForm yesodStatic
+  ];
   buildTools = [ bup curl git gnupg1 lsof openssh perl rsync which ];
-  configureFlags = "-fAssistant
-                    -fProduction";
+  configureFlags = "-fAssistant -fProduction";
   preConfigure = ''
     export HOME="$NIX_BUILD_TOP/tmp"
     mkdir "$HOME"
@@ -57,6 +50,6 @@ cabal.mkDerivation (self: {
     description = "manage files with git, without checking their contents into git";
     license = self.stdenv.lib.licenses.gpl3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.simons ];
+    maintainers = with self.stdenv.lib.maintainers; [ simons ];
   };
 })

From 42c7a11d4be7d63e8c533355db086cc45a1dca8b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 19 Aug 2014 20:43:28 +0200
Subject: [PATCH 0214/1453] haskell-pandoc: update to version 1.13.0.1

---
 pkgs/development/libraries/haskell/pandoc/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix
index 472bc58c1ae5..1b2571563c38 100644
--- a/pkgs/development/libraries/haskell/pandoc/default.nix
+++ b/pkgs/development/libraries/haskell/pandoc/default.nix
@@ -7,14 +7,14 @@
 , httpTypes, HUnit, JuicyPixels, mtl, network, pandocTypes, parsec
 , QuickCheck, random, scientific, SHA, syb, tagsoup, temporary
 , testFramework, testFrameworkHunit, testFrameworkQuickcheck2
-, texmath, text, time, unorderedContainers, vector, xml, yaml
-, zipArchive, zlib
+, texmath, text, time, unorderedContainers, vector, wai, waiExtra
+, xml, yaml, zipArchive, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "pandoc";
-  version = "1.13";
-  sha256 = "09zmh7yvasxybcr4rnnqf9bx8njhi8hwgzsik6db691j5j5yxg6l";
+  version = "1.13.0.1";
+  sha256 = "0pjyxsr93gv0vrdxlr5i0c56mg6rf21qxf1141cb8l0hl0b416d6";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -23,7 +23,7 @@ cabal.mkDerivation (self: {
     haddockLibrary happy highlightingKate hslua HTTP httpClient
     httpClientTls httpTypes JuicyPixels mtl network pandocTypes parsec
     random scientific SHA syb tagsoup temporary texmath text time
-    unorderedContainers vector xml yaml zipArchive zlib
+    unorderedContainers vector wai waiExtra xml yaml zipArchive zlib
   ];
   testDepends = [
     ansiTerminal Diff executablePath filepath highlightingKate HUnit

From 229eb441a3924309eb67dac083d8f975a11a6e14 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 19 Aug 2014 21:17:41 +0200
Subject: [PATCH 0215/1453] haskell-aws: disable test suite to fix the build

https://github.com/aristidb/aws/issues/125
---
 pkgs/development/libraries/haskell/aws/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/aws/default.nix b/pkgs/development/libraries/haskell/aws/default.nix
index 8ba55efce051..d6e8a5fb5ad6 100644
--- a/pkgs/development/libraries/haskell/aws/default.nix
+++ b/pkgs/development/libraries/haskell/aws/default.nix
@@ -26,6 +26,7 @@ cabal.mkDerivation (self: {
     aeson errors mtl QuickCheck quickcheckInstances tagged tasty
     tastyQuickcheck text transformers
   ];
+  doCheck = false;
   meta = {
     homepage = "http://github.com/aristidb/aws";
     description = "Amazon Web Services (AWS) for Haskell";

From 1fbf590713c2dafc6bf0d4cf0099c4d79220d1a8 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Wed, 20 Aug 2014 01:17:16 +0200
Subject: [PATCH 0216/1453] Fix: hdevtools: correct sha256 hash of patch

---
 pkgs/development/tools/haskell/hdevtools/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/haskell/hdevtools/default.nix b/pkgs/development/tools/haskell/hdevtools/default.nix
index 15c9127e38a2..92d024b43a5d 100644
--- a/pkgs/development/tools/haskell/hdevtools/default.nix
+++ b/pkgs/development/tools/haskell/hdevtools/default.nix
@@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "1a218m817q35f52fv6mn28sfv136i6fm2mzgdidpm24pc0585gl7";
   isLibrary = false;
   isExecutable = true;
-  patches = [ (fetchpatch { url = "https://github.com/ts468/hdevtools/pull/2.patch"; sha256 = "0sr62fr1f3cxx86vgd6a56bcjhr02if7n1scj6nbndpfsf9kzadd"; }) ];
+  patches = [ (fetchpatch { url = "https://github.com/ts468/hdevtools/pull/2.diff"; sha256 = "0pwgxm4mh29qm79kg0gc6a90lzjbmh8rf4pc3hx2zqgb5f3l2abs"; }) ];
   buildDepends = [ cmdargs ghcPaths network syb time ];
   meta = {
     homepage = "https://github.com/bitc/hdevtools/";

From 0741150b97961b9ff34db9e56127acb5a2c459a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=BCdiger=20Sonderfeld?= <ruediger@c-plusplus.de>
Date: Wed, 20 Aug 2014 01:53:46 +0200
Subject: [PATCH 0217/1453] colord: Update to 1.1.7 and copy bash completions.

---
 pkgs/tools/misc/colord/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix
index a744adbe05c1..71ec1276c7c9 100644
--- a/pkgs/tools/misc/colord/default.nix
+++ b/pkgs/tools/misc/colord/default.nix
@@ -3,11 +3,11 @@
 , automake, autoconf, libtool, gtk_doc, which, gobjectIntrospection }:
 
 stdenv.mkDerivation rec {
-  name = "colord-1.1.5";
+  name = "colord-1.1.7";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/colord/releases/${name}.tar.xz";
-    sha256 = "1638pfv16bdrdxxprk6dp8d706571a8i3nlfv3m0ldx26xpy8z5j";
+    sha256 = "295395526ee0be30917ae9c352e68bfeb20c7fc266a605725bef969f20547f44";
   };
 
   enableParallelBuilding = true;
@@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     rm -fr $out/var/lib/colord
+    mkdir -p $out/etc/bash_completion.d
+    cp -v data/colormgr $out/etc/bash_completion.d
   '';
 
   meta = {

From fd5084bc8fdf3d680b1039101aa4a447e1eee1c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=BCdiger=20Sonderfeld?= <ruediger@c-plusplus.de>
Date: Wed, 20 Aug 2014 01:54:45 +0200
Subject: [PATCH 0218/1453] Add colord-kde.

A KDE front-end for colord.
---
 pkgs/tools/misc/colord-kde/default.nix | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/tools/misc/colord-kde/default.nix

diff --git a/pkgs/tools/misc/colord-kde/default.nix b/pkgs/tools/misc/colord-kde/default.nix
new file mode 100644
index 000000000000..55260b269c6d
--- /dev/null
+++ b/pkgs/tools/misc/colord-kde/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, cmake, colord, libX11, libXrandr, lcms2, pkgconfig, kdelibs}:
+
+stdenv.mkDerivation {
+  name = "colord-kde-0.3.0";
+
+  src = fetchurl {
+    url = http://download.kde.org/stable/colord-kde/0.3.0/src/colord-kde-0.3.0.tar.bz2;
+    sha256 = "ab3cdb7c8c98aa2ee8de32a92f87770e1fbd58eade6471f3f24d932b50b4cf09";
+  };
+
+  buildInputs = [ cmake colord libX11 libXrandr lcms2 pkgconfig kdelibs ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "A colord front-end for KDE";
+    license = stdenv.lib.licenses.gpl2Plus;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 200881c916a6..e3cbdfcd23b8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10620,6 +10620,8 @@ let
 
       calligra = callPackage ../applications/office/calligra { };
 
+      colord-kde = callPackage ../tools/misc/colord-kde { };
+
       digikam = if builtins.compareVersions "4.9" kde4.release == 1 then
           callPackage ../applications/graphics/digikam/2.nix { }
         else

From 2015aecd44919666377af1f15a36b402624e7f76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 20 Aug 2014 02:22:29 +0200
Subject: [PATCH 0219/1453] Revert "Copy all so files over from nVidia blob"

This reverts commit 816d971aeaff96b6952a1d3a6aff3502c6946dda.
See discussion on https://github.com/Fuuzetsu/nixpkgs/commit/816d971ae
---
 pkgs/os-specific/linux/nvidia-x11/builder.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh
index 8aa538f20689..6acab2424c8d 100755
--- a/pkgs/os-specific/linux/nvidia-x11/builder.sh
+++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh
@@ -33,9 +33,11 @@ installPhase() {
     # Install libGL and friends.
     mkdir -p $out/lib/vendors
 
-    for g in *.so.$versionNumber;
+    for f in \
+      libcuda libGL libnvcuvid libnvidia-cfg libnvidia-compiler \
+      libnvidia-encode libnvidia-glcore libnvidia-ml libnvidia-opencl \
+      libnvidia-tls libOpenCL libnvidia-tls libvdpau_nvidia libEGL libGLESv2
     do
-      f=$(basename $g .so.$versionNumber)
       cp -prd $f.* $out/lib/
       ln -snf $f.so.$versionNumber $out/lib/$f.so
       ln -snf $f.so.$versionNumber $out/lib/$f.so.1

From 47c443bede78fe4571e802d414241b34e873cccb Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 20 Aug 2014 00:34:29 -0500
Subject: [PATCH 0220/1453] nixpkgs: openresty 1.7.4.1rc1

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/servers/http/openresty/default.nix | 58 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 +
 2 files changed, 60 insertions(+)
 create mode 100644 pkgs/servers/http/openresty/default.nix

diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix
new file mode 100644
index 000000000000..f95272b7e8ae
--- /dev/null
+++ b/pkgs/servers/http/openresty/default.nix
@@ -0,0 +1,58 @@
+{ stdenv, fetchurl, fetchgit, openssl, zlib, pcre, libxml2, libxslt, gd, geoip
+, perl }:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  name = "openresty-${version}";
+  version = "1.7.4.1rc1";
+
+  src = fetchurl {
+    url = "http://openresty.org/download/ngx_openresty-${version}.tar.gz";
+    sha256 = "1j976kmbdv07j3n7bwkpdrjs8hlm13mzzdmfbsfwyxpnk034v0j1";
+  };
+
+  buildInputs = [ openssl zlib pcre libxml2 libxslt gd geoip perl ];
+
+  configureFlags = [
+    "--with-pcre-jit"
+    "--with-http_ssl_module"
+    "--with-http_spdy_module"
+    "--with-http_realip_module"
+    "--with-http_addition_module"
+    "--with-http_xslt_module"
+    "--with-http_image_filter_module"
+    "--with-http_geoip_module"
+    "--with-http_sub_module"
+    "--with-http_dav_module"
+    "--with-http_flv_module"
+    "--with-http_mp4_module"
+    "--with-http_gunzip_module"
+    "--with-http_gzip_static_module"
+    "--with-http_auth_request_module"
+    "--with-http_random_index_module"
+    "--with-http_secure_link_module"
+    "--with-http_degradation_module"
+    "--with-http_stub_status_module"
+    "--with-ipv6"
+  ];
+
+  postInstall = ''
+    mv $out/nginx/sbin $out/bin
+    ln -s $out/bin/nginx $out/bin/openresty
+    mv $out/luajit/bin/luajit-2.1.0-alpha $out/bin/luajit-openresty
+  '';
+
+  preConfigure = ''
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2}/include/libxml2 $additionalFlags"
+    export PATH="$PATH:${stdenv.gcc.libc}/sbin"
+  '';
+
+  meta = {
+    description = "A fast web application server built on Nginx";
+    homepage    = http://openresty.org;
+    license     = licenses.bsd2;
+    platforms   = platforms.all;
+    maintainers = with maintainers; [ thoughtpolice ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 200881c916a6..54c41338b772 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6857,6 +6857,8 @@ let
 
   nsq = callPackage ../servers/nsq { };
 
+  openresty = callPackage ../servers/http/openresty { };
+
   opensmtpd = callPackage ../servers/mail/opensmtpd { };
 
   petidomo = callPackage ../servers/mail/petidomo { };

From 0aa8cdcef94fa065238922a016022d8ff2facc5a Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 20 Aug 2014 00:51:15 -0500
Subject: [PATCH 0221/1453] nixpkgs: libressl 2.0.5

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../libraries/libressl/default.nix            | 20 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/libraries/libressl/default.nix

diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix
new file mode 100644
index 000000000000..f77e9a313775
--- /dev/null
+++ b/pkgs/development/libraries/libressl/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "libressl-${version}";
+  version = "2.0.5";
+
+  src = fetchurl {
+    url    = "http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${name}.tar.gz";
+    sha256 = "16pwgmj90k10pf03il39lnck5kqw59hj0fp2qhmgsgmrvssn6m1z";
+  };
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "Free TLS/SSL implementation";
+    homepage    = "http://www.libressl.org";
+    platforms   = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 54c41338b772..914586baeb13 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5870,6 +5870,8 @@ let
 
   openspades = callPackage ../games/openspades {};
 
+  libressl = callPackage ../development/libraries/libressl { };
+
   openssl = callPackage ../development/libraries/openssl {
     fetchurl = fetchurlBoot;
     cryptodevHeaders = linuxPackages.cryptodev.override {

From 9f5eba94d801dd5ffd19a2922bcb9fff0654722e Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 20 Aug 2014 01:12:21 -0500
Subject: [PATCH 0222/1453] re2c: 0.13.6 -> 0.13.7.4

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/tools/parsing/re2c/default.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/parsing/re2c/default.nix b/pkgs/development/tools/parsing/re2c/default.nix
index 00b32bed44e5..9aa1890cb84a 100644
--- a/pkgs/development/tools/parsing/re2c/default.nix
+++ b/pkgs/development/tools/parsing/re2c/default.nix
@@ -1,13 +1,19 @@
 {stdenv, fetchurl }:
 
-stdenv.mkDerivation {
-  name = "re2c-0.13.6";
+stdenv.mkDerivation rec {
+  name = "re2c-${version}";
+  version = "0.13.7.4";
+
   src = fetchurl {
-    url = mirror://sourceforge/re2c/re2c/0.13.6/re2c-0.13.6.tar.gz;
-    sha256 = "1h3na1zacw3166k6wkdjzjs67frjca9wj07wgfas56c7m8wk0ilf";
+    url    = "mirror://sourceforge/re2c/re2c/${version}/${name}.tar.gz";
+    sha256 = "0j42s2gpz0rgiadwyb7ksqgc7i02l0q2qnmiyaj5f1w5rfa2c7yy";
   };
 
   meta = {
     description = "Tool for writing very fast and very flexible scanners";
+    homepage    = "http://re2c.org";
+    license     = stdenv.lib.license.publicDomain;
+    platforms   = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
   };
 }

From 528a1c0f560eab8496b10b9a93601455299aaec3 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 20 Aug 2014 01:13:33 -0500
Subject: [PATCH 0223/1453] ninja: 1.4.0 -> 1.5.1

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/tools/build-managers/ninja/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/build-managers/ninja/default.nix b/pkgs/development/tools/build-managers/ninja/default.nix
index 75c2da8a28de..d62e000fc2a5 100644
--- a/pkgs/development/tools/build-managers/ninja/default.nix
+++ b/pkgs/development/tools/build-managers/ninja/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "ninja-${version}";
-  version = "1.4.0";
+  version = "1.5.1";
 
   src = fetchurl {
     name = "${name}.tar.gz";
     url = "https://github.com/martine/ninja/archive/v${version}.tar.gz";
-    sha256 = "05y3whnp0fvfv1wsp862x0w1vrn3yjzzg8ypvbpcv6y6qlrsn73h";
+    sha256 = "0z9rzay6ipy6q025n1f2im8d8jy6in9pcdsiqj30xpdlsjg7p9zv";
   };
 
   buildInputs = [ python asciidoc re2c ];
@@ -37,6 +37,6 @@ stdenv.mkDerivation rec {
     homepage = http://martine.github.io/ninja/;
     license = licenses.asl20;
     platforms = platforms.unix;
-    maintainers = [ maintainers.bjornfor ];
+    maintainers = [ maintainers.thoughtpolice maintainers.bjornfor ];
   };
 }

From 8b96a44460d596b6bf5a994cdc17888cd950cf1a Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 20 Aug 2014 01:23:40 -0500
Subject: [PATCH 0224/1453] nixpkgs: boringssl 20140820-a7d1363f

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../libraries/boringssl/default.nix           | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/development/libraries/boringssl/default.nix

diff --git a/pkgs/development/libraries/boringssl/default.nix b/pkgs/development/libraries/boringssl/default.nix
new file mode 100644
index 000000000000..a4ea804b7762
--- /dev/null
+++ b/pkgs/development/libraries/boringssl/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchgit, cmake, perl }:
+
+stdenv.mkDerivation rec {
+  name = "boringssl-${version}";
+  version = "20140820-a7d1363f";
+
+  src = fetchgit {
+    url    = "https://boringssl.googlesource.com/boringssl";
+    rev    = "a7d1363fcb1f0d825ec2393c06be3d58b0c57efd";
+    sha256 = "d27dd1416de1a2ea4ec2c219248b2ed2cce5c0405e56adb394077ddc7c319bab";
+  };
+
+  buildInputs = [ cmake perl ];
+  enableParallelBuilding = true;
+
+  installPhase = ''
+    mkdir -p $out/bin $out/include $out/lib
+
+    mv tool/bssl    $out/bin
+    mv ssl/libssl.a $out/lib
+    mv ../include/openssl $out/include
+  '';
+
+  meta = {
+    description = "Free TLS/SSL implementation";
+    homepage    = "https://boringssl.googlesource.com";
+    platforms   = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 914586baeb13..7d44d8fa4450 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5872,6 +5872,8 @@ let
 
   libressl = callPackage ../development/libraries/libressl { };
 
+  boringssl = callPackage ../development/libraries/boringssl { };
+
   openssl = callPackage ../development/libraries/openssl {
     fetchurl = fetchurlBoot;
     cryptodevHeaders = linuxPackages.cryptodev.override {

From 618e220f675035c75fb2ec2af3f0a045f066d12c Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 20 Aug 2014 01:37:17 -0500
Subject: [PATCH 0225/1453] concurrencykit: 0.4.1 -> 0.4.3

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/libraries/concurrencykit/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/concurrencykit/default.nix b/pkgs/development/libraries/concurrencykit/default.nix
index 59de923ad43d..0e584c0d4993 100644
--- a/pkgs/development/libraries/concurrencykit/default.nix
+++ b/pkgs/development/libraries/concurrencykit/default.nix
@@ -2,13 +2,17 @@
 
 stdenv.mkDerivation rec {
   name    = "concurrencykit-${version}";
-  version = "0.4.1";
+  version = "0.4.3";
 
   src = fetchurl {
     url    = "http://concurrencykit.org/releases/ck-${version}.tar.gz";
-    sha256 = "1gi5gpkxvbb6vkhjm9kab7dz1av2i11f1pggxp001rqq2mi3i6aq";
+    sha256 = "1fjdvbj6wazblg6qy0gdqs3kach2y2p6xrcvssmcvxr0nfyaadg2";
   };
 
+  enableParallelBuilding = true;
+
+  configurePhase = "./configure --prefix=$out";
+
   meta = {
     description = "A library of safe, high-performance concurrent data structures";
     homepage    = "http://concurrencykit.org";

From 87f54f196198089e8c739706685ce43e9b819f02 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 20 Aug 2014 01:41:47 -0500
Subject: [PATCH 0226/1453] fmodex: 4.44.34 -> 4.44.41

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/libraries/fmod/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/fmod/default.nix b/pkgs/development/libraries/fmod/default.nix
index 1fb71fc4c574..78b70eebd7e6 100644
--- a/pkgs/development/libraries/fmod/default.nix
+++ b/pkgs/development/libraries/fmod/default.nix
@@ -10,11 +10,11 @@ let
 in
 stdenv.mkDerivation rec {
   name    = "fmod-${version}";
-  version = "4.44.34";
+  version = "4.44.41";
 
   src = fetchurl {
-    url = "http://www.fmod.org/download/fmodex/api/Linux/fmodapi44434linux.tar.gz";
-    sha256 = "057dvawckw3laavfkzvakyrw5lnvvfabs8myibjc95ap1awacb8x";
+    url = "http://www.fmod.org/download/fmodex/api/Linux/fmodapi44441linux.tar.gz";
+    sha256 = "0qjvbhx9g6ijv542n6w3ryv20f74p1qx6bbllda9hl14683z8r8p";
   };
 
   dontStrip = true;

From f1bc7b229d1ddce0951a4ed96f845e3dbaf1ffb7 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 20 Aug 2014 01:43:31 -0500
Subject: [PATCH 0227/1453] jhc: 0.8.1 -> 0.8.2

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/compilers/jhc/default.nix | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/compilers/jhc/default.nix b/pkgs/development/compilers/jhc/default.nix
index 7b1054451f90..08ac509a2456 100644
--- a/pkgs/development/compilers/jhc/default.nix
+++ b/pkgs/development/compilers/jhc/default.nix
@@ -3,18 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "jhc-${version}";
-  version = "0.8.1";
+  version = "0.8.2";
 
   src = fetchurl {
-    url = "http://repetae.net/dist/${name}.tar.gz";
-    sha256 = "11fya5ggk6q4vcm3kwjacfaaqvkammih25saqwlr1g40bcikbnf2";
+    url    = "http://repetae.net/dist/${name}.tar.gz";
+    sha256 = "0lrgg698mx6xlrqcylba9z4g1f053chrzc92ri881dmb1knf83bz";
   };
 
-  patchPhase = ''
-    substituteInPlace ./src/Util/Interact.hs \
-      --replace USE_NOLINE USE_READLINE
-  '';
-
   buildInputs =
     [ perl ghc binary zlib utf8String
       readline fgl regexCompat HsSyck random

From 87393f2f2bd70894729cef115318af0a09849292 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 20 Aug 2014 01:44:01 -0500
Subject: [PATCH 0228/1453] lockdep: 3.14.4 -> 3.16.1

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/os-specific/linux/lockdep/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/lockdep/default.nix b/pkgs/os-specific/linux/lockdep/default.nix
index 9ddcea03475d..1554715a613c 100644
--- a/pkgs/os-specific/linux/lockdep/default.nix
+++ b/pkgs/os-specific/linux/lockdep/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "lockdep-${version}";
-  version = "3.14.4";
+  version = "3.16.1";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "05yp192pbjng92rpvq3fd4mhjc96iylwf6xb7as5lscwg660m1b5";
+    sha256 = "0wbxqlmk7w9047ir51dsz6vi7ww0hpycgrb43mk2a189xaldsdxy";
   };
 
   preConfigure = "cd tools/lib/lockdep";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     cp -R include/liblockdep $out/include
     make install DESTDIR=$out prefix=""
 
-    substituteInPlace $out/bin/lockdep --replace "./liblockdep.so" "$out/lib/liblockdep.so"
+    substituteInPlace $out/bin/lockdep --replace "./liblockdep.so" "$out/lib/liblockdep.so.$version"
   '';
 
   meta = {

From db2a37514d8293dc8e251c9e8b457e2de2bee625 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 20 Aug 2014 01:48:42 -0500
Subject: [PATCH 0229/1453] mariadb: 10.0.11 -> 10.0.13

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/servers/sql/mariadb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 1df9f6a440fd..bb0c0bc8da86 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "mariadb-${version}";
-  version = "10.0.11";
+  version = "10.0.13";
 
   src = fetchurl {
     url    = "https://downloads.mariadb.org/interstitial/mariadb-${version}/source/mariadb-${version}.tar.gz";
-    sha256 = "1p8h06kns30rlbnzw9ddmihs7r3jhp8xlrl4r6h5d107wkcw86v3";
+    sha256 = "039wz89vs03a27anpshj5xaqknm7cqi7mrypvwingqkq26ns0mhs";
   };
 
   buildInputs = [ cmake ncurses openssl bison boost libxml2 libaio judy libevent groff ];

From e2bc49d3f31b57052c35314196ec151188a2b3ed Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 20 Aug 2014 01:53:45 -0500
Subject: [PATCH 0230/1453] mps: 1.113.0 -> 1.114.0

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/libraries/mps/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mps/default.nix b/pkgs/development/libraries/mps/default.nix
index 6e1e8c8e1138..f3a458a80ede 100644
--- a/pkgs/development/libraries/mps/default.nix
+++ b/pkgs/development/libraries/mps/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "mps-${version}";
-  version = "1.113.0";
+  version = "1.114.0";
 
   src = fetchurl {
     url    = "http://www.ravenbrook.com/project/mps/release/${version}/mps-kit-${version}.tar.gz";
-    sha256 = "0v4difh3yl2mvpvnwlavhaags945l1452g07fllhdbpzgbjay79i";
+    sha256 = "1gb0rdd42ib0fai2jwm2gyii8pk59i1rhblnpdzbdj8cj5g0b30h";
   };
 
   buildInputs = [ autoreconfHook sqlite ];

From 36e14121439e3e29614d9950e501729e1c0f3280 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 20 Aug 2014 01:55:02 -0500
Subject: [PATCH 0231/1453] musl: 1.0.0 -> 1.1.4

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/os-specific/linux/musl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix
index 014591f0b55f..97407c887cea 100644
--- a/pkgs/os-specific/linux/musl/default.nix
+++ b/pkgs/os-specific/linux/musl/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "musl-${version}";
-  version = "1.0.0";
+  version = "1.1.4";
 
   src = fetchurl {
     url    = "http://www.musl-libc.org/releases/${name}.tar.gz";
-    sha256 = "0chs9h8k4d0iwv8w7n1w02nll3ypwqa2gag6r4czznkj55fz9mqs";
+    sha256 = "1kgmi17zpzgjhywmmqxazj8qsx8cf9siwa65jqd2i6rs7jnnb335";
   };
 
   enableParallelBuilding = true;

From 32183417faa20dd75308d9cdb8e7fc5cac0c12b0 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 20 Aug 2014 01:56:23 -0500
Subject: [PATCH 0232/1453] stunnel: 5.01 -> 5.03

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/tools/networking/stunnel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix
index 0ea7a948c8d5..15bd74ea387d 100644
--- a/pkgs/tools/networking/stunnel/default.nix
+++ b/pkgs/tools/networking/stunnel/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "stunnel-${version}";
-  version = "5.01";
+  version = "5.03";
 
   src = fetchurl {
     url    = "http://www.stunnel.org/downloads/${name}.tar.gz";
-    sha256 = "0sw87x7yrgjx43a5x0cy71p2vr5j0l8n5pv49hq159p8zxcbyr95";
+    sha256 = "00yx7r46rad3yhdqfwk4grqs87wc6fiq055i91pnwxgscsa3c7ls";
   };
 
   buildInputs = [ openssl ];

From 53adb67395c8f16b882b13b80c645fcea0483b55 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 20 Aug 2014 01:58:50 -0500
Subject: [PATCH 0233/1453] nagios: 4.0.7 -> 4.0.8

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/servers/monitoring/nagios/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix
index 5af759db1c9d..bf43a93a81b2 100644
--- a/pkgs/servers/monitoring/nagios/default.nix
+++ b/pkgs/servers/monitoring/nagios/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, perl, php, gd, libpng, zlib }:
 
-stdenv.mkDerivation {
-  name = "nagios-4.0.7";
+stdenv.mkDerivation rec {
+  name = "nagios-${version}";
+  version = "4.0.8";
 
   src = fetchurl {
-    url = mirror://sourceforge/nagios/nagios-4.x/nagios-4.0.7/nagios-4.0.7.tar.gz;
-    sha256 = "1687qnbsag84r57y9745g2klypacfixd6gkzaj42lmzn0v8y27gg";
+    url = "mirror://sourceforge/nagios/nagios-4.x/${name}/${name}.tar.gz";
+    sha256 = "0jyad39wa318613awlnpczrrakvjcipz8qp1mdsig1cp1hjqs9lb";
   };
 
   patches = [ ./nagios.patch ];

From a8b59789d0175a2e6aa977faf25f3e25f4504019 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 20 Aug 2014 01:59:02 -0500
Subject: [PATCH 0234/1453] nagios-plugins: 2.0 -> 2.0.3

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/servers/monitoring/nagios/plugins/official-2.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix b/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix
index 3420003c641c..79180f172417 100644
--- a/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix
+++ b/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "nagios-plugins-${version}";
-  version = "2.0";
+  version = "2.0.3";
 
   src = fetchurl {
     url = "http://nagios-plugins.org/download/${name}.tar.gz";
-    sha256 = "113nv9jqpbqpdjqilqbj1iyshxyvcmq8w94bq5ajz4dxi9j8045s";
+    sha256 = "0jm0mn55hqwl8ffx8ww9mql2wrkhp1h2k8jw53q3h0ff5m22204g";
   };
 
   # !!! Awful hack. Grrr... this of course only works on NixOS.

From d95ae1cc89479e40fd1330a853dc0de7b17c1060 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 20 Aug 2014 02:03:18 -0500
Subject: [PATCH 0235/1453] fsharp: 3.1.0 -> 3.1.1.25

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/compilers/fsharp/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix
index 1d7955045893..99e893c79d1c 100644
--- a/pkgs/development/compilers/fsharp/default.nix
+++ b/pkgs/development/compilers/fsharp/default.nix
@@ -1,13 +1,12 @@
-{ stdenv, fetchgit, mono, pkgconfig, autoconf, automake, which }:
+{ stdenv, fetchurl, mono, pkgconfig, autoconf, automake, which }:
 
 stdenv.mkDerivation rec {
   name = "fsharp-${version}";
-  version = "3.1.0";
+  version = "3.1.1.25";
 
-  src = fetchgit {
-    url = "https://github.com/fsharp/fsharp";
-    rev = "refs/heads/fsharp_31";
-    sha256 = "0d41ae31c57ec9ac8a4ea149b615ae085f3774b8877d8e53ddbf68856c32eda0";
+  src = fetchurl {
+    url = "https://github.com/fsharp/fsharp/archive/${version}.tar.gz";
+    sha256 = "1vrgw7qk4g78mjjapc1a1frribcgya4cdrwahv3i26z9s10g5h3d";
   };
 
   buildInputs = [ mono pkgconfig autoconf automake which ];

From 5c53f22492511d1d8de46ecd8f11fca20f1287fd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 20 Aug 2014 10:39:03 +0200
Subject: [PATCH 0236/1453] Revert "binutils: Enable sysroot support"

This reverts commit 773595540bd3a52476a7c84799e374d086d1c648. It
breaks stuff and we don't need it anymore.

http://hydra.nixos.org/build/13517591
---
 pkgs/development/tools/misc/binutils/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 246a8573fac9..8d8fc5d464e8 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -59,7 +59,6 @@ stdenv.mkDerivation rec {
 
   configureFlags =
     [ "--enable-shared" "--enable-deterministic-archives" ]
-    ++ optional noSysDirs "--with-sysroot=/var/empty"
     ++ optional (stdenv.system == "mips64el-linux") "--enable-fix-loongson2f-nop"
     ++ optional (cross != null) "--target=${cross.config}"
     ++ optionals gold [ "--enable-gold" "--enable-plugins" ]

From c25d90de7bb8730fa8b6e6da969a447bf4433753 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Aug 2014 11:57:38 +0200
Subject: [PATCH 0237/1453] Move 'cryptol' and 'darcs' from the generic Haskell
 package set into all-packages.nix.

These packages need very a version of GHC to compile.
---
 pkgs/top-level/all-packages.nix     | 13 +++++++------
 pkgs/top-level/haskell-packages.nix |  8 --------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7d44d8fa4450..0c3355a9e408 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2622,7 +2622,11 @@ let
   compcert = callPackage ../development/compilers/compcert {};
 
   cryptol1 = lowPrio (callPackage ../development/compilers/cryptol/1.8.x.nix {});
-  cryptol2 = haskellPackages_ghc763.cryptol; # doesn't compile with the lastest 7.8.3 release
+  cryptol2 = with haskellPackages_ghc763; callPackage ../development/compilers/cryptol/2.0.x.nix {
+    Cabal = Cabal_1_18_1_3;
+    cabalInstall = cabalInstall_1_18_0_3;
+    process = process_1_2_0_0;
+  };
 
   cython = pythonPackages.cython;
   cython3 = python3Packages.cython;
@@ -8342,11 +8346,8 @@ let
 
   d4x = callPackage ../applications/misc/d4x { };
 
-  darcs = haskellPackages_ghc763.darcs.override {
-    # A variant of the Darcs derivation that containts only the executable and
-    # thus has no dependencies on other Haskell packages. We have to use the older
-    # GHC 7.6.3 package set because darcs won't compile with 7.8.x.
-    cabal = haskellPackages_ghc763.cabal.override {
+  darcs = with haskellPackages_ghc763; callPackage ../applications/version-management/darcs {
+    cabal = cabal.override {
       extension = self : super : {
         isLibrary = false;
         configureFlags = "-f-library " + super.configureFlags or "";
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index b6885a1a0480..caee81fcb376 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2937,14 +2937,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   arbtt = callPackage ../applications/misc/arbtt {};
 
-  cryptol = callPackage ../development/compilers/cryptol/2.0.x.nix {
-    Cabal = self.Cabal_1_18_1_3;
-    cabalInstall = self.cabalInstall_1_18_0_3;
-    process = self.process_1_2_0_0;
-  };
-
-  darcs = callPackage ../applications/version-management/darcs {};
-
   idris_plain = callPackage ../development/compilers/idris {
     llvmGeneral = self.llvmGeneral_3_3_8_2;
     llvmGeneralPure = self.llvmGeneralPure_3_3_8_2;

From 9a570581251fe4b534565823c4847dd255512a4d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Aug 2014 11:57:56 +0200
Subject: [PATCH 0238/1453] all-packages.nix: strip trailing whitespace

---
 pkgs/top-level/all-packages.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0c3355a9e408..4c38aed4dd5e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1379,7 +1379,7 @@ let
   kippo = callPackage ../servers/kippo { };
 
   klavaro = callPackage ../games/klavaro {};
-  
+
   kzipmix = callPackage_i686 ../tools/compression/kzipmix { };
 
   minidlna = callPackage ../tools/networking/minidlna {
@@ -1783,7 +1783,7 @@ let
   };
 
   p0f = callPackage ../tools/security/p0f { };
-  
+
   pngout = callPackage ../tools/graphics/pngout { };
 
   hurdPartedCross =
@@ -6411,7 +6411,7 @@ let
   xbase = callPackage ../development/libraries/xbase { };
 
   xcb-util-cursor = callPackage ../development/libraries/xcb-util-cursor { };
- 
+
   xdo = callPackage ../tools/misc/xdo { };
 
   xineLib = callPackage ../development/libraries/xine-lib {
@@ -9351,7 +9351,7 @@ let
   };
 
   synfigstudio = callPackage ../applications/graphics/synfigstudio { };
- 
+
   sxhkd = callPackage ../applications/window-managers/sxhkd { };
 
   msmtp = callPackage ../applications/networking/msmtp { };
@@ -9859,7 +9859,7 @@ let
   uzbl = callPackage ../applications/networking/browsers/uzbl {
     webkit = webkitgtk2;
   };
-  
+
   uTox = callPackage ../applications/networking/instant-messengers/utox { };
 
   vanitygen = callPackage ../applications/misc/vanitygen { };

From c9dd66fde6a369202e27fe8d08246c34ac9a1db0 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Wed, 20 Aug 2014 10:45:59 +0100
Subject: [PATCH 0239/1453] haskell-ghc-mod: add 5.0.1

Separate expression for now due to big API chanages.
---
 .../libraries/haskell/djinn-ghc/default.nix   | 16 +++++
 .../libraries/haskell/djinn-lib/default.nix   | 17 +++++
 .../ghc-mod/{default.nix => 4.1.6.nix}        |  0
 .../libraries/haskell/ghc-mod/5.0.1.nix       | 63 +++++++++++++++++++
 .../haskell/monad-journal/default.nix         | 20 ++++++
 pkgs/top-level/haskell-packages.nix           | 14 ++++-
 6 files changed, 129 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/haskell/djinn-ghc/default.nix
 create mode 100644 pkgs/development/libraries/haskell/djinn-lib/default.nix
 rename pkgs/development/libraries/haskell/ghc-mod/{default.nix => 4.1.6.nix} (100%)
 create mode 100644 pkgs/development/libraries/haskell/ghc-mod/5.0.1.nix
 create mode 100644 pkgs/development/libraries/haskell/monad-journal/default.nix

diff --git a/pkgs/development/libraries/haskell/djinn-ghc/default.nix b/pkgs/development/libraries/haskell/djinn-ghc/default.nix
new file mode 100644
index 000000000000..3b5ffae42c5e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/djinn-ghc/default.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, async, djinnLib, mtl, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "djinn-ghc";
+  version = "0.0.2.2";
+  sha256 = "0dz5jg58si9fsc12212rxmzky09zric7b2sdj1ydmvnrjxkh9l70";
+  buildDepends = [ async djinnLib mtl transformers ];
+  meta = {
+    description = "Generate Haskell code from a type. Bridge from Djinn to GHC API.";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/djinn-lib/default.nix b/pkgs/development/libraries/haskell/djinn-lib/default.nix
new file mode 100644
index 000000000000..357ad9a4fdcc
--- /dev/null
+++ b/pkgs/development/libraries/haskell/djinn-lib/default.nix
@@ -0,0 +1,17 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, mtl }:
+
+cabal.mkDerivation (self: {
+  pname = "djinn-lib";
+  version = "0.0.1.2";
+  sha256 = "048hs27awl4j9lg04qbnpf8c51mzbgy2afckis19zcswmavi1zn0";
+  buildDepends = [ mtl ];
+  meta = {
+    homepage = "http://www.augustsson.net/Darcs/Djinn/";
+    description = "Generate Haskell code from a type. Library extracted from djinn package.";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/4.1.6.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/ghc-mod/default.nix
rename to pkgs/development/libraries/haskell/ghc-mod/4.1.6.nix
diff --git a/pkgs/development/libraries/haskell/ghc-mod/5.0.1.nix b/pkgs/development/libraries/haskell/ghc-mod/5.0.1.nix
new file mode 100644
index 000000000000..eea28837a812
--- /dev/null
+++ b/pkgs/development/libraries/haskell/ghc-mod/5.0.1.nix
@@ -0,0 +1,63 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, Cabal, convertible, deepseq, djinnGhc, doctest, emacs
+, filepath, ghcPaths, ghcSybUtils, haskellSrcExts, hlint, hspec
+, ioChoice, monadControl, monadJournal, mtl, split, syb, text, time
+, transformers, transformersBase
+}:
+
+cabal.mkDerivation (self: {
+  pname = "ghc-mod";
+  version = "5.0.1";
+  sha256 = "01awsi5rfzq6433shfvvnr69ifxb7h8v90mlknxv3dl34zmrhv19";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    Cabal convertible deepseq djinnGhc filepath ghcPaths ghcSybUtils
+    haskellSrcExts hlint ioChoice monadControl monadJournal mtl split
+    syb text time transformers transformersBase
+  ];
+  testDepends = [
+    Cabal convertible deepseq djinnGhc doctest filepath ghcPaths
+    ghcSybUtils haskellSrcExts hlint hspec ioChoice monadControl
+    monadJournal mtl split syb text time transformers transformersBase
+  ];
+  buildTools = [ emacs ];
+  doCheck = false;
+  configureFlags = "--datasubdir=${self.pname}-${self.version}";
+  postInstall = ''
+    cd $out/share/$pname-$version
+    make
+    rm Makefile
+    cd ..
+    ensureDir "$out/share/emacs"
+    mv $pname-$version emacs/site-lisp
+    mv $out/bin/ghc-mod $out/bin/.ghc-mod-wrapped
+    cat - > $out/bin/ghc-mod <<EOF
+    #! ${self.stdenv.shell}
+    COMMAND=\$1
+    shift
+    eval exec $out/bin/.ghc-mod-wrapped \$COMMAND \$( ${self.ghc.GHCGetPackages} ${self.ghc.version} | tr " " "\n" | tail -n +2 | paste -d " " - - | sed 's/.*/-g "&"/' | tr "\n" " ") "\$@"
+    EOF
+
+    mv $out/bin/ghc-modi $out/bin/.ghc-modi-wrapped
+    cat - > $out/bin/ghc-modi <<EOF
+    #! ${self.stdenv.shell}
+    COMMAND=\$1
+    shift
+    eval exec $out/bin/.ghc-modi-wrapped \$COMMAND \$( ${self.ghc.GHCGetPackages} ${self.ghc.version} | tr " " "\n" | tail -n +2 | paste -d " " - - | sed 's/.*/-g "&"/' | tr "\n" " ") "\$@"
+    EOF
+
+    chmod +x $out/bin/ghc-mod
+    chmod +x $out/bin/ghc-modi
+  '';
+  meta = {
+    homepage = "http://www.mew.org/~kazu/proj/ghc-mod/";
+    description = "Happy Haskell Programming";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [
+      andres bluescreen303 ocharles
+    ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/monad-journal/default.nix b/pkgs/development/libraries/haskell/monad-journal/default.nix
new file mode 100644
index 000000000000..3afce21810c5
--- /dev/null
+++ b/pkgs/development/libraries/haskell/monad-journal/default.nix
@@ -0,0 +1,20 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, either, monadControl, mtl, transformers, transformersBase
+}:
+
+cabal.mkDerivation (self: {
+  pname = "monad-journal";
+  version = "0.2.3.0";
+  sha256 = "1k0da0fwk05k8530rlys3n2s1z8glnfdivx93isy6cjr8amndc6b";
+  buildDepends = [
+    either monadControl mtl transformers transformersBase
+  ];
+  meta = {
+    homepage = "https://github.com/phaazon/monad-journal";
+    description = "Pure logger typeclass and monad transformer";
+    license = self.stdenv.lib.licenses.publicDomain;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index b6885a1a0480..c0dbec978d6a 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -678,6 +678,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   djinn = callPackage ../development/libraries/haskell/djinn {};
 
+  djinnGhc = callPackage ../development/libraries/haskell/djinn-ghc {};
+
+  djinnLib = callPackage ../development/libraries/haskell/djinn-lib {};
+
   dlist = callPackage ../development/libraries/haskell/dlist {};
 
   dlistInstances = callPackage ../development/libraries/haskell/dlist-instances {};
@@ -893,10 +897,16 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   ghcjsCodemirror = callPackage ../development/libraries/haskell/ghcjs-codemirror {};
 
-  ghcMod = callPackage ../development/libraries/haskell/ghc-mod {
+  ghcMod_4_1_6 = callPackage ../development/libraries/haskell/ghc-mod/4.1.6.nix {
     inherit (pkgs) emacs;
   };
 
+  ghcMod_5_0_1 = callPackage ../development/libraries/haskell/ghc-mod/5.0.1.nix {
+    inherit (pkgs) emacs;
+  };
+
+  ghcMod = self.ghcMod_4_1_6;
+
   ghcMtl = callPackage ../development/libraries/haskell/ghc-mtl {};
 
   ghcPaths = callPackage ../development/libraries/haskell/ghc-paths {};
@@ -1585,6 +1595,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   monadExtras = callPackage ../development/libraries/haskell/monad-extras {};
 
+  monadJournal = callPackage ../development/libraries/haskell/monad-journal {};
+
   monadLib = callPackage ../development/libraries/haskell/monadlib {};
 
   monadloc = callPackage ../development/libraries/haskell/monadloc {};

From e3e4f26b1d46959b8a1592ffc72c0205908250af Mon Sep 17 00:00:00 2001
From: Shaun Sharples <shaun.sharples@gmail.com>
Date: Wed, 20 Aug 2014 13:21:31 +0200
Subject: [PATCH 0240/1453] Don't try make first argument the command, the vim
 plugin mixes up commands with options

---
 pkgs/development/libraries/haskell/ghc-mod/5.0.1.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/ghc-mod/5.0.1.nix b/pkgs/development/libraries/haskell/ghc-mod/5.0.1.nix
index eea28837a812..ad9207214513 100644
--- a/pkgs/development/libraries/haskell/ghc-mod/5.0.1.nix
+++ b/pkgs/development/libraries/haskell/ghc-mod/5.0.1.nix
@@ -35,17 +35,13 @@ cabal.mkDerivation (self: {
     mv $out/bin/ghc-mod $out/bin/.ghc-mod-wrapped
     cat - > $out/bin/ghc-mod <<EOF
     #! ${self.stdenv.shell}
-    COMMAND=\$1
-    shift
-    eval exec $out/bin/.ghc-mod-wrapped \$COMMAND \$( ${self.ghc.GHCGetPackages} ${self.ghc.version} | tr " " "\n" | tail -n +2 | paste -d " " - - | sed 's/.*/-g "&"/' | tr "\n" " ") "\$@"
+    eval exec $out/bin/.ghc-mod-wrapped \$( ${self.ghc.GHCGetPackages} ${self.ghc.version} | tr " " "\n" | tail -n +2 | paste -d " " - - | sed 's/.*/-g "&"/' | tr "\n" " ") "\$@"
     EOF
 
     mv $out/bin/ghc-modi $out/bin/.ghc-modi-wrapped
     cat - > $out/bin/ghc-modi <<EOF
     #! ${self.stdenv.shell}
-    COMMAND=\$1
-    shift
-    eval exec $out/bin/.ghc-modi-wrapped \$COMMAND \$( ${self.ghc.GHCGetPackages} ${self.ghc.version} | tr " " "\n" | tail -n +2 | paste -d " " - - | sed 's/.*/-g "&"/' | tr "\n" " ") "\$@"
+    eval exec $out/bin/.ghc-modi-wrapped \$( ${self.ghc.GHCGetPackages} ${self.ghc.version} | tr " " "\n" | tail -n +2 | paste -d " " - - | sed 's/.*/-g "&"/' | tr "\n" " ") "\$@"
     EOF
 
     chmod +x $out/bin/ghc-mod

From 784c87772dc00de1f0fd2db95116af485ab217ae Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Aug 2014 11:46:45 +0200
Subject: [PATCH 0241/1453] haskell-happstack-server: update to version 7.3.8

---
 .../haskell/happstack/happstack-server.nix       | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
index 06b6d3488619..1bc0b36f1204 100644
--- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix
+++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
@@ -2,20 +2,20 @@
 
 { cabal, base64Bytestring, blazeHtml, extensibleExceptions
 , filepath, hslogger, html, HUnit, monadControl, mtl, network
-, parsec, sendfile, syb, systemFilepath, text, threads, time
-, timeCompat, transformers, transformersBase, utf8String, xhtml
-, zlib
+, networkUri, parsec, sendfile, syb, systemFilepath, text, threads
+, time, timeCompat, transformers, transformersBase, utf8String
+, xhtml, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "happstack-server";
-  version = "7.3.7";
-  sha256 = "1phw3hpnklcdav3wv10kwjsmrg8gshnsgd564p459pc4k2zffgh1";
+  version = "7.3.8";
+  sha256 = "11jy4r4ih6sndyga3fjg298f5ww8806180dm3fgzsm0xfsjw1ac2";
   buildDepends = [
     base64Bytestring blazeHtml extensibleExceptions filepath hslogger
-    html monadControl mtl network parsec sendfile syb systemFilepath
-    text threads time timeCompat transformers transformersBase
-    utf8String xhtml zlib
+    html monadControl mtl network networkUri parsec sendfile syb
+    systemFilepath text threads time timeCompat transformers
+    transformersBase utf8String xhtml zlib
   ];
   testDepends = [ HUnit parsec zlib ];
   jailbreak = true;

From ec4102e7d954dc50a26b21319ce67a2d97a0c5f1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Aug 2014 11:46:52 +0200
Subject: [PATCH 0242/1453] haskell-hspec-wai: update to version 0.3.0

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

diff --git a/pkgs/development/libraries/haskell/hspec-wai/default.nix b/pkgs/development/libraries/haskell/hspec-wai/default.nix
index 19a2cb91808f..3170318f540b 100644
--- a/pkgs/development/libraries/haskell/hspec-wai/default.nix
+++ b/pkgs/development/libraries/haskell/hspec-wai/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hspec-wai";
-  version = "0.2.0";
-  sha256 = "1hykc6k3kkjzz0x16i6ijcavsxfc003sp7fwvg2v9pzpmf9rfhhd";
+  version = "0.3.0";
+  sha256 = "0wkzv406jiyi8ais3g0addm66274y1pvy55gypmnhwx5rp2kr6fb";
   buildDepends = [
     aeson aesonQq caseInsensitive hspec2 httpTypes text transformers
     wai waiExtra

From 580e18c5ea62c26e88d2715a6dd030489147d989 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Aug 2014 11:46:54 +0200
Subject: [PATCH 0243/1453] haskell-http-client: update to version 0.3.7.1

---
 .../libraries/haskell/http-client/default.nix       | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/http-client/default.nix b/pkgs/development/libraries/haskell/http-client/default.nix
index 08d93287ecbf..2c3ad6d1141b 100644
--- a/pkgs/development/libraries/haskell/http-client/default.nix
+++ b/pkgs/development/libraries/haskell/http-client/default.nix
@@ -2,19 +2,20 @@
 
 { cabal, async, base64Bytestring, blazeBuilder, caseInsensitive
 , cookie, dataDefaultClass, deepseq, exceptions, filepath, hspec
-, httpTypes, mimeTypes, monadControl, network, publicsuffixlist
-, random, streamingCommons, text, time, transformers, zlib
+, httpTypes, mimeTypes, monadControl, network, networkUri
+, publicsuffixlist, random, streamingCommons, text, time
+, transformers, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "http-client";
-  version = "0.3.6.1";
-  sha256 = "0mamndx2fyvshchcwv8ic910b90hp8rgbjhgqww0zpg8p1rr0v9h";
+  version = "0.3.7.1";
+  sha256 = "0wfmzpjzazk5jr1pbkhkxxa32pd40mgm1p426k5bxjn3gw48r30c";
   buildDepends = [
     base64Bytestring blazeBuilder caseInsensitive cookie
     dataDefaultClass deepseq exceptions filepath httpTypes mimeTypes
-    network publicsuffixlist random streamingCommons text time
-    transformers
+    network networkUri publicsuffixlist random streamingCommons text
+    time transformers
   ];
   testDepends = [
     async base64Bytestring blazeBuilder caseInsensitive deepseq hspec

From 59d4db445d4d6a452b5e098f217cf5117033884e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Aug 2014 11:46:57 +0200
Subject: [PATCH 0244/1453] haskell-hxt-http: update to version 9.1.5

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

diff --git a/pkgs/development/libraries/haskell/hxt-http/default.nix b/pkgs/development/libraries/haskell/hxt-http/default.nix
index e85e0ae0a873..a351b68d3d4a 100644
--- a/pkgs/development/libraries/haskell/hxt-http/default.nix
+++ b/pkgs/development/libraries/haskell/hxt-http/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hxt-http";
-  version = "9.1.4";
-  sha256 = "176k71dc30cnjjr9y9vphs0aixs3ww16197qyc491qjrzhymm2g2";
+  version = "9.1.5";
+  sha256 = "172y08zx9q4qvdi7k9hg9qahp6qjs24r663il6fmynaw7szsiib9";
   buildDepends = [ HTTP hxt network parsec ];
   meta = {
     homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html";

From 341831d6a761ab13bd3a79960cf3a3e24202d59b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Aug 2014 11:47:00 +0200
Subject: [PATCH 0245/1453] haskell-hxt: update to version 9.3.1.6

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

diff --git a/pkgs/development/libraries/haskell/hxt/default.nix b/pkgs/development/libraries/haskell/hxt/default.nix
index abf7e6c0ee87..131a01ed4326 100644
--- a/pkgs/development/libraries/haskell/hxt/default.nix
+++ b/pkgs/development/libraries/haskell/hxt/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hxt";
-  version = "9.3.1.4";
-  sha256 = "0klngcnq5rdhpwim2znzcljhqw8k3x7c91bgb16g008zp3lay1rf";
+  version = "9.3.1.6";
+  sha256 = "0k2i72ricxwnadagjbzyhfd7nfivay9gbf5f81sagr6j3wgnhz8f";
   buildDepends = [
     binary deepseq filepath HUnit hxtCharproperties hxtRegexXmlschema
     hxtUnicode mtl network parsec

From 75e56df25604b5aa86ab3deb44346db659d58910 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Aug 2014 11:47:03 +0200
Subject: [PATCH 0246/1453] haskell-language-glsl: update to version 0.1.0

---
 .../libraries/haskell/language-glsl/default.nix     | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/language-glsl/default.nix b/pkgs/development/libraries/haskell/language-glsl/default.nix
index f3a2015ede0f..c259da270323 100644
--- a/pkgs/development/libraries/haskell/language-glsl/default.nix
+++ b/pkgs/development/libraries/haskell/language-glsl/default.nix
@@ -1,14 +1,19 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, HUnit, parsec, prettyclass }:
+{ cabal, HUnit, parsec, prettyclass, testFramework
+, testFrameworkHunit
+}:
 
 cabal.mkDerivation (self: {
   pname = "language-glsl";
-  version = "0.0.2";
-  sha256 = "1ixgivyc5kqjg83rymrjs1mvypvqrczmj6dhn3dbw2a9lhrvljsz";
+  version = "0.1.0";
+  sha256 = "0jr6jwxsfpmnjrnaary37s2i47akq665fnyvv37cp6j928srjizf";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ HUnit parsec prettyclass ];
+  buildDepends = [ parsec prettyclass ];
+  testDepends = [
+    HUnit parsec prettyclass testFramework testFrameworkHunit
+  ];
   meta = {
     description = "GLSL abstract syntax tree, parser, and pretty-printer";
     license = self.stdenv.lib.licenses.bsd3;

From 68af6b805ab197883da9a1382515e43bd2000f78 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Aug 2014 11:48:01 +0200
Subject: [PATCH 0247/1453] haskell-text-icu: update to version 0.7.0.0

---
 pkgs/development/libraries/haskell/text-icu/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/text-icu/default.nix b/pkgs/development/libraries/haskell/text-icu/default.nix
index b47672e12a9c..000b689b2767 100644
--- a/pkgs/development/libraries/haskell/text-icu/default.nix
+++ b/pkgs/development/libraries/haskell/text-icu/default.nix
@@ -6,9 +6,9 @@
 
 cabal.mkDerivation (self: {
   pname = "text-icu";
-  version = "0.6.3.7";
-  sha256 = "0mzzjamcxfrld9xwgdww3890zzkgmi1qb83v5z9zrixmdgwkvhf4";
-  buildDepends = [ text ];
+  version = "0.7.0.0";
+  sha256 = "1fvq6qi9kvw722v2m9d40vwwa2irswfapqfjcrym9c2swdagxnry";
+  buildDepends = [ deepseq text ];
   testDepends = [
     deepseq HUnit QuickCheck random testFramework testFrameworkHunit
     testFrameworkQuickcheck2 text
@@ -19,7 +19,5 @@ cabal.mkDerivation (self: {
     description = "Bindings to the ICU library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.linux;
-    broken = self.stdenv.isDarwin;     # https://github.com/bos/text-icu/issues/6
   };
 })

From d92b08b0ba0a7bc6a1448eaa0fbc3711c15de95d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Aug 2014 11:48:03 +0200
Subject: [PATCH 0248/1453] haskell-wai-extra: update to version 3.0.2

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

diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix
index 6af43d459877..184adcc03dda 100644
--- a/pkgs/development/libraries/haskell/wai-extra/default.nix
+++ b/pkgs/development/libraries/haskell/wai-extra/default.nix
@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai-extra";
-  version = "3.0.1.2";
-  sha256 = "15v3mk7kbinvynsfxb95lwvg52wkpm3q9k5an8ak936ll3j2s14z";
+  version = "3.0.2";
+  sha256 = "1xynrcm8i8iyyc4dy7nsziy0g4yc6gqx0h5vs86f85i1j0mrf3xv";
   buildDepends = [
     ansiTerminal base64Bytestring blazeBuilder caseInsensitive
     dataDefaultClass deepseq fastLogger httpTypes liftedBase network

From b2569a041717b2dda2514cd600907dd3c52aab99 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Aug 2014 11:48:06 +0200
Subject: [PATCH 0249/1453] haskell-warp: update to version 3.0.1.1

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

diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix
index 56d561ea7296..bf53afbe8c8f 100644
--- a/pkgs/development/libraries/haskell/warp/default.nix
+++ b/pkgs/development/libraries/haskell/warp/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "warp";
-  version = "3.0.0.8";
-  sha256 = "0fqv3hch1dd2n0r8gzhgcs3i1v20aysniml7wnj10zsmz048hrk8";
+  version = "3.0.1.1";
+  sha256 = "1sgmcyk9ngys990287wsga3kk6wf29sj414w6jmv8a4sal202mqc";
   buildDepends = [
     autoUpdate blazeBuilder caseInsensitive hashable httpDate httpTypes
     network simpleSendfile streamingCommons text unixCompat void wai

From 7360bbd1793b39a5da20d8e31c3a3ac8d4613d34 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Aug 2014 11:48:09 +0200
Subject: [PATCH 0250/1453] haskell-xss-sanitize: update to version 0.3.5.3

---
 .../libraries/haskell/xss-sanitize/default.nix       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/xss-sanitize/default.nix b/pkgs/development/libraries/haskell/xss-sanitize/default.nix
index c66b615eafbc..acb5fe54bc7b 100644
--- a/pkgs/development/libraries/haskell/xss-sanitize/default.nix
+++ b/pkgs/development/libraries/haskell/xss-sanitize/default.nix
@@ -1,18 +1,18 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, attoparsec, cssText, hspec, HUnit, network, tagsoup, text
-, utf8String
+{ cabal, attoparsec, cssText, hspec, HUnit, networkUri, tagsoup
+, text, utf8String
 }:
 
 cabal.mkDerivation (self: {
   pname = "xss-sanitize";
-  version = "0.3.5.2";
-  sha256 = "1lkawsing0x776078qi1565aj1nr4smxhql1xzfw0bjihbgs1d6b";
+  version = "0.3.5.3";
+  sha256 = "0gd0yxw4dksra4lpa2p6h46pxcqz78g5khqld4lnlz8wphs90bc5";
   buildDepends = [
-    attoparsec cssText network tagsoup text utf8String
+    attoparsec cssText networkUri tagsoup text utf8String
   ];
   testDepends = [
-    attoparsec cssText hspec HUnit network tagsoup text utf8String
+    attoparsec cssText hspec HUnit networkUri tagsoup text utf8String
   ];
   meta = {
     homepage = "http://github.com/yesodweb/haskell-xss-sanitize";

From d404e1120e578cd266763bba7084e34e211539d1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Aug 2014 11:48:12 +0200
Subject: [PATCH 0251/1453] haskell-yesod-auth: update to version 1.3.4.1

---
 .../libraries/haskell/yesod-auth/default.nix         | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix
index 2579946080f5..3a0f166e08f0 100644
--- a/pkgs/development/libraries/haskell/yesod-auth/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix
@@ -4,7 +4,7 @@
 , base64Bytestring, binary, blazeBuilder, blazeHtml, blazeMarkup
 , byteable, conduit, conduitExtra, cryptohash, dataDefault
 , emailValidate, fileEmbed, hamlet, httpClient, httpConduit
-, httpTypes, liftedBase, mimeMail, network, persistent
+, httpTypes, liftedBase, mimeMail, networkUri, persistent
 , persistentTemplate, random, resourcet, safe, shakespeare
 , shakespeareCss, shakespeareJs, text, time, transformers
 , unorderedContainers, wai, yesodCore, yesodForm, yesodPersistent
@@ -12,15 +12,15 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-auth";
-  version = "1.3.4";
-  sha256 = "138wnrs9bf6wl9r4mc1fhshxky7bc6anhgqnwljx4gzvzsd0vq0y";
+  version = "1.3.4.1";
+  sha256 = "0dsb8bn1zgshyaz5d5wpnafi26hrxdp963xcmjx9dia7xd2x1j5m";
   buildDepends = [
     aeson attoparsecConduit authenticate base16Bytestring
     base64Bytestring binary blazeBuilder blazeHtml blazeMarkup byteable
     conduit conduitExtra cryptohash dataDefault emailValidate fileEmbed
-    hamlet httpClient httpConduit httpTypes liftedBase mimeMail network
-    persistent persistentTemplate random resourcet safe shakespeare
-    shakespeareCss shakespeareJs text time transformers
+    hamlet httpClient httpConduit httpTypes liftedBase mimeMail
+    networkUri persistent persistentTemplate random resourcet safe
+    shakespeare shakespeareCss shakespeareJs text time transformers
     unorderedContainers wai yesodCore yesodForm yesodPersistent
   ];
   meta = {

From c6a7af67822fe34f6afd6e03ab36aaf62c8c867c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Aug 2014 11:48:14 +0200
Subject: [PATCH 0252/1453] haskell-yesod-form: update to version 1.3.15.1

---
 pkgs/development/libraries/haskell/yesod-form/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix
index 2b994168d5ee..ab59a1d7b007 100644
--- a/pkgs/development/libraries/haskell/yesod-form/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-form/default.nix
@@ -1,7 +1,7 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, aeson, attoparsec, blazeBuilder, blazeHtml, blazeMarkup
-, byteable, dataDefault, emailValidate, hamlet, hspec, network
+, byteable, dataDefault, emailValidate, hamlet, hspec, networkUri
 , persistent, resourcet, shakespeare, shakespeareCss, shakespeareJs
 , text, time, transformers, wai, xssSanitize, yesodCore
 , yesodPersistent
@@ -9,11 +9,11 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-form";
-  version = "1.3.15";
-  sha256 = "1cyz39892kxa3m3wx8a3sy4fkmhaljvz72r2jq8l5qn2hd0n5b69";
+  version = "1.3.15.1";
+  sha256 = "1sgyjn1a0whk1is57hvqv6fhwvp6jp8p2c0izfc3yqjg7dlwxcwr";
   buildDepends = [
     aeson attoparsec blazeBuilder blazeHtml blazeMarkup byteable
-    dataDefault emailValidate hamlet network persistent resourcet
+    dataDefault emailValidate hamlet networkUri persistent resourcet
     shakespeare shakespeareCss shakespeareJs text time transformers wai
     xssSanitize yesodCore yesodPersistent
   ];

From 18e3aa46722f04553e0685e237057f858db5c0e5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Aug 2014 12:29:00 +0200
Subject: [PATCH 0253/1453] haskell-double-conversion: update to version
 2.0.1.0

---
 .../libraries/haskell/double-conversion/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/double-conversion/default.nix b/pkgs/development/libraries/haskell/double-conversion/default.nix
index 8ad84ea38ebf..7089c9fcd054 100644
--- a/pkgs/development/libraries/haskell/double-conversion/default.nix
+++ b/pkgs/development/libraries/haskell/double-conversion/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "double-conversion";
-  version = "0.2.0.6";
-  sha256 = "1c6hy0ghdqf44fvhdpdxjbcr0ahimw283x5fnvjxja36i71qshjp";
+  version = "2.0.1.0";
+  sha256 = "034ji9jgf3jl0n5pp1nki3lsg173c3b9vniwnwp1q21iasqbawh0";
   buildDepends = [ text ];
   testDepends = [ testFramework testFrameworkQuickcheck2 text ];
   meta = {

From 5cac6895da590a6c9bf55d50d01247a1a14a5d8d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Aug 2014 12:30:54 +0200
Subject: [PATCH 0254/1453] haskell-language-glsl: disable test suit to fix the
 build

https://github.com/noteed/language-glsl/issues/8
---
 pkgs/development/libraries/haskell/language-glsl/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/language-glsl/default.nix b/pkgs/development/libraries/haskell/language-glsl/default.nix
index c259da270323..5edb414a3d09 100644
--- a/pkgs/development/libraries/haskell/language-glsl/default.nix
+++ b/pkgs/development/libraries/haskell/language-glsl/default.nix
@@ -14,6 +14,7 @@ cabal.mkDerivation (self: {
   testDepends = [
     HUnit parsec prettyclass testFramework testFrameworkHunit
   ];
+  doCheck = false;
   meta = {
     description = "GLSL abstract syntax tree, parser, and pretty-printer";
     license = self.stdenv.lib.licenses.bsd3;

From 7c06bb13be3f39103fa013e109feb31615bba369 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Wed, 20 Aug 2014 15:30:18 +0200
Subject: [PATCH 0255/1453] re2c: Fix license reference

---
 pkgs/development/tools/parsing/re2c/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/parsing/re2c/default.nix b/pkgs/development/tools/parsing/re2c/default.nix
index 9aa1890cb84a..5ff4f8ec9db7 100644
--- a/pkgs/development/tools/parsing/re2c/default.nix
+++ b/pkgs/development/tools/parsing/re2c/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Tool for writing very fast and very flexible scanners";
     homepage    = "http://re2c.org";
-    license     = stdenv.lib.license.publicDomain;
+    license     = stdenv.lib.licenses.publicDomain;
     platforms   = stdenv.lib.platforms.all;
     maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
   };

From 5c9157b3294d7c6cda6c32152b254650daa116cf Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Wed, 20 Aug 2014 16:04:10 +0200
Subject: [PATCH 0256/1453] riemann-c-client: Update from 1.2.0 to 1.2.1

---
 pkgs/tools/misc/riemann-c-client/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/riemann-c-client/default.nix b/pkgs/tools/misc/riemann-c-client/default.nix
index 00eaa8aad760..efdc21ad9b79 100644
--- a/pkgs/tools/misc/riemann-c-client/default.nix
+++ b/pkgs/tools/misc/riemann-c-client/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
   name = "riemann-c-client-${version}";
 
-  version = "1.2.0";
+  version = "1.2.1";
 
   src = fetchurl {
     url = "https://github.com/algernon/riemann-c-client/archive/${name}.tar.gz";
-    sha256 = "1w3rx0hva605d5vzlhhm4pb43ady0m3s4mz8ix1ycn4b8cq9jsjs";
+    sha256 = "132yd1m523inmv17sd48xf7xdqb7jj36v7is1xw7w9nny6qxkzwm";
   };
 
   buildInputs = [ autoconf automake libtool pkgconfig file protobufc ];

From bf0e265a61d5376a0931e975917f4677c2f26c39 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Wed, 20 Aug 2014 16:10:20 +0200
Subject: [PATCH 0257/1453] diod: Update from 1.0.21 to 1.0.22

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

diff --git a/pkgs/servers/diod/default.nix b/pkgs/servers/diod/default.nix
index 3b7e7f068af7..0753df43be54 100644
--- a/pkgs/servers/diod/default.nix
+++ b/pkgs/servers/diod/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "diod-${version}";
-  version = "1.0.21";
+  version = "1.0.22";
 
   src = fetchurl {
-    url = "https://github.com/chaos/diod/archive/${version}.tar.gz";
-    sha256 = "1864i42a4rm3f1q68nc19kcshc0hcf6zfgsdq0ppmmwry4mrvij0";
+    url = "https://github.com/chaos/diod/releases/download/${version}/${name}.tar.gz";
+    sha256 = "0h92zadbkq4fjhqjzq17cl3x7bdkz2yakpcl0nccv4ml0gwfbx27";
   };
 
   buildInputs = [ munge lua5 libcap perl ncurses ];

From 77437983a20c2ffb24796fa5f2272307b767a724 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Wed, 20 Aug 2014 16:27:47 +0200
Subject: [PATCH 0258/1453] Slic3r: Bump to 1.1.7.

---
 pkgs/applications/misc/slic3r/default.nix | 32 ++++++++++++++---------
 pkgs/top-level/all-packages.nix           |  4 +--
 pkgs/top-level/perl-packages.nix          | 21 ++++++++++++---
 3 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix
index 203ef7d84a7e..06a5cca94a8d 100644
--- a/pkgs/applications/misc/slic3r/default.nix
+++ b/pkgs/applications/misc/slic3r/default.nix
@@ -1,25 +1,23 @@
 { stdenv, fetchgit, perl, makeWrapper, makeDesktopItem
-# Perl modules:
-, EncodeLocale, MathClipper, ExtUtilsXSpp, BoostGeometryUtils
-, MathConvexHullMonotoneChain, MathGeometryVoronoi, MathPlanePath, Moo
-, IOStringy, ClassXSAccessor, Wx, GrowlGNTP, NetDBus
+, which, perlPackages
 }:
 
 stdenv.mkDerivation rec {
-  version = "0.9.10b";
+  version = "1.1.7";
   name = "slic3r-${version}";
 
   # Slic3r doesn't put out tarballs, only a git repository is available
   src = fetchgit {
     url = "git://github.com/alexrj/Slic3r";
     rev = "refs/tags/${version}";
-    sha256 = "0j06h0z65qn4kyb2b7pnq6bcn4al60q227iz9jlrin0ffx3l0ra7";
+    sha256 = "0hss90iw4xwca08d03wrz0fds5nqwb9zjqii2n6rgpcl4km69fka";
   };
 
-  buildInputs = [ perl makeWrapper
+  buildInputs = with perlPackages; [ perl makeWrapper which
     EncodeLocale MathClipper ExtUtilsXSpp BoostGeometryUtils
     MathConvexHullMonotoneChain MathGeometryVoronoi MathPlanePath Moo
-    IOStringy ClassXSAccessor Wx GrowlGNTP NetDBus
+    IOStringy ClassXSAccessor Wx GrowlGNTP NetDBus ImportInto XMLSAX
+    ExtUtilsMakeMaker
   ];
 
   desktopItem = makeDesktopItem {
@@ -32,13 +30,23 @@ stdenv.mkDerivation rec {
     categories = "Application;Development;";
   };
 
-  # Nothing to do here
-  buildPhase = "true";
+  buildPhase = ''
+    export SLIC3R_NO_AUTO=true
+    export PERL5LIB="./xs/blib/arch/:./xs/blib/lib:$PERL5LIB"
+
+    pushd xs
+      perl Build.PL
+      perl Build
+    popd
+
+    perl Build.PL
+  '';
 
   installPhase = ''
     mkdir -p "$out/share/slic3r/"
     cp -r * "$out/share/slic3r/"
-    wrapProgram "$out/share/slic3r/slic3r.pl" --prefix PERL5LIB : $PERL5LIB
+    wrapProgram "$out/share/slic3r/slic3r.pl" \
+      --prefix PERL5LIB : "$out/share/slic3r/xs/blib/arch:$out/share/slic3r/xs/blib/lib:$PERL5LIB"
     mkdir -p "$out/bin"
     ln -s "$out/share/slic3r/slic3r.pl" "$out/bin/slic3r"
     mkdir -p "$out/share/pixmaps/"
@@ -57,6 +65,6 @@ stdenv.mkDerivation rec {
     homepage = http://slic3r.org/;
     license = licenses.agpl3;
     platforms = platforms.linux;
-    maintainers = [ maintainers.bjornfor ];
+    maintainers = with maintainers; [ bjornfor the-kenny ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4c38aed4dd5e..14ba90197929 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9655,9 +9655,7 @@ let
 
   # slic3r 0.9.10b says: "Running Slic3r under Perl >= 5.16 is not supported nor recommended"
   slic3r = callPackage ../applications/misc/slic3r {
-    inherit (perl514Packages) EncodeLocale MathClipper ExtUtilsXSpp
-            BoostGeometryUtils MathConvexHullMonotoneChain MathGeometryVoronoi
-            MathPlanePath Moo IOStringy ClassXSAccessor Wx GrowlGNTP NetDBus;
+    perlPackages = perl514Packages;
     perl = perl514;
   };
 
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index b37ce6581cd3..8895d4d093b2 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4407,6 +4407,19 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  ImportInto = buildPerlPackage {
+    name = "Import-Into-1.002004";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/E/ET/ETHER/Import-Into-1.002004.tar.gz;
+      sha256 = "110hifk3cj14lxgjq2vaa2qfja21gll4lpn8vbimy0gzqadjbjyy";
+    };
+    propagatedBuildInputs = [ ModuleRuntime ];
+    meta = {
+      description = "Import packages into other packages";
+      license = "perl";
+    };
+  };
+
   IOAll = buildPerlPackage {
     name = "IO-All-0.60";
     src = fetchurl {
@@ -5680,12 +5693,12 @@ let self = _self // overrides; _self = with self; {
   };
 
   Moo = buildPerlPackage {
-    name = "Moo-1.000007";
+    name = "Moo-1.006000";
     src = fetchurl {
-      url = mirror://cpan/authors/id/M/MS/MSTROUT/Moo-1.000007.tar.gz;
-      sha256 = "02q5j5vsfv8ykzmkqk8zac88svard4g6rl455slgz8y2w3xn41ql";
+      url = mirror://cpan/authors/id/H/HA/HAARG/Moo-1.006000.tar.gz;
+      sha256 = "0gjh6dyz825cwjibq2wlpx14drjqx4pxxh931p4x3jd2617hax17";
     };
-    buildInputs = [ TestFatal ];
+    buildInputs = [ TestFatal ImportInto ];
     propagatedBuildInputs = [ ClassMethodModifiers DevelGlobalDestruction ModuleRuntime RoleTiny strictures ];
     meta = {
       description = "Minimalist Object Orientation (with Moose compatiblity)";

From 16bbf0085119c7a2215b0a8a43e78131f46b5231 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Wed, 20 Aug 2014 17:06:34 +0200
Subject: [PATCH 0259/1453] munge: Update from 0.5.10 to 0.5.11

---
 pkgs/tools/security/munge/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/munge/default.nix b/pkgs/tools/security/munge/default.nix
index 2b6cd2243711..f94eaabd2a4b 100644
--- a/pkgs/tools/security/munge/default.nix
+++ b/pkgs/tools/security/munge/default.nix
@@ -1,18 +1,18 @@
 { stdenv, fetchurl, gnused, perl, libgcrypt, zlib, bzip2 }:
 
 stdenv.mkDerivation rec {
-  name = "munge-0.5.10";
+  name = "munge-0.5.11";
 
   src = fetchurl {
     url = "http://munge.googlecode.com/files/${name}.tar.bz2";
-    sha256 = "1imbmpd70vkcpca8d9yd9ajkhf6ik057nr3jb1app1wm51f15q00";
+    sha256 = "19aijdrjij2g0xpqgl198jh131j94p4gvam047gsdc0wz0a5c1wf";
   };
 
   buildInputs = [ gnused perl libgcrypt zlib bzip2 ];
 
   preConfigure = ''
     # Remove the install-data stuff, since it tries to write to /var
-    sed -i '434,465d' src/etc/Makefile.in
+    sed -i '505,511d' src/etc/Makefile.in
   '';
 
   configureFlags = [

From f28d8c2dc43fc14598f4ecbea2cba3974263a278 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Wed, 11 Jun 2014 21:52:53 +0200
Subject: [PATCH 0260/1453] CUPS system wide client configuration.

---
 nixos/modules/services/printing/cupsd.nix | 24 ++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
index d229c610669f..8a8085cad280 100644
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@@ -35,7 +35,7 @@ let
   bindir = pkgs.buildEnv {
     name = "cups-progs";
     paths = cfg.drivers;
-    pathsToLink = [ "/lib/cups" "/share/cups" "/bin" ];
+    pathsToLink = [ "/lib/cups" "/share/cups" "/bin" "/etc/cups" ];
     postBuild = cfg.bindirCmds;
   };
 
@@ -89,6 +89,20 @@ in
         '';
       };
 
+      clientConf = mkOption {
+        type = types.lines;
+        default = "";
+        example =
+          ''
+            ServerName server.example.com
+            Encryption Never
+          '';
+        description = ''
+          The contents of the client configuration.
+          (<filename>client.conf</filename>)
+        '';
+      };
+
       drivers = mkOption {
         type = types.listOf types.path;
         example = literalExample "[ pkgs.splix ]";
@@ -124,6 +138,14 @@ in
 
     environment.systemPackages = [ cups ];
 
+    environment.variables.CUPS_SERVERROOT = "/etc/cups";
+
+    environment.etc = [
+      { source = pkgs.writeText "client.conf" cfg.clientConf;
+        target = "cups/client.conf";
+      }
+    ];
+
     services.dbus.packages = [ cups ];
 
     # Cups uses libusb to talk to printers, and does not use the

From c3565da080492bc0cbfc4e2d921e1bfe28535291 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Aug 2014 19:17:10 +0200
Subject: [PATCH 0261/1453] haskell-force-layout: update to version 0.3.0.6

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

diff --git a/pkgs/development/libraries/haskell/force-layout/default.nix b/pkgs/development/libraries/haskell/force-layout/default.nix
index 99cd863b7c48..77259cc1e401 100644
--- a/pkgs/development/libraries/haskell/force-layout/default.nix
+++ b/pkgs/development/libraries/haskell/force-layout/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "force-layout";
-  version = "0.3.0.5";
-  sha256 = "01wk8zygw9d3r5dwbycyab82kfk8s05ynnajb6kfjv7i09s9sgcb";
+  version = "0.3.0.6";
+  sha256 = "0qmzz9gbzf1jdk08w3nhnw7l3n5bq5sw5k4r0mdc5y11m38xpgm4";
   buildDepends = [
     dataDefaultClass lens vectorSpace vectorSpacePoints
   ];

From a2cd9ceab1774afcecd867193b39d25ae3566baf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Aug 2014 19:17:12 +0200
Subject: [PATCH 0262/1453] haskell-language-glsl: update to version 0.1.1

---
 pkgs/development/libraries/haskell/language-glsl/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/language-glsl/default.nix b/pkgs/development/libraries/haskell/language-glsl/default.nix
index 5edb414a3d09..6d983123cb65 100644
--- a/pkgs/development/libraries/haskell/language-glsl/default.nix
+++ b/pkgs/development/libraries/haskell/language-glsl/default.nix
@@ -6,15 +6,14 @@
 
 cabal.mkDerivation (self: {
   pname = "language-glsl";
-  version = "0.1.0";
-  sha256 = "0jr6jwxsfpmnjrnaary37s2i47akq665fnyvv37cp6j928srjizf";
+  version = "0.1.1";
+  sha256 = "06dc339a2cddzgjda3nzprgr0v2clbhlpl8j81m04i66bbj2l15y";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ parsec prettyclass ];
   testDepends = [
     HUnit parsec prettyclass testFramework testFrameworkHunit
   ];
-  doCheck = false;
   meta = {
     description = "GLSL abstract syntax tree, parser, and pretty-printer";
     license = self.stdenv.lib.licenses.bsd3;

From b48153160ec69f5d9c5c87ec120c1d1534cdadf6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Aug 2014 19:17:16 +0200
Subject: [PATCH 0263/1453] haskell-wai-logger: update to version 2.2.3

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

diff --git a/pkgs/development/libraries/haskell/wai-logger/default.nix b/pkgs/development/libraries/haskell/wai-logger/default.nix
index 69e3d4647282..7acf82bd2fcc 100644
--- a/pkgs/development/libraries/haskell/wai-logger/default.nix
+++ b/pkgs/development/libraries/haskell/wai-logger/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai-logger";
-  version = "2.2.1";
-  sha256 = "0210phkadr5ndpx6ppmygir0mxnpjffvccjb4lnpjnwy2ydf0lzy";
+  version = "2.2.3";
+  sha256 = "0ljpzq3yfiz3xfglvj69jdk46lmgsg6nqncv9mhij4ih6qq0cx0w";
   buildDepends = [
     autoUpdate blazeBuilder byteorder caseInsensitive easyFile
     fastLogger httpTypes network unixTime wai

From 701af305d3f2b448dafa380f0dfc541d13bb91db Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Aug 2014 19:17:18 +0200
Subject: [PATCH 0264/1453] haskell-xss-sanitize: update to version 0.3.5.4

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

diff --git a/pkgs/development/libraries/haskell/xss-sanitize/default.nix b/pkgs/development/libraries/haskell/xss-sanitize/default.nix
index acb5fe54bc7b..4b1edfb5e8bc 100644
--- a/pkgs/development/libraries/haskell/xss-sanitize/default.nix
+++ b/pkgs/development/libraries/haskell/xss-sanitize/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "xss-sanitize";
-  version = "0.3.5.3";
-  sha256 = "0gd0yxw4dksra4lpa2p6h46pxcqz78g5khqld4lnlz8wphs90bc5";
+  version = "0.3.5.4";
+  sha256 = "1h9dj234sj216g676la0h73nwm0fw4snik31qi0s754vyy6bcygf";
   buildDepends = [
     attoparsec cssText networkUri tagsoup text utf8String
   ];

From 020027d84e6b8cb3757dc81e5b89c08bcdf5ad65 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Aug 2014 19:17:20 +0200
Subject: [PATCH 0265/1453] haskell-yesod-auth: update to version 1.3.4.2

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

diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix
index 3a0f166e08f0..1224e105c3fe 100644
--- a/pkgs/development/libraries/haskell/yesod-auth/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix
@@ -12,8 +12,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-auth";
-  version = "1.3.4.1";
-  sha256 = "0dsb8bn1zgshyaz5d5wpnafi26hrxdp963xcmjx9dia7xd2x1j5m";
+  version = "1.3.4.2";
+  sha256 = "0hf5x1qhpxil3na7f1vdjr5i5n7q41a23ikkra9avg3yss94k04d";
   buildDepends = [
     aeson attoparsecConduit authenticate base16Bytestring
     base64Bytestring binary blazeBuilder blazeHtml blazeMarkup byteable

From ce14313c698303dfbab7303f3c53f4a13eecbd27 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Aug 2014 19:17:22 +0200
Subject: [PATCH 0266/1453] haskell-yesod-bin: update to version 1.2.12.4

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

diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix
index dbf98e1457b2..27a1c1522ef9 100644
--- a/pkgs/development/libraries/haskell/yesod-bin/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix
@@ -12,8 +12,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-bin";
-  version = "1.2.12.3";
-  sha256 = "0pm7wwml2574fsimibhhb47s6fn19cdips4p419k7j8g62v4kfzx";
+  version = "1.2.12.4";
+  sha256 = "1pg1zxixgsqz5da2dhs94zi77h63jz3llf0049fgdfg166c685vj";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [

From 07451adc93a0731c0357466c4070afd6ccdfe15c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Aug 2014 19:17:24 +0200
Subject: [PATCH 0267/1453] haskell-yesod-form: update to version 1.3.15.2

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

diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix
index ab59a1d7b007..57f456823c2d 100644
--- a/pkgs/development/libraries/haskell/yesod-form/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-form/default.nix
@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-form";
-  version = "1.3.15.1";
-  sha256 = "1sgyjn1a0whk1is57hvqv6fhwvp6jp8p2c0izfc3yqjg7dlwxcwr";
+  version = "1.3.15.2";
+  sha256 = "05r7w65n63qrlvxlm2j4s0vin4p7gc4cqa8j83465mnl1dzxliy1";
   buildDepends = [
     aeson attoparsec blazeBuilder blazeHtml blazeMarkup byteable
     dataDefault emailValidate hamlet networkUri persistent resourcet

From 3b096e601a8f6fd85d5dbe8767ce396ecc3a1b32 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Aug 2014 19:29:20 +0200
Subject: [PATCH 0268/1453] haskell-time-1.4.2: disable test suite to fix build
 error because the version of test-framework doesn't match

---
 pkgs/development/libraries/haskell/time/1.4.2.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/time/1.4.2.nix b/pkgs/development/libraries/haskell/time/1.4.2.nix
index f838080ad3d9..5e8d967b8dc8 100644
--- a/pkgs/development/libraries/haskell/time/1.4.2.nix
+++ b/pkgs/development/libraries/haskell/time/1.4.2.nix
@@ -12,6 +12,7 @@ cabal.mkDerivation (self: {
   testDepends = [
     Cabal deepseq QuickCheck testFramework testFrameworkQuickcheck2
   ];
+  doCheck = false;
   meta = {
     homepage = "http://semantic.org/TimeLib/";
     description = "A time library";

From e910c8d6c945b9df3c7a9d35218ad3b9f3fddd46 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Aug 2014 19:34:45 +0200
Subject: [PATCH 0269/1453] Disable Hydra builds for broken Haskell packages.

The following packages are broken with GHC 7.8.3:

 - filesystem-conduit version 1.0.0.2
 - ghc-events-analyze version 0.2.0
 - haskelldb version 2.2.2
 - haskell-mpi version 1.2.1
 - haxr-th version 3000.5
 - hoauth version 0.3.5
 - holy-project version 0.1.1.0
 - hoogle version 4.2.32
 - hspread version 0.3.3
 - instant-generics version 0.4
 - ivor version 0.1.14.1
 - jmacro-rpc-happstack version 0.3
 - lambdacube-engine version 0.2.4
 - language-c-inline version 0.6.0.0
 - lockfree-queue version 0.2.3
 - monad-peel version 0.1.1
 - network-transport-tests version 0.1.0.1
 - poppler version 0.12.3
 - profiteur version 0.1.2.1
 - prolog-graph-lib version 0.2.0.1
 - semigroupoid-extras version 4.0
 - setlocale version 0.0.3
 - sized-types version 0.5.0
 - snaplet-postgresql-simple version 0.5
 - snap-loader-dynamic version 0.10.0.2
 - uhc git version 20120502
 - uniqueid version 0.1.1
 - unix-process-conduit version 0.2.2.3
 - vado version 0.0.1
 - vcsgui version 0.0.4
 - xml-html-conduit-lens version 0.3.2.0

The following packages depend on one of the broken ones above:

 - hoodle-builder version 0.3
 - hoodle-core version 0.14
 - hoodle-extra version 0.1
 - hoodle-parser version 0.3
 - hoodle-render version 0.4
 - hoodle-types version 0.3
 - hoodle version 0.3
 - kansas-lava version 0.2.4
 - liblastfm version 0.4.0.0
 - prolog-graph version 0.1.0.2
 - vacuum-cairo version 0.5
 - wcwidth version 0.0.2
---
 pkgs/applications/graphics/hoodle/default.nix                | 1 +
 pkgs/development/compilers/uhc/default.nix                   | 5 ++---
 .../libraries/haskell/filesystem-conduit/default.nix         | 2 ++
 pkgs/development/libraries/haskell/haskell-mpi/default.nix   | 2 ++
 pkgs/development/libraries/haskell/haskelldb/default.nix     | 2 ++
 pkgs/development/libraries/haskell/haxr-th/default.nix       | 2 ++
 pkgs/development/libraries/haskell/hoauth/default.nix        | 2 ++
 pkgs/development/libraries/haskell/holy-project/default.nix  | 2 ++
 .../development/libraries/haskell/hoodle-builder/default.nix | 1 +
 pkgs/development/libraries/haskell/hoodle-core/default.nix   | 1 +
 pkgs/development/libraries/haskell/hoodle-extra/default.nix  | 1 +
 pkgs/development/libraries/haskell/hoodle-parser/default.nix | 1 +
 pkgs/development/libraries/haskell/hoodle-render/default.nix | 1 +
 pkgs/development/libraries/haskell/hoodle-types/default.nix  | 1 +
 pkgs/development/libraries/haskell/hoogle/local.nix          | 4 +++-
 pkgs/development/libraries/haskell/hspread/default.nix       | 2 ++
 .../libraries/haskell/instant-generics/default.nix           | 2 ++
 pkgs/development/libraries/haskell/ivor/default.nix          | 2 ++
 .../libraries/haskell/jmacro-rpc-happstack/default.nix       | 2 ++
 pkgs/development/libraries/haskell/kansas-lava/default.nix   | 1 +
 .../libraries/haskell/lambdacube-engine/default.nix          | 2 ++
 .../libraries/haskell/language-c-inline/default.nix          | 2 ++
 pkgs/development/libraries/haskell/liblastfm/default.nix     | 1 +
 .../development/libraries/haskell/lockfree-queue/default.nix | 2 ++
 pkgs/development/libraries/haskell/monad-peel/default.nix    | 2 ++
 .../libraries/haskell/network-transport-tests/default.nix    | 2 ++
 pkgs/development/libraries/haskell/poppler/default.nix       | 2 ++
 .../libraries/haskell/prolog-graph-lib/default.nix           | 2 ++
 pkgs/development/libraries/haskell/prolog-graph/default.nix  | 1 +
 .../libraries/haskell/semigroupoid-extras/default.nix        | 2 ++
 pkgs/development/libraries/haskell/setlocale/default.nix     | 2 ++
 pkgs/development/libraries/haskell/sized-types/default.nix   | 2 ++
 pkgs/development/libraries/haskell/snap/loader-dynamic.nix   | 2 ++
 .../libraries/haskell/snaplet-postgresql-simple/default.nix  | 2 ++
 .../{strictConcurrency => strict-concurrency}/default.nix    | 2 ++
 pkgs/development/libraries/haskell/uniqueid/default.nix      | 2 ++
 .../libraries/haskell/unix-process-conduit/default.nix       | 2 ++
 pkgs/development/libraries/haskell/vacuum-cairo/default.nix  | 1 +
 pkgs/development/libraries/haskell/vado/default.nix          | 2 ++
 pkgs/development/libraries/haskell/vcsgui/default.nix        | 2 ++
 pkgs/development/libraries/haskell/wcwidth/default.nix       | 1 +
 .../libraries/haskell/xml-html-conduit-lens/default.nix      | 2 ++
 .../development/tools/haskell/ghc-events-analyze/default.nix | 2 ++
 pkgs/development/tools/haskell/profiteur/default.nix         | 2 ++
 pkgs/top-level/haskell-packages.nix                          | 2 +-
 45 files changed, 78 insertions(+), 5 deletions(-)
 rename pkgs/development/libraries/haskell/{strictConcurrency => strict-concurrency}/default.nix (87%)

diff --git a/pkgs/applications/graphics/hoodle/default.nix b/pkgs/applications/graphics/hoodle/default.nix
index 79966a2698fc..afa3a8ca0c7c 100644
--- a/pkgs/applications/graphics/hoodle/default.nix
+++ b/pkgs/applications/graphics/hoodle/default.nix
@@ -16,6 +16,7 @@ cabal.mkDerivation (self: {
     description = "Executable for hoodle";
     license = self.stdenv.lib.licenses.gpl3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
     maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
   };
 })
diff --git a/pkgs/development/compilers/uhc/default.nix b/pkgs/development/compilers/uhc/default.nix
index 31f45086ba0a..2f179d17548e 100644
--- a/pkgs/development/compilers/uhc/default.nix
+++ b/pkgs/development/compilers/uhc/default.nix
@@ -42,8 +42,7 @@ in stdenv.mkDerivation {
     homepage = "http://www.cs.uu.nl/wiki/UHC";
     description = "Utrecht Haskell Compiler";
     platforms = stdenv.lib.platforms.linux;
-    maintainers = [
-      stdenv.lib.maintainers.andres
-    ];
+    hydraPlatforms = stdenv.lib.platforms.none;
+    broken = true;
   };
 }
diff --git a/pkgs/development/libraries/haskell/filesystem-conduit/default.nix b/pkgs/development/libraries/haskell/filesystem-conduit/default.nix
index ecf9ae65e2eb..35c3302641d5 100644
--- a/pkgs/development/libraries/haskell/filesystem-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/filesystem-conduit/default.nix
@@ -19,5 +19,7 @@ cabal.mkDerivation (self: {
     description = "Use system-filepath data types with conduits. (deprecated)";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
+    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/haskell-mpi/default.nix b/pkgs/development/libraries/haskell/haskell-mpi/default.nix
index 25d3dfc43175..b7d9bf991481 100644
--- a/pkgs/development/libraries/haskell/haskell-mpi/default.nix
+++ b/pkgs/development/libraries/haskell/haskell-mpi/default.nix
@@ -16,5 +16,7 @@ cabal.mkDerivation (self: {
     description = "Distributed parallel programming in Haskell using MPI";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
+    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/haskelldb/default.nix b/pkgs/development/libraries/haskell/haskelldb/default.nix
index 79e617b33a3a..ecb92c184934 100644
--- a/pkgs/development/libraries/haskell/haskelldb/default.nix
+++ b/pkgs/development/libraries/haskell/haskelldb/default.nix
@@ -13,5 +13,7 @@ cabal.mkDerivation (self: {
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
+    hydraPlatforms = self.stdenv.lib.platforms.none;
+    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/haxr-th/default.nix b/pkgs/development/libraries/haskell/haxr-th/default.nix
index 1fe9a943a950..7d7e8282e288 100644
--- a/pkgs/development/libraries/haskell/haxr-th/default.nix
+++ b/pkgs/development/libraries/haskell/haxr-th/default.nix
@@ -12,5 +12,7 @@ cabal.mkDerivation (self: {
     description = "Automatic deriving of XML-RPC structs for Haskell records";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
+    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/hoauth/default.nix b/pkgs/development/libraries/haskell/hoauth/default.nix
index 29e4cc44bd25..8ccbfad945c1 100644
--- a/pkgs/development/libraries/haskell/hoauth/default.nix
+++ b/pkgs/development/libraries/haskell/hoauth/default.nix
@@ -16,5 +16,7 @@ cabal.mkDerivation (self: {
     description = "A Haskell implementation of OAuth 1.0a protocol.";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
+    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/holy-project/default.nix b/pkgs/development/libraries/haskell/holy-project/default.nix
index 09141bf6d0a4..088bbe4d4ea8 100644
--- a/pkgs/development/libraries/haskell/holy-project/default.nix
+++ b/pkgs/development/libraries/haskell/holy-project/default.nix
@@ -28,5 +28,7 @@ cabal.mkDerivation (self: {
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.tomberek ];
+    hydraPlatforms = self.stdenv.lib.platforms.none;
+    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/hoodle-builder/default.nix b/pkgs/development/libraries/haskell/hoodle-builder/default.nix
index ca9951d99dc6..8e74edc8e6a5 100644
--- a/pkgs/development/libraries/haskell/hoodle-builder/default.nix
+++ b/pkgs/development/libraries/haskell/hoodle-builder/default.nix
@@ -15,6 +15,7 @@ cabal.mkDerivation (self: {
     description = "text builder for hoodle file format";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
     maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hoodle-core/default.nix b/pkgs/development/libraries/haskell/hoodle-core/default.nix
index 81854479f63e..e63b68261d43 100644
--- a/pkgs/development/libraries/haskell/hoodle-core/default.nix
+++ b/pkgs/development/libraries/haskell/hoodle-core/default.nix
@@ -29,6 +29,7 @@ cabal.mkDerivation (self: {
     description = "Core library for hoodle";
     license = self.stdenv.lib.licenses.gpl3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
     maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hoodle-extra/default.nix b/pkgs/development/libraries/haskell/hoodle-extra/default.nix
index af46f77b730c..c26932f10178 100644
--- a/pkgs/development/libraries/haskell/hoodle-extra/default.nix
+++ b/pkgs/development/libraries/haskell/hoodle-extra/default.nix
@@ -24,6 +24,7 @@ cabal.mkDerivation (self: {
     description = "extra hoodle tools";
     license = self.stdenv.lib.licenses.gpl3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
     maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hoodle-parser/default.nix b/pkgs/development/libraries/haskell/hoodle-parser/default.nix
index 0b0ae2550eb9..8684a754648d 100644
--- a/pkgs/development/libraries/haskell/hoodle-parser/default.nix
+++ b/pkgs/development/libraries/haskell/hoodle-parser/default.nix
@@ -17,6 +17,7 @@ cabal.mkDerivation (self: {
     description = "Hoodle file parser";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
     maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hoodle-render/default.nix b/pkgs/development/libraries/haskell/hoodle-render/default.nix
index 6f025744c19c..71e390222510 100644
--- a/pkgs/development/libraries/haskell/hoodle-render/default.nix
+++ b/pkgs/development/libraries/haskell/hoodle-render/default.nix
@@ -18,6 +18,7 @@ cabal.mkDerivation (self: {
     description = "Hoodle file renderer";
     license = self.stdenv.lib.licenses.gpl3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
     maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hoodle-types/default.nix b/pkgs/development/libraries/haskell/hoodle-types/default.nix
index e97251961e75..22bc514e153b 100644
--- a/pkgs/development/libraries/haskell/hoodle-types/default.nix
+++ b/pkgs/development/libraries/haskell/hoodle-types/default.nix
@@ -11,6 +11,7 @@ cabal.mkDerivation (self: {
     description = "Data types for programs for hoodle file format";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
     maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hoogle/local.nix b/pkgs/development/libraries/haskell/hoogle/local.nix
index eebfd0224d26..490898a75b20 100644
--- a/pkgs/development/libraries/haskell/hoogle/local.nix
+++ b/pkgs/development/libraries/haskell/hoogle/local.nix
@@ -5,7 +5,7 @@
 # It is intended to be used in config.nix similarly to:
 #
 # { packageOverrides = pkgs: rec {
-# 
+#
 #   haskellPackages =
 #     let callPackage = pkgs.lib.callPackageWith haskellPackages;
 #     in pkgs.recurseIntoAttrs (pkgs.haskellPackages.override {
@@ -117,5 +117,7 @@ cabal.mkDerivation (self: rec {
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.jwiegley ];
+    hydraPlatforms = self.stdenv.lib.platforms.none;
+    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/hspread/default.nix b/pkgs/development/libraries/haskell/hspread/default.nix
index 542bc35738ef..975fcb784d81 100644
--- a/pkgs/development/libraries/haskell/hspread/default.nix
+++ b/pkgs/development/libraries/haskell/hspread/default.nix
@@ -11,5 +11,7 @@ cabal.mkDerivation (self: {
     description = "A client library for the spread toolkit";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
+    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/instant-generics/default.nix b/pkgs/development/libraries/haskell/instant-generics/default.nix
index fc9e45789575..d5c0137a2c61 100644
--- a/pkgs/development/libraries/haskell/instant-generics/default.nix
+++ b/pkgs/development/libraries/haskell/instant-generics/default.nix
@@ -12,5 +12,7 @@ cabal.mkDerivation (self: {
     description = "Generic programming library with a sum of products view";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
+    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/ivor/default.nix b/pkgs/development/libraries/haskell/ivor/default.nix
index d23bf36731fb..7a80a14853ec 100644
--- a/pkgs/development/libraries/haskell/ivor/default.nix
+++ b/pkgs/development/libraries/haskell/ivor/default.nix
@@ -12,5 +12,7 @@ cabal.mkDerivation (self: {
     description = "Theorem proving library based on dependent type theory";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
+    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/jmacro-rpc-happstack/default.nix b/pkgs/development/libraries/haskell/jmacro-rpc-happstack/default.nix
index c8c7c503ea93..f787073f0808 100644
--- a/pkgs/development/libraries/haskell/jmacro-rpc-happstack/default.nix
+++ b/pkgs/development/libraries/haskell/jmacro-rpc-happstack/default.nix
@@ -15,5 +15,7 @@ cabal.mkDerivation (self: {
     description = "Happstack backend for jmacro-rpc";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
+    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/kansas-lava/default.nix b/pkgs/development/libraries/haskell/kansas-lava/default.nix
index 55f7dfa595a6..f81f17a3c274 100644
--- a/pkgs/development/libraries/haskell/kansas-lava/default.nix
+++ b/pkgs/development/libraries/haskell/kansas-lava/default.nix
@@ -20,5 +20,6 @@ cabal.mkDerivation (self: {
     description = "Kansas Lava is a hardware simulator and VHDL generator";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
   };
 })
diff --git a/pkgs/development/libraries/haskell/lambdacube-engine/default.nix b/pkgs/development/libraries/haskell/lambdacube-engine/default.nix
index 169660d27c37..62f090471013 100644
--- a/pkgs/development/libraries/haskell/lambdacube-engine/default.nix
+++ b/pkgs/development/libraries/haskell/lambdacube-engine/default.nix
@@ -17,5 +17,7 @@ cabal.mkDerivation (self: {
     description = "3D rendering engine written entirely in Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
+    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/language-c-inline/default.nix b/pkgs/development/libraries/haskell/language-c-inline/default.nix
index d76235342780..435ffef45c32 100644
--- a/pkgs/development/libraries/haskell/language-c-inline/default.nix
+++ b/pkgs/development/libraries/haskell/language-c-inline/default.nix
@@ -14,5 +14,7 @@ cabal.mkDerivation (self: {
     description = "Inline C & Objective-C code in Haskell for language interoperability";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
+    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/liblastfm/default.nix b/pkgs/development/libraries/haskell/liblastfm/default.nix
index 8ea830d0c392..176f80048c4d 100644
--- a/pkgs/development/libraries/haskell/liblastfm/default.nix
+++ b/pkgs/development/libraries/haskell/liblastfm/default.nix
@@ -23,5 +23,6 @@ cabal.mkDerivation (self: {
     description = "Lastfm API interface";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
   };
 })
diff --git a/pkgs/development/libraries/haskell/lockfree-queue/default.nix b/pkgs/development/libraries/haskell/lockfree-queue/default.nix
index 822cfb29c1d7..6864d4c5fc42 100644
--- a/pkgs/development/libraries/haskell/lockfree-queue/default.nix
+++ b/pkgs/development/libraries/haskell/lockfree-queue/default.nix
@@ -18,5 +18,7 @@ cabal.mkDerivation (self: {
     description = "Michael and Scott lock-free queues";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
+    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/monad-peel/default.nix b/pkgs/development/libraries/haskell/monad-peel/default.nix
index 71520d2466a8..b7ffb95b9dfb 100644
--- a/pkgs/development/libraries/haskell/monad-peel/default.nix
+++ b/pkgs/development/libraries/haskell/monad-peel/default.nix
@@ -12,5 +12,7 @@ cabal.mkDerivation (self: {
     description = "Lift control operations like exception catching through monad transformers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
+    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/network-transport-tests/default.nix b/pkgs/development/libraries/haskell/network-transport-tests/default.nix
index 15d54633b502..2dc5036899b0 100644
--- a/pkgs/development/libraries/haskell/network-transport-tests/default.nix
+++ b/pkgs/development/libraries/haskell/network-transport-tests/default.nix
@@ -12,5 +12,7 @@ cabal.mkDerivation (self: {
     description = "Unit tests for Network.Transport implementations";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
+    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/poppler/default.nix b/pkgs/development/libraries/haskell/poppler/default.nix
index dbc21e89f092..327744560acb 100644
--- a/pkgs/development/libraries/haskell/poppler/default.nix
+++ b/pkgs/development/libraries/haskell/poppler/default.nix
@@ -18,5 +18,7 @@ cabal.mkDerivation (self: {
     license = self.stdenv.lib.licenses.gpl2;
     platforms = self.ghc.meta.platforms;
     maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
+    hydraPlatforms = self.stdenv.lib.platforms.none;
+    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/prolog-graph-lib/default.nix b/pkgs/development/libraries/haskell/prolog-graph-lib/default.nix
index 045c4dc20047..73ddd10427a5 100644
--- a/pkgs/development/libraries/haskell/prolog-graph-lib/default.nix
+++ b/pkgs/development/libraries/haskell/prolog-graph-lib/default.nix
@@ -12,5 +12,7 @@ cabal.mkDerivation (self: {
     description = "Generating images of resolution trees for Prolog queries";
     license = self.stdenv.lib.licenses.publicDomain;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
+    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/prolog-graph/default.nix b/pkgs/development/libraries/haskell/prolog-graph/default.nix
index 9b3e5c8be2e6..7a8d0fc42f2c 100644
--- a/pkgs/development/libraries/haskell/prolog-graph/default.nix
+++ b/pkgs/development/libraries/haskell/prolog-graph/default.nix
@@ -17,5 +17,6 @@ cabal.mkDerivation (self: {
     description = "A command line tool to visualize query resolution in Prolog";
     license = self.stdenv.lib.licenses.publicDomain;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
   };
 })
diff --git a/pkgs/development/libraries/haskell/semigroupoid-extras/default.nix b/pkgs/development/libraries/haskell/semigroupoid-extras/default.nix
index a12c8c449c57..13b005a98a92 100644
--- a/pkgs/development/libraries/haskell/semigroupoid-extras/default.nix
+++ b/pkgs/development/libraries/haskell/semigroupoid-extras/default.nix
@@ -12,5 +12,7 @@ cabal.mkDerivation (self: {
     description = "This package has been absorbed into semigroupoids 4.0";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
+    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/setlocale/default.nix b/pkgs/development/libraries/haskell/setlocale/default.nix
index 4094fc221107..fcfd2d34d586 100644
--- a/pkgs/development/libraries/haskell/setlocale/default.nix
+++ b/pkgs/development/libraries/haskell/setlocale/default.nix
@@ -10,5 +10,7 @@ cabal.mkDerivation (self: {
     description = "A Haskell interface to setlocale()";
     license = self.stdenv.lib.licenses.publicDomain;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
+    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/sized-types/default.nix b/pkgs/development/libraries/haskell/sized-types/default.nix
index 23f4fa7fa1c3..67af162a2a89 100644
--- a/pkgs/development/libraries/haskell/sized-types/default.nix
+++ b/pkgs/development/libraries/haskell/sized-types/default.nix
@@ -14,5 +14,7 @@ cabal.mkDerivation (self: {
     description = "Sized types in Haskell using the GHC Nat kind";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
+    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/snap/loader-dynamic.nix b/pkgs/development/libraries/haskell/snap/loader-dynamic.nix
index 3b59fb5ef559..0f4132a75da7 100644
--- a/pkgs/development/libraries/haskell/snap/loader-dynamic.nix
+++ b/pkgs/development/libraries/haskell/snap/loader-dynamic.nix
@@ -12,5 +12,7 @@ cabal.mkDerivation (self: {
     description = "Snap: A Haskell Web Framework: dynamic loader";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
+    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/snaplet-postgresql-simple/default.nix b/pkgs/development/libraries/haskell/snaplet-postgresql-simple/default.nix
index e30a2c98dd45..5238fee7b9f6 100644
--- a/pkgs/development/libraries/haskell/snaplet-postgresql-simple/default.nix
+++ b/pkgs/development/libraries/haskell/snaplet-postgresql-simple/default.nix
@@ -20,5 +20,7 @@ cabal.mkDerivation (self: {
     description = "postgresql-simple snaplet for the Snap Framework";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
+    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/strictConcurrency/default.nix b/pkgs/development/libraries/haskell/strict-concurrency/default.nix
similarity index 87%
rename from pkgs/development/libraries/haskell/strictConcurrency/default.nix
rename to pkgs/development/libraries/haskell/strict-concurrency/default.nix
index b725597ac5f3..edb0ba0fd47c 100644
--- a/pkgs/development/libraries/haskell/strictConcurrency/default.nix
+++ b/pkgs/development/libraries/haskell/strict-concurrency/default.nix
@@ -12,5 +12,7 @@ cabal.mkDerivation (self: {
     description = "Strict concurrency abstractions";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
+    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/uniqueid/default.nix b/pkgs/development/libraries/haskell/uniqueid/default.nix
index f9281247d532..c5834e3f87dc 100644
--- a/pkgs/development/libraries/haskell/uniqueid/default.nix
+++ b/pkgs/development/libraries/haskell/uniqueid/default.nix
@@ -11,5 +11,7 @@ cabal.mkDerivation (self: {
     description = "Splittable Unique Identifier Supply";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
+    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/unix-process-conduit/default.nix b/pkgs/development/libraries/haskell/unix-process-conduit/default.nix
index ff2104ff4398..dc71c43df877 100644
--- a/pkgs/development/libraries/haskell/unix-process-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/unix-process-conduit/default.nix
@@ -13,5 +13,7 @@ cabal.mkDerivation (self: {
     description = "Run processes on Unix systems, with a conduit interface (deprecated)";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
+    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/vacuum-cairo/default.nix b/pkgs/development/libraries/haskell/vacuum-cairo/default.nix
index 43614d14a5fb..343f73238ca4 100644
--- a/pkgs/development/libraries/haskell/vacuum-cairo/default.nix
+++ b/pkgs/development/libraries/haskell/vacuum-cairo/default.nix
@@ -15,5 +15,6 @@ cabal.mkDerivation (self: {
     description = "Visualize live Haskell data structures using vacuum, graphviz and cairo";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
   };
 })
diff --git a/pkgs/development/libraries/haskell/vado/default.nix b/pkgs/development/libraries/haskell/vado/default.nix
index 6c6860935024..e116dd529cf3 100644
--- a/pkgs/development/libraries/haskell/vado/default.nix
+++ b/pkgs/development/libraries/haskell/vado/default.nix
@@ -15,5 +15,7 @@ cabal.mkDerivation (self: {
     description = "Runs commands on remote machines using ssh";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
+    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/vcsgui/default.nix b/pkgs/development/libraries/haskell/vcsgui/default.nix
index 31e5faa2cf88..318f369fc3e2 100644
--- a/pkgs/development/libraries/haskell/vcsgui/default.nix
+++ b/pkgs/development/libraries/haskell/vcsgui/default.nix
@@ -14,5 +14,7 @@ cabal.mkDerivation (self: {
     description = "GUI library for source code management systems";
     license = "GPL";
     platforms = self.stdenv.lib.platforms.linux;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
+    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/wcwidth/default.nix b/pkgs/development/libraries/haskell/wcwidth/default.nix
index a3285791b6c1..7c5c703533a4 100644
--- a/pkgs/development/libraries/haskell/wcwidth/default.nix
+++ b/pkgs/development/libraries/haskell/wcwidth/default.nix
@@ -14,5 +14,6 @@ cabal.mkDerivation (self: {
     description = "Native wcwidth";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
   };
 })
diff --git a/pkgs/development/libraries/haskell/xml-html-conduit-lens/default.nix b/pkgs/development/libraries/haskell/xml-html-conduit-lens/default.nix
index b6fd82d622cc..3dded2dcb447 100644
--- a/pkgs/development/libraries/haskell/xml-html-conduit-lens/default.nix
+++ b/pkgs/development/libraries/haskell/xml-html-conduit-lens/default.nix
@@ -17,5 +17,7 @@ cabal.mkDerivation (self: {
     description = "Optics for xml-conduit and html-conduit";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
+    broken = true;
   };
 })
diff --git a/pkgs/development/tools/haskell/ghc-events-analyze/default.nix b/pkgs/development/tools/haskell/ghc-events-analyze/default.nix
index af708e40afe4..b58d8d1429bc 100644
--- a/pkgs/development/tools/haskell/ghc-events-analyze/default.nix
+++ b/pkgs/development/tools/haskell/ghc-events-analyze/default.nix
@@ -18,5 +18,7 @@ cabal.mkDerivation (self: {
     description = "Analyze and visualize event logs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
+    broken = true;
   };
 })
diff --git a/pkgs/development/tools/haskell/profiteur/default.nix b/pkgs/development/tools/haskell/profiteur/default.nix
index 2cc73ca66726..b637e563ffb2 100644
--- a/pkgs/development/tools/haskell/profiteur/default.nix
+++ b/pkgs/development/tools/haskell/profiteur/default.nix
@@ -18,5 +18,7 @@ cabal.mkDerivation (self: {
     description = "Treemap visualiser for GHC prof files";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
+    broken = true;
   };
 })
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index cea58c3e2155..bbbac772d909 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2343,7 +2343,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   Stream = callPackage ../development/libraries/haskell/Stream {};
 
-  strictConcurrency = callPackage ../development/libraries/haskell/strictConcurrency {};
+  strictConcurrency = callPackage ../development/libraries/haskell/strict-concurrency {};
 
   stringbuilder = callPackage ../development/libraries/haskell/stringbuilder {};
 

From 30d05ba08261b52d3c87adcf209702a31d47320c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Aug 2014 19:48:02 +0200
Subject: [PATCH 0270/1453] haskell-timeparsers: build this package with a
 recent version of 'convertible'

---
 pkgs/top-level/haskell-packages.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index bbbac772d909..be427ec90e8a 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2493,9 +2493,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   timerep = callPackage ../development/libraries/haskell/timerep {};
 
-  timeparsers = callPackage ../development/libraries/haskell/timeparsers {
-    convertible = self.convertible_1_0_11_1;
-  };
+  timeparsers = callPackage ../development/libraries/haskell/timeparsers {};
 
   timeRecurrence = callPackage ../development/libraries/haskell/time-recurrence {};
 

From 128039217e1d674dcce60817e5c5adc7badbb39a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Aug 2014 19:57:37 +0200
Subject: [PATCH 0271/1453] haskell-hdevtools: fix patch checksum one more time

It appears that upstream has re-based the pull request, thereby changing the hash.
---
 pkgs/development/tools/haskell/hdevtools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/haskell/hdevtools/default.nix b/pkgs/development/tools/haskell/hdevtools/default.nix
index 92d024b43a5d..350ad216bcab 100644
--- a/pkgs/development/tools/haskell/hdevtools/default.nix
+++ b/pkgs/development/tools/haskell/hdevtools/default.nix
@@ -1,4 +1,4 @@
-{ cabal, cmdargs, ghcPaths, network, syb, time, fetchpatch }:
+{ cabal, cmdargs, ghcPaths, network, syb, time, fetchurl }:
 
 cabal.mkDerivation (self: {
   pname = "hdevtools";
@@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "1a218m817q35f52fv6mn28sfv136i6fm2mzgdidpm24pc0585gl7";
   isLibrary = false;
   isExecutable = true;
-  patches = [ (fetchpatch { url = "https://github.com/ts468/hdevtools/pull/2.diff"; sha256 = "0pwgxm4mh29qm79kg0gc6a90lzjbmh8rf4pc3hx2zqgb5f3l2abs"; }) ];
+  patches = [ (fetchurl { url = "https://github.com/ts468/hdevtools/pull/2.patch"; md5 = "256609d2d3f5b719caa0002ee579d169"; }) ];
   buildDepends = [ cmdargs ghcPaths network syb time ];
   meta = {
     homepage = "https://github.com/bitc/hdevtools/";

From f4b5cd9f3f7382769c9f2da90351d32573956d93 Mon Sep 17 00:00:00 2001
From: Matej Cotman <cotman.matej@gmail.com>
Date: Wed, 20 Aug 2014 21:17:48 +0200
Subject: [PATCH 0272/1453] use mkDefault on root's shell

---
 nixos/modules/config/users-groups.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index 5de81a773424..7783f13b14b1 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -404,7 +404,7 @@ in {
         uid = ids.uids.root;
         description = "System administrator";
         home = "/root";
-        shell = cfg.defaultUserShell;
+        shell = mkDefault cfg.defaultUserShell;
         group = "root";
         extraGroups = [ "grsecurity" ];
         hashedPassword = mkDefault config.security.initialRootPassword;

From c198a3689890e5b9395480aaae644acd7d3bd675 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 20 Aug 2014 21:27:43 +0200
Subject: [PATCH 0273/1453] twinkle: fix build (fixes #3673)

Pulled patches from Debian and hacked around linking errors.
I'm able to ring my mobile phone now.
However, on exit the process is stuck and needs kill -9.

CC: maintainer @MarcWeber.
---
 .../twinkle/boost_regex.patch                 | 17 +++++
 .../instant-messengers/twinkle/default.nix    | 33 ++++++---
 .../instant-messengers/twinkle/libgsm.patch   | 70 +++++++++++++++++++
 .../twinkle/localetime_r_conflict.diff        | 13 ++++
 .../twinkle/newer-libccrtp.diff               | 22 ++++++
 pkgs/top-level/all-packages.nix               |  5 +-
 6 files changed, 145 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/applications/networking/instant-messengers/twinkle/boost_regex.patch
 create mode 100644 pkgs/applications/networking/instant-messengers/twinkle/libgsm.patch
 create mode 100644 pkgs/applications/networking/instant-messengers/twinkle/localetime_r_conflict.diff
 create mode 100644 pkgs/applications/networking/instant-messengers/twinkle/newer-libccrtp.diff

diff --git a/pkgs/applications/networking/instant-messengers/twinkle/boost_regex.patch b/pkgs/applications/networking/instant-messengers/twinkle/boost_regex.patch
new file mode 100644
index 000000000000..3d4c46b2431d
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/twinkle/boost_regex.patch
@@ -0,0 +1,17 @@
+Index: twinkle-1.4.2/configure.in
+===================================================================
+--- twinkle-1.4.2.orig/configure.in	2013-07-25 11:07:54.160534950 -0400
++++ twinkle-1.4.2/configure.in	2013-07-25 11:07:59.000000000 -0400
+@@ -294,7 +294,11 @@
+ 	AC_CHECK_LIB(boost_regex-gcc, main, [
+ 		LIBS="-lboost_regex-gcc $LIBS"
+ 		echo "LIBS += -lboost_regex-gcc" >> $QT_INCL_PRO],
+-		[AC_MSG_ERROR([libboost_regex library is missing (boost package).])])])
++		[
++		AC_CHECK_LIB(boost_regex, main, [
++			LIBS="-lboost_regex $LIBS"
++			echo "LIBS += -lboost_regex" >> $QT_INCL_PRO],
++			[AC_MSG_ERROR([libboost_regex library is missing (boost package).])])])])
+ 
+ ms_CHECK_LRELEASE()
+ 	
diff --git a/pkgs/applications/networking/instant-messengers/twinkle/default.nix b/pkgs/applications/networking/instant-messengers/twinkle/default.nix
index 060c844980bb..830e4715f159 100644
--- a/pkgs/applications/networking/instant-messengers/twinkle/default.nix
+++ b/pkgs/applications/networking/instant-messengers/twinkle/default.nix
@@ -1,29 +1,40 @@
-{ stdenv, fetchurl, pkgconfig, commoncpp2, ccrtp, openssl, boost
+{ stdenv, fetchurl, pkgconfig, autoreconfHook, commoncpp2, ccrtp, openssl, boost
 , libsndfile, libxml2, libjpeg, readline, qt3, perl, file
 , alsaLib, speex, libzrtpcpp, xorg }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "twinkle-1.4.2";
 
   src = fetchurl {
-    url = http://www.xs4all.nl/~mfnboer/twinkle/download/twinkle-1.4.2.tar.gz;
+    url = "http://www.xs4all.nl/~mfnboer/twinkle/download/${name}.tar.gz";
     sha256 = "19c9gqam78srsgv0463g7lfnv4mn5lvbxx3zl87bnm0vmk3qcxl0";
   };
 
+  patches = [ # all from Debian
+    ./newer-libccrtp.diff
+    ./libgsm.patch
+    ./localetime_r_conflict.diff
+    ./boost_regex.patch # modified not to use "-mt" suffix
+  ];
+
   configureFlags = "--with-extra-includes=${libjpeg}/include";
 
   buildInputs =
-    [ pkgconfig commoncpp2 ccrtp openssl boost libsndfile
+    [ pkgconfig autoreconfHook commoncpp2 openssl boost libsndfile
       libxml2 libjpeg readline qt3 perl file
       # optional ? :
-      alsaLib
-      speex libzrtpcpp xorg.libX11 xorg.libXaw xorg.libICE xorg.libXext
+      alsaLib speex
+      libzrtpcpp xorg.libX11 xorg.libXaw xorg.libICE xorg.libXext
     ];
 
-  meta = {
-    homepage = http://www.xs4all.nl/~mfnboer/twinkle/index.html;
-    license = "GPL";
-    maintainers = [ stdenv.lib.maintainers.marcweber ];
-    platforms = stdenv.lib.platforms.linux;
+  NIX_CFLAGS_LINK = "-Wl,--as-needed -lboost_regex -lasound -lzrtpcpp -lspeex -lspeexdsp";
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    homepage = http://www.twinklephone.com/;
+    license = licenses.gpl2Plus;
+    maintainers = [ lib.maintainers.marcweber ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/twinkle/libgsm.patch b/pkgs/applications/networking/instant-messengers/twinkle/libgsm.patch
new file mode 100644
index 000000000000..1574273feb53
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/twinkle/libgsm.patch
@@ -0,0 +1,70 @@
+Index: twinkle-1.4.2/configure.in
+===================================================================
+--- twinkle-1.4.2.orig/configure.in	2013-07-25 11:07:54.264533206 -0400
++++ twinkle-1.4.2/configure.in	2013-07-25 11:07:54.256533340 -0400
+@@ -195,22 +195,33 @@
+ 
+ # This check does not work on all platforms
+ # Check if libgsm is available
+-# AC_CHECK_LIB(gsm, sf_open, [
+-#	AC_CHECK_HEADER(gsm.h, [],
+-#		[AC_MSG_ERROR([gsm header files missing (gsm.h)])])
+-#	AC_DEFINE(HAVE_GSM, 1, [Define to 1 if you have the <libgsm> library.])
+-#	GSM_LIBS="-lgsm"
+-#	echo "LIBS += -lgsm" >> $QT_INCL_PRO
+-#	have_gsm="yes" ], [
+-#	have_gsm="no"
+-#	GSM_LIBS="\$(top_builddir)/src/audio/gsm/libgsm.a"
+-#	echo "LIBS += ../audio/gsm/libgsm.a" >> $QT_INCL_PRO ])
+-have_gsm="no"
+-GSM_LIBS="\$(top_builddir)/src/audio/gsm/libgsm.a"
+-echo "LIBS += ../audio/gsm/libgsm.a" >> $QT_INCL_PRO
++AC_CHECK_LIB(gsm, sf_open, [
++	AC_CHECK_HEADER(gsm.h, [],
++		[AC_MSG_ERROR([gsm header files missing (gsm.h)])])
++	AC_DEFINE(HAVE_GSM, 1, [Define to 1 if you have the <libgsm> library.])
++	GSM_LIBS="-lgsm"
++	echo "LIBS += -lgsm" >> $QT_INCL_PRO
++	have_gsm="yes" ], [
++	have_gsm="no"
++	GSM_LIBS="\$(top_builddir)/src/audio/gsm/libgsm.a"
++	echo "LIBS += ../audio/gsm/libgsm.a" >> $QT_INCL_PRO ])
++#have_gsm="no"
++#GSM_LIBS="\$(top_builddir)/src/audio/gsm/libgsm.a"
++#echo "LIBS += ../audio/gsm/libgsm.a" >> $QT_INCL_PRO
+ 
+ AC_SUBST(GSM_LIBS)
+ 
++# Check if libgsm is available
++AC_CHECK_LIB(gsm, sf_open, [
++	AC_CHECK_HEADER(gsm.h, [],
++		[AC_MSG_ERROR([gsm header files missing (gsm.h)])])
++	AC_DEFINE(HAVE_GSM, 1, [Define to 1 if you have the <libgsm> library.])
++	LIBS="-lgsm $LIBS"
++	echo "LIBS += -lgsm" >> $QT_INCL_PRO
++	have_gsm="yes" ], [
++	have_gsm="no"
++	echo "$(top_builddir)/src/audio/gsm/libgsm.a" >> $QT_INCL_PRO ])
++
+ # Check if ALSA is available
+ AC_CHECK_LIB(asound, main, [
+ 	AC_CHECK_HEADER(alsa/asoundlib.h, [],
+@@ -348,3 +359,4 @@
+ AC_MSG_RESULT([Speex:       $have_speex])
+ AC_MSG_RESULT([iLBC:        $have_ilbc])
+ AC_MSG_RESULT([ZRTP:        $have_zrtp])
++AC_MSG_RESULT([Libgsm dynamic link:	$have_gsm])
+Index: twinkle-1.4.2/src/twinkle_config.h.in
+===================================================================
+--- twinkle-1.4.2.orig/src/twinkle_config.h.in	2013-07-25 11:07:54.264533206 -0400
++++ twinkle-1.4.2/src/twinkle_config.h.in	2013-07-25 11:07:54.256533340 -0400
+@@ -19,6 +19,9 @@
+ /* Define to 1 if you have the <history.h> header file. */
+ #undef HAVE_HISTORY_H
+ 
++/* Define to 1 if you have the <libgsm> library. */
++#undef HAVE_GSM
++
+ /* Define to 1 if you have the <ilbc> library. */
+ #undef HAVE_ILBC
+ 
diff --git a/pkgs/applications/networking/instant-messengers/twinkle/localetime_r_conflict.diff b/pkgs/applications/networking/instant-messengers/twinkle/localetime_r_conflict.diff
new file mode 100644
index 000000000000..3fbc2eb0cb1e
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/twinkle/localetime_r_conflict.diff
@@ -0,0 +1,13 @@
+Index: twinkle-1.4.2/src/log.cpp
+===================================================================
+--- twinkle-1.4.2.orig/src/log.cpp	2009-01-18 09:35:28.000000000 -0500
++++ twinkle-1.4.2/src/log.cpp	2013-07-25 11:43:08.901209713 -0400
+@@ -161,7 +161,7 @@
+ 
+ 	gettimeofday(&t, NULL);
+ 	date = t.tv_sec;
+-	localtime_r(&date, &tm);
++	ost::localtime_r(&date, &tm);
+ 
+ 	*log_stream << "+++ ";
+ 	*log_stream << tm.tm_mday;
diff --git a/pkgs/applications/networking/instant-messengers/twinkle/newer-libccrtp.diff b/pkgs/applications/networking/instant-messengers/twinkle/newer-libccrtp.diff
new file mode 100644
index 000000000000..9d07b3dbd6ae
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/twinkle/newer-libccrtp.diff
@@ -0,0 +1,22 @@
+Index: twinkle-1.4.2/configure.in
+===================================================================
+--- twinkle-1.4.2.orig/configure.in	2013-07-25 11:09:16.000000000 -0400
++++ twinkle-1.4.2/configure.in	2013-07-25 11:11:59.512418187 -0400
+@@ -66,7 +66,7 @@
+ 
+ export PKG_CONFIG_PATH
+ 
+-PKG_CHECK_MODULES(CCRTP, libccrtp1 >= 1.6.0)
++PKG_CHECK_MODULES(CCRTP, libccrtp >= 1.6.0)
+ 
+ PKG_CHECK_MODULES(XML2, libxml-2.0)
+ # AC_CHECK_HEADER(libxml/tree.h, [],
+@@ -136,7 +136,7 @@
+ #echo "INCLUDEPATH += `$CCGNU2_CONFIG --includes`" | sed -e s/-I//g > $QT_INCL_PRO
+ # libccrtp1(ccrtp) depend from libccgnu2(commoncpp2) and
+ # should include above flags !
+-echo "INCLUDEPATH += `$PKG_CONFIG --cflags-only-I libccrtp1`" | sed -e s/-I//g >> $QT_INCL_PRO
++echo "INCLUDEPATH += `$PKG_CONFIG --cflags-only-I libccrtp`" | sed -e s/-I//g >> $QT_INCL_PRO
+ echo "INCLUDEPATH += `$PKG_CONFIG --cflags-only-I libxml-2.0`" | sed -e s/-I//g >> $QT_INCL_PRO
+ 
+ # get libraries specified on command line
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1bae61699c5c..191bf9f44fb6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9838,10 +9838,7 @@ let
 
   twmn = callPackage ../applications/misc/twmn { };
 
-  twinkle = callPackage ../applications/networking/instant-messengers/twinkle {
-    ccrtp = ccrtp_1_8;
-    libzrtpcpp = libzrtpcpp_1_6;
-  };
+  twinkle = callPackage ../applications/networking/instant-messengers/twinkle { };
 
   umurmur = callPackage ../applications/networking/umurmur { };
 

From c14f3e4039741cfc970252ade65c83e93aeabf30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 17 Aug 2014 23:43:08 +0200
Subject: [PATCH 0274/1453] uvccapture: new package

"Capture image from USB webcam at a specified interval"

I apply patches from Debian to make it build with V4L2 (instead of v1
API) and fix some warnings/bugs. Source code is also downloaded from
Debian, as uvccapture homepage is unavailable.

Homepage: http://linux-uvc.berlios.de/ (seems to have vanished...)
---
 .../applications/video/uvccapture/default.nix | 51 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 53 insertions(+)
 create mode 100644 pkgs/applications/video/uvccapture/default.nix

diff --git a/pkgs/applications/video/uvccapture/default.nix b/pkgs/applications/video/uvccapture/default.nix
new file mode 100644
index 000000000000..468db4625103
--- /dev/null
+++ b/pkgs/applications/video/uvccapture/default.nix
@@ -0,0 +1,51 @@
+{ stdenv, fetchurl, libjpeg }:
+
+let
+  debianPatches = fetchurl {
+    url = "mirror://debian/pool/main/u/uvccapture/uvccapture_0.5-3.debian.tar.gz";
+    sha256 = "0m29by13nw1r8sch366qzdxg5rsd1k766kqg1nj2pdb8f7pwjh9r";
+  };
+
+in
+
+stdenv.mkDerivation rec {
+  name = "uvccapture-0.5";
+  
+  src = fetchurl {
+    url = "mirror://debian/pool/main/u/uvccapture/uvccapture_0.5.orig.tar.gz";
+    sha256 = "1b3akkcmr3brbf93akr8xi20w8zqf2g0qfq928500wy04qi6jqpi";
+  };
+
+  buildInputs = [ libjpeg ];
+
+  patchPhase = ''
+    tar xvf "${debianPatches}"
+    for fname in debian/patches/fix_videodev_include_FTBFS.patch \
+                 debian/patches/warnings.patch \
+                 debian/patches/numbuffers.patch
+    do
+        echo "Applying patch $fname"
+        patch < "$fname"
+    done
+  '';
+
+  makeFlagsArray = [ "PREFIX=$(out)/bin/" ];
+
+  preInstall = ''
+    mkdir -p "$out/bin"
+  '';
+
+  # Upstream has no man page, install one from Debian
+  postInstall = ''
+    mkdir -p "$out/share/man/man1"
+    cp -v debian/uvccapture.1 "$out/share/man/man1/"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Capture image from USB webcam at a specified interval";
+    homepage = http://linux-uvc.berlios.de/;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 200881c916a6..5c367ee75b68 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9847,6 +9847,8 @@ let
 
   uucp = callPackage ../tools/misc/uucp { };
 
+  uvccapture = callPackage ../applications/video/uvccapture { };
+
   uwimap = callPackage ../tools/networking/uwimap { };
 
   uzbl = callPackage ../applications/networking/browsers/uzbl {

From 4ee77e2fc5394531f1c1b049d49845da45bd425d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 17 Aug 2014 22:56:52 +0200
Subject: [PATCH 0275/1453] libtar: new package

libtar is a C library for manipulating POSIX tar files.

http://www.feep.net/libtar/
---
 pkgs/development/libraries/libtar/default.nix | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/libraries/libtar/default.nix

diff --git a/pkgs/development/libraries/libtar/default.nix b/pkgs/development/libraries/libtar/default.nix
new file mode 100644
index 000000000000..7a8dfa7a6227
--- /dev/null
+++ b/pkgs/development/libraries/libtar/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchgit, autoreconfHook }:
+
+stdenv.mkDerivation rec {
+  version = "1.2.20";
+  name = "libtar-${version}";
+  
+  # Maintenance repo for libtar (Arch Linux uses this)
+  src = fetchgit {
+    url = "git://repo.or.cz/libtar.git";
+    rev = "refs/tags/v${version}";
+    sha256 = "1pjsqnqjaqgkzf1j8m6y5h76bwprffsjjj6gk8rh2fjsha14rqn9";
+  };
+
+  buildInputs = [ autoreconfHook ];
+
+  meta = with stdenv.lib; {
+    description = "C library for manipulating POSIX tar files";
+    homepage = http://www.feep.net/libtar/;
+    license = licenses.bsd3;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5c367ee75b68..967c097dbd00 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5502,6 +5502,8 @@ let
 
   libspatialite = callPackage ../development/libraries/libspatialite { };
 
+  libtar = callPackage ../development/libraries/libtar { };
+
   libtasn1 = callPackage ../development/libraries/libtasn1 { };
 
   libtheora = callPackage ../development/libraries/libtheora { };

From 006ebdfe7853002299ebf8b14e175eb68f37a31f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 17 Aug 2014 22:58:02 +0200
Subject: [PATCH 0276/1453] linuxstopmotion: new package

Linux Stopmotion is a program for creating stop-motion animation movies.

http://linuxstopmotion.org/

I had to apply a small patch to make grabbing images from webcam work
(using uvccapture). I find it odd that it didn't work without the patch,
seeing that Arch Linux also have the v0.8.0 version, but with no patch.
Latest Ubuntu (14.04) has v0.7.2, which is unaffected.
---
 .../video/linuxstopmotion/default.nix         | 36 +++++++++++++++++++
 ...stopmotion-fix-wrong-isProcess-logic.patch | 33 +++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 71 insertions(+)
 create mode 100644 pkgs/applications/video/linuxstopmotion/default.nix
 create mode 100644 pkgs/applications/video/linuxstopmotion/linuxstopmotion-fix-wrong-isProcess-logic.patch

diff --git a/pkgs/applications/video/linuxstopmotion/default.nix b/pkgs/applications/video/linuxstopmotion/default.nix
new file mode 100644
index 000000000000..23a033844b38
--- /dev/null
+++ b/pkgs/applications/video/linuxstopmotion/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchgit, pkgconfig, qt4, SDL, SDL_image, libvorbis, libtar, libxml2
+, gamin
+}:
+
+stdenv.mkDerivation rec {
+  version = "0.8";
+  name = "linuxstopmotion-${version}";
+  
+  src = fetchgit {
+    url = "git://git.code.sf.net/p/linuxstopmotion/code";
+    rev = "refs/tags/${version}";
+    sha256 = "1xkkrhllgy2d7k0vrdj794ya7y3g3n7xh8c2qgnb26yrarz79dqj";
+  };
+
+  buildInputs = [ pkgconfig qt4 SDL SDL_image libvorbis libtar libxml2 gamin ];
+
+  patches = [ ./linuxstopmotion-fix-wrong-isProcess-logic.patch ];
+
+  configurePhase = ''
+    qmake PREFIX="$out"
+  '';
+
+  # Installation breaks without this
+  preInstall = ''
+    mkdir -p "$out/share/stopmotion/translations/"
+    cp -v build/*.qm "$out/share/stopmotion/translations/"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Create stop-motion animation movies";
+    homepage = http://linuxstopmotion.org/;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
+}
diff --git a/pkgs/applications/video/linuxstopmotion/linuxstopmotion-fix-wrong-isProcess-logic.patch b/pkgs/applications/video/linuxstopmotion/linuxstopmotion-fix-wrong-isProcess-logic.patch
new file mode 100644
index 000000000000..caab48d0e2d9
--- /dev/null
+++ b/pkgs/applications/video/linuxstopmotion/linuxstopmotion-fix-wrong-isProcess-logic.patch
@@ -0,0 +1,33 @@
+From b23b7dab1d540b0710fcb9ded1c6256a49844906 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
+Date: Wed, 20 Aug 2014 22:22:00 +0200
+Subject: [PATCH] Fix wrong "isProcess" logic
+
+Stopmotion wrongly thinks that uvccapture should be run as a daemon,
+even though configuration for uvccapture has no "daemon-like" command
+line to be run (according to "preferences"). The result is an error
+popup instead of video/image grabbing.
+
+This brings back the "isProcess" logic that was in stopmotion v0.7.2,
+because it seems to work, while the current logic (v0.8.0) seems to
+fail.
+---
+ src/presentation/frontends/qtfrontend/frameview.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/presentation/frontends/qtfrontend/frameview.cpp b/src/presentation/frontends/qtfrontend/frameview.cpp
+index e44dca7..d2c41fd 100644
+--- a/src/presentation/frontends/qtfrontend/frameview.cpp
++++ b/src/presentation/frontends/qtfrontend/frameview.cpp
+@@ -270,7 +270,7 @@ bool FrameView::on() {
+ 	Preference device(QString("device%1")
+ 			.arg(activeDev).toLatin1().constData(), "");
+ 	QString pre = QString(prepoll.get()).replace("$VIDEODEVICE", device.get());
+-	bool isProcess = startDaemon.get();
++	bool isProcess = (strcmp(startDaemon.get(), "") == 0) ? false : true;
+ 
+ 	bool isCameraReady = true;
+ 	this->grabber = new CommandLineGrabber(capturedFile.path(), isProcess);
+-- 
+2.0.2
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 967c097dbd00..f8675c985ab9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9630,6 +9630,8 @@ let
     conf = config.st.conf or null;
   };
 
+  linuxstopmotion = callPackage ../applications/video/linuxstopmotion { };
+
   sweethome3d = recurseIntoAttrs (  (callPackage ../applications/misc/sweethome3d { })
                                  // (callPackage ../applications/misc/sweethome3d/editors.nix {
                                       sweethome3dApp = sweethome3d.application;

From facb810bcc741751856fc894477a6aa933c58b37 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Thu, 21 Aug 2014 00:42:50 +0200
Subject: [PATCH 0277/1453] rhash: new package

Console utility for computing and verifying hash sums of files

http://rhash.anz.ru
---
 pkgs/tools/security/rhash/default.nix | 18 ++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 2 files changed, 20 insertions(+)
 create mode 100644 pkgs/tools/security/rhash/default.nix

diff --git a/pkgs/tools/security/rhash/default.nix b/pkgs/tools/security/rhash/default.nix
new file mode 100644
index 000000000000..6a2710869bf8
--- /dev/null
+++ b/pkgs/tools/security/rhash/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "rhash-1.3.3";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/rhash/${name}-src.tar.gz";
+    sha1 = "0981bdc98ba7ef923b1a6cd7fd8bb0374cff632e";
+  };
+
+  installFlags = [ "DESTDIR=$(out)" "PREFIX=/" ];
+
+  meta = with stdenv.lib; {
+    homepage = http://rhash.anz.ru;
+    description = "Console utility for computing and verifying hash sums of files";
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 191bf9f44fb6..f2c8b83ada53 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1973,6 +1973,8 @@ let
 
   rdmd = callPackage ../development/compilers/rdmd { };
 
+  rhash = callPackage ../tools/security/rhash { };
+
   riemann_c_client = callPackage ../tools/misc/riemann-c-client { };
 
   ripmime = callPackage ../tools/networking/ripmime {};

From 25351012b26b5e8c5010eb9b339f9551da27cdac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 20 Aug 2014 23:27:37 +0200
Subject: [PATCH 0278/1453] nvidia: fix problems with -glsi and glx

..by generalizing the build script.
Obsoletes #3699, and it should finally fix problems around 816d971a.
---
 pkgs/os-specific/linux/nvidia-x11/builder.sh  | 54 +++++++++----------
 pkgs/os-specific/linux/nvidia-x11/default.nix | 12 ++---
 2 files changed, 31 insertions(+), 35 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh
index 6acab2424c8d..4291116f4ef4 100755
--- a/pkgs/os-specific/linux/nvidia-x11/builder.sh
+++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh
@@ -30,32 +30,7 @@ buildPhase() {
 
 installPhase() {
 
-    # Install libGL and friends.
-    mkdir -p $out/lib/vendors
-
-    for f in \
-      libcuda libGL libnvcuvid libnvidia-cfg libnvidia-compiler \
-      libnvidia-encode libnvidia-glcore libnvidia-ml libnvidia-opencl \
-      libnvidia-tls libOpenCL libnvidia-tls libvdpau_nvidia libEGL libGLESv2
-    do
-      cp -prd $f.* $out/lib/
-      ln -snf $f.so.$versionNumber $out/lib/$f.so
-      ln -snf $f.so.$versionNumber $out/lib/$f.so.1
-    done
-
-    cp -p nvidia.icd $out/lib/vendors/
-    cp -prd tls $out/lib/
-    cp -prd libOpenCL.so.1.0.0 $out/lib/
-    ln -snf libOpenCL.so.1.0.0 $out/lib/libOpenCL.so
-    ln -snf libOpenCL.so.1.0.0 $out/lib/libOpenCL.so.1
-
-    patchelf --set-rpath $out/lib:$glPath $out/lib/libGL.so.*.*
-    patchelf --set-rpath $out/lib:$glPath $out/lib/libvdpau_nvidia.so.*.*
-    patchelf --set-rpath $cudaPath $out/lib/libcuda.so.*.*
-    patchelf --set-rpath $openclPath $out/lib/libnvidia-opencl.so.*.*
-
     if test -z "$libsOnly"; then
-
         # Install the kernel module.
         mkdir -p $out/lib/modules/$kernelVersion/misc
         cp kernel/nvidia.ko $out/lib/modules/$kernelVersion/misc
@@ -69,10 +44,7 @@ installPhase() {
         mkdir -p $out/lib/xorg/modules/extensions
         cp -p libglx.so.* $out/lib/xorg/modules/extensions
 
-        ln -snf libnvidia-wfb.so.$versionNumber $out/lib/xorg/modules/libnvidia-wfb.so.1
-        ln -snf libglx.so.$versionNumber $out/lib/xorg/modules/extensions/libglx.so
-
-        patchelf --set-rpath $out/lib $out/lib/xorg/modules/extensions/libglx.so.*.*
+        #patchelf --set-rpath $out/lib $out/lib/xorg/modules/extensions/libglx.so.*.*
 
         # Install the programs.
         mkdir -p $out/bin
@@ -105,6 +77,30 @@ installPhase() {
         # Test a bit.
         $out/bin/nvidia-settings --version
     fi
+
+
+    # Install libGL and friends.
+    mkdir -p "$out/lib/vendors"
+    cp -p nvidia.icd $out/lib/vendors/
+
+    cp -prd *.so.* tls "$out/lib/"
+    rm "$out"/lib/lib{glx,nvidia-wfb}.so.* # handled separately
+
+    for libname in `find "$out/lib/" -name '*.so.*'`
+    do
+      # I'm lazy to differentiate needed libs per-library, as the closure is the same.
+      # Unfortunately --shrink-rpath would strip too much.
+      patchelf --set-rpath "$out/lib:$allLibPath" "$libname"
+
+      libname_short=`echo -n "$libname" | sed 's/so\..*/so/'`
+      ln -srnf "$libname" "$libname_short"
+      ln -srnf "$libname" "$libname_short.1"
+    done
+
+    #patchelf --set-rpath $out/lib:$glPath $out/lib/libGL.so.*.*
+    #patchelf --set-rpath $out/lib:$glPath $out/lib/libvdpau_nvidia.so.*.*
+    #patchelf --set-rpath $cudaPath $out/lib/libcuda.so.*.*
+    #patchelf --set-rpath $openclPath $out/lib/libnvidia-opencl.so.*.*
 }
 
 
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 5cd1bf180d67..c89846db72cf 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -14,6 +14,7 @@ let
 
   versionNumber = "340.32";
 
+  inherit (stdenv.lib) makeLibraryPath;
 in
 
 stdenv.mkDerivation {
@@ -40,13 +41,12 @@ stdenv.mkDerivation {
 
   dontStrip = true;
 
-  glPath = stdenv.lib.makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr];
+  glPath      = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr];
+  cudaPath    = makeLibraryPath [zlib stdenv.gcc.gcc];
+  openclPath  = makeLibraryPath [zlib];
+  allLibPath  = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr zlib stdenv.gcc.gcc];
 
-  cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.gcc.gcc];
-
-  openclPath = stdenv.lib.makeLibraryPath [zlib];
-
-  programPath = optionalString (!libsOnly) (stdenv.lib.makeLibraryPath
+  programPath = optionalString (!libsOnly) (makeLibraryPath
     [ gtk atk pango glib gdk_pixbuf xlibs.libXv ] );
 
   buildInputs = [ perl ];

From 2d03fbf75202272f37bf648d06922c2c624f126a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 20 Aug 2014 23:38:43 +0200
Subject: [PATCH 0279/1453] twinkle eval: fix the typo

---
 .../networking/instant-messengers/twinkle/default.nix           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/twinkle/default.nix b/pkgs/applications/networking/instant-messengers/twinkle/default.nix
index 830e4715f159..2e6b904c134e 100644
--- a/pkgs/applications/networking/instant-messengers/twinkle/default.nix
+++ b/pkgs/applications/networking/instant-messengers/twinkle/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = http://www.twinklephone.com/;
     license = licenses.gpl2Plus;
-    maintainers = [ lib.maintainers.marcweber ];
+    maintainers = [ maintainers.marcweber ];
     platforms = platforms.linux;
   };
 }

From 81ad94ce5106c5ab7f31044b591a6d2b884c02c1 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Thu, 21 Aug 2014 03:01:53 +0200
Subject: [PATCH 0280/1453] bedup: Update from 20140206 to 20140413

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0e93505f0e93..d42897857c1a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -663,16 +663,16 @@ rec {
 
 
   bedup = buildPythonPackage rec {
-    name = "bedup-20140206";
+    name = "bedup-20140413";
 
     src = fetchgit {
       url = "https://github.com/g2p/bedup.git";
-      rev = "80cb217d4819a03e159e42850a9a3f14e2b278a3";
-      sha256 = "1rik7a62v708ivfcy0pawhfnrb84b7gm3qr54x6jsxl0iqz078h6";
+      rev = "5189e166145b8954ac41883f81ef3c3b50dc96ab";
+      sha256 = "e61768fa19934bd176799f90bda3ea9f49a5def21fa2523a8e47df8a48e730e9";
     };
 
     buildInputs = [ pkgs.btrfsProgs ];
-    propagatedBuildInputs = with pkgs; [ contextlib2 sqlalchemy pyxdg pycparser cffi alembic ];
+    propagatedBuildInputs = with pkgs; [ contextlib2 sqlalchemy8 pyxdg pycparser cffi alembic ];
 
     meta = {
       description = "Deduplication for Btrfs";

From de8a2e1433f42e5039b706b775d123e917c6e3d6 Mon Sep 17 00:00:00 2001
From: Andrew Morsillo <andrew@peeramid.org>
Date: Wed, 20 Aug 2014 21:50:09 -0400
Subject: [PATCH 0281/1453] Bump version of Dwarf Fortress to 40_09. Build
 graphics library for dwarf fortress instead of using provided one for more
 reliability.

---
 pkgs/games/dwarf-fortress/df2014.nix | 50 ++++++++++++++++++++++------
 1 file changed, 39 insertions(+), 11 deletions(-)

diff --git a/pkgs/games/dwarf-fortress/df2014.nix b/pkgs/games/dwarf-fortress/df2014.nix
index 6a0d30ea89f4..e9affd7bbf02 100644
--- a/pkgs/games/dwarf-fortress/df2014.nix
+++ b/pkgs/games/dwarf-fortress/df2014.nix
@@ -1,17 +1,41 @@
-{ stdenv, fetchurl, SDL, SDL_image, SDL_ttf, gtk, glib, mesa, openal, glibc, libsndfile
-, copyDataDirectory ? false }:
+{ stdenv, fetchgit, fetchurl, cmake, glew, ncurses, SDL, SDL_image, SDL_ttf, gtk2, glib, mesa, openal, pango, atk, gdk_pixbuf, glibc, libsndfile
+  , copyDataDirectory ? true }:
+
+/* set copyDataDirectory as true by default since df 40 does not seem to run without it */
+
+let
+
+  srcs = {
+    df_unfuck = fetchgit {
+      url = "https://github.com/svenstaro/dwarf_fortress_unfuck";
+      rev = "4681508dd799aaf20b47c2ac0e9da18fa4876993";
+      sha256 = "16495214a19742cb97351109b124ad9d691ee52bbb1b86c9c1907978734b5ca0";
+    };
+
+    df = fetchurl {
+      url = "http://www.bay12games.com/dwarves/df_40_09_linux.tar.bz2";
+      sha256 = "1aka2vblhip4sjkcpkxfra1fa9z4hzlj0sdl6rh2qda0l7q7i0ki";
+    };
+  };
+
+in
 
 assert stdenv.system == "i686-linux";
 
 stdenv.mkDerivation rec {
-  name = "dwarf-fortress-0.40.05";
+  name = "dwarf-fortress-0.40.09";
 
-  src = fetchurl {
-    url = "http://www.bay12games.com/dwarves/df_40_05_linux.tar.bz2";
-    sha256 = "1b9nd33yz5a945v9jyqii1k4s71i701m2d0h7fw6f5g9p6nvx43s";
-  };
 
-  phases = "unpackPhase patchPhase installPhase";
+  buildInputs = [ SDL SDL_image SDL_ttf gtk2 glib glew mesa ncurses openal glibc libsndfile pango atk cmake gdk_pixbuf];
+  src = "${srcs.df_unfuck} ${srcs.df}";
+  phases = "unpackPhase patchPhase configurePhase buildPhase installPhase";
+
+  sourceRoot = "git-export";
+
+  cmakeFlags = [
+    "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include"
+    "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2}/lib/gtk-2.0/include"
+  ];
 
   /* :TODO: Game options should be configurable by patching the default configuration files */
 
@@ -21,11 +45,15 @@ stdenv.mkDerivation rec {
     set -x
     mkdir -p $out/bin
     mkdir -p $out/share/df_linux
-    cp -r * $out/share/df_linux
+    cd ../../
+    cp -r ./df_linux/* $out/share/df_linux
+    rm $out/share/df_linux/libs/lib*
+    patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.gcc.gcc stdenv.glibc ]}:$out/share/df_linux/libs"  $out/share/df_linux/libs/Dwarf_Fortress
+    cp -f ./git-export/build/libgraphics.so $out/share/df_linux/libs/libgraphics.so
+
     cp $permission $out/share/df_linux/nix_permission
 
     patchelf --set-interpreter ${glibc}/lib/ld-linux.so.2 $out/share/df_linux/libs/Dwarf_Fortress
-    ln -s ${libsndfile}/lib/libsndfile.so $out/share/df_linux/libs/
 
     cat > $out/bin/dwarf-fortress << EOF
     #!${stdenv.shell}
@@ -66,7 +94,7 @@ stdenv.mkDerivation rec {
     ''}
 
     # now run Dwarf Fortress!
-    export LD_LIBRARY_PATH=\$DF_DIR/df_linux/libs/:${SDL}/lib:${SDL_image}/lib/:${SDL_ttf}/lib/:${gtk}/lib/:${glib}/lib/:${mesa}/lib/:${openal}/lib/
+    export LD_LIBRARY_PATH=\${stdenv.gcc}/lib:${SDL}/lib:${SDL_image}/lib/:${SDL_ttf}/lib/:${gtk2}/lib/:${glib}/lib/:${mesa}/lib/:${openal}/lib/:${libsndfile}/lib:$DF_DIR/df_linux/libs/
     \$DF_DIR/df "\$@"
     EOF
 

From c54a8ed1d05091d12d8341dbee7843e348cc2576 Mon Sep 17 00:00:00 2001
From: sfultong <sam.griffin@gmail.com>
Date: Wed, 20 Aug 2014 23:02:16 -0400
Subject: [PATCH 0282/1453] Merge pull request #1 from sfultongv/sfultong-14.04

updating tomcat to version 7
---
 nixos/modules/services/web-servers/tomcat.nix |  2 +-
 pkgs/servers/http/tomcat/6.0.nix              | 27 ++++---------------
 pkgs/servers/http/tomcat/7.0.nix              |  6 +++++
 pkgs/servers/http/tomcat/recent.nix           | 24 +++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 5 files changed, 38 insertions(+), 23 deletions(-)
 create mode 100644 pkgs/servers/http/tomcat/7.0.nix
 create mode 100644 pkgs/servers/http/tomcat/recent.nix

diff --git a/nixos/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix
index c2f464014ae6..2af249a8e961 100644
--- a/nixos/modules/services/web-servers/tomcat.nix
+++ b/nixos/modules/services/web-servers/tomcat.nix
@@ -5,7 +5,7 @@ with lib;
 let
 
   cfg = config.services.tomcat;
-  tomcat = pkgs.tomcat6;
+  tomcat = pkgs.tomcat7;
 in
 
 {
diff --git a/pkgs/servers/http/tomcat/6.0.nix b/pkgs/servers/http/tomcat/6.0.nix
index ee0049ce08f6..19f20cc8823c 100644
--- a/pkgs/servers/http/tomcat/6.0.nix
+++ b/pkgs/servers/http/tomcat/6.0.nix
@@ -1,23 +1,6 @@
-{ stdenv, fetchurl }:
-
-let version = "6.0.39"; in
-
-stdenv.mkDerivation rec {
-  name = "apache-tomcat-${version}";
-
-  src = fetchurl {
-    url = "mirror://apache/tomcat/tomcat-6/v${version}/bin/${name}.tar.gz";
+import ./recent.nix 
+  {
+    versionMajor = "6";
+    versionMinor = "0.39";
     sha256 = "19qix6affhc252n03smjf482drg3nxd27shni1gvhphgj3zfmgfy";
-  };
-
-  installPhase =
-    ''
-      mkdir $out
-      mv * $out
-    '';
-
-  meta = {
-    homepage = http://tomcat.apache.org/;
-    description = "An implementation of the Java Servlet and JavaServer Pages technologies";
-  };
-}
+  }
diff --git a/pkgs/servers/http/tomcat/7.0.nix b/pkgs/servers/http/tomcat/7.0.nix
new file mode 100644
index 000000000000..87bc57eb2b65
--- /dev/null
+++ b/pkgs/servers/http/tomcat/7.0.nix
@@ -0,0 +1,6 @@
+import ./recent.nix 
+  {
+    versionMajor = "7";
+    versionMinor = "0.55";
+    sha256 = "c20934fda63bc7311e2d8e067d67f886890c8be72280425c5f6f8fdd7a376c15";
+  }
diff --git a/pkgs/servers/http/tomcat/recent.nix b/pkgs/servers/http/tomcat/recent.nix
new file mode 100644
index 000000000000..0d11ba7a1046
--- /dev/null
+++ b/pkgs/servers/http/tomcat/recent.nix
@@ -0,0 +1,24 @@
+{ versionMajor, versionMinor, sha256 }:
+{ stdenv, fetchurl }:
+
+let version = "${versionMajor}.${versionMinor}"; in
+
+stdenv.mkDerivation rec {
+  name = "apache-tomcat-${version}";
+
+  src = fetchurl {
+    url = "mirror://apache/tomcat/tomcat-${versionMajor}/v${version}/bin/${name}.tar.gz";
+    inherit sha256;
+  };
+
+  installPhase =
+    ''
+      mkdir $out
+      mv * $out
+    '';
+
+  meta = {
+    homepage = http://tomcat.apache.org/;
+    description = "An implementation of the Java Servlet and JavaServer Pages technologies";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f2c8b83ada53..7aeaf7f7a3c5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7022,6 +7022,8 @@ let
 
   tomcat6 = callPackage ../servers/http/tomcat/6.0.nix { };
 
+  tomcat7 = callPackage ../servers/http/tomcat/7.0.nix { };
+
   tomcat_mysql_jdbc = callPackage ../servers/http/tomcat/jdbc/mysql { };
 
   axis2 = callPackage ../servers/http/tomcat/axis2 { };

From 219983d6ad1bec55ab174d064d41d086654f9a17 Mon Sep 17 00:00:00 2001
From: Sam Griffin <sam.griffin@gmail.com>
Date: Wed, 20 Aug 2014 23:23:44 -0400
Subject: [PATCH 0283/1453] adding tomcat version 8

---
 pkgs/servers/http/tomcat/8.0.nix | 6 ++++++
 pkgs/top-level/all-packages.nix  | 2 ++
 2 files changed, 8 insertions(+)
 create mode 100644 pkgs/servers/http/tomcat/8.0.nix

diff --git a/pkgs/servers/http/tomcat/8.0.nix b/pkgs/servers/http/tomcat/8.0.nix
new file mode 100644
index 000000000000..63b8d2bbc94e
--- /dev/null
+++ b/pkgs/servers/http/tomcat/8.0.nix
@@ -0,0 +1,6 @@
+import ./recent.nix 
+  {
+    versionMajor = "8";
+    versionMinor = "0.9";
+    sha256 = "5ea3c8260088ee4fd223a532a4b0c23a10e549c34705e2f190279a1a7f1f83d9";
+  }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7aeaf7f7a3c5..4ae428bd83ee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7023,6 +7023,8 @@ let
   tomcat6 = callPackage ../servers/http/tomcat/6.0.nix { };
 
   tomcat7 = callPackage ../servers/http/tomcat/7.0.nix { };
+	
+  tomcat8 = callPackage ../servers/http/tomcat/8.0.nix { };
 
   tomcat_mysql_jdbc = callPackage ../servers/http/tomcat/jdbc/mysql { };
 

From b6a2f8eaa8019fa1b40e1ed160eddf3c3e2ae944 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 21 Aug 2014 08:42:00 +0400
Subject: [PATCH 0284/1453] Fix a strange openresty build error

---
 pkgs/servers/http/openresty/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix
index f95272b7e8ae..e301cc429b9e 100644
--- a/pkgs/servers/http/openresty/default.nix
+++ b/pkgs/servers/http/openresty/default.nix
@@ -46,6 +46,7 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2}/include/libxml2 $additionalFlags"
     export PATH="$PATH:${stdenv.gcc.libc}/sbin"
+    patchShebangs .
   '';
 
   meta = {

From f09f8adc0fe0ff19453ff519f86af91013899a56 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 21 Aug 2014 00:22:42 -0500
Subject: [PATCH 0285/1453] nixpkgs: stricat 20140609100300

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/tools/security/stricat/default.nix | 24 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/tools/security/stricat/default.nix

diff --git a/pkgs/tools/security/stricat/default.nix b/pkgs/tools/security/stricat/default.nix
new file mode 100644
index 000000000000..64ebb4c0ca26
--- /dev/null
+++ b/pkgs/tools/security/stricat/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name    = "stricat-${version}";
+  version = "20140609100300";
+
+  src = fetchurl {
+    url    = "http://www.stribob.com/dist/${name}.tgz";
+    sha256 = "1axg8r4g5n5kdqj5013pgck80nni3z172xkg506vz4zx1zcmrm4r";
+  };
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mv stricat $out/bin
+  '';
+
+  meta = {
+    description = "multi-use cryptographic tool based on the STRIBOB algorithm";
+    homepage    = "https://www.stribob.com/stricat/";
+    license     = stdenv.lib.licenses.bsd3;
+    platforms   = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f2c8b83ada53..94c4888d7bbc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2169,6 +2169,8 @@ let
 
   sitecopy = callPackage ../tools/networking/sitecopy { };
 
+  stricat = callPackage ../tools/security/stricat { };
+
   privoxy = callPackage ../tools/networking/privoxy { };
 
   t1utils = callPackage ../tools/misc/t1utils { };

From af14075f4d2fe75a6f62a1adad6cec17f16ac5a1 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 21 Aug 2014 11:27:56 +0200
Subject: [PATCH 0286/1453] Update node-packages-generated. Remove packages
 from node-packages.json that use an npm package that has a cyclic dependency.
 See also npm2nix#3

---
 pkgs/top-level/node-packages-generated.nix | 11965 ++++++++++---------
 pkgs/top-level/node-packages.json          |     8 -
 2 files changed, 6362 insertions(+), 5611 deletions(-)

diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index e250085f7307..fb12a10e5df3 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -20,99 +20,15 @@
     ];
     passthru.names = [ "Base64" ];
   };
-  by-spec."CSSselect"."0.x" =
-    self.by-version."CSSselect"."0.7.0";
-  by-version."CSSselect"."0.7.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-CSSselect-0.7.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/CSSselect/-/CSSselect-0.7.0.tgz";
-        name = "CSSselect-0.7.0.tgz";
-        sha1 = "e4054c67b467465f3c9500c0da0aa7878c4babd2";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."CSSselect" or []);
-    deps = [
-      self.by-version."CSSwhat"."0.4.5"
-      self.by-version."domutils"."1.4.3"
-      self.by-version."boolbase"."1.0.0"
-      self.by-version."nth-check"."1.0.0"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "CSSselect" ];
-  };
-  by-spec."CSSselect"."~0.4.0" =
-    self.by-version."CSSselect"."0.4.1";
-  by-version."CSSselect"."0.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-CSSselect-0.4.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/CSSselect/-/CSSselect-0.4.1.tgz";
-        name = "CSSselect-0.4.1.tgz";
-        sha1 = "f8ab7e1f8418ce63cda6eb7bd778a85d7ec492b2";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."CSSselect" or []);
-    deps = [
-      self.by-version."CSSwhat"."0.4.5"
-      self.by-version."domutils"."1.4.3"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "CSSselect" ];
-  };
-  by-spec."CSSwhat"."0.4" =
-    self.by-version."CSSwhat"."0.4.5";
-  by-version."CSSwhat"."0.4.5" = lib.makeOverridable self.buildNodePackage {
-    name = "node-CSSwhat-0.4.5";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/CSSwhat/-/CSSwhat-0.4.5.tgz";
-        name = "CSSwhat-0.4.5.tgz";
-        sha1 = "85d7b2799ff3d98055353c802949e39913e16a62";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."CSSwhat" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "CSSwhat" ];
-  };
-  by-spec."JSONStream"."~0.6.4" =
-    self.by-version."JSONStream"."0.6.4";
-  by-version."JSONStream"."0.6.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-JSONStream-0.6.4";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/JSONStream/-/JSONStream-0.6.4.tgz";
-        name = "JSONStream-0.6.4.tgz";
-        sha1 = "4b2c8063f8f512787b2375f7ee9db69208fa2dcb";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."JSONStream" or []);
-    deps = [
-      self.by-version."jsonparse"."0.0.5"
-      self.by-version."through"."2.2.7"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "JSONStream" ];
-  };
   by-spec."JSONStream"."~0.7.1" =
-    self.by-version."JSONStream"."0.7.2";
-  by-version."JSONStream"."0.7.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-JSONStream-0.7.2";
+    self.by-version."JSONStream"."0.7.4";
+  by-version."JSONStream"."0.7.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-JSONStream-0.7.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/JSONStream/-/JSONStream-0.7.2.tgz";
-        name = "JSONStream-0.7.2.tgz";
-        sha1 = "27f4d7fe1918dc08ee72aed9c794e32ce80618f7";
+        url = "http://registry.npmjs.org/JSONStream/-/JSONStream-0.7.4.tgz";
+        name = "JSONStream-0.7.4.tgz";
+        sha1 = "734290e41511eea7c2cfe151fbf9a563a97b9786";
       })
     ];
     buildInputs =
@@ -125,6 +41,29 @@
     ];
     passthru.names = [ "JSONStream" ];
   };
+  by-spec."JSONStream"."~0.8.3" =
+    self.by-version."JSONStream"."0.8.4";
+  by-version."JSONStream"."0.8.4" = lib.makeOverridable self.buildNodePackage {
+    name = "JSONStream-0.8.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz";
+        name = "JSONStream-0.8.4.tgz";
+        sha1 = "91657dfe6ff857483066132b4618b62e8f4887bd";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."JSONStream" or []);
+    deps = [
+      self.by-version."jsonparse"."0.0.5"
+      self.by-version."through"."2.3.4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "JSONStream" ];
+  };
+  by-spec."JSONStream"."~0.8.4" =
+    self.by-version."JSONStream"."0.8.4";
   by-spec."StringScanner"."~0.0.3" =
     self.by-version."StringScanner"."0.0.3";
   by-version."StringScanner"."0.0.3" = lib.makeOverridable self.buildNodePackage {
@@ -165,7 +104,7 @@
   };
   by-spec."abbrev"."1.0.x" =
     self.by-version."abbrev"."1.0.5";
-  by-spec."abbrev"."~1.0.4" =
+  by-spec."abbrev"."~1.0.5" =
     self.by-version."abbrev"."1.0.5";
   by-spec."accepts"."1.0.0" =
     self.by-version."accepts"."1.0.0";
@@ -188,6 +127,33 @@
     ];
     passthru.names = [ "accepts" ];
   };
+  by-spec."accepts"."~1.0.0" =
+    self.by-version."accepts"."1.0.7";
+  by-version."accepts"."1.0.7" = lib.makeOverridable self.buildNodePackage {
+    name = "node-accepts-1.0.7";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/accepts/-/accepts-1.0.7.tgz";
+        name = "accepts-1.0.7.tgz";
+        sha1 = "5b501fb4f0704309964ccdb048172541208dab1a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."accepts" or []);
+    deps = [
+      self.by-version."mime-types"."1.0.2"
+      self.by-version."negotiator"."0.4.7"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "accepts" ];
+  };
+  by-spec."accepts"."~1.0.4" =
+    self.by-version."accepts"."1.0.7";
+  by-spec."accepts"."~1.0.5" =
+    self.by-version."accepts"."1.0.7";
+  by-spec."accepts"."~1.0.7" =
+    self.by-version."accepts"."1.0.7";
   by-spec."active-x-obfuscator"."0.0.1" =
     self.by-version."active-x-obfuscator"."0.0.1";
   by-version."active-x-obfuscator"."0.0.1" = lib.makeOverridable self.buildNodePackage {
@@ -208,7 +174,7 @@
     ];
     passthru.names = [ "active-x-obfuscator" ];
   };
-  by-spec."addressparser"."~0.2.0" =
+  by-spec."addressparser"."~0.2.1" =
     self.by-version."addressparser"."0.2.1";
   by-version."addressparser"."0.2.1" = lib.makeOverridable self.buildNodePackage {
     name = "node-addressparser-0.2.1";
@@ -246,7 +212,7 @@
     ];
     passthru.names = [ "adm-zip" ];
   };
-  by-spec."adm-zip"."^0.4.3" =
+  by-spec."adm-zip"."~0.4.3" =
     self.by-version."adm-zip"."0.4.4";
   by-version."adm-zip"."0.4.4" = lib.makeOverridable self.buildNodePackage {
     name = "node-adm-zip-0.4.4";
@@ -265,8 +231,6 @@
     ];
     passthru.names = [ "adm-zip" ];
   };
-  by-spec."adm-zip"."~0.4.3" =
-    self.by-version."adm-zip"."0.4.4";
   by-spec."almond"."*" =
     self.by-version."almond"."0.2.9";
   by-version."almond"."0.2.9" = lib.makeOverridable self.buildNodePackage {
@@ -309,15 +273,15 @@
   "amdefine" = self.by-version."amdefine"."0.1.0";
   by-spec."amdefine".">=0.0.4" =
     self.by-version."amdefine"."0.1.0";
-  by-spec."ansi"."~0.2.1" =
-    self.by-version."ansi"."0.2.1";
-  by-version."ansi"."0.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "ansi-0.2.1";
+  by-spec."ansi"."~0.3.0" =
+    self.by-version."ansi"."0.3.0";
+  by-version."ansi"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-ansi-0.3.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/ansi/-/ansi-0.2.1.tgz";
-        name = "ansi-0.2.1.tgz";
-        sha1 = "3ab568ec18cd0ab7753c83117d57dad684a1c017";
+        url = "http://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz";
+        name = "ansi-0.3.0.tgz";
+        sha1 = "74b2f1f187c8553c7f95015bcb76009fb43d38e0";
       })
     ];
     buildInputs =
@@ -328,6 +292,46 @@
     ];
     passthru.names = [ "ansi" ];
   };
+  by-spec."ansi-regex"."^0.1.0" =
+    self.by-version."ansi-regex"."0.1.0";
+  by-version."ansi-regex"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-ansi-regex-0.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-0.1.0.tgz";
+        name = "ansi-regex-0.1.0.tgz";
+        sha1 = "55ca60db6900857c423ae9297980026f941ed903";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."ansi-regex" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "ansi-regex" ];
+  };
+  by-spec."ansi-regex"."^0.2.0" =
+    self.by-version."ansi-regex"."0.2.1";
+  by-version."ansi-regex"."0.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-ansi-regex-0.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz";
+        name = "ansi-regex-0.2.1.tgz";
+        sha1 = "0d8e946967a3d8143f93e24e298525fc1b2235f9";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."ansi-regex" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "ansi-regex" ];
+  };
+  by-spec."ansi-regex"."^0.2.1" =
+    self.by-version."ansi-regex"."0.2.1";
   by-spec."ansi-remover"."*" =
     self.by-version."ansi-remover"."0.0.2";
   by-version."ansi-remover"."0.0.2" = lib.makeOverridable self.buildNodePackage {
@@ -348,34 +352,15 @@
     passthru.names = [ "ansi-remover" ];
   };
   "ansi-remover" = self.by-version."ansi-remover"."0.0.2";
-  by-spec."ansi-styles"."~0.1.0" =
-    self.by-version."ansi-styles"."0.1.2";
-  by-version."ansi-styles"."0.1.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-ansi-styles-0.1.2";
+  by-spec."ansi-styles"."^1.1.0" =
+    self.by-version."ansi-styles"."1.1.0";
+  by-version."ansi-styles"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-ansi-styles-1.1.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-0.1.2.tgz";
-        name = "ansi-styles-0.1.2.tgz";
-        sha1 = "5bab27c2e0bbe944ee42057cf23adee970abc7c6";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ansi-styles" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "ansi-styles" ];
-  };
-  by-spec."ansi-styles"."~0.2.0" =
-    self.by-version."ansi-styles"."0.2.0";
-  by-version."ansi-styles"."0.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-ansi-styles-0.2.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-0.2.0.tgz";
-        name = "ansi-styles-0.2.0.tgz";
-        sha1 = "359ab4b15dcd64ba6d74734b72c36360a9af2c19";
+        url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz";
+        name = "ansi-styles-1.1.0.tgz";
+        sha1 = "eaecbf66cd706882760b2f4691582b8f55d7a7de";
       })
     ];
     buildInputs =
@@ -405,25 +390,6 @@
     ];
     passthru.names = [ "ansi-styles" ];
   };
-  by-spec."ansicolors"."~0.2.1" =
-    self.by-version."ansicolors"."0.2.1";
-  by-version."ansicolors"."0.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-ansicolors-0.2.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/ansicolors/-/ansicolors-0.2.1.tgz";
-        name = "ansicolors-0.2.1.tgz";
-        sha1 = "be089599097b74a5c9c4a84a0cdbcdb62bd87aef";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ansicolors" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "ansicolors" ];
-  };
   by-spec."ansicolors"."~0.3.2" =
     self.by-version."ansicolors"."0.3.2";
   by-version."ansicolors"."0.3.2" = lib.makeOverridable self.buildNodePackage {
@@ -482,24 +448,26 @@
     ];
     passthru.names = [ "apparatus" ];
   };
-  by-spec."archiver"."~0.5.2" =
-    self.by-version."archiver"."0.5.2";
-  by-version."archiver"."0.5.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-archiver-0.5.2";
+  by-spec."archiver"."~0.10.0" =
+    self.by-version."archiver"."0.10.1";
+  by-version."archiver"."0.10.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-archiver-0.10.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/archiver/-/archiver-0.5.2.tgz";
-        name = "archiver-0.5.2.tgz";
-        sha1 = "4e021b1fea5d902201f4886fca6a19fcc760083b";
+        url = "http://registry.npmjs.org/archiver/-/archiver-0.10.1.tgz";
+        name = "archiver-0.10.1.tgz";
+        sha1 = "c88a50fe114f744d059a07dfc4690f3a204146e4";
       })
     ];
     buildInputs =
       (self.nativeDeps."archiver" or []);
     deps = [
-      self.by-version."readable-stream"."1.0.27-1"
-      self.by-version."zip-stream"."0.1.4"
+      self.by-version."buffer-crc32"."0.2.3"
+      self.by-version."readable-stream"."1.0.31"
+      self.by-version."tar-stream"."0.4.5"
+      self.by-version."zip-stream"."0.3.7"
       self.by-version."lazystream"."0.1.0"
-      self.by-version."file-utils"."0.1.5"
+      self.by-version."file-utils"."0.2.0"
       self.by-version."lodash"."2.4.1"
     ];
     peerDependencies = [
@@ -525,8 +493,6 @@
     ];
     passthru.names = [ "archy" ];
   };
-  by-spec."archy"."0.0.2" =
-    self.by-version."archy"."0.0.2";
   by-spec."argparse"."0.1.15" =
     self.by-version."argparse"."0.1.15";
   by-version."argparse"."0.1.15" = lib.makeOverridable self.buildNodePackage {
@@ -550,63 +516,6 @@
   };
   by-spec."argparse"."~ 0.1.11" =
     self.by-version."argparse"."0.1.15";
-  by-spec."array-filter"."~0.0.0" =
-    self.by-version."array-filter"."0.0.1";
-  by-version."array-filter"."0.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-array-filter-0.0.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/array-filter/-/array-filter-0.0.1.tgz";
-        name = "array-filter-0.0.1.tgz";
-        sha1 = "7da8cf2e26628ed732803581fd21f67cacd2eeec";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."array-filter" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "array-filter" ];
-  };
-  by-spec."array-map"."~0.0.0" =
-    self.by-version."array-map"."0.0.0";
-  by-version."array-map"."0.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-array-map-0.0.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz";
-        name = "array-map-0.0.0.tgz";
-        sha1 = "88a2bab73d1cf7bcd5c1b118a003f66f665fa662";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."array-map" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "array-map" ];
-  };
-  by-spec."array-reduce"."~0.0.0" =
-    self.by-version."array-reduce"."0.0.0";
-  by-version."array-reduce"."0.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-array-reduce-0.0.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/array-reduce/-/array-reduce-0.0.0.tgz";
-        name = "array-reduce-0.0.0.tgz";
-        sha1 = "173899d3ffd1c7d9383e4479525dbe278cab5f2b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."array-reduce" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "array-reduce" ];
-  };
   by-spec."asap"."^1.0.0" =
     self.by-version."asap"."1.0.0";
   by-version."asap"."1.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -645,27 +554,6 @@
     ];
     passthru.names = [ "ascii-json" ];
   };
-  by-spec."ascli"."*" =
-    self.by-version."ascli"."0.3.0";
-  by-version."ascli"."0.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-ascli-0.3.0";
-    src = [
-      (self.patchSource fetchurl {
-        url = "http://registry.npmjs.org/ascli/-/ascli-0.3.0.tgz";
-        name = "ascli-0.3.0.tgz";
-        sha1 = "5e66230e5219fe3e8952a4efb4f20fae596a813a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ascli" or []);
-    deps = [
-      self.by-version."colour"."0.7.1"
-      self.by-version."optjs"."3.2.1-boom"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "ascli" ];
-  };
   by-spec."asn1"."0.1.11" =
     self.by-version."asn1"."0.1.11";
   by-version."asn1"."0.1.11" = lib.makeOverridable self.buildNodePackage {
@@ -727,6 +615,25 @@
     ];
     passthru.names = [ "assert-plus" ];
   };
+  by-spec."assert-plus"."0.1.3" =
+    self.by-version."assert-plus"."0.1.3";
+  by-version."assert-plus"."0.1.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-assert-plus-0.1.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.3.tgz";
+        name = "assert-plus-0.1.3.tgz";
+        sha1 = "32eba8ac83e50ae4f4b5babab1ae9aa0edec9fef";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."assert-plus" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "assert-plus" ];
+  };
   by-spec."assertion-error"."1.0.0" =
     self.by-version."assertion-error"."1.0.0";
   by-version."assertion-error"."1.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -767,14 +674,14 @@
     passthru.names = [ "astw" ];
   };
   by-spec."async"."*" =
-    self.by-version."async"."0.7.0";
-  by-version."async"."0.7.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-async-0.7.0";
+    self.by-version."async"."0.9.0";
+  by-version."async"."0.9.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-async-0.9.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/async/-/async-0.7.0.tgz";
-        name = "async-0.7.0.tgz";
-        sha1 = "4429e0e62f5de0a54f37458c49f0b897eb52ada5";
+        url = "http://registry.npmjs.org/async/-/async-0.9.0.tgz";
+        name = "async-0.9.0.tgz";
+        sha1 = "ac3613b1da9bed1b47510bb4651b8931e47146c7";
       })
     ];
     buildInputs =
@@ -785,7 +692,7 @@
     ];
     passthru.names = [ "async" ];
   };
-  "async" = self.by-version."async"."0.7.0";
+  "async" = self.by-version."async"."0.9.0";
   by-spec."async"."0.1.15" =
     self.by-version."async"."0.1.15";
   by-version."async"."0.1.15" = lib.makeOverridable self.buildNodePackage {
@@ -864,29 +771,27 @@
     ];
     passthru.names = [ "async" ];
   };
+  by-spec."async"."0.9.x" =
+    self.by-version."async"."0.9.0";
   by-spec."async"."^0.2.10" =
     self.by-version."async"."0.2.10";
   by-spec."async"."~0.1.22" =
     self.by-version."async"."0.1.22";
-  by-spec."async"."~0.2.10" =
-    self.by-version."async"."0.2.10";
   by-spec."async"."~0.2.6" =
     self.by-version."async"."0.2.10";
   by-spec."async"."~0.2.7" =
     self.by-version."async"."0.2.10";
-  by-spec."async"."~0.2.8" =
-    self.by-version."async"."0.2.10";
   by-spec."async"."~0.2.9" =
     self.by-version."async"."0.2.10";
-  by-spec."async"."~0.4" =
-    self.by-version."async"."0.4.1";
-  by-version."async"."0.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-async-0.4.1";
+  by-spec."async"."~0.7.0" =
+    self.by-version."async"."0.7.0";
+  by-version."async"."0.7.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-async-0.7.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/async/-/async-0.4.1.tgz";
-        name = "async-0.4.1.tgz";
-        sha1 = "1985abade017df906bfaa8d77d424b25366b3a5b";
+        url = "http://registry.npmjs.org/async/-/async-0.7.0.tgz";
+        name = "async-0.7.0.tgz";
+        sha1 = "4429e0e62f5de0a54f37458c49f0b897eb52ada5";
       })
     ];
     buildInputs =
@@ -897,15 +802,15 @@
     ];
     passthru.names = [ "async" ];
   };
-  by-spec."async"."~0.6.2" =
-    self.by-version."async"."0.6.2";
-  by-version."async"."0.6.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-async-0.6.2";
+  by-spec."async"."~0.8" =
+    self.by-version."async"."0.8.0";
+  by-version."async"."0.8.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-async-0.8.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/async/-/async-0.6.2.tgz";
-        name = "async-0.6.2.tgz";
-        sha1 = "41fd038a3812c0a8bc1842ecf08ba63eb0392bef";
+        url = "http://registry.npmjs.org/async/-/async-0.8.0.tgz";
+        name = "async-0.8.0.tgz";
+        sha1 = "ee65ec77298c2ff1456bc4418a052d0f06435112";
       })
     ];
     buildInputs =
@@ -916,28 +821,51 @@
     ];
     passthru.names = [ "async" ];
   };
+  by-spec."async"."~0.9.0" =
+    self.by-version."async"."0.9.0";
+  by-spec."async-some"."~1.0.0" =
+    self.by-version."async-some"."1.0.1";
+  by-version."async-some"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-async-some-1.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/async-some/-/async-some-1.0.1.tgz";
+        name = "async-some-1.0.1.tgz";
+        sha1 = "8b54f08d46f0f9babc72ea9d646c245d23a4d9e5";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."async-some" or []);
+    deps = [
+      self.by-version."dezalgo"."1.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "async-some" ];
+  };
   by-spec."aws-sdk"."*" =
-    self.by-version."aws-sdk"."2.0.0-rc9";
-  by-version."aws-sdk"."2.0.0-rc9" = lib.makeOverridable self.buildNodePackage {
-    name = "node-aws-sdk-2.0.0-rc9";
+    self.by-version."aws-sdk"."2.0.14";
+  by-version."aws-sdk"."2.0.14" = lib.makeOverridable self.buildNodePackage {
+    name = "node-aws-sdk-2.0.14";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-2.0.0-rc9.tgz";
-        name = "aws-sdk-2.0.0-rc9.tgz";
-        sha1 = "caa7653837f7886e7f9e4da5df3b3c8324d7d0ab";
+        url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-2.0.14.tgz";
+        name = "aws-sdk-2.0.14.tgz";
+        sha1 = "ee6668b97d62924b3d27d577658411c06ad7f2ad";
       })
     ];
     buildInputs =
       (self.nativeDeps."aws-sdk" or []);
     deps = [
-      self.by-version."xml2js"."0.2.4"
+      self.by-version."aws-sdk-apis"."3.1.6"
+      self.by-version."xml2js"."0.2.6"
       self.by-version."xmlbuilder"."0.4.2"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "aws-sdk" ];
   };
-  "aws-sdk" = self.by-version."aws-sdk"."2.0.0-rc9";
+  "aws-sdk" = self.by-version."aws-sdk"."2.0.14";
   by-spec."aws-sdk".">=1.2.0 <2" =
     self.by-version."aws-sdk"."1.18.0";
   by-version."aws-sdk"."1.18.0" = lib.makeOverridable self.buildNodePackage {
@@ -959,6 +887,25 @@
     ];
     passthru.names = [ "aws-sdk" ];
   };
+  by-spec."aws-sdk-apis".">=3.1.0 <4.0.0" =
+    self.by-version."aws-sdk-apis"."3.1.6";
+  by-version."aws-sdk-apis"."3.1.6" = lib.makeOverridable self.buildNodePackage {
+    name = "node-aws-sdk-apis-3.1.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/aws-sdk-apis/-/aws-sdk-apis-3.1.6.tgz";
+        name = "aws-sdk-apis-3.1.6.tgz";
+        sha1 = "1831a16ef8d5dd7d7278c749aff3d33ee7b1dacb";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."aws-sdk-apis" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "aws-sdk-apis" ];
+  };
   by-spec."aws-sign"."~0.2.0" =
     self.by-version."aws-sign"."0.2.0";
   by-version."aws-sign"."0.2.0" = lib.makeOverridable self.buildNodePackage {
@@ -1076,14 +1023,14 @@
     passthru.names = [ "base62" ];
   };
   by-spec."base64-js"."~0.0.4" =
-    self.by-version."base64-js"."0.0.6";
-  by-version."base64-js"."0.0.6" = lib.makeOverridable self.buildNodePackage {
-    name = "node-base64-js-0.0.6";
+    self.by-version."base64-js"."0.0.7";
+  by-version."base64-js"."0.0.7" = lib.makeOverridable self.buildNodePackage {
+    name = "node-base64-js-0.0.7";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/base64-js/-/base64-js-0.0.6.tgz";
-        name = "base64-js-0.0.6.tgz";
-        sha1 = "7b859f79f0bbbd55867ba67a7fab397e24a20947";
+        url = "http://registry.npmjs.org/base64-js/-/base64-js-0.0.7.tgz";
+        name = "base64-js-0.0.7.tgz";
+        sha1 = "54400dc91d696cec32a8a47902f971522fee8f48";
       })
     ];
     buildInputs =
@@ -1094,6 +1041,25 @@
     ];
     passthru.names = [ "base64-js" ];
   };
+  by-spec."base64-url"."1" =
+    self.by-version."base64-url"."1.0.0";
+  by-version."base64-url"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-base64-url-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/base64-url/-/base64-url-1.0.0.tgz";
+        name = "base64-url-1.0.0.tgz";
+        sha1 = "ab694376f2801af6c9260899ffef02f86b40ee2c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."base64-url" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "base64-url" ];
+  };
   by-spec."base64id"."0.1.0" =
     self.by-version."base64id"."0.1.0";
   by-version."base64id"."0.1.0" = lib.makeOverridable self.buildNodePackage {
@@ -1113,6 +1079,25 @@
     ];
     passthru.names = [ "base64id" ];
   };
+  by-spec."basic-auth"."1.0.0" =
+    self.by-version."basic-auth"."1.0.0";
+  by-version."basic-auth"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-basic-auth-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/basic-auth/-/basic-auth-1.0.0.tgz";
+        name = "basic-auth-1.0.0.tgz";
+        sha1 = "111b2d9ff8e4e6d136b8c84ea5e096cb87351637";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."basic-auth" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "basic-auth" ];
+  };
   by-spec."basic-auth-connect"."1.0.0" =
     self.by-version."basic-auth-connect"."1.0.0";
   by-version."basic-auth-connect"."1.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -1151,57 +1136,56 @@
     ];
     passthru.names = [ "batch" ];
   };
-  by-spec."bcrypt"."*" =
-    self.by-version."bcrypt"."0.7.7";
-  by-version."bcrypt"."0.7.7" = lib.makeOverridable self.buildNodePackage {
-    name = "node-bcrypt-0.7.7";
+  by-spec."batch"."0.5.1" =
+    self.by-version."batch"."0.5.1";
+  by-version."batch"."0.5.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-batch-0.5.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/bcrypt/-/bcrypt-0.7.7.tgz";
-        name = "bcrypt-0.7.7.tgz";
-        sha1 = "966a2e709b8cf62c2e05408baf7c5ed663b3c868";
+        url = "http://registry.npmjs.org/batch/-/batch-0.5.1.tgz";
+        name = "batch-0.5.1.tgz";
+        sha1 = "36a4bab594c050fd7b507bca0db30c2d92af4ff2";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."batch" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "batch" ];
+  };
+  by-spec."bcrypt"."*" =
+    self.by-version."bcrypt"."0.8.0";
+  by-version."bcrypt"."0.8.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-bcrypt-0.8.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/bcrypt/-/bcrypt-0.8.0.tgz";
+        name = "bcrypt-0.8.0.tgz";
+        sha1 = "b8f226406e5b78c838833a8468a4a0402cbc93c9";
       })
     ];
     buildInputs =
       (self.nativeDeps."bcrypt" or []);
     deps = [
       self.by-version."bindings"."1.0.0"
+      self.by-version."nan"."1.3.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "bcrypt" ];
   };
-  "bcrypt" = self.by-version."bcrypt"."0.7.7";
-  by-spec."binary"."~0.3.0" =
-    self.by-version."binary"."0.3.0";
-  by-version."binary"."0.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-binary-0.3.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/binary/-/binary-0.3.0.tgz";
-        name = "binary-0.3.0.tgz";
-        sha1 = "9f60553bc5ce8c3386f3b553cff47462adecaa79";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."binary" or []);
-    deps = [
-      self.by-version."chainsaw"."0.1.0"
-      self.by-version."buffers"."0.1.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "binary" ];
-  };
+  "bcrypt" = self.by-version."bcrypt"."0.8.0";
   by-spec."bindings"."*" =
-    self.by-version."bindings"."1.2.0";
-  by-version."bindings"."1.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-bindings-1.2.0";
+    self.by-version."bindings"."1.2.1";
+  by-version."bindings"."1.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-bindings-1.2.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/bindings/-/bindings-1.2.0.tgz";
-        name = "bindings-1.2.0.tgz";
-        sha1 = "c224fc5b349a84043779f97a6271d9d70da7636f";
+        url = "http://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz";
+        name = "bindings-1.2.1.tgz";
+        sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11";
       })
     ];
     buildInputs =
@@ -1231,6 +1215,49 @@
     ];
     passthru.names = [ "bindings" ];
   };
+  by-spec."bindings"."1.1.1" =
+    self.by-version."bindings"."1.1.1";
+  by-version."bindings"."1.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-bindings-1.1.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/bindings/-/bindings-1.1.1.tgz";
+        name = "bindings-1.1.1.tgz";
+        sha1 = "951f7ae010302ffc50b265b124032017ed2bf6f3";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."bindings" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "bindings" ];
+  };
+  by-spec."bindings".">=1.2.1" =
+    self.by-version."bindings"."1.2.1";
+  by-spec."bindings"."~1.2.1" =
+    self.by-version."bindings"."1.2.1";
+  by-spec."bl"."^0.9.0" =
+    self.by-version."bl"."0.9.1";
+  by-version."bl"."0.9.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-bl-0.9.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/bl/-/bl-0.9.1.tgz";
+        name = "bl-0.9.1.tgz";
+        sha1 = "d262c5b83aa5cf4386cea1d998c82b36d7ae2942";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."bl" or []);
+    deps = [
+      self.by-version."readable-stream"."1.0.31"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "bl" ];
+  };
   by-spec."block-stream"."*" =
     self.by-version."block-stream"."0.0.7";
   by-version."block-stream"."0.0.7" = lib.makeOverridable self.buildNodePackage {
@@ -1253,6 +1280,25 @@
   };
   by-spec."block-stream"."0.0.7" =
     self.by-version."block-stream"."0.0.7";
+  by-spec."bluebird".">= 1.2.1" =
+    self.by-version."bluebird"."2.3.0";
+  by-version."bluebird"."2.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-bluebird-2.3.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/bluebird/-/bluebird-2.3.0.tgz";
+        name = "bluebird-2.3.0.tgz";
+        sha1 = "0d9260735ca30c8a28b3427a291fe2b9287da0f8";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."bluebird" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "bluebird" ];
+  };
   by-spec."blueimp-md5"."~1.1.0" =
     self.by-version."blueimp-md5"."1.1.0";
   by-version."blueimp-md5"."1.1.0" = lib.makeOverridable self.buildNodePackage {
@@ -1272,46 +1318,58 @@
     ];
     passthru.names = [ "blueimp-md5" ];
   };
-  by-spec."body-parser"."~1.0.1" =
-    self.by-version."body-parser"."1.0.2";
-  by-version."body-parser"."1.0.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-body-parser-1.0.2";
+  by-spec."body-parser"."~1.4.3" =
+    self.by-version."body-parser"."1.4.3";
+  by-version."body-parser"."1.4.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-body-parser-1.4.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/body-parser/-/body-parser-1.0.2.tgz";
-        name = "body-parser-1.0.2.tgz";
-        sha1 = "3461479a3278fe00fcaebec3314bb54fc4f7b47c";
+        url = "http://registry.npmjs.org/body-parser/-/body-parser-1.4.3.tgz";
+        name = "body-parser-1.4.3.tgz";
+        sha1 = "4727952cff4af0773eefa4b226c2f4122f5e234d";
       })
     ];
     buildInputs =
       (self.nativeDeps."body-parser" or []);
     deps = [
-      self.by-version."type-is"."1.1.0"
-      self.by-version."raw-body"."1.1.4"
+      self.by-version."bytes"."1.0.0"
+      self.by-version."depd"."0.3.0"
+      self.by-version."iconv-lite"."0.4.3"
+      self.by-version."media-typer"."0.2.0"
       self.by-version."qs"."0.6.6"
+      self.by-version."raw-body"."1.2.2"
+      self.by-version."type-is"."1.3.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "body-parser" ];
   };
-  by-spec."boolbase"."~1.0.0" =
-    self.by-version."boolbase"."1.0.0";
-  by-version."boolbase"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-boolbase-1.0.0";
+  by-spec."body-parser"."~1.6.5" =
+    self.by-version."body-parser"."1.6.5";
+  by-version."body-parser"."1.6.5" = lib.makeOverridable self.buildNodePackage {
+    name = "node-body-parser-1.6.5";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz";
-        name = "boolbase-1.0.0.tgz";
-        sha1 = "68dff5fbe60c51eb37725ea9e3ed310dcc1e776e";
+        url = "http://registry.npmjs.org/body-parser/-/body-parser-1.6.5.tgz";
+        name = "body-parser-1.6.5.tgz";
+        sha1 = "536f01e08ee2b6df6a941d6c8c9647ee99ee4de7";
       })
     ];
     buildInputs =
-      (self.nativeDeps."boolbase" or []);
+      (self.nativeDeps."body-parser" or []);
     deps = [
+      self.by-version."bytes"."1.0.0"
+      self.by-version."depd"."0.4.4"
+      self.by-version."iconv-lite"."0.4.4"
+      self.by-version."media-typer"."0.2.0"
+      self.by-version."on-finished"."2.1.0"
+      self.by-version."qs"."1.2.2"
+      self.by-version."raw-body"."1.3.0"
+      self.by-version."type-is"."1.3.2"
     ];
     peerDependencies = [
     ];
-    passthru.names = [ "boolbase" ];
+    passthru.names = [ "body-parser" ];
   };
   by-spec."boom"."0.3.x" =
     self.by-version."boom"."0.3.8";
@@ -1353,316 +1411,6 @@
     ];
     passthru.names = [ "boom" ];
   };
-  by-spec."bower"."*" =
-    self.by-version."bower"."1.3.2";
-  by-version."bower"."1.3.2" = lib.makeOverridable self.buildNodePackage {
-    name = "bower-1.3.2";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bower/-/bower-1.3.2.tgz";
-        name = "bower-1.3.2.tgz";
-        sha1 = "ae1eeea5c3ba9300e10e55b193e9d2fd5407fb7b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bower" or []);
-    deps = [
-      self.by-version."abbrev"."1.0.5"
-      self.by-version."archy"."0.0.2"
-      self.by-version."bower-config"."0.5.0"
-      self.by-version."bower-endpoint-parser"."0.2.1"
-      self.by-version."bower-json"."0.4.0"
-      self.by-version."bower-logger"."0.2.2"
-      self.by-version."bower-registry-client"."0.1.6"
-      self.by-version."cardinal"."0.4.4"
-      self.by-version."chalk"."0.4.0"
-      self.by-version."chmodr"."0.1.0"
-      self.by-version."decompress-zip"."0.0.6"
-      self.by-version."fstream"."0.1.25"
-      self.by-version."fstream-ignore"."0.0.7"
-      self.by-version."glob"."3.2.9"
-      self.by-version."graceful-fs"."2.0.3"
-      self.by-version."handlebars"."1.3.0"
-      self.by-version."inquirer"."0.4.1"
-      self.by-version."junk"."0.2.2"
-      self.by-version."mkdirp"."0.3.5"
-      self.by-version."mout"."0.9.1"
-      self.by-version."nopt"."2.1.2"
-      self.by-version."lru-cache"."2.5.0"
-      self.by-version."open"."0.0.5"
-      self.by-version."osenv"."0.0.3"
-      self.by-version."promptly"."0.2.0"
-      self.by-version."q"."1.0.1"
-      self.by-version."request"."2.33.0"
-      self.by-version."request-progress"."0.3.1"
-      self.by-version."retry"."0.6.0"
-      self.by-version."rimraf"."2.2.6"
-      self.by-version."semver"."2.2.1"
-      self.by-version."stringify-object"."0.2.0"
-      self.by-version."tar"."0.1.19"
-      self.by-version."tmp"."0.0.23"
-      self.by-version."update-notifier"."0.1.8"
-      self.by-version."which"."1.0.5"
-      self.by-version."p-throttler"."0.0.1"
-      self.by-version."insight"."0.3.1"
-      self.by-version."is-root"."0.1.0"
-      self.by-version."shell-quote"."1.4.1"
-      self.by-version."lockfile"."0.4.2"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "bower" ];
-  };
-  "bower" = self.by-version."bower"."1.3.2";
-  by-spec."bower".">=0.9.0" =
-    self.by-version."bower"."1.3.2";
-  by-spec."bower".">=1.2.8 <2" =
-    self.by-version."bower"."1.3.2";
-  by-spec."bower"."~1.2.0" =
-    self.by-version."bower"."1.2.8";
-  by-version."bower"."1.2.8" = lib.makeOverridable self.buildNodePackage {
-    name = "bower-1.2.8";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bower/-/bower-1.2.8.tgz";
-        name = "bower-1.2.8.tgz";
-        sha1 = "f63c0804a267d5ffaf2fd3fd488367e73dce202f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bower" or []);
-    deps = [
-      self.by-version."abbrev"."1.0.5"
-      self.by-version."archy"."0.0.2"
-      self.by-version."bower-config"."0.5.0"
-      self.by-version."bower-endpoint-parser"."0.2.1"
-      self.by-version."bower-json"."0.4.0"
-      self.by-version."bower-logger"."0.2.2"
-      self.by-version."bower-registry-client"."0.1.6"
-      self.by-version."cardinal"."0.4.4"
-      self.by-version."chalk"."0.2.1"
-      self.by-version."chmodr"."0.1.0"
-      self.by-version."decompress-zip"."0.0.6"
-      self.by-version."fstream"."0.1.25"
-      self.by-version."fstream-ignore"."0.0.7"
-      self.by-version."glob"."3.2.9"
-      self.by-version."graceful-fs"."2.0.3"
-      self.by-version."handlebars"."1.0.12"
-      self.by-version."inquirer"."0.3.5"
-      self.by-version."junk"."0.2.2"
-      self.by-version."mkdirp"."0.3.5"
-      self.by-version."mout"."0.7.1"
-      self.by-version."nopt"."2.1.2"
-      self.by-version."lru-cache"."2.3.1"
-      self.by-version."open"."0.0.5"
-      self.by-version."osenv"."0.0.3"
-      self.by-version."promptly"."0.2.0"
-      self.by-version."q"."0.9.7"
-      self.by-version."request"."2.27.0"
-      self.by-version."request-progress"."0.3.1"
-      self.by-version."retry"."0.6.0"
-      self.by-version."rimraf"."2.2.6"
-      self.by-version."semver"."2.1.0"
-      self.by-version."stringify-object"."0.1.8"
-      self.by-version."sudo-block"."0.2.1"
-      self.by-version."tar"."0.1.19"
-      self.by-version."tmp"."0.0.23"
-      self.by-version."update-notifier"."0.1.8"
-      self.by-version."which"."1.0.5"
-      self.by-version."p-throttler"."0.0.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "bower" ];
-  };
-  by-spec."bower-config"."~0.4.3" =
-    self.by-version."bower-config"."0.4.5";
-  by-version."bower-config"."0.4.5" = lib.makeOverridable self.buildNodePackage {
-    name = "node-bower-config-0.4.5";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bower-config/-/bower-config-0.4.5.tgz";
-        name = "bower-config-0.4.5.tgz";
-        sha1 = "baa7cee382f53b13bb62a4afaee7c05f20143c13";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bower-config" or []);
-    deps = [
-      self.by-version."graceful-fs"."2.0.3"
-      self.by-version."mout"."0.6.0"
-      self.by-version."optimist"."0.6.1"
-      self.by-version."osenv"."0.0.3"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "bower-config" ];
-  };
-  by-spec."bower-config"."~0.5.0" =
-    self.by-version."bower-config"."0.5.0";
-  by-version."bower-config"."0.5.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-bower-config-0.5.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bower-config/-/bower-config-0.5.0.tgz";
-        name = "bower-config-0.5.0.tgz";
-        sha1 = "d081d43008816b1beb876dee272219851dd4c89c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bower-config" or []);
-    deps = [
-      self.by-version."graceful-fs"."2.0.3"
-      self.by-version."mout"."0.6.0"
-      self.by-version."optimist"."0.6.1"
-      self.by-version."osenv"."0.0.3"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "bower-config" ];
-  };
-  by-spec."bower-endpoint-parser"."0.2.1" =
-    self.by-version."bower-endpoint-parser"."0.2.1";
-  by-version."bower-endpoint-parser"."0.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-bower-endpoint-parser-0.2.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bower-endpoint-parser/-/bower-endpoint-parser-0.2.1.tgz";
-        name = "bower-endpoint-parser-0.2.1.tgz";
-        sha1 = "8c4010a2900cdab07ea5d38f0bd03e9bbccef90f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bower-endpoint-parser" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "bower-endpoint-parser" ];
-  };
-  by-spec."bower-endpoint-parser"."~0.2.0" =
-    self.by-version."bower-endpoint-parser"."0.2.1";
-  by-spec."bower-json"."0.4.0" =
-    self.by-version."bower-json"."0.4.0";
-  by-version."bower-json"."0.4.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-bower-json-0.4.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bower-json/-/bower-json-0.4.0.tgz";
-        name = "bower-json-0.4.0.tgz";
-        sha1 = "a99c3ccf416ef0590ed0ded252c760f1c6d93766";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bower-json" or []);
-    deps = [
-      self.by-version."deep-extend"."0.2.8"
-      self.by-version."graceful-fs"."2.0.3"
-      self.by-version."intersect"."0.0.3"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "bower-json" ];
-  };
-  by-spec."bower-json"."~0.4.0" =
-    self.by-version."bower-json"."0.4.0";
-  by-spec."bower-logger"."0.2.1" =
-    self.by-version."bower-logger"."0.2.1";
-  by-version."bower-logger"."0.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-bower-logger-0.2.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bower-logger/-/bower-logger-0.2.1.tgz";
-        name = "bower-logger-0.2.1.tgz";
-        sha1 = "0c1817c48063a88d96cc3d516c55e57fff5d9ecb";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bower-logger" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "bower-logger" ];
-  };
-  by-spec."bower-logger"."~0.2.1" =
-    self.by-version."bower-logger"."0.2.2";
-  by-version."bower-logger"."0.2.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-bower-logger-0.2.2";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bower-logger/-/bower-logger-0.2.2.tgz";
-        name = "bower-logger-0.2.2.tgz";
-        sha1 = "39be07e979b2fc8e03a94634205ed9422373d381";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bower-logger" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "bower-logger" ];
-  };
-  by-spec."bower-logger"."~0.2.2" =
-    self.by-version."bower-logger"."0.2.2";
-  by-spec."bower-registry-client"."~0.1.4" =
-    self.by-version."bower-registry-client"."0.1.6";
-  by-version."bower-registry-client"."0.1.6" = lib.makeOverridable self.buildNodePackage {
-    name = "node-bower-registry-client-0.1.6";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bower-registry-client/-/bower-registry-client-0.1.6.tgz";
-        name = "bower-registry-client-0.1.6.tgz";
-        sha1 = "c3ae74a98f24f50a373bbcb0ef443558be01d4b7";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bower-registry-client" or []);
-    deps = [
-      self.by-version."async"."0.2.10"
-      self.by-version."bower-config"."0.4.5"
-      self.by-version."graceful-fs"."2.0.3"
-      self.by-version."lru-cache"."2.3.1"
-      self.by-version."request"."2.27.0"
-      self.by-version."request-replay"."0.2.0"
-      self.by-version."rimraf"."2.2.6"
-      self.by-version."mkdirp"."0.3.5"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "bower-registry-client" ];
-  };
-  by-spec."bower2nix"."*" =
-    self.by-version."bower2nix"."2.1.0";
-  by-version."bower2nix"."2.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "bower2nix-2.1.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bower2nix/-/bower2nix-2.1.0.tgz";
-        name = "bower2nix-2.1.0.tgz";
-        sha1 = "213f507a729b20a1c3cb48f995a034f9c05f53e6";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bower2nix" or []);
-    deps = [
-      self.by-version."temp"."0.6.0"
-      self.by-version."fs.extra"."1.2.1"
-      self.by-version."bower-json"."0.4.0"
-      self.by-version."bower-endpoint-parser"."0.2.1"
-      self.by-version."bower-logger"."0.2.1"
-      self.by-version."bower"."1.3.2"
-      self.by-version."argparse"."0.1.15"
-      self.by-version."clone"."0.1.11"
-      self.by-version."semver"."2.2.1"
-      self.by-version."fetch-bower"."2.0.0"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "bower2nix" ];
-  };
-  "bower2nix" = self.by-version."bower2nix"."2.1.0";
   by-spec."broadway"."0.2.9" =
     self.by-version."broadway"."0.2.9";
   by-version."broadway"."0.2.9" = lib.makeOverridable self.buildNodePackage {
@@ -1689,204 +1437,147 @@
   };
   by-spec."broadway"."0.2.x" =
     self.by-version."broadway"."0.2.9";
-  by-spec."browser-pack"."~2.0.0" =
-    self.by-version."browser-pack"."2.0.1";
-  by-version."browser-pack"."2.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "browser-pack-2.0.1";
+  by-spec."browser-pack"."^3.0.0" =
+    self.by-version."browser-pack"."3.1.1";
+  by-version."browser-pack"."3.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "browser-pack-3.1.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/browser-pack/-/browser-pack-2.0.1.tgz";
-        name = "browser-pack-2.0.1.tgz";
-        sha1 = "5d1c527f56c582677411c4db2a128648ff6bf150";
+        url = "http://registry.npmjs.org/browser-pack/-/browser-pack-3.1.1.tgz";
+        name = "browser-pack-3.1.1.tgz";
+        sha1 = "b7600f080d2a7ef1a276ef4c0485a358ba9d1215";
       })
     ];
     buildInputs =
       (self.nativeDeps."browser-pack" or []);
     deps = [
-      self.by-version."JSONStream"."0.6.4"
-      self.by-version."through"."2.3.4"
+      self.by-version."JSONStream"."0.8.4"
       self.by-version."combine-source-map"."0.3.0"
+      self.by-version."concat-stream"."1.4.6"
+      self.by-version."through2"."0.5.1"
+      self.by-version."umd"."2.1.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "browser-pack" ];
   };
-  by-spec."browser-resolve"."~1.2.1" =
-    self.by-version."browser-resolve"."1.2.4";
-  by-version."browser-resolve"."1.2.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-browser-resolve-1.2.4";
+  by-spec."browser-resolve"."^1.3.0" =
+    self.by-version."browser-resolve"."1.3.2";
+  by-version."browser-resolve"."1.3.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-browser-resolve-1.3.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/browser-resolve/-/browser-resolve-1.2.4.tgz";
-        name = "browser-resolve-1.2.4.tgz";
-        sha1 = "59ae7820a82955ecd32f5fb7c468ac21c4723806";
+        url = "http://registry.npmjs.org/browser-resolve/-/browser-resolve-1.3.2.tgz";
+        name = "browser-resolve-1.3.2.tgz";
+        sha1 = "028417dd85828eea872c1bbb3e6609534545d20c";
       })
     ];
     buildInputs =
       (self.nativeDeps."browser-resolve" or []);
     deps = [
-      self.by-version."resolve"."0.6.3"
+      self.by-version."resolve"."0.7.4"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "browser-resolve" ];
   };
-  by-spec."browser-resolve"."~1.2.2" =
-    self.by-version."browser-resolve"."1.2.4";
+  by-spec."browser-resolve"."^1.3.1" =
+    self.by-version."browser-resolve"."1.3.2";
   by-spec."browserchannel"."*" =
-    self.by-version."browserchannel"."1.2.0";
-  by-version."browserchannel"."1.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-browserchannel-1.2.0";
+    self.by-version."browserchannel"."2.0.0";
+  by-version."browserchannel"."2.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-browserchannel-2.0.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/browserchannel/-/browserchannel-1.2.0.tgz";
-        name = "browserchannel-1.2.0.tgz";
-        sha1 = "207ce6eb844e00febfdf32084f10d4757cbcf97c";
+        url = "http://registry.npmjs.org/browserchannel/-/browserchannel-2.0.0.tgz";
+        name = "browserchannel-2.0.0.tgz";
+        sha1 = "0f211b3cad9995e8729b2bacd46b53c027c0ea63";
       })
     ];
     buildInputs =
       (self.nativeDeps."browserchannel" or []);
     deps = [
       self.by-version."hat"."0.0.3"
-      self.by-version."connect"."2.14.4"
-      self.by-version."request"."2.34.0"
+      self.by-version."connect"."2.25.7"
+      self.by-version."request"."2.40.0"
       self.by-version."ascii-json"."0.2.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "browserchannel" ];
   };
-  "browserchannel" = self.by-version."browserchannel"."1.2.0";
+  "browserchannel" = self.by-version."browserchannel"."2.0.0";
   by-spec."browserify"."*" =
-    self.by-version."browserify"."3.44.2";
-  by-version."browserify"."3.44.2" = lib.makeOverridable self.buildNodePackage {
-    name = "browserify-3.44.2";
+    self.by-version."browserify"."5.10.1";
+  by-version."browserify"."5.10.1" = lib.makeOverridable self.buildNodePackage {
+    name = "browserify-5.10.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/browserify/-/browserify-3.44.2.tgz";
-        name = "browserify-3.44.2.tgz";
-        sha1 = "ffa2788d06e8073ffd734d94c3ae272ca3dd630a";
+        url = "http://registry.npmjs.org/browserify/-/browserify-5.10.1.tgz";
+        name = "browserify-5.10.1.tgz";
+        sha1 = "a79cc8b647d6bfe25f96434ff8ecaeb5c01f6bae";
       })
     ];
     buildInputs =
       (self.nativeDeps."browserify" or []);
     deps = [
-      self.by-version."JSONStream"."0.7.2"
+      self.by-version."JSONStream"."0.8.4"
       self.by-version."assert"."1.1.1"
-      self.by-version."browser-pack"."2.0.1"
-      self.by-version."browser-resolve"."1.2.4"
+      self.by-version."browser-pack"."3.1.1"
+      self.by-version."browser-resolve"."1.3.2"
       self.by-version."browserify-zlib"."0.1.4"
-      self.by-version."buffer"."2.1.13"
-      self.by-version."builtins"."0.0.3"
+      self.by-version."buffer"."2.5.0"
+      self.by-version."builtins"."0.0.5"
       self.by-version."commondir"."0.0.1"
-      self.by-version."concat-stream"."1.4.5"
-      self.by-version."console-browserify"."1.0.3"
+      self.by-version."concat-stream"."1.4.6"
+      self.by-version."console-browserify"."1.1.0"
       self.by-version."constants-browserify"."0.0.1"
-      self.by-version."crypto-browserify"."1.0.9"
-      self.by-version."deep-equal"."0.1.2"
+      self.by-version."crypto-browserify"."3.0.1"
+      self.by-version."deep-equal"."0.2.1"
       self.by-version."defined"."0.0.0"
-      self.by-version."deps-sort"."0.1.1"
-      self.by-version."derequire"."0.8.0"
-      self.by-version."domain-browser"."1.1.1"
-      self.by-version."duplexer"."0.1.1"
-      self.by-version."events"."1.0.0"
-      self.by-version."glob"."3.2.9"
-      self.by-version."http-browserify"."1.3.2"
+      self.by-version."deps-sort"."1.3.5"
+      self.by-version."domain-browser"."1.1.2"
+      self.by-version."duplexer2"."0.0.2"
+      self.by-version."events"."1.0.1"
+      self.by-version."glob"."4.0.5"
+      self.by-version."http-browserify"."1.5.0"
       self.by-version."https-browserify"."0.0.0"
       self.by-version."inherits"."2.0.1"
-      self.by-version."insert-module-globals"."5.0.1"
-      self.by-version."module-deps"."1.10.0"
+      self.by-version."insert-module-globals"."6.1.0"
+      self.by-version."isarray"."0.0.1"
+      self.by-version."labeled-stream-splicer"."1.0.0"
+      self.by-version."module-deps"."3.5.5"
       self.by-version."os-browserify"."0.1.2"
-      self.by-version."parents"."0.0.2"
+      self.by-version."parents"."0.0.3"
       self.by-version."path-browserify"."0.0.0"
+      self.by-version."process"."0.7.0"
       self.by-version."punycode"."1.2.4"
-      self.by-version."querystring-es3"."0.2.0"
-      self.by-version."resolve"."0.6.3"
+      self.by-version."querystring-es3"."0.2.1-0"
+      self.by-version."readable-stream"."1.1.13"
+      self.by-version."resolve"."0.7.4"
       self.by-version."shallow-copy"."0.0.1"
+      self.by-version."shasum"."1.0.0"
       self.by-version."shell-quote"."0.0.1"
-      self.by-version."stream-browserify"."0.1.3"
+      self.by-version."stream-browserify"."1.0.0"
       self.by-version."stream-combiner"."0.0.4"
       self.by-version."string_decoder"."0.0.1"
       self.by-version."subarg"."0.0.1"
-      self.by-version."syntax-error"."1.1.0"
-      self.by-version."through2"."0.4.1"
-      self.by-version."timers-browserify"."1.0.1"
+      self.by-version."syntax-error"."1.1.1"
+      self.by-version."through2"."1.1.1"
+      self.by-version."timers-browserify"."1.0.3"
       self.by-version."tty-browserify"."0.0.0"
-      self.by-version."umd"."2.0.0"
+      self.by-version."umd"."2.1.0"
       self.by-version."url"."0.10.1"
       self.by-version."util"."0.10.3"
       self.by-version."vm-browserify"."0.0.4"
+      self.by-version."xtend"."3.0.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "browserify" ];
   };
-  "browserify" = self.by-version."browserify"."3.44.2";
-  by-spec."browserify"."~3.38.0" =
-    self.by-version."browserify"."3.38.1";
-  by-version."browserify"."3.38.1" = lib.makeOverridable self.buildNodePackage {
-    name = "browserify-3.38.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/browserify/-/browserify-3.38.1.tgz";
-        name = "browserify-3.38.1.tgz";
-        sha1 = "4790937ec5b01f1c340e83521e36c4e3aaf3d7ba";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."browserify" or []);
-    deps = [
-      self.by-version."JSONStream"."0.7.2"
-      self.by-version."assert"."1.1.1"
-      self.by-version."browser-pack"."2.0.1"
-      self.by-version."browser-resolve"."1.2.4"
-      self.by-version."buffer"."2.1.13"
-      self.by-version."builtins"."0.0.3"
-      self.by-version."commondir"."0.0.1"
-      self.by-version."concat-stream"."1.4.5"
-      self.by-version."console-browserify"."1.0.3"
-      self.by-version."constants-browserify"."0.0.1"
-      self.by-version."crypto-browserify"."1.0.9"
-      self.by-version."deep-equal"."0.1.2"
-      self.by-version."defined"."0.0.0"
-      self.by-version."deps-sort"."0.1.1"
-      self.by-version."derequire"."0.8.0"
-      self.by-version."domain-browser"."1.1.1"
-      self.by-version."duplexer"."0.1.1"
-      self.by-version."events"."1.0.0"
-      self.by-version."glob"."3.2.9"
-      self.by-version."http-browserify"."1.3.2"
-      self.by-version."https-browserify"."0.0.0"
-      self.by-version."inherits"."2.0.1"
-      self.by-version."insert-module-globals"."5.0.1"
-      self.by-version."module-deps"."1.8.1"
-      self.by-version."os-browserify"."0.1.2"
-      self.by-version."parents"."0.0.2"
-      self.by-version."path-browserify"."0.0.0"
-      self.by-version."punycode"."1.2.4"
-      self.by-version."querystring-es3"."0.2.0"
-      self.by-version."resolve"."0.6.3"
-      self.by-version."shallow-copy"."0.0.1"
-      self.by-version."shell-quote"."0.0.1"
-      self.by-version."stream-browserify"."0.1.3"
-      self.by-version."stream-combiner"."0.0.4"
-      self.by-version."string_decoder"."0.0.1"
-      self.by-version."subarg"."0.0.1"
-      self.by-version."syntax-error"."1.1.0"
-      self.by-version."through2"."0.4.1"
-      self.by-version."timers-browserify"."1.0.1"
-      self.by-version."tty-browserify"."0.0.0"
-      self.by-version."umd"."2.0.0"
-      self.by-version."url"."0.7.9"
-      self.by-version."util"."0.10.3"
-      self.by-version."vm-browserify"."0.0.4"
-      self.by-version."zlib-browserify"."0.0.3"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "browserify" ];
-  };
-  by-spec."browserify-zlib"."~0.1.2" =
+  "browserify" = self.by-version."browserify"."5.10.1";
+  by-spec."browserify-zlib"."^0.1.4" =
     self.by-version."browserify-zlib"."0.1.4";
   by-version."browserify-zlib"."0.1.4" = lib.makeOverridable self.buildNodePackage {
     name = "node-browserify-zlib-0.1.4";
@@ -1900,12 +1591,14 @@
     buildInputs =
       (self.nativeDeps."browserify-zlib" or []);
     deps = [
-      self.by-version."pako"."0.2.0"
+      self.by-version."pako"."0.2.5"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "browserify-zlib" ];
   };
+  by-spec."browserify-zlib"."~0.1.2" =
+    self.by-version."browserify-zlib"."0.1.4";
   by-spec."bson"."0.1.8" =
     self.by-version."bson"."0.1.8";
   by-version."bson"."0.1.8" = lib.makeOverridable self.buildNodePackage {
@@ -1925,6 +1618,26 @@
     ];
     passthru.names = [ "bson" ];
   };
+  by-spec."bson"."0.2.11" =
+    self.by-version."bson"."0.2.11";
+  by-version."bson"."0.2.11" = lib.makeOverridable self.buildNodePackage {
+    name = "node-bson-0.2.11";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/bson/-/bson-0.2.11.tgz";
+        name = "bson-0.2.11.tgz";
+        sha1 = "7a1b9df70b36a247ada83d795e566a049f78bbb8";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."bson" or []);
+    deps = [
+      self.by-version."nan"."1.2.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "bson" ];
+  };
   by-spec."bson"."0.2.2" =
     self.by-version."bson"."0.2.2";
   by-version."bson"."0.2.2" = lib.makeOverridable self.buildNodePackage {
@@ -1963,41 +1676,62 @@
     ];
     passthru.names = [ "bson" ];
   };
-  by-spec."bson"."0.2.7" =
-    self.by-version."bson"."0.2.7";
-  by-version."bson"."0.2.7" = lib.makeOverridable self.buildNodePackage {
-    name = "node-bson-0.2.7";
+  by-spec."bson"."0.2.9" =
+    self.by-version."bson"."0.2.9";
+  by-version."bson"."0.2.9" = lib.makeOverridable self.buildNodePackage {
+    name = "node-bson-0.2.9";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/bson/-/bson-0.2.7.tgz";
-        name = "bson-0.2.7.tgz";
-        sha1 = "6793161c40e5a9757091d7ee7d52a4717950236b";
+        url = "http://registry.npmjs.org/bson/-/bson-0.2.9.tgz";
+        name = "bson-0.2.9.tgz";
+        sha1 = "ee3716a52c985ff3074b6ece3257c75ee12f3a05";
       })
     ];
     buildInputs =
       (self.nativeDeps."bson" or []);
     deps = [
-      self.by-version."nan"."0.8.0"
+      self.by-version."nan"."1.0.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "bson" ];
   };
-  by-spec."buffer"."~2.1.4" =
-    self.by-version."buffer"."2.1.13";
-  by-version."buffer"."2.1.13" = lib.makeOverridable self.buildNodePackage {
-    name = "node-buffer-2.1.13";
+  by-spec."buffer"."^2.3.0" =
+    self.by-version."buffer"."2.5.0";
+  by-version."buffer"."2.5.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-buffer-2.5.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/buffer/-/buffer-2.1.13.tgz";
-        name = "buffer-2.1.13.tgz";
-        sha1 = "c88838ebf79f30b8b4a707788470bea8a62c2355";
+        url = "http://registry.npmjs.org/buffer/-/buffer-2.5.0.tgz";
+        name = "buffer-2.5.0.tgz";
+        sha1 = "ee451ce8cd122dc922027674338dcef9e0eadd9a";
       })
     ];
     buildInputs =
       (self.nativeDeps."buffer" or []);
     deps = [
-      self.by-version."base64-js"."0.0.6"
+      self.by-version."base64-js"."0.0.7"
+      self.by-version."ieee754"."1.1.3"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "buffer" ];
+  };
+  by-spec."buffer"."~2.3.2" =
+    self.by-version."buffer"."2.3.4";
+  by-version."buffer"."2.3.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-buffer-2.3.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/buffer/-/buffer-2.3.4.tgz";
+        name = "buffer-2.3.4.tgz";
+        sha1 = "7e4af5a23c15e13fcbfd5c5a1ec974cb61668a4c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."buffer" or []);
+    deps = [
+      self.by-version."base64-js"."0.0.7"
       self.by-version."ieee754"."1.1.3"
     ];
     peerDependencies = [
@@ -2042,27 +1776,27 @@
     ];
     passthru.names = [ "buffer-crc32" ];
   };
-  by-spec."buffer-crc32"."~0.2.1" =
-    self.by-version."buffer-crc32"."0.2.1";
-  by-spec."buffers"."~0.1.1" =
-    self.by-version."buffers"."0.1.1";
-  by-version."buffers"."0.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-buffers-0.1.1";
+  by-spec."buffer-crc32"."0.2.3" =
+    self.by-version."buffer-crc32"."0.2.3";
+  by-version."buffer-crc32"."0.2.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-buffer-crc32-0.2.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz";
-        name = "buffers-0.1.1.tgz";
-        sha1 = "b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb";
+        url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.3.tgz";
+        name = "buffer-crc32-0.2.3.tgz";
+        sha1 = "bb54519e95d107cbd2400e76d0cab1467336d921";
       })
     ];
     buildInputs =
-      (self.nativeDeps."buffers" or []);
+      (self.nativeDeps."buffer-crc32" or []);
     deps = [
     ];
     peerDependencies = [
     ];
-    passthru.names = [ "buffers" ];
+    passthru.names = [ "buffer-crc32" ];
   };
+  by-spec."buffer-crc32"."~0.2.1" =
+    self.by-version."buffer-crc32"."0.2.3";
   by-spec."buffertools"."*" =
     self.by-version."buffertools"."2.1.2";
   by-version."buffertools"."2.1.2" = lib.makeOverridable self.buildNodePackage {
@@ -2103,14 +1837,14 @@
     passthru.names = [ "buffertools" ];
   };
   by-spec."builtins"."~0.0.3" =
-    self.by-version."builtins"."0.0.3";
-  by-version."builtins"."0.0.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-builtins-0.0.3";
+    self.by-version."builtins"."0.0.5";
+  by-version."builtins"."0.0.5" = lib.makeOverridable self.buildNodePackage {
+    name = "node-builtins-0.0.5";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/builtins/-/builtins-0.0.3.tgz";
-        name = "builtins-0.0.3.tgz";
-        sha1 = "5d006166da71610bc2bcf73019f0f0cc43309755";
+        url = "http://registry.npmjs.org/builtins/-/builtins-0.0.5.tgz";
+        name = "builtins-0.0.5.tgz";
+        sha1 = "86dd881f9862856e62fd7ed7767b438c4d79b7ab";
       })
     ];
     buildInputs =
@@ -2142,26 +1876,6 @@
     ];
     passthru.names = [ "bunyan" ];
   };
-  by-spec."bytebuffer".">=2.2 <3" =
-    self.by-version."bytebuffer"."2.3.1";
-  by-version."bytebuffer"."2.3.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-bytebuffer-2.3.1";
-    src = [
-      (self.patchSource fetchurl {
-        url = "http://registry.npmjs.org/bytebuffer/-/bytebuffer-2.3.1.tgz";
-        name = "bytebuffer-2.3.1.tgz";
-        sha1 = "17c2c290bfed534b06aadd6513aa5a0096ca2639";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bytebuffer" or []);
-    deps = [
-      self.by-version."long"."1.1.2"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "bytebuffer" ];
-  };
   by-spec."bytes"."0.1.0" =
     self.by-version."bytes"."0.1.0";
   by-version."bytes"."0.1.0" = lib.makeOverridable self.buildNodePackage {
@@ -2219,15 +1933,15 @@
     ];
     passthru.names = [ "bytes" ];
   };
-  by-spec."bytes"."0.3.0" =
-    self.by-version."bytes"."0.3.0";
-  by-version."bytes"."0.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-bytes-0.3.0";
+  by-spec."bytes"."1" =
+    self.by-version."bytes"."1.0.0";
+  by-version."bytes"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-bytes-1.0.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/bytes/-/bytes-0.3.0.tgz";
-        name = "bytes-0.3.0.tgz";
-        sha1 = "78e2e0e28c7f9c7b988ea8aee0db4d5fa9941935";
+        url = "http://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz";
+        name = "bytes-1.0.0.tgz";
+        sha1 = "3569ede8ba34315fab99c3e92cb04c7220de1fa8";
       })
     ];
     buildInputs =
@@ -2238,12 +1952,10 @@
     ];
     passthru.names = [ "bytes" ];
   };
-  by-spec."bytes"."~0.2.0" =
-    self.by-version."bytes"."0.2.1";
+  by-spec."bytes"."1.0.0" =
+    self.by-version."bytes"."1.0.0";
   by-spec."bytes"."~0.2.1" =
     self.by-version."bytes"."0.2.1";
-  by-spec."bytes"."~0.3.0" =
-    self.by-version."bytes"."0.3.0";
   by-spec."callsite"."~1.0.0" =
     self.by-version."callsite"."1.0.0";
   by-version."callsite"."1.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -2263,27 +1975,6 @@
     ];
     passthru.names = [ "callsite" ];
   };
-  by-spec."cardinal"."~0.4.0" =
-    self.by-version."cardinal"."0.4.4";
-  by-version."cardinal"."0.4.4" = lib.makeOverridable self.buildNodePackage {
-    name = "cardinal-0.4.4";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/cardinal/-/cardinal-0.4.4.tgz";
-        name = "cardinal-0.4.4.tgz";
-        sha1 = "ca5bb68a5b511b90fe93b9acea49bdee5c32bfe2";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."cardinal" or []);
-    deps = [
-      self.by-version."redeyed"."0.4.4"
-      self.by-version."ansicolors"."0.2.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "cardinal" ];
-  };
   by-spec."chai"."*" =
     self.by-version."chai"."1.9.1";
   by-version."chai"."1.9.1" = lib.makeOverridable self.buildNodePackage {
@@ -2306,26 +1997,6 @@
     passthru.names = [ "chai" ];
   };
   "chai" = self.by-version."chai"."1.9.1";
-  by-spec."chainsaw"."~0.1.0" =
-    self.by-version."chainsaw"."0.1.0";
-  by-version."chainsaw"."0.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-chainsaw-0.1.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz";
-        name = "chainsaw-0.1.0.tgz";
-        sha1 = "5eab50b28afe58074d0d58291388828b5e5fbc98";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."chainsaw" or []);
-    deps = [
-      self.by-version."traverse"."0.3.9"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "chainsaw" ];
-  };
   by-spec."chalk"."^0.4.0" =
     self.by-version."chalk"."0.4.0";
   by-version."chalk"."0.4.0" = lib.makeOverridable self.buildNodePackage {
@@ -2348,71 +2019,53 @@
     ];
     passthru.names = [ "chalk" ];
   };
-  by-spec."chalk"."~0.1.1" =
-    self.by-version."chalk"."0.1.1";
-  by-version."chalk"."0.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-chalk-0.1.1";
+  by-spec."chalk"."^0.5.0" =
+    self.by-version."chalk"."0.5.1";
+  by-version."chalk"."0.5.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-chalk-0.5.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/chalk/-/chalk-0.1.1.tgz";
-        name = "chalk-0.1.1.tgz";
-        sha1 = "fe6d90ae2c270424720c87ed92d36490b7d36ea0";
+        url = "http://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz";
+        name = "chalk-0.5.1.tgz";
+        sha1 = "663b3a648b68b55d04690d49167aa837858f2174";
       })
     ];
     buildInputs =
       (self.nativeDeps."chalk" or []);
     deps = [
-      self.by-version."has-color"."0.1.7"
-      self.by-version."ansi-styles"."0.1.2"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "chalk" ];
-  };
-  by-spec."chalk"."~0.2.0" =
-    self.by-version."chalk"."0.2.1";
-  by-version."chalk"."0.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-chalk-0.2.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/chalk/-/chalk-0.2.1.tgz";
-        name = "chalk-0.2.1.tgz";
-        sha1 = "7613e1575145b21386483f7f485aa5ffa8cbd10c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."chalk" or []);
-    deps = [
-      self.by-version."has-color"."0.1.7"
-      self.by-version."ansi-styles"."0.2.0"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "chalk" ];
-  };
-  by-spec."chalk"."~0.3.0" =
-    self.by-version."chalk"."0.3.0";
-  by-version."chalk"."0.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-chalk-0.3.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/chalk/-/chalk-0.3.0.tgz";
-        name = "chalk-0.3.0.tgz";
-        sha1 = "1c98437737f1199ebcc1d4c48fd41b9f9c8e8f23";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."chalk" or []);
-    deps = [
-      self.by-version."has-color"."0.1.7"
-      self.by-version."ansi-styles"."0.2.0"
+      self.by-version."ansi-styles"."1.1.0"
+      self.by-version."escape-string-regexp"."1.0.1"
+      self.by-version."has-ansi"."0.1.0"
+      self.by-version."strip-ansi"."0.3.0"
+      self.by-version."supports-color"."0.2.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "chalk" ];
   };
+  by-spec."chalk"."^0.5.1" =
+    self.by-version."chalk"."0.5.1";
   by-spec."chalk"."~0.4.0" =
     self.by-version."chalk"."0.4.0";
+  by-spec."char-spinner"."~1.0.1" =
+    self.by-version."char-spinner"."1.0.1";
+  by-version."char-spinner"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-char-spinner-1.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/char-spinner/-/char-spinner-1.0.1.tgz";
+        name = "char-spinner-1.0.1.tgz";
+        sha1 = "e6ea67bd247e107112983b7ab0479ed362800081";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."char-spinner" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "char-spinner" ];
+  };
   by-spec."character-parser"."1.2.0" =
     self.by-version."character-parser"."1.2.0";
   by-version."character-parser"."1.2.0" = lib.makeOverridable self.buildNodePackage {
@@ -2432,72 +2085,6 @@
     ];
     passthru.names = [ "character-parser" ];
   };
-  by-spec."cheerio"."~0.12.0" =
-    self.by-version."cheerio"."0.12.4";
-  by-version."cheerio"."0.12.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-cheerio-0.12.4";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/cheerio/-/cheerio-0.12.4.tgz";
-        name = "cheerio-0.12.4.tgz";
-        sha1 = "c199626e9e1eb0d4233a91a4793e7f8aaa69a18b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."cheerio" or []);
-    deps = [
-      self.by-version."cheerio-select"."0.0.3"
-      self.by-version."htmlparser2"."3.1.4"
-      self.by-version."underscore"."1.4.4"
-      self.by-version."entities"."0.5.0"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "cheerio" ];
-  };
-  by-spec."cheerio"."~0.13.0" =
-    self.by-version."cheerio"."0.13.1";
-  by-version."cheerio"."0.13.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-cheerio-0.13.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/cheerio/-/cheerio-0.13.1.tgz";
-        name = "cheerio-0.13.1.tgz";
-        sha1 = "48af1134561b3527f83d9156c4f9a8ebd82b06ec";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."cheerio" or []);
-    deps = [
-      self.by-version."htmlparser2"."3.4.0"
-      self.by-version."underscore"."1.5.2"
-      self.by-version."entities"."0.5.0"
-      self.by-version."CSSselect"."0.4.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "cheerio" ];
-  };
-  by-spec."cheerio-select"."*" =
-    self.by-version."cheerio-select"."0.0.3";
-  by-version."cheerio-select"."0.0.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-cheerio-select-0.0.3";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/cheerio-select/-/cheerio-select-0.0.3.tgz";
-        name = "cheerio-select-0.0.3.tgz";
-        sha1 = "3f2420114f3ccb0b1b075c245ccfaae5d617a388";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."cheerio-select" or []);
-    deps = [
-      self.by-version."CSSselect"."0.7.0"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "cheerio-select" ];
-  };
   by-spec."child-process-close"."~0.1.1" =
     self.by-version."child-process-close"."0.1.1";
   by-version."child-process-close"."0.1.1" = lib.makeOverridable self.buildNodePackage {
@@ -2537,20 +2124,20 @@
     passthru.names = [ "chmodr" ];
   };
   by-spec."chokidar".">=0.8.2" =
-    self.by-version."chokidar"."0.8.2";
-  by-version."chokidar"."0.8.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-chokidar-0.8.2";
+    self.by-version."chokidar"."0.8.4";
+  by-version."chokidar"."0.8.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-chokidar-0.8.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/chokidar/-/chokidar-0.8.2.tgz";
-        name = "chokidar-0.8.2.tgz";
-        sha1 = "767e2509aaa040fd8a23cc46225a783dc1bfc899";
+        url = "http://registry.npmjs.org/chokidar/-/chokidar-0.8.4.tgz";
+        name = "chokidar-0.8.4.tgz";
+        sha1 = "3b2b5066817086534ba81a092bdcf4be25b8bee0";
       })
     ];
     buildInputs =
       (self.nativeDeps."chokidar" or []);
     deps = [
-      self.by-version."fsevents"."0.2.0"
+      self.by-version."fsevents"."0.2.1"
       self.by-version."recursive-readdir"."0.0.2"
     ];
     peerDependencies = [
@@ -2576,46 +2163,6 @@
     ];
     passthru.names = [ "chownr" ];
   };
-  by-spec."circular-json"."0.1.x" =
-    self.by-version."circular-json"."0.1.6";
-  by-version."circular-json"."0.1.6" = lib.makeOverridable self.buildNodePackage {
-    name = "node-circular-json-0.1.6";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/circular-json/-/circular-json-0.1.6.tgz";
-        name = "circular-json-0.1.6.tgz";
-        sha1 = "fd692b65f8bce4f2900bea14f74ad681ab294c7f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."circular-json" or []);
-    deps = [
-      self.by-version."wru"."0.2.7"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "circular-json" ];
-  };
-  by-spec."class-extend"."~0.1.0" =
-    self.by-version."class-extend"."0.1.1";
-  by-version."class-extend"."0.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-class-extend-0.1.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/class-extend/-/class-extend-0.1.1.tgz";
-        name = "class-extend-0.1.1.tgz";
-        sha1 = "0feb1e59f4ace7bc163b509745f3282c4c7e528a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."class-extend" or []);
-    deps = [
-      self.by-version."lodash"."2.4.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "class-extend" ];
-  };
   by-spec."clean-css"."2.1.x" =
     self.by-version."clean-css"."2.1.8";
   by-version."clean-css"."2.1.8" = lib.makeOverridable self.buildNodePackage {
@@ -2636,73 +2183,47 @@
     ];
     passthru.names = [ "clean-css" ];
   };
-  by-spec."clean-css"."~2.1.0" =
-    self.by-version."clean-css"."2.1.8";
-  by-spec."cli"."0.4.x" =
-    self.by-version."cli"."0.4.5";
-  by-version."cli"."0.4.5" = lib.makeOverridable self.buildNodePackage {
-    name = "node-cli-0.4.5";
+  by-spec."clean-css"."~2.2.0" =
+    self.by-version."clean-css"."2.2.13";
+  by-version."clean-css"."2.2.13" = lib.makeOverridable self.buildNodePackage {
+    name = "clean-css-2.2.13";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/cli/-/cli-0.4.5.tgz";
-        name = "cli-0.4.5.tgz";
-        sha1 = "78f9485cd161b566e9a6c72d7170c4270e81db61";
+        url = "http://registry.npmjs.org/clean-css/-/clean-css-2.2.13.tgz";
+        name = "clean-css-2.2.13.tgz";
+        sha1 = "c63aba2723a410f79ed7b34ff163aaa627bc2362";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."clean-css" or []);
+    deps = [
+      self.by-version."commander"."2.2.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "clean-css" ];
+  };
+  by-spec."cli"."0.6.x" =
+    self.by-version."cli"."0.6.3";
+  by-version."cli"."0.6.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-cli-0.6.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/cli/-/cli-0.6.3.tgz";
+        name = "cli-0.6.3.tgz";
+        sha1 = "31418ed08d60a1b02cf180c6d6fee3204bfe65cd";
       })
     ];
     buildInputs =
       (self.nativeDeps."cli" or []);
     deps = [
-      self.by-version."glob"."3.2.9"
+      self.by-version."glob"."3.2.11"
+      self.by-version."exit"."0.1.2"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "cli" ];
   };
-  by-spec."cli-color"."*" =
-    self.by-version."cli-color"."0.2.3";
-  by-version."cli-color"."0.2.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-cli-color-0.2.3";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/cli-color/-/cli-color-0.2.3.tgz";
-        name = "cli-color-0.2.3.tgz";
-        sha1 = "0a25ceae5a6a1602be7f77d28563c36700274e88";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."cli-color" or []);
-    deps = [
-      self.by-version."es5-ext"."0.9.2"
-      self.by-version."memoizee"."0.2.6"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "cli-color" ];
-  };
-  by-spec."cli-color"."~0.2.2" =
-    self.by-version."cli-color"."0.2.3";
-  by-spec."cli-color"."~0.2.3" =
-    self.by-version."cli-color"."0.2.3";
-  by-spec."cli-log"."~0.0.8" =
-    self.by-version."cli-log"."0.0.8";
-  by-version."cli-log"."0.0.8" = lib.makeOverridable self.buildNodePackage {
-    name = "node-cli-log-0.0.8";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/cli-log/-/cli-log-0.0.8.tgz";
-        name = "cli-log-0.0.8.tgz";
-        sha1 = "af738d7f5fcda8aab21bd4dbcd904ee5137c1ad0";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."cli-log" or []);
-    deps = [
-      self.by-version."cli-color"."0.2.3"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "cli-log" ];
-  };
   by-spec."cliff"."0.1.8" =
     self.by-version."cliff"."0.1.8";
   by-version."cliff"."0.1.8" = lib.makeOverridable self.buildNodePackage {
@@ -2725,25 +2246,6 @@
     ];
     passthru.names = [ "cliff" ];
   };
-  by-spec."clone"."0.1.11" =
-    self.by-version."clone"."0.1.11";
-  by-version."clone"."0.1.11" = lib.makeOverridable self.buildNodePackage {
-    name = "node-clone-0.1.11";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/clone/-/clone-0.1.11.tgz";
-        name = "clone-0.1.11.tgz";
-        sha1 = "408b7d1773eb0dfbf2ddb156c1c47170c17e3a96";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."clone" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "clone" ];
-  };
   by-spec."clone"."0.1.5" =
     self.by-version."clone"."0.1.5";
   by-version."clone"."0.1.5" = lib.makeOverridable self.buildNodePackage {
@@ -2782,27 +2284,88 @@
     ];
     passthru.names = [ "clone" ];
   };
-  by-spec."cmd-shim"."~1.1.1" =
-    self.by-version."cmd-shim"."1.1.1";
-  by-version."cmd-shim"."1.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-cmd-shim-1.1.1";
+  by-spec."clone-stats"."~0.0.1" =
+    self.by-version."clone-stats"."0.0.1";
+  by-version."clone-stats"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-clone-stats-0.0.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/cmd-shim/-/cmd-shim-1.1.1.tgz";
-        name = "cmd-shim-1.1.1.tgz";
-        sha1 = "348b292db32ed74c8283fcf6c48549b84c6658a7";
+        url = "http://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz";
+        name = "clone-stats-0.0.1.tgz";
+        sha1 = "b88f94a82cf38b8791d58046ea4029ad88ca99d1";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."clone-stats" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "clone-stats" ];
+  };
+  by-spec."cmd-shim"."~1.1.1" =
+    self.by-version."cmd-shim"."1.1.2";
+  by-version."cmd-shim"."1.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-cmd-shim-1.1.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/cmd-shim/-/cmd-shim-1.1.2.tgz";
+        name = "cmd-shim-1.1.2.tgz";
+        sha1 = "e4f9198802e361e8eb43b591959ef4dc6cdb6754";
       })
     ];
     buildInputs =
       (self.nativeDeps."cmd-shim" or []);
     deps = [
-      self.by-version."mkdirp"."0.3.5"
+      self.by-version."mkdirp"."0.5.0"
       self.by-version."graceful-fs"."2.0.3"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "cmd-shim" ];
   };
+  by-spec."cmdln"."1.3.2" =
+    self.by-version."cmdln"."1.3.2";
+  by-version."cmdln"."1.3.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-cmdln-1.3.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/cmdln/-/cmdln-1.3.2.tgz";
+        name = "cmdln-1.3.2.tgz";
+        sha1 = "46a7b362166875cdafe7bc3fe6c73e4644dc6884";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."cmdln" or []);
+    deps = [
+      self.by-version."assert-plus"."0.1.3"
+      self.by-version."extsprintf"."1.0.2"
+      self.by-version."verror"."1.3.6"
+      self.by-version."dashdash"."1.3.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "cmdln" ];
+  };
+  by-spec."co"."~3.1.0" =
+    self.by-version."co"."3.1.0";
+  by-version."co"."3.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-co-3.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/co/-/co-3.1.0.tgz";
+        name = "co-3.1.0.tgz";
+        sha1 = "4ea54ea5a08938153185e15210c68d9092bc1b78";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."co" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "co" ];
+  };
   by-spec."coffee-script"."*" =
     self.by-version."coffee-script"."1.7.1";
   by-version."coffee-script"."1.7.1" = lib.makeOverridable self.buildNodePackage {
@@ -2891,7 +2454,7 @@
     ];
     passthru.names = [ "coffee-script-redux" ];
   };
-  by-spec."collections"."^2.0.0" =
+  by-spec."collections".">=2.0.1 <3.0.0" =
     self.by-version."collections"."2.0.1";
   by-version."collections"."2.0.1" = lib.makeOverridable self.buildNodePackage {
     name = "node-collections-2.0.1";
@@ -2905,21 +2468,21 @@
     buildInputs =
       (self.nativeDeps."collections" or []);
     deps = [
-      self.by-version."weak-map"."1.0.4"
+      self.by-version."weak-map"."1.0.5"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "collections" ];
   };
-  by-spec."color"."~0.5.0" =
-    self.by-version."color"."0.5.0";
-  by-version."color"."0.5.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-color-0.5.0";
+  by-spec."color"."~0.6.0" =
+    self.by-version."color"."0.6.0";
+  by-version."color"."0.6.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-color-0.6.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/color/-/color-0.5.0.tgz";
-        name = "color-0.5.0.tgz";
-        sha1 = "4d283d8bfe4cbc7006de6b6d25a3c26f00e3ee6d";
+        url = "http://registry.npmjs.org/color/-/color-0.6.0.tgz";
+        name = "color-0.6.0.tgz";
+        sha1 = "53f4b27698e1fe42a19423dc092dd8ee529b4267";
       })
     ];
     buildInputs =
@@ -3011,43 +2574,24 @@
   };
   by-spec."colors"."0.x.x" =
     self.by-version."colors"."0.6.2";
-  by-spec."colors"."~0.6.0-1" =
-    self.by-version."colors"."0.6.2";
   by-spec."colors"."~0.6.2" =
     self.by-version."colors"."0.6.2";
-  by-spec."colour"."*" =
-    self.by-version."colour"."0.7.1";
-  by-version."colour"."0.7.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-colour-0.7.1";
+  by-spec."columnify"."~1.1.0" =
+    self.by-version."columnify"."1.1.0";
+  by-version."columnify"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-columnify-1.1.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/colour/-/colour-0.7.1.tgz";
-        name = "colour-0.7.1.tgz";
-        sha1 = "9cb169917ec5d12c0736d3e8685746df1cadf778";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."colour" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "colour" ];
-  };
-  by-spec."columnify"."0.1.2" =
-    self.by-version."columnify"."0.1.2";
-  by-version."columnify"."0.1.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-columnify-0.1.2";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/columnify/-/columnify-0.1.2.tgz";
-        name = "columnify-0.1.2.tgz";
-        sha1 = "ab1a1f1e37b26ba4b87c6920fb717fe51c827042";
+        url = "http://registry.npmjs.org/columnify/-/columnify-1.1.0.tgz";
+        name = "columnify-1.1.0.tgz";
+        sha1 = "0b908e6d4f1c80194358a1933aaf9dc49271c679";
       })
     ];
     buildInputs =
       (self.nativeDeps."columnify" or []);
     deps = [
+      self.by-version."strip-ansi"."0.2.2"
+      self.by-version."wcwidth.js"."0.0.4"
     ];
     peerDependencies = [
     ];
@@ -3068,22 +2612,22 @@
       (self.nativeDeps."combine-source-map" or []);
     deps = [
       self.by-version."inline-source-map"."0.3.0"
-      self.by-version."convert-source-map"."0.3.3"
-      self.by-version."source-map"."0.1.33"
+      self.by-version."convert-source-map"."0.3.5"
+      self.by-version."source-map"."0.1.38"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "combine-source-map" ];
   };
   by-spec."combined-stream"."~0.0.4" =
-    self.by-version."combined-stream"."0.0.4";
-  by-version."combined-stream"."0.0.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-combined-stream-0.0.4";
+    self.by-version."combined-stream"."0.0.5";
+  by-version."combined-stream"."0.0.5" = lib.makeOverridable self.buildNodePackage {
+    name = "node-combined-stream-0.0.5";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.4.tgz";
-        name = "combined-stream-0.0.4.tgz";
-        sha1 = "2d1a43347dbe9515a4a2796732e5b88473840b22";
+        url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.5.tgz";
+        name = "combined-stream-0.0.5.tgz";
+        sha1 = "29ed76e5c9aad07c4acf9ca3d32601cce28697a2";
       })
     ];
     buildInputs =
@@ -3114,26 +2658,6 @@
     ];
     passthru.names = [ "commander" ];
   };
-  by-spec."commander"."1.2.x" =
-    self.by-version."commander"."1.2.0";
-  by-version."commander"."1.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-commander-1.2.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/commander/-/commander-1.2.0.tgz";
-        name = "commander-1.2.0.tgz";
-        sha1 = "fd5713bfa153c7d6cc599378a5ab4c45c535029e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."commander" or []);
-    deps = [
-      self.by-version."keypress"."0.1.0"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "commander" ];
-  };
   by-spec."commander"."1.3.1" =
     self.by-version."commander"."1.3.1";
   by-version."commander"."1.3.1" = lib.makeOverridable self.buildNodePackage {
@@ -3214,8 +2738,46 @@
   };
   by-spec."commander"."2.1.x" =
     self.by-version."commander"."2.1.0";
-  by-spec."commander"."~0.6.1" =
-    self.by-version."commander"."0.6.1";
+  by-spec."commander"."2.2.x" =
+    self.by-version."commander"."2.2.0";
+  by-version."commander"."2.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-commander-2.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/commander/-/commander-2.2.0.tgz";
+        name = "commander-2.2.0.tgz";
+        sha1 = "175ad4b9317f3ff615f201c1e57224f55a3e91df";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."commander" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "commander" ];
+  };
+  by-spec."commander"."2.x" =
+    self.by-version."commander"."2.3.0";
+  by-version."commander"."2.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-commander-2.3.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/commander/-/commander-2.3.0.tgz";
+        name = "commander-2.3.0.tgz";
+        sha1 = "fd430e889832ec353b9acd1de217c11cb3eef873";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."commander" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "commander" ];
+  };
+  by-spec."commander"."~2.0.0" =
+    self.by-version."commander"."2.0.0";
   by-spec."commander"."~2.1.0" =
     self.by-version."commander"."2.1.0";
   by-spec."commondir"."0.0.1" =
@@ -3237,15 +2799,34 @@
     ];
     passthru.names = [ "commondir" ];
   };
-  by-spec."compressible"."1.0.0" =
-    self.by-version."compressible"."1.0.0";
-  by-version."compressible"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-compressible-1.0.0";
+  by-spec."component-emitter"."1.1.2" =
+    self.by-version."component-emitter"."1.1.2";
+  by-version."component-emitter"."1.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-component-emitter-1.1.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/compressible/-/compressible-1.0.0.tgz";
-        name = "compressible-1.0.0.tgz";
-        sha1 = "f83e49c1cb61421753545125a8011d68b492427d";
+        url = "http://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz";
+        name = "component-emitter-1.1.2.tgz";
+        sha1 = "296594f2753daa63996d2af08d15a95116c9aec3";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."component-emitter" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "component-emitter" ];
+  };
+  by-spec."compressible"."~1.1.1" =
+    self.by-version."compressible"."1.1.1";
+  by-version."compressible"."1.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-compressible-1.1.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/compressible/-/compressible-1.1.1.tgz";
+        name = "compressible-1.1.1.tgz";
+        sha1 = "23b71ea90ea6c6a66289701a918182c24d0729ef";
       })
     ];
     buildInputs =
@@ -3256,52 +2837,57 @@
     ];
     passthru.names = [ "compressible" ];
   };
-  by-spec."compression"."1.0.0" =
-    self.by-version."compression"."1.0.0";
-  by-version."compression"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-compression-1.0.0";
+  by-spec."compression"."~1.0.11" =
+    self.by-version."compression"."1.0.11";
+  by-version."compression"."1.0.11" = lib.makeOverridable self.buildNodePackage {
+    name = "node-compression-1.0.11";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/compression/-/compression-1.0.0.tgz";
-        name = "compression-1.0.0.tgz";
-        sha1 = "8aeb85d48db5145d38bc8b181b6352d8eab26020";
+        url = "http://registry.npmjs.org/compression/-/compression-1.0.11.tgz";
+        name = "compression-1.0.11.tgz";
+        sha1 = "69700cf1ee8963454356ac192a6e5e91e232bffb";
       })
     ];
     buildInputs =
       (self.nativeDeps."compression" or []);
     deps = [
-      self.by-version."bytes"."0.2.1"
-      self.by-version."negotiator"."0.3.0"
-      self.by-version."compressible"."1.0.0"
+      self.by-version."accepts"."1.0.7"
+      self.by-version."bytes"."1.0.0"
+      self.by-version."compressible"."1.1.1"
+      self.by-version."debug"."1.0.4"
+      self.by-version."on-headers"."1.0.0"
+      self.by-version."vary"."1.0.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "compression" ];
   };
   by-spec."concat-stream"."^1.4.1" =
-    self.by-version."concat-stream"."1.4.5";
-  by-version."concat-stream"."1.4.5" = lib.makeOverridable self.buildNodePackage {
-    name = "node-concat-stream-1.4.5";
+    self.by-version."concat-stream"."1.4.6";
+  by-version."concat-stream"."1.4.6" = lib.makeOverridable self.buildNodePackage {
+    name = "node-concat-stream-1.4.6";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/concat-stream/-/concat-stream-1.4.5.tgz";
-        name = "concat-stream-1.4.5.tgz";
-        sha1 = "cbf6ffd17c15d58f0baeacbb47d927cf566446a6";
+        url = "http://registry.npmjs.org/concat-stream/-/concat-stream-1.4.6.tgz";
+        name = "concat-stream-1.4.6.tgz";
+        sha1 = "8cb736a556a32f020f1ddc82fa3448381c5e5cce";
       })
     ];
     buildInputs =
       (self.nativeDeps."concat-stream" or []);
     deps = [
       self.by-version."inherits"."2.0.1"
-      self.by-version."typedarray"."0.0.5"
-      self.by-version."readable-stream"."1.1.13-1"
+      self.by-version."typedarray"."0.0.6"
+      self.by-version."readable-stream"."1.1.13"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "concat-stream" ];
   };
   by-spec."concat-stream"."~1.4.1" =
-    self.by-version."concat-stream"."1.4.5";
+    self.by-version."concat-stream"."1.4.6";
+  by-spec."concat-stream"."~1.4.5" =
+    self.by-version."concat-stream"."1.4.6";
   by-spec."config"."0.4.15" =
     self.by-version."config"."0.4.15";
   by-version."config"."0.4.15" = lib.makeOverridable self.buildNodePackage {
@@ -3338,8 +2924,8 @@
     buildInputs =
       (self.nativeDeps."config-chain" or []);
     deps = [
-      self.by-version."proto-list"."1.2.2"
-      self.by-version."ini"."1.1.0"
+      self.by-version."proto-list"."1.2.3"
+      self.by-version."ini"."1.2.1"
     ];
     peerDependencies = [
     ];
@@ -3347,33 +2933,54 @@
   };
   by-spec."config-chain"."~1.1.8" =
     self.by-version."config-chain"."1.1.8";
-  by-spec."configstore"."~0.2.1" =
-    self.by-version."configstore"."0.2.3";
-  by-version."configstore"."0.2.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-configstore-0.2.3";
+  by-spec."configstore"."^0.3.0" =
+    self.by-version."configstore"."0.3.1";
+  by-version."configstore"."0.3.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-configstore-0.3.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/configstore/-/configstore-0.2.3.tgz";
-        name = "configstore-0.2.3.tgz";
-        sha1 = "b1bdc4ad823a25423dc15d220fcc1ae1d7efab02";
+        url = "http://registry.npmjs.org/configstore/-/configstore-0.3.1.tgz";
+        name = "configstore-0.3.1.tgz";
+        sha1 = "e1b4715994fe5f8e22e69b21d54c7a448339314d";
       })
     ];
     buildInputs =
       (self.nativeDeps."configstore" or []);
     deps = [
-      self.by-version."mkdirp"."0.3.5"
+      self.by-version."graceful-fs"."3.0.2"
       self.by-version."js-yaml"."3.0.2"
-      self.by-version."osenv"."0.0.3"
-      self.by-version."graceful-fs"."2.0.3"
+      self.by-version."mkdirp"."0.5.0"
+      self.by-version."object-assign"."0.3.1"
+      self.by-version."osenv"."0.1.0"
       self.by-version."uuid"."1.4.1"
-      self.by-version."object-assign"."0.1.2"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "configstore" ];
   };
-  by-spec."configstore"."~0.2.2" =
-    self.by-version."configstore"."0.2.3";
+  by-spec."connect"."*" =
+    self.by-version."connect"."3.1.1";
+  by-version."connect"."3.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-connect-3.1.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/connect/-/connect-3.1.1.tgz";
+        name = "connect-3.1.1.tgz";
+        sha1 = "a73e2449c3efc2dfd1661865977a09184d120196";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."connect" or []);
+    deps = [
+      self.by-version."debug"."1.0.4"
+      self.by-version."finalhandler"."0.1.0"
+      self.by-version."parseurl"."1.3.0"
+      self.by-version."utils-merge"."1.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "connect" ];
+  };
   by-spec."connect"."1.x" =
     self.by-version."connect"."1.9.2";
   by-version."connect"."1.9.2" = lib.makeOverridable self.buildNodePackage {
@@ -3388,9 +2995,9 @@
     buildInputs =
       (self.nativeDeps."connect" or []);
     deps = [
-      self.by-version."qs"."0.6.6"
+      self.by-version."qs"."1.2.2"
       self.by-version."mime"."1.2.11"
-      self.by-version."formidable"."1.0.14"
+      self.by-version."formidable"."1.0.15"
     ];
     peerDependencies = [
     ];
@@ -3419,7 +3026,7 @@
       self.by-version."fresh"."0.2.0"
       self.by-version."pause"."0.0.1"
       self.by-version."uid2"."0.0.3"
-      self.by-version."debug"."0.8.1"
+      self.by-version."debug"."1.0.4"
       self.by-version."methods"."0.0.1"
       self.by-version."raw-body"."0.0.3"
       self.by-version."negotiator"."0.3.0"
@@ -3429,42 +3036,49 @@
     ];
     passthru.names = [ "connect" ];
   };
-  by-spec."connect"."2.14.1" =
-    self.by-version."connect"."2.14.1";
-  by-version."connect"."2.14.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-connect-2.14.1";
+  by-spec."connect"."2.25.7" =
+    self.by-version."connect"."2.25.7";
+  by-version."connect"."2.25.7" = lib.makeOverridable self.buildNodePackage {
+    name = "node-connect-2.25.7";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/connect/-/connect-2.14.1.tgz";
-        name = "connect-2.14.1.tgz";
-        sha1 = "e6fd676a5735ca703a89eb970f3d283fadecc2c7";
+        url = "http://registry.npmjs.org/connect/-/connect-2.25.7.tgz";
+        name = "connect-2.25.7.tgz";
+        sha1 = "22a29ebf710c6379ca0e20f0974c268a15ec4d29";
       })
     ];
     buildInputs =
       (self.nativeDeps."connect" or []);
     deps = [
       self.by-version."basic-auth-connect"."1.0.0"
-      self.by-version."cookie-parser"."1.0.1"
-      self.by-version."cookie-signature"."1.0.3"
-      self.by-version."compression"."1.0.0"
-      self.by-version."connect-timeout"."1.0.0"
-      self.by-version."csurf"."1.0.0"
-      self.by-version."errorhandler"."1.0.0"
-      self.by-version."express-session"."1.0.2"
+      self.by-version."body-parser"."1.6.5"
+      self.by-version."bytes"."1.0.0"
+      self.by-version."cookie"."0.1.2"
+      self.by-version."cookie-parser"."1.3.2"
+      self.by-version."cookie-signature"."1.0.4"
+      self.by-version."compression"."1.0.11"
+      self.by-version."connect-timeout"."1.2.2"
+      self.by-version."csurf"."1.4.0"
+      self.by-version."debug"."1.0.4"
+      self.by-version."depd"."0.4.4"
+      self.by-version."errorhandler"."1.1.1"
+      self.by-version."express-session"."1.7.6"
+      self.by-version."finalhandler"."0.1.0"
       self.by-version."fresh"."0.2.2"
-      self.by-version."method-override"."1.0.0"
-      self.by-version."morgan"."1.0.0"
-      self.by-version."qs"."0.6.6"
-      self.by-version."response-time"."1.0.0"
-      self.by-version."serve-index"."1.0.1"
-      self.by-version."serve-static"."1.0.2"
-      self.by-version."static-favicon"."1.0.0"
-      self.by-version."vhost"."1.0.0"
-      self.by-version."bytes"."0.2.1"
+      self.by-version."media-typer"."0.2.0"
+      self.by-version."method-override"."2.1.3"
+      self.by-version."morgan"."1.2.3"
+      self.by-version."multiparty"."3.3.2"
+      self.by-version."on-headers"."1.0.0"
+      self.by-version."parseurl"."1.3.0"
+      self.by-version."qs"."1.2.2"
+      self.by-version."response-time"."2.0.1"
+      self.by-version."serve-favicon"."2.0.1"
+      self.by-version."serve-index"."1.1.6"
+      self.by-version."serve-static"."1.5.3"
+      self.by-version."type-is"."1.3.2"
+      self.by-version."vhost"."2.0.0"
       self.by-version."pause"."0.0.1"
-      self.by-version."debug"."0.8.1"
-      self.by-version."raw-body"."1.1.3"
-      self.by-version."multiparty"."2.2.0"
     ];
     peerDependencies = [
     ];
@@ -3491,7 +3105,7 @@
       self.by-version."bytes"."0.1.0"
       self.by-version."send"."0.0.3"
       self.by-version."fresh"."0.1.0"
-      self.by-version."debug"."0.8.1"
+      self.by-version."debug"."1.0.4"
     ];
     peerDependencies = [
     ];
@@ -3520,7 +3134,7 @@
       self.by-version."bytes"."0.2.0"
       self.by-version."fresh"."0.1.0"
       self.by-version."pause"."0.0.1"
-      self.by-version."debug"."0.8.1"
+      self.by-version."debug"."1.0.4"
     ];
     peerDependencies = [
     ];
@@ -3549,54 +3163,14 @@
       self.by-version."bytes"."0.2.0"
       self.by-version."fresh"."0.1.0"
       self.by-version."pause"."0.0.1"
-      self.by-version."debug"."0.8.1"
+      self.by-version."debug"."1.0.4"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "connect" ];
   };
   by-spec."connect"."~2" =
-    self.by-version."connect"."2.14.4";
-  by-version."connect"."2.14.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-connect-2.14.4";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/connect/-/connect-2.14.4.tgz";
-        name = "connect-2.14.4.tgz";
-        sha1 = "40e74de3947a5278035c12f21535604555609a5a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."connect" or []);
-    deps = [
-      self.by-version."basic-auth-connect"."1.0.0"
-      self.by-version."cookie-parser"."1.0.1"
-      self.by-version."cookie-signature"."1.0.3"
-      self.by-version."compression"."1.0.0"
-      self.by-version."connect-timeout"."1.0.0"
-      self.by-version."csurf"."1.1.0"
-      self.by-version."errorhandler"."1.0.0"
-      self.by-version."express-session"."1.0.2"
-      self.by-version."fresh"."0.2.2"
-      self.by-version."method-override"."1.0.0"
-      self.by-version."morgan"."1.0.0"
-      self.by-version."qs"."0.6.6"
-      self.by-version."response-time"."1.0.0"
-      self.by-version."setimmediate"."1.0.1"
-      self.by-version."serve-index"."1.0.1"
-      self.by-version."serve-static"."1.0.4"
-      self.by-version."static-favicon"."1.0.2"
-      self.by-version."vhost"."1.0.0"
-      self.by-version."bytes"."0.3.0"
-      self.by-version."pause"."0.0.1"
-      self.by-version."debug"."0.8.1"
-      self.by-version."raw-body"."1.1.3"
-      self.by-version."multiparty"."2.2.0"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "connect" ];
-  };
+    self.by-version."connect"."2.25.7";
   by-spec."connect"."~2.12.0" =
     self.by-version."connect"."2.12.0";
   by-version."connect"."2.12.0" = lib.makeOverridable self.buildNodePackage {
@@ -3684,7 +3258,7 @@
     buildInputs =
       (self.nativeDeps."connect-jade-static" or []);
     deps = [
-      self.by-version."jade"."1.3.1"
+      self.by-version."jade"."1.5.0"
     ];
     peerDependencies = [
     ];
@@ -3692,14 +3266,14 @@
   };
   "connect-jade-static" = self.by-version."connect-jade-static"."0.1.3";
   by-spec."connect-mongo"."*" =
-    self.by-version."connect-mongo"."0.4.0";
-  by-version."connect-mongo"."0.4.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-connect-mongo-0.4.0";
+    self.by-version."connect-mongo"."0.4.1";
+  by-version."connect-mongo"."0.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-connect-mongo-0.4.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/connect-mongo/-/connect-mongo-0.4.0.tgz";
-        name = "connect-mongo-0.4.0.tgz";
-        sha1 = "4cb33728334a8f10f2d9e43d31369dbc2f856336";
+        url = "http://registry.npmjs.org/connect-mongo/-/connect-mongo-0.4.1.tgz";
+        name = "connect-mongo-0.4.1.tgz";
+        sha1 = "01ed3e71558fb3f0fdc97b784ef974f9909ddd11";
       })
     ];
     buildInputs =
@@ -3711,22 +3285,24 @@
     ];
     passthru.names = [ "connect-mongo" ];
   };
-  "connect-mongo" = self.by-version."connect-mongo"."0.4.0";
-  by-spec."connect-timeout"."1.0.0" =
-    self.by-version."connect-timeout"."1.0.0";
-  by-version."connect-timeout"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-connect-timeout-1.0.0";
+  "connect-mongo" = self.by-version."connect-mongo"."0.4.1";
+  by-spec."connect-timeout"."~1.2.2" =
+    self.by-version."connect-timeout"."1.2.2";
+  by-version."connect-timeout"."1.2.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-connect-timeout-1.2.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/connect-timeout/-/connect-timeout-1.0.0.tgz";
-        name = "connect-timeout-1.0.0.tgz";
-        sha1 = "12054799f90bb9566f8b274efe7842d6465d10bb";
+        url = "http://registry.npmjs.org/connect-timeout/-/connect-timeout-1.2.2.tgz";
+        name = "connect-timeout-1.2.2.tgz";
+        sha1 = "5953602bb66abfd5fa21ae911a7221c5e825a1c0";
       })
     ];
     buildInputs =
       (self.nativeDeps."connect-timeout" or []);
     deps = [
-      self.by-version."debug"."0.8.1"
+      self.by-version."debug"."1.0.4"
+      self.by-version."ms"."0.6.2"
+      self.by-version."on-headers"."1.0.0"
     ];
     peerDependencies = [
     ];
@@ -3751,44 +3327,28 @@
     ];
     passthru.names = [ "connection-parse" ];
   };
-  by-spec."console-browserify"."0.1.x" =
-    self.by-version."console-browserify"."0.1.6";
-  by-version."console-browserify"."0.1.6" = lib.makeOverridable self.buildNodePackage {
-    name = "node-console-browserify-0.1.6";
+  by-spec."console-browserify"."1.1.x" =
+    self.by-version."console-browserify"."1.1.0";
+  by-version."console-browserify"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-console-browserify-1.1.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/console-browserify/-/console-browserify-0.1.6.tgz";
-        name = "console-browserify-0.1.6.tgz";
-        sha1 = "d128a3c0bb88350eb5626c6e7c71a6f0fd48983c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."console-browserify" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "console-browserify" ];
-  };
-  by-spec."console-browserify"."~1.0.1" =
-    self.by-version."console-browserify"."1.0.3";
-  by-version."console-browserify"."1.0.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-console-browserify-1.0.3";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/console-browserify/-/console-browserify-1.0.3.tgz";
-        name = "console-browserify-1.0.3.tgz";
-        sha1 = "d3898d2c3a93102f364197f8874b4f92b5286a8e";
+        url = "http://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz";
+        name = "console-browserify-1.1.0.tgz";
+        sha1 = "f0241c45730a9fc6323b206dbf38edc741d0bb10";
       })
     ];
     buildInputs =
       (self.nativeDeps."console-browserify" or []);
     deps = [
+      self.by-version."date-now"."0.1.4"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "console-browserify" ];
   };
+  by-spec."console-browserify"."^1.1.0" =
+    self.by-version."console-browserify"."1.1.0";
   by-spec."constantinople"."~1.0.1" =
     self.by-version."constantinople"."1.0.2";
   by-version."constantinople"."1.0.2" = lib.makeOverridable self.buildNodePackage {
@@ -3803,7 +3363,7 @@
     buildInputs =
       (self.nativeDeps."constantinople" or []);
     deps = [
-      self.by-version."uglify-js"."2.4.13"
+      self.by-version."uglify-js"."2.4.15"
     ];
     peerDependencies = [
     ];
@@ -3812,20 +3372,20 @@
   by-spec."constantinople"."~1.0.2" =
     self.by-version."constantinople"."1.0.2";
   by-spec."constantinople"."~2.0.0" =
-    self.by-version."constantinople"."2.0.0";
-  by-version."constantinople"."2.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-constantinople-2.0.0";
+    self.by-version."constantinople"."2.0.1";
+  by-version."constantinople"."2.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-constantinople-2.0.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/constantinople/-/constantinople-2.0.0.tgz";
-        name = "constantinople-2.0.0.tgz";
-        sha1 = "0558c3f340095a43acf2386149e5537074330e49";
+        url = "http://registry.npmjs.org/constantinople/-/constantinople-2.0.1.tgz";
+        name = "constantinople-2.0.1.tgz";
+        sha1 = "5829f856f301a9bdb107d935f77d8eb8ccec4c79";
       })
     ];
     buildInputs =
       (self.nativeDeps."constantinople" or []);
     deps = [
-      self.by-version."uglify-js"."2.4.13"
+      self.by-version."uglify-js"."2.4.15"
     ];
     peerDependencies = [
     ];
@@ -3851,14 +3411,14 @@
     passthru.names = [ "constants-browserify" ];
   };
   by-spec."convert-source-map"."~0.3.0" =
-    self.by-version."convert-source-map"."0.3.3";
-  by-version."convert-source-map"."0.3.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-convert-source-map-0.3.3";
+    self.by-version."convert-source-map"."0.3.5";
+  by-version."convert-source-map"."0.3.5" = lib.makeOverridable self.buildNodePackage {
+    name = "node-convert-source-map-0.3.5";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.3.tgz";
-        name = "convert-source-map-0.3.3.tgz";
-        sha1 = "f77f130ded4e611d313a1bcf78f988990831c69b";
+        url = "http://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz";
+        name = "convert-source-map-0.3.5.tgz";
+        sha1 = "f1d802950af7dd2631a1febe0596550c86ab3190";
       })
     ];
     buildInputs =
@@ -3926,25 +3486,6 @@
     ];
     passthru.names = [ "cookie" ];
   };
-  by-spec."cookie"."0.1.1" =
-    self.by-version."cookie"."0.1.1";
-  by-version."cookie"."0.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-cookie-0.1.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/cookie/-/cookie-0.1.1.tgz";
-        name = "cookie-0.1.1.tgz";
-        sha1 = "cbd4b537aa65f800b6c66ead2520ba8d6afbdf54";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."cookie" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "cookie" ];
-  };
   by-spec."cookie"."0.1.2" =
     self.by-version."cookie"."0.1.2";
   by-version."cookie"."0.1.2" = lib.makeOverridable self.buildNodePackage {
@@ -4002,29 +3543,29 @@
     ];
     passthru.names = [ "cookie-jar" ];
   };
-  by-spec."cookie-parser"."1.0.1" =
-    self.by-version."cookie-parser"."1.0.1";
-  by-version."cookie-parser"."1.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-cookie-parser-1.0.1";
+  by-spec."cookie-parser"."1.3.2" =
+    self.by-version."cookie-parser"."1.3.2";
+  by-version."cookie-parser"."1.3.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-cookie-parser-1.3.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/cookie-parser/-/cookie-parser-1.0.1.tgz";
-        name = "cookie-parser-1.0.1.tgz";
-        sha1 = "17bd622c9717cd0858a912a9fef4c0362360a7b0";
+        url = "http://registry.npmjs.org/cookie-parser/-/cookie-parser-1.3.2.tgz";
+        name = "cookie-parser-1.3.2.tgz";
+        sha1 = "52211cc82c955d79ff0c088954407724e19cf562";
       })
     ];
     buildInputs =
       (self.nativeDeps."cookie-parser" or []);
     deps = [
-      self.by-version."cookie"."0.1.0"
-      self.by-version."cookie-signature"."1.0.3"
+      self.by-version."cookie"."0.1.2"
+      self.by-version."cookie-signature"."1.0.4"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "cookie-parser" ];
   };
-  by-spec."cookie-parser"."~1.0.1" =
-    self.by-version."cookie-parser"."1.0.1";
+  by-spec."cookie-parser"."~1.3.2" =
+    self.by-version."cookie-parser"."1.3.2";
   by-spec."cookie-signature"."1.0.0" =
     self.by-version."cookie-signature"."1.0.0";
   by-version."cookie-signature"."1.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -4082,6 +3623,25 @@
     ];
     passthru.names = [ "cookie-signature" ];
   };
+  by-spec."cookie-signature"."1.0.4" =
+    self.by-version."cookie-signature"."1.0.4";
+  by-version."cookie-signature"."1.0.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-cookie-signature-1.0.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.4.tgz";
+        name = "cookie-signature-1.0.4.tgz";
+        sha1 = "0edd22286e3a111b9a2a70db363e925e867f6aca";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."cookie-signature" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "cookie-signature" ];
+  };
   by-spec."cookiejar"."1.3.0" =
     self.by-version."cookiejar"."1.3.0";
   by-version."cookiejar"."1.3.0" = lib.makeOverridable self.buildNodePackage {
@@ -4101,46 +3661,66 @@
     ];
     passthru.names = [ "cookiejar" ];
   };
-  by-spec."cookies".">= 0.2.2" =
-    self.by-version."cookies"."0.4.0";
-  by-version."cookies"."0.4.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-cookies-0.4.0";
+  by-spec."cookiejar"."1.3.2" =
+    self.by-version."cookiejar"."1.3.2";
+  by-version."cookiejar"."1.3.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-cookiejar-1.3.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/cookies/-/cookies-0.4.0.tgz";
-        name = "cookies-0.4.0.tgz";
-        sha1 = "c5d1f8b76217ed653135afe32bdad747c2fa9190";
+        url = "http://registry.npmjs.org/cookiejar/-/cookiejar-1.3.2.tgz";
+        name = "cookiejar-1.3.2.tgz";
+        sha1 = "61d3229e2da20c859032233502958a9b7df58249";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."cookiejar" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "cookiejar" ];
+  };
+  by-spec."cookiejar"."2.0.1" =
+    self.by-version."cookiejar"."2.0.1";
+  by-version."cookiejar"."2.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-cookiejar-2.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/cookiejar/-/cookiejar-2.0.1.tgz";
+        name = "cookiejar-2.0.1.tgz";
+        sha1 = "3d12752f6adf68a892f332433492bd5812bb668f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."cookiejar" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "cookiejar" ];
+  };
+  by-spec."cookies".">= 0.2.2" =
+    self.by-version."cookies"."0.5.0";
+  by-version."cookies"."0.5.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-cookies-0.5.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/cookies/-/cookies-0.5.0.tgz";
+        name = "cookies-0.5.0.tgz";
+        sha1 = "164cac46a1d3ca3b3b87427414c24931d8381025";
       })
     ];
     buildInputs =
       (self.nativeDeps."cookies" or []);
     deps = [
-      self.by-version."keygrip"."1.0.0"
+      self.by-version."keygrip"."1.0.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "cookies" ];
   };
-  by-spec."copy-paste"."~0.2.0" =
-    self.by-version."copy-paste"."0.2.0";
-  by-version."copy-paste"."0.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-copy-paste-0.2.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/copy-paste/-/copy-paste-0.2.0.tgz";
-        name = "copy-paste-0.2.0.tgz";
-        sha1 = "6a83a3a073fc144adfa83cd03adb8db35953c424";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."copy-paste" or []);
-    deps = [
-      self.by-version."execSync"."1.0.1-pre"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "copy-paste" ];
-  };
+  by-spec."cookies"."~0.5.0" =
+    self.by-version."cookies"."0.5.0";
   by-spec."core-util-is"."~1.0.0" =
     self.by-version."core-util-is"."1.0.1";
   by-version."core-util-is"."1.0.1" = lib.makeOverridable self.buildNodePackage {
@@ -4174,36 +3754,36 @@
     buildInputs =
       (self.nativeDeps."couch-login" or []);
     deps = [
-      self.by-version."request"."2.34.0"
+      self.by-version."request"."2.40.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "couch-login" ];
   };
   by-spec."coveralls"."*" =
-    self.by-version."coveralls"."2.10.0";
-  by-version."coveralls"."2.10.0" = lib.makeOverridable self.buildNodePackage {
-    name = "coveralls-2.10.0";
+    self.by-version."coveralls"."2.11.1";
+  by-version."coveralls"."2.11.1" = lib.makeOverridable self.buildNodePackage {
+    name = "coveralls-2.11.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/coveralls/-/coveralls-2.10.0.tgz";
-        name = "coveralls-2.10.0.tgz";
-        sha1 = "03f0c54070f30e0d336c79ef2b16a5c53728a7e5";
+        url = "http://registry.npmjs.org/coveralls/-/coveralls-2.11.1.tgz";
+        name = "coveralls-2.11.1.tgz";
+        sha1 = "fedc951296207cc5eb545476923e64f20cf7854d";
       })
     ];
     buildInputs =
       (self.nativeDeps."coveralls" or []);
     deps = [
       self.by-version."js-yaml"."3.0.1"
-      self.by-version."request"."2.16.2"
       self.by-version."lcov-parse"."0.0.6"
-      self.by-version."log-driver"."1.2.1"
+      self.by-version."log-driver"."1.2.4"
+      self.by-version."request"."2.36.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "coveralls" ];
   };
-  "coveralls" = self.by-version."coveralls"."2.10.0";
+  "coveralls" = self.by-version."coveralls"."2.11.1";
   by-spec."crc"."0.2.0" =
     self.by-version."crc"."0.2.0";
   by-version."crc"."0.2.0" = lib.makeOverridable self.buildNodePackage {
@@ -4223,6 +3803,27 @@
     ];
     passthru.names = [ "crc" ];
   };
+  by-spec."crc32-stream"."~0.2.0" =
+    self.by-version."crc32-stream"."0.2.0";
+  by-version."crc32-stream"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-crc32-stream-0.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/crc32-stream/-/crc32-stream-0.2.0.tgz";
+        name = "crc32-stream-0.2.0.tgz";
+        sha1 = "5c80d480c8682f904b6f15530dbbe0b8c063dbbe";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."crc32-stream" or []);
+    deps = [
+      self.by-version."readable-stream"."1.0.31"
+      self.by-version."buffer-crc32"."0.2.3"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "crc32-stream" ];
+  };
   by-spec."crossroads"."~0.12.0" =
     self.by-version."crossroads"."0.12.0";
   by-version."crossroads"."0.12.0" = lib.makeOverridable self.buildNodePackage {
@@ -4302,20 +3903,22 @@
     ];
     passthru.names = [ "crypto" ];
   };
-  by-spec."crypto-browserify"."~1.0.9" =
-    self.by-version."crypto-browserify"."1.0.9";
-  by-version."crypto-browserify"."1.0.9" = lib.makeOverridable self.buildNodePackage {
-    name = "node-crypto-browserify-1.0.9";
+  by-spec."crypto-browserify"."^3.0.0" =
+    self.by-version."crypto-browserify"."3.0.1";
+  by-version."crypto-browserify"."3.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-crypto-browserify-3.0.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/crypto-browserify/-/crypto-browserify-1.0.9.tgz";
-        name = "crypto-browserify-1.0.9.tgz";
-        sha1 = "cc5449685dfb85eb11c9828acc7cb87ab5bbfcc0";
+        url = "http://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.0.1.tgz";
+        name = "crypto-browserify-3.0.1.tgz";
+        sha1 = "770fd68e8422f9b1e53d6812f1c2ce2ea7ab917c";
       })
     ];
     buildInputs =
       (self.nativeDeps."crypto-browserify" or []);
     deps = [
+      self.by-version."ripemd160"."0.2.0"
+      self.by-version."sha.js"."2.1.7"
     ];
     peerDependencies = [
     ];
@@ -4340,6 +3943,29 @@
     ];
     passthru.names = [ "cscodegen" ];
   };
+  by-spec."csrf-tokens"."~2.0.0" =
+    self.by-version."csrf-tokens"."2.0.0";
+  by-version."csrf-tokens"."2.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-csrf-tokens-2.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/csrf-tokens/-/csrf-tokens-2.0.0.tgz";
+        name = "csrf-tokens-2.0.0.tgz";
+        sha1 = "c821003fb8b6ad17bc977d6fd1a84bedc3ed619b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."csrf-tokens" or []);
+    deps = [
+      self.by-version."rndm"."1.0.0"
+      self.by-version."scmp"."0.0.3"
+      self.by-version."uid-safe"."1.0.1"
+      self.by-version."base64-url"."1.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "csrf-tokens" ];
+  };
   by-spec."css"."~1.0.8" =
     self.by-version."css"."1.0.8";
   by-version."css"."1.0.8" = lib.makeOverridable self.buildNodePackage {
@@ -4418,42 +4044,23 @@
     ];
     passthru.names = [ "css-stringify" ];
   };
-  by-spec."csurf"."1.0.0" =
-    self.by-version."csurf"."1.0.0";
-  by-version."csurf"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-csurf-1.0.0";
+  by-spec."csurf"."~1.4.0" =
+    self.by-version."csurf"."1.4.0";
+  by-version."csurf"."1.4.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-csurf-1.4.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/csurf/-/csurf-1.0.0.tgz";
-        name = "csurf-1.0.0.tgz";
-        sha1 = "a68d5718b988032e270abf1f4b34f272753d745b";
+        url = "http://registry.npmjs.org/csurf/-/csurf-1.4.0.tgz";
+        name = "csurf-1.4.0.tgz";
+        sha1 = "035628ab6644d7709ac9d1adc78ef05a2d576efe";
       })
     ];
     buildInputs =
       (self.nativeDeps."csurf" or []);
     deps = [
-      self.by-version."uid2"."0.0.3"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "csurf" ];
-  };
-  by-spec."csurf"."1.1.0" =
-    self.by-version."csurf"."1.1.0";
-  by-version."csurf"."1.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-csurf-1.1.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/csurf/-/csurf-1.1.0.tgz";
-        name = "csurf-1.1.0.tgz";
-        sha1 = "5dd459df40df43b9eb828284d6d03132f42cb8b2";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."csurf" or []);
-    deps = [
-      self.by-version."uid2"."0.0.3"
-      self.by-version."scmp"."0.0.3"
+      self.by-version."cookie"."0.1.2"
+      self.by-version."cookie-signature"."1.0.4"
+      self.by-version."csrf-tokens"."2.0.0"
     ];
     peerDependencies = [
     ];
@@ -4516,24 +4123,64 @@
     ];
     passthru.names = [ "cycle" ];
   };
-  by-spec."dargs"."~0.1.0" =
-    self.by-version."dargs"."0.1.0";
-  by-version."dargs"."0.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-dargs-0.1.0";
+  by-spec."dashdash"."1.3.2" =
+    self.by-version."dashdash"."1.3.2";
+  by-version."dashdash"."1.3.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-dashdash-1.3.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/dargs/-/dargs-0.1.0.tgz";
-        name = "dargs-0.1.0.tgz";
-        sha1 = "2364ad9f441f976dcd5fe9961e21715665a5e3c3";
+        url = "http://registry.npmjs.org/dashdash/-/dashdash-1.3.2.tgz";
+        name = "dashdash-1.3.2.tgz";
+        sha1 = "1e76d13fadf25f8f50e70212c98a25beb1b3b8eb";
       })
     ];
     buildInputs =
-      (self.nativeDeps."dargs" or []);
+      (self.nativeDeps."dashdash" or []);
+    deps = [
+      self.by-version."assert-plus"."0.1.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "dashdash" ];
+  };
+  by-spec."dashdash"."1.5.0" =
+    self.by-version."dashdash"."1.5.0";
+  by-version."dashdash"."1.5.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-dashdash-1.5.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/dashdash/-/dashdash-1.5.0.tgz";
+        name = "dashdash-1.5.0.tgz";
+        sha1 = "fa5aa8a9415a7c5c3928be18bd4975458e666452";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."dashdash" or []);
+    deps = [
+      self.by-version."assert-plus"."0.1.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "dashdash" ];
+  };
+  by-spec."date-now"."^0.1.4" =
+    self.by-version."date-now"."0.1.4";
+  by-version."date-now"."0.1.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-date-now-0.1.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz";
+        name = "date-now-0.1.4.tgz";
+        sha1 = "eaf439fd4d4848ad74e5cc7dbef200672b9e345b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."date-now" or []);
     deps = [
     ];
     peerDependencies = [
     ];
-    passthru.names = [ "dargs" ];
+    passthru.names = [ "date-now" ];
   };
   by-spec."dateformat"."1.0.2-1.2.3" =
     self.by-version."dateformat"."1.0.2-1.2.3";
@@ -4555,14 +4202,14 @@
     passthru.names = [ "dateformat" ];
   };
   by-spec."dateformat"."~1.0.6" =
-    self.by-version."dateformat"."1.0.7-1.2.3";
-  by-version."dateformat"."1.0.7-1.2.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-dateformat-1.0.7-1.2.3";
+    self.by-version."dateformat"."1.0.8-1.2.3";
+  by-version."dateformat"."1.0.8-1.2.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-dateformat-1.0.8-1.2.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/dateformat/-/dateformat-1.0.7-1.2.3.tgz";
-        name = "dateformat-1.0.7-1.2.3.tgz";
-        sha1 = "ebb561bb7214ee57a8dc2687adab1d555de9419c";
+        url = "http://registry.npmjs.org/dateformat/-/dateformat-1.0.8-1.2.3.tgz";
+        name = "dateformat-1.0.8-1.2.3.tgz";
+        sha1 = "5d60c5d574dc778a7f98139156c6cfc9d851d1e7";
       })
     ];
     buildInputs =
@@ -4574,19 +4221,20 @@
     passthru.names = [ "dateformat" ];
   };
   by-spec."debug"."*" =
-    self.by-version."debug"."0.8.1";
-  by-version."debug"."0.8.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-debug-0.8.1";
+    self.by-version."debug"."1.0.4";
+  by-version."debug"."1.0.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-debug-1.0.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/debug/-/debug-0.8.1.tgz";
-        name = "debug-0.8.1.tgz";
-        sha1 = "20ff4d26f5e422cb68a1bacbbb61039ad8c1c130";
+        url = "http://registry.npmjs.org/debug/-/debug-1.0.4.tgz";
+        name = "debug-1.0.4.tgz";
+        sha1 = "5b9c256bd54b6ec02283176fa8a0ede6d154cbf8";
       })
     ];
     buildInputs =
       (self.nativeDeps."debug" or []);
     deps = [
+      self.by-version."ms"."0.6.2"
     ];
     peerDependencies = [
     ];
@@ -4630,68 +4278,77 @@
     ];
     passthru.names = [ "debug" ];
   };
+  by-spec."debug"."1.0.2" =
+    self.by-version."debug"."1.0.2";
+  by-version."debug"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-debug-1.0.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/debug/-/debug-1.0.2.tgz";
+        name = "debug-1.0.2.tgz";
+        sha1 = "3849591c10cce648476c3c7c2e2e3416db5963c4";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."debug" or []);
+    deps = [
+      self.by-version."ms"."0.6.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "debug" ];
+  };
+  by-spec."debug"."1.0.3" =
+    self.by-version."debug"."1.0.3";
+  by-version."debug"."1.0.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-debug-1.0.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/debug/-/debug-1.0.3.tgz";
+        name = "debug-1.0.3.tgz";
+        sha1 = "fc8c6b2d6002804b4081c0208e0f6460ba1fa3e4";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."debug" or []);
+    deps = [
+      self.by-version."ms"."0.6.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "debug" ];
+  };
+  by-spec."debug"."1.0.4" =
+    self.by-version."debug"."1.0.4";
   by-spec."debug".">= 0.7.3 < 1" =
     self.by-version."debug"."0.8.1";
-  by-spec."debug"."~0.7.0" =
-    self.by-version."debug"."0.7.4";
+  by-version."debug"."0.8.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-debug-0.8.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/debug/-/debug-0.8.1.tgz";
+        name = "debug-0.8.1.tgz";
+        sha1 = "20ff4d26f5e422cb68a1bacbbb61039ad8c1c130";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."debug" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "debug" ];
+  };
+  by-spec."debug"."^1.0.2" =
+    self.by-version."debug"."1.0.4";
   by-spec."debug"."~0.7.2" =
     self.by-version."debug"."0.7.4";
   by-spec."debug"."~0.8" =
     self.by-version."debug"."0.8.1";
-  by-spec."decompress"."^0.2.0" =
-    self.by-version."decompress"."0.2.3";
-  by-version."decompress"."0.2.3" = lib.makeOverridable self.buildNodePackage {
-    name = "decompress-0.2.3";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/decompress/-/decompress-0.2.3.tgz";
-        name = "decompress-0.2.3.tgz";
-        sha1 = "ad471a0fc51b7193b72f60c9e040ce1a7a4b9fcc";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."decompress" or []);
-    deps = [
-      self.by-version."adm-zip"."0.4.4"
-      self.by-version."extname"."0.1.2"
-      self.by-version."get-stdin"."0.1.0"
-      self.by-version."map-key"."0.1.1"
-      self.by-version."mkdirp"."0.3.5"
-      self.by-version."nopt"."2.2.0"
-      self.by-version."rimraf"."2.2.6"
-      self.by-version."stream-combiner"."0.0.4"
-      self.by-version."tar"."0.1.19"
-      self.by-version."tempfile"."0.1.3"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "decompress" ];
-  };
-  by-spec."decompress-zip"."~0.0.3" =
-    self.by-version."decompress-zip"."0.0.6";
-  by-version."decompress-zip"."0.0.6" = lib.makeOverridable self.buildNodePackage {
-    name = "decompress-zip-0.0.6";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/decompress-zip/-/decompress-zip-0.0.6.tgz";
-        name = "decompress-zip-0.0.6.tgz";
-        sha1 = "263ef05b304cdcd1172858af453561c53ae017bb";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."decompress-zip" or []);
-    deps = [
-      self.by-version."q"."1.0.1"
-      self.by-version."mkpath"."0.1.0"
-      self.by-version."binary"."0.3.0"
-      self.by-version."touch"."0.0.2"
-      self.by-version."readable-stream"."1.1.13-1"
-      self.by-version."nopt"."2.2.0"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "decompress-zip" ];
-  };
+  by-spec."debug"."~1.0.1" =
+    self.by-version."debug"."1.0.4";
+  by-spec."debug"."~1.0.2" =
+    self.by-version."debug"."1.0.4";
   by-spec."deep-eql"."0.1.3" =
     self.by-version."deep-eql"."0.1.3";
   by-version."deep-eql"."0.1.3" = lib.makeOverridable self.buildNodePackage {
@@ -4752,34 +4409,17 @@
   };
   by-spec."deep-equal"."~0.0.0" =
     self.by-version."deep-equal"."0.0.0";
-  by-spec."deep-equal"."~0.1.0" =
-    self.by-version."deep-equal"."0.1.2";
-  by-version."deep-equal"."0.1.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-deep-equal-0.1.2";
+  by-spec."deep-equal"."~0.2.1" =
+    self.by-version."deep-equal"."0.2.1";
+  by-spec."deep-extend"."~0.2.10" =
+    self.by-version."deep-extend"."0.2.11";
+  by-version."deep-extend"."0.2.11" = lib.makeOverridable self.buildNodePackage {
+    name = "node-deep-extend-0.2.11";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.1.2.tgz";
-        name = "deep-equal-0.1.2.tgz";
-        sha1 = "b246c2b80a570a47c11be1d9bd1070ec878b87ce";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."deep-equal" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "deep-equal" ];
-  };
-  by-spec."deep-extend"."~0.2.5" =
-    self.by-version."deep-extend"."0.2.8";
-  by-version."deep-extend"."0.2.8" = lib.makeOverridable self.buildNodePackage {
-    name = "node-deep-extend-0.2.8";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/deep-extend/-/deep-extend-0.2.8.tgz";
-        name = "deep-extend-0.2.8.tgz";
-        sha1 = "6d2893a805286e46d8243137c32fb991b50f4299";
+        url = "http://registry.npmjs.org/deep-extend/-/deep-extend-0.2.11.tgz";
+        name = "deep-extend-0.2.11.tgz";
+        sha1 = "7a16ba69729132340506170494bc83f7076fe08f";
       })
     ];
     buildInputs =
@@ -4790,8 +4430,8 @@
     ];
     passthru.names = [ "deep-extend" ];
   };
-  by-spec."deep-extend"."~0.2.8" =
-    self.by-version."deep-extend"."0.2.8";
+  by-spec."deep-extend"."~0.2.5" =
+    self.by-version."deep-extend"."0.2.11";
   by-spec."deepmerge"."*" =
     self.by-version."deepmerge"."0.2.7";
   by-version."deepmerge"."0.2.7" = lib.makeOverridable self.buildNodePackage {
@@ -4831,6 +4471,26 @@
     ];
     passthru.names = [ "defined" ];
   };
+  by-spec."deflate-crc32-stream"."~0.1.0" =
+    self.by-version."deflate-crc32-stream"."0.1.1";
+  by-version."deflate-crc32-stream"."0.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-deflate-crc32-stream-0.1.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/deflate-crc32-stream/-/deflate-crc32-stream-0.1.1.tgz";
+        name = "deflate-crc32-stream-0.1.1.tgz";
+        sha1 = "5df9e343174f56e7d6056e8ba1f91e5576c02160";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."deflate-crc32-stream" or []);
+    deps = [
+      self.by-version."buffer-crc32"."0.2.3"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "deflate-crc32-stream" ];
+  };
   by-spec."delayed-stream"."0.0.5" =
     self.by-version."delayed-stream"."0.0.5";
   by-version."delayed-stream"."0.0.5" = lib.makeOverridable self.buildNodePackage {
@@ -4850,51 +4510,107 @@
     ];
     passthru.names = [ "delayed-stream" ];
   };
-  by-spec."deps-sort"."~0.1.1" =
-    self.by-version."deps-sort"."0.1.1";
-  by-version."deps-sort"."0.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "deps-sort-0.1.1";
+  by-spec."delegates"."0.0.3" =
+    self.by-version."delegates"."0.0.3";
+  by-version."delegates"."0.0.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-delegates-0.0.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/deps-sort/-/deps-sort-0.1.1.tgz";
-        name = "deps-sort-0.1.1.tgz";
-        sha1 = "940d9da1f84a3891c7218ad240ec5ed6084bc8d6";
+        url = "http://registry.npmjs.org/delegates/-/delegates-0.0.3.tgz";
+        name = "delegates-0.0.3.tgz";
+        sha1 = "4f25cbf8e1c061967f834e003f3bd18ded4baeea";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."delegates" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "delegates" ];
+  };
+  by-spec."depd"."0.3.0" =
+    self.by-version."depd"."0.3.0";
+  by-version."depd"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-depd-0.3.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/depd/-/depd-0.3.0.tgz";
+        name = "depd-0.3.0.tgz";
+        sha1 = "11c9bc28e425325fbd8b38940beff69fa5326883";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."depd" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "depd" ];
+  };
+  by-spec."depd"."0.4.4" =
+    self.by-version."depd"."0.4.4";
+  by-version."depd"."0.4.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-depd-0.4.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/depd/-/depd-0.4.4.tgz";
+        name = "depd-0.4.4.tgz";
+        sha1 = "07091fae75f97828d89b4a02a2d4778f0e7c0662";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."depd" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "depd" ];
+  };
+  by-spec."deps-sort"."^1.3.5" =
+    self.by-version."deps-sort"."1.3.5";
+  by-version."deps-sort"."1.3.5" = lib.makeOverridable self.buildNodePackage {
+    name = "deps-sort-1.3.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/deps-sort/-/deps-sort-1.3.5.tgz";
+        name = "deps-sort-1.3.5.tgz";
+        sha1 = "89dc3c323504080558f9909bf57df1f7837c5c6f";
       })
     ];
     buildInputs =
       (self.nativeDeps."deps-sort" or []);
     deps = [
-      self.by-version."through"."2.3.4"
-      self.by-version."JSONStream"."0.6.4"
-      self.by-version."minimist"."0.0.8"
+      self.by-version."JSONStream"."0.8.4"
+      self.by-version."isarray"."0.0.1"
+      self.by-version."minimist"."0.2.0"
+      self.by-version."shasum"."1.0.0"
+      self.by-version."through2"."0.5.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "deps-sort" ];
   };
-  by-spec."derequire"."~0.8.0" =
-    self.by-version."derequire"."0.8.0";
-  by-version."derequire"."0.8.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-derequire-0.8.0";
+  by-spec."destroy"."1.0.3" =
+    self.by-version."destroy"."1.0.3";
+  by-version."destroy"."1.0.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-destroy-1.0.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/derequire/-/derequire-0.8.0.tgz";
-        name = "derequire-0.8.0.tgz";
-        sha1 = "c1f7f1da2cede44adede047378f03f444e9c4c0d";
+        url = "http://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz";
+        name = "destroy-1.0.3.tgz";
+        sha1 = "b433b4724e71fd8551d9885174851c5fc377e2c9";
       })
     ];
     buildInputs =
-      (self.nativeDeps."derequire" or []);
+      (self.nativeDeps."destroy" or []);
     deps = [
-      self.by-version."estraverse"."1.5.0"
-      self.by-version."esrefactor"."0.1.0"
-      self.by-version."esprima-fb"."3001.1.0-dev-harmony-fb"
     ];
     peerDependencies = [
     ];
-    passthru.names = [ "derequire" ];
+    passthru.names = [ "destroy" ];
   };
-  by-spec."detective"."~3.1.0" =
+  by-spec."detective"."^3.1.0" =
     self.by-version."detective"."3.1.0";
   by-version."detective"."3.1.0" = lib.makeOverridable self.buildNodePackage {
     name = "node-detective-3.1.0";
@@ -4915,6 +4631,45 @@
     ];
     passthru.names = [ "detective" ];
   };
+  by-spec."dethroy"."~1.0.0" =
+    self.by-version."dethroy"."1.0.2";
+  by-version."dethroy"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-dethroy-1.0.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/dethroy/-/dethroy-1.0.2.tgz";
+        name = "dethroy-1.0.2.tgz";
+        sha1 = "c82003317693dcbcda3f752b0182e3bf16dd4421";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."dethroy" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "dethroy" ];
+  };
+  by-spec."dezalgo"."^1.0.0" =
+    self.by-version."dezalgo"."1.0.0";
+  by-version."dezalgo"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-dezalgo-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/dezalgo/-/dezalgo-1.0.0.tgz";
+        name = "dezalgo-1.0.0.tgz";
+        sha1 = "050bb723f18b5617b309f26c2dc8fe6f2573b6fc";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."dezalgo" or []);
+    deps = [
+      self.by-version."asap"."1.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "dezalgo" ];
+  };
   by-spec."di"."~0.0.1" =
     self.by-version."di"."0.0.1";
   by-version."di"."0.0.1" = lib.makeOverridable self.buildNodePackage {
@@ -4972,8 +4727,6 @@
     ];
     passthru.names = [ "diff" ];
   };
-  by-spec."diff"."~1.0.4" =
-    self.by-version."diff"."1.0.8";
   by-spec."diff"."~1.0.7" =
     self.by-version."diff"."1.0.8";
   by-spec."director"."1.1.10" =
@@ -4995,36 +4748,36 @@
     ];
     passthru.names = [ "director" ];
   };
-  by-spec."dkim-signer"."~0.1.0" =
-    self.by-version."dkim-signer"."0.1.0";
-  by-version."dkim-signer"."0.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-dkim-signer-0.1.0";
+  by-spec."dkim-signer"."~0.1.1" =
+    self.by-version."dkim-signer"."0.1.2";
+  by-version."dkim-signer"."0.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-dkim-signer-0.1.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/dkim-signer/-/dkim-signer-0.1.0.tgz";
-        name = "dkim-signer-0.1.0.tgz";
-        sha1 = "c57c29b238029fbb08622afc2729ad596bcb417b";
+        url = "http://registry.npmjs.org/dkim-signer/-/dkim-signer-0.1.2.tgz";
+        name = "dkim-signer-0.1.2.tgz";
+        sha1 = "2ff5d61c87d8fbff5a8b131cffc5ec3ba1c25553";
       })
     ];
     buildInputs =
       (self.nativeDeps."dkim-signer" or []);
     deps = [
       self.by-version."punycode"."1.2.4"
-      self.by-version."mimelib"."0.2.14"
+      self.by-version."mimelib"."0.2.17"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "dkim-signer" ];
   };
   by-spec."domain-browser"."~1.1.0" =
-    self.by-version."domain-browser"."1.1.1";
-  by-version."domain-browser"."1.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-domain-browser-1.1.1";
+    self.by-version."domain-browser"."1.1.2";
+  by-version."domain-browser"."1.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-domain-browser-1.1.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/domain-browser/-/domain-browser-1.1.1.tgz";
-        name = "domain-browser-1.1.1.tgz";
-        sha1 = "0123c1b9afe3bb7c8a9e856177b2059440957de0";
+        url = "http://registry.npmjs.org/domain-browser/-/domain-browser-1.1.2.tgz";
+        name = "domain-browser-1.1.2.tgz";
+        sha1 = "5a21f30a29a9891533915061426974dc2f14e56b";
       })
     ];
     buildInputs =
@@ -5054,46 +4807,6 @@
     ];
     passthru.names = [ "domelementtype" ];
   };
-  by-spec."domhandler"."2.0" =
-    self.by-version."domhandler"."2.0.3";
-  by-version."domhandler"."2.0.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-domhandler-2.0.3";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/domhandler/-/domhandler-2.0.3.tgz";
-        name = "domhandler-2.0.3.tgz";
-        sha1 = "889f8df626403af0788e29d66d5d5c6f7ebf0fd6";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."domhandler" or []);
-    deps = [
-      self.by-version."domelementtype"."1.1.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "domhandler" ];
-  };
-  by-spec."domhandler"."2.1" =
-    self.by-version."domhandler"."2.1.0";
-  by-version."domhandler"."2.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-domhandler-2.1.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/domhandler/-/domhandler-2.1.0.tgz";
-        name = "domhandler-2.1.0.tgz";
-        sha1 = "d2646f5e57f6c3bab11cf6cb05d3c0acf7412594";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."domhandler" or []);
-    deps = [
-      self.by-version."domelementtype"."1.1.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "domhandler" ];
-  };
   by-spec."domhandler"."2.2" =
     self.by-version."domhandler"."2.2.0";
   by-version."domhandler"."2.2.0" = lib.makeOverridable self.buildNodePackage {
@@ -5114,15 +4827,15 @@
     ];
     passthru.names = [ "domhandler" ];
   };
-  by-spec."domutils"."1.1" =
-    self.by-version."domutils"."1.1.6";
-  by-version."domutils"."1.1.6" = lib.makeOverridable self.buildNodePackage {
-    name = "node-domutils-1.1.6";
+  by-spec."domutils"."1.5" =
+    self.by-version."domutils"."1.5.0";
+  by-version."domutils"."1.5.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-domutils-1.5.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/domutils/-/domutils-1.1.6.tgz";
-        name = "domutils-1.1.6.tgz";
-        sha1 = "bddc3de099b9a2efacc51c623f28f416ecc57485";
+        url = "http://registry.npmjs.org/domutils/-/domutils-1.5.0.tgz";
+        name = "domutils-1.5.0.tgz";
+        sha1 = "bfa4ceb8b7ab6f9423fe59154e04da6cc3ff3949";
       })
     ];
     buildInputs =
@@ -5134,88 +4847,21 @@
     ];
     passthru.names = [ "domutils" ];
   };
-  by-spec."domutils"."1.3" =
-    self.by-version."domutils"."1.3.0";
-  by-version."domutils"."1.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-domutils-1.3.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/domutils/-/domutils-1.3.0.tgz";
-        name = "domutils-1.3.0.tgz";
-        sha1 = "9ad4d59b5af6ca684c62fe6d768ef170e70df192";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."domutils" or []);
-    deps = [
-      self.by-version."domelementtype"."1.1.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "domutils" ];
-  };
-  by-spec."domutils"."1.4" =
-    self.by-version."domutils"."1.4.3";
-  by-version."domutils"."1.4.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-domutils-1.4.3";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz";
-        name = "domutils-1.4.3.tgz";
-        sha1 = "0865513796c6b306031850e175516baf80b72a6f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."domutils" or []);
-    deps = [
-      self.by-version."domelementtype"."1.1.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "domutils" ];
-  };
-  by-spec."download"."~0.1.6" =
-    self.by-version."download"."0.1.16";
-  by-version."download"."0.1.16" = lib.makeOverridable self.buildNodePackage {
-    name = "download-0.1.16";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/download/-/download-0.1.16.tgz";
-        name = "download-0.1.16.tgz";
-        sha1 = "46783e7f590d1c0d49eb1915ab8941c74cb45e99";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."download" or []);
-    deps = [
-      self.by-version."decompress"."0.2.3"
-      self.by-version."each-async"."0.1.2"
-      self.by-version."get-stdin"."0.1.0"
-      self.by-version."get-urls"."0.1.1"
-      self.by-version."mkdirp"."0.3.5"
-      self.by-version."nopt"."2.2.0"
-      self.by-version."request"."2.34.0"
-      self.by-version."through2"."0.4.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "download" ];
-  };
   by-spec."dox"."~0.4.4" =
-    self.by-version."dox"."0.4.4";
-  by-version."dox"."0.4.4" = lib.makeOverridable self.buildNodePackage {
-    name = "dox-0.4.4";
+    self.by-version."dox"."0.4.6";
+  by-version."dox"."0.4.6" = lib.makeOverridable self.buildNodePackage {
+    name = "dox-0.4.6";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/dox/-/dox-0.4.4.tgz";
-        name = "dox-0.4.4.tgz";
-        sha1 = "4f898abbb88cd879c7c49a4973abc95b7f384823";
+        url = "http://registry.npmjs.org/dox/-/dox-0.4.6.tgz";
+        name = "dox-0.4.6.tgz";
+        sha1 = "b1f53ccd1aa0d7f712fdca22124a666e3ed37215";
       })
     ];
     buildInputs =
       (self.nativeDeps."dox" or []);
     deps = [
-      self.by-version."github-flavored-markdown"."1.0.1"
+      self.by-version."marked"."0.3.2"
       self.by-version."commander"."0.6.1"
     ];
     peerDependencies = [
@@ -5260,34 +4906,37 @@
     ];
     passthru.names = [ "duplexer" ];
   };
-  by-spec."each-async"."^0.1.1" =
-    self.by-version."each-async"."0.1.2";
-  by-version."each-async"."0.1.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-each-async-0.1.2";
+  by-spec."duplexer2"."0.0.2" =
+    self.by-version."duplexer2"."0.0.2";
+  by-version."duplexer2"."0.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-duplexer2-0.0.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/each-async/-/each-async-0.1.2.tgz";
-        name = "each-async-0.1.2.tgz";
-        sha1 = "d5b900bd92705ed5b8cad3307a6536adb0f134c6";
+        url = "http://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz";
+        name = "duplexer2-0.0.2.tgz";
+        sha1 = "c614dcf67e2fb14995a91711e5a617e8a60a31db";
       })
     ];
     buildInputs =
-      (self.nativeDeps."each-async" or []);
+      (self.nativeDeps."duplexer2" or []);
     deps = [
+      self.by-version."readable-stream"."1.1.13"
     ];
     peerDependencies = [
     ];
-    passthru.names = [ "each-async" ];
+    passthru.names = [ "duplexer2" ];
   };
-  by-spec."editor"."0.0.5" =
-    self.by-version."editor"."0.0.5";
-  by-version."editor"."0.0.5" = lib.makeOverridable self.buildNodePackage {
-    name = "node-editor-0.0.5";
+  by-spec."duplexer2"."~0.0.2" =
+    self.by-version."duplexer2"."0.0.2";
+  by-spec."editor"."~0.1.0" =
+    self.by-version."editor"."0.1.0";
+  by-version."editor"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-editor-0.1.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/editor/-/editor-0.0.5.tgz";
-        name = "editor-0.0.5.tgz";
-        sha1 = "8c38877781f2547011c1aeffdbe50cafcc59794a";
+        url = "http://registry.npmjs.org/editor/-/editor-0.1.0.tgz";
+        name = "editor-0.1.0.tgz";
+        sha1 = "542f4662c6a8c88e862fc11945e204e51981b9a1";
       })
     ];
     buildInputs =
@@ -5298,6 +4947,44 @@
     ];
     passthru.names = [ "editor" ];
   };
+  by-spec."ee-first"."1.0.3" =
+    self.by-version."ee-first"."1.0.3";
+  by-version."ee-first"."1.0.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-ee-first-1.0.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/ee-first/-/ee-first-1.0.3.tgz";
+        name = "ee-first-1.0.3.tgz";
+        sha1 = "6c98c4089abecb5a7b85c1ac449aa603d3b3dabe";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."ee-first" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "ee-first" ];
+  };
+  by-spec."ee-first"."1.0.5" =
+    self.by-version."ee-first"."1.0.5";
+  by-version."ee-first"."1.0.5" = lib.makeOverridable self.buildNodePackage {
+    name = "node-ee-first-1.0.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/ee-first/-/ee-first-1.0.5.tgz";
+        name = "ee-first-1.0.5.tgz";
+        sha1 = "8c9b212898d8cd9f1a9436650ce7be202c9e9ff0";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."ee-first" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "ee-first" ];
+  };
   by-spec."ejs"."0.8.3" =
     self.by-version."ejs"."0.8.3";
   by-version."ejs"."0.8.3" = lib.makeOverridable self.buildNodePackage {
@@ -5336,54 +5023,55 @@
     ];
     passthru.names = [ "emitter-component" ];
   };
-  by-spec."emitter-component"."1.0.0" =
-    self.by-version."emitter-component"."1.0.0";
-  by-version."emitter-component"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-emitter-component-1.0.0";
+  by-spec."encoding"."~0.1.7" =
+    self.by-version."encoding"."0.1.8";
+  by-version."encoding"."0.1.8" = lib.makeOverridable self.buildNodePackage {
+    name = "node-encoding-0.1.8";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/emitter-component/-/emitter-component-1.0.0.tgz";
-        name = "emitter-component-1.0.0.tgz";
-        sha1 = "f04dd18fc3dc3e9a74cbc0f310b088666e4c016f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."emitter-component" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "emitter-component" ];
-  };
-  by-spec."encoding"."~0.1" =
-    self.by-version."encoding"."0.1.7";
-  by-version."encoding"."0.1.7" = lib.makeOverridable self.buildNodePackage {
-    name = "node-encoding-0.1.7";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/encoding/-/encoding-0.1.7.tgz";
-        name = "encoding-0.1.7.tgz";
-        sha1 = "25cc19b34e9225d120c2ea769f9136c91cecc908";
+        url = "http://registry.npmjs.org/encoding/-/encoding-0.1.8.tgz";
+        name = "encoding-0.1.8.tgz";
+        sha1 = "3c48d355f6f4da0545de88c6f2673ccf70df11e7";
       })
     ];
     buildInputs =
       (self.nativeDeps."encoding" or []);
     deps = [
-      self.by-version."iconv-lite"."0.2.11"
+      self.by-version."iconv-lite"."0.4.4"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "encoding" ];
   };
-  by-spec."entities"."0.x" =
-    self.by-version."entities"."0.5.0";
-  by-version."entities"."0.5.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-entities-0.5.0";
+  by-spec."end-of-stream"."^1.0.0" =
+    self.by-version."end-of-stream"."1.0.0";
+  by-version."end-of-stream"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-end-of-stream-1.0.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/entities/-/entities-0.5.0.tgz";
-        name = "entities-0.5.0.tgz";
-        sha1 = "f611cb5ae221050e0012c66979503fd7ae19cc49";
+        url = "http://registry.npmjs.org/end-of-stream/-/end-of-stream-1.0.0.tgz";
+        name = "end-of-stream-1.0.0.tgz";
+        sha1 = "d4596e702734a93e40e9af864319eabd99ff2f0e";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."end-of-stream" or []);
+    deps = [
+      self.by-version."once"."1.3.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "end-of-stream" ];
+  };
+  by-spec."entities"."1.0" =
+    self.by-version."entities"."1.0.0";
+  by-version."entities"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-entities-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/entities/-/entities-1.0.0.tgz";
+        name = "entities-1.0.0.tgz";
+        sha1 = "b2987aa3821347fcde642b24fdfc9e4fb712bf26";
       })
     ];
     buildInputs =
@@ -5394,15 +5082,15 @@
     ];
     passthru.names = [ "entities" ];
   };
-  by-spec."envify"."~1.2.0" =
-    self.by-version."envify"."1.2.1";
-  by-version."envify"."1.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "envify-1.2.1";
+  by-spec."envify"."^2.0.0" =
+    self.by-version."envify"."2.0.1";
+  by-version."envify"."2.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "envify-2.0.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/envify/-/envify-1.2.1.tgz";
-        name = "envify-1.2.1.tgz";
-        sha1 = "ac34e3676f9035d59518fef57d9914a24a18767a";
+        url = "http://registry.npmjs.org/envify/-/envify-2.0.1.tgz";
+        name = "envify-2.0.1.tgz";
+        sha1 = "abab827e063efd8e6f4d485aa82b66688dd056b2";
       })
     ];
     buildInputs =
@@ -5417,44 +5105,46 @@
     ];
     passthru.names = [ "envify" ];
   };
-  by-spec."errorhandler"."1.0.0" =
-    self.by-version."errorhandler"."1.0.0";
-  by-version."errorhandler"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-errorhandler-1.0.0";
+  by-spec."error-inject"."~1.0.0" =
+    self.by-version."error-inject"."1.0.0";
+  by-version."error-inject"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-error-inject-1.0.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/errorhandler/-/errorhandler-1.0.0.tgz";
-        name = "errorhandler-1.0.0.tgz";
-        sha1 = "d74b37e8dc38c99afb3f5a79edcebaea022d042a";
+        url = "http://registry.npmjs.org/error-inject/-/error-inject-1.0.0.tgz";
+        name = "error-inject-1.0.0.tgz";
+        sha1 = "e2b3d91b54aed672f309d950d154850fa11d4f37";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."error-inject" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "error-inject" ];
+  };
+  by-spec."errorhandler"."1.1.1" =
+    self.by-version."errorhandler"."1.1.1";
+  by-version."errorhandler"."1.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-errorhandler-1.1.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/errorhandler/-/errorhandler-1.1.1.tgz";
+        name = "errorhandler-1.1.1.tgz";
+        sha1 = "18defd436d8ca2efe0a2d886c5c4d6ee6d76d691";
       })
     ];
     buildInputs =
       (self.nativeDeps."errorhandler" or []);
     deps = [
+      self.by-version."accepts"."1.0.7"
+      self.by-version."escape-html"."1.0.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "errorhandler" ];
   };
-  by-spec."es5-ext"."~0.9.2" =
-    self.by-version."es5-ext"."0.9.2";
-  by-version."es5-ext"."0.9.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-es5-ext-0.9.2";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/es5-ext/-/es5-ext-0.9.2.tgz";
-        name = "es5-ext-0.9.2.tgz";
-        sha1 = "d2e309d1f223b0718648835acf5b8823a8061f8a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."es5-ext" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "es5-ext" ];
-  };
   by-spec."escape-html"."*" =
     self.by-version."escape-html"."1.0.1";
   by-version."escape-html"."1.0.1" = lib.makeOverridable self.buildNodePackage {
@@ -5477,24 +5167,45 @@
   "escape-html" = self.by-version."escape-html"."1.0.1";
   by-spec."escape-html"."1.0.1" =
     self.by-version."escape-html"."1.0.1";
-  by-spec."escodegen"."1.3.x" =
-    self.by-version."escodegen"."1.3.2";
-  by-version."escodegen"."1.3.2" = lib.makeOverridable self.buildNodePackage {
-    name = "escodegen-1.3.2";
+  by-spec."escape-html"."~1.0.1" =
+    self.by-version."escape-html"."1.0.1";
+  by-spec."escape-string-regexp"."^1.0.0" =
+    self.by-version."escape-string-regexp"."1.0.1";
+  by-version."escape-string-regexp"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-escape-string-regexp-1.0.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/escodegen/-/escodegen-1.3.2.tgz";
-        name = "escodegen-1.3.2.tgz";
-        sha1 = "bb0f434dbd594f2060639a79b4b06259dd5372de";
+        url = "http://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.1.tgz";
+        name = "escape-string-regexp-1.0.1.tgz";
+        sha1 = "78c76393afb84f102230d949a6125c7f3cf65904";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."escape-string-regexp" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "escape-string-regexp" ];
+  };
+  by-spec."escodegen"."1.3.x" =
+    self.by-version."escodegen"."1.3.3";
+  by-version."escodegen"."1.3.3" = lib.makeOverridable self.buildNodePackage {
+    name = "escodegen-1.3.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/escodegen/-/escodegen-1.3.3.tgz";
+        name = "escodegen-1.3.3.tgz";
+        sha1 = "f024016f5a88e046fd12005055e939802e6c5f23";
       })
     ];
     buildInputs =
       (self.nativeDeps."escodegen" or []);
     deps = [
       self.by-version."esutils"."1.0.0"
-      self.by-version."estraverse"."1.5.0"
+      self.by-version."estraverse"."1.5.1"
       self.by-version."esprima"."1.1.1"
-      self.by-version."source-map"."0.1.33"
+      self.by-version."source-map"."0.1.38"
     ];
     peerDependencies = [
     ];
@@ -5516,7 +5227,7 @@
     deps = [
       self.by-version."esprima"."1.0.4"
       self.by-version."estraverse"."1.3.2"
-      self.by-version."source-map"."0.1.33"
+      self.by-version."source-map"."0.1.38"
     ];
     peerDependencies = [
     ];
@@ -5539,9 +5250,9 @@
       (self.nativeDeps."escodegen" or []);
     deps = [
       self.by-version."esprima"."1.0.4"
-      self.by-version."estraverse"."1.5.0"
+      self.by-version."estraverse"."1.5.1"
       self.by-version."esutils"."1.0.0"
-      self.by-version."source-map"."0.1.33"
+      self.by-version."source-map"."0.1.38"
     ];
     peerDependencies = [
     ];
@@ -5561,27 +5272,7 @@
     buildInputs =
       (self.nativeDeps."escope" or []);
     deps = [
-      self.by-version."estraverse"."1.5.0"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "escope" ];
-  };
-  by-spec."escope"."~0.0.13" =
-    self.by-version."escope"."0.0.16";
-  by-version."escope"."0.0.16" = lib.makeOverridable self.buildNodePackage {
-    name = "node-escope-0.0.16";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/escope/-/escope-0.0.16.tgz";
-        name = "escope-0.0.16.tgz";
-        sha1 = "418c7a0afca721dafe659193fd986283e746538f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."escope" or []);
-    deps = [
-      self.by-version."estraverse"."1.5.0"
+      self.by-version."estraverse"."1.5.1"
     ];
     peerDependencies = [
     ];
@@ -5605,7 +5296,7 @@
       self.by-version."escope"."1.0.1"
       self.by-version."escodegen"."0.0.28"
       self.by-version."estraverse"."1.3.2"
-      self.by-version."source-map"."0.1.33"
+      self.by-version."source-map"."0.1.38"
       self.by-version."esshorten"."0.0.2"
       self.by-version."optimist"."0.6.1"
     ];
@@ -5613,15 +5304,15 @@
     ];
     passthru.names = [ "esmangle" ];
   };
-  by-spec."esprima"."1.1.x" =
-    self.by-version."esprima"."1.1.1";
-  by-version."esprima"."1.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "esprima-1.1.1";
+  by-spec."esprima"."1.2.x" =
+    self.by-version."esprima"."1.2.2";
+  by-version."esprima"."1.2.2" = lib.makeOverridable self.buildNodePackage {
+    name = "esprima-1.2.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/esprima/-/esprima-1.1.1.tgz";
-        name = "esprima-1.1.1.tgz";
-        sha1 = "5b6f1547f4d102e670e140c509be6771d6aeb549";
+        url = "http://registry.npmjs.org/esprima/-/esprima-1.2.2.tgz";
+        name = "esprima-1.2.2.tgz";
+        sha1 = "76a0fd66fcfe154fd292667dc264019750b1657b";
       })
     ];
     buildInputs =
@@ -5657,6 +5348,23 @@
     self.by-version."esprima"."1.0.4";
   by-spec."esprima"."~1.1.1" =
     self.by-version."esprima"."1.1.1";
+  by-version."esprima"."1.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "esprima-1.1.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/esprima/-/esprima-1.1.1.tgz";
+        name = "esprima-1.1.1.tgz";
+        sha1 = "5b6f1547f4d102e670e140c509be6771d6aeb549";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."esprima" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "esprima" ];
+  };
   by-spec."esprima-fb"."3001.1.0-dev-harmony-fb" =
     self.by-version."esprima-fb"."3001.1.0-dev-harmony-fb";
   by-version."esprima-fb"."3001.1.0-dev-harmony-fb" = lib.makeOverridable self.buildNodePackage {
@@ -5676,32 +5384,8 @@
     ];
     passthru.names = [ "esprima-fb" ];
   };
-  by-spec."esprima-fb"."^3001.1.0-dev-harmony-fb" =
-    self.by-version."esprima-fb"."3001.1.0-dev-harmony-fb";
   by-spec."esprima-fb"."~3001.1.0-dev-harmony-fb" =
     self.by-version."esprima-fb"."3001.1.0-dev-harmony-fb";
-  by-spec."esrefactor"."~0.1.0" =
-    self.by-version."esrefactor"."0.1.0";
-  by-version."esrefactor"."0.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-esrefactor-0.1.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/esrefactor/-/esrefactor-0.1.0.tgz";
-        name = "esrefactor-0.1.0.tgz";
-        sha1 = "d142795a282339ab81e936b5b7a21b11bf197b13";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."esrefactor" or []);
-    deps = [
-      self.by-version."esprima"."1.0.4"
-      self.by-version."estraverse"."0.0.4"
-      self.by-version."escope"."0.0.16"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "esrefactor" ];
-  };
   by-spec."esshorten"."~ 0.0.2" =
     self.by-version."esshorten"."0.0.2";
   by-version."esshorten"."0.0.2" = lib.makeOverridable self.buildNodePackage {
@@ -5724,14 +5408,14 @@
     passthru.names = [ "esshorten" ];
   };
   by-spec."estraverse".">= 0.0.2" =
-    self.by-version."estraverse"."1.5.0";
-  by-version."estraverse"."1.5.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-estraverse-1.5.0";
+    self.by-version."estraverse"."1.5.1";
+  by-version."estraverse"."1.5.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-estraverse-1.5.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/estraverse/-/estraverse-1.5.0.tgz";
-        name = "estraverse-1.5.0.tgz";
-        sha1 = "248ec3f0d4bf39a940109c92a05ceb56d59e53ee";
+        url = "http://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz";
+        name = "estraverse-1.5.1.tgz";
+        sha1 = "867a3e8e58a9f84618afb6c2ddbcd916b7cbaf71";
       })
     ];
     buildInputs =
@@ -5780,29 +5464,10 @@
     ];
     passthru.names = [ "estraverse" ];
   };
-  by-spec."estraverse"."~0.0.4" =
-    self.by-version."estraverse"."0.0.4";
-  by-version."estraverse"."0.0.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-estraverse-0.0.4";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/estraverse/-/estraverse-0.0.4.tgz";
-        name = "estraverse-0.0.4.tgz";
-        sha1 = "01a0932dfee574684a598af5a67c3bf9b6428db2";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."estraverse" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "estraverse" ];
-  };
   by-spec."estraverse"."~1.3.0" =
     self.by-version."estraverse"."1.3.2";
   by-spec."estraverse"."~1.5.0" =
-    self.by-version."estraverse"."1.5.0";
+    self.by-version."estraverse"."1.5.1";
   by-spec."esutils"."~1.0.0" =
     self.by-version."esutils"."1.0.0";
   by-version."esutils"."1.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -5822,26 +5487,6 @@
     ];
     passthru.names = [ "esutils" ];
   };
-  by-spec."event-emitter"."~0.2.2" =
-    self.by-version."event-emitter"."0.2.2";
-  by-version."event-emitter"."0.2.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-event-emitter-0.2.2";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/event-emitter/-/event-emitter-0.2.2.tgz";
-        name = "event-emitter-0.2.2.tgz";
-        sha1 = "c81e3724eb55407c5a0d5ee3299411f700f54291";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."event-emitter" or []);
-    deps = [
-      self.by-version."es5-ext"."0.9.2"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "event-emitter" ];
-  };
   by-spec."event-stream"."~0.5" =
     self.by-version."event-stream"."0.5.3";
   by-version."event-stream"."0.5.3" = lib.makeOverridable self.buildNodePackage {
@@ -5882,14 +5527,14 @@
     passthru.names = [ "eventemitter2" ];
   };
   by-spec."eventemitter2"."~0.4.11" =
-    self.by-version."eventemitter2"."0.4.13";
-  by-version."eventemitter2"."0.4.13" = lib.makeOverridable self.buildNodePackage {
-    name = "node-eventemitter2-0.4.13";
+    self.by-version."eventemitter2"."0.4.14";
+  by-version."eventemitter2"."0.4.14" = lib.makeOverridable self.buildNodePackage {
+    name = "node-eventemitter2-0.4.14";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.13.tgz";
-        name = "eventemitter2-0.4.13.tgz";
-        sha1 = "0a8ab97f9c1b563361b8927f9e80606277509153";
+        url = "http://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz";
+        name = "eventemitter2-0.4.14.tgz";
+        sha1 = "8f61b75cde012b2e9eb284d4545583b5643b61ab";
       })
     ];
     buildInputs =
@@ -5901,16 +5546,35 @@
     passthru.names = [ "eventemitter2" ];
   };
   by-spec."eventemitter2"."~0.4.13" =
-    self.by-version."eventemitter2"."0.4.13";
-  by-spec."events"."~1.0.0" =
-    self.by-version."events"."1.0.0";
-  by-version."events"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-events-1.0.0";
+    self.by-version."eventemitter2"."0.4.14";
+  by-spec."eventemitter3"."*" =
+    self.by-version."eventemitter3"."0.1.4";
+  by-version."eventemitter3"."0.1.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-eventemitter3-0.1.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/events/-/events-1.0.0.tgz";
-        name = "events-1.0.0.tgz";
-        sha1 = "63c0f80c74d1435e8eb03b54306a9d8e8f6f9da0";
+        url = "http://registry.npmjs.org/eventemitter3/-/eventemitter3-0.1.4.tgz";
+        name = "eventemitter3-0.1.4.tgz";
+        sha1 = "da2be74b7a1a4760272e1390f975503be5cb7e24";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."eventemitter3" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "eventemitter3" ];
+  };
+  by-spec."events"."~1.0.0" =
+    self.by-version."events"."1.0.1";
+  by-version."events"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-events-1.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/events/-/events-1.0.1.tgz";
+        name = "events-1.0.1.tgz";
+        sha1 = "386f6471cbb609e7925e7bfe7468634b9e069ac2";
       })
     ];
     buildInputs =
@@ -5957,38 +5621,18 @@
       self.by-version."oauth"."0.9.11"
       self.by-version."request"."2.9.203"
       self.by-version."connect"."2.3.9"
-      self.by-version."openid"."0.5.8"
-      self.by-version."xml2js"."0.4.2"
+      self.by-version."openid"."0.5.9"
+      self.by-version."xml2js"."0.4.4"
       self.by-version."node-swt"."0.1.1"
       self.by-version."node-wsfederation"."0.1.1"
       self.by-version."debug"."0.5.0"
-      self.by-version."express"."3.5.1"
+      self.by-version."express"."3.16.7"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "everyauth" ];
   };
-  by-spec."execSync"."~1.0.0" =
-    self.by-version."execSync"."1.0.1-pre";
-  by-version."execSync"."1.0.1-pre" = lib.makeOverridable self.buildNodePackage {
-    name = "node-execSync-1.0.1-pre";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/execSync/-/execSync-1.0.1-pre.tgz";
-        name = "execSync-1.0.1-pre.tgz";
-        sha1 = "8fa8deb748eecdafe61feea49921bb9b7a410d1e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."execSync" or []);
-    deps = [
-      self.by-version."temp"."0.5.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "execSync" ];
-  };
-  by-spec."exit"."0.1.x" =
+  by-spec."exit"."0.1.2" =
     self.by-version."exit"."0.1.2";
   by-version."exit"."0.1.2" = lib.makeOverridable self.buildNodePackage {
     name = "node-exit-0.1.2";
@@ -6007,45 +5651,52 @@
     ];
     passthru.names = [ "exit" ];
   };
+  by-spec."exit"."0.1.x" =
+    self.by-version."exit"."0.1.2";
   by-spec."exit"."~0.1.1" =
     self.by-version."exit"."0.1.2";
   by-spec."express"."*" =
-    self.by-version."express"."4.0.0";
-  by-version."express"."4.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-express-4.0.0";
+    self.by-version."express"."4.8.5";
+  by-version."express"."4.8.5" = lib.makeOverridable self.buildNodePackage {
+    name = "node-express-4.8.5";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/express/-/express-4.0.0.tgz";
-        name = "express-4.0.0.tgz";
-        sha1 = "274dc82933c9f574cc38a0ce5ea8172be9c6b094";
+        url = "http://registry.npmjs.org/express/-/express-4.8.5.tgz";
+        name = "express-4.8.5.tgz";
+        sha1 = "59cf7666c29bf7cb8545a1acd43dd81a52cb26d9";
       })
     ];
     buildInputs =
       (self.nativeDeps."express" or []);
     deps = [
-      self.by-version."parseurl"."1.0.1"
-      self.by-version."accepts"."1.0.0"
-      self.by-version."type-is"."1.0.0"
+      self.by-version."accepts"."1.0.7"
+      self.by-version."buffer-crc32"."0.2.3"
+      self.by-version."debug"."1.0.4"
+      self.by-version."depd"."0.4.4"
+      self.by-version."escape-html"."1.0.1"
+      self.by-version."finalhandler"."0.1.0"
+      self.by-version."media-typer"."0.2.0"
+      self.by-version."methods"."1.1.0"
+      self.by-version."parseurl"."1.3.0"
+      self.by-version."path-to-regexp"."0.1.3"
+      self.by-version."proxy-addr"."1.0.1"
+      self.by-version."qs"."1.2.2"
       self.by-version."range-parser"."1.0.0"
-      self.by-version."cookie"."0.1.0"
-      self.by-version."buffer-crc32"."0.2.1"
+      self.by-version."send"."0.8.3"
+      self.by-version."serve-static"."1.5.3"
+      self.by-version."type-is"."1.3.2"
+      self.by-version."vary"."0.1.0"
+      self.by-version."cookie"."0.1.2"
       self.by-version."fresh"."0.2.2"
-      self.by-version."methods"."0.1.0"
-      self.by-version."send"."0.2.0"
-      self.by-version."cookie-signature"."1.0.3"
+      self.by-version."cookie-signature"."1.0.4"
       self.by-version."merge-descriptors"."0.0.2"
       self.by-version."utils-merge"."1.0.0"
-      self.by-version."escape-html"."1.0.1"
-      self.by-version."qs"."0.6.6"
-      self.by-version."serve-static"."1.0.1"
-      self.by-version."path-to-regexp"."0.1.2"
-      self.by-version."debug"."0.8.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "express" ];
   };
-  "express" = self.by-version."express"."4.0.0";
+  "express" = self.by-version."express"."4.8.5";
   by-spec."express"."2.5.11" =
     self.by-version."express"."2.5.11";
   by-version."express"."2.5.11" = lib.makeOverridable self.buildNodePackage {
@@ -6088,12 +5739,12 @@
       self.by-version."range-parser"."0.0.4"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."cookie"."0.0.5"
-      self.by-version."buffer-crc32"."0.2.1"
+      self.by-version."buffer-crc32"."0.2.3"
       self.by-version."fresh"."0.1.0"
       self.by-version."methods"."0.0.1"
       self.by-version."send"."0.1.0"
       self.by-version."cookie-signature"."1.0.1"
-      self.by-version."debug"."0.8.1"
+      self.by-version."debug"."1.0.4"
     ];
     peerDependencies = [
     ];
@@ -6123,45 +5774,52 @@
       self.by-version."methods"."0.1.0"
       self.by-version."send"."0.1.4"
       self.by-version."cookie-signature"."1.0.1"
-      self.by-version."debug"."0.8.1"
+      self.by-version."debug"."1.0.4"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "express" ];
   };
   by-spec."express"."3.x" =
-    self.by-version."express"."3.5.1";
-  by-version."express"."3.5.1" = lib.makeOverridable self.buildNodePackage {
-    name = "express-3.5.1";
+    self.by-version."express"."3.16.7";
+  by-version."express"."3.16.7" = lib.makeOverridable self.buildNodePackage {
+    name = "express-3.16.7";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/express/-/express-3.5.1.tgz";
-        name = "express-3.5.1.tgz";
-        sha1 = "4b333e1117faca336a538f4c724140b9ce1a87e7";
+        url = "http://registry.npmjs.org/express/-/express-3.16.7.tgz";
+        name = "express-3.16.7.tgz";
+        sha1 = "788aab5d66e85060211d6fea08eb2986f2f2631c";
       })
     ];
     buildInputs =
       (self.nativeDeps."express" or []);
     deps = [
-      self.by-version."connect"."2.14.1"
+      self.by-version."basic-auth"."1.0.0"
+      self.by-version."buffer-crc32"."0.2.3"
+      self.by-version."connect"."2.25.7"
       self.by-version."commander"."1.3.2"
+      self.by-version."debug"."1.0.4"
+      self.by-version."depd"."0.4.4"
+      self.by-version."escape-html"."1.0.1"
+      self.by-version."media-typer"."0.2.0"
+      self.by-version."methods"."1.1.0"
+      self.by-version."mkdirp"."0.5.0"
+      self.by-version."parseurl"."1.3.0"
+      self.by-version."proxy-addr"."1.0.1"
       self.by-version."range-parser"."1.0.0"
-      self.by-version."mkdirp"."0.3.5"
-      self.by-version."cookie"."0.1.1"
-      self.by-version."buffer-crc32"."0.2.1"
+      self.by-version."send"."0.8.3"
+      self.by-version."vary"."0.1.0"
+      self.by-version."cookie"."0.1.2"
       self.by-version."fresh"."0.2.2"
-      self.by-version."methods"."0.1.0"
-      self.by-version."send"."0.2.0"
-      self.by-version."cookie-signature"."1.0.3"
+      self.by-version."cookie-signature"."1.0.4"
       self.by-version."merge-descriptors"."0.0.2"
-      self.by-version."debug"."0.8.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "express" ];
   };
   by-spec."express".">=3.0.0" =
-    self.by-version."express"."4.0.0";
+    self.by-version."express"."4.8.5";
   by-spec."express"."~3.1.1" =
     self.by-version."express"."3.1.2";
   by-version."express"."3.1.2" = lib.makeOverridable self.buildNodePackage {
@@ -6181,30 +5839,100 @@
       self.by-version."range-parser"."0.0.4"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."cookie"."0.0.5"
-      self.by-version."buffer-crc32"."0.2.1"
+      self.by-version."buffer-crc32"."0.2.3"
       self.by-version."fresh"."0.1.0"
       self.by-version."methods"."0.0.1"
       self.by-version."send"."0.1.0"
       self.by-version."cookie-signature"."1.0.0"
+      self.by-version."debug"."1.0.4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "express" ];
+  };
+  by-spec."express"."~4.0" =
+    self.by-version."express"."4.0.0";
+  by-version."express"."4.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-express-4.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/express/-/express-4.0.0.tgz";
+        name = "express-4.0.0.tgz";
+        sha1 = "274dc82933c9f574cc38a0ce5ea8172be9c6b094";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."express" or []);
+    deps = [
+      self.by-version."parseurl"."1.0.1"
+      self.by-version."accepts"."1.0.0"
+      self.by-version."type-is"."1.0.0"
+      self.by-version."range-parser"."1.0.0"
+      self.by-version."cookie"."0.1.0"
+      self.by-version."buffer-crc32"."0.2.1"
+      self.by-version."fresh"."0.2.2"
+      self.by-version."methods"."0.1.0"
+      self.by-version."send"."0.2.0"
+      self.by-version."cookie-signature"."1.0.3"
+      self.by-version."merge-descriptors"."0.0.2"
+      self.by-version."utils-merge"."1.0.0"
+      self.by-version."escape-html"."1.0.1"
+      self.by-version."qs"."0.6.6"
+      self.by-version."serve-static"."1.0.1"
+      self.by-version."path-to-regexp"."0.1.2"
       self.by-version."debug"."0.8.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "express" ];
   };
-  by-spec."express"."~3.5" =
-    self.by-version."express"."3.5.1";
-  by-spec."express"."~4.0.0-rc4" =
-    self.by-version."express"."4.0.0";
-  by-spec."express-form"."*" =
-    self.by-version."express-form"."0.12.2";
-  by-version."express-form"."0.12.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-express-form-0.12.2";
+  by-spec."express"."~4.4.5" =
+    self.by-version."express"."4.4.5";
+  by-version."express"."4.4.5" = lib.makeOverridable self.buildNodePackage {
+    name = "node-express-4.4.5";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/express-form/-/express-form-0.12.2.tgz";
-        name = "express-form-0.12.2.tgz";
-        sha1 = "c23ed4f233df09a1c61bcc698b8e4089dda54c1a";
+        url = "http://registry.npmjs.org/express/-/express-4.4.5.tgz";
+        name = "express-4.4.5.tgz";
+        sha1 = "5f2f302f277187abd721c3a36e44d86c5e3f03eb";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."express" or []);
+    deps = [
+      self.by-version."accepts"."1.0.7"
+      self.by-version."buffer-crc32"."0.2.3"
+      self.by-version."debug"."1.0.2"
+      self.by-version."escape-html"."1.0.1"
+      self.by-version."methods"."1.0.1"
+      self.by-version."parseurl"."1.0.1"
+      self.by-version."proxy-addr"."1.0.1"
+      self.by-version."range-parser"."1.0.0"
+      self.by-version."send"."0.4.3"
+      self.by-version."serve-static"."1.2.3"
+      self.by-version."type-is"."1.2.1"
+      self.by-version."vary"."0.1.0"
+      self.by-version."cookie"."0.1.2"
+      self.by-version."fresh"."0.2.2"
+      self.by-version."cookie-signature"."1.0.4"
+      self.by-version."merge-descriptors"."0.0.2"
+      self.by-version."utils-merge"."1.0.0"
+      self.by-version."qs"."0.6.6"
+      self.by-version."path-to-regexp"."0.1.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "express" ];
+  };
+  by-spec."express-form"."*" =
+    self.by-version."express-form"."0.12.3";
+  by-version."express-form"."0.12.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-express-form-0.12.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/express-form/-/express-form-0.12.3.tgz";
+        name = "express-form-0.12.3.tgz";
+        sha1 = "e3d944b892b621524925837bee0d658f84833139";
       })
     ];
     buildInputs =
@@ -6212,14 +5940,14 @@
     deps = [
       self.by-version."validator"."0.4.28"
       self.by-version."object-additions"."0.5.1"
-      self.by-version."async"."0.2.10"
+      self.by-version."async"."0.7.0"
     ];
     peerDependencies = [
-      self.by-version."express"."4.0.0"
+      self.by-version."express"."4.8.5"
     ];
     passthru.names = [ "express-form" ];
   };
-  "express-form" = self.by-version."express-form"."0.12.2";
+  "express-form" = self.by-version."express-form"."0.12.3";
   by-spec."express-partials"."0.0.6" =
     self.by-version."express-partials"."0.0.6";
   by-version."express-partials"."0.0.6" = lib.makeOverridable self.buildNodePackage {
@@ -6239,76 +5967,82 @@
     ];
     passthru.names = [ "express-partials" ];
   };
-  by-spec."express-session"."1.0.2" =
-    self.by-version."express-session"."1.0.2";
-  by-version."express-session"."1.0.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-express-session-1.0.2";
+  by-spec."express-session"."~1.6.1" =
+    self.by-version."express-session"."1.6.5";
+  by-version."express-session"."1.6.5" = lib.makeOverridable self.buildNodePackage {
+    name = "node-express-session-1.6.5";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/express-session/-/express-session-1.0.2.tgz";
-        name = "express-session-1.0.2.tgz";
-        sha1 = "004478c742561774411ceb79733155a56b6d49eb";
+        url = "http://registry.npmjs.org/express-session/-/express-session-1.6.5.tgz";
+        name = "express-session-1.6.5.tgz";
+        sha1 = "c4ca7740025fe4561f88041157931071f91e957b";
       })
     ];
     buildInputs =
       (self.nativeDeps."express-session" or []);
     deps = [
-      self.by-version."utils-merge"."1.0.0"
-      self.by-version."cookie"."0.1.0"
-      self.by-version."cookie-signature"."1.0.3"
-      self.by-version."uid2"."0.0.3"
-      self.by-version."buffer-crc32"."0.2.1"
-      self.by-version."debug"."0.7.4"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "express-session" ];
-  };
-  by-spec."express-session"."~1.0.2" =
-    self.by-version."express-session"."1.0.3";
-  by-version."express-session"."1.0.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-express-session-1.0.3";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/express-session/-/express-session-1.0.3.tgz";
-        name = "express-session-1.0.3.tgz";
-        sha1 = "a45ec65dda263f74f3b5b9c6da0ac74c36ac0639";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."express-session" or []);
-    deps = [
-      self.by-version."utils-merge"."1.0.0"
+      self.by-version."buffer-crc32"."0.2.3"
       self.by-version."cookie"."0.1.2"
-      self.by-version."cookie-signature"."1.0.3"
-      self.by-version."uid2"."0.0.3"
-      self.by-version."buffer-crc32"."0.2.1"
-      self.by-version."debug"."0.7.4"
+      self.by-version."cookie-signature"."1.0.4"
+      self.by-version."debug"."1.0.3"
+      self.by-version."depd"."0.3.0"
+      self.by-version."on-headers"."0.0.0"
+      self.by-version."uid-safe"."1.0.1"
+      self.by-version."utils-merge"."1.0.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "express-session" ];
   };
-  by-spec."ext-list"."^0.1.0" =
-    self.by-version."ext-list"."0.1.0";
-  by-version."ext-list"."0.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-ext-list-0.1.0";
+  by-spec."express-session"."~1.7.6" =
+    self.by-version."express-session"."1.7.6";
+  by-version."express-session"."1.7.6" = lib.makeOverridable self.buildNodePackage {
+    name = "node-express-session-1.7.6";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/ext-list/-/ext-list-0.1.0.tgz";
-        name = "ext-list-0.1.0.tgz";
-        sha1 = "a266915887ed6b87056eeb76b8c29e61d84ebc39";
+        url = "http://registry.npmjs.org/express-session/-/express-session-1.7.6.tgz";
+        name = "express-session-1.7.6.tgz";
+        sha1 = "e1c369ba2176f7afdb79e77d65dcd8c7c46e48a5";
       })
     ];
     buildInputs =
-      (self.nativeDeps."ext-list" or []);
+      (self.nativeDeps."express-session" or []);
     deps = [
+      self.by-version."buffer-crc32"."0.2.3"
+      self.by-version."cookie"."0.1.2"
+      self.by-version."cookie-signature"."1.0.4"
+      self.by-version."debug"."1.0.4"
+      self.by-version."depd"."0.4.4"
+      self.by-version."on-headers"."1.0.0"
+      self.by-version."parseurl"."1.3.0"
+      self.by-version."uid-safe"."1.0.1"
+      self.by-version."utils-merge"."1.0.0"
     ];
     peerDependencies = [
     ];
-    passthru.names = [ "ext-list" ];
+    passthru.names = [ "express-session" ];
   };
   by-spec."extend"."*" =
+    self.by-version."extend"."1.3.0";
+  by-version."extend"."1.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-extend-1.3.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/extend/-/extend-1.3.0.tgz";
+        name = "extend-1.3.0.tgz";
+        sha1 = "d1516fb0ff5624d2ebf9123ea1dac5a1994004f8";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."extend" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "extend" ];
+  };
+  "extend" = self.by-version."extend"."1.3.0";
+  by-spec."extend"."~1.2.1" =
     self.by-version."extend"."1.2.1";
   by-version."extend"."1.2.1" = lib.makeOverridable self.buildNodePackage {
     name = "node-extend-1.2.1";
@@ -6327,31 +6061,6 @@
     ];
     passthru.names = [ "extend" ];
   };
-  "extend" = self.by-version."extend"."1.2.1";
-  by-spec."extend"."~1.2.1" =
-    self.by-version."extend"."1.2.1";
-  by-spec."extname"."^0.1.1" =
-    self.by-version."extname"."0.1.2";
-  by-version."extname"."0.1.2" = lib.makeOverridable self.buildNodePackage {
-    name = "extname-0.1.2";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/extname/-/extname-0.1.2.tgz";
-        name = "extname-0.1.2.tgz";
-        sha1 = "de821aa0f01449d4b4043d4aeefa89a456bf3239";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."extname" or []);
-    deps = [
-      self.by-version."ext-list"."0.1.0"
-      self.by-version."map-key"."0.1.1"
-      self.by-version."underscore.string"."2.3.3"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "extname" ];
-  };
   by-spec."extract-opts"."~2.2.0" =
     self.by-version."extract-opts"."2.2.0";
   by-version."extract-opts"."2.2.0" = lib.makeOverridable self.buildNodePackage {
@@ -6445,59 +6154,15 @@
     buildInputs =
       (self.nativeDeps."faye-websocket" or []);
     deps = [
-      self.by-version."websocket-driver"."0.3.2"
+      self.by-version."websocket-driver"."0.3.5"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "faye-websocket" ];
   };
   "faye-websocket" = self.by-version."faye-websocket"."0.7.2";
-  by-spec."faye-websocket"."0.7.0" =
-    self.by-version."faye-websocket"."0.7.0";
-  by-version."faye-websocket"."0.7.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-faye-websocket-0.7.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.7.0.tgz";
-        name = "faye-websocket-0.7.0.tgz";
-        sha1 = "c16c50ec0d483357a8eafd1ec6fcc313d027f5be";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."faye-websocket" or []);
-    deps = [
-      self.by-version."websocket-driver"."0.3.2"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "faye-websocket" ];
-  };
-  by-spec."fetch-bower"."*" =
-    self.by-version."fetch-bower"."2.0.0";
-  by-version."fetch-bower"."2.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "fetch-bower-2.0.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/fetch-bower/-/fetch-bower-2.0.0.tgz";
-        name = "fetch-bower-2.0.0.tgz";
-        sha1 = "c027feb75a512001d1287bbfb3ffaafba67eb92f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."fetch-bower" or []);
-    deps = [
-      self.by-version."bower-endpoint-parser"."0.2.1"
-      self.by-version."bower-logger"."0.2.1"
-      self.by-version."bower"."1.3.2"
-      self.by-version."glob"."3.2.9"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "fetch-bower" ];
-  };
-  "fetch-bower" = self.by-version."fetch-bower"."2.0.0";
-  by-spec."fetch-bower".">=2 <3" =
-    self.by-version."fetch-bower"."2.0.0";
+  by-spec."faye-websocket"."0.7.2" =
+    self.by-version."faye-websocket"."0.7.2";
   by-spec."fields"."~0.1.11" =
     self.by-version."fields"."0.1.12";
   by-version."fields"."0.1.12" = lib.makeOverridable self.buildNodePackage {
@@ -6514,40 +6179,57 @@
     deps = [
       self.by-version."colors"."0.6.2"
       self.by-version."keypress"."0.1.0"
-      self.by-version."sprintf"."0.1.3"
+      self.by-version."sprintf"."0.1.4"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "fields" ];
   };
-  by-spec."file-utils"."~0.1.1" =
-    self.by-version."file-utils"."0.1.5";
-  by-version."file-utils"."0.1.5" = lib.makeOverridable self.buildNodePackage {
-    name = "node-file-utils-0.1.5";
+  by-spec."figures"."^1.0.1" =
+    self.by-version."figures"."1.3.2";
+  by-version."figures"."1.3.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-figures-1.3.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/file-utils/-/file-utils-0.1.5.tgz";
-        name = "file-utils-0.1.5.tgz";
-        sha1 = "dc8153c855387cb4dacb0a1725531fa444a6b48c";
+        url = "http://registry.npmjs.org/figures/-/figures-1.3.2.tgz";
+        name = "figures-1.3.2.tgz";
+        sha1 = "3ea3915639485d960acff99810086c161db82051";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."figures" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "figures" ];
+  };
+  by-spec."file-utils"."~0.2.0" =
+    self.by-version."file-utils"."0.2.0";
+  by-version."file-utils"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-file-utils-0.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/file-utils/-/file-utils-0.2.0.tgz";
+        name = "file-utils-0.2.0.tgz";
+        sha1 = "0372c89b19bd96fc9a02a180c91fad29e4dbacaa";
       })
     ];
     buildInputs =
       (self.nativeDeps."file-utils" or []);
     deps = [
-      self.by-version."lodash"."2.1.0"
+      self.by-version."lodash"."2.4.1"
       self.by-version."iconv-lite"."0.2.11"
-      self.by-version."rimraf"."2.2.6"
-      self.by-version."glob"."3.2.9"
+      self.by-version."rimraf"."2.2.8"
+      self.by-version."glob"."3.2.11"
       self.by-version."minimatch"."0.2.14"
       self.by-version."findup-sync"."0.1.3"
-      self.by-version."isbinaryfile"."0.1.9"
+      self.by-version."isbinaryfile"."2.0.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "file-utils" ];
   };
-  by-spec."file-utils"."~0.1.5" =
-    self.by-version."file-utils"."0.1.5";
   by-spec."fileset"."0.1.x" =
     self.by-version."fileset"."0.1.5";
   by-version."fileset"."0.1.5" = lib.makeOverridable self.buildNodePackage {
@@ -6562,22 +6244,43 @@
     buildInputs =
       (self.nativeDeps."fileset" or []);
     deps = [
-      self.by-version."minimatch"."0.2.14"
-      self.by-version."glob"."3.2.9"
+      self.by-version."minimatch"."0.4.0"
+      self.by-version."glob"."3.2.11"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "fileset" ];
   };
-  by-spec."findit".">=1.1.0 <2.0.0" =
-    self.by-version."findit"."1.1.1";
-  by-version."findit"."1.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-findit-1.1.1";
+  by-spec."finalhandler"."0.1.0" =
+    self.by-version."finalhandler"."0.1.0";
+  by-version."finalhandler"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-finalhandler-0.1.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/findit/-/findit-1.1.1.tgz";
-        name = "findit-1.1.1.tgz";
-        sha1 = "b460e2f7633d78ed2c217c77c4209ecacaf8262a";
+        url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.1.0.tgz";
+        name = "finalhandler-0.1.0.tgz";
+        sha1 = "da05bbc4f5f4a30c84ce1d91f3c154007c4e9daa";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."finalhandler" or []);
+    deps = [
+      self.by-version."debug"."1.0.4"
+      self.by-version."escape-html"."1.0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "finalhandler" ];
+  };
+  by-spec."findit".">=1.1.0 <2.0.0" =
+    self.by-version."findit"."1.2.0";
+  by-version."findit"."1.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-findit-1.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/findit/-/findit-1.2.0.tgz";
+        name = "findit-1.2.0.tgz";
+        sha1 = "f571a3a840749ae8b0cbf4bf43ced7659eec3ce8";
       })
     ];
     buildInputs =
@@ -6588,27 +6291,6 @@
     ];
     passthru.names = [ "findit" ];
   };
-  by-spec."findup"."~0.1.3" =
-    self.by-version."findup"."0.1.5";
-  by-version."findup"."0.1.5" = lib.makeOverridable self.buildNodePackage {
-    name = "findup-0.1.5";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/findup/-/findup-0.1.5.tgz";
-        name = "findup-0.1.5.tgz";
-        sha1 = "8ad929a3393bac627957a7e5de4623b06b0e2ceb";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."findup" or []);
-    deps = [
-      self.by-version."colors"."0.6.2"
-      self.by-version."commander"."2.1.0"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "findup" ];
-  };
   by-spec."findup-sync"."~0.1.0" =
     self.by-version."findup-sync"."0.1.3";
   by-version."findup-sync"."0.1.3" = lib.makeOverridable self.buildNodePackage {
@@ -6623,7 +6305,7 @@
     buildInputs =
       (self.nativeDeps."findup-sync" or []);
     deps = [
-      self.by-version."glob"."3.2.9"
+      self.by-version."glob"."3.2.11"
       self.by-version."lodash"."2.4.1"
     ];
     peerDependencies = [
@@ -6632,6 +6314,47 @@
   };
   by-spec."findup-sync"."~0.1.2" =
     self.by-version."findup-sync"."0.1.3";
+  by-spec."finished"."1.2.2" =
+    self.by-version."finished"."1.2.2";
+  by-version."finished"."1.2.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-finished-1.2.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/finished/-/finished-1.2.2.tgz";
+        name = "finished-1.2.2.tgz";
+        sha1 = "41608eafadfd65683b46a1220bc4b1ec3daedcd8";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."finished" or []);
+    deps = [
+      self.by-version."ee-first"."1.0.3"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "finished" ];
+  };
+  by-spec."finished"."~1.2.0" =
+    self.by-version."finished"."1.2.2";
+  by-spec."first-chunk-stream"."^0.1.0" =
+    self.by-version."first-chunk-stream"."0.1.0";
+  by-version."first-chunk-stream"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-first-chunk-stream-0.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-0.1.0.tgz";
+        name = "first-chunk-stream-0.1.0.tgz";
+        sha1 = "755d3ec14d49a86e3d2fcc08beead5c0ca2b9c0a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."first-chunk-stream" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "first-chunk-stream" ];
+  };
   by-spec."flatiron"."*" =
     self.by-version."flatiron"."0.3.11";
   by-version."flatiron"."0.3.11" = lib.makeOverridable self.buildNodePackage {
@@ -6698,15 +6421,34 @@
     ];
     passthru.names = [ "forEachAsync" ];
   };
-  by-spec."forever"."*" =
-    self.by-version."forever"."0.11.0";
-  by-version."forever"."0.11.0" = lib.makeOverridable self.buildNodePackage {
-    name = "forever-0.11.0";
+  by-spec."foreachasync"."3.x" =
+    self.by-version."foreachasync"."3.0.0";
+  by-version."foreachasync"."3.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-foreachasync-3.0.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/forever/-/forever-0.11.0.tgz";
-        name = "forever-0.11.0.tgz";
-        sha1 = "97de678915c64dacce2ccbfb94620723b308d44f";
+        url = "http://registry.npmjs.org/foreachasync/-/foreachasync-3.0.0.tgz";
+        name = "foreachasync-3.0.0.tgz";
+        sha1 = "5502987dc8714be3392097f32e0071c9dee07cf6";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."foreachasync" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "foreachasync" ];
+  };
+  by-spec."forever"."*" =
+    self.by-version."forever"."0.11.1";
+  by-version."forever"."0.11.1" = lib.makeOverridable self.buildNodePackage {
+    name = "forever-0.11.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/forever/-/forever-0.11.1.tgz";
+        name = "forever-0.11.1.tgz";
+        sha1 = "50ac8744c0a6e0c266524c4746397f74d6b09c5b";
       })
     ];
     buildInputs =
@@ -6729,7 +6471,7 @@
     ];
     passthru.names = [ "forever" ];
   };
-  "forever" = self.by-version."forever"."0.11.0";
+  "forever" = self.by-version."forever"."0.11.1";
   by-spec."forever-agent"."~0.2.0" =
     self.by-version."forever-agent"."0.2.0";
   by-version."forever-agent"."0.2.0" = lib.makeOverridable self.buildNodePackage {
@@ -6769,14 +6511,14 @@
     passthru.names = [ "forever-agent" ];
   };
   by-spec."forever-monitor"."*" =
-    self.by-version."forever-monitor"."1.2.3";
-  by-version."forever-monitor"."1.2.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-forever-monitor-1.2.3";
+    self.by-version."forever-monitor"."1.3.0";
+  by-version."forever-monitor"."1.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-forever-monitor-1.3.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/forever-monitor/-/forever-monitor-1.2.3.tgz";
-        name = "forever-monitor-1.2.3.tgz";
-        sha1 = "b27ac3acb6fdcc7315d6cd85830f2d004733028b";
+        url = "http://registry.npmjs.org/forever-monitor/-/forever-monitor-1.3.0.tgz";
+        name = "forever-monitor-1.3.0.tgz";
+        sha1 = "57e883da03ec0eb690ad4259afbccf22f609d52e";
       })
     ];
     buildInputs =
@@ -6793,7 +6535,7 @@
     ];
     passthru.names = [ "forever-monitor" ];
   };
-  "forever-monitor" = self.by-version."forever-monitor"."1.2.3";
+  "forever-monitor" = self.by-version."forever-monitor"."1.3.0";
   by-spec."forever-monitor"."1.1.0" =
     self.by-version."forever-monitor"."1.1.0";
   by-version."forever-monitor"."1.1.0" = lib.makeOverridable self.buildNodePackage {
@@ -6821,6 +6563,73 @@
   };
   by-spec."forever-monitor"."1.2.3" =
     self.by-version."forever-monitor"."1.2.3";
+  by-version."forever-monitor"."1.2.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-forever-monitor-1.2.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/forever-monitor/-/forever-monitor-1.2.3.tgz";
+        name = "forever-monitor-1.2.3.tgz";
+        sha1 = "b27ac3acb6fdcc7315d6cd85830f2d004733028b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."forever-monitor" or []);
+    deps = [
+      self.by-version."broadway"."0.2.9"
+      self.by-version."minimatch"."0.2.14"
+      self.by-version."pkginfo"."0.3.0"
+      self.by-version."ps-tree"."0.0.3"
+      self.by-version."watch"."0.5.1"
+      self.by-version."utile"."0.1.7"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "forever-monitor" ];
+  };
+  by-spec."form-data"."0.1.2" =
+    self.by-version."form-data"."0.1.2";
+  by-version."form-data"."0.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-form-data-0.1.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/form-data/-/form-data-0.1.2.tgz";
+        name = "form-data-0.1.2.tgz";
+        sha1 = "1143c21357911a78dd7913b189b4bab5d5d57445";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."form-data" or []);
+    deps = [
+      self.by-version."combined-stream"."0.0.5"
+      self.by-version."mime"."1.2.11"
+      self.by-version."async"."0.2.10"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "form-data" ];
+  };
+  by-spec."form-data"."0.1.3" =
+    self.by-version."form-data"."0.1.3";
+  by-version."form-data"."0.1.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-form-data-0.1.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/form-data/-/form-data-0.1.3.tgz";
+        name = "form-data-0.1.3.tgz";
+        sha1 = "4ee4346e6eb5362e8344a02075bd8dbd8c7373ea";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."form-data" or []);
+    deps = [
+      self.by-version."combined-stream"."0.0.5"
+      self.by-version."mime"."1.2.11"
+      self.by-version."async"."0.9.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "form-data" ];
+  };
   by-spec."form-data"."~0.0.3" =
     self.by-version."form-data"."0.0.10";
   by-version."form-data"."0.0.10" = lib.makeOverridable self.buildNodePackage {
@@ -6835,7 +6644,7 @@
     buildInputs =
       (self.nativeDeps."form-data" or []);
     deps = [
-      self.by-version."combined-stream"."0.0.4"
+      self.by-version."combined-stream"."0.0.5"
       self.by-version."mime"."1.2.11"
       self.by-version."async"."0.2.10"
     ];
@@ -6844,22 +6653,22 @@
     passthru.names = [ "form-data" ];
   };
   by-spec."form-data"."~0.1.0" =
-    self.by-version."form-data"."0.1.2";
-  by-version."form-data"."0.1.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-form-data-0.1.2";
+    self.by-version."form-data"."0.1.4";
+  by-version."form-data"."0.1.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-form-data-0.1.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/form-data/-/form-data-0.1.2.tgz";
-        name = "form-data-0.1.2.tgz";
-        sha1 = "1143c21357911a78dd7913b189b4bab5d5d57445";
+        url = "http://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz";
+        name = "form-data-0.1.4.tgz";
+        sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12";
       })
     ];
     buildInputs =
       (self.nativeDeps."form-data" or []);
     deps = [
-      self.by-version."combined-stream"."0.0.4"
+      self.by-version."combined-stream"."0.0.5"
       self.by-version."mime"."1.2.11"
-      self.by-version."async"."0.2.10"
+      self.by-version."async"."0.9.0"
     ];
     peerDependencies = [
     ];
@@ -6962,7 +6771,24 @@
     passthru.names = [ "formidable" ];
   };
   by-spec."formidable"."1.0.x" =
-    self.by-version."formidable"."1.0.14";
+    self.by-version."formidable"."1.0.15";
+  by-version."formidable"."1.0.15" = lib.makeOverridable self.buildNodePackage {
+    name = "node-formidable-1.0.15";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/formidable/-/formidable-1.0.15.tgz";
+        name = "formidable-1.0.15.tgz";
+        sha1 = "91363d59cc51ddca2be84ca0336ec0135606c155";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."formidable" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "formidable" ];
+  };
   by-spec."fresh"."0.1.0" =
     self.by-version."fresh"."0.1.0";
   by-version."fresh"."0.1.0" = lib.makeOverridable self.buildNodePackage {
@@ -7039,12 +6865,33 @@
       self.by-version."ncp"."0.4.2"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."jsonfile"."1.0.1"
-      self.by-version."rimraf"."2.2.6"
+      self.by-version."rimraf"."2.2.8"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "fs-extra" ];
   };
+  by-spec."fs-vacuum"."~1.2.1" =
+    self.by-version."fs-vacuum"."1.2.1";
+  by-version."fs-vacuum"."1.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-fs-vacuum-1.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/fs-vacuum/-/fs-vacuum-1.2.1.tgz";
+        name = "fs-vacuum-1.2.1.tgz";
+        sha1 = "1bc3c62da30d6272569b8b9089c9811abb0a600b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."fs-vacuum" or []);
+    deps = [
+      self.by-version."graceful-fs"."3.0.2"
+      self.by-version."rimraf"."2.2.8"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "fs-vacuum" ];
+  };
   by-spec."fs-walk"."*" =
     self.by-version."fs-walk"."0.0.1";
   by-version."fs-walk"."0.0.1" = lib.makeOverridable self.buildNodePackage {
@@ -7059,7 +6906,7 @@
     buildInputs =
       (self.nativeDeps."fs-walk" or []);
     deps = [
-      self.by-version."async"."0.7.0"
+      self.by-version."async"."0.9.0"
     ];
     peerDependencies = [
     ];
@@ -7088,17 +6935,15 @@
     ];
     passthru.names = [ "fs.extra" ];
   };
-  by-spec."fs.extra".">=1.2.1 <2" =
-    self.by-version."fs.extra"."1.2.1";
-  by-spec."fsevents"."0.2.0" =
-    self.by-version."fsevents"."0.2.0";
-  by-version."fsevents"."0.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-fsevents-0.2.0";
+  by-spec."fsevents"."pipobscure/fsevents#7dcdf9fa3f8956610fd6f69f72c67bace2de7138" =
+    self.by-version."fsevents"."0.2.1";
+  by-version."fsevents"."0.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-fsevents-0.2.1";
     src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/fsevents/-/fsevents-0.2.0.tgz";
-        name = "fsevents-0.2.0.tgz";
-        sha1 = "1de161da042818f45bfbe11a853da8e5c6ca5d83";
+      (fetchgit {
+        url = "git://github.com/pipobscure/fsevents.git";
+        rev = "7dcdf9fa3f8956610fd6f69f72c67bace2de7138";
+        sha256 = "cc89ed7e31ee7e387326c4f9a3668306bdb98ff9cbaff9d7f29e258e56584bfb";
       })
     ];
     buildInputs =
@@ -7111,210 +6956,121 @@
     passthru.names = [ "fsevents" ];
   };
   by-spec."fstream"."0" =
-    self.by-version."fstream"."0.1.25";
-  by-version."fstream"."0.1.25" = lib.makeOverridable self.buildNodePackage {
-    name = "node-fstream-0.1.25";
+    self.by-version."fstream"."0.1.31";
+  by-version."fstream"."0.1.31" = lib.makeOverridable self.buildNodePackage {
+    name = "node-fstream-0.1.31";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/fstream/-/fstream-0.1.25.tgz";
-        name = "fstream-0.1.25.tgz";
-        sha1 = "deef2db7c7898357c2b37202212a9e5b36abc732";
+        url = "http://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz";
+        name = "fstream-0.1.31.tgz";
+        sha1 = "7337f058fbbbbefa8c9f561a28cab0849202c988";
       })
     ];
     buildInputs =
       (self.nativeDeps."fstream" or []);
     deps = [
-      self.by-version."rimraf"."2.2.6"
-      self.by-version."mkdirp"."0.3.5"
-      self.by-version."graceful-fs"."2.0.3"
+      self.by-version."graceful-fs"."3.0.2"
       self.by-version."inherits"."2.0.1"
+      self.by-version."mkdirp"."0.5.0"
+      self.by-version."rimraf"."2.2.8"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "fstream" ];
   };
-  by-spec."fstream"."~0.1.17" =
-    self.by-version."fstream"."0.1.25";
-  by-spec."fstream"."~0.1.22" =
-    self.by-version."fstream"."0.1.25";
-  by-spec."fstream"."~0.1.25" =
-    self.by-version."fstream"."0.1.25";
-  by-spec."fstream"."~0.1.8" =
-    self.by-version."fstream"."0.1.25";
-  by-spec."fstream-ignore"."~0.0.5" =
-    self.by-version."fstream-ignore"."0.0.7";
-  by-version."fstream-ignore"."0.0.7" = lib.makeOverridable self.buildNodePackage {
-    name = "node-fstream-ignore-0.0.7";
+  by-spec."fstream"."^1.0.0" =
+    self.by-version."fstream"."1.0.2";
+  by-version."fstream"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-fstream-1.0.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/fstream-ignore/-/fstream-ignore-0.0.7.tgz";
-        name = "fstream-ignore-0.0.7.tgz";
-        sha1 = "eea3033f0c3728139de7b57ab1b0d6d89c353c63";
+        url = "http://registry.npmjs.org/fstream/-/fstream-1.0.2.tgz";
+        name = "fstream-1.0.2.tgz";
+        sha1 = "56930ff1b4d4d7b1a689c8656b3a11e744ab92c6";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."fstream" or []);
+    deps = [
+      self.by-version."graceful-fs"."3.0.2"
+      self.by-version."inherits"."2.0.1"
+      self.by-version."mkdirp"."0.5.0"
+      self.by-version."rimraf"."2.2.8"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "fstream" ];
+  };
+  by-spec."fstream"."^1.0.2" =
+    self.by-version."fstream"."1.0.2";
+  by-spec."fstream"."~0.1.28" =
+    self.by-version."fstream"."0.1.31";
+  by-spec."fstream"."~0.1.29" =
+    self.by-version."fstream"."0.1.31";
+  by-spec."fstream"."~0.1.8" =
+    self.by-version."fstream"."0.1.31";
+  by-spec."fstream-ignore"."^1.0.0" =
+    self.by-version."fstream-ignore"."1.0.1";
+  by-version."fstream-ignore"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-fstream-ignore-1.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.1.tgz";
+        name = "fstream-ignore-1.0.1.tgz";
+        sha1 = "153df36c4fa2cb006fb915dc71ac9d75f6a17c82";
       })
     ];
     buildInputs =
       (self.nativeDeps."fstream-ignore" or []);
     deps = [
-      self.by-version."minimatch"."0.2.14"
-      self.by-version."fstream"."0.1.25"
+      self.by-version."fstream"."1.0.2"
       self.by-version."inherits"."2.0.1"
+      self.by-version."minimatch"."1.0.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "fstream-ignore" ];
   };
-  by-spec."fstream-ignore"."~0.0.6" =
-    self.by-version."fstream-ignore"."0.0.7";
-  by-spec."fstream-npm"."~0.1.6" =
-    self.by-version."fstream-npm"."0.1.6";
-  by-version."fstream-npm"."0.1.6" = lib.makeOverridable self.buildNodePackage {
-    name = "node-fstream-npm-0.1.6";
+  by-spec."fstream-npm"."~0.1.7" =
+    self.by-version."fstream-npm"."0.1.8";
+  by-version."fstream-npm"."0.1.8" = lib.makeOverridable self.buildNodePackage {
+    name = "node-fstream-npm-0.1.8";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/fstream-npm/-/fstream-npm-0.1.6.tgz";
-        name = "fstream-npm-0.1.6.tgz";
-        sha1 = "1369323075d9bd85cfcc9409f33f0d6fe5be104d";
+        url = "http://registry.npmjs.org/fstream-npm/-/fstream-npm-0.1.8.tgz";
+        name = "fstream-npm-0.1.8.tgz";
+        sha1 = "38a70fdeb510a443e1a5378d90413403fc724fa8";
       })
     ];
     buildInputs =
       (self.nativeDeps."fstream-npm" or []);
     deps = [
-      self.by-version."fstream-ignore"."0.0.7"
+      self.by-version."fstream-ignore"."1.0.1"
       self.by-version."inherits"."2.0.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "fstream-npm" ];
   };
-  by-spec."generator-angular"."*" =
-    self.by-version."generator-angular"."0.8.0";
-  by-version."generator-angular"."0.8.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-generator-angular-0.8.0";
+  by-spec."gaze"."^0.5.1" =
+    self.by-version."gaze"."0.5.1";
+  by-version."gaze"."0.5.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-gaze-0.5.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/generator-angular/-/generator-angular-0.8.0.tgz";
-        name = "generator-angular-0.8.0.tgz";
-        sha1 = "c2115b1a7a304b884b7f8857cade77dc36b63d13";
+        url = "http://registry.npmjs.org/gaze/-/gaze-0.5.1.tgz";
+        name = "gaze-0.5.1.tgz";
+        sha1 = "22e731078ef3e49d1c4ab1115ac091192051824c";
       })
     ];
     buildInputs =
-      (self.nativeDeps."generator-angular" or []);
-    deps = [
-      self.by-version."chalk"."0.4.0"
-      self.by-version."wiredep"."1.0.0"
-      self.by-version."yeoman-generator"."0.16.0"
-    ];
-    peerDependencies = [
-      self.by-version."generator-karma"."0.7.0"
-      self.by-version."yo"."1.1.2"
-    ];
-    passthru.names = [ "generator-angular" ];
-  };
-  "generator-angular" = self.by-version."generator-angular"."0.8.0";
-  by-spec."generator-karma".">=0.6.0" =
-    self.by-version."generator-karma"."0.7.0";
-  by-version."generator-karma"."0.7.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-generator-karma-0.7.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/generator-karma/-/generator-karma-0.7.0.tgz";
-        name = "generator-karma-0.7.0.tgz";
-        sha1 = "aaa2b6d8905b687343fe6a10b15279afd984048d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."generator-karma" or []);
-    deps = [
-      self.by-version."yeoman-generator"."0.16.0"
-    ];
-    peerDependencies = [
-      self.by-version."yo"."1.1.2"
-    ];
-    passthru.names = [ "generator-karma" ];
-  };
-  by-spec."generator-mocha".">=0.1.0" =
-    self.by-version."generator-mocha"."0.1.3";
-  by-version."generator-mocha"."0.1.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-generator-mocha-0.1.3";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/generator-mocha/-/generator-mocha-0.1.3.tgz";
-        name = "generator-mocha-0.1.3.tgz";
-        sha1 = "d54977bc0839b30c9b15fdd900e0ecd42afe14c8";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."generator-mocha" or []);
-    deps = [
-      self.by-version."yeoman-generator"."0.14.2"
-    ];
-    peerDependencies = [
-      self.by-version."yo"."1.1.2"
-    ];
-    passthru.names = [ "generator-mocha" ];
-  };
-  by-spec."generator-webapp"."*" =
-    self.by-version."generator-webapp"."0.4.9";
-  by-version."generator-webapp"."0.4.9" = lib.makeOverridable self.buildNodePackage {
-    name = "node-generator-webapp-0.4.9";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/generator-webapp/-/generator-webapp-0.4.9.tgz";
-        name = "generator-webapp-0.4.9.tgz";
-        sha1 = "df8aa10af9bac7fd59f4072b9cdf0f120e8bb611";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."generator-webapp" or []);
-    deps = [
-      self.by-version."yeoman-generator"."0.16.0"
-      self.by-version."cheerio"."0.13.1"
-      self.by-version."chalk"."0.4.0"
-    ];
-    peerDependencies = [
-      self.by-version."yo"."1.1.2"
-      self.by-version."generator-mocha"."0.1.3"
-    ];
-    passthru.names = [ "generator-webapp" ];
-  };
-  "generator-webapp" = self.by-version."generator-webapp"."0.4.9";
-  by-spec."get-stdin"."^0.1.0" =
-    self.by-version."get-stdin"."0.1.0";
-  by-version."get-stdin"."0.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-get-stdin-0.1.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/get-stdin/-/get-stdin-0.1.0.tgz";
-        name = "get-stdin-0.1.0.tgz";
-        sha1 = "5998af24aafc802d15c82c685657eeb8b10d4a91";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."get-stdin" or []);
+      (self.nativeDeps."gaze" or []);
     deps = [
+      self.by-version."globule"."0.1.0"
     ];
     peerDependencies = [
     ];
-    passthru.names = [ "get-stdin" ];
-  };
-  by-spec."get-urls"."^0.1.1" =
-    self.by-version."get-urls"."0.1.1";
-  by-version."get-urls"."0.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "get-urls-0.1.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/get-urls/-/get-urls-0.1.1.tgz";
-        name = "get-urls-0.1.1.tgz";
-        sha1 = "f94aa79c9e5d99cb843e44c5f67e24954e08fb59";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."get-urls" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "get-urls" ];
+    passthru.names = [ "gaze" ];
   };
   by-spec."getmac"."~1.0.6" =
     self.by-version."getmac"."1.0.6";
@@ -7355,80 +7111,26 @@
     ];
     passthru.names = [ "getobject" ];
   };
-  by-spec."gh"."*" =
-    self.by-version."gh"."1.9.1";
-  by-version."gh"."1.9.1" = lib.makeOverridable self.buildNodePackage {
-    name = "gh-1.9.1";
+  by-spec."github-url-from-git"."^1.3.0" =
+    self.by-version."github-url-from-git"."1.3.0";
+  by-version."github-url-from-git"."1.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-github-url-from-git-1.3.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/gh/-/gh-1.9.1.tgz";
-        name = "gh-1.9.1.tgz";
-        sha1 = "1862071cddc13cfd31545c64256ab731bb334194";
+        url = "http://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.3.0.tgz";
+        name = "github-url-from-git-1.3.0.tgz";
+        sha1 = "6e79d9779632ca78aa645c67bb419f70e51d69f7";
       })
     ];
     buildInputs =
-      (self.nativeDeps."gh" or []);
-    deps = [
-      self.by-version."async"."0.2.10"
-      self.by-version."cli-color"."0.2.3"
-      self.by-version."cli-log"."0.0.8"
-      self.by-version."github"."0.1.16"
-      self.by-version."copy-paste"."0.2.0"
-      self.by-version."handlebars"."1.3.0"
-      self.by-version."inquirer"."0.4.1"
-      self.by-version."moment"."2.5.1"
-      self.by-version."nopt"."2.2.0"
-      self.by-version."open"."0.0.5"
-      self.by-version."truncate"."1.0.2"
-      self.by-version."update-notifier"."0.1.8"
-      self.by-version."userhome"."0.1.0"
-      self.by-version."which"."1.0.5"
-      self.by-version."wordwrap"."0.0.2"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "gh" ];
-  };
-  "gh" = self.by-version."gh"."1.9.1";
-  by-spec."github"."~0.1.15" =
-    self.by-version."github"."0.1.16";
-  by-version."github"."0.1.16" = lib.makeOverridable self.buildNodePackage {
-    name = "node-github-0.1.16";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/github/-/github-0.1.16.tgz";
-        name = "github-0.1.16.tgz";
-        sha1 = "895d2a85b0feb7980d89ac0ce4f44dcaa03f17b5";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."github" or []);
+      (self.nativeDeps."github-url-from-git" or []);
     deps = [
     ];
     peerDependencies = [
     ];
-    passthru.names = [ "github" ];
+    passthru.names = [ "github-url-from-git" ];
   };
-  by-spec."github-flavored-markdown".">= 0.0.1" =
-    self.by-version."github-flavored-markdown"."1.0.1";
-  by-version."github-flavored-markdown"."1.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-github-flavored-markdown-1.0.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/github-flavored-markdown/-/github-flavored-markdown-1.0.1.tgz";
-        name = "github-flavored-markdown-1.0.1.tgz";
-        sha1 = "93361b87a31c25790d9c81a1b798214a737eab38";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."github-flavored-markdown" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "github-flavored-markdown" ];
-  };
-  by-spec."github-url-from-git"."1.1.1" =
+  by-spec."github-url-from-git"."~1.1.1" =
     self.by-version."github-url-from-git"."1.1.1";
   by-version."github-url-from-git"."1.1.1" = lib.makeOverridable self.buildNodePackage {
     name = "node-github-url-from-git-1.1.1";
@@ -7447,17 +7149,34 @@
     ];
     passthru.names = [ "github-url-from-git" ];
   };
-  by-spec."github-url-from-git"."~1.1.1" =
-    self.by-version."github-url-from-git"."1.1.1";
-  by-spec."github-url-from-username-repo"."0.0.2" =
-    self.by-version."github-url-from-username-repo"."0.0.2";
-  by-version."github-url-from-username-repo"."0.0.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-github-url-from-username-repo-0.0.2";
+  by-spec."github-url-from-git"."~1.2.0" =
+    self.by-version."github-url-from-git"."1.2.0";
+  by-version."github-url-from-git"."1.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-github-url-from-git-1.2.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/github-url-from-username-repo/-/github-url-from-username-repo-0.0.2.tgz";
-        name = "github-url-from-username-repo-0.0.2.tgz";
-        sha1 = "0d9ee8e2bca36d5f065a1bcd23eb3f1fa3d636bd";
+        url = "http://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.2.0.tgz";
+        name = "github-url-from-git-1.2.0.tgz";
+        sha1 = "7ace1fc6920f790d2967faed61688902320c37d2";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."github-url-from-git" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "github-url-from-git" ];
+  };
+  by-spec."github-url-from-username-repo"."^0.2.0" =
+    self.by-version."github-url-from-username-repo"."0.2.0";
+  by-version."github-url-from-username-repo"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-github-url-from-username-repo-0.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/github-url-from-username-repo/-/github-url-from-username-repo-0.2.0.tgz";
+        name = "github-url-from-username-repo-0.2.0.tgz";
+        sha1 = "7590b4fa605b7a6cbb7e06ffcd9d253210f9dbe1";
       })
     ];
     buildInputs =
@@ -7468,22 +7187,47 @@
     ];
     passthru.names = [ "github-url-from-username-repo" ];
   };
+  by-spec."github-url-from-username-repo"."~0.2.0" =
+    self.by-version."github-url-from-username-repo"."0.2.0";
   by-spec."glob"."3" =
-    self.by-version."glob"."3.2.9";
-  by-version."glob"."3.2.9" = lib.makeOverridable self.buildNodePackage {
-    name = "node-glob-3.2.9";
+    self.by-version."glob"."3.2.11";
+  by-version."glob"."3.2.11" = lib.makeOverridable self.buildNodePackage {
+    name = "node-glob-3.2.11";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/glob/-/glob-3.2.9.tgz";
-        name = "glob-3.2.9.tgz";
-        sha1 = "56af2289aa43d07d7702666480373eb814d91d40";
+        url = "http://registry.npmjs.org/glob/-/glob-3.2.11.tgz";
+        name = "glob-3.2.11.tgz";
+        sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d";
       })
     ];
     buildInputs =
       (self.nativeDeps."glob" or []);
     deps = [
-      self.by-version."minimatch"."0.2.14"
       self.by-version."inherits"."2.0.1"
+      self.by-version."minimatch"."0.3.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "glob" ];
+  };
+  by-spec."glob"."3 || 4" =
+    self.by-version."glob"."4.0.5";
+  by-version."glob"."4.0.5" = lib.makeOverridable self.buildNodePackage {
+    name = "node-glob-4.0.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/glob/-/glob-4.0.5.tgz";
+        name = "glob-4.0.5.tgz";
+        sha1 = "95e42c9efdb3ab1f4788fd7793dfded4a3378063";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."glob" or []);
+    deps = [
+      self.by-version."inherits"."2.0.1"
+      self.by-version."minimatch"."1.0.0"
+      self.by-version."once"."1.3.0"
+      self.by-version."graceful-fs"."3.0.2"
     ];
     peerDependencies = [
     ];
@@ -7512,13 +7256,19 @@
     passthru.names = [ "glob" ];
   };
   by-spec."glob"."3.2.x" =
-    self.by-version."glob"."3.2.9";
+    self.by-version."glob"."3.2.11";
   by-spec."glob"."3.x" =
-    self.by-version."glob"."3.2.9";
-  by-spec."glob".">= 3.1.4" =
-    self.by-version."glob"."3.2.9";
-  by-spec."glob".">=3.2.7 <4" =
-    self.by-version."glob"."3.2.9";
+    self.by-version."glob"."3.2.11";
+  by-spec."glob"."4.x" =
+    self.by-version."glob"."4.0.5";
+  by-spec."glob"."^4.0.0" =
+    self.by-version."glob"."4.0.5";
+  by-spec."glob"."^4.0.2" =
+    self.by-version."glob"."4.0.5";
+  by-spec."glob"."^4.0.5" =
+    self.by-version."glob"."4.0.5";
+  by-spec."glob"."~ 3.2.1" =
+    self.by-version."glob"."3.2.11";
   by-spec."glob"."~3.1.21" =
     self.by-version."glob"."3.1.21";
   by-version."glob"."3.1.21" = lib.makeOverridable self.buildNodePackage {
@@ -7541,18 +7291,103 @@
     ];
     passthru.names = [ "glob" ];
   };
-  by-spec."glob"."~3.2.0" =
-    self.by-version."glob"."3.2.9";
   by-spec."glob"."~3.2.1" =
-    self.by-version."glob"."3.2.9";
+    self.by-version."glob"."3.2.11";
   by-spec."glob"."~3.2.6" =
-    self.by-version."glob"."3.2.9";
+    self.by-version."glob"."3.2.11";
   by-spec."glob"."~3.2.7" =
-    self.by-version."glob"."3.2.9";
-  by-spec."glob"."~3.2.8" =
-    self.by-version."glob"."3.2.9";
+    self.by-version."glob"."3.2.11";
   by-spec."glob"."~3.2.9" =
-    self.by-version."glob"."3.2.9";
+    self.by-version."glob"."3.2.11";
+  by-spec."glob"."~4.0.3" =
+    self.by-version."glob"."4.0.5";
+  by-spec."glob-stream"."^3.1.5" =
+    self.by-version."glob-stream"."3.1.15";
+  by-version."glob-stream"."3.1.15" = lib.makeOverridable self.buildNodePackage {
+    name = "node-glob-stream-3.1.15";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/glob-stream/-/glob-stream-3.1.15.tgz";
+        name = "glob-stream-3.1.15.tgz";
+        sha1 = "084bdbe9d8203fbb48bcf05c382dbb7e6666f8f5";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."glob-stream" or []);
+    deps = [
+      self.by-version."glob"."4.0.5"
+      self.by-version."minimatch"."1.0.0"
+      self.by-version."ordered-read-streams"."0.0.8"
+      self.by-version."glob2base"."0.0.11"
+      self.by-version."unique-stream"."1.0.0"
+      self.by-version."through2"."0.6.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "glob-stream" ];
+  };
+  by-spec."glob-watcher"."^0.0.6" =
+    self.by-version."glob-watcher"."0.0.6";
+  by-version."glob-watcher"."0.0.6" = lib.makeOverridable self.buildNodePackage {
+    name = "node-glob-watcher-0.0.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz";
+        name = "glob-watcher-0.0.6.tgz";
+        sha1 = "b95b4a8df74b39c83298b0c05c978b4d9a3b710b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."glob-watcher" or []);
+    deps = [
+      self.by-version."gaze"."0.5.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "glob-watcher" ];
+  };
+  by-spec."glob2base"."^0.0.11" =
+    self.by-version."glob2base"."0.0.11";
+  by-version."glob2base"."0.0.11" = lib.makeOverridable self.buildNodePackage {
+    name = "node-glob2base-0.0.11";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/glob2base/-/glob2base-0.0.11.tgz";
+        name = "glob2base-0.0.11.tgz";
+        sha1 = "e56904ae5292c2d9cefbc5b97f419614fb56b660";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."glob2base" or []);
+    deps = [
+      self.by-version."lodash"."2.4.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "glob2base" ];
+  };
+  by-spec."globule"."~0.1.0" =
+    self.by-version."globule"."0.1.0";
+  by-version."globule"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-globule-0.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/globule/-/globule-0.1.0.tgz";
+        name = "globule-0.1.0.tgz";
+        sha1 = "d9c8edde1da79d125a151b79533b978676346ae5";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."globule" or []);
+    deps = [
+      self.by-version."lodash"."1.0.1"
+      self.by-version."glob"."3.1.21"
+      self.by-version."minimatch"."0.2.14"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "globule" ];
+  };
   by-spec."graceful-fs"."2" =
     self.by-version."graceful-fs"."2.0.3";
   by-version."graceful-fs"."2.0.3" = lib.makeOverridable self.buildNodePackage {
@@ -7572,6 +7407,31 @@
     ];
     passthru.names = [ "graceful-fs" ];
   };
+  by-spec."graceful-fs"."2 || 3" =
+    self.by-version."graceful-fs"."3.0.2";
+  by-version."graceful-fs"."3.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-graceful-fs-3.0.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.2.tgz";
+        name = "graceful-fs-3.0.2.tgz";
+        sha1 = "2cb5bf7f742bea8ad47c754caeee032b7e71a577";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."graceful-fs" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "graceful-fs" ];
+  };
+  by-spec."graceful-fs"."3" =
+    self.by-version."graceful-fs"."3.0.2";
+  by-spec."graceful-fs"."^3.0.0" =
+    self.by-version."graceful-fs"."3.0.2";
+  by-spec."graceful-fs"."^3.0.2" =
+    self.by-version."graceful-fs"."3.0.2";
   by-spec."graceful-fs"."~1" =
     self.by-version."graceful-fs"."1.2.3";
   by-version."graceful-fs"."1.2.3" = lib.makeOverridable self.buildNodePackage {
@@ -7591,44 +7451,29 @@
     ];
     passthru.names = [ "graceful-fs" ];
   };
-  by-spec."graceful-fs"."~1.1" =
-    self.by-version."graceful-fs"."1.1.14";
-  by-version."graceful-fs"."1.1.14" = lib.makeOverridable self.buildNodePackage {
-    name = "node-graceful-fs-1.1.14";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-1.1.14.tgz";
-        name = "graceful-fs-1.1.14.tgz";
-        sha1 = "07078db5f6377f6321fceaaedf497de124dc9465";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."graceful-fs" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "graceful-fs" ];
-  };
   by-spec."graceful-fs"."~1.2.0" =
     self.by-version."graceful-fs"."1.2.3";
-  by-spec."graceful-fs"."~2" =
-    self.by-version."graceful-fs"."2.0.3";
   by-spec."graceful-fs"."~2.0.0" =
     self.by-version."graceful-fs"."2.0.3";
   by-spec."graceful-fs"."~2.0.1" =
     self.by-version."graceful-fs"."2.0.3";
-  by-spec."graceful-fs"."~2.0.2" =
+  by-spec."graceful-fs"."~2.0.3" =
     self.by-version."graceful-fs"."2.0.3";
+  by-spec."graceful-fs"."~3.0.0" =
+    self.by-version."graceful-fs"."3.0.2";
+  by-spec."graceful-fs"."~3.0.1" =
+    self.by-version."graceful-fs"."3.0.2";
+  by-spec."graceful-fs"."~3.0.2" =
+    self.by-version."graceful-fs"."3.0.2";
   by-spec."gridfs-stream"."*" =
-    self.by-version."gridfs-stream"."0.4.1";
-  by-version."gridfs-stream"."0.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-gridfs-stream-0.4.1";
+    self.by-version."gridfs-stream"."0.5.1";
+  by-version."gridfs-stream"."0.5.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-gridfs-stream-0.5.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/gridfs-stream/-/gridfs-stream-0.4.1.tgz";
-        name = "gridfs-stream-0.4.1.tgz";
-        sha1 = "1bcccb1b05b57946363b5e53fbe2bc95dd8877bb";
+        url = "http://registry.npmjs.org/gridfs-stream/-/gridfs-stream-0.5.1.tgz";
+        name = "gridfs-stream-0.5.1.tgz";
+        sha1 = "5fd94b0da4df1a602f7b0a02fb2365460d91b90c";
       })
     ];
     buildInputs =
@@ -7639,7 +7484,7 @@
     ];
     passthru.names = [ "gridfs-stream" ];
   };
-  "gridfs-stream" = self.by-version."gridfs-stream"."0.4.1";
+  "gridfs-stream" = self.by-version."gridfs-stream"."0.5.1";
   by-spec."growl"."1.7.x" =
     self.by-version."growl"."1.7.0";
   by-version."growl"."1.7.0" = lib.makeOverridable self.buildNodePackage {
@@ -7659,15 +7504,34 @@
     ];
     passthru.names = [ "growl" ];
   };
-  by-spec."grunt"."0.4.x" =
-    self.by-version."grunt"."0.4.4";
-  by-version."grunt"."0.4.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-grunt-0.4.4";
+  by-spec."growl"."1.8.x" =
+    self.by-version."growl"."1.8.1";
+  by-version."growl"."1.8.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-growl-1.8.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/grunt/-/grunt-0.4.4.tgz";
-        name = "grunt-0.4.4.tgz";
-        sha1 = "f37fa46e2e52e37f9a0370542a74281c09c73f53";
+        url = "http://registry.npmjs.org/growl/-/growl-1.8.1.tgz";
+        name = "growl-1.8.1.tgz";
+        sha1 = "4b2dec8d907e93db336624dcec0183502f8c9428";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."growl" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "growl" ];
+  };
+  by-spec."grunt"."0.4.x" =
+    self.by-version."grunt"."0.4.5";
+  by-version."grunt"."0.4.5" = lib.makeOverridable self.buildNodePackage {
+    name = "node-grunt-0.4.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/grunt/-/grunt-0.4.5.tgz";
+        name = "grunt-0.4.5.tgz";
+        sha1 = "56937cd5194324adff6d207631832a9d6ba4e7f0";
       })
     ];
     buildInputs =
@@ -7677,60 +7541,33 @@
       self.by-version."coffee-script"."1.3.3"
       self.by-version."colors"."0.6.2"
       self.by-version."dateformat"."1.0.2-1.2.3"
-      self.by-version."eventemitter2"."0.4.13"
+      self.by-version."eventemitter2"."0.4.14"
       self.by-version."findup-sync"."0.1.3"
       self.by-version."glob"."3.1.21"
       self.by-version."hooker"."0.2.3"
       self.by-version."iconv-lite"."0.2.11"
       self.by-version."minimatch"."0.2.14"
       self.by-version."nopt"."1.0.10"
-      self.by-version."rimraf"."2.2.6"
+      self.by-version."rimraf"."2.2.8"
       self.by-version."lodash"."0.9.2"
       self.by-version."underscore.string"."2.2.1"
       self.by-version."which"."1.0.5"
       self.by-version."js-yaml"."2.0.5"
       self.by-version."exit"."0.1.2"
       self.by-version."getobject"."0.1.0"
-      self.by-version."grunt-legacy-util"."0.1.2"
+      self.by-version."grunt-legacy-util"."0.2.0"
+      self.by-version."grunt-legacy-log"."0.1.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "grunt" ];
   };
-  by-spec."grunt"."^0.4.0" =
-    self.by-version."grunt"."0.4.4";
   by-spec."grunt"."~0.4" =
-    self.by-version."grunt"."0.4.4";
+    self.by-version."grunt"."0.4.5";
   by-spec."grunt"."~0.4.0" =
-    self.by-version."grunt"."0.4.4";
+    self.by-version."grunt"."0.4.5";
   by-spec."grunt"."~0.4.1" =
-    self.by-version."grunt"."0.4.4";
-  by-spec."grunt-bower-task"."*" =
-    self.by-version."grunt-bower-task"."0.3.4";
-  by-version."grunt-bower-task"."0.3.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-grunt-bower-task-0.3.4";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/grunt-bower-task/-/grunt-bower-task-0.3.4.tgz";
-        name = "grunt-bower-task-0.3.4.tgz";
-        sha1 = "6f713725ae96bb22ed60b1173cf4c522bbb8583b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."grunt-bower-task" or []);
-    deps = [
-      self.by-version."bower"."1.2.8"
-      self.by-version."lodash"."0.10.0"
-      self.by-version."rimraf"."2.0.3"
-      self.by-version."wrench"."1.4.4"
-      self.by-version."colors"."0.6.2"
-      self.by-version."async"."0.1.22"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "grunt-bower-task" ];
-  };
-  "grunt-bower-task" = self.by-version."grunt-bower-task"."0.3.4";
+    self.by-version."grunt"."0.4.5";
   by-spec."grunt-cli"."*" =
     self.by-version."grunt-cli"."0.1.13";
   by-version."grunt-cli"."0.1.13" = lib.makeOverridable self.buildNodePackage {
@@ -7754,32 +7591,30 @@
     passthru.names = [ "grunt-cli" ];
   };
   "grunt-cli" = self.by-version."grunt-cli"."0.1.13";
-  by-spec."grunt-cli"."~0.1.7" =
-    self.by-version."grunt-cli"."0.1.13";
   by-spec."grunt-contrib-cssmin"."*" =
-    self.by-version."grunt-contrib-cssmin"."0.9.0";
-  by-version."grunt-contrib-cssmin"."0.9.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-grunt-contrib-cssmin-0.9.0";
+    self.by-version."grunt-contrib-cssmin"."0.10.0";
+  by-version."grunt-contrib-cssmin"."0.10.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-grunt-contrib-cssmin-0.10.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-0.9.0.tgz";
-        name = "grunt-contrib-cssmin-0.9.0.tgz";
-        sha1 = "27241f0160a8866659dab40dc8c2776c01ec7ce2";
+        url = "http://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-0.10.0.tgz";
+        name = "grunt-contrib-cssmin-0.10.0.tgz";
+        sha1 = "e05f341e753a9674b2b1070220fdcbac22079418";
       })
     ];
     buildInputs =
       (self.nativeDeps."grunt-contrib-cssmin" or []);
     deps = [
       self.by-version."chalk"."0.4.0"
-      self.by-version."clean-css"."2.1.8"
-      self.by-version."maxmin"."0.1.0"
+      self.by-version."clean-css"."2.2.13"
+      self.by-version."maxmin"."0.2.2"
     ];
     peerDependencies = [
-      self.by-version."grunt"."0.4.4"
+      self.by-version."grunt"."0.4.5"
     ];
     passthru.names = [ "grunt-contrib-cssmin" ];
   };
-  "grunt-contrib-cssmin" = self.by-version."grunt-contrib-cssmin"."0.9.0";
+  "grunt-contrib-cssmin" = self.by-version."grunt-contrib-cssmin"."0.10.0";
   by-spec."grunt-contrib-jshint"."*" =
     self.by-version."grunt-contrib-jshint"."0.10.0";
   by-version."grunt-contrib-jshint"."0.10.0" = lib.makeOverridable self.buildNodePackage {
@@ -7794,96 +7629,97 @@
     buildInputs =
       (self.nativeDeps."grunt-contrib-jshint" or []);
     deps = [
-      self.by-version."jshint"."2.5.0"
+      self.by-version."jshint"."2.5.4"
       self.by-version."hooker"."0.2.3"
     ];
     peerDependencies = [
-      self.by-version."grunt"."0.4.4"
+      self.by-version."grunt"."0.4.5"
     ];
     passthru.names = [ "grunt-contrib-jshint" ];
   };
   "grunt-contrib-jshint" = self.by-version."grunt-contrib-jshint"."0.10.0";
   by-spec."grunt-contrib-less"."*" =
-    self.by-version."grunt-contrib-less"."0.11.0";
-  by-version."grunt-contrib-less"."0.11.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-grunt-contrib-less-0.11.0";
+    self.by-version."grunt-contrib-less"."0.11.4";
+  by-version."grunt-contrib-less"."0.11.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-grunt-contrib-less-0.11.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-0.11.0.tgz";
-        name = "grunt-contrib-less-0.11.0.tgz";
-        sha1 = "601cbdda0591f7fde7fe50278cd904fedede90ed";
+        url = "http://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-0.11.4.tgz";
+        name = "grunt-contrib-less-0.11.4.tgz";
+        sha1 = "5667475ac4517f32ca623b9a4d81d6cf4aed2b51";
       })
     ];
     buildInputs =
       (self.nativeDeps."grunt-contrib-less" or []);
     deps = [
-      self.by-version."less"."1.7.0"
-      self.by-version."chalk"."0.4.0"
-      self.by-version."maxmin"."0.1.0"
-      self.by-version."lodash"."2.4.1"
       self.by-version."async"."0.2.10"
+      self.by-version."chalk"."0.5.1"
+      self.by-version."less"."1.7.4"
+      self.by-version."lodash"."2.4.1"
+      self.by-version."maxmin"."0.1.0"
     ];
     peerDependencies = [
-      self.by-version."grunt"."0.4.4"
+      self.by-version."grunt"."0.4.5"
     ];
     passthru.names = [ "grunt-contrib-less" ];
   };
-  "grunt-contrib-less" = self.by-version."grunt-contrib-less"."0.11.0";
+  "grunt-contrib-less" = self.by-version."grunt-contrib-less"."0.11.4";
   by-spec."grunt-contrib-requirejs"."*" =
-    self.by-version."grunt-contrib-requirejs"."0.4.3";
-  by-version."grunt-contrib-requirejs"."0.4.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-grunt-contrib-requirejs-0.4.3";
+    self.by-version."grunt-contrib-requirejs"."0.4.4";
+  by-version."grunt-contrib-requirejs"."0.4.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-grunt-contrib-requirejs-0.4.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/grunt-contrib-requirejs/-/grunt-contrib-requirejs-0.4.3.tgz";
-        name = "grunt-contrib-requirejs-0.4.3.tgz";
-        sha1 = "ac243dc312af5c85cd095169da1b3177bfe89c59";
+        url = "http://registry.npmjs.org/grunt-contrib-requirejs/-/grunt-contrib-requirejs-0.4.4.tgz";
+        name = "grunt-contrib-requirejs-0.4.4.tgz";
+        sha1 = "87f2165a981e48a45d22f8cc5299d0934031b972";
       })
     ];
     buildInputs =
       (self.nativeDeps."grunt-contrib-requirejs" or []);
     deps = [
-      self.by-version."requirejs"."2.1.11"
+      self.by-version."requirejs"."2.1.14"
     ];
     peerDependencies = [
-      self.by-version."grunt"."0.4.4"
+      self.by-version."grunt"."0.4.5"
     ];
     passthru.names = [ "grunt-contrib-requirejs" ];
   };
-  "grunt-contrib-requirejs" = self.by-version."grunt-contrib-requirejs"."0.4.3";
+  "grunt-contrib-requirejs" = self.by-version."grunt-contrib-requirejs"."0.4.4";
   by-spec."grunt-contrib-uglify"."*" =
-    self.by-version."grunt-contrib-uglify"."0.4.0";
-  by-version."grunt-contrib-uglify"."0.4.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-grunt-contrib-uglify-0.4.0";
+    self.by-version."grunt-contrib-uglify"."0.5.1";
+  by-version."grunt-contrib-uglify"."0.5.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-grunt-contrib-uglify-0.5.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-0.4.0.tgz";
-        name = "grunt-contrib-uglify-0.4.0.tgz";
-        sha1 = "6a4df3e85ccf4bbae484b0328cc71c9f102e80be";
+        url = "http://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-0.5.1.tgz";
+        name = "grunt-contrib-uglify-0.5.1.tgz";
+        sha1 = "15f0aa5e8e8ba421aea980879ee505bc712b6cde";
       })
     ];
     buildInputs =
       (self.nativeDeps."grunt-contrib-uglify" or []);
     deps = [
-      self.by-version."uglify-js"."2.4.13"
-      self.by-version."chalk"."0.4.0"
-      self.by-version."maxmin"."0.1.0"
+      self.by-version."chalk"."0.5.1"
+      self.by-version."lodash"."2.4.1"
+      self.by-version."maxmin"."0.2.2"
+      self.by-version."uglify-js"."2.4.15"
     ];
     peerDependencies = [
-      self.by-version."grunt"."0.4.4"
+      self.by-version."grunt"."0.4.5"
     ];
     passthru.names = [ "grunt-contrib-uglify" ];
   };
-  "grunt-contrib-uglify" = self.by-version."grunt-contrib-uglify"."0.4.0";
+  "grunt-contrib-uglify" = self.by-version."grunt-contrib-uglify"."0.5.1";
   by-spec."grunt-karma"."*" =
-    self.by-version."grunt-karma"."0.8.2";
-  by-version."grunt-karma"."0.8.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-grunt-karma-0.8.2";
+    self.by-version."grunt-karma"."0.8.3";
+  by-version."grunt-karma"."0.8.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-grunt-karma-0.8.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/grunt-karma/-/grunt-karma-0.8.2.tgz";
-        name = "grunt-karma-0.8.2.tgz";
-        sha1 = "0f422d357e4556fb96ab68c6d9a2be46908f1c84";
+        url = "http://registry.npmjs.org/grunt-karma/-/grunt-karma-0.8.3.tgz";
+        name = "grunt-karma-0.8.3.tgz";
+        sha1 = "e9ecf718153af1914aa53602a37f85de04310e7f";
       })
     ];
     buildInputs =
@@ -7892,21 +7728,44 @@
       self.by-version."lodash"."2.4.1"
     ];
     peerDependencies = [
-      self.by-version."grunt"."0.4.4"
-      self.by-version."karma"."0.12.9"
+      self.by-version."grunt"."0.4.5"
+      self.by-version."karma"."0.12.22"
     ];
     passthru.names = [ "grunt-karma" ];
   };
-  "grunt-karma" = self.by-version."grunt-karma"."0.8.2";
-  by-spec."grunt-legacy-util"."~0.1.2" =
-    self.by-version."grunt-legacy-util"."0.1.2";
-  by-version."grunt-legacy-util"."0.1.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-grunt-legacy-util-0.1.2";
+  "grunt-karma" = self.by-version."grunt-karma"."0.8.3";
+  by-spec."grunt-legacy-log"."~0.1.0" =
+    self.by-version."grunt-legacy-log"."0.1.1";
+  by-version."grunt-legacy-log"."0.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-grunt-legacy-log-0.1.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-0.1.2.tgz";
-        name = "grunt-legacy-util-0.1.2.tgz";
-        sha1 = "be84d337ef4a0137dc8566092a46528fd8957ebd";
+        url = "http://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-0.1.1.tgz";
+        name = "grunt-legacy-log-0.1.1.tgz";
+        sha1 = "d41f1a6abc9b0b1256a2b5ff02f4c3298dfcd57a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."grunt-legacy-log" or []);
+    deps = [
+      self.by-version."hooker"."0.2.3"
+      self.by-version."lodash"."2.4.1"
+      self.by-version."underscore.string"."2.3.3"
+      self.by-version."colors"."0.6.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "grunt-legacy-log" ];
+  };
+  by-spec."grunt-legacy-util"."~0.2.0" =
+    self.by-version."grunt-legacy-util"."0.2.0";
+  by-version."grunt-legacy-util"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-grunt-legacy-util-0.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-0.2.0.tgz";
+        name = "grunt-legacy-util-0.2.0.tgz";
+        sha1 = "93324884dbf7e37a9ff7c026dff451d94a9e554b";
       })
     ];
     buildInputs =
@@ -7941,7 +7800,7 @@
       self.by-version."replace"."0.2.9"
     ];
     peerDependencies = [
-      self.by-version."grunt"."0.4.4"
+      self.by-version."grunt"."0.4.5"
     ];
     passthru.names = [ "grunt-sed" ];
   };
@@ -7961,10 +7820,10 @@
       (self.nativeDeps."guifi-earth" or []);
     deps = [
       self.by-version."coffee-script"."1.7.1"
-      self.by-version."jade"."1.3.1"
-      self.by-version."q"."2.0.1"
-      self.by-version."xml2js"."0.4.2"
-      self.by-version."msgpack"."0.2.3"
+      self.by-version."jade"."1.5.0"
+      self.by-version."q"."2.0.2"
+      self.by-version."xml2js"."0.4.4"
+      self.by-version."msgpack"."0.2.4"
     ];
     peerDependencies = [
     ];
@@ -7985,13 +7844,34 @@
     buildInputs =
       (self.nativeDeps."gzip-size" or []);
     deps = [
-      self.by-version."concat-stream"."1.4.5"
+      self.by-version."concat-stream"."1.4.6"
       self.by-version."zlib-browserify"."0.0.3"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "gzip-size" ];
   };
+  by-spec."gzip-size"."^0.2.0" =
+    self.by-version."gzip-size"."0.2.0";
+  by-version."gzip-size"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "gzip-size-0.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/gzip-size/-/gzip-size-0.2.0.tgz";
+        name = "gzip-size-0.2.0.tgz";
+        sha1 = "e3a2a191205fe56ee326f5c271435dfaecfb3e1c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."gzip-size" or []);
+    deps = [
+      self.by-version."concat-stream"."1.4.6"
+      self.by-version."browserify-zlib"."0.1.4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "gzip-size" ];
+  };
   by-spec."gzippo"."*" =
     self.by-version."gzippo"."0.2.0";
   by-version."gzippo"."0.2.0" = lib.makeOverridable self.buildNodePackage {
@@ -8006,14 +7886,14 @@
     buildInputs =
       (self.nativeDeps."gzippo" or []);
     deps = [
-      self.by-version."send"."0.2.0"
+      self.by-version."send"."0.8.3"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "gzippo" ];
   };
   "gzippo" = self.by-version."gzippo"."0.2.0";
-  by-spec."handlebars"."1.3.0" =
+  by-spec."handlebars"."1.3.x" =
     self.by-version."handlebars"."1.3.0";
   by-version."handlebars"."1.3.0" = lib.makeOverridable self.buildNodePackage {
     name = "handlebars-1.3.0";
@@ -8034,31 +7914,26 @@
     ];
     passthru.names = [ "handlebars" ];
   };
-  by-spec."handlebars"."1.3.x" =
-    self.by-version."handlebars"."1.3.0";
-  by-spec."handlebars"."~1.0.11" =
-    self.by-version."handlebars"."1.0.12";
-  by-version."handlebars"."1.0.12" = lib.makeOverridable self.buildNodePackage {
-    name = "handlebars-1.0.12";
+  by-spec."has-ansi"."^0.1.0" =
+    self.by-version."has-ansi"."0.1.0";
+  by-version."has-ansi"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "has-ansi-0.1.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/handlebars/-/handlebars-1.0.12.tgz";
-        name = "handlebars-1.0.12.tgz";
-        sha1 = "18c6d3440c35e91b19b3ff582b9151ab4985d4fc";
+        url = "http://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz";
+        name = "has-ansi-0.1.0.tgz";
+        sha1 = "84f265aae8c0e6a88a12d7022894b7568894c62e";
       })
     ];
     buildInputs =
-      (self.nativeDeps."handlebars" or []);
+      (self.nativeDeps."has-ansi" or []);
     deps = [
-      self.by-version."optimist"."0.3.7"
-      self.by-version."uglify-js"."2.3.6"
+      self.by-version."ansi-regex"."0.2.1"
     ];
     peerDependencies = [
     ];
-    passthru.names = [ "handlebars" ];
+    passthru.names = [ "has-ansi" ];
   };
-  by-spec."handlebars"."~1.3.0" =
-    self.by-version."handlebars"."1.3.0";
   by-spec."has-color"."~0.1.0" =
     self.by-version."has-color"."0.1.7";
   by-version."has-color"."0.1.7" = lib.makeOverridable self.buildNodePackage {
@@ -8138,7 +8013,30 @@
     ];
     passthru.names = [ "hat" ];
   };
-  by-spec."hawk"."~0.10.0" =
+  by-spec."hawk"."1.1.1" =
+    self.by-version."hawk"."1.1.1";
+  by-version."hawk"."1.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-hawk-1.1.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz";
+        name = "hawk-1.1.1.tgz";
+        sha1 = "87cd491f9b46e4e2aeaca335416766885d2d1ed9";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."hawk" or []);
+    deps = [
+      self.by-version."hoek"."0.9.1"
+      self.by-version."boom"."0.4.2"
+      self.by-version."cryptiles"."0.2.2"
+      self.by-version."sntp"."0.2.4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "hawk" ];
+  };
+  by-spec."hawk"."~0.10.2" =
     self.by-version."hawk"."0.10.2";
   by-version."hawk"."0.10.2" = lib.makeOverridable self.buildNodePackage {
     name = "node-hawk-0.10.2";
@@ -8161,8 +8059,6 @@
     ];
     passthru.names = [ "hawk" ];
   };
-  by-spec."hawk"."~0.10.2" =
-    self.by-version."hawk"."0.10.2";
   by-spec."hawk"."~1.0.0" =
     self.by-version."hawk"."1.0.0";
   by-version."hawk"."1.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -8206,44 +8102,45 @@
     passthru.names = [ "he" ];
   };
   by-spec."hipache"."*" =
-    self.by-version."hipache"."0.2.9";
-  by-version."hipache"."0.2.9" = lib.makeOverridable self.buildNodePackage {
-    name = "hipache-0.2.9";
+    self.by-version."hipache"."0.3.1";
+  by-version."hipache"."0.3.1" = lib.makeOverridable self.buildNodePackage {
+    name = "hipache-0.3.1";
     src = [
-      (self.patchSource fetchurl {
-        url = "http://registry.npmjs.org/hipache/-/hipache-0.2.9.tgz";
-        name = "hipache-0.2.9.tgz";
-        sha1 = "48a7fa7170be328b264d6e413bfb76d130e03b2a";
+      (fetchurl {
+        url = "http://registry.npmjs.org/hipache/-/hipache-0.3.1.tgz";
+        name = "hipache-0.3.1.tgz";
+        sha1 = "e21764eafe6429ec8dc9377b55e1ca86799704d5";
       })
     ];
     buildInputs =
       (self.nativeDeps."hipache" or []);
     deps = [
-      self.by-version."http-proxy"."0.10.3"
-      self.by-version."redis"."0.8.6"
-      self.by-version."lru-cache"."2.2.4"
-      self.by-version."optimist"."0.3.7"
+      self.by-version."http-proxy"."1.0.2"
+      self.by-version."redis"."0.10.3"
+      self.by-version."lru-cache"."2.5.0"
+      self.by-version."minimist"."0.0.8"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "hipache" ];
   };
-  "hipache" = self.by-version."hipache"."0.2.9";
+  "hipache" = self.by-version."hipache"."0.3.1";
   by-spec."hiredis"."*" =
-    self.by-version."hiredis"."0.1.16";
-  by-version."hiredis"."0.1.16" = lib.makeOverridable self.buildNodePackage {
-    name = "node-hiredis-0.1.16";
+    self.by-version."hiredis"."0.1.17";
+  by-version."hiredis"."0.1.17" = lib.makeOverridable self.buildNodePackage {
+    name = "node-hiredis-0.1.17";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/hiredis/-/hiredis-0.1.16.tgz";
-        name = "hiredis-0.1.16.tgz";
-        sha1 = "f6cee1add2589b8b71cef3c4d3936a9fcd638640";
+        url = "http://registry.npmjs.org/hiredis/-/hiredis-0.1.17.tgz";
+        name = "hiredis-0.1.17.tgz";
+        sha1 = "60a33a968efc9a974e7ebb832f33aa965d3d354e";
       })
     ];
     buildInputs =
       (self.nativeDeps."hiredis" or []);
     deps = [
-      self.by-version."bindings"."1.2.0"
+      self.by-version."bindings"."1.2.1"
+      self.by-version."nan"."1.1.2"
     ];
     peerDependencies = [
     ];
@@ -8325,70 +8222,25 @@
     ];
     passthru.names = [ "hooks" ];
   };
-  by-spec."htmlparser2"."3.1.4" =
-    self.by-version."htmlparser2"."3.1.4";
-  by-version."htmlparser2"."3.1.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-htmlparser2-3.1.4";
+  by-spec."htmlparser2"."3.7.x" =
+    self.by-version."htmlparser2"."3.7.3";
+  by-version."htmlparser2"."3.7.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-htmlparser2-3.7.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.1.4.tgz";
-        name = "htmlparser2-3.1.4.tgz";
-        sha1 = "72cbe7d5d56c01acf61fcf7b933331f4e45b36f0";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."htmlparser2" or []);
-    deps = [
-      self.by-version."domhandler"."2.0.3"
-      self.by-version."domutils"."1.1.6"
-      self.by-version."domelementtype"."1.1.1"
-      self.by-version."readable-stream"."1.0.27-1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "htmlparser2" ];
-  };
-  by-spec."htmlparser2"."3.3.x" =
-    self.by-version."htmlparser2"."3.3.0";
-  by-version."htmlparser2"."3.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-htmlparser2-3.3.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.3.0.tgz";
-        name = "htmlparser2-3.3.0.tgz";
-        sha1 = "cc70d05a59f6542e43f0e685c982e14c924a9efe";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."htmlparser2" or []);
-    deps = [
-      self.by-version."domhandler"."2.1.0"
-      self.by-version."domutils"."1.1.6"
-      self.by-version."domelementtype"."1.1.1"
-      self.by-version."readable-stream"."1.0.27-1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "htmlparser2" ];
-  };
-  by-spec."htmlparser2"."~3.4.0" =
-    self.by-version."htmlparser2"."3.4.0";
-  by-version."htmlparser2"."3.4.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-htmlparser2-3.4.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.4.0.tgz";
-        name = "htmlparser2-3.4.0.tgz";
-        sha1 = "a1cd65f5823ad285e19d63b085ad722d0a51eae7";
+        url = "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.7.3.tgz";
+        name = "htmlparser2-3.7.3.tgz";
+        sha1 = "6a64c77637c08c6f30ec2a8157a53333be7cb05e";
       })
     ];
     buildInputs =
       (self.nativeDeps."htmlparser2" or []);
     deps = [
       self.by-version."domhandler"."2.2.0"
-      self.by-version."domutils"."1.3.0"
+      self.by-version."domutils"."1.5.0"
       self.by-version."domelementtype"."1.1.1"
-      self.by-version."readable-stream"."1.1.13-1"
+      self.by-version."readable-stream"."1.1.13"
+      self.by-version."entities"."1.0.0"
     ];
     peerDependencies = [
     ];
@@ -8415,15 +8267,15 @@
     ];
     passthru.names = [ "http-auth" ];
   };
-  by-spec."http-browserify"."~1.3.1" =
-    self.by-version."http-browserify"."1.3.2";
-  by-version."http-browserify"."1.3.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-http-browserify-1.3.2";
+  by-spec."http-browserify"."^1.4.0" =
+    self.by-version."http-browserify"."1.5.0";
+  by-version."http-browserify"."1.5.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-http-browserify-1.5.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/http-browserify/-/http-browserify-1.3.2.tgz";
-        name = "http-browserify-1.3.2.tgz";
-        sha1 = "b562c34479349a690d7a6597df495aefa8c604f5";
+        url = "http://registry.npmjs.org/http-browserify/-/http-browserify-1.5.0.tgz";
+        name = "http-browserify-1.5.0.tgz";
+        sha1 = "9ecc18daa92289793fed28f9f14b0a0ce6f98040";
       })
     ];
     buildInputs =
@@ -8436,24 +8288,21 @@
     ];
     passthru.names = [ "http-browserify" ];
   };
-  by-spec."http-proxy"."git+https://github.com/samalba/node-http-proxy.git" =
-    self.by-version."http-proxy"."0.10.3";
-  by-version."http-proxy"."0.10.3" = lib.makeOverridable self.buildNodePackage {
-    name = "http-proxy-0.10.3";
+  by-spec."http-proxy"."1.0.2" =
+    self.by-version."http-proxy"."1.0.2";
+  by-version."http-proxy"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-http-proxy-1.0.2";
     src = [
-      (fetchgit {
-        url = "https://github.com/samalba/node-http-proxy.git";
-        rev = "8e277989d2d05edaee65e524fb4fba9142c52aa5";
-        sha256 = "8ce0e05c73e517eefc6d9bf8b61349351aee119c2fb60763f23170607cc0e41f";
+      (fetchurl {
+        url = "http://registry.npmjs.org/http-proxy/-/http-proxy-1.0.2.tgz";
+        name = "http-proxy-1.0.2.tgz";
+        sha1 = "08060ff2edb2189e57aa3a152d3ac63ed1af7254";
       })
     ];
     buildInputs =
       (self.nativeDeps."http-proxy" or []);
     deps = [
-      self.by-version."colors"."0.6.2"
-      self.by-version."optimist"."0.3.7"
-      self.by-version."pkginfo"."0.2.3"
-      self.by-version."utile"."0.1.7"
+      self.by-version."eventemitter3"."0.1.4"
     ];
     peerDependencies = [
     ];
@@ -8584,26 +8433,26 @@
     passthru.names = [ "i" ];
   };
   by-spec."i18next"."*" =
-    self.by-version."i18next"."1.7.3";
-  by-version."i18next"."1.7.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-i18next-1.7.3";
+    self.by-version."i18next"."1.7.4";
+  by-version."i18next"."1.7.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-i18next-1.7.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/i18next/-/i18next-1.7.3.tgz";
-        name = "i18next-1.7.3.tgz";
-        sha1 = "8a064866c8e6e87b4664a32fe81b9be34b4a3894";
+        url = "http://registry.npmjs.org/i18next/-/i18next-1.7.4.tgz";
+        name = "i18next-1.7.4.tgz";
+        sha1 = "b61629c9de95a5c076acb2f954f8a882ac0772af";
       })
     ];
     buildInputs =
       (self.nativeDeps."i18next" or []);
     deps = [
-      self.by-version."cookies"."0.4.0"
+      self.by-version."cookies"."0.5.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "i18next" ];
   };
-  "i18next" = self.by-version."i18next"."1.7.3";
+  "i18next" = self.by-version."i18next"."1.7.4";
   by-spec."ibrik"."~1.1.1" =
     self.by-version."ibrik"."1.1.1";
   by-version."ibrik"."1.1.1" = lib.makeOverridable self.buildNodePackage {
@@ -8620,8 +8469,8 @@
     deps = [
       self.by-version."lodash"."2.4.1"
       self.by-version."coffee-script-redux"."2.0.0-beta8"
-      self.by-version."istanbul"."0.2.7"
-      self.by-version."estraverse"."1.5.0"
+      self.by-version."istanbul"."0.2.16"
+      self.by-version."estraverse"."1.5.1"
       self.by-version."escodegen"."1.1.0"
       self.by-version."which"."1.0.5"
       self.by-version."mkdirp"."0.3.5"
@@ -8631,7 +8480,45 @@
     ];
     passthru.names = [ "ibrik" ];
   };
-  by-spec."iconv-lite"."~0.2.10" =
+  by-spec."iconv-lite"."0.4.3" =
+    self.by-version."iconv-lite"."0.4.3";
+  by-version."iconv-lite"."0.4.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-iconv-lite-0.4.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.3.tgz";
+        name = "iconv-lite-0.4.3.tgz";
+        sha1 = "9e7887793b769cc695eb22d2546a4fd2d79b7a1e";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."iconv-lite" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "iconv-lite" ];
+  };
+  by-spec."iconv-lite"."0.4.4" =
+    self.by-version."iconv-lite"."0.4.4";
+  by-version."iconv-lite"."0.4.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-iconv-lite-0.4.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.4.tgz";
+        name = "iconv-lite-0.4.4.tgz";
+        sha1 = "e95f2e41db0735fc21652f7827a5ee32e63c83a8";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."iconv-lite" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "iconv-lite" ];
+  };
+  by-spec."iconv-lite"."~0.2.11" =
     self.by-version."iconv-lite"."0.2.11";
   by-version."iconv-lite"."0.2.11" = lib.makeOverridable self.buildNodePackage {
     name = "node-iconv-lite-0.2.11";
@@ -8650,8 +8537,8 @@
     ];
     passthru.names = [ "iconv-lite" ];
   };
-  by-spec."iconv-lite"."~0.2.11" =
-    self.by-version."iconv-lite"."0.2.11";
+  by-spec."iconv-lite"."~0.4.3" =
+    self.by-version."iconv-lite"."0.4.4";
   by-spec."ieee754"."~1.1.1" =
     self.by-version."ieee754"."1.1.3";
   by-version."ieee754"."1.1.3" = lib.makeOverridable self.buildNodePackage {
@@ -8690,6 +8577,26 @@
     ];
     passthru.names = [ "indexof" ];
   };
+  by-spec."inflight"."~1.0.1" =
+    self.by-version."inflight"."1.0.1";
+  by-version."inflight"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-inflight-1.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/inflight/-/inflight-1.0.1.tgz";
+        name = "inflight-1.0.1.tgz";
+        sha1 = "01f6911821535243c790ac0f998f54e9023ffb6f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."inflight" or []);
+    deps = [
+      self.by-version."once"."1.3.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "inflight" ];
+  };
   by-spec."inherits"."1" =
     self.by-version."inherits"."1.0.0";
   by-version."inherits"."1.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -8732,6 +8639,8 @@
   };
   by-spec."inherits"."2.0.1" =
     self.by-version."inherits"."2.0.1";
+  by-spec."inherits"."^2.0.1" =
+    self.by-version."inherits"."2.0.1";
   by-spec."inherits"."~1.0.0" =
     self.by-version."inherits"."1.0.0";
   by-spec."inherits"."~2.0.0" =
@@ -8739,6 +8648,29 @@
   by-spec."inherits"."~2.0.1" =
     self.by-version."inherits"."2.0.1";
   by-spec."ini"."1" =
+    self.by-version."ini"."1.2.1";
+  by-version."ini"."1.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-ini-1.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/ini/-/ini-1.2.1.tgz";
+        name = "ini-1.2.1.tgz";
+        sha1 = "7f774e2f22752cd1dacbf9c63323df2a164ebca3";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."ini" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "ini" ];
+  };
+  by-spec."ini"."1.x.x" =
+    self.by-version."ini"."1.2.1";
+  by-spec."ini"."^1.2.0" =
+    self.by-version."ini"."1.2.1";
+  by-spec."ini"."~1.1.0" =
     self.by-version."ini"."1.1.0";
   by-version."ini"."1.1.0" = lib.makeOverridable self.buildNodePackage {
     name = "node-ini-1.1.0";
@@ -8757,29 +8689,27 @@
     ];
     passthru.names = [ "ini" ];
   };
-  by-spec."ini"."1.x.x" =
-    self.by-version."ini"."1.1.0";
-  by-spec."ini"."~1.1.0" =
-    self.by-version."ini"."1.1.0";
-  by-spec."init-package-json"."0.0.15" =
-    self.by-version."init-package-json"."0.0.15";
-  by-version."init-package-json"."0.0.15" = lib.makeOverridable self.buildNodePackage {
-    name = "node-init-package-json-0.0.15";
+  by-spec."ini"."~1.2.0" =
+    self.by-version."ini"."1.2.1";
+  by-spec."init-package-json"."~0.1.1" =
+    self.by-version."init-package-json"."0.1.2";
+  by-version."init-package-json"."0.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-init-package-json-0.1.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/init-package-json/-/init-package-json-0.0.15.tgz";
-        name = "init-package-json-0.0.15.tgz";
-        sha1 = "d40f0201e4de6aa2b3fdc4208ae162766703ebed";
+        url = "http://registry.npmjs.org/init-package-json/-/init-package-json-0.1.2.tgz";
+        name = "init-package-json-0.1.2.tgz";
+        sha1 = "9e232ccae0d5cf712cd7773b0f1fcd59b7edc2da";
       })
     ];
     buildInputs =
       (self.nativeDeps."init-package-json" or []);
     deps = [
-      self.by-version."promzard"."0.2.1"
+      self.by-version."glob"."4.0.5"
+      self.by-version."promzard"."0.2.2"
       self.by-version."read"."1.0.5"
-      self.by-version."read-package-json"."1.1.8"
-      self.by-version."semver"."2.2.1"
-      self.by-version."glob"."3.2.9"
+      self.by-version."read-package-json"."1.2.6"
+      self.by-version."semver"."3.0.1"
     ];
     peerDependencies = [
     ];
@@ -8799,142 +8729,65 @@
     buildInputs =
       (self.nativeDeps."inline-source-map" or []);
     deps = [
-      self.by-version."source-map"."0.1.33"
+      self.by-version."source-map"."0.1.38"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "inline-source-map" ];
   };
-  by-spec."inquirer"."~0.3.0" =
-    self.by-version."inquirer"."0.3.5";
-  by-version."inquirer"."0.3.5" = lib.makeOverridable self.buildNodePackage {
-    name = "node-inquirer-0.3.5";
+  by-spec."insert-module-globals"."^6.1.0" =
+    self.by-version."insert-module-globals"."6.1.0";
+  by-version."insert-module-globals"."6.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "insert-module-globals-6.1.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/inquirer/-/inquirer-0.3.5.tgz";
-        name = "inquirer-0.3.5.tgz";
-        sha1 = "a78be064ac9abf168147c02169a931d9a483a9f6";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."inquirer" or []);
-    deps = [
-      self.by-version."lodash"."1.2.1"
-      self.by-version."async"."0.2.10"
-      self.by-version."cli-color"."0.2.3"
-      self.by-version."mute-stream"."0.0.3"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "inquirer" ];
-  };
-  by-spec."inquirer"."~0.3.1" =
-    self.by-version."inquirer"."0.3.5";
-  by-spec."inquirer"."~0.4.0" =
-    self.by-version."inquirer"."0.4.1";
-  by-version."inquirer"."0.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-inquirer-0.4.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/inquirer/-/inquirer-0.4.1.tgz";
-        name = "inquirer-0.4.1.tgz";
-        sha1 = "6cf74eb1a347f97a1a207bea8ad1c987d0ff4b81";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."inquirer" or []);
-    deps = [
-      self.by-version."lodash"."2.4.1"
-      self.by-version."async"."0.2.10"
-      self.by-version."cli-color"."0.2.3"
-      self.by-version."mute-stream"."0.0.4"
-      self.by-version."through"."2.3.4"
-      self.by-version."readline2"."0.1.0"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "inquirer" ];
-  };
-  by-spec."inquirer"."~0.4.1" =
-    self.by-version."inquirer"."0.4.1";
-  by-spec."insert-module-globals"."~5.0.1" =
-    self.by-version."insert-module-globals"."5.0.1";
-  by-version."insert-module-globals"."5.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "insert-module-globals-5.0.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/insert-module-globals/-/insert-module-globals-5.0.1.tgz";
-        name = "insert-module-globals-5.0.1.tgz";
-        sha1 = "eec9c0dfad30380e8eda313a094165dc2f2350d2";
+        url = "http://registry.npmjs.org/insert-module-globals/-/insert-module-globals-6.1.0.tgz";
+        name = "insert-module-globals-6.1.0.tgz";
+        sha1 = "b0ee36d97057e9eda133ad6d4b00a8821cd63663";
       })
     ];
     buildInputs =
       (self.nativeDeps."insert-module-globals" or []);
     deps = [
-      self.by-version."JSONStream"."0.7.2"
-      self.by-version."concat-stream"."1.4.5"
+      self.by-version."JSONStream"."0.7.4"
+      self.by-version."concat-stream"."1.4.6"
       self.by-version."lexical-scope"."1.1.0"
       self.by-version."process"."0.6.0"
       self.by-version."through"."2.3.4"
+      self.by-version."xtend"."3.0.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "insert-module-globals" ];
   };
-  by-spec."insight"."~0.3.0" =
-    self.by-version."insight"."0.3.1";
-  by-version."insight"."0.3.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-insight-0.3.1";
+  by-spec."ipaddr.js"."0.1.2" =
+    self.by-version."ipaddr.js"."0.1.2";
+  by-version."ipaddr.js"."0.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-ipaddr.js-0.1.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/insight/-/insight-0.3.1.tgz";
-        name = "insight-0.3.1.tgz";
-        sha1 = "1a14f32c06115c0850338c38a253d707b611d448";
+        url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.2.tgz";
+        name = "ipaddr.js-0.1.2.tgz";
+        sha1 = "6a1fd3d854f5002965c34d7bbcd9b4a8d4b0467e";
       })
     ];
     buildInputs =
-      (self.nativeDeps."insight" or []);
-    deps = [
-      self.by-version."chalk"."0.4.0"
-      self.by-version."request"."2.27.0"
-      self.by-version."configstore"."0.2.3"
-      self.by-version."async"."0.2.10"
-      self.by-version."inquirer"."0.4.1"
-      self.by-version."object-assign"."0.1.2"
-      self.by-version."lodash.debounce"."2.4.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "insight" ];
-  };
-  by-spec."intersect"."~0.0.3" =
-    self.by-version."intersect"."0.0.3";
-  by-version."intersect"."0.0.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-intersect-0.0.3";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/intersect/-/intersect-0.0.3.tgz";
-        name = "intersect-0.0.3.tgz";
-        sha1 = "c1a4a5e5eac6ede4af7504cc07e0ada7bc9f4920";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."intersect" or []);
+      (self.nativeDeps."ipaddr.js" or []);
     deps = [
     ];
     peerDependencies = [
     ];
-    passthru.names = [ "intersect" ];
+    passthru.names = [ "ipaddr.js" ];
   };
   by-spec."ironhorse"."*" =
-    self.by-version."ironhorse"."0.0.9";
-  by-version."ironhorse"."0.0.9" = lib.makeOverridable self.buildNodePackage {
-    name = "node-ironhorse-0.0.9";
+    self.by-version."ironhorse"."0.0.10";
+  by-version."ironhorse"."0.0.10" = lib.makeOverridable self.buildNodePackage {
+    name = "node-ironhorse-0.0.10";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/ironhorse/-/ironhorse-0.0.9.tgz";
-        name = "ironhorse-0.0.9.tgz";
-        sha1 = "9cfaf75e464a0bf394d511a05c0a8b8de080a1d9";
+        url = "http://registry.npmjs.org/ironhorse/-/ironhorse-0.0.10.tgz";
+        name = "ironhorse-0.0.10.tgz";
+        sha1 = "98c1c9e29889fabbaaea0ce558501c47f9319856";
       })
     ];
     buildInputs =
@@ -8944,33 +8797,33 @@
       self.by-version."winston"."0.7.3"
       self.by-version."nconf"."0.6.9"
       self.by-version."fs-walk"."0.0.1"
-      self.by-version."async"."0.7.0"
-      self.by-version."express"."4.0.0"
-      self.by-version."jade"."1.3.1"
+      self.by-version."async"."0.9.0"
+      self.by-version."express"."4.8.5"
+      self.by-version."jade"."1.5.0"
       self.by-version."passport"."0.2.0"
       self.by-version."passport-http"."0.2.2"
-      self.by-version."js-yaml"."3.0.2"
-      self.by-version."mongoose"."3.8.8"
-      self.by-version."gridfs-stream"."0.4.1"
-      self.by-version."temp"."0.7.0"
-      self.by-version."kue"."0.7.5"
-      self.by-version."redis"."0.10.1"
-      self.by-version."hiredis"."0.1.16"
+      self.by-version."js-yaml"."3.1.0"
+      self.by-version."mongoose"."3.8.15"
+      self.by-version."gridfs-stream"."0.5.1"
+      self.by-version."temp"."0.8.1"
+      self.by-version."kue"."0.8.5"
+      self.by-version."redis"."0.12.1"
+      self.by-version."hiredis"."0.1.17"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "ironhorse" ];
   };
-  "ironhorse" = self.by-version."ironhorse"."0.0.9";
+  "ironhorse" = self.by-version."ironhorse"."0.0.10";
   by-spec."is-promise"."~1" =
-    self.by-version."is-promise"."1.0.0";
-  by-version."is-promise"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-is-promise-1.0.0";
+    self.by-version."is-promise"."1.0.1";
+  by-version."is-promise"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-is-promise-1.0.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/is-promise/-/is-promise-1.0.0.tgz";
-        name = "is-promise-1.0.0.tgz";
-        sha1 = "b998d17551f16f69f7bd4828f58f018cc81e064f";
+        url = "http://registry.npmjs.org/is-promise/-/is-promise-1.0.1.tgz";
+        name = "is-promise-1.0.1.tgz";
+        sha1 = "31573761c057e33c2e91aab9e96da08cefbe76e5";
       })
     ];
     buildInputs =
@@ -8981,24 +8834,24 @@
     ];
     passthru.names = [ "is-promise" ];
   };
-  by-spec."is-root"."~0.1.0" =
-    self.by-version."is-root"."0.1.0";
-  by-version."is-root"."0.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-is-root-0.1.0";
+  by-spec."is-utf8"."^0.2.0" =
+    self.by-version."is-utf8"."0.2.0";
+  by-version."is-utf8"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-is-utf8-0.2.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/is-root/-/is-root-0.1.0.tgz";
-        name = "is-root-0.1.0.tgz";
-        sha1 = "825e394ab593df2d73c5d0092fce507270b53dcb";
+        url = "http://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz";
+        name = "is-utf8-0.2.0.tgz";
+        sha1 = "b8aa54125ae626bfe4e3beb965f16a89c58a1137";
       })
     ];
     buildInputs =
-      (self.nativeDeps."is-root" or []);
+      (self.nativeDeps."is-utf8" or []);
     deps = [
     ];
     peerDependencies = [
     ];
-    passthru.names = [ "is-root" ];
+    passthru.names = [ "is-utf8" ];
   };
   by-spec."isarray"."0.0.1" =
     self.by-version."isarray"."0.0.1";
@@ -9019,27 +8872,8 @@
     ];
     passthru.names = [ "isarray" ];
   };
-  by-spec."isbinaryfile"."~0.1.8" =
-    self.by-version."isbinaryfile"."0.1.9";
-  by-version."isbinaryfile"."0.1.9" = lib.makeOverridable self.buildNodePackage {
-    name = "node-isbinaryfile-0.1.9";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/isbinaryfile/-/isbinaryfile-0.1.9.tgz";
-        name = "isbinaryfile-0.1.9.tgz";
-        sha1 = "15eece35c4ab708d8924da99fb874f2b5cc0b6c4";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."isbinaryfile" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "isbinaryfile" ];
-  };
-  by-spec."isbinaryfile"."~0.1.9" =
-    self.by-version."isbinaryfile"."0.1.9";
+  by-spec."isarray"."~0.0.1" =
+    self.by-version."isarray"."0.0.1";
   by-spec."isbinaryfile"."~2.0.0" =
     self.by-version."isbinaryfile"."2.0.1";
   by-version."isbinaryfile"."2.0.1" = lib.makeOverridable self.buildNodePackage {
@@ -9060,68 +8894,98 @@
     passthru.names = [ "isbinaryfile" ];
   };
   by-spec."istanbul"."*" =
-    self.by-version."istanbul"."0.2.7";
-  by-version."istanbul"."0.2.7" = lib.makeOverridable self.buildNodePackage {
-    name = "istanbul-0.2.7";
+    self.by-version."istanbul"."0.3.0";
+  by-version."istanbul"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "istanbul-0.3.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/istanbul/-/istanbul-0.2.7.tgz";
-        name = "istanbul-0.2.7.tgz";
-        sha1 = "bb482e1d06a0fea00993a10b2ee266fc740642bc";
+        url = "http://registry.npmjs.org/istanbul/-/istanbul-0.3.0.tgz";
+        name = "istanbul-0.3.0.tgz";
+        sha1 = "5b7179104942adbb0ec3e140d5e3d071db55abbd";
       })
     ];
     buildInputs =
       (self.nativeDeps."istanbul" or []);
     deps = [
-      self.by-version."esprima"."1.1.1"
-      self.by-version."escodegen"."1.3.2"
+      self.by-version."esprima"."1.2.2"
+      self.by-version."escodegen"."1.3.3"
       self.by-version."handlebars"."1.3.0"
-      self.by-version."mkdirp"."0.3.5"
-      self.by-version."nopt"."2.2.0"
+      self.by-version."mkdirp"."0.5.0"
+      self.by-version."nopt"."3.0.1"
       self.by-version."fileset"."0.1.5"
       self.by-version."which"."1.0.5"
-      self.by-version."async"."0.2.10"
+      self.by-version."async"."0.9.0"
       self.by-version."abbrev"."1.0.5"
       self.by-version."wordwrap"."0.0.2"
-      self.by-version."resolve"."0.6.3"
-      self.by-version."js-yaml"."3.0.2"
+      self.by-version."resolve"."0.7.4"
+      self.by-version."js-yaml"."3.1.0"
+      self.by-version."once"."1.3.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "istanbul" ];
   };
-  "istanbul" = self.by-version."istanbul"."0.2.7";
-  by-spec."istanbul"."~0.2.3" =
-    self.by-version."istanbul"."0.2.7";
+  "istanbul" = self.by-version."istanbul"."0.3.0";
   by-spec."istanbul"."~0.2.4" =
-    self.by-version."istanbul"."0.2.7";
-  by-spec."jade"."*" =
-    self.by-version."jade"."1.3.1";
-  by-version."jade"."1.3.1" = lib.makeOverridable self.buildNodePackage {
-    name = "jade-1.3.1";
+    self.by-version."istanbul"."0.2.16";
+  by-version."istanbul"."0.2.16" = lib.makeOverridable self.buildNodePackage {
+    name = "istanbul-0.2.16";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/jade/-/jade-1.3.1.tgz";
-        name = "jade-1.3.1.tgz";
-        sha1 = "7483d848b8714dc50a40da98b0409790b374216b";
+        url = "http://registry.npmjs.org/istanbul/-/istanbul-0.2.16.tgz";
+        name = "istanbul-0.2.16.tgz";
+        sha1 = "870545a0d4f4b4ce161039e9e805a98c2c700bd9";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."istanbul" or []);
+    deps = [
+      self.by-version."esprima"."1.2.2"
+      self.by-version."escodegen"."1.3.3"
+      self.by-version."handlebars"."1.3.0"
+      self.by-version."mkdirp"."0.5.0"
+      self.by-version."nopt"."3.0.1"
+      self.by-version."fileset"."0.1.5"
+      self.by-version."which"."1.0.5"
+      self.by-version."async"."0.9.0"
+      self.by-version."abbrev"."1.0.5"
+      self.by-version."wordwrap"."0.0.2"
+      self.by-version."resolve"."0.7.4"
+      self.by-version."js-yaml"."3.1.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "istanbul" ];
+  };
+  by-spec."istanbul"."~0.3.0" =
+    self.by-version."istanbul"."0.3.0";
+  by-spec."jade"."*" =
+    self.by-version."jade"."1.5.0";
+  by-version."jade"."1.5.0" = lib.makeOverridable self.buildNodePackage {
+    name = "jade-1.5.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/jade/-/jade-1.5.0.tgz";
+        name = "jade-1.5.0.tgz";
+        sha1 = "74a93a5a290e11296c8b919b7a4d72301739b27e";
       })
     ];
     buildInputs =
       (self.nativeDeps."jade" or []);
     deps = [
       self.by-version."commander"."2.1.0"
-      self.by-version."mkdirp"."0.3.5"
+      self.by-version."mkdirp"."0.5.0"
       self.by-version."transformers"."2.1.0"
       self.by-version."character-parser"."1.2.0"
       self.by-version."monocle"."1.1.51"
-      self.by-version."with"."3.0.0"
-      self.by-version."constantinople"."2.0.0"
+      self.by-version."with"."3.0.1"
+      self.by-version."constantinople"."2.0.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "jade" ];
   };
-  "jade" = self.by-version."jade"."1.3.1";
+  "jade" = self.by-version."jade"."1.5.0";
   by-spec."jade"."0.26.3" =
     self.by-version."jade"."0.26.3";
   by-version."jade"."0.26.3" = lib.makeOverridable self.buildNodePackage {
@@ -9191,7 +9055,7 @@
     passthru.names = [ "jade" ];
   };
   by-spec."jade".">= 0.0.1" =
-    self.by-version."jade"."1.3.1";
+    self.by-version."jade"."1.5.0";
   by-spec."jade"."~0.35.0" =
     self.by-version."jade"."0.35.0";
   by-version."jade"."0.35.0" = lib.makeOverridable self.buildNodePackage {
@@ -9219,14 +9083,14 @@
     passthru.names = [ "jade" ];
   };
   by-spec."jayschema"."*" =
-    self.by-version."jayschema"."0.2.7";
-  by-version."jayschema"."0.2.7" = lib.makeOverridable self.buildNodePackage {
-    name = "jayschema-0.2.7";
+    self.by-version."jayschema"."0.2.8";
+  by-version."jayschema"."0.2.8" = lib.makeOverridable self.buildNodePackage {
+    name = "jayschema-0.2.8";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/jayschema/-/jayschema-0.2.7.tgz";
-        name = "jayschema-0.2.7.tgz";
-        sha1 = "99d653a0c6ceec4f2c5932c5d73c835bb8911062";
+        url = "http://registry.npmjs.org/jayschema/-/jayschema-0.2.8.tgz";
+        name = "jayschema-0.2.8.tgz";
+        sha1 = "ea7883f501a4cdc7b91f48889f5774ea43159f17";
       })
     ];
     buildInputs =
@@ -9238,16 +9102,16 @@
     ];
     passthru.names = [ "jayschema" ];
   };
-  "jayschema" = self.by-version."jayschema"."0.2.7";
+  "jayschema" = self.by-version."jayschema"."0.2.8";
   by-spec."js-yaml"."*" =
-    self.by-version."js-yaml"."3.0.2";
-  by-version."js-yaml"."3.0.2" = lib.makeOverridable self.buildNodePackage {
-    name = "js-yaml-3.0.2";
+    self.by-version."js-yaml"."3.1.0";
+  by-version."js-yaml"."3.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "js-yaml-3.1.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/js-yaml/-/js-yaml-3.0.2.tgz";
-        name = "js-yaml-3.0.2.tgz";
-        sha1 = "9937865f8e897a5e894e73c2c5cf2e89b32eb771";
+        url = "http://registry.npmjs.org/js-yaml/-/js-yaml-3.1.0.tgz";
+        name = "js-yaml-3.1.0.tgz";
+        sha1 = "36ba02e618c50748e772dd352428904cbbadcf44";
       })
     ];
     buildInputs =
@@ -9260,7 +9124,7 @@
     ];
     passthru.names = [ "js-yaml" ];
   };
-  "js-yaml" = self.by-version."js-yaml"."3.0.2";
+  "js-yaml" = self.by-version."js-yaml"."3.1.0";
   by-spec."js-yaml"."0.3.x" =
     self.by-version."js-yaml"."0.3.7";
   by-version."js-yaml"."0.3.7" = lib.makeOverridable self.buildNodePackage {
@@ -9323,7 +9187,7 @@
     passthru.names = [ "js-yaml" ];
   };
   by-spec."js-yaml"."3.x" =
-    self.by-version."js-yaml"."3.0.2";
+    self.by-version."js-yaml"."3.1.0";
   by-spec."js-yaml"."~2.0.5" =
     self.by-version."js-yaml"."2.0.5";
   by-version."js-yaml"."2.0.5" = lib.makeOverridable self.buildNodePackage {
@@ -9347,6 +9211,25 @@
   };
   by-spec."js-yaml"."~3.0.1" =
     self.by-version."js-yaml"."3.0.2";
+  by-version."js-yaml"."3.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "js-yaml-3.0.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/js-yaml/-/js-yaml-3.0.2.tgz";
+        name = "js-yaml-3.0.2.tgz";
+        sha1 = "9937865f8e897a5e894e73c2c5cf2e89b32eb771";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."js-yaml" or []);
+    deps = [
+      self.by-version."argparse"."0.1.15"
+      self.by-version."esprima"."1.0.4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "js-yaml" ];
+  };
   by-spec."jsesc"."0.4.3" =
     self.by-version."jsesc"."0.4.3";
   by-version."jsesc"."0.4.3" = lib.makeOverridable self.buildNodePackage {
@@ -9369,35 +9252,35 @@
   by-spec."jsesc"."~0.4.3" =
     self.by-version."jsesc"."0.4.3";
   by-spec."jshint"."*" =
-    self.by-version."jshint"."2.5.0";
-  by-version."jshint"."2.5.0" = lib.makeOverridable self.buildNodePackage {
-    name = "jshint-2.5.0";
+    self.by-version."jshint"."2.5.4";
+  by-version."jshint"."2.5.4" = lib.makeOverridable self.buildNodePackage {
+    name = "jshint-2.5.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/jshint/-/jshint-2.5.0.tgz";
-        name = "jshint-2.5.0.tgz";
-        sha1 = "82fd1a235ffce75fad1b40b2a38bef47beac8c54";
+        url = "http://registry.npmjs.org/jshint/-/jshint-2.5.4.tgz";
+        name = "jshint-2.5.4.tgz";
+        sha1 = "3dc82cb37b381b65f0e95ec7a616d39b4e95faef";
       })
     ];
     buildInputs =
       (self.nativeDeps."jshint" or []);
     deps = [
-      self.by-version."shelljs"."0.1.4"
-      self.by-version."underscore"."1.4.4"
-      self.by-version."cli"."0.4.5"
-      self.by-version."minimatch"."0.2.14"
-      self.by-version."htmlparser2"."3.3.0"
-      self.by-version."console-browserify"."0.1.6"
+      self.by-version."shelljs"."0.3.0"
+      self.by-version."underscore"."1.6.0"
+      self.by-version."cli"."0.6.3"
+      self.by-version."minimatch"."0.4.0"
+      self.by-version."htmlparser2"."3.7.3"
+      self.by-version."console-browserify"."1.1.0"
       self.by-version."exit"."0.1.2"
-      self.by-version."strip-json-comments"."0.1.1"
+      self.by-version."strip-json-comments"."0.1.3"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "jshint" ];
   };
-  "jshint" = self.by-version."jshint"."2.5.0";
+  "jshint" = self.by-version."jshint"."2.5.4";
   by-spec."jshint"."~2.5.0" =
-    self.by-version."jshint"."2.5.0";
+    self.by-version."jshint"."2.5.4";
   by-spec."json-schema"."0.2.2" =
     self.by-version."json-schema"."0.2.2";
   by-version."json-schema"."0.2.2" = lib.makeOverridable self.buildNodePackage {
@@ -9417,6 +9300,26 @@
     ];
     passthru.names = [ "json-schema" ];
   };
+  by-spec."json-stable-stringify"."~0.0.0" =
+    self.by-version."json-stable-stringify"."0.0.1";
+  by-version."json-stable-stringify"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-json-stable-stringify-0.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz";
+        name = "json-stable-stringify-0.0.1.tgz";
+        sha1 = "611c23e814db375527df851193db59dd2af27f45";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."json-stable-stringify" or []);
+    deps = [
+      self.by-version."jsonify"."0.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "json-stable-stringify" ];
+  };
   by-spec."json-stringify-safe"."~3.0.0" =
     self.by-version."json-stringify-safe"."3.0.0";
   by-version."json-stringify-safe"."3.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -9576,79 +9479,62 @@
     ];
     passthru.names = [ "jstransform" ];
   };
-  by-spec."junk"."~0.2.0" =
-    self.by-version."junk"."0.2.2";
-  by-version."junk"."0.2.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-junk-0.2.2";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/junk/-/junk-0.2.2.tgz";
-        name = "junk-0.2.2.tgz";
-        sha1 = "d595eb199b37930cecd1f2c52820847e80e48ae7";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."junk" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "junk" ];
-  };
   by-spec."karma"."*" =
-    self.by-version."karma"."0.12.9";
-  by-version."karma"."0.12.9" = lib.makeOverridable self.buildNodePackage {
-    name = "karma-0.12.9";
+    self.by-version."karma"."0.12.22";
+  by-version."karma"."0.12.22" = lib.makeOverridable self.buildNodePackage {
+    name = "karma-0.12.22";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/karma/-/karma-0.12.9.tgz";
-        name = "karma-0.12.9.tgz";
-        sha1 = "9431735e50fcbd8ca04963a0e4da0b6550b41998";
+        url = "http://registry.npmjs.org/karma/-/karma-0.12.22.tgz";
+        name = "karma-0.12.22.tgz";
+        sha1 = "05073db2a1ba0638f15cb76a515563be34460dc7";
       })
     ];
     buildInputs =
       (self.nativeDeps."karma" or []);
     deps = [
       self.by-version."di"."0.0.1"
-      self.by-version."socket.io"."0.9.16"
-      self.by-version."chokidar"."0.8.2"
-      self.by-version."glob"."3.2.9"
+      self.by-version."socket.io"."0.9.17"
+      self.by-version."chokidar"."0.8.4"
+      self.by-version."glob"."3.2.11"
       self.by-version."minimatch"."0.2.14"
       self.by-version."http-proxy"."0.10.4"
       self.by-version."optimist"."0.6.1"
-      self.by-version."rimraf"."2.2.6"
+      self.by-version."rimraf"."2.2.8"
       self.by-version."q"."0.9.7"
       self.by-version."colors"."0.6.2"
       self.by-version."lodash"."2.4.1"
       self.by-version."mime"."1.2.11"
-      self.by-version."log4js"."0.6.14"
-      self.by-version."useragent"."2.0.8"
+      self.by-version."log4js"."0.6.18"
+      self.by-version."useragent"."2.0.9"
       self.by-version."graceful-fs"."2.0.3"
       self.by-version."connect"."2.12.0"
-      self.by-version."source-map"."0.1.33"
+      self.by-version."source-map"."0.1.38"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "karma" ];
   };
-  "karma" = self.by-version."karma"."0.12.9";
+  "karma" = self.by-version."karma"."0.12.22";
   by-spec."karma".">=0.11.11" =
-    self.by-version."karma"."0.12.9";
+    self.by-version."karma"."0.12.22";
+  by-spec."karma".">=0.12.8" =
+    self.by-version."karma"."0.12.22";
   by-spec."karma".">=0.9" =
-    self.by-version."karma"."0.12.9";
+    self.by-version."karma"."0.12.22";
   by-spec."karma".">=0.9.3" =
-    self.by-version."karma"."0.12.9";
+    self.by-version."karma"."0.12.22";
   by-spec."karma"."~0.12.0" =
-    self.by-version."karma"."0.12.9";
+    self.by-version."karma"."0.12.22";
   by-spec."karma-chrome-launcher"."*" =
-    self.by-version."karma-chrome-launcher"."0.1.3";
-  by-version."karma-chrome-launcher"."0.1.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-karma-chrome-launcher-0.1.3";
+    self.by-version."karma-chrome-launcher"."0.1.4";
+  by-version."karma-chrome-launcher"."0.1.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-karma-chrome-launcher-0.1.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-0.1.3.tgz";
-        name = "karma-chrome-launcher-0.1.3.tgz";
-        sha1 = "b7f82dd9c83c84d26355bf31159739706973a3ec";
+        url = "http://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-0.1.4.tgz";
+        name = "karma-chrome-launcher-0.1.4.tgz";
+        sha1 = "492f6b8ceed3dacb829b147514c9106660f1b185";
       })
     ];
     buildInputs =
@@ -9656,35 +9542,36 @@
     deps = [
     ];
     peerDependencies = [
-      self.by-version."karma"."0.12.9"
+      self.by-version."karma"."0.12.22"
     ];
     passthru.names = [ "karma-chrome-launcher" ];
   };
-  "karma-chrome-launcher" = self.by-version."karma-chrome-launcher"."0.1.3";
+  "karma-chrome-launcher" = self.by-version."karma-chrome-launcher"."0.1.4";
   by-spec."karma-coverage"."*" =
-    self.by-version."karma-coverage"."0.2.1";
-  by-version."karma-coverage"."0.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-karma-coverage-0.2.1";
+    self.by-version."karma-coverage"."0.2.6";
+  by-version."karma-coverage"."0.2.6" = lib.makeOverridable self.buildNodePackage {
+    name = "node-karma-coverage-0.2.6";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/karma-coverage/-/karma-coverage-0.2.1.tgz";
-        name = "karma-coverage-0.2.1.tgz";
-        sha1 = "3b1bce268711a631e008e108930906eceae0a623";
+        url = "http://registry.npmjs.org/karma-coverage/-/karma-coverage-0.2.6.tgz";
+        name = "karma-coverage-0.2.6.tgz";
+        sha1 = "6ab53e69a03a6e0fe2a0563216895a720040fca9";
       })
     ];
     buildInputs =
       (self.nativeDeps."karma-coverage" or []);
     deps = [
-      self.by-version."istanbul"."0.2.7"
+      self.by-version."istanbul"."0.3.0"
       self.by-version."ibrik"."1.1.1"
-      self.by-version."dateformat"."1.0.7-1.2.3"
+      self.by-version."dateformat"."1.0.8-1.2.3"
+      self.by-version."minimatch"."0.3.0"
     ];
     peerDependencies = [
-      self.by-version."karma"."0.12.9"
+      self.by-version."karma"."0.12.22"
     ];
     passthru.names = [ "karma-coverage" ];
   };
-  "karma-coverage" = self.by-version."karma-coverage"."0.2.1";
+  "karma-coverage" = self.by-version."karma-coverage"."0.2.6";
   by-spec."karma-junit-reporter"."*" =
     self.by-version."karma-junit-reporter"."0.2.2";
   by-version."karma-junit-reporter"."0.2.2" = lib.makeOverridable self.buildNodePackage {
@@ -9702,20 +9589,20 @@
       self.by-version."xmlbuilder"."0.4.2"
     ];
     peerDependencies = [
-      self.by-version."karma"."0.12.9"
+      self.by-version."karma"."0.12.22"
     ];
     passthru.names = [ "karma-junit-reporter" ];
   };
   "karma-junit-reporter" = self.by-version."karma-junit-reporter"."0.2.2";
   by-spec."karma-mocha"."*" =
-    self.by-version."karma-mocha"."0.1.3";
-  by-version."karma-mocha"."0.1.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-karma-mocha-0.1.3";
+    self.by-version."karma-mocha"."0.1.8";
+  by-version."karma-mocha"."0.1.8" = lib.makeOverridable self.buildNodePackage {
+    name = "node-karma-mocha-0.1.8";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/karma-mocha/-/karma-mocha-0.1.3.tgz";
-        name = "karma-mocha-0.1.3.tgz";
-        sha1 = "396e44be8ddb4abf28bfca0387924c3aeddbce1a";
+        url = "http://registry.npmjs.org/karma-mocha/-/karma-mocha-0.1.8.tgz";
+        name = "karma-mocha-0.1.8.tgz";
+        sha1 = "7f086bd06ab6151cbd5b0cf1614c15344963fdf6";
       })
     ];
     buildInputs =
@@ -9723,21 +9610,21 @@
     deps = [
     ];
     peerDependencies = [
-      self.by-version."karma"."0.12.9"
-      self.by-version."mocha"."1.18.2"
+      self.by-version."karma"."0.12.22"
+      self.by-version."mocha"."1.21.4"
     ];
     passthru.names = [ "karma-mocha" ];
   };
-  "karma-mocha" = self.by-version."karma-mocha"."0.1.3";
+  "karma-mocha" = self.by-version."karma-mocha"."0.1.8";
   by-spec."karma-requirejs"."*" =
-    self.by-version."karma-requirejs"."0.2.1";
-  by-version."karma-requirejs"."0.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-karma-requirejs-0.2.1";
+    self.by-version."karma-requirejs"."0.2.2";
+  by-version."karma-requirejs"."0.2.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-karma-requirejs-0.2.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/karma-requirejs/-/karma-requirejs-0.2.1.tgz";
-        name = "karma-requirejs-0.2.1.tgz";
-        sha1 = "7f3ac5df67bccd9d832a928ec658d733ec983c5d";
+        url = "http://registry.npmjs.org/karma-requirejs/-/karma-requirejs-0.2.2.tgz";
+        name = "karma-requirejs-0.2.2.tgz";
+        sha1 = "e497ca0868e2e09a9b8e3f646745c31a935fe8b6";
       })
     ];
     buildInputs =
@@ -9745,46 +9632,46 @@
     deps = [
     ];
     peerDependencies = [
-      self.by-version."karma"."0.12.9"
-      self.by-version."requirejs"."2.1.11"
+      self.by-version."karma"."0.12.22"
+      self.by-version."requirejs"."2.1.14"
     ];
     passthru.names = [ "karma-requirejs" ];
   };
-  "karma-requirejs" = self.by-version."karma-requirejs"."0.2.1";
+  "karma-requirejs" = self.by-version."karma-requirejs"."0.2.2";
   by-spec."karma-sauce-launcher"."*" =
-    self.by-version."karma-sauce-launcher"."0.2.7";
-  by-version."karma-sauce-launcher"."0.2.7" = lib.makeOverridable self.buildNodePackage {
-    name = "node-karma-sauce-launcher-0.2.7";
+    self.by-version."karma-sauce-launcher"."0.2.10";
+  by-version."karma-sauce-launcher"."0.2.10" = lib.makeOverridable self.buildNodePackage {
+    name = "node-karma-sauce-launcher-0.2.10";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/karma-sauce-launcher/-/karma-sauce-launcher-0.2.7.tgz";
-        name = "karma-sauce-launcher-0.2.7.tgz";
-        sha1 = "a87a0b2e3612b298f3f6c2a96839940af85ac849";
+        url = "http://registry.npmjs.org/karma-sauce-launcher/-/karma-sauce-launcher-0.2.10.tgz";
+        name = "karma-sauce-launcher-0.2.10.tgz";
+        sha1 = "9aed0df47934c630d2ceb7faa954f5c454deddb0";
       })
     ];
     buildInputs =
       (self.nativeDeps."karma-sauce-launcher" or []);
     deps = [
-      self.by-version."wd"."0.2.19"
-      self.by-version."sauce-connect-launcher"."0.4.2"
+      self.by-version."wd"."0.3.4"
+      self.by-version."sauce-connect-launcher"."0.6.1"
       self.by-version."q"."0.9.7"
       self.by-version."saucelabs"."0.1.1"
     ];
     peerDependencies = [
-      self.by-version."karma"."0.12.9"
+      self.by-version."karma"."0.12.22"
     ];
     passthru.names = [ "karma-sauce-launcher" ];
   };
-  "karma-sauce-launcher" = self.by-version."karma-sauce-launcher"."0.2.7";
-  by-spec."keen.io"."~0.0.4" =
-    self.by-version."keen.io"."0.0.4";
-  by-version."keen.io"."0.0.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-keen.io-0.0.4";
+  "karma-sauce-launcher" = self.by-version."karma-sauce-launcher"."0.2.10";
+  by-spec."keen.io"."~0.1.2" =
+    self.by-version."keen.io"."0.1.2";
+  by-version."keen.io"."0.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-keen.io-0.1.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/keen.io/-/keen.io-0.0.4.tgz";
-        name = "keen.io-0.0.4.tgz";
-        sha1 = "041caa79371a6bec51288e222f3bb2e05c7e6b25";
+        url = "http://registry.npmjs.org/keen.io/-/keen.io-0.1.2.tgz";
+        name = "keen.io-0.1.2.tgz";
+        sha1 = "a55b9d1d8b4354a8845f2a224eb3a6f7271378b2";
       })
     ];
     buildInputs =
@@ -9855,14 +9742,14 @@
     passthru.names = [ "kew" ];
   };
   by-spec."keygrip"."~1.0.0" =
-    self.by-version."keygrip"."1.0.0";
-  by-version."keygrip"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-keygrip-1.0.0";
+    self.by-version."keygrip"."1.0.1";
+  by-version."keygrip"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-keygrip-1.0.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/keygrip/-/keygrip-1.0.0.tgz";
-        name = "keygrip-1.0.0.tgz";
-        sha1 = "b771120e8e697b8692b76866a84cdff3912fc379";
+        url = "http://registry.npmjs.org/keygrip/-/keygrip-1.0.1.tgz";
+        name = "keygrip-1.0.1.tgz";
+        sha1 = "b02fa4816eef21a8c4b35ca9e52921ffc89a30e9";
       })
     ];
     buildInputs =
@@ -9914,47 +9801,126 @@
     passthru.names = [ "knockout" ];
   };
   by-spec."knox"."*" =
-    self.by-version."knox"."0.8.9";
-  by-version."knox"."0.8.9" = lib.makeOverridable self.buildNodePackage {
-    name = "node-knox-0.8.9";
+    self.by-version."knox"."0.9.0";
+  by-version."knox"."0.9.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-knox-0.9.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/knox/-/knox-0.8.9.tgz";
-        name = "knox-0.8.9.tgz";
-        sha1 = "b96ec0b4ec1be75d8006f80cb302bfa818d7001c";
+        url = "http://registry.npmjs.org/knox/-/knox-0.9.0.tgz";
+        name = "knox-0.9.0.tgz";
+        sha1 = "8810e1dfe4332db505a796f5c9a11aee8b393e2c";
       })
     ];
     buildInputs =
       (self.nativeDeps."knox" or []);
     deps = [
       self.by-version."mime"."1.2.11"
-      self.by-version."xml2js"."0.2.8"
-      self.by-version."debug"."0.7.4"
-      self.by-version."stream-counter"."0.1.0"
+      self.by-version."xml2js"."0.4.4"
+      self.by-version."debug"."1.0.4"
+      self.by-version."stream-counter"."1.0.0"
+      self.by-version."once"."1.3.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "knox" ];
   };
-  "knox" = self.by-version."knox"."0.8.9";
-  by-spec."kue"."*" =
-    self.by-version."kue"."0.7.5";
-  by-version."kue"."0.7.5" = lib.makeOverridable self.buildNodePackage {
-    name = "node-kue-0.7.5";
+  "knox" = self.by-version."knox"."0.9.0";
+  by-spec."koa"."*" =
+    self.by-version."koa"."0.10.0";
+  by-version."koa"."0.10.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-koa-0.10.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/kue/-/kue-0.7.5.tgz";
-        name = "kue-0.7.5.tgz";
-        sha1 = "d815a8a35b22dd28df3f54f0b874403a257dc807";
+        url = "http://registry.npmjs.org/koa/-/koa-0.10.0.tgz";
+        name = "koa-0.10.0.tgz";
+        sha1 = "876f6ab92ee19b89c7157a108d3c046d48377146";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."koa" or []);
+    deps = [
+      self.by-version."escape-html"."1.0.1"
+      self.by-version."statuses"."1.0.4"
+      self.by-version."accepts"."1.0.7"
+      self.by-version."type-is"."1.3.2"
+      self.by-version."mime-types"."1.0.2"
+      self.by-version."media-typer"."0.2.0"
+      self.by-version."finished"."1.2.2"
+      self.by-version."co"."3.1.0"
+      self.by-version."debug"."1.0.4"
+      self.by-version."fresh"."0.2.2"
+      self.by-version."koa-compose"."2.3.0"
+      self.by-version."koa-is-json"."1.0.0"
+      self.by-version."cookies"."0.5.0"
+      self.by-version."delegates"."0.0.3"
+      self.by-version."dethroy"."1.0.2"
+      self.by-version."error-inject"."1.0.0"
+      self.by-version."vary"."0.1.0"
+      self.by-version."parseurl"."1.2.0"
+      self.by-version."only"."0.0.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "koa" ];
+  };
+  by-spec."koa-compose"."~2.3.0" =
+    self.by-version."koa-compose"."2.3.0";
+  by-version."koa-compose"."2.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-koa-compose-2.3.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/koa-compose/-/koa-compose-2.3.0.tgz";
+        name = "koa-compose-2.3.0.tgz";
+        sha1 = "4617fa832a16412a56967334304efd797d6ed35c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."koa-compose" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "koa-compose" ];
+  };
+  by-spec."koa-is-json"."~1.0.0" =
+    self.by-version."koa-is-json"."1.0.0";
+  by-version."koa-is-json"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-koa-is-json-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/koa-is-json/-/koa-is-json-1.0.0.tgz";
+        name = "koa-is-json-1.0.0.tgz";
+        sha1 = "273c07edcdcb8df6a2c1ab7d59ee76491451ec14";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."koa-is-json" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "koa-is-json" ];
+  };
+  by-spec."kue"."*" =
+    self.by-version."kue"."0.8.5";
+  by-version."kue"."0.8.5" = lib.makeOverridable self.buildNodePackage {
+    name = "node-kue-0.8.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/kue/-/kue-0.8.5.tgz";
+        name = "kue-0.8.5.tgz";
+        sha1 = "253d7a9a0bdd086100e48bbcce6c7dfad3381ed4";
       })
     ];
     buildInputs =
       (self.nativeDeps."kue" or []);
     deps = [
-      self.by-version."redis"."0.10.1"
+      self.by-version."redis"."0.10.3"
       self.by-version."express"."3.1.2"
       self.by-version."jade"."1.1.5"
       self.by-version."stylus"."0.42.2"
+      self.by-version."lodash"."2.4.1"
+      self.by-version."lodash-deep"."1.2.1"
       self.by-version."nib"."0.5.0"
       self.by-version."reds"."0.2.4"
     ];
@@ -9962,7 +9928,29 @@
     ];
     passthru.names = [ "kue" ];
   };
-  "kue" = self.by-version."kue"."0.7.5";
+  "kue" = self.by-version."kue"."0.8.5";
+  by-spec."labeled-stream-splicer"."^1.0.0" =
+    self.by-version."labeled-stream-splicer"."1.0.0";
+  by-version."labeled-stream-splicer"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-labeled-stream-splicer-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-1.0.0.tgz";
+        name = "labeled-stream-splicer-1.0.0.tgz";
+        sha1 = "cb1282bc2d8e9a4bfb3bcda184e8f017deea7c1d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."labeled-stream-splicer" or []);
+    deps = [
+      self.by-version."inherits"."2.0.1"
+      self.by-version."isarray"."0.0.1"
+      self.by-version."stream-splicer"."1.3.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "labeled-stream-splicer" ];
+  };
   by-spec."lazy"."~1.0.11" =
     self.by-version."lazy"."1.0.11";
   by-version."lazy"."1.0.11" = lib.makeOverridable self.buildNodePackage {
@@ -9996,7 +9984,7 @@
     buildInputs =
       (self.nativeDeps."lazystream" or []);
     deps = [
-      self.by-version."readable-stream"."1.0.27-1"
+      self.by-version."readable-stream"."1.0.31"
     ];
     peerDependencies = [
     ];
@@ -10022,55 +10010,56 @@
     passthru.names = [ "lcov-parse" ];
   };
   by-spec."lcov-result-merger"."*" =
-    self.by-version."lcov-result-merger"."0.0.2";
-  by-version."lcov-result-merger"."0.0.2" = lib.makeOverridable self.buildNodePackage {
-    name = "lcov-result-merger-0.0.2";
+    self.by-version."lcov-result-merger"."1.0.0";
+  by-version."lcov-result-merger"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "lcov-result-merger-1.0.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/lcov-result-merger/-/lcov-result-merger-0.0.2.tgz";
-        name = "lcov-result-merger-0.0.2.tgz";
-        sha1 = "72a538c09f76e5c79b511bcd1053948d4aa98f10";
+        url = "http://registry.npmjs.org/lcov-result-merger/-/lcov-result-merger-1.0.0.tgz";
+        name = "lcov-result-merger-1.0.0.tgz";
+        sha1 = "c0afba9711b1cd8ef6a43e71254a39a9882f6ff5";
       })
     ];
     buildInputs =
       (self.nativeDeps."lcov-result-merger" or []);
     deps = [
-      self.by-version."glob"."3.2.9"
+      self.by-version."through2"."0.5.1"
+      self.by-version."vinyl"."0.2.3"
+      self.by-version."vinyl-fs"."0.3.6"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "lcov-result-merger" ];
   };
-  "lcov-result-merger" = self.by-version."lcov-result-merger"."0.0.2";
+  "lcov-result-merger" = self.by-version."lcov-result-merger"."1.0.0";
   by-spec."less"."*" =
-    self.by-version."less"."1.7.0";
-  by-version."less"."1.7.0" = lib.makeOverridable self.buildNodePackage {
-    name = "less-1.7.0";
+    self.by-version."less"."1.7.4";
+  by-version."less"."1.7.4" = lib.makeOverridable self.buildNodePackage {
+    name = "less-1.7.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/less/-/less-1.7.0.tgz";
-        name = "less-1.7.0.tgz";
-        sha1 = "6f1293bac1f402c932c2ce21ba7337f7c635ba84";
+        url = "http://registry.npmjs.org/less/-/less-1.7.4.tgz";
+        name = "less-1.7.4.tgz";
+        sha1 = "1db03afd0d1b848d898d10d2690d79ee3834026d";
       })
     ];
     buildInputs =
       (self.nativeDeps."less" or []);
     deps = [
+      self.by-version."graceful-fs"."2.0.3"
       self.by-version."mime"."1.2.11"
       self.by-version."request"."2.34.0"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."clean-css"."2.1.8"
-      self.by-version."source-map"."0.1.33"
+      self.by-version."source-map"."0.1.38"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "less" ];
   };
-  "less" = self.by-version."less"."1.7.0";
-  by-spec."less"."^1.7.0" =
-    self.by-version."less"."1.7.0";
-  by-spec."less"."~1.7.0" =
-    self.by-version."less"."1.7.0";
+  "less" = self.by-version."less"."1.7.4";
+  by-spec."less"."^1.7.2" =
+    self.by-version."less"."1.7.4";
   by-spec."lexical-scope"."~1.1.0" =
     self.by-version."lexical-scope"."1.1.0";
   by-version."lexical-scope"."1.1.0" = lib.makeOverridable self.buildNodePackage {
@@ -10091,35 +10080,36 @@
     ];
     passthru.names = [ "lexical-scope" ];
   };
-  by-spec."libxmljs"."~0.8.1" =
-    self.by-version."libxmljs"."0.8.1";
-  by-version."libxmljs"."0.8.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-libxmljs-0.8.1";
+  by-spec."libxmljs"."~0.10.0" =
+    self.by-version."libxmljs"."0.10.0";
+  by-version."libxmljs"."0.10.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-libxmljs-0.10.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/libxmljs/-/libxmljs-0.8.1.tgz";
-        name = "libxmljs-0.8.1.tgz";
-        sha1 = "b8b1d3962a92dbc5be9dc798bac028e09db8d630";
+        url = "http://registry.npmjs.org/libxmljs/-/libxmljs-0.10.0.tgz";
+        name = "libxmljs-0.10.0.tgz";
+        sha1 = "847eb4b0545b02d1c235e1f8371818cf709d3256";
       })
     ];
     buildInputs =
       (self.nativeDeps."libxmljs" or []);
     deps = [
-      self.by-version."bindings"."1.0.0"
+      self.by-version."bindings"."1.1.1"
+      self.by-version."nan"."1.1.2"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "libxmljs" ];
   };
   by-spec."libyaml"."*" =
-    self.by-version."libyaml"."0.2.3";
-  by-version."libyaml"."0.2.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-libyaml-0.2.3";
+    self.by-version."libyaml"."0.2.4";
+  by-version."libyaml"."0.2.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-libyaml-0.2.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/libyaml/-/libyaml-0.2.3.tgz";
-        name = "libyaml-0.2.3.tgz";
-        sha1 = "c07e7fefcad6e09218ebf9ff814bbd520172add6";
+        url = "http://registry.npmjs.org/libyaml/-/libyaml-0.2.4.tgz";
+        name = "libyaml-0.2.4.tgz";
+        sha1 = "46b6abe00ef0bc0ac60ca599c0e7c80ff920e959";
       })
     ];
     buildInputs =
@@ -10130,16 +10120,16 @@
     ];
     passthru.names = [ "libyaml" ];
   };
-  "libyaml" = self.by-version."libyaml"."0.2.3";
+  "libyaml" = self.by-version."libyaml"."0.2.4";
   by-spec."lockfile"."~0.4.0" =
-    self.by-version."lockfile"."0.4.2";
-  by-version."lockfile"."0.4.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-lockfile-0.4.2";
+    self.by-version."lockfile"."0.4.3";
+  by-version."lockfile"."0.4.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-lockfile-0.4.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/lockfile/-/lockfile-0.4.2.tgz";
-        name = "lockfile-0.4.2.tgz";
-        sha1 = "ab91f5d3745bc005ae4fa34d078910d1f2b9612d";
+        url = "http://registry.npmjs.org/lockfile/-/lockfile-0.4.3.tgz";
+        name = "lockfile-0.4.3.tgz";
+        sha1 = "79b965ee9b32d9dd24b59cf81205e6dcb6d3b224";
       })
     ];
     buildInputs =
@@ -10150,9 +10140,7 @@
     ];
     passthru.names = [ "lockfile" ];
   };
-  by-spec."lockfile"."~0.4.2" =
-    self.by-version."lockfile"."0.4.2";
-  by-spec."lodash"."^2.4.1" =
+  by-spec."lodash"."2.4.1" =
     self.by-version."lodash"."2.4.1";
   by-version."lodash"."2.4.1" = lib.makeOverridable self.buildNodePackage {
     name = "node-lodash-2.4.1";
@@ -10171,25 +10159,10 @@
     ];
     passthru.names = [ "lodash" ];
   };
-  by-spec."lodash"."~0.10.0" =
-    self.by-version."lodash"."0.10.0";
-  by-version."lodash"."0.10.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-lodash-0.10.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash/-/lodash-0.10.0.tgz";
-        name = "lodash-0.10.0.tgz";
-        sha1 = "5254bbc2c46c827f535a27d631fd4f2bff374ce7";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash" ];
-  };
+  by-spec."lodash".">=2.4.1" =
+    self.by-version."lodash"."2.4.1";
+  by-spec."lodash"."^2.4.1" =
+    self.by-version."lodash"."2.4.1";
   by-spec."lodash"."~0.9.2" =
     self.by-version."lodash"."0.9.2";
   by-version."lodash"."0.9.2" = lib.makeOverridable self.buildNodePackage {
@@ -10209,74 +10182,15 @@
     ];
     passthru.names = [ "lodash" ];
   };
-  by-spec."lodash"."~1.2.1" =
-    self.by-version."lodash"."1.2.1";
-  by-version."lodash"."1.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-lodash-1.2.1";
+  by-spec."lodash"."~1.0.1" =
+    self.by-version."lodash"."1.0.1";
+  by-version."lodash"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-lodash-1.0.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/lodash/-/lodash-1.2.1.tgz";
-        name = "lodash-1.2.1.tgz";
-        sha1 = "ed47b16e46f06b2b40309b68e9163c17e93ea304";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash" ];
-  };
-  by-spec."lodash"."~1.3.0" =
-    self.by-version."lodash"."1.3.1";
-  by-version."lodash"."1.3.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-lodash-1.3.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash/-/lodash-1.3.1.tgz";
-        name = "lodash-1.3.1.tgz";
-        sha1 = "a4663b53686b895ff074e2ba504dfb76a8e2b770";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash" ];
-  };
-  by-spec."lodash"."~1.3.1" =
-    self.by-version."lodash"."1.3.1";
-  by-spec."lodash"."~2.1.0" =
-    self.by-version."lodash"."2.1.0";
-  by-version."lodash"."2.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-lodash-2.1.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash/-/lodash-2.1.0.tgz";
-        name = "lodash-2.1.0.tgz";
-        sha1 = "0637eaaa36a8a1cfc865c3adfb942189bfb0998d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash" ];
-  };
-  by-spec."lodash"."~2.2.1" =
-    self.by-version."lodash"."2.2.1";
-  by-version."lodash"."2.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-lodash-2.2.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash/-/lodash-2.2.1.tgz";
-        name = "lodash-2.2.1.tgz";
-        sha1 = "ca935fd14ab3c0c872abacf198b9cda501440867";
+        url = "http://registry.npmjs.org/lodash/-/lodash-1.0.1.tgz";
+        name = "lodash-1.0.1.tgz";
+        sha1 = "57945732498d92310e5bd4b1ff4f273a79e6c9fc";
       })
     ];
     buildInputs =
@@ -10289,6 +10203,26 @@
   };
   by-spec."lodash"."~2.4.1" =
     self.by-version."lodash"."2.4.1";
+  by-spec."lodash-deep"."^1.1.0" =
+    self.by-version."lodash-deep"."1.2.1";
+  by-version."lodash-deep"."1.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-lodash-deep-1.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash-deep/-/lodash-deep-1.2.1.tgz";
+        name = "lodash-deep-1.2.1.tgz";
+        sha1 = "04ea62f43112151388de983f7e07c3e6ded07225";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash-deep" or []);
+    deps = [
+      self.by-version."lodash"."2.4.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash-deep" ];
+  };
   by-spec."lodash-node"."~2.4.1" =
     self.by-version."lodash-node"."2.4.1";
   by-version."lodash-node"."2.4.1" = lib.makeOverridable self.buildNodePackage {
@@ -10308,197 +10242,15 @@
     ];
     passthru.names = [ "lodash-node" ];
   };
-  by-spec."lodash._isnative"."~2.4.1" =
-    self.by-version."lodash._isnative"."2.4.1";
-  by-version."lodash._isnative"."2.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-lodash._isnative-2.4.1";
+  by-spec."log-driver"."1.2.4" =
+    self.by-version."log-driver"."1.2.4";
+  by-version."log-driver"."1.2.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-log-driver-1.2.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz";
-        name = "lodash._isnative-2.4.1.tgz";
-        sha1 = "3ea6404b784a7be836c7b57580e1cdf79b14832c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash._isnative" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash._isnative" ];
-  };
-  by-spec."lodash._objecttypes"."~2.4.1" =
-    self.by-version."lodash._objecttypes"."2.4.1";
-  by-version."lodash._objecttypes"."2.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-lodash._objecttypes-2.4.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz";
-        name = "lodash._objecttypes-2.4.1.tgz";
-        sha1 = "7c0b7f69d98a1f76529f890b0cdb1b4dfec11c11";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash._objecttypes" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash._objecttypes" ];
-  };
-  by-spec."lodash._shimkeys"."~2.4.1" =
-    self.by-version."lodash._shimkeys"."2.4.1";
-  by-version."lodash._shimkeys"."2.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-lodash._shimkeys-2.4.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz";
-        name = "lodash._shimkeys-2.4.1.tgz";
-        sha1 = "6e9cc9666ff081f0b5a6c978b83e242e6949d203";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash._shimkeys" or []);
-    deps = [
-      self.by-version."lodash._objecttypes"."2.4.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash._shimkeys" ];
-  };
-  by-spec."lodash.debounce"."~2.4.1" =
-    self.by-version."lodash.debounce"."2.4.1";
-  by-version."lodash.debounce"."2.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-lodash.debounce-2.4.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash.debounce/-/lodash.debounce-2.4.1.tgz";
-        name = "lodash.debounce-2.4.1.tgz";
-        sha1 = "d8cead246ec4b926e8b85678fc396bfeba8cc6fc";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash.debounce" or []);
-    deps = [
-      self.by-version."lodash.isfunction"."2.4.1"
-      self.by-version."lodash.isobject"."2.4.1"
-      self.by-version."lodash.now"."2.4.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash.debounce" ];
-  };
-  by-spec."lodash.defaults"."~2.4.1" =
-    self.by-version."lodash.defaults"."2.4.1";
-  by-version."lodash.defaults"."2.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-lodash.defaults-2.4.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz";
-        name = "lodash.defaults-2.4.1.tgz";
-        sha1 = "a7e8885f05e68851144b6e12a8f3678026bc4c54";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash.defaults" or []);
-    deps = [
-      self.by-version."lodash.keys"."2.4.1"
-      self.by-version."lodash._objecttypes"."2.4.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash.defaults" ];
-  };
-  by-spec."lodash.isfunction"."~2.4.1" =
-    self.by-version."lodash.isfunction"."2.4.1";
-  by-version."lodash.isfunction"."2.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-lodash.isfunction-2.4.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-2.4.1.tgz";
-        name = "lodash.isfunction-2.4.1.tgz";
-        sha1 = "2cfd575c73e498ab57e319b77fa02adef13a94d1";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash.isfunction" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash.isfunction" ];
-  };
-  by-spec."lodash.isobject"."~2.4.1" =
-    self.by-version."lodash.isobject"."2.4.1";
-  by-version."lodash.isobject"."2.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-lodash.isobject-2.4.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz";
-        name = "lodash.isobject-2.4.1.tgz";
-        sha1 = "5a2e47fe69953f1ee631a7eba1fe64d2d06558f5";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash.isobject" or []);
-    deps = [
-      self.by-version."lodash._objecttypes"."2.4.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash.isobject" ];
-  };
-  by-spec."lodash.keys"."~2.4.1" =
-    self.by-version."lodash.keys"."2.4.1";
-  by-version."lodash.keys"."2.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-lodash.keys-2.4.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz";
-        name = "lodash.keys-2.4.1.tgz";
-        sha1 = "48dea46df8ff7632b10d706b8acb26591e2b3727";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash.keys" or []);
-    deps = [
-      self.by-version."lodash._isnative"."2.4.1"
-      self.by-version."lodash.isobject"."2.4.1"
-      self.by-version."lodash._shimkeys"."2.4.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash.keys" ];
-  };
-  by-spec."lodash.now"."~2.4.1" =
-    self.by-version."lodash.now"."2.4.1";
-  by-version."lodash.now"."2.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-lodash.now-2.4.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash.now/-/lodash.now-2.4.1.tgz";
-        name = "lodash.now-2.4.1.tgz";
-        sha1 = "6872156500525185faf96785bb7fe7fe15b562c6";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash.now" or []);
-    deps = [
-      self.by-version."lodash._isnative"."2.4.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash.now" ];
-  };
-  by-spec."log-driver"."1.2.1" =
-    self.by-version."log-driver"."1.2.1";
-  by-version."log-driver"."1.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-log-driver-1.2.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/log-driver/-/log-driver-1.2.1.tgz";
-        name = "log-driver-1.2.1.tgz";
-        sha1 = "ada8202a133e99764306652e195e28268b0bea5b";
+        url = "http://registry.npmjs.org/log-driver/-/log-driver-1.2.4.tgz";
+        name = "log-driver-1.2.4.tgz";
+        sha1 = "2d62d7faef45d8a71341961a04b0761eca99cfa3";
       })
     ];
     buildInputs =
@@ -10510,14 +10262,14 @@
     passthru.names = [ "log-driver" ];
   };
   by-spec."log4js"."~0.6.3" =
-    self.by-version."log4js"."0.6.14";
-  by-version."log4js"."0.6.14" = lib.makeOverridable self.buildNodePackage {
-    name = "node-log4js-0.6.14";
+    self.by-version."log4js"."0.6.18";
+  by-version."log4js"."0.6.18" = lib.makeOverridable self.buildNodePackage {
+    name = "node-log4js-0.6.18";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/log4js/-/log4js-0.6.14.tgz";
-        name = "log4js-0.6.14.tgz";
-        sha1 = "7c26a0a25536b42bafa17fd937b87536fad3b229";
+        url = "http://registry.npmjs.org/log4js/-/log4js-0.6.18.tgz";
+        name = "log4js-0.6.18.tgz";
+        sha1 = "b362d629b02e111434839502b5a24b3201f5d805";
       })
     ];
     buildInputs =
@@ -10525,31 +10277,12 @@
     deps = [
       self.by-version."async"."0.1.15"
       self.by-version."semver"."1.1.4"
-      self.by-version."readable-stream"."1.0.27-1"
+      self.by-version."readable-stream"."1.0.31"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "log4js" ];
   };
-  by-spec."long"."*" =
-    self.by-version."long"."1.1.2";
-  by-version."long"."1.1.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-long-1.1.2";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/long/-/long-1.1.2.tgz";
-        name = "long-1.1.2.tgz";
-        sha1 = "eaef5951ca7551d96926b82da242db9d6b28fb53";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."long" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "long" ];
-  };
   by-spec."longjohn"."~0.2.2" =
     self.by-version."longjohn"."0.2.4";
   by-version."longjohn"."0.2.4" = lib.makeOverridable self.buildNodePackage {
@@ -10645,6 +10378,8 @@
     ];
     passthru.names = [ "lru-cache" ];
   };
+  by-spec."lru-cache"."2.5.x" =
+    self.by-version."lru-cache"."2.5.0";
   by-spec."lru-cache"."~1.0.2" =
     self.by-version."lru-cache"."1.0.6";
   by-version."lru-cache"."1.0.6" = lib.makeOverridable self.buildNodePackage {
@@ -10664,25 +10399,6 @@
     ];
     passthru.names = [ "lru-cache" ];
   };
-  by-spec."lru-cache"."~2.3.0" =
-    self.by-version."lru-cache"."2.3.1";
-  by-version."lru-cache"."2.3.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-lru-cache-2.3.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.3.1.tgz";
-        name = "lru-cache-2.3.1.tgz";
-        sha1 = "b3adf6b3d856e954e2c390e6cef22081245a53d6";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lru-cache" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "lru-cache" ];
-  };
   by-spec."lru-cache"."~2.5.0" =
     self.by-version."lru-cache"."2.5.0";
   by-spec."lsmod"."~0.0.3" =
@@ -10705,50 +10421,29 @@
     passthru.names = [ "lsmod" ];
   };
   by-spec."mailcomposer".">= 0.1.27" =
-    self.by-version."mailcomposer"."0.2.9";
-  by-version."mailcomposer"."0.2.9" = lib.makeOverridable self.buildNodePackage {
-    name = "node-mailcomposer-0.2.9";
+    self.by-version."mailcomposer"."0.2.12";
+  by-version."mailcomposer"."0.2.12" = lib.makeOverridable self.buildNodePackage {
+    name = "node-mailcomposer-0.2.12";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/mailcomposer/-/mailcomposer-0.2.9.tgz";
-        name = "mailcomposer-0.2.9.tgz";
-        sha1 = "2b6417a4fb5de8ffcaf1a27e1b024463903f908e";
+        url = "http://registry.npmjs.org/mailcomposer/-/mailcomposer-0.2.12.tgz";
+        name = "mailcomposer-0.2.12.tgz";
+        sha1 = "4d02a604616adcb45fb36d37513f4c1bd0b75681";
       })
     ];
     buildInputs =
       (self.nativeDeps."mailcomposer" or []);
     deps = [
-      self.by-version."mimelib"."0.2.14"
+      self.by-version."mimelib"."0.2.17"
       self.by-version."mime"."1.2.11"
       self.by-version."he"."0.3.6"
-      self.by-version."punycode"."1.2.4"
       self.by-version."follow-redirects"."0.0.3"
-      self.by-version."dkim-signer"."0.1.0"
+      self.by-version."dkim-signer"."0.1.2"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "mailcomposer" ];
   };
-  by-spec."map-key"."^0.1.1" =
-    self.by-version."map-key"."0.1.1";
-  by-version."map-key"."0.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-map-key-0.1.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/map-key/-/map-key-0.1.1.tgz";
-        name = "map-key-0.1.1.tgz";
-        sha1 = "cf0d6ad80ae145477d25904c9eb44b23ac471c8b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."map-key" or []);
-    deps = [
-      self.by-version."mout"."0.9.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "map-key" ];
-  };
   by-spec."marked"."*" =
     self.by-version."marked"."0.3.2";
   by-version."marked"."0.3.2" = lib.makeOverridable self.buildNodePackage {
@@ -10769,6 +10464,8 @@
     passthru.names = [ "marked" ];
   };
   "marked" = self.by-version."marked"."0.3.2";
+  by-spec."marked".">=0.3.1" =
+    self.by-version."marked"."0.3.2";
   by-spec."maxmin"."^0.1.0" =
     self.by-version."maxmin"."0.1.0";
   by-version."maxmin"."0.1.0" = lib.makeOverridable self.buildNodePackage {
@@ -10784,15 +10481,38 @@
       (self.nativeDeps."maxmin" or []);
     deps = [
       self.by-version."gzip-size"."0.1.1"
-      self.by-version."pretty-bytes"."0.1.0"
+      self.by-version."pretty-bytes"."0.1.2"
       self.by-version."chalk"."0.4.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "maxmin" ];
   };
-  by-spec."maxmin"."~0.1.0" =
-    self.by-version."maxmin"."0.1.0";
+  by-spec."maxmin"."^0.2.0" =
+    self.by-version."maxmin"."0.2.2";
+  by-version."maxmin"."0.2.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-maxmin-0.2.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/maxmin/-/maxmin-0.2.2.tgz";
+        name = "maxmin-0.2.2.tgz";
+        sha1 = "a36ced8cc22e3abcd108cfb797a3a4b40275593f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."maxmin" or []);
+    deps = [
+      self.by-version."chalk"."0.5.1"
+      self.by-version."figures"."1.3.2"
+      self.by-version."gzip-size"."0.2.0"
+      self.by-version."pretty-bytes"."0.1.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "maxmin" ];
+  };
+  by-spec."maxmin"."~0.2.0" =
+    self.by-version."maxmin"."0.2.2";
   by-spec."meat"."*" =
     self.by-version."meat"."0.2.5";
   by-version."meat"."0.2.5" = lib.makeOverridable self.buildNodePackage {
@@ -10819,28 +10539,27 @@
     passthru.names = [ "meat" ];
   };
   "meat" = self.by-version."meat"."0.2.5";
-  by-spec."memoizee"."~0.2.5" =
-    self.by-version."memoizee"."0.2.6";
-  by-version."memoizee"."0.2.6" = lib.makeOverridable self.buildNodePackage {
-    name = "node-memoizee-0.2.6";
+  by-spec."media-typer"."0.2.0" =
+    self.by-version."media-typer"."0.2.0";
+  by-version."media-typer"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-media-typer-0.2.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/memoizee/-/memoizee-0.2.6.tgz";
-        name = "memoizee-0.2.6.tgz";
-        sha1 = "bb45a7ad02530082f1612671dab35219cd2e0741";
+        url = "http://registry.npmjs.org/media-typer/-/media-typer-0.2.0.tgz";
+        name = "media-typer-0.2.0.tgz";
+        sha1 = "d8a065213adfeaa2e76321a2b6dda36ff6335984";
       })
     ];
     buildInputs =
-      (self.nativeDeps."memoizee" or []);
+      (self.nativeDeps."media-typer" or []);
     deps = [
-      self.by-version."es5-ext"."0.9.2"
-      self.by-version."event-emitter"."0.2.2"
-      self.by-version."next-tick"."0.1.0"
     ];
     peerDependencies = [
     ];
-    passthru.names = [ "memoizee" ];
+    passthru.names = [ "media-typer" ];
   };
+  by-spec."media-typer"."~0.2.0" =
+    self.by-version."media-typer"."0.2.0";
   by-spec."merge-descriptors"."0.0.2" =
     self.by-version."merge-descriptors"."0.0.2";
   by-version."merge-descriptors"."0.0.2" = lib.makeOverridable self.buildNodePackage {
@@ -10860,45 +10579,29 @@
     ];
     passthru.names = [ "merge-descriptors" ];
   };
-  by-spec."method-override"."1.0.0" =
-    self.by-version."method-override"."1.0.0";
-  by-version."method-override"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-method-override-1.0.0";
+  by-spec."method-override"."~2.1.3" =
+    self.by-version."method-override"."2.1.3";
+  by-version."method-override"."2.1.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-method-override-2.1.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/method-override/-/method-override-1.0.0.tgz";
-        name = "method-override-1.0.0.tgz";
-        sha1 = "9e5bfbd80f3b9e043801dd3fe60bbab0f15b5f61";
+        url = "http://registry.npmjs.org/method-override/-/method-override-2.1.3.tgz";
+        name = "method-override-2.1.3.tgz";
+        sha1 = "511f41c4fb1dccdb6ab1844da5dc6ea81b7c1135";
       })
     ];
     buildInputs =
       (self.nativeDeps."method-override" or []);
     deps = [
-      self.by-version."methods"."0.1.0"
+      self.by-version."debug"."1.0.4"
+      self.by-version."methods"."1.1.0"
+      self.by-version."parseurl"."1.3.0"
+      self.by-version."vary"."1.0.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "method-override" ];
   };
-  by-spec."methods"."*" =
-    self.by-version."methods"."0.1.0";
-  by-version."methods"."0.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-methods-0.1.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/methods/-/methods-0.1.0.tgz";
-        name = "methods-0.1.0.tgz";
-        sha1 = "335d429eefd21b7bacf2e9c922a8d2bd14a30e4f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."methods" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "methods" ];
-  };
   by-spec."methods"."0.0.1" =
     self.by-version."methods"."0.0.1";
   by-version."methods"."0.0.1" = lib.makeOverridable self.buildNodePackage {
@@ -10920,6 +10623,80 @@
   };
   by-spec."methods"."0.1.0" =
     self.by-version."methods"."0.1.0";
+  by-version."methods"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-methods-0.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/methods/-/methods-0.1.0.tgz";
+        name = "methods-0.1.0.tgz";
+        sha1 = "335d429eefd21b7bacf2e9c922a8d2bd14a30e4f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."methods" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "methods" ];
+  };
+  by-spec."methods"."1.0.0" =
+    self.by-version."methods"."1.0.0";
+  by-version."methods"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-methods-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/methods/-/methods-1.0.0.tgz";
+        name = "methods-1.0.0.tgz";
+        sha1 = "9a73d86375dfcef26ef61ca3e4b8a2e2538a80e3";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."methods" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "methods" ];
+  };
+  by-spec."methods"."1.0.1" =
+    self.by-version."methods"."1.0.1";
+  by-version."methods"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-methods-1.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/methods/-/methods-1.0.1.tgz";
+        name = "methods-1.0.1.tgz";
+        sha1 = "75bc91943dffd7da037cf3eeb0ed73a0037cd14b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."methods" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "methods" ];
+  };
+  by-spec."methods"."1.1.0" =
+    self.by-version."methods"."1.1.0";
+  by-version."methods"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-methods-1.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/methods/-/methods-1.1.0.tgz";
+        name = "methods-1.1.0.tgz";
+        sha1 = "5dca4ee12df52ff3b056145986a8f01cbc86436f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."methods" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "methods" ];
+  };
   by-spec."mime"."*" =
     self.by-version."mime"."1.2.11";
   by-version."mime"."1.2.11" = lib.makeOverridable self.buildNodePackage {
@@ -11017,8 +10794,6 @@
     ];
     passthru.names = [ "mime" ];
   };
-  by-spec."mime"."1.2.x" =
-    self.by-version."mime"."1.2.11";
   by-spec."mime".">= 0.0.1" =
     self.by-version."mime"."1.2.11";
   by-spec."mime"."~1.2.11" =
@@ -11029,21 +10804,61 @@
     self.by-version."mime"."1.2.11";
   by-spec."mime"."~1.2.9" =
     self.by-version."mime"."1.2.11";
-  by-spec."mimelib"."~0.2.14" =
-    self.by-version."mimelib"."0.2.14";
-  by-version."mimelib"."0.2.14" = lib.makeOverridable self.buildNodePackage {
-    name = "node-mimelib-0.2.14";
+  by-spec."mime-types"."1.0.0" =
+    self.by-version."mime-types"."1.0.0";
+  by-version."mime-types"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-mime-types-1.0.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/mimelib/-/mimelib-0.2.14.tgz";
-        name = "mimelib-0.2.14.tgz";
-        sha1 = "2a1aa724bd190b85bd526e6317ab6106edfd6831";
+        url = "http://registry.npmjs.org/mime-types/-/mime-types-1.0.0.tgz";
+        name = "mime-types-1.0.0.tgz";
+        sha1 = "6a7b4a6af2e7d92f97afe03f047c7801e8f001d2";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mime-types" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mime-types" ];
+  };
+  by-spec."mime-types"."~1.0.0" =
+    self.by-version."mime-types"."1.0.2";
+  by-version."mime-types"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-mime-types-1.0.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz";
+        name = "mime-types-1.0.2.tgz";
+        sha1 = "995ae1392ab8affcbfcb2641dd054e943c0d5dce";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mime-types" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mime-types" ];
+  };
+  by-spec."mime-types"."~1.0.1" =
+    self.by-version."mime-types"."1.0.2";
+  by-spec."mimelib"."~0.2.15" =
+    self.by-version."mimelib"."0.2.17";
+  by-version."mimelib"."0.2.17" = lib.makeOverridable self.buildNodePackage {
+    name = "node-mimelib-0.2.17";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mimelib/-/mimelib-0.2.17.tgz";
+        name = "mimelib-0.2.17.tgz";
+        sha1 = "6b0cb91a6451b92649e4cc98c5b64eed2d19a4aa";
       })
     ];
     buildInputs =
       (self.nativeDeps."mimelib" or []);
     deps = [
-      self.by-version."encoding"."0.1.7"
+      self.by-version."encoding"."0.1.8"
       self.by-version."addressparser"."0.2.1"
     ];
     peerDependencies = [
@@ -11051,14 +10866,14 @@
     passthru.names = [ "mimelib" ];
   };
   by-spec."minimatch"."0" =
-    self.by-version."minimatch"."0.2.14";
-  by-version."minimatch"."0.2.14" = lib.makeOverridable self.buildNodePackage {
-    name = "node-minimatch-0.2.14";
+    self.by-version."minimatch"."0.4.0";
+  by-version."minimatch"."0.4.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-minimatch-0.4.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz";
-        name = "minimatch-0.2.14.tgz";
-        sha1 = "c74e780574f63c6f9a090e90efbe6ef53a6a756a";
+        url = "http://registry.npmjs.org/minimatch/-/minimatch-0.4.0.tgz";
+        name = "minimatch-0.4.0.tgz";
+        sha1 = "bd2c7d060d2c8c8fd7cde7f1f2ed2d5b270fdb1b";
       })
     ];
     buildInputs =
@@ -11093,25 +10908,86 @@
   };
   by-spec."minimatch"."0.2.x" =
     self.by-version."minimatch"."0.2.14";
+  by-version."minimatch"."0.2.14" = lib.makeOverridable self.buildNodePackage {
+    name = "node-minimatch-0.2.14";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz";
+        name = "minimatch-0.2.14.tgz";
+        sha1 = "c74e780574f63c6f9a090e90efbe6ef53a6a756a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."minimatch" or []);
+    deps = [
+      self.by-version."lru-cache"."2.5.0"
+      self.by-version."sigmund"."1.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "minimatch" ];
+  };
+  by-spec."minimatch"."0.3" =
+    self.by-version."minimatch"."0.3.0";
+  by-version."minimatch"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-minimatch-0.3.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz";
+        name = "minimatch-0.3.0.tgz";
+        sha1 = "275d8edaac4f1bb3326472089e7949c8394699dd";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."minimatch" or []);
+    deps = [
+      self.by-version."lru-cache"."2.5.0"
+      self.by-version."sigmund"."1.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "minimatch" ];
+  };
   by-spec."minimatch"."0.x" =
-    self.by-version."minimatch"."0.2.14";
+    self.by-version."minimatch"."0.4.0";
   by-spec."minimatch"."0.x.x" =
-    self.by-version."minimatch"."0.2.14";
+    self.by-version."minimatch"."0.4.0";
+  by-spec."minimatch"."1" =
+    self.by-version."minimatch"."1.0.0";
+  by-version."minimatch"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-minimatch-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz";
+        name = "minimatch-1.0.0.tgz";
+        sha1 = "e0dd2120b49e1b724ce8d714c520822a9438576d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."minimatch" or []);
+    deps = [
+      self.by-version."lru-cache"."2.5.0"
+      self.by-version."sigmund"."1.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "minimatch" ];
+  };
   by-spec."minimatch".">=0.2.4" =
-    self.by-version."minimatch"."0.2.14";
+    self.by-version."minimatch"."1.0.0";
+  by-spec."minimatch"."^1.0.0" =
+    self.by-version."minimatch"."1.0.0";
   by-spec."minimatch"."~0.2" =
     self.by-version."minimatch"."0.2.14";
-  by-spec."minimatch"."~0.2.0" =
-    self.by-version."minimatch"."0.2.14";
   by-spec."minimatch"."~0.2.11" =
     self.by-version."minimatch"."0.2.14";
   by-spec."minimatch"."~0.2.12" =
     self.by-version."minimatch"."0.2.14";
-  by-spec."minimatch"."~0.2.14" =
-    self.by-version."minimatch"."0.2.14";
   by-spec."minimatch"."~0.2.9" =
     self.by-version."minimatch"."0.2.14";
-  by-spec."minimist"."~0.0.1" =
+  by-spec."minimatch"."~0.3.0" =
+    self.by-version."minimatch"."0.3.0";
+  by-spec."minimist"."0.0.8" =
     self.by-version."minimist"."0.0.8";
   by-version."minimist"."0.0.8" = lib.makeOverridable self.buildNodePackage {
     name = "node-minimist-0.0.8";
@@ -11130,19 +11006,74 @@
     ];
     passthru.names = [ "minimist" ];
   };
-  by-spec."minimist"."~0.0.5" =
-    self.by-version."minimist"."0.0.8";
-  by-spec."minimist"."~0.0.7" =
-    self.by-version."minimist"."0.0.8";
-  by-spec."ministyle"."~0.1.3" =
-    self.by-version."ministyle"."0.1.3";
-  by-version."ministyle"."0.1.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-ministyle-0.1.3";
+  by-spec."minimist"."^0.1.0" =
+    self.by-version."minimist"."0.1.0";
+  by-version."minimist"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-minimist-0.1.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/ministyle/-/ministyle-0.1.3.tgz";
-        name = "ministyle-0.1.3.tgz";
-        sha1 = "d7a639f29e9450b9d5ebf2255d1fa8d1d9d89900";
+        url = "http://registry.npmjs.org/minimist/-/minimist-0.1.0.tgz";
+        name = "minimist-0.1.0.tgz";
+        sha1 = "99df657a52574c21c9057497df742790b2b4c0de";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."minimist" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "minimist" ];
+  };
+  by-spec."minimist"."~0.0.1" =
+    self.by-version."minimist"."0.0.10";
+  by-version."minimist"."0.0.10" = lib.makeOverridable self.buildNodePackage {
+    name = "node-minimist-0.0.10";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz";
+        name = "minimist-0.0.10.tgz";
+        sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."minimist" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "minimist" ];
+  };
+  by-spec."minimist"."~0.0.7" =
+    self.by-version."minimist"."0.0.10";
+  by-spec."minimist"."~0.2.0" =
+    self.by-version."minimist"."0.2.0";
+  by-version."minimist"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-minimist-0.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz";
+        name = "minimist-0.2.0.tgz";
+        sha1 = "4dffe525dae2b864c66c2e23c6271d7afdecefce";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."minimist" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "minimist" ];
+  };
+  by-spec."ministyle"."~0.1.3" =
+    self.by-version."ministyle"."0.1.4";
+  by-version."ministyle"."0.1.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-ministyle-0.1.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/ministyle/-/ministyle-0.1.4.tgz";
+        name = "ministyle-0.1.4.tgz";
+        sha1 = "b10481eb16aa8f7b6cd983817393a44da0e5a0cd";
       })
     ];
     buildInputs =
@@ -11174,29 +11105,28 @@
     passthru.names = [ "miniwrite" ];
   };
   by-spec."mkdirp"."*" =
-    self.by-version."mkdirp"."0.3.5";
-  by-version."mkdirp"."0.3.5" = lib.makeOverridable self.buildNodePackage {
-    name = "node-mkdirp-0.3.5";
+    self.by-version."mkdirp"."0.5.0";
+  by-version."mkdirp"."0.5.0" = lib.makeOverridable self.buildNodePackage {
+    name = "mkdirp-0.5.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz";
-        name = "mkdirp-0.3.5.tgz";
-        sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7";
+        url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz";
+        name = "mkdirp-0.5.0.tgz";
+        sha1 = "1d73076a6df986cd9344e15e71fcc05a4c9abf12";
       })
     ];
     buildInputs =
       (self.nativeDeps."mkdirp" or []);
     deps = [
+      self.by-version."minimist"."0.0.8"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "mkdirp" ];
   };
-  "mkdirp" = self.by-version."mkdirp"."0.3.5";
+  "mkdirp" = self.by-version."mkdirp"."0.5.0";
   by-spec."mkdirp"."0" =
-    self.by-version."mkdirp"."0.3.5";
-  by-spec."mkdirp"."0.3" =
-    self.by-version."mkdirp"."0.3.5";
+    self.by-version."mkdirp"."0.5.0";
   by-spec."mkdirp"."0.3.0" =
     self.by-version."mkdirp"."0.3.0";
   by-version."mkdirp"."0.3.0" = lib.makeOverridable self.buildNodePackage {
@@ -11218,46 +11148,81 @@
   };
   by-spec."mkdirp"."0.3.5" =
     self.by-version."mkdirp"."0.3.5";
+  by-version."mkdirp"."0.3.5" = lib.makeOverridable self.buildNodePackage {
+    name = "node-mkdirp-0.3.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz";
+        name = "mkdirp-0.3.5.tgz";
+        sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mkdirp" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mkdirp" ];
+  };
   by-spec."mkdirp"."0.3.x" =
     self.by-version."mkdirp"."0.3.5";
+  by-spec."mkdirp"."0.5" =
+    self.by-version."mkdirp"."0.5.0";
+  by-spec."mkdirp"."0.5.0" =
+    self.by-version."mkdirp"."0.5.0";
+  by-spec."mkdirp"."0.5.x" =
+    self.by-version."mkdirp"."0.5.0";
   by-spec."mkdirp"."0.x.x" =
-    self.by-version."mkdirp"."0.3.5";
-  by-spec."mkdirp"."^0.3.5" =
-    self.by-version."mkdirp"."0.3.5";
+    self.by-version."mkdirp"."0.5.0";
+  by-spec."mkdirp".">=0.5 0" =
+    self.by-version."mkdirp"."0.5.0";
+  by-spec."mkdirp"."^0.5.0" =
+    self.by-version."mkdirp"."0.5.0";
   by-spec."mkdirp"."~0.3.3" =
     self.by-version."mkdirp"."0.3.5";
   by-spec."mkdirp"."~0.3.4" =
     self.by-version."mkdirp"."0.3.5";
   by-spec."mkdirp"."~0.3.5" =
     self.by-version."mkdirp"."0.3.5";
-  by-spec."mkpath"."~0.1.0" =
-    self.by-version."mkpath"."0.1.0";
-  by-version."mkpath"."0.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-mkpath-0.1.0";
+  by-spec."mkdirp"."~0.5.0" =
+    self.by-version."mkdirp"."0.5.0";
+  by-spec."mocha"."*" =
+    self.by-version."mocha"."1.21.4";
+  by-version."mocha"."1.21.4" = lib.makeOverridable self.buildNodePackage {
+    name = "mocha-1.21.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/mkpath/-/mkpath-0.1.0.tgz";
-        name = "mkpath-0.1.0.tgz";
-        sha1 = "7554a6f8d871834cc97b5462b122c4c124d6de91";
+        url = "http://registry.npmjs.org/mocha/-/mocha-1.21.4.tgz";
+        name = "mocha-1.21.4.tgz";
+        sha1 = "e77d69c3773ba3e2b4fe6b628c28b5dd43880adc";
       })
     ];
     buildInputs =
-      (self.nativeDeps."mkpath" or []);
+      (self.nativeDeps."mocha" or []);
     deps = [
+      self.by-version."commander"."2.0.0"
+      self.by-version."growl"."1.8.1"
+      self.by-version."jade"."0.26.3"
+      self.by-version."diff"."1.0.7"
+      self.by-version."debug"."1.0.4"
+      self.by-version."mkdirp"."0.3.5"
+      self.by-version."glob"."3.2.3"
     ];
     peerDependencies = [
     ];
-    passthru.names = [ "mkpath" ];
+    passthru.names = [ "mocha" ];
   };
-  by-spec."mocha"."*" =
-    self.by-version."mocha"."1.18.2";
-  by-version."mocha"."1.18.2" = lib.makeOverridable self.buildNodePackage {
-    name = "mocha-1.18.2";
+  "mocha" = self.by-version."mocha"."1.21.4";
+  by-spec."mocha"."~1.20.1" =
+    self.by-version."mocha"."1.20.1";
+  by-version."mocha"."1.20.1" = lib.makeOverridable self.buildNodePackage {
+    name = "mocha-1.20.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/mocha/-/mocha-1.18.2.tgz";
-        name = "mocha-1.18.2.tgz";
-        sha1 = "800848f8f7884c61eefcfa2a27304ba9e5446d0b";
+        url = "http://registry.npmjs.org/mocha/-/mocha-1.20.1.tgz";
+        name = "mocha-1.20.1.tgz";
+        sha1 = "f343832d9fe0c7d97c64fc70448f5136df9fed5b";
       })
     ];
     buildInputs =
@@ -11267,34 +11232,7 @@
       self.by-version."growl"."1.7.0"
       self.by-version."jade"."0.26.3"
       self.by-version."diff"."1.0.7"
-      self.by-version."debug"."0.8.1"
-      self.by-version."mkdirp"."0.3.5"
-      self.by-version."glob"."3.2.3"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "mocha" ];
-  };
-  "mocha" = self.by-version."mocha"."1.18.2";
-  by-spec."mocha"."1.13.x" =
-    self.by-version."mocha"."1.13.0";
-  by-version."mocha"."1.13.0" = lib.makeOverridable self.buildNodePackage {
-    name = "mocha-1.13.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mocha/-/mocha-1.13.0.tgz";
-        name = "mocha-1.13.0.tgz";
-        sha1 = "8d8fa4e310b94cc6efeb3ed26aeca96dea93307c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mocha" or []);
-    deps = [
-      self.by-version."commander"."0.6.1"
-      self.by-version."growl"."1.7.0"
-      self.by-version."jade"."0.26.3"
-      self.by-version."diff"."1.0.7"
-      self.by-version."debug"."0.8.1"
+      self.by-version."debug"."1.0.4"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."glob"."3.2.3"
     ];
@@ -11303,28 +11241,28 @@
     passthru.names = [ "mocha" ];
   };
   by-spec."mocha-phantomjs"."*" =
-    self.by-version."mocha-phantomjs"."3.3.2";
-  by-version."mocha-phantomjs"."3.3.2" = lib.makeOverridable self.buildNodePackage {
-    name = "mocha-phantomjs-3.3.2";
+    self.by-version."mocha-phantomjs"."3.5.0";
+  by-version."mocha-phantomjs"."3.5.0" = lib.makeOverridable self.buildNodePackage {
+    name = "mocha-phantomjs-3.5.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/mocha-phantomjs/-/mocha-phantomjs-3.3.2.tgz";
-        name = "mocha-phantomjs-3.3.2.tgz";
-        sha1 = "2d7cc9926f0fbbeb341697d7f2a031151c601722";
+        url = "http://registry.npmjs.org/mocha-phantomjs/-/mocha-phantomjs-3.5.0.tgz";
+        name = "mocha-phantomjs-3.5.0.tgz";
+        sha1 = "56fb4072122b4061b21e9c3901e35f4a7c58a93e";
       })
     ];
     buildInputs =
       (self.nativeDeps."mocha-phantomjs" or []);
     deps = [
-      self.by-version."mocha"."1.13.0"
-      self.by-version."commander"."1.2.0"
-      self.by-version."which"."1.0.5"
+      self.by-version."mocha"."1.20.1"
+      self.by-version."commander"."2.0.0"
     ];
     peerDependencies = [
+      self.by-version."phantomjs"."1.9.7-15"
     ];
     passthru.names = [ "mocha-phantomjs" ];
   };
-  "mocha-phantomjs" = self.by-version."mocha-phantomjs"."3.3.2";
+  "mocha-phantomjs" = self.by-version."mocha-phantomjs"."3.5.0";
   by-spec."mocha-unfunk-reporter"."*" =
     self.by-version."mocha-unfunk-reporter"."0.4.0";
   by-version."mocha-unfunk-reporter"."0.4.0" = lib.makeOverridable self.buildNodePackage {
@@ -11342,62 +11280,41 @@
       self.by-version."jsesc"."0.4.3"
       self.by-version."unfunk-diff"."0.0.2"
       self.by-version."miniwrite"."0.1.3"
-      self.by-version."ministyle"."0.1.3"
+      self.by-version."ministyle"."0.1.4"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "mocha-unfunk-reporter" ];
   };
   "mocha-unfunk-reporter" = self.by-version."mocha-unfunk-reporter"."0.4.0";
-  by-spec."module-deps"."~1.10.0" =
-    self.by-version."module-deps"."1.10.0";
-  by-version."module-deps"."1.10.0" = lib.makeOverridable self.buildNodePackage {
-    name = "module-deps-1.10.0";
+  by-spec."module-deps"."^3.5.0" =
+    self.by-version."module-deps"."3.5.5";
+  by-version."module-deps"."3.5.5" = lib.makeOverridable self.buildNodePackage {
+    name = "module-deps-3.5.5";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/module-deps/-/module-deps-1.10.0.tgz";
-        name = "module-deps-1.10.0.tgz";
-        sha1 = "57a9cac9dbd092428ec5249f6cf37fb249d77db6";
+        url = "http://registry.npmjs.org/module-deps/-/module-deps-3.5.5.tgz";
+        name = "module-deps-3.5.5.tgz";
+        sha1 = "08e52113552fe72a6f912b1bbe58e9e84ff1ac4a";
       })
     ];
     buildInputs =
       (self.nativeDeps."module-deps" or []);
     deps = [
-      self.by-version."JSONStream"."0.7.2"
-      self.by-version."browser-resolve"."1.2.4"
-      self.by-version."concat-stream"."1.4.5"
+      self.by-version."JSONStream"."0.7.4"
+      self.by-version."browser-resolve"."1.3.2"
+      self.by-version."concat-stream"."1.4.6"
       self.by-version."detective"."3.1.0"
-      self.by-version."minimist"."0.0.8"
-      self.by-version."parents"."0.0.2"
-      self.by-version."resolve"."0.6.3"
-      self.by-version."through"."2.3.4"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "module-deps" ];
-  };
-  by-spec."module-deps"."~1.8.0" =
-    self.by-version."module-deps"."1.8.1";
-  by-version."module-deps"."1.8.1" = lib.makeOverridable self.buildNodePackage {
-    name = "module-deps-1.8.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/module-deps/-/module-deps-1.8.1.tgz";
-        name = "module-deps-1.8.1.tgz";
-        sha1 = "9d603b286f87cf62aad9e3f7b65a2f8bfa21de5b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."module-deps" or []);
-    deps = [
-      self.by-version."JSONStream"."0.7.2"
-      self.by-version."browser-resolve"."1.2.4"
-      self.by-version."concat-stream"."1.4.5"
-      self.by-version."detective"."3.1.0"
-      self.by-version."minimist"."0.0.8"
-      self.by-version."parents"."0.0.2"
-      self.by-version."resolve"."0.6.3"
-      self.by-version."through"."2.3.4"
+      self.by-version."duplexer2"."0.0.2"
+      self.by-version."inherits"."2.0.1"
+      self.by-version."minimist"."0.2.0"
+      self.by-version."parents"."1.0.0"
+      self.by-version."readable-stream"."1.1.13"
+      self.by-version."resolve"."0.7.4"
+      self.by-version."shallow-copy"."0.0.1"
+      self.by-version."stream-combiner2"."1.0.1"
+      self.by-version."subarg"."0.0.1"
+      self.by-version."through2"."0.4.2"
     ];
     peerDependencies = [
     ];
@@ -11441,15 +11358,15 @@
     ];
     passthru.names = [ "moment" ];
   };
-  by-spec."moment"."~2.5.1" =
-    self.by-version."moment"."2.5.1";
-  by-version."moment"."2.5.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-moment-2.5.1";
+  by-spec."moment"."~2.7.0" =
+    self.by-version."moment"."2.7.0";
+  by-version."moment"."2.7.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-moment-2.7.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/moment/-/moment-2.5.1.tgz";
-        name = "moment-2.5.1.tgz";
-        sha1 = "7146a3900533064ca799d5e792f4e480ee0e82bc";
+        url = "http://registry.npmjs.org/moment/-/moment-2.7.0.tgz";
+        name = "moment-2.7.0.tgz";
+        sha1 = "359a19ec634cda3c706c8709adda54c0329aaec4";
       })
     ];
     buildInputs =
@@ -11461,27 +11378,28 @@
     passthru.names = [ "moment" ];
   };
   by-spec."mongodb"."*" =
-    self.by-version."mongodb"."1.4.2";
-  by-version."mongodb"."1.4.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-mongodb-1.4.2";
+    self.by-version."mongodb"."1.4.8";
+  by-version."mongodb"."1.4.8" = lib.makeOverridable self.buildNodePackage {
+    name = "node-mongodb-1.4.8";
     src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.2.tgz";
-        name = "mongodb-1.4.2.tgz";
-        sha1 = "68b5a5ac7ee146dcbdf17d01f60ffe88e61e76aa";
+      (self.patchSource fetchurl {
+        url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.8.tgz";
+        name = "mongodb-1.4.8.tgz";
+        sha1 = "808802e296f78e5062ef46a87a90abd68031552f";
       })
     ];
     buildInputs =
       (self.nativeDeps."mongodb" or []);
     deps = [
-      self.by-version."bson"."0.2.7"
+      self.by-version."bson"."0.2.11"
       self.by-version."kerberos"."0.0.3"
+      self.by-version."readable-stream"."1.1.13"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "mongodb" ];
   };
-  "mongodb" = self.by-version."mongodb"."1.4.2";
+  "mongodb" = self.by-version."mongodb"."1.4.8";
   by-spec."mongodb"."1.2.14" =
     self.by-version."mongodb"."1.2.14";
   by-version."mongodb"."1.2.14" = lib.makeOverridable self.buildNodePackage {
@@ -11523,7 +11441,7 @@
     ];
     passthru.names = [ "mongodb" ];
   };
-  by-spec."mongodb"."1.3.23" =
+  by-spec."mongodb"."1.3.x" =
     self.by-version."mongodb"."1.3.23";
   by-version."mongodb"."1.3.23" = lib.makeOverridable self.buildNodePackage {
     name = "node-mongodb-1.3.23";
@@ -11544,35 +11462,27 @@
     ];
     passthru.names = [ "mongodb" ];
   };
-  by-spec."mongodb"."1.3.x" =
-    self.by-version."mongodb"."1.3.23";
-  by-spec."mongoose"."*" =
-    self.by-version."mongoose"."3.8.8";
-  by-version."mongoose"."3.8.8" = lib.makeOverridable self.buildNodePackage {
-    name = "node-mongoose-3.8.8";
+  by-spec."mongodb"."1.4.7" =
+    self.by-version."mongodb"."1.4.7";
+  by-version."mongodb"."1.4.7" = lib.makeOverridable self.buildNodePackage {
+    name = "node-mongodb-1.4.7";
     src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mongoose/-/mongoose-3.8.8.tgz";
-        name = "mongoose-3.8.8.tgz";
-        sha1 = "ab046f1fa17b0bdf090a04b6d034d87d240a47c2";
+      (self.patchSource fetchurl {
+        url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.7.tgz";
+        name = "mongodb-1.4.7.tgz";
+        sha1 = "f605b5d43c6c018c7d56d2fb53984dd60a7be128";
       })
     ];
     buildInputs =
-      (self.nativeDeps."mongoose" or []);
+      (self.nativeDeps."mongodb" or []);
     deps = [
-      self.by-version."hooks"."0.2.1"
-      self.by-version."mongodb"."1.3.23"
-      self.by-version."ms"."0.1.0"
-      self.by-version."sliced"."0.0.5"
-      self.by-version."muri"."0.3.1"
-      self.by-version."mpromise"."0.4.3"
-      self.by-version."mpath"."0.1.1"
-      self.by-version."regexp-clone"."0.0.1"
-      self.by-version."mquery"."0.5.3"
+      self.by-version."bson"."0.2.9"
+      self.by-version."kerberos"."0.0.3"
+      self.by-version."readable-stream"."1.1.13"
     ];
     peerDependencies = [
     ];
-    passthru.names = [ "mongoose" ];
+    passthru.names = [ "mongodb" ];
   };
   by-spec."mongoose"."3.6.7" =
     self.by-version."mongoose"."3.6.7";
@@ -11628,6 +11538,34 @@
     passthru.names = [ "mongoose" ];
   };
   "mongoose" = self.by-version."mongoose"."3.6.20";
+  by-spec."mongoose"."3.8.x" =
+    self.by-version."mongoose"."3.8.15";
+  by-version."mongoose"."3.8.15" = lib.makeOverridable self.buildNodePackage {
+    name = "node-mongoose-3.8.15";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mongoose/-/mongoose-3.8.15.tgz";
+        name = "mongoose-3.8.15.tgz";
+        sha1 = "2bc089d011f9e4e662e3aa2aab00771ef43847c1";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mongoose" or []);
+    deps = [
+      self.by-version."mongodb"."1.4.7"
+      self.by-version."hooks"."0.2.1"
+      self.by-version."ms"."0.1.0"
+      self.by-version."sliced"."0.0.5"
+      self.by-version."muri"."0.3.1"
+      self.by-version."mpromise"."0.4.3"
+      self.by-version."mpath"."0.1.1"
+      self.by-version."regexp-clone"."0.0.1"
+      self.by-version."mquery"."0.8.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mongoose" ];
+  };
   by-spec."mongoose-lifecycle"."1.0.0" =
     self.by-version."mongoose-lifecycle"."1.0.0";
   by-version."mongoose-lifecycle"."1.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -11708,85 +11646,29 @@
     ];
     passthru.names = [ "monocle" ];
   };
-  by-spec."morgan"."1.0.0" =
-    self.by-version."morgan"."1.0.0";
-  by-version."morgan"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-morgan-1.0.0";
+  by-spec."morgan"."~1.2.3" =
+    self.by-version."morgan"."1.2.3";
+  by-version."morgan"."1.2.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-morgan-1.2.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/morgan/-/morgan-1.0.0.tgz";
-        name = "morgan-1.0.0.tgz";
-        sha1 = "83cf74b9f2d841901f1a9a6b8fa7a468d2e47a8d";
+        url = "http://registry.npmjs.org/morgan/-/morgan-1.2.3.tgz";
+        name = "morgan-1.2.3.tgz";
+        sha1 = "3b0f1704df90255a542591abacd797891a8c40a1";
       })
     ];
     buildInputs =
       (self.nativeDeps."morgan" or []);
     deps = [
-      self.by-version."bytes"."0.2.1"
+      self.by-version."basic-auth"."1.0.0"
+      self.by-version."bytes"."1.0.0"
+      self.by-version."depd"."0.4.4"
+      self.by-version."on-finished"."2.1.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "morgan" ];
   };
-  by-spec."mout"."^0.9.0" =
-    self.by-version."mout"."0.9.1";
-  by-version."mout"."0.9.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-mout-0.9.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mout/-/mout-0.9.1.tgz";
-        name = "mout-0.9.1.tgz";
-        sha1 = "84f0f3fd6acc7317f63de2affdcc0cee009b0477";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mout" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "mout" ];
-  };
-  by-spec."mout"."~0.6.0" =
-    self.by-version."mout"."0.6.0";
-  by-version."mout"."0.6.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-mout-0.6.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mout/-/mout-0.6.0.tgz";
-        name = "mout-0.6.0.tgz";
-        sha1 = "ce7abad8130d796b09d7fb509bcc73b09be024a6";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mout" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "mout" ];
-  };
-  by-spec."mout"."~0.7.0" =
-    self.by-version."mout"."0.7.1";
-  by-version."mout"."0.7.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-mout-0.7.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mout/-/mout-0.7.1.tgz";
-        name = "mout-0.7.1.tgz";
-        sha1 = "218de2b0880b220d99f4fbaee3fc0c3a5310bda8";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mout" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "mout" ];
-  };
-  by-spec."mout"."~0.9.0" =
-    self.by-version."mout"."0.9.1";
   by-spec."mpath"."0.1.1" =
     self.by-version."mpath"."0.1.1";
   by-version."mpath"."0.1.1" = lib.makeOverridable self.buildNodePackage {
@@ -11845,15 +11727,15 @@
     ];
     passthru.names = [ "mpromise" ];
   };
-  by-spec."mquery"."0.5.3" =
-    self.by-version."mquery"."0.5.3";
-  by-version."mquery"."0.5.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-mquery-0.5.3";
+  by-spec."mquery"."0.8.0" =
+    self.by-version."mquery"."0.8.0";
+  by-version."mquery"."0.8.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-mquery-0.8.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/mquery/-/mquery-0.5.3.tgz";
-        name = "mquery-0.5.3.tgz";
-        sha1 = "b8a04d096ecf90bf17a81cc39b80dd4e5abcecec";
+        url = "http://registry.npmjs.org/mquery/-/mquery-0.8.0.tgz";
+        name = "mquery-0.8.0.tgz";
+        sha1 = "1e5b8c2a5a52f5583bd08932700b85440ee25f60";
       })
     ];
     buildInputs =
@@ -11886,20 +11768,40 @@
     ];
     passthru.names = [ "ms" ];
   };
-  by-spec."msgpack".">= 0.0.1" =
-    self.by-version."msgpack"."0.2.3";
-  by-version."msgpack"."0.2.3" = lib.makeOverridable self.buildNodePackage {
-    name = "msgpack-0.2.3";
+  by-spec."ms"."0.6.2" =
+    self.by-version."ms"."0.6.2";
+  by-version."ms"."0.6.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-ms-0.6.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/msgpack/-/msgpack-0.2.3.tgz";
-        name = "msgpack-0.2.3.tgz";
-        sha1 = "0739ab7eaa0a5ba0ff7da2061c72ab806b6afe5f";
+        url = "http://registry.npmjs.org/ms/-/ms-0.6.2.tgz";
+        name = "ms-0.6.2.tgz";
+        sha1 = "d89c2124c6fdc1353d65a8b77bf1aac4b193708c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."ms" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "ms" ];
+  };
+  by-spec."msgpack".">= 0.0.1" =
+    self.by-version."msgpack"."0.2.4";
+  by-version."msgpack"."0.2.4" = lib.makeOverridable self.buildNodePackage {
+    name = "msgpack-0.2.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/msgpack/-/msgpack-0.2.4.tgz";
+        name = "msgpack-0.2.4.tgz";
+        sha1 = "17ac333ea5320b45059f80c992d7465fed4fe706";
       })
     ];
     buildInputs =
       (self.nativeDeps."msgpack" or []);
     deps = [
+      self.by-version."nan"."1.0.0"
     ];
     peerDependencies = [
     ];
@@ -11919,7 +11821,28 @@
     buildInputs =
       (self.nativeDeps."multiparty" or []);
     deps = [
-      self.by-version."readable-stream"."1.1.13-1"
+      self.by-version."readable-stream"."1.1.13"
+      self.by-version."stream-counter"."0.2.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "multiparty" ];
+  };
+  by-spec."multiparty"."3.3.2" =
+    self.by-version."multiparty"."3.3.2";
+  by-version."multiparty"."3.3.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-multiparty-3.3.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/multiparty/-/multiparty-3.3.2.tgz";
+        name = "multiparty-3.3.2.tgz";
+        sha1 = "35de6804dc19643e5249f3d3e3bdc6c8ce301d3f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."multiparty" or []);
+    deps = [
+      self.by-version."readable-stream"."1.1.13"
       self.by-version."stream-counter"."0.2.0"
     ];
     peerDependencies = [
@@ -11945,26 +11868,7 @@
     ];
     passthru.names = [ "muri" ];
   };
-  by-spec."mute-stream"."0.0.3" =
-    self.by-version."mute-stream"."0.0.3";
-  by-version."mute-stream"."0.0.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-mute-stream-0.0.3";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mute-stream/-/mute-stream-0.0.3.tgz";
-        name = "mute-stream-0.0.3.tgz";
-        sha1 = "f09c090d333b3063f615cbbcca71b349893f0152";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mute-stream" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "mute-stream" ];
-  };
-  by-spec."mute-stream"."0.0.4" =
+  by-spec."mute-stream"."~0.0.4" =
     self.by-version."mute-stream"."0.0.4";
   by-version."mute-stream"."0.0.4" = lib.makeOverridable self.buildNodePackage {
     name = "node-mute-stream-0.0.4";
@@ -11983,8 +11887,6 @@
     ];
     passthru.names = [ "mute-stream" ];
   };
-  by-spec."mute-stream"."~0.0.4" =
-    self.by-version."mute-stream"."0.0.4";
   by-spec."mv"."0.0.5" =
     self.by-version."mv"."0.0.5";
   by-version."mv"."0.0.5" = lib.makeOverridable self.buildNodePackage {
@@ -12004,15 +11906,35 @@
     ];
     passthru.names = [ "mv" ];
   };
-  by-spec."nan"."~0.3.0" =
-    self.by-version."nan"."0.3.2";
-  by-version."nan"."0.3.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-nan-0.3.2";
+  by-spec."mz"."1" =
+    self.by-version."mz"."1.0.1";
+  by-version."mz"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-mz-1.0.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/nan/-/nan-0.3.2.tgz";
-        name = "nan-0.3.2.tgz";
-        sha1 = "0df1935cab15369075ef160ad2894107aa14dc2d";
+        url = "http://registry.npmjs.org/mz/-/mz-1.0.1.tgz";
+        name = "mz-1.0.1.tgz";
+        sha1 = "5ce1d3fe5cb3267c9c3141fb6a070f8d17f215d8";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mz" or []);
+    deps = [
+      self.by-version."native-or-bluebird"."1.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mz" ];
+  };
+  by-spec."nan"."1.1.2" =
+    self.by-version."nan"."1.1.2";
+  by-version."nan"."1.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-nan-1.1.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/nan/-/nan-1.1.2.tgz";
+        name = "nan-1.1.2.tgz";
+        sha1 = "bbd48552fc0758673ebe8fada360b60278a6636b";
       })
     ];
     buildInputs =
@@ -12023,15 +11945,15 @@
     ];
     passthru.names = [ "nan" ];
   };
-  by-spec."nan"."~0.6.0" =
-    self.by-version."nan"."0.6.0";
-  by-version."nan"."0.6.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-nan-0.6.0";
+  by-spec."nan"."1.2.0" =
+    self.by-version."nan"."1.2.0";
+  by-version."nan"."1.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-nan-1.2.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/nan/-/nan-0.6.0.tgz";
-        name = "nan-0.6.0.tgz";
-        sha1 = "a54ebe59717b467c77425302bd7c17574c887aaa";
+        url = "http://registry.npmjs.org/nan/-/nan-1.2.0.tgz";
+        name = "nan-1.2.0.tgz";
+        sha1 = "9c4d63ce9e4f8e95de2d574e18f7925554a8a8ef";
       })
     ];
     buildInputs =
@@ -12042,6 +11964,27 @@
     ];
     passthru.names = [ "nan" ];
   };
+  by-spec."nan"."1.3.0" =
+    self.by-version."nan"."1.3.0";
+  by-version."nan"."1.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-nan-1.3.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/nan/-/nan-1.3.0.tgz";
+        name = "nan-1.3.0.tgz";
+        sha1 = "9a5b8d5ef97a10df3050e59b2c362d3baf779742";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."nan" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "nan" ];
+  };
+  by-spec."nan".">=1.1.0" =
+    self.by-version."nan"."1.3.0";
   by-spec."nan"."~0.8.0" =
     self.by-version."nan"."0.8.0";
   by-version."nan"."0.8.0" = lib.makeOverridable self.buildNodePackage {
@@ -12061,6 +12004,48 @@
     ];
     passthru.names = [ "nan" ];
   };
+  by-spec."nan"."~1.0.0" =
+    self.by-version."nan"."1.0.0";
+  by-version."nan"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-nan-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/nan/-/nan-1.0.0.tgz";
+        name = "nan-1.0.0.tgz";
+        sha1 = "ae24f8850818d662fcab5acf7f3b95bfaa2ccf38";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."nan" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "nan" ];
+  };
+  by-spec."nan"."~1.1.0" =
+    self.by-version."nan"."1.1.2";
+  by-spec."nan"."~1.2.0" =
+    self.by-version."nan"."1.2.0";
+  by-spec."native-or-bluebird"."1" =
+    self.by-version."native-or-bluebird"."1.0.0";
+  by-version."native-or-bluebird"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-native-or-bluebird-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/native-or-bluebird/-/native-or-bluebird-1.0.0.tgz";
+        name = "native-or-bluebird-1.0.0.tgz";
+        sha1 = "2259f00d3b8621a9e6389f0d99badfcc2d8fccfe";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."native-or-bluebird" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "native-or-bluebird" ];
+  };
   by-spec."natural"."0.1.17" =
     self.by-version."natural"."0.1.17";
   by-version."natural"."0.1.17" = lib.makeOverridable self.buildNodePackage {
@@ -12098,7 +12083,7 @@
       (self.nativeDeps."nconf" or []);
     deps = [
       self.by-version."async"."0.2.9"
-      self.by-version."ini"."1.1.0"
+      self.by-version."ini"."1.2.1"
       self.by-version."optimist"."0.6.0"
     ];
     peerDependencies = [
@@ -12190,15 +12175,15 @@
     ];
     passthru.names = [ "negotiator" ];
   };
-  by-spec."negotiator"."0.4.2" =
-    self.by-version."negotiator"."0.4.2";
-  by-version."negotiator"."0.4.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-negotiator-0.4.2";
+  by-spec."negotiator"."0.4.7" =
+    self.by-version."negotiator"."0.4.7";
+  by-version."negotiator"."0.4.7" = lib.makeOverridable self.buildNodePackage {
+    name = "node-negotiator-0.4.7";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/negotiator/-/negotiator-0.4.2.tgz";
-        name = "negotiator-0.4.2.tgz";
-        sha1 = "8c43ea7e4c40ddfe40c3c0234c4ef77500b8fd37";
+        url = "http://registry.npmjs.org/negotiator/-/negotiator-0.4.7.tgz";
+        name = "negotiator-0.4.7.tgz";
+        sha1 = "a4160f7177ec806738631d0d3052325da42abdc8";
       })
     ];
     buildInputs =
@@ -12231,25 +12216,6 @@
     ];
     passthru.names = [ "net-ping" ];
   };
-  by-spec."next-tick"."0.1.x" =
-    self.by-version."next-tick"."0.1.0";
-  by-version."next-tick"."0.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-next-tick-0.1.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/next-tick/-/next-tick-0.1.0.tgz";
-        name = "next-tick-0.1.0.tgz";
-        sha1 = "1912cce8eb9b697d640fbba94f8f00dec3b94259";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."next-tick" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "next-tick" ];
-  };
   by-spec."nib"."0.5.0" =
     self.by-version."nib"."0.5.0";
   by-version."nib"."0.5.0" = lib.makeOverridable self.buildNodePackage {
@@ -12309,13 +12275,13 @@
       self.by-version."async"."0.2.10"
       self.by-version."colors"."0.6.2"
       self.by-version."diff"."1.0.8"
-      self.by-version."dox"."0.4.4"
+      self.by-version."dox"."0.4.6"
       self.by-version."jade"."0.35.0"
       self.by-version."node-uuid"."1.4.1"
       self.by-version."optimist"."0.6.1"
       self.by-version."request"."2.27.0"
       self.by-version."semver"."2.1.0"
-      self.by-version."sprintf"."0.1.3"
+      self.by-version."sprintf"."0.1.4"
       self.by-version."temp"."0.6.0"
       self.by-version."wrench"."1.5.8"
       self.by-version."uglify-js"."2.3.6"
@@ -12326,111 +12292,144 @@
     passthru.names = [ "node-appc" ];
   };
   by-spec."node-expat"."*" =
-    self.by-version."node-expat"."2.1.4";
-  by-version."node-expat"."2.1.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-node-expat-2.1.4";
+    self.by-version."node-expat"."2.3.1";
+  by-version."node-expat"."2.3.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-node-expat-2.3.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/node-expat/-/node-expat-2.1.4.tgz";
-        name = "node-expat-2.1.4.tgz";
-        sha1 = "e55a82249b71afbce09ffa880705ec37553c5121";
+        url = "http://registry.npmjs.org/node-expat/-/node-expat-2.3.1.tgz";
+        name = "node-expat-2.3.1.tgz";
+        sha1 = "32c515a4d1cf747fb655d3ad4374696537592413";
       })
     ];
     buildInputs =
       (self.nativeDeps."node-expat" or []);
     deps = [
-      self.by-version."nan"."0.6.0"
+      self.by-version."bindings"."1.2.1"
+      self.by-version."nan"."1.2.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "node-expat" ];
   };
-  "node-expat" = self.by-version."node-expat"."2.1.4";
+  "node-expat" = self.by-version."node-expat"."2.3.1";
   by-spec."node-gyp"."*" =
-    self.by-version."node-gyp"."0.13.0";
-  by-version."node-gyp"."0.13.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-gyp-0.13.0";
+    self.by-version."node-gyp"."1.0.1";
+  by-version."node-gyp"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-gyp-1.0.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.13.0.tgz";
-        name = "node-gyp-0.13.0.tgz";
-        sha1 = "84e216991a64ce5f03d50c95518bd72ca9e10f1e";
+        url = "http://registry.npmjs.org/node-gyp/-/node-gyp-1.0.1.tgz";
+        name = "node-gyp-1.0.1.tgz";
+        sha1 = "d5e364145ff10b259be9986855c83b5a76a2d975";
       })
     ];
     buildInputs =
       (self.nativeDeps."node-gyp" or []);
     deps = [
-      self.by-version."glob"."3.2.9"
-      self.by-version."graceful-fs"."2.0.3"
-      self.by-version."fstream"."0.1.25"
-      self.by-version."minimatch"."0.2.14"
-      self.by-version."mkdirp"."0.3.5"
-      self.by-version."nopt"."2.2.0"
-      self.by-version."npmlog"."0.0.6"
-      self.by-version."osenv"."0.0.3"
-      self.by-version."request"."2.34.0"
-      self.by-version."rimraf"."2.2.6"
-      self.by-version."semver"."2.2.1"
-      self.by-version."tar"."0.1.19"
+      self.by-version."fstream"."1.0.2"
+      self.by-version."glob"."4.0.5"
+      self.by-version."graceful-fs"."3.0.2"
+      self.by-version."minimatch"."1.0.0"
+      self.by-version."mkdirp"."0.5.0"
+      self.by-version."nopt"."3.0.1"
+      self.by-version."npmlog"."0.1.1"
+      self.by-version."osenv"."0.1.0"
+      self.by-version."request"."2.40.0"
+      self.by-version."rimraf"."2.2.8"
+      self.by-version."semver"."3.0.1"
+      self.by-version."tar"."1.0.1"
       self.by-version."which"."1.0.5"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "node-gyp" ];
   };
-  "node-gyp" = self.by-version."node-gyp"."0.13.0";
+  "node-gyp" = self.by-version."node-gyp"."1.0.1";
   by-spec."node-gyp"."~0.13.0" =
-    self.by-version."node-gyp"."0.13.0";
-  by-spec."node-inspector"."*" =
-    self.by-version."node-inspector"."0.7.3";
-  by-version."node-inspector"."0.7.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-inspector-0.7.3";
+    self.by-version."node-gyp"."0.13.1";
+  by-version."node-gyp"."0.13.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-gyp-0.13.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/node-inspector/-/node-inspector-0.7.3.tgz";
-        name = "node-inspector-0.7.3.tgz";
-        sha1 = "988317f9a7e645d1bb78e40bb2289db82a077e73";
+        url = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.13.1.tgz";
+        name = "node-gyp-0.13.1.tgz";
+        sha1 = "5a484dd2dc13d5b894a8fe781a250c07eae7bffa";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."node-gyp" or []);
+    deps = [
+      self.by-version."glob"."3.2.11"
+      self.by-version."graceful-fs"."2.0.3"
+      self.by-version."fstream"."0.1.31"
+      self.by-version."minimatch"."0.4.0"
+      self.by-version."mkdirp"."0.5.0"
+      self.by-version."nopt"."2.2.1"
+      self.by-version."npmlog"."0.1.1"
+      self.by-version."osenv"."0.1.0"
+      self.by-version."request"."2.40.0"
+      self.by-version."rimraf"."2.2.8"
+      self.by-version."semver"."2.2.1"
+      self.by-version."tar"."0.1.20"
+      self.by-version."which"."1.0.5"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "node-gyp" ];
+  };
+  by-spec."node-inspector"."*" =
+    self.by-version."node-inspector"."0.7.4";
+  by-version."node-inspector"."0.7.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-inspector-0.7.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/node-inspector/-/node-inspector-0.7.4.tgz";
+        name = "node-inspector-0.7.4.tgz";
+        sha1 = "3d07234f0834e7f1e21a1669eceaa224a7be43f2";
       })
     ];
     buildInputs =
       (self.nativeDeps."node-inspector" or []);
     deps = [
-      self.by-version."express"."3.5.1"
-      self.by-version."async"."0.4.1"
-      self.by-version."glob"."3.2.9"
+      self.by-version."express"."4.0.0"
+      self.by-version."async"."0.8.0"
+      self.by-version."glob"."3.2.11"
       self.by-version."rc"."0.3.5"
       self.by-version."strong-data-uri"."0.1.1"
       self.by-version."debug"."0.8.1"
-      self.by-version."ws"."0.4.31"
+      self.by-version."ws"."0.4.32"
       self.by-version."opener"."1.3.0"
-      self.by-version."yargs"."1.1.3"
+      self.by-version."yargs"."1.2.6"
       self.by-version."which"."1.0.5"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "node-inspector" ];
   };
-  "node-inspector" = self.by-version."node-inspector"."0.7.3";
+  "node-inspector" = self.by-version."node-inspector"."0.7.4";
   by-spec."node-protobuf"."*" =
-    self.by-version."node-protobuf"."1.0.10";
-  by-version."node-protobuf"."1.0.10" = lib.makeOverridable self.buildNodePackage {
-    name = "node-node-protobuf-1.0.10";
+    self.by-version."node-protobuf"."1.2.0";
+  by-version."node-protobuf"."1.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-node-protobuf-1.2.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/node-protobuf/-/node-protobuf-1.0.10.tgz";
-        name = "node-protobuf-1.0.10.tgz";
-        sha1 = "a8a02d55129efe1776bc3e038d7e6c676c001fcd";
+        url = "http://registry.npmjs.org/node-protobuf/-/node-protobuf-1.2.0.tgz";
+        name = "node-protobuf-1.2.0.tgz";
+        sha1 = "c69ca29f149431b6b6ec8079ec2ee01aa0590bcc";
       })
     ];
     buildInputs =
       (self.nativeDeps."node-protobuf" or []);
     deps = [
+      self.by-version."bindings"."1.2.1"
+      self.by-version."nan"."1.3.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "node-protobuf" ];
   };
-  "node-protobuf" = self.by-version."node-protobuf"."1.0.10";
+  "node-protobuf" = self.by-version."node-protobuf"."1.2.0";
   by-spec."node-swt".">=0.1.1" =
     self.by-version."node-swt"."0.1.1";
   by-version."node-swt"."0.1.1" = lib.makeOverridable self.buildNodePackage {
@@ -12581,7 +12580,7 @@
     buildInputs =
       (self.nativeDeps."node-wsfederation" or []);
     deps = [
-      self.by-version."xml2js"."0.4.2"
+      self.by-version."xml2js"."0.4.4"
     ];
     peerDependencies = [
     ];
@@ -12620,8 +12619,8 @@
     buildInputs =
       (self.nativeDeps."nodemailer" or []);
     deps = [
-      self.by-version."mailcomposer"."0.2.9"
-      self.by-version."simplesmtp"."0.3.25"
+      self.by-version."mailcomposer"."0.2.12"
+      self.by-version."simplesmtp"."0.3.32"
       self.by-version."optimist"."0.6.1"
     ];
     peerDependencies = [
@@ -12629,27 +12628,28 @@
     passthru.names = [ "nodemailer" ];
   };
   by-spec."nodemon"."*" =
-    self.by-version."nodemon"."1.0.17";
-  by-version."nodemon"."1.0.17" = lib.makeOverridable self.buildNodePackage {
-    name = "nodemon-1.0.17";
+    self.by-version."nodemon"."1.2.1";
+  by-version."nodemon"."1.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "nodemon-1.2.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/nodemon/-/nodemon-1.0.17.tgz";
-        name = "nodemon-1.0.17.tgz";
-        sha1 = "910a3f3cb66c06a3499498455cf4e0119f75799c";
+        url = "http://registry.npmjs.org/nodemon/-/nodemon-1.2.1.tgz";
+        name = "nodemon-1.2.1.tgz";
+        sha1 = "02a288045652e92350e7d752a8054472ed2c4824";
       })
     ];
     buildInputs =
       (self.nativeDeps."nodemon" or []);
     deps = [
-      self.by-version."update-notifier"."0.1.8"
-      self.by-version."minimatch"."0.2.14"
+      self.by-version."update-notifier"."0.1.10"
+      self.by-version."minimatch"."0.3.0"
+      self.by-version."ps-tree"."0.0.3"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "nodemon" ];
   };
-  "nodemon" = self.by-version."nodemon"."1.0.17";
+  "nodemon" = self.by-version."nodemon"."1.2.1";
   by-spec."nomnom"."1.6.x" =
     self.by-version."nomnom"."1.6.2";
   by-version."nomnom"."1.6.2" = lib.makeOverridable self.buildNodePackage {
@@ -12672,14 +12672,34 @@
     passthru.names = [ "nomnom" ];
   };
   by-spec."nopt"."2" =
-    self.by-version."nopt"."2.2.0";
-  by-version."nopt"."2.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "nopt-2.2.0";
+    self.by-version."nopt"."2.2.1";
+  by-version."nopt"."2.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "nopt-2.2.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/nopt/-/nopt-2.2.0.tgz";
-        name = "nopt-2.2.0.tgz";
-        sha1 = "3d106676f3607ac466af9bf82bd707b1501d3bd5";
+        url = "http://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz";
+        name = "nopt-2.2.1.tgz";
+        sha1 = "2aa09b7d1768487b3b89a9c5aa52335bff0baea7";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."nopt" or []);
+    deps = [
+      self.by-version."abbrev"."1.0.5"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "nopt" ];
+  };
+  by-spec."nopt"."2 || 3" =
+    self.by-version."nopt"."3.0.1";
+  by-version."nopt"."3.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "nopt-3.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/nopt/-/nopt-3.0.1.tgz";
+        name = "nopt-3.0.1.tgz";
+        sha1 = "bce5c42446a3291f47622a370abbf158fbbacbfd";
       })
     ];
     buildInputs =
@@ -12711,10 +12731,8 @@
     ];
     passthru.names = [ "nopt" ];
   };
-  by-spec."nopt"."2.2.x" =
-    self.by-version."nopt"."2.2.0";
-  by-spec."nopt"."^2.2.0" =
-    self.by-version."nopt"."2.2.0";
+  by-spec."nopt"."3.x" =
+    self.by-version."nopt"."3.0.1";
   by-spec."nopt"."~1.0.10" =
     self.by-version."nopt"."1.0.10";
   by-version."nopt"."1.0.10" = lib.makeOverridable self.buildNodePackage {
@@ -12735,7 +12753,7 @@
     ];
     passthru.names = [ "nopt" ];
   };
-  by-spec."nopt"."~2.1.1" =
+  by-spec."nopt"."~2.1.2" =
     self.by-version."nopt"."2.1.2";
   by-version."nopt"."2.1.2" = lib.makeOverridable self.buildNodePackage {
     name = "nopt-2.1.2";
@@ -12755,92 +12773,118 @@
     ];
     passthru.names = [ "nopt" ];
   };
-  by-spec."nopt"."~2.1.2" =
-    self.by-version."nopt"."2.1.2";
-  by-spec."nopt"."~2.2.0" =
-    self.by-version."nopt"."2.2.0";
-  by-spec."normalize-package-data"."~0.2.9" =
-    self.by-version."normalize-package-data"."0.2.12";
-  by-version."normalize-package-data"."0.2.12" = lib.makeOverridable self.buildNodePackage {
-    name = "node-normalize-package-data-0.2.12";
+  by-spec."nopt"."~3.0.1" =
+    self.by-version."nopt"."3.0.1";
+  by-spec."normalize-package-data"."0.4" =
+    self.by-version."normalize-package-data"."0.4.2";
+  by-version."normalize-package-data"."0.4.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-normalize-package-data-0.4.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-0.2.12.tgz";
-        name = "normalize-package-data-0.2.12.tgz";
-        sha1 = "c8284cf0cb0466ea60ee64276b9070722c1da768";
+        url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-0.4.2.tgz";
+        name = "normalize-package-data-0.4.2.tgz";
+        sha1 = "166dc052a74e2f5ac1d3d23903ab3f2e2b7dd8e6";
       })
     ];
     buildInputs =
       (self.nativeDeps."normalize-package-data" or []);
     deps = [
-      self.by-version."semver"."2.2.1"
       self.by-version."github-url-from-git"."1.1.1"
-      self.by-version."github-url-from-username-repo"."0.0.2"
+      self.by-version."github-url-from-username-repo"."0.2.0"
+      self.by-version."semver"."3.0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "normalize-package-data" ];
+  };
+  by-spec."normalize-package-data"."^1.0.0" =
+    self.by-version."normalize-package-data"."1.0.0";
+  by-version."normalize-package-data"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-normalize-package-data-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-1.0.0.tgz";
+        name = "normalize-package-data-1.0.0.tgz";
+        sha1 = "5239d9921791a8ad027607f580a74c76166623c8";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."normalize-package-data" or []);
+    deps = [
+      self.by-version."github-url-from-git"."1.3.0"
+      self.by-version."github-url-from-username-repo"."0.2.0"
+      self.by-version."semver"."3.0.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "normalize-package-data" ];
   };
   by-spec."npm"."*" =
-    self.by-version."npm"."1.4.7";
-  by-version."npm"."1.4.7" = lib.makeOverridable self.buildNodePackage {
-    name = "npm-1.4.7";
+    self.by-version."npm"."2.0.0-alpha-5";
+  by-version."npm"."2.0.0-alpha-5" = lib.makeOverridable self.buildNodePackage {
+    name = "npm-2.0.0-alpha-5";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/npm/-/npm-1.4.7.tgz";
-        name = "npm-1.4.7.tgz";
-        sha1 = "7e3c4385973ffb58c9bf15eebe2668c0ce3fafe0";
+        url = "http://registry.npmjs.org/npm/-/npm-2.0.0-alpha-5.tgz";
+        name = "npm-2.0.0-alpha-5.tgz";
+        sha1 = "5135b111cb6b8e56ab1bdc4e486b87c295862ca8";
       })
     ];
     buildInputs =
       (self.nativeDeps."npm" or []);
     deps = [
       self.by-version."abbrev"."1.0.5"
-      self.by-version."ansi"."0.2.1"
+      self.by-version."ansi"."0.3.0"
       self.by-version."ansicolors"."0.3.2"
       self.by-version."ansistyles"."0.1.3"
       self.by-version."archy"."0.0.2"
+      self.by-version."async-some"."1.0.1"
       self.by-version."block-stream"."0.0.7"
+      self.by-version."char-spinner"."1.0.1"
       self.by-version."child-process-close"."0.1.1"
       self.by-version."chmodr"."0.1.0"
       self.by-version."chownr"."0.0.1"
-      self.by-version."cmd-shim"."1.1.1"
-      self.by-version."columnify"."0.1.2"
-      self.by-version."editor"."0.0.5"
-      self.by-version."fstream"."0.1.25"
-      self.by-version."fstream-npm"."0.1.6"
-      self.by-version."github-url-from-git"."1.1.1"
-      self.by-version."github-url-from-username-repo"."0.0.2"
-      self.by-version."glob"."3.2.9"
-      self.by-version."graceful-fs"."2.0.3"
-      self.by-version."ini"."1.1.0"
-      self.by-version."init-package-json"."0.0.15"
-      self.by-version."lockfile"."0.4.2"
+      self.by-version."cmd-shim"."1.1.2"
+      self.by-version."columnify"."1.1.0"
+      self.by-version."editor"."0.1.0"
+      self.by-version."fs-vacuum"."1.2.1"
+      self.by-version."fstream"."0.1.31"
+      self.by-version."fstream-npm"."0.1.8"
+      self.by-version."github-url-from-git"."1.2.0"
+      self.by-version."github-url-from-username-repo"."0.2.0"
+      self.by-version."glob"."4.0.5"
+      self.by-version."graceful-fs"."3.0.2"
+      self.by-version."inflight"."1.0.1"
+      self.by-version."ini"."1.2.1"
+      self.by-version."init-package-json"."0.1.2"
+      self.by-version."lockfile"."0.4.3"
       self.by-version."lru-cache"."2.5.0"
-      self.by-version."minimatch"."0.2.14"
-      self.by-version."mkdirp"."0.3.5"
-      self.by-version."node-gyp"."0.13.0"
-      self.by-version."nopt"."2.2.0"
-      self.by-version."npm-install-checks"."1.0.0"
-      self.by-version."npm-registry-client"."0.4.7"
-      self.by-version."npm-user-validate"."0.0.3"
-      self.by-version."npmconf"."0.1.14"
-      self.by-version."npmlog"."0.0.6"
+      self.by-version."minimatch"."0.3.0"
+      self.by-version."mkdirp"."0.5.0"
+      self.by-version."node-gyp"."0.13.1"
+      self.by-version."nopt"."3.0.1"
+      self.by-version."npm-cache-filename"."1.0.1"
+      self.by-version."npm-install-checks"."1.0.3"
+      self.by-version."npm-package-arg"."2.0.2"
+      self.by-version."npm-registry-client"."3.0.6"
+      self.by-version."npm-user-validate"."0.1.0"
+      self.by-version."npmconf"."2.0.5"
+      self.by-version."npmlog"."0.1.1"
       self.by-version."once"."1.3.0"
       self.by-version."opener"."1.3.0"
-      self.by-version."osenv"."0.0.3"
+      self.by-version."osenv"."0.1.0"
       self.by-version."path-is-inside"."1.0.1"
       self.by-version."read"."1.0.5"
-      self.by-version."read-installed"."2.0.2"
-      self.by-version."read-package-json"."1.1.8"
+      self.by-version."read-installed"."2.0.7"
+      self.by-version."read-package-json"."1.2.6"
       self.by-version."request"."2.30.0"
-      self.by-version."retry"."0.6.0"
-      self.by-version."rimraf"."2.2.6"
-      self.by-version."semver"."2.2.1"
-      self.by-version."sha"."1.2.3"
+      self.by-version."retry"."0.6.1"
+      self.by-version."rimraf"."2.2.8"
+      self.by-version."semver"."2.3.2"
+      self.by-version."sha"."1.2.4"
       self.by-version."slide"."1.1.5"
       self.by-version."sorted-object"."1.0.0"
-      self.by-version."tar"."0.1.19"
+      self.by-version."tar"."0.1.20"
       self.by-version."text-table"."0.2.0"
       self.by-version."uid-number"."0.0.5"
       self.by-version."which"."1.0.5"
@@ -12849,28 +12893,69 @@
     ];
     passthru.names = [ "npm" ];
   };
-  "npm" = self.by-version."npm"."1.4.7";
-  by-spec."npm-install-checks"."~1.0.0" =
-    self.by-version."npm-install-checks"."1.0.0";
-  by-version."npm-install-checks"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-npm-install-checks-1.0.0";
+  "npm" = self.by-version."npm"."2.0.0-alpha-5";
+  by-spec."npm-cache-filename"."^1.0.0" =
+    self.by-version."npm-cache-filename"."1.0.1";
+  by-version."npm-cache-filename"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-npm-cache-filename-1.0.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/npm-install-checks/-/npm-install-checks-1.0.0.tgz";
-        name = "npm-install-checks-1.0.0.tgz";
-        sha1 = "7e1469b5e0c693b2ae2a8830b5fc4e7bf76c88fd";
+        url = "http://registry.npmjs.org/npm-cache-filename/-/npm-cache-filename-1.0.1.tgz";
+        name = "npm-cache-filename-1.0.1.tgz";
+        sha1 = "9b640f0c1a5ba1145659685372a9ff71f70c4323";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."npm-cache-filename" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "npm-cache-filename" ];
+  };
+  by-spec."npm-cache-filename"."~1.0.1" =
+    self.by-version."npm-cache-filename"."1.0.1";
+  by-spec."npm-install-checks"."~1.0.2" =
+    self.by-version."npm-install-checks"."1.0.3";
+  by-version."npm-install-checks"."1.0.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-npm-install-checks-1.0.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/npm-install-checks/-/npm-install-checks-1.0.3.tgz";
+        name = "npm-install-checks-1.0.3.tgz";
+        sha1 = "9301006141a8f1454ae6bfe9a2f89da91316de02";
       })
     ];
     buildInputs =
       (self.nativeDeps."npm-install-checks" or []);
     deps = [
-      self.by-version."npmlog"."0.0.6"
-      self.by-version."semver"."2.2.1"
+      self.by-version."npmlog"."0.1.1"
+      self.by-version."semver"."3.0.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "npm-install-checks" ];
   };
+  by-spec."npm-package-arg"."~2.0.0" =
+    self.by-version."npm-package-arg"."2.0.2";
+  by-version."npm-package-arg"."2.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-npm-package-arg-2.0.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/npm-package-arg/-/npm-package-arg-2.0.2.tgz";
+        name = "npm-package-arg-2.0.2.tgz";
+        sha1 = "e4f660c683068eccba9b27b4075cc00c0ccc6037";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."npm-package-arg" or []);
+    deps = [
+      self.by-version."semver"."3.0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "npm-package-arg" ];
+  };
   by-spec."npm-registry-client"."0.2.27" =
     self.by-version."npm-registry-client"."0.2.27";
   by-version."npm-registry-client"."0.2.27" = lib.makeOverridable self.buildNodePackage {
@@ -12885,58 +12970,62 @@
     buildInputs =
       (self.nativeDeps."npm-registry-client" or []);
     deps = [
-      self.by-version."request"."2.34.0"
+      self.by-version."request"."2.40.0"
       self.by-version."graceful-fs"."2.0.3"
       self.by-version."semver"."2.0.11"
       self.by-version."slide"."1.1.5"
       self.by-version."chownr"."0.0.1"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."rimraf"."2.2.6"
+      self.by-version."rimraf"."2.2.8"
       self.by-version."retry"."0.6.0"
       self.by-version."couch-login"."0.1.20"
-      self.by-version."npmlog"."0.0.6"
+      self.by-version."npmlog"."0.1.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "npm-registry-client" ];
   };
-  by-spec."npm-registry-client"."~0.4.7" =
-    self.by-version."npm-registry-client"."0.4.7";
-  by-version."npm-registry-client"."0.4.7" = lib.makeOverridable self.buildNodePackage {
-    name = "node-npm-registry-client-0.4.7";
+  by-spec."npm-registry-client"."~3.0.0" =
+    self.by-version."npm-registry-client"."3.0.6";
+  by-version."npm-registry-client"."3.0.6" = lib.makeOverridable self.buildNodePackage {
+    name = "node-npm-registry-client-3.0.6";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.4.7.tgz";
-        name = "npm-registry-client-0.4.7.tgz";
-        sha1 = "f4369b59890da7882527eb7c427dd95d43707afb";
+        url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-3.0.6.tgz";
+        name = "npm-registry-client-3.0.6.tgz";
+        sha1 = "14a17d9a60ed2a80b04edcbc596dbce0d96540ee";
       })
     ];
     buildInputs =
       (self.nativeDeps."npm-registry-client" or []);
     deps = [
-      self.by-version."request"."2.34.0"
-      self.by-version."graceful-fs"."2.0.3"
-      self.by-version."semver"."2.2.1"
-      self.by-version."slide"."1.1.5"
       self.by-version."chownr"."0.0.1"
-      self.by-version."mkdirp"."0.3.5"
-      self.by-version."rimraf"."2.2.6"
+      self.by-version."graceful-fs"."3.0.2"
+      self.by-version."mkdirp"."0.5.0"
+      self.by-version."normalize-package-data"."0.4.2"
+      self.by-version."npm-cache-filename"."1.0.1"
+      self.by-version."request"."2.40.0"
       self.by-version."retry"."0.6.0"
-      self.by-version."npmlog"."0.0.6"
+      self.by-version."rimraf"."2.2.8"
+      self.by-version."semver"."3.0.1"
+      self.by-version."slide"."1.1.5"
+      self.by-version."npmlog"."0.1.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "npm-registry-client" ];
   };
-  by-spec."npm-user-validate"."0.0.3" =
-    self.by-version."npm-user-validate"."0.0.3";
-  by-version."npm-user-validate"."0.0.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-npm-user-validate-0.0.3";
+  by-spec."npm-registry-client"."~3.0.2" =
+    self.by-version."npm-registry-client"."3.0.6";
+  by-spec."npm-user-validate"."~0.1.0" =
+    self.by-version."npm-user-validate"."0.1.0";
+  by-version."npm-user-validate"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-npm-user-validate-0.1.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.0.3.tgz";
-        name = "npm-user-validate-0.0.3.tgz";
-        sha1 = "818eca4312d13da648f9bc1d7f80bb4f151e0c2e";
+        url = "http://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.1.0.tgz";
+        name = "npm-user-validate-0.1.0.tgz";
+        sha1 = "358a5b5148ed3f79771d980388c6e34c4a61f638";
       })
     ];
     buildInputs =
@@ -12948,33 +13037,33 @@
     passthru.names = [ "npm-user-validate" ];
   };
   by-spec."npm2nix"."*" =
-    self.by-version."npm2nix"."5.6.0";
-  by-version."npm2nix"."5.6.0" = lib.makeOverridable self.buildNodePackage {
-    name = "npm2nix-5.6.0";
+    self.by-version."npm2nix"."5.7.0";
+  by-version."npm2nix"."5.7.0" = lib.makeOverridable self.buildNodePackage {
+    name = "npm2nix-5.7.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/npm2nix/-/npm2nix-5.6.0.tgz";
-        name = "npm2nix-5.6.0.tgz";
-        sha1 = "75680a36a24fe7f434a18199552cd3e7a576e875";
+        url = "http://registry.npmjs.org/npm2nix/-/npm2nix-5.7.0.tgz";
+        name = "npm2nix-5.7.0.tgz";
+        sha1 = "ac4547c4ee35fd19fd8dfcf1b1f47eccfb6b6dfa";
       })
     ];
     buildInputs =
       (self.nativeDeps."npm2nix" or []);
     deps = [
-      self.by-version."semver"."2.2.1"
+      self.by-version."semver"."2.3.2"
       self.by-version."argparse"."0.1.15"
       self.by-version."npm-registry-client"."0.2.27"
       self.by-version."npmconf"."0.1.1"
       self.by-version."tar"."0.1.17"
       self.by-version."temp"."0.6.0"
       self.by-version."fs.extra"."1.2.1"
-      self.by-version."findit"."1.1.1"
+      self.by-version."findit"."1.2.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "npm2nix" ];
   };
-  "npm2nix" = self.by-version."npm2nix"."5.6.0";
+  "npm2nix" = self.by-version."npm2nix"."5.7.0";
   by-spec."npmconf"."0.0.24" =
     self.by-version."npmconf"."0.0.24";
   by-version."npmconf"."0.0.24" = lib.makeOverridable self.buildNodePackage {
@@ -12994,7 +13083,7 @@
       self.by-version."once"."1.1.1"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."osenv"."0.0.3"
-      self.by-version."nopt"."2.2.0"
+      self.by-version."nopt"."2.2.1"
       self.by-version."semver"."1.1.4"
       self.by-version."ini"."1.1.0"
     ];
@@ -13021,23 +13110,23 @@
       self.by-version."once"."1.1.1"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."osenv"."0.0.3"
-      self.by-version."nopt"."2.2.0"
-      self.by-version."semver"."2.2.1"
+      self.by-version."nopt"."2.2.1"
+      self.by-version."semver"."2.3.2"
       self.by-version."ini"."1.1.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "npmconf" ];
   };
-  by-spec."npmconf"."~0.1.13" =
-    self.by-version."npmconf"."0.1.14";
-  by-version."npmconf"."0.1.14" = lib.makeOverridable self.buildNodePackage {
-    name = "node-npmconf-0.1.14";
+  by-spec."npmconf"."~0.1.2" =
+    self.by-version."npmconf"."0.1.16";
+  by-version."npmconf"."0.1.16" = lib.makeOverridable self.buildNodePackage {
+    name = "node-npmconf-0.1.16";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.14.tgz";
-        name = "npmconf-0.1.14.tgz";
-        sha1 = "aea4bc12c5a84191a32cd350e325da4fe8b127e7";
+        url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.16.tgz";
+        name = "npmconf-0.1.16.tgz";
+        sha1 = "0bdca78b8551419686b3a98004f06f0819edcd2a";
       })
     ];
     buildInputs =
@@ -13048,42 +13137,70 @@
       self.by-version."once"."1.3.0"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."osenv"."0.0.3"
-      self.by-version."nopt"."2.2.0"
-      self.by-version."semver"."2.2.1"
+      self.by-version."nopt"."2.2.1"
+      self.by-version."semver"."2.3.2"
       self.by-version."ini"."1.1.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "npmconf" ];
   };
-  by-spec."npmconf"."~0.1.14" =
-    self.by-version."npmconf"."0.1.14";
-  by-spec."npmconf"."~0.1.2" =
-    self.by-version."npmconf"."0.1.14";
-  by-spec."npmlog"."*" =
-    self.by-version."npmlog"."0.0.6";
-  by-version."npmlog"."0.0.6" = lib.makeOverridable self.buildNodePackage {
-    name = "node-npmlog-0.0.6";
+  by-spec."npmconf"."~2.0.1" =
+    self.by-version."npmconf"."2.0.5";
+  by-version."npmconf"."2.0.5" = lib.makeOverridable self.buildNodePackage {
+    name = "node-npmconf-2.0.5";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/npmlog/-/npmlog-0.0.6.tgz";
-        name = "npmlog-0.0.6.tgz";
-        sha1 = "685043fe71aa1665d6e3b2acef180640caf40873";
+        url = "http://registry.npmjs.org/npmconf/-/npmconf-2.0.5.tgz";
+        name = "npmconf-2.0.5.tgz";
+        sha1 = "70ad9975cd8d855e198a2deec8df6d04d932035c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."npmconf" or []);
+    deps = [
+      self.by-version."config-chain"."1.1.8"
+      self.by-version."inherits"."2.0.1"
+      self.by-version."ini"."1.2.1"
+      self.by-version."mkdirp"."0.5.0"
+      self.by-version."nopt"."3.0.1"
+      self.by-version."once"."1.3.0"
+      self.by-version."osenv"."0.1.0"
+      self.by-version."semver"."3.0.1"
+      self.by-version."uid-number"."0.0.5"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "npmconf" ];
+  };
+  by-spec."npmconf"."~2.0.3" =
+    self.by-version."npmconf"."2.0.5";
+  by-spec."npmlog"."*" =
+    self.by-version."npmlog"."0.1.1";
+  by-version."npmlog"."0.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-npmlog-0.1.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/npmlog/-/npmlog-0.1.1.tgz";
+        name = "npmlog-0.1.1.tgz";
+        sha1 = "8b9b9e4405d7ec48c31c2346965aadc7abaecaa5";
       })
     ];
     buildInputs =
       (self.nativeDeps."npmlog" or []);
     deps = [
-      self.by-version."ansi"."0.2.1"
+      self.by-version."ansi"."0.3.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "npmlog" ];
   };
   by-spec."npmlog"."0" =
-    self.by-version."npmlog"."0.0.6";
-  by-spec."npmlog"."0.0.6" =
-    self.by-version."npmlog"."0.0.6";
+    self.by-version."npmlog"."0.1.1";
+  by-spec."npmlog"."0.1" =
+    self.by-version."npmlog"."0.1.1";
+  by-spec."npmlog"."~0.1.1" =
+    self.by-version."npmlog"."0.1.1";
   by-spec."nssocket"."~0.5.1" =
     self.by-version."nssocket"."0.5.1";
   by-version."nssocket"."0.5.1" = lib.makeOverridable self.buildNodePackage {
@@ -13098,33 +13215,13 @@
     buildInputs =
       (self.nativeDeps."nssocket" or []);
     deps = [
-      self.by-version."eventemitter2"."0.4.13"
+      self.by-version."eventemitter2"."0.4.14"
       self.by-version."lazy"."1.0.11"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "nssocket" ];
   };
-  by-spec."nth-check"."~1.0.0" =
-    self.by-version."nth-check"."1.0.0";
-  by-version."nth-check"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-nth-check-1.0.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/nth-check/-/nth-check-1.0.0.tgz";
-        name = "nth-check-1.0.0.tgz";
-        sha1 = "02fc1277aa2bf8e6083be456104d6a646101a49d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."nth-check" or []);
-    deps = [
-      self.by-version."boolbase"."1.0.0"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "nth-check" ];
-  };
   by-spec."oauth"."https://github.com/ciaranj/node-oauth/tarball/master" =
     self.by-version."oauth"."0.9.11";
   by-version."oauth"."0.9.11" = lib.makeOverridable self.buildNodePackage {
@@ -13133,7 +13230,7 @@
       (fetchurl {
         url = "https://github.com/ciaranj/node-oauth/tarball/master";
         name = "oauth-0.9.11.tgz";
-        sha256 = "14cc7a064e3eda0948ac8db72fae140cb7b0fdbe031375d02cd6d0359c8b8faa";
+        sha256 = "81deda1451b8103f278cbede8aab0a929a63882dbc604214fd7690d72390d083";
       })
     ];
     buildInputs =
@@ -13201,15 +13298,15 @@
     ];
     passthru.names = [ "object-additions" ];
   };
-  by-spec."object-assign"."~0.1.1" =
-    self.by-version."object-assign"."0.1.2";
-  by-version."object-assign"."0.1.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-object-assign-0.1.2";
+  by-spec."object-assign"."~0.3.1" =
+    self.by-version."object-assign"."0.3.1";
+  by-version."object-assign"."0.3.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-object-assign-0.3.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/object-assign/-/object-assign-0.1.2.tgz";
-        name = "object-assign-0.1.2.tgz";
-        sha1 = "036992f073aff7b2db83d06b3fb3155a5ccac37f";
+        url = "http://registry.npmjs.org/object-assign/-/object-assign-0.3.1.tgz";
+        name = "object-assign-0.3.1.tgz";
+        sha1 = "060e2a2a27d7c0d77ec77b78f11aa47fd88008d2";
       })
     ];
     buildInputs =
@@ -13220,8 +13317,6 @@
     ];
     passthru.names = [ "object-assign" ];
   };
-  by-spec."object-assign"."~0.1.2" =
-    self.by-version."object-assign"."0.1.2";
   by-spec."object-keys"."~0.4.0" =
     self.by-version."object-keys"."0.4.0";
   by-version."object-keys"."0.4.0" = lib.makeOverridable self.buildNodePackage {
@@ -13241,6 +13336,64 @@
     ];
     passthru.names = [ "object-keys" ];
   };
+  by-spec."on-finished"."2.1.0" =
+    self.by-version."on-finished"."2.1.0";
+  by-version."on-finished"."2.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-on-finished-2.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/on-finished/-/on-finished-2.1.0.tgz";
+        name = "on-finished-2.1.0.tgz";
+        sha1 = "0c539f09291e8ffadde0c8a25850fb2cedc7022d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."on-finished" or []);
+    deps = [
+      self.by-version."ee-first"."1.0.5"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "on-finished" ];
+  };
+  by-spec."on-headers"."0.0.0" =
+    self.by-version."on-headers"."0.0.0";
+  by-version."on-headers"."0.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-on-headers-0.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/on-headers/-/on-headers-0.0.0.tgz";
+        name = "on-headers-0.0.0.tgz";
+        sha1 = "ee2817f8344325785cd9c2df2b242bbc17caf4c4";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."on-headers" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "on-headers" ];
+  };
+  by-spec."on-headers"."~1.0.0" =
+    self.by-version."on-headers"."1.0.0";
+  by-version."on-headers"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-on-headers-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/on-headers/-/on-headers-1.0.0.tgz";
+        name = "on-headers-1.0.0.tgz";
+        sha1 = "2c75b5da4375513d0161c6052e7fcbe4953fca5d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."on-headers" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "on-headers" ];
+  };
   by-spec."once"."1.1.1" =
     self.by-version."once"."1.1.1";
   by-version."once"."1.1.1" = lib.makeOverridable self.buildNodePackage {
@@ -13260,9 +13413,7 @@
     ];
     passthru.names = [ "once" ];
   };
-  by-spec."once"."~1.1.1" =
-    self.by-version."once"."1.1.1";
-  by-spec."once"."~1.3.0" =
+  by-spec."once"."1.x" =
     self.by-version."once"."1.3.0";
   by-version."once"."1.3.0" = lib.makeOverridable self.buildNodePackage {
     name = "node-once-1.3.0";
@@ -13281,6 +13432,31 @@
     ];
     passthru.names = [ "once" ];
   };
+  by-spec."once"."^1.3.0" =
+    self.by-version."once"."1.3.0";
+  by-spec."once"."~1.1.1" =
+    self.by-version."once"."1.1.1";
+  by-spec."once"."~1.3.0" =
+    self.by-version."once"."1.3.0";
+  by-spec."only"."0.0.2" =
+    self.by-version."only"."0.0.2";
+  by-version."only"."0.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-only-0.0.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/only/-/only-0.0.2.tgz";
+        name = "only-0.0.2.tgz";
+        sha1 = "2afde84d03e50b9a8edc444e30610a70295edfb4";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."only" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "only" ];
+  };
   by-spec."open"."0.0.2" =
     self.by-version."open"."0.0.2";
   by-version."open"."0.0.2" = lib.makeOverridable self.buildNodePackage {
@@ -13300,26 +13476,7 @@
     ];
     passthru.names = [ "open" ];
   };
-  by-spec."open"."0.0.4" =
-    self.by-version."open"."0.0.4";
-  by-version."open"."0.0.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-open-0.0.4";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/open/-/open-0.0.4.tgz";
-        name = "open-0.0.4.tgz";
-        sha1 = "5de46a0858b9f49f9f211aa8f26628550657f262";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."open" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "open" ];
-  };
-  by-spec."open"."~0.0.3" =
+  by-spec."open"."~0.0.5" =
     self.by-version."open"."0.0.5";
   by-version."open"."0.0.5" = lib.makeOverridable self.buildNodePackage {
     name = "node-open-0.0.5";
@@ -13338,8 +13495,6 @@
     ];
     passthru.names = [ "open" ];
   };
-  by-spec."open"."~0.0.4" =
-    self.by-version."open"."0.0.5";
   by-spec."opener"."~1.3.0" =
     self.by-version."opener"."1.3.0";
   by-version."opener"."1.3.0" = lib.makeOverridable self.buildNodePackage {
@@ -13360,14 +13515,14 @@
     passthru.names = [ "opener" ];
   };
   by-spec."openid".">=0.2.0" =
-    self.by-version."openid"."0.5.8";
-  by-version."openid"."0.5.8" = lib.makeOverridable self.buildNodePackage {
-    name = "node-openid-0.5.8";
+    self.by-version."openid"."0.5.9";
+  by-version."openid"."0.5.9" = lib.makeOverridable self.buildNodePackage {
+    name = "node-openid-0.5.9";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/openid/-/openid-0.5.8.tgz";
-        name = "openid-0.5.8.tgz";
-        sha1 = "e1e3b26235cb8964ef850c074529b9d031550e85";
+        url = "http://registry.npmjs.org/openid/-/openid-0.5.9.tgz";
+        name = "openid-0.5.9.tgz";
+        sha1 = "f44dd2609764c458c65fb22c03db068579e4bfa8";
       })
     ];
     buildInputs =
@@ -13393,7 +13548,7 @@
       (self.nativeDeps."optimist" or []);
     deps = [
       self.by-version."wordwrap"."0.0.2"
-      self.by-version."minimist"."0.0.8"
+      self.by-version."minimist"."0.0.10"
     ];
     peerDependencies = [
     ];
@@ -13420,7 +13575,30 @@
     ];
     passthru.names = [ "optimist" ];
   };
-  by-spec."optimist"."0.3.x" =
+  by-spec."optimist"."0.6.0" =
+    self.by-version."optimist"."0.6.0";
+  by-version."optimist"."0.6.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-optimist-0.6.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz";
+        name = "optimist-0.6.0.tgz";
+        sha1 = "69424826f3405f79f142e6fc3d9ae58d4dbb9200";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."optimist" or []);
+    deps = [
+      self.by-version."wordwrap"."0.0.2"
+      self.by-version."minimist"."0.0.10"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "optimist" ];
+  };
+  by-spec."optimist"."0.6.x" =
+    self.by-version."optimist"."0.6.1";
+  by-spec."optimist"."~0.3" =
     self.by-version."optimist"."0.3.7";
   by-version."optimist"."0.3.7" = lib.makeOverridable self.buildNodePackage {
     name = "node-optimist-0.3.7";
@@ -13440,31 +13618,6 @@
     ];
     passthru.names = [ "optimist" ];
   };
-  by-spec."optimist"."0.6.0" =
-    self.by-version."optimist"."0.6.0";
-  by-version."optimist"."0.6.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-optimist-0.6.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz";
-        name = "optimist-0.6.0.tgz";
-        sha1 = "69424826f3405f79f142e6fc3d9ae58d4dbb9200";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."optimist" or []);
-    deps = [
-      self.by-version."wordwrap"."0.0.2"
-      self.by-version."minimist"."0.0.8"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "optimist" ];
-  };
-  by-spec."optimist"."0.6.x" =
-    self.by-version."optimist"."0.6.1";
-  by-spec."optimist"."~0.3" =
-    self.by-version."optimist"."0.3.7";
   by-spec."optimist"."~0.3.5" =
     self.by-version."optimist"."0.3.7";
   by-spec."optimist"."~0.6.0" =
@@ -13490,25 +13643,6 @@
     ];
     passthru.names = [ "options" ];
   };
-  by-spec."optjs"."*" =
-    self.by-version."optjs"."3.2.1-boom";
-  by-version."optjs"."3.2.1-boom" = lib.makeOverridable self.buildNodePackage {
-    name = "node-optjs-3.2.1-boom";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/optjs/-/optjs-3.2.1-boom.tgz";
-        name = "optjs-3.2.1-boom.tgz";
-        sha1 = "bc0af6c8647db5eec511c4ca2d264f9646add758";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."optjs" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "optjs" ];
-  };
   by-spec."optparse"."*" =
     self.by-version."optparse"."1.0.5";
   by-version."optparse"."1.0.5" = lib.makeOverridable self.buildNodePackage {
@@ -13531,6 +13665,25 @@
   "optparse" = self.by-version."optparse"."1.0.5";
   by-spec."optparse".">= 1.0.3" =
     self.by-version."optparse"."1.0.5";
+  by-spec."ordered-read-streams"."0.0.8" =
+    self.by-version."ordered-read-streams"."0.0.8";
+  by-version."ordered-read-streams"."0.0.8" = lib.makeOverridable self.buildNodePackage {
+    name = "node-ordered-read-streams-0.0.8";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.0.8.tgz";
+        name = "ordered-read-streams-0.0.8.tgz";
+        sha1 = "fd921331b1a130b66aeef711b219aee01d89e0c5";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."ordered-read-streams" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "ordered-read-streams" ];
+  };
   by-spec."os-browserify"."~0.1.1" =
     self.by-version."os-browserify"."0.1.2";
   by-version."os-browserify"."0.1.2" = lib.makeOverridable self.buildNodePackage {
@@ -13551,6 +13704,25 @@
     passthru.names = [ "os-browserify" ];
   };
   by-spec."osenv"."0" =
+    self.by-version."osenv"."0.1.0";
+  by-version."osenv"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-osenv-0.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/osenv/-/osenv-0.1.0.tgz";
+        name = "osenv-0.1.0.tgz";
+        sha1 = "61668121eec584955030b9f470b1d2309504bfcb";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."osenv" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "osenv" ];
+  };
+  by-spec."osenv"."0.0.3" =
     self.by-version."osenv"."0.0.3";
   by-version."osenv"."0.0.3" = lib.makeOverridable self.buildNodePackage {
     name = "node-osenv-0.0.3";
@@ -13569,10 +13741,10 @@
     ];
     passthru.names = [ "osenv" ];
   };
-  by-spec."osenv"."0.0.3" =
-    self.by-version."osenv"."0.0.3";
-  by-spec."osenv"."~0.0.3" =
-    self.by-version."osenv"."0.0.3";
+  by-spec."osenv"."^0.1.0" =
+    self.by-version."osenv"."0.1.0";
+  by-spec."osenv"."~0.1.0" =
+    self.by-version."osenv"."0.1.0";
   by-spec."owl-deepcopy"."*" =
     self.by-version."owl-deepcopy"."0.0.4";
   by-version."owl-deepcopy"."0.0.4" = lib.makeOverridable self.buildNodePackage {
@@ -13595,35 +13767,15 @@
   "owl-deepcopy" = self.by-version."owl-deepcopy"."0.0.4";
   by-spec."owl-deepcopy"."~0.0.1" =
     self.by-version."owl-deepcopy"."0.0.4";
-  by-spec."p-throttler"."~0.0.1" =
-    self.by-version."p-throttler"."0.0.1";
-  by-version."p-throttler"."0.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-p-throttler-0.0.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/p-throttler/-/p-throttler-0.0.1.tgz";
-        name = "p-throttler-0.0.1.tgz";
-        sha1 = "c341e3589ec843852a035e6f88e6c1e96150029b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."p-throttler" or []);
-    deps = [
-      self.by-version."q"."0.9.7"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "p-throttler" ];
-  };
   by-spec."pako"."~0.2.0" =
-    self.by-version."pako"."0.2.0";
-  by-version."pako"."0.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-pako-0.2.0";
+    self.by-version."pako"."0.2.5";
+  by-version."pako"."0.2.5" = lib.makeOverridable self.buildNodePackage {
+    name = "node-pako-0.2.5";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/pako/-/pako-0.2.0.tgz";
-        name = "pako-0.2.0.tgz";
-        sha1 = "bb93787e8c60587c8b13cd3cd8802e9d6f5dd8d5";
+        url = "http://registry.npmjs.org/pako/-/pako-0.2.5.tgz";
+        name = "pako-0.2.5.tgz";
+        sha1 = "36df19467a3879152e9adcc44784f07d0a80c525";
       })
     ];
     buildInputs =
@@ -13634,27 +13786,46 @@
     ];
     passthru.names = [ "pako" ];
   };
-  by-spec."parents"."0.0.2" =
-    self.by-version."parents"."0.0.2";
-  by-version."parents"."0.0.2" = lib.makeOverridable self.buildNodePackage {
-    name = "parents-0.0.2";
+  by-spec."parents"."^1.0.0" =
+    self.by-version."parents"."1.0.0";
+  by-version."parents"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "parents-1.0.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/parents/-/parents-0.0.2.tgz";
-        name = "parents-0.0.2.tgz";
-        sha1 = "67147826e497d40759aaf5ba4c99659b6034d302";
+        url = "http://registry.npmjs.org/parents/-/parents-1.0.0.tgz";
+        name = "parents-1.0.0.tgz";
+        sha1 = "05726fdb61b60d8c9e3d5d9c595aa78c881c8479";
       })
     ];
     buildInputs =
       (self.nativeDeps."parents" or []);
     deps = [
+      self.by-version."path-platform"."0.0.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "parents" ];
   };
   by-spec."parents"."~0.0.1" =
-    self.by-version."parents"."0.0.2";
+    self.by-version."parents"."0.0.3";
+  by-version."parents"."0.0.3" = lib.makeOverridable self.buildNodePackage {
+    name = "parents-0.0.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/parents/-/parents-0.0.3.tgz";
+        name = "parents-0.0.3.tgz";
+        sha1 = "fa212f024d9fa6318dbb6b4ce676c8be493b9c43";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."parents" or []);
+    deps = [
+      self.by-version."path-platform"."0.0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "parents" ];
+  };
   by-spec."parseurl"."1.0.1" =
     self.by-version."parseurl"."1.0.1";
   by-version."parseurl"."1.0.1" = lib.makeOverridable self.buildNodePackage {
@@ -13674,6 +13845,63 @@
     ];
     passthru.names = [ "parseurl" ];
   };
+  by-spec."parseurl"."~1.1.3" =
+    self.by-version."parseurl"."1.1.3";
+  by-version."parseurl"."1.1.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-parseurl-1.1.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/parseurl/-/parseurl-1.1.3.tgz";
+        name = "parseurl-1.1.3.tgz";
+        sha1 = "1f005738ac71b417bc2d0845cbdfa2a8b63ea639";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."parseurl" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "parseurl" ];
+  };
+  by-spec."parseurl"."~1.2.0" =
+    self.by-version."parseurl"."1.2.0";
+  by-version."parseurl"."1.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-parseurl-1.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/parseurl/-/parseurl-1.2.0.tgz";
+        name = "parseurl-1.2.0.tgz";
+        sha1 = "be7df2d698eb49ffb10ea62939693e152991c008";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."parseurl" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "parseurl" ];
+  };
+  by-spec."parseurl"."~1.3.0" =
+    self.by-version."parseurl"."1.3.0";
+  by-version."parseurl"."1.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-parseurl-1.3.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz";
+        name = "parseurl-1.3.0.tgz";
+        sha1 = "b58046db4223e145afa76009e61bac87cc2281b3";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."parseurl" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "parseurl" ];
+  };
   by-spec."passport"."*" =
     self.by-version."passport"."0.2.0";
   by-version."passport"."0.2.0" = lib.makeOverridable self.buildNodePackage {
@@ -13821,6 +14049,25 @@
     ];
     passthru.names = [ "path-is-inside" ];
   };
+  by-spec."path-platform"."^0.0.1" =
+    self.by-version."path-platform"."0.0.1";
+  by-version."path-platform"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-path-platform-0.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/path-platform/-/path-platform-0.0.1.tgz";
+        name = "path-platform-0.0.1.tgz";
+        sha1 = "b5585d7c3c463d89aa0060d86611cf1afd617e2a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."path-platform" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "path-platform" ];
+  };
   by-spec."path-to-regexp"."0.1.2" =
     self.by-version."path-to-regexp"."0.1.2";
   by-version."path-to-regexp"."0.1.2" = lib.makeOverridable self.buildNodePackage {
@@ -13840,6 +14087,25 @@
     ];
     passthru.names = [ "path-to-regexp" ];
   };
+  by-spec."path-to-regexp"."0.1.3" =
+    self.by-version."path-to-regexp"."0.1.3";
+  by-version."path-to-regexp"."0.1.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-path-to-regexp-0.1.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.3.tgz";
+        name = "path-to-regexp-0.1.3.tgz";
+        sha1 = "21b9ab82274279de25b156ea08fd12ca51b8aecb";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."path-to-regexp" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "path-to-regexp" ];
+  };
   by-spec."pause"."0.0.1" =
     self.by-version."pause"."0.0.1";
   by-version."pause"."0.0.1" = lib.makeOverridable self.buildNodePackage {
@@ -13860,14 +14126,14 @@
     passthru.names = [ "pause" ];
   };
   by-spec."phantomjs"."*" =
-    self.by-version."phantomjs"."1.9.7-4";
-  by-version."phantomjs"."1.9.7-4" = lib.makeOverridable self.buildNodePackage {
-    name = "phantomjs-1.9.7-4";
+    self.by-version."phantomjs"."1.9.7-15";
+  by-version."phantomjs"."1.9.7-15" = lib.makeOverridable self.buildNodePackage {
+    name = "phantomjs-1.9.7-15";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.7-4.tgz";
-        name = "phantomjs-1.9.7-4.tgz";
-        sha1 = "975b84f17b4b3bb28161d28303cb793b98c9d0dd";
+        url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.7-15.tgz";
+        name = "phantomjs-1.9.7-15.tgz";
+        sha1 = "0b3a7ce630486a83be91ff4e832eee20e971115b";
       })
     ];
     buildInputs =
@@ -13878,16 +14144,21 @@
       self.by-version."ncp"."0.4.2"
       self.by-version."npmconf"."0.0.24"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."rimraf"."2.2.6"
+      self.by-version."progress"."1.1.8"
+      self.by-version."request"."2.36.0"
+      self.by-version."request-progress"."0.3.1"
+      self.by-version."rimraf"."2.2.8"
       self.by-version."which"."1.0.5"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "phantomjs" ];
   };
-  "phantomjs" = self.by-version."phantomjs"."1.9.7-4";
-  by-spec."phantomjs"."~1.9.1-2" =
-    self.by-version."phantomjs"."1.9.7-4";
+  "phantomjs" = self.by-version."phantomjs"."1.9.7-15";
+  by-spec."phantomjs"."~1.9.1" =
+    self.by-version."phantomjs"."1.9.7-15";
+  by-spec."phantomjs"."~1.9.7" =
+    self.by-version."phantomjs"."1.9.7-15";
   by-spec."pkginfo"."0.2.x" =
     self.by-version."pkginfo"."0.2.3";
   by-version."pkginfo"."0.2.3" = lib.makeOverridable self.buildNodePackage {
@@ -13931,26 +14202,26 @@
   by-spec."pkginfo"."0.x.x" =
     self.by-version."pkginfo"."0.3.0";
   by-spec."plist-native"."*" =
-    self.by-version."plist-native"."0.2.3";
-  by-version."plist-native"."0.2.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-plist-native-0.2.3";
+    self.by-version."plist-native"."0.3.1";
+  by-version."plist-native"."0.3.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-plist-native-0.3.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/plist-native/-/plist-native-0.2.3.tgz";
-        name = "plist-native-0.2.3.tgz";
-        sha1 = "76843a2da80d587b75dcbcc1634c6f3968a2af17";
+        url = "http://registry.npmjs.org/plist-native/-/plist-native-0.3.1.tgz";
+        name = "plist-native-0.3.1.tgz";
+        sha1 = "c9cd71ae2ac6aa16c315dde213c65d6cc53dee1a";
       })
     ];
     buildInputs =
       (self.nativeDeps."plist-native" or []);
     deps = [
-      self.by-version."libxmljs"."0.8.1"
+      self.by-version."libxmljs"."0.10.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "plist-native" ];
   };
-  "plist-native" = self.by-version."plist-native"."0.2.3";
+  "plist-native" = self.by-version."plist-native"."0.3.1";
   by-spec."policyfile"."0.0.4" =
     self.by-version."policyfile"."0.0.4";
   by-version."policyfile"."0.0.4" = lib.makeOverridable self.buildNodePackage {
@@ -14010,14 +14281,14 @@
     passthru.names = [ "posix-getopt" ];
   };
   by-spec."pretty-bytes"."^0.1.0" =
-    self.by-version."pretty-bytes"."0.1.0";
-  by-version."pretty-bytes"."0.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "pretty-bytes-0.1.0";
+    self.by-version."pretty-bytes"."0.1.2";
+  by-version."pretty-bytes"."0.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "pretty-bytes-0.1.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/pretty-bytes/-/pretty-bytes-0.1.0.tgz";
-        name = "pretty-bytes-0.1.0.tgz";
-        sha1 = "2cad1cdd7838fe59018ae5e0ccf7cae741942f8e";
+        url = "http://registry.npmjs.org/pretty-bytes/-/pretty-bytes-0.1.2.tgz";
+        name = "pretty-bytes-0.1.2.tgz";
+        sha1 = "cd90294d58a1ca4e8a5d0fb9c8225998881acf00";
       })
     ];
     buildInputs =
@@ -14028,6 +14299,25 @@
     ];
     passthru.names = [ "pretty-bytes" ];
   };
+  by-spec."process"."^0.7.0" =
+    self.by-version."process"."0.7.0";
+  by-version."process"."0.7.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-process-0.7.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/process/-/process-0.7.0.tgz";
+        name = "process-0.7.0.tgz";
+        sha1 = "c52208161a34adf3812344ae85d3e6150469389d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."process" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "process" ];
+  };
   by-spec."process"."~0.5.1" =
     self.by-version."process"."0.5.2";
   by-version."process"."0.5.2" = lib.makeOverridable self.buildNodePackage {
@@ -14066,6 +14356,25 @@
     ];
     passthru.names = [ "process" ];
   };
+  by-spec."progress"."^1.1.5" =
+    self.by-version."progress"."1.1.8";
+  by-version."progress"."1.1.8" = lib.makeOverridable self.buildNodePackage {
+    name = "node-progress-1.1.8";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/progress/-/progress-1.1.8.tgz";
+        name = "progress-1.1.8.tgz";
+        sha1 = "e260c78f6161cdd9b0e56cc3e0a85de17c7a57be";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."progress" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "progress" ];
+  };
   by-spec."promise"."~2.0" =
     self.by-version."promise"."2.0.0";
   by-version."promise"."2.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -14080,7 +14389,7 @@
     buildInputs =
       (self.nativeDeps."promise" or []);
     deps = [
-      self.by-version."is-promise"."1.0.0"
+      self.by-version."is-promise"."1.0.1"
     ];
     peerDependencies = [
     ];
@@ -14102,7 +14411,7 @@
     deps = [
       self.by-version."pkginfo"."0.3.0"
       self.by-version."read"."1.0.5"
-      self.by-version."revalidator"."0.1.7"
+      self.by-version."revalidator"."0.1.8"
       self.by-version."utile"."0.2.1"
       self.by-version."winston"."0.6.2"
     ];
@@ -14110,35 +14419,15 @@
     ];
     passthru.names = [ "prompt" ];
   };
-  by-spec."promptly"."~0.2.0" =
-    self.by-version."promptly"."0.2.0";
-  by-version."promptly"."0.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-promptly-0.2.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/promptly/-/promptly-0.2.0.tgz";
-        name = "promptly-0.2.0.tgz";
-        sha1 = "73ef200fa8329d5d3a8df41798950b8646ca46d9";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."promptly" or []);
-    deps = [
-      self.by-version."read"."1.0.5"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "promptly" ];
-  };
   by-spec."promzard"."~0.2.0" =
-    self.by-version."promzard"."0.2.1";
-  by-version."promzard"."0.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-promzard-0.2.1";
+    self.by-version."promzard"."0.2.2";
+  by-version."promzard"."0.2.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-promzard-0.2.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/promzard/-/promzard-0.2.1.tgz";
-        name = "promzard-0.2.1.tgz";
-        sha1 = "c4c7cbe5182465c13b43540be9daf47098b4e75b";
+        url = "http://registry.npmjs.org/promzard/-/promzard-0.2.2.tgz";
+        name = "promzard-0.2.2.tgz";
+        sha1 = "918b9f2b29458cb001781a8856502e4a79b016e0";
       })
     ];
     buildInputs =
@@ -14151,14 +14440,14 @@
     passthru.names = [ "promzard" ];
   };
   by-spec."proto-list"."~1.2.1" =
-    self.by-version."proto-list"."1.2.2";
-  by-version."proto-list"."1.2.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-proto-list-1.2.2";
+    self.by-version."proto-list"."1.2.3";
+  by-version."proto-list"."1.2.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-proto-list-1.2.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/proto-list/-/proto-list-1.2.2.tgz";
-        name = "proto-list-1.2.2.tgz";
-        sha1 = "48b88798261ec2c4a785720cdfec6200d57d3326";
+        url = "http://registry.npmjs.org/proto-list/-/proto-list-1.2.3.tgz";
+        name = "proto-list-1.2.3.tgz";
+        sha1 = "6235554a1bca1f0d15e3ca12ca7329d5def42bd9";
       })
     ];
     buildInputs =
@@ -14169,26 +14458,25 @@
     ];
     passthru.names = [ "proto-list" ];
   };
-  by-spec."protobufjs".">= 1.1.4" =
-    self.by-version."protobufjs"."2.0.5";
-  by-version."protobufjs"."2.0.5" = lib.makeOverridable self.buildNodePackage {
-    name = "protobufjs-2.0.5";
+  by-spec."proxy-addr"."1.0.1" =
+    self.by-version."proxy-addr"."1.0.1";
+  by-version."proxy-addr"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-proxy-addr-1.0.1";
     src = [
-      (self.patchSource fetchurl {
-        url = "http://registry.npmjs.org/protobufjs/-/protobufjs-2.0.5.tgz";
-        name = "protobufjs-2.0.5.tgz";
-        sha1 = "7f351178c959b333d2327b773325ca4b2627a242";
+      (fetchurl {
+        url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.1.tgz";
+        name = "proxy-addr-1.0.1.tgz";
+        sha1 = "c7c566d5eb4e3fad67eeb9c77c5558ccc39b88a8";
       })
     ];
     buildInputs =
-      (self.nativeDeps."protobufjs" or []);
+      (self.nativeDeps."proxy-addr" or []);
     deps = [
-      self.by-version."bytebuffer"."2.3.1"
-      self.by-version."ascli"."0.3.0"
+      self.by-version."ipaddr.js"."0.1.2"
     ];
     peerDependencies = [
     ];
-    passthru.names = [ "protobufjs" ];
+    passthru.names = [ "proxy-addr" ];
   };
   by-spec."ps-tree"."0.0.x" =
     self.by-version."ps-tree"."0.0.3";
@@ -14210,6 +14498,8 @@
     ];
     passthru.names = [ "ps-tree" ];
   };
+  by-spec."ps-tree"."~0.0.3" =
+    self.by-version."ps-tree"."0.0.3";
   by-spec."punycode"."1.2.4" =
     self.by-version."punycode"."1.2.4";
   by-version."punycode"."1.2.4" = lib.makeOverridable self.buildNodePackage {
@@ -14230,16 +14520,14 @@
     passthru.names = [ "punycode" ];
   };
   by-spec."punycode".">=0.2.0" =
-    self.by-version."punycode"."1.2.4";
-  by-spec."punycode".">=1.0.0 <1.1.0" =
-    self.by-version."punycode"."1.0.0";
-  by-version."punycode"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-punycode-1.0.0";
+    self.by-version."punycode"."1.3.1";
+  by-version."punycode"."1.3.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-punycode-1.3.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/punycode/-/punycode-1.0.0.tgz";
-        name = "punycode-1.0.0.tgz";
-        sha1 = "ce9e6c6e9c1db5827174fceb12ff4938700a1bd3";
+        url = "http://registry.npmjs.org/punycode/-/punycode-1.3.1.tgz";
+        name = "punycode-1.3.1.tgz";
+        sha1 = "710afe5123c20a1530b712e3e682b9118fe8058e";
       })
     ];
     buildInputs =
@@ -14252,6 +14540,8 @@
   };
   by-spec."punycode"."~1.2.3" =
     self.by-version."punycode"."1.2.4";
+  by-spec."punycode"."~1.2.4" =
+    self.by-version."punycode"."1.2.4";
   by-spec."pure-css"."git://github.com/yui/pure.git#v0.5.0-rc-1" =
     self.by-version."pure-css"."0.5.0-rc-1";
   by-version."pure-css"."0.5.0-rc-1" = lib.makeOverridable self.buildNodePackage {
@@ -14273,14 +14563,14 @@
   };
   "pure-css" = self.by-version."pure-css"."0.5.0-rc-1";
   by-spec."q".">= 0.0.1" =
-    self.by-version."q"."2.0.1";
-  by-version."q"."2.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-q-2.0.1";
+    self.by-version."q"."2.0.2";
+  by-version."q"."2.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-q-2.0.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/q/-/q-2.0.1.tgz";
-        name = "q-2.0.1.tgz";
-        sha1 = "ae9dc1edd970e72820a1ca716ecc1b0fc96c1c5a";
+        url = "http://registry.npmjs.org/q/-/q-2.0.2.tgz";
+        name = "q-2.0.2.tgz";
+        sha1 = "4629e6cc668ff8554cfa775dab5aba50bad8f56d";
       })
     ];
     buildInputs =
@@ -14293,7 +14583,7 @@
     ];
     passthru.names = [ "q" ];
   };
-  by-spec."q"."~0.9.2" =
+  by-spec."q"."~0.9.6" =
     self.by-version."q"."0.9.7";
   by-version."q"."0.9.7" = lib.makeOverridable self.buildNodePackage {
     name = "node-q-0.9.7";
@@ -14312,11 +14602,9 @@
     ];
     passthru.names = [ "q" ];
   };
-  by-spec."q"."~0.9.6" =
-    self.by-version."q"."0.9.7";
   by-spec."q"."~0.9.7" =
     self.by-version."q"."0.9.7";
-  by-spec."q"."~1.0.0" =
+  by-spec."q"."~1.0.1" =
     self.by-version."q"."1.0.1";
   by-version."q"."1.0.1" = lib.makeOverridable self.buildNodePackage {
     name = "node-q-1.0.1";
@@ -14335,8 +14623,6 @@
     ];
     passthru.names = [ "q" ];
   };
-  by-spec."q"."~1.0.1" =
-    self.by-version."q"."1.0.1";
   by-spec."qs"."0.4.2" =
     self.by-version."qs"."0.4.2";
   by-version."qs"."0.4.2" = lib.makeOverridable self.buildNodePackage {
@@ -14453,9 +14739,28 @@
     ];
     passthru.names = [ "qs" ];
   };
+  by-spec."qs"."1.2.2" =
+    self.by-version."qs"."1.2.2";
+  by-version."qs"."1.2.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-qs-1.2.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/qs/-/qs-1.2.2.tgz";
+        name = "qs-1.2.2.tgz";
+        sha1 = "19b57ff24dc2a99ce1f8bdf6afcda59f8ef61f88";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."qs" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "qs" ];
+  };
   by-spec."qs".">= 0.4.0" =
-    self.by-version."qs"."0.6.6";
-  by-spec."qs"."~0.5.0" =
+    self.by-version."qs"."1.2.2";
+  by-spec."qs"."~0.5.4" =
     self.by-version."qs"."0.5.6";
   by-version."qs"."0.5.6" = lib.makeOverridable self.buildNodePackage {
     name = "node-qs-0.5.6";
@@ -14474,40 +14779,36 @@
     ];
     passthru.names = [ "qs" ];
   };
-  by-spec."qs"."~0.5.4" =
-    self.by-version."qs"."0.5.6";
   by-spec."qs"."~0.6.0" =
     self.by-version."qs"."0.6.6";
-  by-spec."qs"."~0.6.6" =
-    self.by-version."qs"."0.6.6";
-  by-spec."querystring".">=0.1.0 <0.2.0" =
-    self.by-version."querystring"."0.1.0";
-  by-version."querystring"."0.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-querystring-0.1.0";
+  by-spec."qs"."~1.0.0" =
+    self.by-version."qs"."1.0.2";
+  by-version."qs"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-qs-1.0.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/querystring/-/querystring-0.1.0.tgz";
-        name = "querystring-0.1.0.tgz";
-        sha1 = "cb76a26cda0a10a94163fcdb3e132827f04b7b10";
+        url = "http://registry.npmjs.org/qs/-/qs-1.0.2.tgz";
+        name = "qs-1.0.2.tgz";
+        sha1 = "50a93e2b5af6691c31bcea5dae78ee6ea1903768";
       })
     ];
     buildInputs =
-      (self.nativeDeps."querystring" or []);
+      (self.nativeDeps."qs" or []);
     deps = [
     ];
     peerDependencies = [
     ];
-    passthru.names = [ "querystring" ];
+    passthru.names = [ "qs" ];
   };
-  by-spec."querystring-es3"."0.2.0" =
-    self.by-version."querystring-es3"."0.2.0";
-  by-version."querystring-es3"."0.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-querystring-es3-0.2.0";
+  by-spec."querystring-es3"."~0.2.0" =
+    self.by-version."querystring-es3"."0.2.1-0";
+  by-version."querystring-es3"."0.2.1-0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-querystring-es3-0.2.1-0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.0.tgz";
-        name = "querystring-es3-0.2.0.tgz";
-        sha1 = "c365a08a69c443accfeb3a9deab35e3f0abaa476";
+        url = "http://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1-0.tgz";
+        name = "querystring-es3-0.2.1-0.tgz";
+        sha1 = "bd38cbd701040e7ef66c94a93db4a5b45be39565";
       })
     ];
     buildInputs =
@@ -14518,15 +14819,15 @@
     ];
     passthru.names = [ "querystring-es3" ];
   };
-  by-spec."rai"."~0.1" =
-    self.by-version."rai"."0.1.9";
-  by-version."rai"."0.1.9" = lib.makeOverridable self.buildNodePackage {
-    name = "node-rai-0.1.9";
+  by-spec."rai"."~0.1.11" =
+    self.by-version."rai"."0.1.11";
+  by-version."rai"."0.1.11" = lib.makeOverridable self.buildNodePackage {
+    name = "node-rai-0.1.11";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/rai/-/rai-0.1.9.tgz";
-        name = "rai-0.1.9.tgz";
-        sha1 = "0f71aac1b8787828b0e0bdae73ec4fe64bad11fc";
+        url = "http://registry.npmjs.org/rai/-/rai-0.1.11.tgz";
+        name = "rai-0.1.11.tgz";
+        sha1 = "ea0ba30ceecfb77a46d3b2d849e3d4249d056228";
       })
     ];
     buildInputs =
@@ -14577,24 +14878,27 @@
   };
   by-spec."range-parser"."~1.0.0" =
     self.by-version."range-parser"."1.0.0";
-  by-spec."raven"."~0.6.3" =
-    self.by-version."raven"."0.6.3";
-  by-version."raven"."0.6.3" = lib.makeOverridable self.buildNodePackage {
-    name = "raven-0.6.3";
+  by-spec."raven"."~0.7.0" =
+    self.by-version."raven"."0.7.0";
+  by-version."raven"."0.7.0" = lib.makeOverridable self.buildNodePackage {
+    name = "raven-0.7.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/raven/-/raven-0.6.3.tgz";
-        name = "raven-0.6.3.tgz";
-        sha1 = "3e7c72d45e0dff93ecc54978661331755c637320";
+        url = "http://registry.npmjs.org/raven/-/raven-0.7.0.tgz";
+        name = "raven-0.7.0.tgz";
+        sha1 = "ec7fea6c0b87c59b252a9491c93d5bcf8d0c7ba0";
       })
     ];
     buildInputs =
       (self.nativeDeps."raven" or []);
     deps = [
+      self.by-version."cookie"."0.1.0"
+      self.by-version."lsmod"."0.0.3"
       self.by-version."node-uuid"."1.4.1"
       self.by-version."stack-trace"."0.0.7"
-      self.by-version."lsmod"."0.0.3"
-      self.by-version."cookie"."0.1.0"
+      self.by-version."connect"."3.1.1"
+      self.by-version."express"."4.8.5"
+      self.by-version."koa"."0.10.0"
     ];
     peerDependencies = [
     ];
@@ -14639,41 +14943,43 @@
     ];
     passthru.names = [ "raw-body" ];
   };
-  by-spec."raw-body"."1.1.3" =
-    self.by-version."raw-body"."1.1.3";
-  by-version."raw-body"."1.1.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-raw-body-1.1.3";
+  by-spec."raw-body"."1.2.2" =
+    self.by-version."raw-body"."1.2.2";
+  by-version."raw-body"."1.2.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-raw-body-1.2.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/raw-body/-/raw-body-1.1.3.tgz";
-        name = "raw-body-1.1.3.tgz";
-        sha1 = "3d2f91e2449259cc67b8c3ce9f061db5b987935b";
+        url = "http://registry.npmjs.org/raw-body/-/raw-body-1.2.2.tgz";
+        name = "raw-body-1.2.2.tgz";
+        sha1 = "0c68e1ee28cfed7dba4822234aec6078461cbc1f";
       })
     ];
     buildInputs =
       (self.nativeDeps."raw-body" or []);
     deps = [
-      self.by-version."bytes"."0.2.1"
+      self.by-version."bytes"."1.0.0"
+      self.by-version."iconv-lite"."0.4.3"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "raw-body" ];
   };
-  by-spec."raw-body"."~1.1.2" =
-    self.by-version."raw-body"."1.1.4";
-  by-version."raw-body"."1.1.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-raw-body-1.1.4";
+  by-spec."raw-body"."1.3.0" =
+    self.by-version."raw-body"."1.3.0";
+  by-version."raw-body"."1.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-raw-body-1.3.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/raw-body/-/raw-body-1.1.4.tgz";
-        name = "raw-body-1.1.4.tgz";
-        sha1 = "f0b5624388d031f63da07f870c86cb9ccadcb67d";
+        url = "http://registry.npmjs.org/raw-body/-/raw-body-1.3.0.tgz";
+        name = "raw-body-1.3.0.tgz";
+        sha1 = "978230a156a5548f42eef14de22d0f4f610083d1";
       })
     ];
     buildInputs =
       (self.nativeDeps."raw-body" or []);
     deps = [
-      self.by-version."bytes"."0.3.0"
+      self.by-version."bytes"."1.0.0"
+      self.by-version."iconv-lite"."0.4.4"
     ];
     peerDependencies = [
     ];
@@ -14699,14 +15005,14 @@
     passthru.names = [ "raw-socket" ];
   };
   by-spec."rbytes"."*" =
-    self.by-version."rbytes"."1.0.0";
-  by-version."rbytes"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-rbytes-1.0.0";
+    self.by-version."rbytes"."1.1.0";
+  by-version."rbytes"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-rbytes-1.1.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/rbytes/-/rbytes-1.0.0.tgz";
-        name = "rbytes-1.0.0.tgz";
-        sha1 = "4eeb85c457f710d8147329d5eed5cd02c798fa4d";
+        url = "http://registry.npmjs.org/rbytes/-/rbytes-1.1.0.tgz";
+        name = "rbytes-1.1.0.tgz";
+        sha1 = "50234097e70c079bcdf5227494311b1038f3d619";
       })
     ];
     buildInputs =
@@ -14717,7 +15023,7 @@
     ];
     passthru.names = [ "rbytes" ];
   };
-  "rbytes" = self.by-version."rbytes"."1.0.0";
+  "rbytes" = self.by-version."rbytes"."1.1.0";
   by-spec."rc"."~0.3.0" =
     self.by-version."rc"."0.3.5";
   by-version."rc"."0.3.5" = lib.makeOverridable self.buildNodePackage {
@@ -14732,37 +15038,58 @@
     buildInputs =
       (self.nativeDeps."rc" or []);
     deps = [
-      self.by-version."minimist"."0.0.8"
-      self.by-version."deep-extend"."0.2.8"
+      self.by-version."minimist"."0.0.10"
+      self.by-version."deep-extend"."0.2.11"
       self.by-version."ini"."1.1.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "rc" ];
   };
-  by-spec."rc"."~0.3.4" =
-    self.by-version."rc"."0.3.5";
-  by-spec."react"."*" =
-    self.by-version."react"."0.10.0";
-  by-version."react"."0.10.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-react-0.10.0";
+  by-spec."rc"."~0.4.0" =
+    self.by-version."rc"."0.4.0";
+  by-version."rc"."0.4.0" = lib.makeOverridable self.buildNodePackage {
+    name = "rc-0.4.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/react/-/react-0.10.0.tgz";
-        name = "react-0.10.0.tgz";
-        sha1 = "8c82753593d3f325ca99d820f7400ab02f1ee1f8";
+        url = "http://registry.npmjs.org/rc/-/rc-0.4.0.tgz";
+        name = "rc-0.4.0.tgz";
+        sha1 = "ce24a2029ad94c3a40d09604a87227027d7210d3";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."rc" or []);
+    deps = [
+      self.by-version."minimist"."0.0.10"
+      self.by-version."deep-extend"."0.2.11"
+      self.by-version."strip-json-comments"."0.1.3"
+      self.by-version."ini"."1.1.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "rc" ];
+  };
+  by-spec."react"."*" =
+    self.by-version."react"."0.11.1";
+  by-version."react"."0.11.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-react-0.11.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/react/-/react-0.11.1.tgz";
+        name = "react-0.11.1.tgz";
+        sha1 = "201190712f69bc451e2c83946653384d7448aaff";
       })
     ];
     buildInputs =
       (self.nativeDeps."react" or []);
     deps = [
+      self.by-version."envify"."2.0.1"
     ];
     peerDependencies = [
-      self.by-version."envify"."1.2.1"
     ];
     passthru.names = [ "react" ];
   };
-  "react" = self.by-version."react"."0.10.0";
+  "react" = self.by-version."react"."0.11.1";
   by-spec."read"."1" =
     self.by-version."read"."1.0.5";
   by-version."read"."1.0.5" = lib.makeOverridable self.buildNodePackage {
@@ -14789,56 +15116,103 @@
     self.by-version."read"."1.0.5";
   by-spec."read"."~1.0.4" =
     self.by-version."read"."1.0.5";
-  by-spec."read-installed"."~2.0.1" =
-    self.by-version."read-installed"."2.0.2";
-  by-version."read-installed"."2.0.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-read-installed-2.0.2";
+  by-spec."read-installed"."~2.0.5" =
+    self.by-version."read-installed"."2.0.7";
+  by-version."read-installed"."2.0.7" = lib.makeOverridable self.buildNodePackage {
+    name = "node-read-installed-2.0.7";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/read-installed/-/read-installed-2.0.2.tgz";
-        name = "read-installed-2.0.2.tgz";
-        sha1 = "e69e7e1946af932b2fa454465639ebea4d63773c";
+        url = "http://registry.npmjs.org/read-installed/-/read-installed-2.0.7.tgz";
+        name = "read-installed-2.0.7.tgz";
+        sha1 = "a82157a5e273576c57f230ecec3702ab215a6d6c";
       })
     ];
     buildInputs =
       (self.nativeDeps."read-installed" or []);
     deps = [
-      self.by-version."read-package-json"."1.1.8"
-      self.by-version."semver"."2.2.1"
+      self.by-version."read-package-json"."1.2.6"
+      self.by-version."semver"."3.0.1"
       self.by-version."slide"."1.1.5"
       self.by-version."util-extend"."1.0.1"
-      self.by-version."graceful-fs"."2.0.3"
+      self.by-version."graceful-fs"."3.0.2"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "read-installed" ];
   };
   by-spec."read-package-json"."1" =
-    self.by-version."read-package-json"."1.1.8";
-  by-version."read-package-json"."1.1.8" = lib.makeOverridable self.buildNodePackage {
-    name = "node-read-package-json-1.1.8";
+    self.by-version."read-package-json"."1.2.6";
+  by-version."read-package-json"."1.2.6" = lib.makeOverridable self.buildNodePackage {
+    name = "node-read-package-json-1.2.6";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.1.8.tgz";
-        name = "read-package-json-1.1.8.tgz";
-        sha1 = "234928819444283fd63f9d93ce03ba00668e94f9";
+        url = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.2.6.tgz";
+        name = "read-package-json-1.2.6.tgz";
+        sha1 = "eedcc11ba25a94f80e5941fdbccff4a21d8ab13a";
       })
     ];
     buildInputs =
       (self.nativeDeps."read-package-json" or []);
     deps = [
-      self.by-version."glob"."3.2.9"
+      self.by-version."github-url-from-git"."1.3.0"
+      self.by-version."glob"."4.0.5"
       self.by-version."lru-cache"."2.5.0"
-      self.by-version."normalize-package-data"."0.2.12"
-      self.by-version."graceful-fs"."2.0.3"
+      self.by-version."normalize-package-data"."1.0.0"
+      self.by-version."graceful-fs"."3.0.2"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "read-package-json" ];
   };
-  by-spec."read-package-json"."~1.1.8" =
-    self.by-version."read-package-json"."1.1.8";
+  by-spec."read-package-json"."~1.2.3" =
+    self.by-version."read-package-json"."1.2.6";
+  by-spec."readable-stream"."*" =
+    self.by-version."readable-stream"."1.1.13";
+  by-version."readable-stream"."1.1.13" = lib.makeOverridable self.buildNodePackage {
+    name = "node-readable-stream-1.1.13";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz";
+        name = "readable-stream-1.1.13.tgz";
+        sha1 = "f6eef764f514c89e2b9e23146a75ba106756d23e";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."readable-stream" or []);
+    deps = [
+      self.by-version."core-util-is"."1.0.1"
+      self.by-version."isarray"."0.0.1"
+      self.by-version."string_decoder"."0.10.25"
+      self.by-version."inherits"."2.0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "readable-stream" ];
+  };
   by-spec."readable-stream"."1.0" =
+    self.by-version."readable-stream"."1.0.31";
+  by-version."readable-stream"."1.0.31" = lib.makeOverridable self.buildNodePackage {
+    name = "node-readable-stream-1.0.31";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.31.tgz";
+        name = "readable-stream-1.0.31.tgz";
+        sha1 = "8f2502e0bc9e3b0da1b94520aabb4e2603ecafae";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."readable-stream" or []);
+    deps = [
+      self.by-version."core-util-is"."1.0.1"
+      self.by-version."isarray"."0.0.1"
+      self.by-version."string_decoder"."0.10.25"
+      self.by-version."inherits"."2.0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "readable-stream" ];
+  };
+  by-spec."readable-stream"."1.0.27-1" =
     self.by-version."readable-stream"."1.0.27-1";
   by-version."readable-stream"."1.0.27-1" = lib.makeOverridable self.buildNodePackage {
     name = "node-readable-stream-1.0.27-1";
@@ -14862,38 +15236,47 @@
     passthru.names = [ "readable-stream" ];
   };
   by-spec."readable-stream"."1.1" =
-    self.by-version."readable-stream"."1.1.13-1";
-  by-version."readable-stream"."1.1.13-1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-readable-stream-1.1.13-1";
+    self.by-version."readable-stream"."1.1.13";
+  by-spec."readable-stream".">=1.0.27-1 <1.1.0-0" =
+    self.by-version."readable-stream"."1.0.31";
+  by-spec."readable-stream".">=1.1.13-1 <1.2.0-0" =
+    self.by-version."readable-stream"."1.1.13";
+  by-spec."readable-stream"."^1.0.27-1" =
+    self.by-version."readable-stream"."1.1.13";
+  by-spec."readable-stream"."^1.1.13-1" =
+    self.by-version."readable-stream"."1.1.13";
+  by-spec."readable-stream"."~1.0.17" =
+    self.by-version."readable-stream"."1.0.31";
+  by-spec."readable-stream"."~1.0.2" =
+    self.by-version."readable-stream"."1.0.31";
+  by-spec."readable-stream"."~1.0.24" =
+    self.by-version."readable-stream"."1.0.31";
+  by-spec."readable-stream"."~1.0.26" =
+    self.by-version."readable-stream"."1.0.31";
+  by-spec."readable-stream"."~1.1.8" =
+    self.by-version."readable-stream"."1.1.13";
+  by-spec."readable-stream"."~1.1.9" =
+    self.by-version."readable-stream"."1.1.13";
+  by-spec."readable-wrap"."^1.0.0" =
+    self.by-version."readable-wrap"."1.0.0";
+  by-version."readable-wrap"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-readable-wrap-1.0.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13-1.tgz";
-        name = "readable-stream-1.1.13-1.tgz";
-        sha1 = "fc6f04f3366bf37bae21bec2e411c1b4d2cf1a46";
+        url = "http://registry.npmjs.org/readable-wrap/-/readable-wrap-1.0.0.tgz";
+        name = "readable-wrap-1.0.0.tgz";
+        sha1 = "3b5a211c631e12303a54991c806c17e7ae206bff";
       })
     ];
     buildInputs =
-      (self.nativeDeps."readable-stream" or []);
+      (self.nativeDeps."readable-wrap" or []);
     deps = [
-      self.by-version."core-util-is"."1.0.1"
-      self.by-version."isarray"."0.0.1"
-      self.by-version."string_decoder"."0.10.25"
-      self.by-version."inherits"."2.0.1"
+      self.by-version."readable-stream"."1.1.13"
     ];
     peerDependencies = [
     ];
-    passthru.names = [ "readable-stream" ];
+    passthru.names = [ "readable-wrap" ];
   };
-  by-spec."readable-stream"."~1.0.17" =
-    self.by-version."readable-stream"."1.0.27-1";
-  by-spec."readable-stream"."~1.0.2" =
-    self.by-version."readable-stream"."1.0.27-1";
-  by-spec."readable-stream"."~1.0.24" =
-    self.by-version."readable-stream"."1.0.27-1";
-  by-spec."readable-stream"."~1.1.8" =
-    self.by-version."readable-stream"."1.1.13-1";
-  by-spec."readable-stream"."~1.1.9" =
-    self.by-version."readable-stream"."1.1.13-1";
   by-spec."readdirp"."~0.2.3" =
     self.by-version."readdirp"."0.2.5";
   by-version."readdirp"."0.2.5" = lib.makeOverridable self.buildNodePackage {
@@ -14908,34 +15291,12 @@
     buildInputs =
       (self.nativeDeps."readdirp" or []);
     deps = [
-      self.by-version."minimatch"."0.2.14"
+      self.by-version."minimatch"."1.0.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "readdirp" ];
   };
-  by-spec."readline2"."~0.1.0" =
-    self.by-version."readline2"."0.1.0";
-  by-version."readline2"."0.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-readline2-0.1.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/readline2/-/readline2-0.1.0.tgz";
-        name = "readline2-0.1.0.tgz";
-        sha1 = "6a272ef89731225b448e4c6799b6e50d5be12b98";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."readline2" or []);
-    deps = [
-      self.by-version."mute-stream"."0.0.4"
-      self.by-version."lodash"."2.4.1"
-      self.by-version."chalk"."0.4.0"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "readline2" ];
-  };
   by-spec."recursive-readdir"."0.0.2" =
     self.by-version."recursive-readdir"."0.0.2";
   by-version."recursive-readdir"."0.0.2" = lib.makeOverridable self.buildNodePackage {
@@ -14955,35 +15316,35 @@
     ];
     passthru.names = [ "recursive-readdir" ];
   };
-  by-spec."redeyed"."~0.4.0" =
-    self.by-version."redeyed"."0.4.4";
-  by-version."redeyed"."0.4.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-redeyed-0.4.4";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/redeyed/-/redeyed-0.4.4.tgz";
-        name = "redeyed-0.4.4.tgz";
-        sha1 = "37e990a6f2b21b2a11c2e6a48fd4135698cba97f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."redeyed" or []);
-    deps = [
-      self.by-version."esprima"."1.0.4"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "redeyed" ];
-  };
   by-spec."redis"."*" =
-    self.by-version."redis"."0.10.1";
-  by-version."redis"."0.10.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-redis-0.10.1";
+    self.by-version."redis"."0.12.1";
+  by-version."redis"."0.12.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-redis-0.12.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/redis/-/redis-0.10.1.tgz";
-        name = "redis-0.10.1.tgz";
-        sha1 = "4f09258931d961377239fdbd495e1d99a263a8ec";
+        url = "http://registry.npmjs.org/redis/-/redis-0.12.1.tgz";
+        name = "redis-0.12.1.tgz";
+        sha1 = "64df76ad0fc8acebaebd2a0645e8a48fac49185e";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."redis" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "redis" ];
+  };
+  "redis" = self.by-version."redis"."0.12.1";
+  by-spec."redis"."0.10.x" =
+    self.by-version."redis"."0.10.3";
+  by-version."redis"."0.10.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-redis-0.10.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/redis/-/redis-0.10.3.tgz";
+        name = "redis-0.10.3.tgz";
+        sha1 = "8927fe2110ee39617bcf3fd37b89d8e123911bb6";
       })
     ];
     buildInputs =
@@ -14994,7 +15355,6 @@
     ];
     passthru.names = [ "redis" ];
   };
-  "redis" = self.by-version."redis"."0.10.1";
   by-spec."redis"."0.7.2" =
     self.by-version."redis"."0.7.2";
   by-version."redis"."0.7.2" = lib.makeOverridable self.buildNodePackage {
@@ -15009,7 +15369,7 @@
     buildInputs =
       (self.nativeDeps."redis" or []);
     deps = [
-      self.by-version."hiredis"."0.1.16"
+      self.by-version."hiredis"."0.1.17"
     ];
     peerDependencies = [
     ];
@@ -15034,27 +15394,8 @@
     ];
     passthru.names = [ "redis" ];
   };
-  by-spec."redis"."0.8.x" =
-    self.by-version."redis"."0.8.6";
-  by-version."redis"."0.8.6" = lib.makeOverridable self.buildNodePackage {
-    name = "node-redis-0.8.6";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/redis/-/redis-0.8.6.tgz";
-        name = "redis-0.8.6.tgz";
-        sha1 = "a7ae8f0d6fad24bdeaffe28158d6cd1f1c9d30b8";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."redis" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "redis" ];
-  };
   by-spec."redis"."~0.10.0" =
-    self.by-version."redis"."0.10.1";
+    self.by-version."redis"."0.10.3";
   by-spec."reds"."~0.2.4" =
     self.by-version."reds"."0.2.4";
   by-version."reds"."0.2.4" = lib.makeOverridable self.buildNodePackage {
@@ -15137,70 +15478,41 @@
     passthru.names = [ "replace" ];
   };
   by-spec."request"."2" =
-    self.by-version."request"."2.34.0";
-  by-version."request"."2.34.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-request-2.34.0";
+    self.by-version."request"."2.40.0";
+  by-version."request"."2.40.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-request-2.40.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/request/-/request-2.34.0.tgz";
-        name = "request-2.34.0.tgz";
-        sha1 = "b5d8b9526add4a2d4629f4d417124573996445ae";
+        url = "http://registry.npmjs.org/request/-/request-2.40.0.tgz";
+        name = "request-2.40.0.tgz";
+        sha1 = "4dd670f696f1e6e842e66b4b5e839301ab9beb67";
       })
     ];
     buildInputs =
       (self.nativeDeps."request" or []);
     deps = [
-      self.by-version."qs"."0.6.6"
+      self.by-version."qs"."1.0.2"
       self.by-version."json-stringify-safe"."5.0.0"
+      self.by-version."mime-types"."1.0.2"
       self.by-version."forever-agent"."0.5.2"
       self.by-version."node-uuid"."1.4.1"
-      self.by-version."mime"."1.2.11"
       self.by-version."tough-cookie"."0.12.1"
-      self.by-version."form-data"."0.1.2"
-      self.by-version."tunnel-agent"."0.3.0"
+      self.by-version."form-data"."0.1.4"
+      self.by-version."tunnel-agent"."0.4.0"
       self.by-version."http-signature"."0.10.0"
       self.by-version."oauth-sign"."0.3.0"
-      self.by-version."hawk"."1.0.0"
+      self.by-version."hawk"."1.1.1"
       self.by-version."aws-sign2"."0.5.0"
+      self.by-version."stringstream"."0.0.4"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "request" ];
   };
   by-spec."request"."2 >=2.20.0" =
-    self.by-version."request"."2.34.0";
+    self.by-version."request"."2.40.0";
   by-spec."request"."2 >=2.25.0" =
-    self.by-version."request"."2.34.0";
-  by-spec."request"."2.16.2" =
-    self.by-version."request"."2.16.2";
-  by-version."request"."2.16.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-request-2.16.2";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/request/-/request-2.16.2.tgz";
-        name = "request-2.16.2.tgz";
-        sha1 = "83a028be61be4a05163e7e2e7a4b40e35df1bcb9";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."request" or []);
-    deps = [
-      self.by-version."form-data"."0.0.10"
-      self.by-version."mime"."1.2.11"
-      self.by-version."hawk"."0.10.2"
-      self.by-version."node-uuid"."1.4.1"
-      self.by-version."cookie-jar"."0.2.0"
-      self.by-version."aws-sign"."0.2.0"
-      self.by-version."oauth-sign"."0.2.0"
-      self.by-version."forever-agent"."0.2.0"
-      self.by-version."tunnel-agent"."0.2.0"
-      self.by-version."json-stringify-safe"."3.0.0"
-      self.by-version."qs"."0.5.6"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "request" ];
-  };
+    self.by-version."request"."2.40.0";
   by-spec."request"."2.16.x" =
     self.by-version."request"."2.16.6";
   by-version."request"."2.16.6" = lib.makeOverridable self.buildNodePackage {
@@ -15231,6 +15543,37 @@
     ];
     passthru.names = [ "request" ];
   };
+  by-spec."request"."2.36.0" =
+    self.by-version."request"."2.36.0";
+  by-version."request"."2.36.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-request-2.36.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/request/-/request-2.36.0.tgz";
+        name = "request-2.36.0.tgz";
+        sha1 = "28c6c04262c7b9ffdd21b9255374517ee6d943f5";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."request" or []);
+    deps = [
+      self.by-version."qs"."0.6.6"
+      self.by-version."json-stringify-safe"."5.0.0"
+      self.by-version."mime"."1.2.11"
+      self.by-version."forever-agent"."0.5.2"
+      self.by-version."node-uuid"."1.4.1"
+      self.by-version."tough-cookie"."0.12.1"
+      self.by-version."form-data"."0.1.4"
+      self.by-version."tunnel-agent"."0.4.0"
+      self.by-version."http-signature"."0.10.0"
+      self.by-version."oauth-sign"."0.3.0"
+      self.by-version."hawk"."1.0.0"
+      self.by-version."aws-sign2"."0.5.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "request" ];
+  };
   by-spec."request"."2.9.x" =
     self.by-version."request"."2.9.203";
   by-version."request"."2.9.203" = lib.makeOverridable self.buildNodePackage {
@@ -15250,12 +15593,10 @@
     ];
     passthru.names = [ "request" ];
   };
-  by-spec."request".">=2.33.0" =
-    self.by-version."request"."2.34.0";
-  by-spec."request"."^2.34.0" =
-    self.by-version."request"."2.34.0";
+  by-spec."request"."^2.36.0" =
+    self.by-version."request"."2.40.0";
   by-spec."request"."~2" =
-    self.by-version."request"."2.34.0";
+    self.by-version."request"."2.40.0";
   by-spec."request"."~2.27.0" =
     self.by-version."request"."2.27.0";
   by-version."request"."2.27.0" = lib.makeOverridable self.buildNodePackage {
@@ -15281,7 +15622,7 @@
       self.by-version."cookie-jar"."0.3.0"
       self.by-version."node-uuid"."1.4.1"
       self.by-version."mime"."1.2.11"
-      self.by-version."form-data"."0.1.2"
+      self.by-version."form-data"."0.1.4"
     ];
     peerDependencies = [
     ];
@@ -15307,7 +15648,7 @@
       self.by-version."node-uuid"."1.4.1"
       self.by-version."mime"."1.2.11"
       self.by-version."tough-cookie"."0.9.15"
-      self.by-version."form-data"."0.1.2"
+      self.by-version."form-data"."0.1.4"
       self.by-version."tunnel-agent"."0.3.0"
       self.by-version."http-signature"."0.10.0"
       self.by-version."oauth-sign"."0.3.0"
@@ -15318,15 +15659,15 @@
     ];
     passthru.names = [ "request" ];
   };
-  by-spec."request"."~2.33.0" =
-    self.by-version."request"."2.33.0";
-  by-version."request"."2.33.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-request-2.33.0";
+  by-spec."request"."~2.34.0" =
+    self.by-version."request"."2.34.0";
+  by-version."request"."2.34.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-request-2.34.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/request/-/request-2.33.0.tgz";
-        name = "request-2.33.0.tgz";
-        sha1 = "5167878131726070ec633752ea230a2379dc65ff";
+        url = "http://registry.npmjs.org/request/-/request-2.34.0.tgz";
+        name = "request-2.34.0.tgz";
+        sha1 = "b5d8b9526add4a2d4629f4d417124573996445ae";
       })
     ];
     buildInputs =
@@ -15338,7 +15679,7 @@
       self.by-version."node-uuid"."1.4.1"
       self.by-version."mime"."1.2.11"
       self.by-version."tough-cookie"."0.12.1"
-      self.by-version."form-data"."0.1.2"
+      self.by-version."form-data"."0.1.4"
       self.by-version."tunnel-agent"."0.3.0"
       self.by-version."http-signature"."0.10.0"
       self.by-version."oauth-sign"."0.3.0"
@@ -15349,7 +15690,38 @@
     ];
     passthru.names = [ "request" ];
   };
-  by-spec."request-progress"."~0.3.0" =
+  by-spec."request"."~2.37.0" =
+    self.by-version."request"."2.37.0";
+  by-version."request"."2.37.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-request-2.37.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/request/-/request-2.37.0.tgz";
+        name = "request-2.37.0.tgz";
+        sha1 = "6c04c1f0f34af0c8b7408f1c1e30d4d6bd852d46";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."request" or []);
+    deps = [
+      self.by-version."qs"."0.6.6"
+      self.by-version."json-stringify-safe"."5.0.0"
+      self.by-version."mime-types"."1.0.2"
+      self.by-version."forever-agent"."0.5.2"
+      self.by-version."node-uuid"."1.4.1"
+      self.by-version."tough-cookie"."0.12.1"
+      self.by-version."form-data"."0.1.4"
+      self.by-version."tunnel-agent"."0.4.0"
+      self.by-version."http-signature"."0.10.0"
+      self.by-version."oauth-sign"."0.3.0"
+      self.by-version."hawk"."1.1.1"
+      self.by-version."aws-sign2"."0.5.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "request" ];
+  };
+  by-spec."request-progress"."^0.3.1" =
     self.by-version."request-progress"."0.3.1";
   by-version."request-progress"."0.3.1" = lib.makeOverridable self.buildNodePackage {
     name = "node-request-progress-0.3.1";
@@ -15369,35 +15741,15 @@
     ];
     passthru.names = [ "request-progress" ];
   };
-  by-spec."request-replay"."~0.2.0" =
-    self.by-version."request-replay"."0.2.0";
-  by-version."request-replay"."0.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-request-replay-0.2.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/request-replay/-/request-replay-0.2.0.tgz";
-        name = "request-replay-0.2.0.tgz";
-        sha1 = "9b693a5d118b39f5c596ead5ed91a26444057f60";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."request-replay" or []);
-    deps = [
-      self.by-version."retry"."0.6.0"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "request-replay" ];
-  };
   by-spec."requirejs"."~2.1" =
-    self.by-version."requirejs"."2.1.11";
-  by-version."requirejs"."2.1.11" = lib.makeOverridable self.buildNodePackage {
-    name = "requirejs-2.1.11";
+    self.by-version."requirejs"."2.1.14";
+  by-version."requirejs"."2.1.14" = lib.makeOverridable self.buildNodePackage {
+    name = "requirejs-2.1.14";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/requirejs/-/requirejs-2.1.11.tgz";
-        name = "requirejs-2.1.11.tgz";
-        sha1 = "0eafaa6b46ca9b5b1e13406f119c020190a24442";
+        url = "http://registry.npmjs.org/requirejs/-/requirejs-2.1.14.tgz";
+        name = "requirejs-2.1.14.tgz";
+        sha1 = "de00290aa526192ff8df4dc0ba9370ce399a76b0";
       })
     ];
     buildInputs =
@@ -15409,16 +15761,16 @@
     passthru.names = [ "requirejs" ];
   };
   by-spec."requirejs"."~2.1.0" =
-    self.by-version."requirejs"."2.1.11";
-  by-spec."resolve"."0.6.3" =
-    self.by-version."resolve"."0.6.3";
-  by-version."resolve"."0.6.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-resolve-0.6.3";
+    self.by-version."requirejs"."2.1.14";
+  by-spec."resolve"."0.7.4" =
+    self.by-version."resolve"."0.7.4";
+  by-version."resolve"."0.7.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-resolve-0.7.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/resolve/-/resolve-0.6.3.tgz";
-        name = "resolve-0.6.3.tgz";
-        sha1 = "dd957982e7e736debdf53b58a4dd91754575dd46";
+        url = "http://registry.npmjs.org/resolve/-/resolve-0.7.4.tgz";
+        name = "resolve-0.7.4.tgz";
+        sha1 = "395a9ef9e873fbfe12bd14408bd91bb936003d69";
       })
     ];
     buildInputs =
@@ -15429,8 +15781,8 @@
     ];
     passthru.names = [ "resolve" ];
   };
-  by-spec."resolve"."0.6.x" =
-    self.by-version."resolve"."0.6.3";
+  by-spec."resolve"."0.7.x" =
+    self.by-version."resolve"."0.7.4";
   by-spec."resolve"."~0.3.0" =
     self.by-version."resolve"."0.3.1";
   by-version."resolve"."0.3.1" = lib.makeOverridable self.buildNodePackage {
@@ -15452,24 +15804,25 @@
   };
   by-spec."resolve"."~0.3.1" =
     self.by-version."resolve"."0.3.1";
-  by-spec."resolve"."~0.6.0" =
-    self.by-version."resolve"."0.6.3";
-  by-spec."resolve"."~0.6.1" =
-    self.by-version."resolve"."0.6.3";
-  by-spec."response-time"."1.0.0" =
-    self.by-version."response-time"."1.0.0";
-  by-version."response-time"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-response-time-1.0.0";
+  by-spec."resolve"."~0.7.1" =
+    self.by-version."resolve"."0.7.4";
+  by-spec."resolve"."~0.7.2" =
+    self.by-version."resolve"."0.7.4";
+  by-spec."response-time"."~2.0.1" =
+    self.by-version."response-time"."2.0.1";
+  by-version."response-time"."2.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-response-time-2.0.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/response-time/-/response-time-1.0.0.tgz";
-        name = "response-time-1.0.0.tgz";
-        sha1 = "c2bc8d08f3c359f97eae1d6da86eead175fabdc9";
+        url = "http://registry.npmjs.org/response-time/-/response-time-2.0.1.tgz";
+        name = "response-time-2.0.1.tgz";
+        sha1 = "c6d2cbadeac4cb251b21016fe182640c02aff343";
       })
     ];
     buildInputs =
       (self.nativeDeps."response-time" or []);
     deps = [
+      self.by-version."on-headers"."1.0.0"
     ];
     peerDependencies = [
     ];
@@ -15512,26 +15865,26 @@
     passthru.names = [ "restify" ];
   };
   by-spec."rethinkdb"."*" =
-    self.by-version."rethinkdb"."1.12.0-0";
-  by-version."rethinkdb"."1.12.0-0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-rethinkdb-1.12.0-0";
+    self.by-version."rethinkdb"."1.13.0-3";
+  by-version."rethinkdb"."1.13.0-3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-rethinkdb-1.13.0-3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/rethinkdb/-/rethinkdb-1.12.0-0.tgz";
-        name = "rethinkdb-1.12.0-0.tgz";
-        sha1 = "cad01e869bd12dcd09f235c5ec8f5ccf26cc6f81";
+        url = "http://registry.npmjs.org/rethinkdb/-/rethinkdb-1.13.0-3.tgz";
+        name = "rethinkdb-1.13.0-3.tgz";
+        sha1 = "67db23e23ac3ff40fd4738414fc14d1935e6009e";
       })
     ];
     buildInputs =
       (self.nativeDeps."rethinkdb" or []);
     deps = [
-      self.by-version."protobufjs"."2.0.5"
+      self.by-version."bluebird"."2.3.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "rethinkdb" ];
   };
-  "rethinkdb" = self.by-version."rethinkdb"."1.12.0-0";
+  "rethinkdb" = self.by-version."rethinkdb"."1.13.0-3";
   by-spec."retry"."0.6.0" =
     self.by-version."retry"."0.6.0";
   by-version."retry"."0.6.0" = lib.makeOverridable self.buildNodePackage {
@@ -15552,16 +15905,33 @@
     passthru.names = [ "retry" ];
   };
   by-spec."retry"."~0.6.0" =
-    self.by-version."retry"."0.6.0";
-  by-spec."revalidator"."0.1.x" =
-    self.by-version."revalidator"."0.1.7";
-  by-version."revalidator"."0.1.7" = lib.makeOverridable self.buildNodePackage {
-    name = "node-revalidator-0.1.7";
+    self.by-version."retry"."0.6.1";
+  by-version."retry"."0.6.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-retry-0.6.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/revalidator/-/revalidator-0.1.7.tgz";
-        name = "revalidator-0.1.7.tgz";
-        sha1 = "f0b68b01bc5c5e0e9e6d864154d7098f24fec1db";
+        url = "http://registry.npmjs.org/retry/-/retry-0.6.1.tgz";
+        name = "retry-0.6.1.tgz";
+        sha1 = "fdc90eed943fde11b893554b8cc63d0e899ba918";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."retry" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "retry" ];
+  };
+  by-spec."revalidator"."0.1.x" =
+    self.by-version."revalidator"."0.1.8";
+  by-version."revalidator"."0.1.8" = lib.makeOverridable self.buildNodePackage {
+    name = "node-revalidator-0.1.8";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz";
+        name = "revalidator-0.1.8.tgz";
+        sha1 = "fece61bfa0c1b52a206bd6b18198184bdd523a3b";
       })
     ];
     buildInputs =
@@ -15615,14 +15985,14 @@
     passthru.names = [ "rimraf" ];
   };
   by-spec."rimraf"."2" =
-    self.by-version."rimraf"."2.2.6";
-  by-version."rimraf"."2.2.6" = lib.makeOverridable self.buildNodePackage {
-    name = "rimraf-2.2.6";
+    self.by-version."rimraf"."2.2.8";
+  by-version."rimraf"."2.2.8" = lib.makeOverridable self.buildNodePackage {
+    name = "rimraf-2.2.8";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.6.tgz";
-        name = "rimraf-2.2.6.tgz";
-        sha1 = "c59597569b14d956ad29cacc42bdddf5f0ea4f4c";
+        url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz";
+        name = "rimraf-2.2.8.tgz";
+        sha1 = "e439be2aaee327321952730f99a8929e4fc50582";
       })
     ];
     buildInputs =
@@ -15634,31 +16004,11 @@
     passthru.names = [ "rimraf" ];
   };
   by-spec."rimraf"."2.x.x" =
-    self.by-version."rimraf"."2.2.6";
-  by-spec."rimraf"."^2.2.2" =
-    self.by-version."rimraf"."2.2.6";
+    self.by-version."rimraf"."2.2.8";
+  by-spec."rimraf"."^2.2.8" =
+    self.by-version."rimraf"."2.2.8";
   by-spec."rimraf"."~2" =
-    self.by-version."rimraf"."2.2.6";
-  by-spec."rimraf"."~2.0.2" =
-    self.by-version."rimraf"."2.0.3";
-  by-version."rimraf"."2.0.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-rimraf-2.0.3";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/rimraf/-/rimraf-2.0.3.tgz";
-        name = "rimraf-2.0.3.tgz";
-        sha1 = "f50a2965e7144e9afd998982f15df706730f56a9";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."rimraf" or []);
-    deps = [
-      self.by-version."graceful-fs"."1.1.14"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "rimraf" ];
-  };
+    self.by-version."rimraf"."2.2.8";
   by-spec."rimraf"."~2.1.4" =
     self.by-version."rimraf"."2.1.4";
   by-version."rimraf"."2.1.4" = lib.makeOverridable self.buildNodePackage {
@@ -15680,13 +16030,53 @@
     passthru.names = [ "rimraf" ];
   };
   by-spec."rimraf"."~2.2.0" =
-    self.by-version."rimraf"."2.2.6";
+    self.by-version."rimraf"."2.2.8";
   by-spec."rimraf"."~2.2.2" =
-    self.by-version."rimraf"."2.2.6";
+    self.by-version."rimraf"."2.2.8";
   by-spec."rimraf"."~2.2.5" =
-    self.by-version."rimraf"."2.2.6";
+    self.by-version."rimraf"."2.2.8";
   by-spec."rimraf"."~2.2.6" =
-    self.by-version."rimraf"."2.2.6";
+    self.by-version."rimraf"."2.2.8";
+  by-spec."rimraf"."~2.2.8" =
+    self.by-version."rimraf"."2.2.8";
+  by-spec."ripemd160"."0.2.0" =
+    self.by-version."ripemd160"."0.2.0";
+  by-version."ripemd160"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-ripemd160-0.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/ripemd160/-/ripemd160-0.2.0.tgz";
+        name = "ripemd160-0.2.0.tgz";
+        sha1 = "2bf198bde167cacfa51c0a928e84b68bbe171fce";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."ripemd160" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "ripemd160" ];
+  };
+  by-spec."rndm"."1" =
+    self.by-version."rndm"."1.0.0";
+  by-version."rndm"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-rndm-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/rndm/-/rndm-1.0.0.tgz";
+        name = "rndm-1.0.0.tgz";
+        sha1 = "dcb6eb485b9b416d15e097f39c31458e4cfda2da";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."rndm" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "rndm" ];
+  };
   by-spec."ruglify"."~1.0.0" =
     self.by-version."ruglify"."1.0.0";
   by-version."ruglify"."1.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -15755,24 +16145,24 @@
     ];
     passthru.names = [ "samsam" ];
   };
-  by-spec."sauce-connect-launcher"."~0.4.0" =
-    self.by-version."sauce-connect-launcher"."0.4.2";
-  by-version."sauce-connect-launcher"."0.4.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-sauce-connect-launcher-0.4.2";
+  by-spec."sauce-connect-launcher"."~0.6.0" =
+    self.by-version."sauce-connect-launcher"."0.6.1";
+  by-version."sauce-connect-launcher"."0.6.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-sauce-connect-launcher-0.6.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/sauce-connect-launcher/-/sauce-connect-launcher-0.4.2.tgz";
-        name = "sauce-connect-launcher-0.4.2.tgz";
-        sha1 = "a24b9fde59e3b29ca2011174c5c08ef8f74e44b9";
+        url = "http://registry.npmjs.org/sauce-connect-launcher/-/sauce-connect-launcher-0.6.1.tgz";
+        name = "sauce-connect-launcher-0.6.1.tgz";
+        sha1 = "a770184d8d9860cbb1e76c344af28cdf5d0e247a";
       })
     ];
     buildInputs =
       (self.nativeDeps."sauce-connect-launcher" or []);
     deps = [
-      self.by-version."lodash"."1.3.1"
-      self.by-version."async"."0.2.10"
+      self.by-version."lodash"."2.4.1"
+      self.by-version."async"."0.9.0"
       self.by-version."adm-zip"."0.4.4"
-      self.by-version."rimraf"."2.2.6"
+      self.by-version."rimraf"."2.2.8"
     ];
     peerDependencies = [
     ];
@@ -15797,6 +16187,25 @@
     ];
     passthru.names = [ "saucelabs" ];
   };
+  by-spec."sax"."0.4.2" =
+    self.by-version."sax"."0.4.2";
+  by-version."sax"."0.4.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-sax-0.4.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/sax/-/sax-0.4.2.tgz";
+        name = "sax-0.4.2.tgz";
+        sha1 = "39f3b601733d6bec97105b242a2a40fd6978ac3c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."sax" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "sax" ];
+  };
   by-spec."sax"."0.5.x" =
     self.by-version."sax"."0.5.8";
   by-version."sax"."0.5.8" = lib.makeOverridable self.buildNodePackage {
@@ -15816,7 +16225,7 @@
     ];
     passthru.names = [ "sax" ];
   };
-  by-spec."sax".">=0.4.2" =
+  by-spec."sax"."0.6.x" =
     self.by-version."sax"."0.6.0";
   by-version."sax"."0.6.0" = lib.makeOverridable self.buildNodePackage {
     name = "node-sax-0.6.0";
@@ -15835,6 +16244,8 @@
     ];
     passthru.names = [ "sax" ];
   };
+  by-spec."sax".">=0.4.2" =
+    self.by-version."sax"."0.6.0";
   by-spec."scmp"."~0.0.3" =
     self.by-version."scmp"."0.0.3";
   by-version."scmp"."0.0.3" = lib.makeOverridable self.buildNodePackage {
@@ -15855,14 +16266,14 @@
     passthru.names = [ "scmp" ];
   };
   by-spec."selenium-webdriver"."*" =
-    self.by-version."selenium-webdriver"."2.41.0";
-  by-version."selenium-webdriver"."2.41.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-selenium-webdriver-2.41.0";
+    self.by-version."selenium-webdriver"."2.42.1";
+  by-version."selenium-webdriver"."2.42.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-selenium-webdriver-2.42.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.41.0.tgz";
-        name = "selenium-webdriver-2.41.0.tgz";
-        sha1 = "d084dfbc73bdf33aedc7d731eaab028affad7f16";
+        url = "http://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.42.1.tgz";
+        name = "selenium-webdriver-2.42.1.tgz";
+        sha1 = "61984d1583b89c80a9f3bf31623d00bcc82a8d0e";
       })
     ];
     buildInputs =
@@ -15873,16 +16284,16 @@
     ];
     passthru.names = [ "selenium-webdriver" ];
   };
-  "selenium-webdriver" = self.by-version."selenium-webdriver"."2.41.0";
+  "selenium-webdriver" = self.by-version."selenium-webdriver"."2.42.1";
   by-spec."semver"."*" =
-    self.by-version."semver"."2.2.1";
-  by-version."semver"."2.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "semver-2.2.1";
+    self.by-version."semver"."3.0.1";
+  by-version."semver"."3.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "semver-3.0.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/semver/-/semver-2.2.1.tgz";
-        name = "semver-2.2.1.tgz";
-        sha1 = "7941182b3ffcc580bff1c17942acdf7951c0d213";
+        url = "http://registry.npmjs.org/semver/-/semver-3.0.1.tgz";
+        name = "semver-3.0.1.tgz";
+        sha1 = "720ac012515a252f91fb0dd2e99a56a70d6cf078";
       })
     ];
     buildInputs =
@@ -15893,7 +16304,7 @@
     ];
     passthru.names = [ "semver" ];
   };
-  "semver" = self.by-version."semver"."2.2.1";
+  "semver" = self.by-version."semver"."3.0.1";
   by-spec."semver"."1.1.0" =
     self.by-version."semver"."1.1.0";
   by-version."semver"."1.1.0" = lib.makeOverridable self.buildNodePackage {
@@ -15933,15 +16344,38 @@
     passthru.names = [ "semver" ];
   };
   by-spec."semver"."2" =
-    self.by-version."semver"."2.2.1";
+    self.by-version."semver"."2.3.2";
+  by-version."semver"."2.3.2" = lib.makeOverridable self.buildNodePackage {
+    name = "semver-2.3.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/semver/-/semver-2.3.2.tgz";
+        name = "semver-2.3.2.tgz";
+        sha1 = "b9848f25d6cf36333073ec9ef8856d42f1233e52";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."semver" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "semver" ];
+  };
+  by-spec."semver"."2 >=2.2.1 || 3.x" =
+    self.by-version."semver"."3.0.1";
+  by-spec."semver"."2 || 3" =
+    self.by-version."semver"."3.0.1";
   by-spec."semver"."2.x" =
-    self.by-version."semver"."2.2.1";
+    self.by-version."semver"."2.3.2";
+  by-spec."semver"."2.x || 3.x" =
+    self.by-version."semver"."3.0.1";
   by-spec."semver".">=2.0.10 <3.0.0" =
-    self.by-version."semver"."2.2.1";
-  by-spec."semver".">=2.2.1 <3" =
-    self.by-version."semver"."2.2.1";
-  by-spec."semver"."^2.2.1" =
-    self.by-version."semver"."2.2.1";
+    self.by-version."semver"."2.3.2";
+  by-spec."semver"."^2.3.0" =
+    self.by-version."semver"."2.3.2";
+  by-spec."semver"."^2.3.0 || 3.x" =
+    self.by-version."semver"."3.0.1";
   by-spec."semver"."~1.1.0" =
     self.by-version."semver"."1.1.4";
   by-spec."semver"."~1.1.4" =
@@ -15986,23 +16420,49 @@
   };
   by-spec."semver"."~2.2.1" =
     self.by-version."semver"."2.2.1";
-  by-spec."send"."*" =
-    self.by-version."send"."0.2.0";
-  by-version."send"."0.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-send-0.2.0";
+  by-version."semver"."2.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "semver-2.2.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/send/-/send-0.2.0.tgz";
-        name = "send-0.2.0.tgz";
-        sha1 = "067abf45cff8bffb29cbdb7439725b32388a2c58";
+        url = "http://registry.npmjs.org/semver/-/semver-2.2.1.tgz";
+        name = "semver-2.2.1.tgz";
+        sha1 = "7941182b3ffcc580bff1c17942acdf7951c0d213";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."semver" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "semver" ];
+  };
+  by-spec."semver"."~2.3.0" =
+    self.by-version."semver"."2.3.2";
+  by-spec."semver"."~2.3.1" =
+    self.by-version."semver"."2.3.2";
+  by-spec."send"."*" =
+    self.by-version."send"."0.8.3";
+  by-version."send"."0.8.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-send-0.8.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/send/-/send-0.8.3.tgz";
+        name = "send-0.8.3.tgz";
+        sha1 = "593886004fcb968a1b5727814a32b388b3b99083";
       })
     ];
     buildInputs =
       (self.nativeDeps."send" or []);
     deps = [
-      self.by-version."debug"."0.8.1"
-      self.by-version."mime"."1.2.11"
+      self.by-version."debug"."1.0.4"
+      self.by-version."depd"."0.4.4"
+      self.by-version."destroy"."1.0.3"
+      self.by-version."escape-html"."1.0.1"
       self.by-version."fresh"."0.2.2"
+      self.by-version."mime"."1.2.11"
+      self.by-version."ms"."0.6.2"
+      self.by-version."on-finished"."2.1.0"
       self.by-version."range-parser"."1.0.0"
     ];
     peerDependencies = [
@@ -16023,7 +16483,7 @@
     buildInputs =
       (self.nativeDeps."send" or []);
     deps = [
-      self.by-version."debug"."0.8.1"
+      self.by-version."debug"."1.0.4"
       self.by-version."mime"."1.2.6"
       self.by-version."fresh"."0.1.0"
       self.by-version."range-parser"."0.0.4"
@@ -16046,7 +16506,7 @@
     buildInputs =
       (self.nativeDeps."send" or []);
     deps = [
-      self.by-version."debug"."0.8.1"
+      self.by-version."debug"."1.0.4"
       self.by-version."mime"."1.2.6"
       self.by-version."fresh"."0.1.0"
       self.by-version."range-parser"."0.0.4"
@@ -16069,7 +16529,7 @@
     buildInputs =
       (self.nativeDeps."send" or []);
     deps = [
-      self.by-version."debug"."0.8.1"
+      self.by-version."debug"."1.0.4"
       self.by-version."mime"."1.2.11"
       self.by-version."fresh"."0.2.0"
       self.by-version."range-parser"."0.0.4"
@@ -16080,6 +16540,81 @@
   };
   by-spec."send"."0.2.0" =
     self.by-version."send"."0.2.0";
+  by-version."send"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-send-0.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/send/-/send-0.2.0.tgz";
+        name = "send-0.2.0.tgz";
+        sha1 = "067abf45cff8bffb29cbdb7439725b32388a2c58";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."send" or []);
+    deps = [
+      self.by-version."debug"."1.0.4"
+      self.by-version."mime"."1.2.11"
+      self.by-version."fresh"."0.2.2"
+      self.by-version."range-parser"."1.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "send" ];
+  };
+  by-spec."send"."0.4.3" =
+    self.by-version."send"."0.4.3";
+  by-version."send"."0.4.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-send-0.4.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/send/-/send-0.4.3.tgz";
+        name = "send-0.4.3.tgz";
+        sha1 = "9627b23b7707fbf6373831cac5793330b594b640";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."send" or []);
+    deps = [
+      self.by-version."debug"."1.0.2"
+      self.by-version."escape-html"."1.0.1"
+      self.by-version."finished"."1.2.2"
+      self.by-version."fresh"."0.2.2"
+      self.by-version."mime"."1.2.11"
+      self.by-version."range-parser"."1.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "send" ];
+  };
+  by-spec."send"."0.6.0" =
+    self.by-version."send"."0.6.0";
+  by-version."send"."0.6.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-send-0.6.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/send/-/send-0.6.0.tgz";
+        name = "send-0.6.0.tgz";
+        sha1 = "a59da9265db7c35141e1079cf1f368ee0d59b3ab";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."send" or []);
+    deps = [
+      self.by-version."debug"."1.0.3"
+      self.by-version."depd"."0.3.0"
+      self.by-version."escape-html"."1.0.1"
+      self.by-version."finished"."1.2.2"
+      self.by-version."fresh"."0.2.2"
+      self.by-version."mime"."1.2.11"
+      self.by-version."ms"."0.6.2"
+      self.by-version."range-parser"."1.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "send" ];
+  };
+  by-spec."send"."0.8.3" =
+    self.by-version."send"."0.8.3";
   by-spec."sequence"."2.2.1" =
     self.by-version."sequence"."2.2.1";
   by-version."sequence"."2.2.1" = lib.makeOverridable self.buildNodePackage {
@@ -16101,22 +16636,43 @@
   };
   by-spec."sequence"."2.x" =
     self.by-version."sequence"."2.2.1";
-  by-spec."serve-index"."1.0.1" =
-    self.by-version."serve-index"."1.0.1";
-  by-version."serve-index"."1.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-serve-index-1.0.1";
+  by-spec."serve-favicon"."2.0.1" =
+    self.by-version."serve-favicon"."2.0.1";
+  by-version."serve-favicon"."2.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-serve-favicon-2.0.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/serve-index/-/serve-index-1.0.1.tgz";
-        name = "serve-index-1.0.1.tgz";
-        sha1 = "2782ee8ede6cccaae54957962c4715e8ce1921a6";
+        url = "http://registry.npmjs.org/serve-favicon/-/serve-favicon-2.0.1.tgz";
+        name = "serve-favicon-2.0.1.tgz";
+        sha1 = "4826975d9f173ca3a4158e9698161f75dec7afec";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."serve-favicon" or []);
+    deps = [
+      self.by-version."fresh"."0.2.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "serve-favicon" ];
+  };
+  by-spec."serve-index"."~1.1.6" =
+    self.by-version."serve-index"."1.1.6";
+  by-version."serve-index"."1.1.6" = lib.makeOverridable self.buildNodePackage {
+    name = "node-serve-index-1.1.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/serve-index/-/serve-index-1.1.6.tgz";
+        name = "serve-index-1.1.6.tgz";
+        sha1 = "b758318fe781628383f66ac80dd447712ea7781f";
       })
     ];
     buildInputs =
       (self.nativeDeps."serve-index" or []);
     deps = [
-      self.by-version."batch"."0.5.0"
-      self.by-version."negotiator"."0.4.2"
+      self.by-version."accepts"."1.0.7"
+      self.by-version."batch"."0.5.1"
+      self.by-version."parseurl"."1.3.0"
     ];
     peerDependencies = [
     ];
@@ -16142,89 +16698,114 @@
     ];
     passthru.names = [ "serve-static" ];
   };
-  by-spec."serve-static"."1.0.2" =
-    self.by-version."serve-static"."1.0.2";
-  by-version."serve-static"."1.0.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-serve-static-1.0.2";
+  by-spec."serve-static"."1.2.3" =
+    self.by-version."serve-static"."1.2.3";
+  by-version."serve-static"."1.2.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-serve-static-1.2.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/serve-static/-/serve-static-1.0.2.tgz";
-        name = "serve-static-1.0.2.tgz";
-        sha1 = "4129f6727b09fb031134fa6d185683e30bfbef54";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."serve-static" or []);
-    deps = [
-      self.by-version."send"."0.2.0"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "serve-static" ];
-  };
-  by-spec."serve-static"."1.0.4" =
-    self.by-version."serve-static"."1.0.4";
-  by-version."serve-static"."1.0.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-serve-static-1.0.4";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/serve-static/-/serve-static-1.0.4.tgz";
-        name = "serve-static-1.0.4.tgz";
-        sha1 = "426fedebe77bad21f373f1efcae09746639fba06";
+        url = "http://registry.npmjs.org/serve-static/-/serve-static-1.2.3.tgz";
+        name = "serve-static-1.2.3.tgz";
+        sha1 = "93cecbc340f079ecb8589281d1dc31c26c0cd158";
       })
     ];
     buildInputs =
       (self.nativeDeps."serve-static" or []);
     deps = [
+      self.by-version."escape-html"."1.0.1"
       self.by-version."parseurl"."1.0.1"
-      self.by-version."send"."0.2.0"
+      self.by-version."send"."0.4.3"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "serve-static" ];
   };
-  by-spec."serve-static"."~1.0.3" =
-    self.by-version."serve-static"."1.0.4";
-  by-spec."setimmediate"."1.0.1" =
-    self.by-version."setimmediate"."1.0.1";
-  by-version."setimmediate"."1.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-setimmediate-1.0.1";
+  by-spec."serve-static"."~1.3.0" =
+    self.by-version."serve-static"."1.3.2";
+  by-version."serve-static"."1.3.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-serve-static-1.3.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/setimmediate/-/setimmediate-1.0.1.tgz";
-        name = "setimmediate-1.0.1.tgz";
-        sha1 = "a9ca56ccbd6a4c3334855f060abcdece5c42ebb7";
+        url = "http://registry.npmjs.org/serve-static/-/serve-static-1.3.2.tgz";
+        name = "serve-static-1.3.2.tgz";
+        sha1 = "d904a6cbf55f511c78138f6f45ee6e69d9d105ca";
       })
     ];
     buildInputs =
-      (self.nativeDeps."setimmediate" or []);
+      (self.nativeDeps."serve-static" or []);
     deps = [
+      self.by-version."escape-html"."1.0.1"
+      self.by-version."parseurl"."1.1.3"
+      self.by-version."send"."0.6.0"
     ];
     peerDependencies = [
     ];
-    passthru.names = [ "setimmediate" ];
+    passthru.names = [ "serve-static" ];
+  };
+  by-spec."serve-static"."~1.5.3" =
+    self.by-version."serve-static"."1.5.3";
+  by-version."serve-static"."1.5.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-serve-static-1.5.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/serve-static/-/serve-static-1.5.3.tgz";
+        name = "serve-static-1.5.3.tgz";
+        sha1 = "2e28efa5899686fd3ccdb97a80aa464002244581";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."serve-static" or []);
+    deps = [
+      self.by-version."escape-html"."1.0.1"
+      self.by-version."parseurl"."1.3.0"
+      self.by-version."send"."0.8.3"
+      self.by-version."utils-merge"."1.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "serve-static" ];
   };
   by-spec."sha"."~1.2.1" =
-    self.by-version."sha"."1.2.3";
-  by-version."sha"."1.2.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-sha-1.2.3";
+    self.by-version."sha"."1.2.4";
+  by-version."sha"."1.2.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-sha-1.2.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/sha/-/sha-1.2.3.tgz";
-        name = "sha-1.2.3.tgz";
-        sha1 = "3a96ef3054a0fe0b87c9aa985824a6a736fc0329";
+        url = "http://registry.npmjs.org/sha/-/sha-1.2.4.tgz";
+        name = "sha-1.2.4.tgz";
+        sha1 = "1f9a377f27b6fdee409b9b858e43da702be48a4d";
       })
     ];
     buildInputs =
       (self.nativeDeps."sha" or []);
     deps = [
-      self.by-version."graceful-fs"."2.0.3"
-      self.by-version."readable-stream"."1.0.27-1"
+      self.by-version."graceful-fs"."3.0.2"
+      self.by-version."readable-stream"."1.0.31"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "sha" ];
   };
+  by-spec."sha.js"."2.1.7" =
+    self.by-version."sha.js"."2.1.7";
+  by-version."sha.js"."2.1.7" = lib.makeOverridable self.buildNodePackage {
+    name = "sha.js-2.1.7";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/sha.js/-/sha.js-2.1.7.tgz";
+        name = "sha.js-2.1.7.tgz";
+        sha1 = "4ab5d386d5c1a26183e61bcc446a9370a3eb8859";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."sha.js" or []);
+    deps = [
+      self.by-version."buffer"."2.3.4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "sha.js" ];
+  };
   by-spec."shallow-copy"."0.0.1" =
     self.by-version."shallow-copy"."0.0.1";
   by-version."shallow-copy"."0.0.1" = lib.makeOverridable self.buildNodePackage {
@@ -16244,6 +16825,26 @@
     ];
     passthru.names = [ "shallow-copy" ];
   };
+  by-spec."shasum"."^1.0.0" =
+    self.by-version."shasum"."1.0.0";
+  by-version."shasum"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-shasum-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/shasum/-/shasum-1.0.0.tgz";
+        name = "shasum-1.0.0.tgz";
+        sha1 = "26e3f2cef88577da2d976c7c160a5f297eb2ea36";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."shasum" or []);
+    deps = [
+      self.by-version."json-stable-stringify"."0.0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "shasum" ];
+  };
   by-spec."shell-quote"."~0.0.1" =
     self.by-version."shell-quote"."0.0.1";
   by-version."shell-quote"."0.0.1" = lib.makeOverridable self.buildNodePackage {
@@ -16263,38 +16864,15 @@
     ];
     passthru.names = [ "shell-quote" ];
   };
-  by-spec."shell-quote"."~1.4.1" =
-    self.by-version."shell-quote"."1.4.1";
-  by-version."shell-quote"."1.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-shell-quote-1.4.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/shell-quote/-/shell-quote-1.4.1.tgz";
-        name = "shell-quote-1.4.1.tgz";
-        sha1 = "ae18442b536a08c720239b079d2f228acbedee40";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."shell-quote" or []);
-    deps = [
-      self.by-version."jsonify"."0.0.0"
-      self.by-version."array-filter"."0.0.1"
-      self.by-version."array-reduce"."0.0.0"
-      self.by-version."array-map"."0.0.0"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "shell-quote" ];
-  };
   by-spec."shelljs"."*" =
-    self.by-version."shelljs"."0.2.6";
-  by-version."shelljs"."0.2.6" = lib.makeOverridable self.buildNodePackage {
-    name = "shelljs-0.2.6";
+    self.by-version."shelljs"."0.3.0";
+  by-version."shelljs"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "shelljs-0.3.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz";
-        name = "shelljs-0.2.6.tgz";
-        sha1 = "90492d72ffcc8159976baba62fb0f6884f0c3378";
+        url = "http://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz";
+        name = "shelljs-0.3.0.tgz";
+        sha1 = "3596e6307a781544f591f37da618360f31db57b1";
       })
     ];
     buildInputs =
@@ -16305,37 +16883,18 @@
     ];
     passthru.names = [ "shelljs" ];
   };
-  "shelljs" = self.by-version."shelljs"."0.2.6";
-  by-spec."shelljs"."0.1.x" =
-    self.by-version."shelljs"."0.1.4";
-  by-version."shelljs"."0.1.4" = lib.makeOverridable self.buildNodePackage {
-    name = "shelljs-0.1.4";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/shelljs/-/shelljs-0.1.4.tgz";
-        name = "shelljs-0.1.4.tgz";
-        sha1 = "dfbbe78d56c3c0168d2fb79e10ecd1dbcb07ec0e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."shelljs" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "shelljs" ];
-  };
-  by-spec."shelljs"."~0.2.6" =
-    self.by-version."shelljs"."0.2.6";
+  "shelljs" = self.by-version."shelljs"."0.3.0";
+  by-spec."shelljs"."0.3.x" =
+    self.by-version."shelljs"."0.3.0";
   by-spec."should"."*" =
-    self.by-version."should"."3.3.1";
-  by-version."should"."3.3.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-should-3.3.1";
+    self.by-version."should"."4.0.4";
+  by-version."should"."4.0.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-should-4.0.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/should/-/should-3.3.1.tgz";
-        name = "should-3.3.1.tgz";
-        sha1 = "28c93a522ba001146af96078f0a88bf5ac929522";
+        url = "http://registry.npmjs.org/should/-/should-4.0.4.tgz";
+        name = "should-4.0.4.tgz";
+        sha1 = "8efaa304f1f148cf3d2e955862990f9ab9ea628f";
       })
     ];
     buildInputs =
@@ -16346,7 +16905,7 @@
     ];
     passthru.names = [ "should" ];
   };
-  "should" = self.by-version."should"."3.3.1";
+  "should" = self.by-version."should"."4.0.4";
   by-spec."sigmund"."~1.0.0" =
     self.by-version."sigmund"."1.0.0";
   by-version."sigmund"."1.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -16409,20 +16968,20 @@
     passthru.names = [ "simple-lru-cache" ];
   };
   by-spec."simplesmtp".">= 0.1.22" =
-    self.by-version."simplesmtp"."0.3.25";
-  by-version."simplesmtp"."0.3.25" = lib.makeOverridable self.buildNodePackage {
-    name = "node-simplesmtp-0.3.25";
+    self.by-version."simplesmtp"."0.3.32";
+  by-version."simplesmtp"."0.3.32" = lib.makeOverridable self.buildNodePackage {
+    name = "node-simplesmtp-0.3.32";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.25.tgz";
-        name = "simplesmtp-0.3.25.tgz";
-        sha1 = "09b6ac292b7dae8053cfba11da09a0458eb8af39";
+        url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.32.tgz";
+        name = "simplesmtp-0.3.32.tgz";
+        sha1 = "b3589b4cbf90624e712ab0ec1a7480ec14fd1c12";
       })
     ];
     buildInputs =
       (self.nativeDeps."simplesmtp" or []);
     deps = [
-      self.by-version."rai"."0.1.9"
+      self.by-version."rai"."0.1.11"
       self.by-version."xoauth2"."0.1.8"
     ];
     peerDependencies = [
@@ -16430,14 +16989,14 @@
     passthru.names = [ "simplesmtp" ];
   };
   by-spec."sinon"."*" =
-    self.by-version."sinon"."1.9.1";
-  by-version."sinon"."1.9.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-sinon-1.9.1";
+    self.by-version."sinon"."1.10.3";
+  by-version."sinon"."1.10.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-sinon-1.10.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/sinon/-/sinon-1.9.1.tgz";
-        name = "sinon-1.9.1.tgz";
-        sha1 = "0dac622bd3f0e6f9662a7431baf65f58c3459d69";
+        url = "http://registry.npmjs.org/sinon/-/sinon-1.10.3.tgz";
+        name = "sinon-1.10.3.tgz";
+        sha1 = "c063e0e99d8327dc199113aab52eb83a2e9e3c2c";
       })
     ];
     buildInputs =
@@ -16450,7 +17009,7 @@
     ];
     passthru.names = [ "sinon" ];
   };
-  "sinon" = self.by-version."sinon"."1.9.1";
+  "sinon" = self.by-version."sinon"."1.10.3";
   by-spec."slasp"."*" =
     self.by-version."slasp"."0.0.3";
   by-version."slasp"."0.0.3" = lib.makeOverridable self.buildNodePackage {
@@ -16530,7 +17089,7 @@
     ];
     passthru.names = [ "sliced" ];
   };
-  by-spec."slide"."~1.1.3" =
+  by-spec."slide"."^1.1.3" =
     self.by-version."slide"."1.1.5";
   by-version."slide"."1.1.5" = lib.makeOverridable self.buildNodePackage {
     name = "node-slide-1.1.5";
@@ -16549,17 +17108,19 @@
     ];
     passthru.names = [ "slide" ];
   };
+  by-spec."slide"."~1.1.3" =
+    self.by-version."slide"."1.1.5";
   by-spec."slide"."~1.1.5" =
     self.by-version."slide"."1.1.5";
   by-spec."smartdc"."*" =
-    self.by-version."smartdc"."7.2.1";
-  by-version."smartdc"."7.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "smartdc-7.2.1";
+    self.by-version."smartdc"."7.3.0";
+  by-version."smartdc"."7.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "smartdc-7.3.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/smartdc/-/smartdc-7.2.1.tgz";
-        name = "smartdc-7.2.1.tgz";
-        sha1 = "6fce690557f6b563c061d6adee161d6b33d06148";
+        url = "http://registry.npmjs.org/smartdc/-/smartdc-7.3.0.tgz";
+        name = "smartdc-7.3.0.tgz";
+        sha1 = "d932196df2d75599fcb98a628803e83c8f9fbe45";
       })
     ];
     buildInputs =
@@ -16572,12 +17133,15 @@
       self.by-version."bunyan"."0.21.1"
       self.by-version."clone"."0.1.6"
       self.by-version."smartdc-auth"."1.0.1"
+      self.by-version."cmdln"."1.3.2"
+      self.by-version."dashdash"."1.5.0"
+      self.by-version."vasync"."1.4.3"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "smartdc" ];
   };
-  "smartdc" = self.by-version."smartdc"."7.2.1";
+  "smartdc" = self.by-version."smartdc"."7.3.0";
   by-spec."smartdc-auth"."1.0.1" =
     self.by-version."smartdc-auth"."1.0.1";
   by-version."smartdc-auth"."1.0.1" = lib.makeOverridable self.buildNodePackage {
@@ -16666,14 +17230,14 @@
     passthru.names = [ "socket.io" ];
   };
   by-spec."socket.io"."~0.9.13" =
-    self.by-version."socket.io"."0.9.16";
-  by-version."socket.io"."0.9.16" = lib.makeOverridable self.buildNodePackage {
-    name = "node-socket.io-0.9.16";
+    self.by-version."socket.io"."0.9.17";
+  by-version."socket.io"."0.9.17" = lib.makeOverridable self.buildNodePackage {
+    name = "node-socket.io-0.9.17";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/socket.io/-/socket.io-0.9.16.tgz";
-        name = "socket.io-0.9.16.tgz";
-        sha1 = "3bab0444e49b55fbbc157424dbd41aa375a51a76";
+        url = "http://registry.npmjs.org/socket.io/-/socket.io-0.9.17.tgz";
+        name = "socket.io-0.9.17.tgz";
+        sha1 = "ca389268fb2cd5df4b59218490a08c907581c9ec";
       })
     ];
     buildInputs =
@@ -16689,7 +17253,7 @@
     passthru.names = [ "socket.io" ];
   };
   by-spec."socket.io"."~0.9.16" =
-    self.by-version."socket.io"."0.9.16";
+    self.by-version."socket.io"."0.9.17";
   by-spec."socket.io-client"."0.9.11" =
     self.by-version."socket.io-client"."0.9.11";
   by-version."socket.io-client"."0.9.11" = lib.makeOverridable self.buildNodePackage {
@@ -16705,7 +17269,7 @@
       (self.nativeDeps."socket.io-client" or []);
     deps = [
       self.by-version."uglify-js"."1.2.5"
-      self.by-version."ws"."0.4.31"
+      self.by-version."ws"."0.4.32"
       self.by-version."xmlhttprequest"."1.4.2"
       self.by-version."active-x-obfuscator"."0.0.1"
     ];
@@ -16728,7 +17292,7 @@
       (self.nativeDeps."socket.io-client" or []);
     deps = [
       self.by-version."uglify-js"."1.2.5"
-      self.by-version."ws"."0.4.31"
+      self.by-version."ws"."0.4.32"
       self.by-version."xmlhttprequest"."1.4.2"
       self.by-version."active-x-obfuscator"."0.0.1"
     ];
@@ -16737,27 +17301,27 @@
     passthru.names = [ "socket.io-client" ];
   };
   by-spec."sockjs"."*" =
-    self.by-version."sockjs"."0.3.8";
-  by-version."sockjs"."0.3.8" = lib.makeOverridable self.buildNodePackage {
-    name = "node-sockjs-0.3.8";
+    self.by-version."sockjs"."0.3.9";
+  by-version."sockjs"."0.3.9" = lib.makeOverridable self.buildNodePackage {
+    name = "node-sockjs-0.3.9";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/sockjs/-/sockjs-0.3.8.tgz";
-        name = "sockjs-0.3.8.tgz";
-        sha1 = "c083cb0505db1ea1a949d3bd12d8a1ea385a456c";
+        url = "http://registry.npmjs.org/sockjs/-/sockjs-0.3.9.tgz";
+        name = "sockjs-0.3.9.tgz";
+        sha1 = "5ae2c732dac07f6d7e9e8a9a60ec86ec4fc3ffc7";
       })
     ];
     buildInputs =
       (self.nativeDeps."sockjs" or []);
     deps = [
       self.by-version."node-uuid"."1.3.3"
-      self.by-version."faye-websocket"."0.7.0"
+      self.by-version."faye-websocket"."0.7.2"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "sockjs" ];
   };
-  "sockjs" = self.by-version."sockjs"."0.3.8";
+  "sockjs" = self.by-version."sockjs"."0.3.9";
   by-spec."sorted-object"."~1.0.0" =
     self.by-version."sorted-object"."1.0.0";
   by-version."sorted-object"."1.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -16778,14 +17342,14 @@
     passthru.names = [ "sorted-object" ];
   };
   by-spec."source-map"."*" =
-    self.by-version."source-map"."0.1.33";
-  by-version."source-map"."0.1.33" = lib.makeOverridable self.buildNodePackage {
-    name = "node-source-map-0.1.33";
+    self.by-version."source-map"."0.1.38";
+  by-version."source-map"."0.1.38" = lib.makeOverridable self.buildNodePackage {
+    name = "node-source-map-0.1.38";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/source-map/-/source-map-0.1.33.tgz";
-        name = "source-map-0.1.33.tgz";
-        sha1 = "c659297a73af18c073b0aa2e7cc91e316b5c570c";
+        url = "http://registry.npmjs.org/source-map/-/source-map-0.1.38.tgz";
+        name = "source-map-0.1.38.tgz";
+        sha1 = "f93a6f9d96a5b9cf5494c043497d9542f9fa6b33";
       })
     ];
     buildInputs =
@@ -16797,7 +17361,7 @@
     ];
     passthru.names = [ "source-map" ];
   };
-  "source-map" = self.by-version."source-map"."0.1.33";
+  "source-map" = self.by-version."source-map"."0.1.38";
   by-spec."source-map"."0.1.11" =
     self.by-version."source-map"."0.1.11";
   by-version."source-map"."0.1.11" = lib.makeOverridable self.buildNodePackage {
@@ -16838,20 +17402,40 @@
     ];
     passthru.names = [ "source-map" ];
   };
+  by-spec."source-map"."0.1.34" =
+    self.by-version."source-map"."0.1.34";
+  by-version."source-map"."0.1.34" = lib.makeOverridable self.buildNodePackage {
+    name = "node-source-map-0.1.34";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz";
+        name = "source-map-0.1.34.tgz";
+        sha1 = "a7cfe89aec7b1682c3b198d0acfb47d7d090566b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."source-map" or []);
+    deps = [
+      self.by-version."amdefine"."0.1.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "source-map" ];
+  };
   by-spec."source-map"."0.1.x" =
-    self.by-version."source-map"."0.1.33";
+    self.by-version."source-map"."0.1.38";
   by-spec."source-map".">= 0.1.2" =
-    self.by-version."source-map"."0.1.33";
+    self.by-version."source-map"."0.1.38";
   by-spec."source-map"."~ 0.1.8" =
-    self.by-version."source-map"."0.1.33";
+    self.by-version."source-map"."0.1.38";
   by-spec."source-map"."~0.1.30" =
-    self.by-version."source-map"."0.1.33";
+    self.by-version."source-map"."0.1.38";
   by-spec."source-map"."~0.1.31" =
-    self.by-version."source-map"."0.1.33";
+    self.by-version."source-map"."0.1.38";
   by-spec."source-map"."~0.1.33" =
-    self.by-version."source-map"."0.1.33";
+    self.by-version."source-map"."0.1.38";
   by-spec."source-map"."~0.1.7" =
-    self.by-version."source-map"."0.1.33";
+    self.by-version."source-map"."0.1.38";
   by-spec."spdy"."1.7.1" =
     self.by-version."spdy"."1.7.1";
   by-version."spdy"."1.7.1" = lib.makeOverridable self.buildNodePackage {
@@ -16872,14 +17456,14 @@
     passthru.names = [ "spdy" ];
   };
   by-spec."sprintf"."~0.1.2" =
-    self.by-version."sprintf"."0.1.3";
-  by-version."sprintf"."0.1.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-sprintf-0.1.3";
+    self.by-version."sprintf"."0.1.4";
+  by-version."sprintf"."0.1.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-sprintf-0.1.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/sprintf/-/sprintf-0.1.3.tgz";
-        name = "sprintf-0.1.3.tgz";
-        sha1 = "530fc31405d47422f6edb40f29bdafac599ede11";
+        url = "http://registry.npmjs.org/sprintf/-/sprintf-0.1.4.tgz";
+        name = "sprintf-0.1.4.tgz";
+        sha1 = "6f870a8f4aae1c7fe53eee02b6ca31aa2d78863b";
       })
     ];
     buildInputs =
@@ -16891,7 +17475,7 @@
     passthru.names = [ "sprintf" ];
   };
   by-spec."sprintf"."~0.1.3" =
-    self.by-version."sprintf"."0.1.3";
+    self.by-version."sprintf"."0.1.4";
   by-spec."ssh-agent"."0.2.1" =
     self.by-version."ssh-agent"."0.2.1";
   by-version."ssh-agent"."0.2.1" = lib.makeOverridable self.buildNodePackage {
@@ -16952,14 +17536,14 @@
     passthru.names = [ "stack-trace" ];
   };
   by-spec."stackdriver-statsd-backend"."*" =
-    self.by-version."stackdriver-statsd-backend"."0.2.1";
-  by-version."stackdriver-statsd-backend"."0.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-stackdriver-statsd-backend-0.2.1";
+    self.by-version."stackdriver-statsd-backend"."0.2.2";
+  by-version."stackdriver-statsd-backend"."0.2.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-stackdriver-statsd-backend-0.2.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/stackdriver-statsd-backend/-/stackdriver-statsd-backend-0.2.1.tgz";
-        name = "stackdriver-statsd-backend-0.2.1.tgz";
-        sha1 = "3109661288821e79259b4d750a25d7159265dd8e";
+        url = "http://registry.npmjs.org/stackdriver-statsd-backend/-/stackdriver-statsd-backend-0.2.2.tgz";
+        name = "stackdriver-statsd-backend-0.2.2.tgz";
+        sha1 = "15bdc95adf083cfbfa20d7ff8f67277d7eba38f8";
       })
     ];
     buildInputs =
@@ -16970,45 +17554,7 @@
     ];
     passthru.names = [ "stackdriver-statsd-backend" ];
   };
-  "stackdriver-statsd-backend" = self.by-version."stackdriver-statsd-backend"."0.2.1";
-  by-spec."static-favicon"."1.0.0" =
-    self.by-version."static-favicon"."1.0.0";
-  by-version."static-favicon"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-static-favicon-1.0.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/static-favicon/-/static-favicon-1.0.0.tgz";
-        name = "static-favicon-1.0.0.tgz";
-        sha1 = "2e58dcfe58957a2d53337ef7a38cf9ad6c13c0d0";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."static-favicon" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "static-favicon" ];
-  };
-  by-spec."static-favicon"."1.0.2" =
-    self.by-version."static-favicon"."1.0.2";
-  by-version."static-favicon"."1.0.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-static-favicon-1.0.2";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/static-favicon/-/static-favicon-1.0.2.tgz";
-        name = "static-favicon-1.0.2.tgz";
-        sha1 = "7c15920dda2bf33f414b0e60aebbd65cdd2a1d2f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."static-favicon" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "static-favicon" ];
-  };
+  "stackdriver-statsd-backend" = self.by-version."stackdriver-statsd-backend"."0.2.2";
   by-spec."statsd"."*" =
     self.by-version."statsd"."0.7.1";
   by-version."statsd"."0.7.1" = lib.makeOverridable self.buildNodePackage {
@@ -17033,14 +17579,14 @@
   };
   "statsd" = self.by-version."statsd"."0.7.1";
   by-spec."statsd-librato-backend"."*" =
-    self.by-version."statsd-librato-backend"."0.1.2";
-  by-version."statsd-librato-backend"."0.1.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-statsd-librato-backend-0.1.2";
+    self.by-version."statsd-librato-backend"."0.1.3";
+  by-version."statsd-librato-backend"."0.1.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-statsd-librato-backend-0.1.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/statsd-librato-backend/-/statsd-librato-backend-0.1.2.tgz";
-        name = "statsd-librato-backend-0.1.2.tgz";
-        sha1 = "228718018361ef352109bb69e2e6b3af9ab7d12d";
+        url = "http://registry.npmjs.org/statsd-librato-backend/-/statsd-librato-backend-0.1.3.tgz";
+        name = "statsd-librato-backend-0.1.3.tgz";
+        sha1 = "a72b885f6114a1d8ad460aff6a8319631b8c4e08";
       })
     ];
     buildInputs =
@@ -17051,29 +17597,48 @@
     ];
     passthru.names = [ "statsd-librato-backend" ];
   };
-  "statsd-librato-backend" = self.by-version."statsd-librato-backend"."0.1.2";
-  by-spec."stream-browserify"."~0.1.0" =
-    self.by-version."stream-browserify"."0.1.3";
-  by-version."stream-browserify"."0.1.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-stream-browserify-0.1.3";
+  "statsd-librato-backend" = self.by-version."statsd-librato-backend"."0.1.3";
+  by-spec."statuses"."~1.0.1" =
+    self.by-version."statuses"."1.0.4";
+  by-version."statuses"."1.0.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-statuses-1.0.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/stream-browserify/-/stream-browserify-0.1.3.tgz";
-        name = "stream-browserify-0.1.3.tgz";
-        sha1 = "95cf1b369772e27adaf46352265152689c6c4be9";
+        url = "http://registry.npmjs.org/statuses/-/statuses-1.0.4.tgz";
+        name = "statuses-1.0.4.tgz";
+        sha1 = "a8b203f645cf475a66426f6be690205c85f3ebdd";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."statuses" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "statuses" ];
+  };
+  by-spec."stream-browserify"."^1.0.0" =
+    self.by-version."stream-browserify"."1.0.0";
+  by-version."stream-browserify"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-stream-browserify-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/stream-browserify/-/stream-browserify-1.0.0.tgz";
+        name = "stream-browserify-1.0.0.tgz";
+        sha1 = "bf9b4abfb42b274d751479e44e0ff2656b6f1193";
       })
     ];
     buildInputs =
       (self.nativeDeps."stream-browserify" or []);
     deps = [
       self.by-version."inherits"."2.0.1"
-      self.by-version."process"."0.5.2"
+      self.by-version."readable-stream"."1.1.13"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "stream-browserify" ];
   };
-  by-spec."stream-combiner"."^0.0.4" =
+  by-spec."stream-combiner"."~0.0.2" =
     self.by-version."stream-combiner"."0.0.4";
   by-version."stream-combiner"."0.0.4" = lib.makeOverridable self.buildNodePackage {
     name = "node-stream-combiner-0.0.4";
@@ -17093,23 +17658,41 @@
     ];
     passthru.names = [ "stream-combiner" ];
   };
-  by-spec."stream-combiner"."~0.0.2" =
-    self.by-version."stream-combiner"."0.0.4";
-  by-spec."stream-counter"."~0.1.0" =
-    self.by-version."stream-counter"."0.1.0";
-  by-version."stream-counter"."0.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-stream-counter-0.1.0";
+  by-spec."stream-combiner2"."~1.0.0" =
+    self.by-version."stream-combiner2"."1.0.1";
+  by-version."stream-combiner2"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-stream-combiner2-1.0.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/stream-counter/-/stream-counter-0.1.0.tgz";
-        name = "stream-counter-0.1.0.tgz";
-        sha1 = "a035e429361fb57f361606e17fcd8a8b9677327b";
+        url = "http://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.0.1.tgz";
+        name = "stream-combiner2-1.0.1.tgz";
+        sha1 = "e992881737c754a999431134f4f3f5b45ca0a97a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."stream-combiner2" or []);
+    deps = [
+      self.by-version."duplexer2"."0.0.2"
+      self.by-version."through2"."0.5.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "stream-combiner2" ];
+  };
+  by-spec."stream-counter"."^1.0.0" =
+    self.by-version."stream-counter"."1.0.0";
+  by-version."stream-counter"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-stream-counter-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/stream-counter/-/stream-counter-1.0.0.tgz";
+        name = "stream-counter-1.0.0.tgz";
+        sha1 = "91cf2569ce4dc5061febcd7acb26394a5a114751";
       })
     ];
     buildInputs =
       (self.nativeDeps."stream-counter" or []);
     deps = [
-      self.by-version."readable-stream"."1.0.27-1"
     ];
     peerDependencies = [
     ];
@@ -17129,12 +17712,37 @@
     buildInputs =
       (self.nativeDeps."stream-counter" or []);
     deps = [
-      self.by-version."readable-stream"."1.1.13-1"
+      self.by-version."readable-stream"."1.1.13"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "stream-counter" ];
   };
+  by-spec."stream-splicer"."^1.1.0" =
+    self.by-version."stream-splicer"."1.3.0";
+  by-version."stream-splicer"."1.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-stream-splicer-1.3.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/stream-splicer/-/stream-splicer-1.3.0.tgz";
+        name = "stream-splicer-1.3.0.tgz";
+        sha1 = "4839f2f03c4137b3896d064a4d927807a3b95b21";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."stream-splicer" or []);
+    deps = [
+      self.by-version."inherits"."2.0.1"
+      self.by-version."isarray"."0.0.1"
+      self.by-version."readable-stream"."1.1.13"
+      self.by-version."readable-wrap"."1.0.0"
+      self.by-version."through2"."1.1.1"
+      self.by-version."indexof"."0.0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "stream-splicer" ];
+  };
   by-spec."stream-splitter-transform"."*" =
     self.by-version."stream-splitter-transform"."0.0.4";
   by-version."stream-splitter-transform"."0.0.4" = lib.makeOverridable self.buildNodePackage {
@@ -17213,43 +17821,64 @@
     ];
     passthru.names = [ "string_decoder" ];
   };
-  by-spec."stringify-object"."~0.1.4" =
-    self.by-version."stringify-object"."0.1.8";
-  by-version."stringify-object"."0.1.8" = lib.makeOverridable self.buildNodePackage {
-    name = "node-stringify-object-0.1.8";
+  by-spec."stringstream"."~0.0.4" =
+    self.by-version."stringstream"."0.0.4";
+  by-version."stringstream"."0.0.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-stringstream-0.0.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/stringify-object/-/stringify-object-0.1.8.tgz";
-        name = "stringify-object-0.1.8.tgz";
-        sha1 = "463348f38fdcd4fec1c011084c24a59ac653c1ee";
+        url = "http://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz";
+        name = "stringstream-0.0.4.tgz";
+        sha1 = "0f0e3423f942960b5692ac324a57dd093bc41a92";
       })
     ];
     buildInputs =
-      (self.nativeDeps."stringify-object" or []);
+      (self.nativeDeps."stringstream" or []);
     deps = [
     ];
     peerDependencies = [
     ];
-    passthru.names = [ "stringify-object" ];
+    passthru.names = [ "stringstream" ];
   };
-  by-spec."stringify-object"."~0.2.0" =
-    self.by-version."stringify-object"."0.2.0";
-  by-version."stringify-object"."0.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-stringify-object-0.2.0";
+  by-spec."strip-ansi"."^0.2.1" =
+    self.by-version."strip-ansi"."0.2.2";
+  by-version."strip-ansi"."0.2.2" = lib.makeOverridable self.buildNodePackage {
+    name = "strip-ansi-0.2.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/stringify-object/-/stringify-object-0.2.0.tgz";
-        name = "stringify-object-0.2.0.tgz";
-        sha1 = "832996ea55ab2aaa7570cc9bc0d5774adfc2c585";
+        url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-0.2.2.tgz";
+        name = "strip-ansi-0.2.2.tgz";
+        sha1 = "854d290c981525fc8c397a910b025ae2d54ffc08";
       })
     ];
     buildInputs =
-      (self.nativeDeps."stringify-object" or []);
+      (self.nativeDeps."strip-ansi" or []);
     deps = [
+      self.by-version."ansi-regex"."0.1.0"
     ];
     peerDependencies = [
     ];
-    passthru.names = [ "stringify-object" ];
+    passthru.names = [ "strip-ansi" ];
+  };
+  by-spec."strip-ansi"."^0.3.0" =
+    self.by-version."strip-ansi"."0.3.0";
+  by-version."strip-ansi"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "strip-ansi-0.3.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz";
+        name = "strip-ansi-0.3.0.tgz";
+        sha1 = "25f48ea22ca79187f3174a4db8759347bb126220";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."strip-ansi" or []);
+    deps = [
+      self.by-version."ansi-regex"."0.2.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "strip-ansi" ];
   };
   by-spec."strip-ansi"."~0.1.0" =
     self.by-version."strip-ansi"."0.1.1";
@@ -17270,15 +17899,36 @@
     ];
     passthru.names = [ "strip-ansi" ];
   };
-  by-spec."strip-json-comments"."0.1.x" =
-    self.by-version."strip-json-comments"."0.1.1";
-  by-version."strip-json-comments"."0.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "strip-json-comments-0.1.1";
+  by-spec."strip-bom"."^0.3.0" =
+    self.by-version."strip-bom"."0.3.1";
+  by-version."strip-bom"."0.3.1" = lib.makeOverridable self.buildNodePackage {
+    name = "strip-bom-0.3.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/strip-json-comments/-/strip-json-comments-0.1.1.tgz";
-        name = "strip-json-comments-0.1.1.tgz";
-        sha1 = "eb5a750bd4e8dc82817295a115dc11b63f01d4b0";
+        url = "http://registry.npmjs.org/strip-bom/-/strip-bom-0.3.1.tgz";
+        name = "strip-bom-0.3.1.tgz";
+        sha1 = "9e8a39eff456ff9abc2f059f5f2225bb0f3f7ca5";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."strip-bom" or []);
+    deps = [
+      self.by-version."first-chunk-stream"."0.1.0"
+      self.by-version."is-utf8"."0.2.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "strip-bom" ];
+  };
+  by-spec."strip-json-comments"."0.1.x" =
+    self.by-version."strip-json-comments"."0.1.3";
+  by-version."strip-json-comments"."0.1.3" = lib.makeOverridable self.buildNodePackage {
+    name = "strip-json-comments-0.1.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/strip-json-comments/-/strip-json-comments-0.1.3.tgz";
+        name = "strip-json-comments-0.1.3.tgz";
+        sha1 = "164c64e370a8a3cc00c9e01b539e569823f0ee54";
       })
     ];
     buildInputs =
@@ -17310,14 +17960,14 @@
     passthru.names = [ "strong-data-uri" ];
   };
   by-spec."stylus"."*" =
-    self.by-version."stylus"."0.44.0-beta3";
-  by-version."stylus"."0.44.0-beta3" = lib.makeOverridable self.buildNodePackage {
-    name = "stylus-0.44.0-beta3";
+    self.by-version."stylus"."0.48.0";
+  by-version."stylus"."0.48.0" = lib.makeOverridable self.buildNodePackage {
+    name = "stylus-0.48.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/stylus/-/stylus-0.44.0-beta3.tgz";
-        name = "stylus-0.44.0-beta3.tgz";
-        sha1 = "a602b30f57f1692cf0f1fb664e60a14e26102cff";
+        url = "http://registry.npmjs.org/stylus/-/stylus-0.48.0.tgz";
+        name = "stylus-0.48.0.tgz";
+        sha1 = "a8de8341b1cd89efb9161050bf87a72d65485795";
       })
     ];
     buildInputs =
@@ -17325,16 +17975,16 @@
     deps = [
       self.by-version."css-parse"."1.7.0"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."debug"."0.8.1"
+      self.by-version."debug"."1.0.4"
       self.by-version."sax"."0.5.8"
-      self.by-version."glob"."3.2.9"
-      self.by-version."circular-json"."0.1.6"
+      self.by-version."glob"."3.2.11"
+      self.by-version."source-map"."0.1.38"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "stylus" ];
   };
-  "stylus" = self.by-version."stylus"."0.44.0-beta3";
+  "stylus" = self.by-version."stylus"."0.48.0";
   by-spec."stylus"."0.42.2" =
     self.by-version."stylus"."0.42.2";
   by-version."stylus"."0.42.2" = lib.makeOverridable self.buildNodePackage {
@@ -17351,9 +18001,9 @@
     deps = [
       self.by-version."css-parse"."1.7.0"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."debug"."0.8.1"
+      self.by-version."debug"."1.0.4"
       self.by-version."sax"."0.5.8"
-      self.by-version."glob"."3.2.9"
+      self.by-version."glob"."3.2.11"
     ];
     peerDependencies = [
     ];
@@ -17373,75 +18023,37 @@
     buildInputs =
       (self.nativeDeps."subarg" or []);
     deps = [
-      self.by-version."minimist"."0.0.8"
+      self.by-version."minimist"."0.0.10"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "subarg" ];
   };
-  by-spec."sudo-block"."~0.2.0" =
-    self.by-version."sudo-block"."0.2.1";
-  by-version."sudo-block"."0.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-sudo-block-0.2.1";
+  by-spec."superagent"."0.18.0" =
+    self.by-version."superagent"."0.18.0";
+  by-version."superagent"."0.18.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-superagent-0.18.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/sudo-block/-/sudo-block-0.2.1.tgz";
-        name = "sudo-block-0.2.1.tgz";
-        sha1 = "b394820741b66c0fe06f97b334f0674036837ba5";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."sudo-block" or []);
-    deps = [
-      self.by-version."chalk"."0.1.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "sudo-block" ];
-  };
-  by-spec."sudo-block"."~0.3.0" =
-    self.by-version."sudo-block"."0.3.0";
-  by-version."sudo-block"."0.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-sudo-block-0.3.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/sudo-block/-/sudo-block-0.3.0.tgz";
-        name = "sudo-block-0.3.0.tgz";
-        sha1 = "aec27fbde8763ee32e3e47b8ba3c70584da7eb9c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."sudo-block" or []);
-    deps = [
-      self.by-version."chalk"."0.3.0"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "sudo-block" ];
-  };
-  by-spec."superagent"."0.17.0" =
-    self.by-version."superagent"."0.17.0";
-  by-version."superagent"."0.17.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-superagent-0.17.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/superagent/-/superagent-0.17.0.tgz";
-        name = "superagent-0.17.0.tgz";
-        sha1 = "aadcd50fbe5a93e71991118d79bf0714d625bba8";
+        url = "http://registry.npmjs.org/superagent/-/superagent-0.18.0.tgz";
+        name = "superagent-0.18.0.tgz";
+        sha1 = "9d4375a3ae2c4fbd55fd20d5b12a2470d2fc8f62";
       })
     ];
     buildInputs =
       (self.nativeDeps."superagent" or []);
     deps = [
-      self.by-version."qs"."0.6.5"
+      self.by-version."qs"."0.6.6"
       self.by-version."formidable"."1.0.14"
       self.by-version."mime"."1.2.5"
-      self.by-version."emitter-component"."1.0.0"
+      self.by-version."component-emitter"."1.1.2"
       self.by-version."methods"."0.0.1"
-      self.by-version."cookiejar"."1.3.0"
+      self.by-version."cookiejar"."1.3.2"
       self.by-version."debug"."0.7.4"
       self.by-version."reduce-component"."1.0.1"
       self.by-version."extend"."1.2.1"
+      self.by-version."form-data"."0.1.2"
+      self.by-version."readable-stream"."1.0.27-1"
     ];
     peerDependencies = [
     ];
@@ -17472,30 +18084,77 @@
     ];
     passthru.names = [ "superagent" ];
   };
-  by-spec."superagent"."~0.17.0" =
-    self.by-version."superagent"."0.17.0";
-  by-spec."supertest"."*" =
-    self.by-version."supertest"."0.11.0";
-  by-version."supertest"."0.11.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-supertest-0.11.0";
+  by-spec."superagent"."~0.18.0" =
+    self.by-version."superagent"."0.18.2";
+  by-version."superagent"."0.18.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-superagent-0.18.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/supertest/-/supertest-0.11.0.tgz";
-        name = "supertest-0.11.0.tgz";
-        sha1 = "f8496b9f05cac1ea2fcec1d21adeca7167f42460";
+        url = "http://registry.npmjs.org/superagent/-/superagent-0.18.2.tgz";
+        name = "superagent-0.18.2.tgz";
+        sha1 = "9afc6276a9475f4bdcd535ac6a0685ebc4b560eb";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."superagent" or []);
+    deps = [
+      self.by-version."qs"."0.6.6"
+      self.by-version."formidable"."1.0.14"
+      self.by-version."mime"."1.2.11"
+      self.by-version."component-emitter"."1.1.2"
+      self.by-version."methods"."1.0.1"
+      self.by-version."cookiejar"."2.0.1"
+      self.by-version."debug"."1.0.4"
+      self.by-version."reduce-component"."1.0.1"
+      self.by-version."extend"."1.2.1"
+      self.by-version."form-data"."0.1.3"
+      self.by-version."readable-stream"."1.0.27-1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "superagent" ];
+  };
+  by-spec."supertest"."*" =
+    self.by-version."supertest"."0.13.0";
+  by-version."supertest"."0.13.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-supertest-0.13.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/supertest/-/supertest-0.13.0.tgz";
+        name = "supertest-0.13.0.tgz";
+        sha1 = "4892bafd9beaa9bbcc95fd5a9f04949aef1ce06f";
       })
     ];
     buildInputs =
       (self.nativeDeps."supertest" or []);
     deps = [
-      self.by-version."superagent"."0.17.0"
-      self.by-version."methods"."0.1.0"
+      self.by-version."superagent"."0.18.0"
+      self.by-version."methods"."1.0.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "supertest" ];
   };
-  "supertest" = self.by-version."supertest"."0.11.0";
+  "supertest" = self.by-version."supertest"."0.13.0";
+  by-spec."supports-color"."^0.2.0" =
+    self.by-version."supports-color"."0.2.0";
+  by-version."supports-color"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "supports-color-0.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz";
+        name = "supports-color-0.2.0.tgz";
+        sha1 = "d92de2694eb3f67323973d7ae3d8b55b4c22190a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."supports-color" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "supports-color" ];
+  };
   by-spec."swig"."0.14.x" =
     self.by-version."swig"."0.14.0";
   by-version."swig"."0.14.0" = lib.makeOverridable self.buildNodePackage {
@@ -17538,15 +18197,15 @@
   };
   by-spec."sylvester".">= 0.0.8" =
     self.by-version."sylvester"."0.0.21";
-  by-spec."syntax-error"."~1.1.0" =
-    self.by-version."syntax-error"."1.1.0";
-  by-version."syntax-error"."1.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-syntax-error-1.1.0";
+  by-spec."syntax-error"."^1.1.1" =
+    self.by-version."syntax-error"."1.1.1";
+  by-version."syntax-error"."1.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-syntax-error-1.1.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/syntax-error/-/syntax-error-1.1.0.tgz";
-        name = "syntax-error-1.1.0.tgz";
-        sha1 = "8bc3b08141b4e5084dfc66c74e15928db9f34e85";
+        url = "http://registry.npmjs.org/syntax-error/-/syntax-error-1.1.1.tgz";
+        name = "syntax-error-1.1.1.tgz";
+        sha1 = "50a4f836356f3803a8e954ce5dfd4a0f95ba6a87";
       })
     ];
     buildInputs =
@@ -17581,30 +18240,50 @@
     passthru.names = [ "tape" ];
   };
   by-spec."tar"."*" =
-    self.by-version."tar"."0.1.19";
-  by-version."tar"."0.1.19" = lib.makeOverridable self.buildNodePackage {
-    name = "node-tar-0.1.19";
+    self.by-version."tar"."1.0.1";
+  by-version."tar"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-tar-1.0.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/tar/-/tar-0.1.19.tgz";
-        name = "tar-0.1.19.tgz";
-        sha1 = "fe45941799e660ce1ea52d875d37481b4bf13eac";
+        url = "http://registry.npmjs.org/tar/-/tar-1.0.1.tgz";
+        name = "tar-1.0.1.tgz";
+        sha1 = "6075b5a1f236defe0c7e3756d3d9b3ebdad0f19a";
       })
     ];
     buildInputs =
       (self.nativeDeps."tar" or []);
     deps = [
-      self.by-version."inherits"."2.0.1"
       self.by-version."block-stream"."0.0.7"
-      self.by-version."fstream"."0.1.25"
+      self.by-version."fstream"."1.0.2"
+      self.by-version."inherits"."2.0.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "tar" ];
   };
-  "tar" = self.by-version."tar"."0.1.19";
+  "tar" = self.by-version."tar"."1.0.1";
   by-spec."tar"."0" =
-    self.by-version."tar"."0.1.19";
+    self.by-version."tar"."0.1.20";
+  by-version."tar"."0.1.20" = lib.makeOverridable self.buildNodePackage {
+    name = "node-tar-0.1.20";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/tar/-/tar-0.1.20.tgz";
+        name = "tar-0.1.20.tgz";
+        sha1 = "42940bae5b5f22c74483699126f9f3f27449cb13";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."tar" or []);
+    deps = [
+      self.by-version."block-stream"."0.0.7"
+      self.by-version."fstream"."0.1.31"
+      self.by-version."inherits"."2.0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "tar" ];
+  };
   by-spec."tar"."0.1.17" =
     self.by-version."tar"."0.1.17";
   by-version."tar"."0.1.17" = lib.makeOverridable self.buildNodePackage {
@@ -17621,39 +18300,60 @@
     deps = [
       self.by-version."inherits"."1.0.0"
       self.by-version."block-stream"."0.0.7"
-      self.by-version."fstream"."0.1.25"
+      self.by-version."fstream"."0.1.31"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "tar" ];
   };
-  by-spec."tar"."^0.1.18" =
-    self.by-version."tar"."0.1.19";
-  by-spec."tar"."~0.1.17" =
-    self.by-version."tar"."0.1.19";
-  by-spec."tar"."~0.1.19" =
-    self.by-version."tar"."0.1.19";
-  by-spec."temp"."*" =
-    self.by-version."temp"."0.7.0";
-  by-version."temp"."0.7.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-temp-0.7.0";
+  by-spec."tar"."^1.0.0" =
+    self.by-version."tar"."1.0.1";
+  by-spec."tar"."~0.1.20" =
+    self.by-version."tar"."0.1.20";
+  by-spec."tar-stream"."~0.4.0" =
+    self.by-version."tar-stream"."0.4.5";
+  by-version."tar-stream"."0.4.5" = lib.makeOverridable self.buildNodePackage {
+    name = "node-tar-stream-0.4.5";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/temp/-/temp-0.7.0.tgz";
-        name = "temp-0.7.0.tgz";
-        sha1 = "d34bdc8e7f955da2a6a473fea07ad601d68ba78f";
+        url = "http://registry.npmjs.org/tar-stream/-/tar-stream-0.4.5.tgz";
+        name = "tar-stream-0.4.5.tgz";
+        sha1 = "a5e0a7521f57974c919b2b99fdae55589aeefa46";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."tar-stream" or []);
+    deps = [
+      self.by-version."bl"."0.9.1"
+      self.by-version."end-of-stream"."1.0.0"
+      self.by-version."readable-stream"."1.1.13"
+      self.by-version."xtend"."4.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "tar-stream" ];
+  };
+  by-spec."temp"."*" =
+    self.by-version."temp"."0.8.1";
+  by-version."temp"."0.8.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-temp-0.8.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/temp/-/temp-0.8.1.tgz";
+        name = "temp-0.8.1.tgz";
+        sha1 = "4b7b4ffde85bb09f2dd6ba6cc43b44213c94fd3a";
       })
     ];
     buildInputs =
       (self.nativeDeps."temp" or []);
     deps = [
-      self.by-version."rimraf"."2.2.6"
+      self.by-version."rimraf"."2.2.8"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "temp" ];
   };
-  "temp" = self.by-version."temp"."0.7.0";
+  "temp" = self.by-version."temp"."0.8.1";
   by-spec."temp"."0.6.0" =
     self.by-version."temp"."0.6.0";
   by-version."temp"."0.6.0" = lib.makeOverridable self.buildNodePackage {
@@ -17675,50 +18375,10 @@
     ];
     passthru.names = [ "temp" ];
   };
-  by-spec."temp"."~0.5.1" =
-    self.by-version."temp"."0.5.1";
-  by-version."temp"."0.5.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-temp-0.5.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/temp/-/temp-0.5.1.tgz";
-        name = "temp-0.5.1.tgz";
-        sha1 = "77ab19c79aa7b593cbe4fac2441768cad987b8df";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."temp" or []);
-    deps = [
-      self.by-version."rimraf"."2.1.4"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "temp" ];
-  };
   by-spec."temp"."~0.6.0" =
     self.by-version."temp"."0.6.0";
-  by-spec."temp"."~0.7.0" =
-    self.by-version."temp"."0.7.0";
-  by-spec."tempfile"."^0.1.2" =
-    self.by-version."tempfile"."0.1.3";
-  by-version."tempfile"."0.1.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-tempfile-0.1.3";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/tempfile/-/tempfile-0.1.3.tgz";
-        name = "tempfile-0.1.3.tgz";
-        sha1 = "7d6b710047339d39f847327a056dadf183103010";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."tempfile" or []);
-    deps = [
-      self.by-version."uuid"."1.4.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "tempfile" ];
-  };
+  by-spec."temp"."~0.8.0" =
+    self.by-version."temp"."0.8.1";
   by-spec."text-table"."~0.2.0" =
     self.by-version."text-table"."0.2.0";
   by-version."text-table"."0.2.0" = lib.makeOverridable self.buildNodePackage {
@@ -17776,59 +18436,103 @@
     ];
     passthru.names = [ "through" ];
   };
-  by-spec."through"."~2.2.7" =
-    self.by-version."through"."2.2.7";
-  by-version."through"."2.2.7" = lib.makeOverridable self.buildNodePackage {
-    name = "node-through-2.2.7";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/through/-/through-2.2.7.tgz";
-        name = "through-2.2.7.tgz";
-        sha1 = "6e8e21200191d4eb6a99f6f010df46aa1c6eb2bd";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."through" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "through" ];
-  };
   by-spec."through"."~2.3.4" =
     self.by-version."through"."2.3.4";
-  by-spec."through2"."^0.4.0" =
-    self.by-version."through2"."0.4.1";
-  by-version."through2"."0.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-through2-0.4.1";
+  by-spec."through2"."^0.5.1" =
+    self.by-version."through2"."0.5.1";
+  by-version."through2"."0.5.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-through2-0.5.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/through2/-/through2-0.4.1.tgz";
-        name = "through2-0.4.1.tgz";
-        sha1 = "afd849c65af513c2541a98a7cfbcfec3a15a9686";
+        url = "http://registry.npmjs.org/through2/-/through2-0.5.1.tgz";
+        name = "through2-0.5.1.tgz";
+        sha1 = "dfdd012eb9c700e2323fd334f38ac622ab372da7";
       })
     ];
     buildInputs =
       (self.nativeDeps."through2" or []);
     deps = [
-      self.by-version."readable-stream"."1.0.27-1"
-      self.by-version."xtend"."2.1.2"
+      self.by-version."readable-stream"."1.0.31"
+      self.by-version."xtend"."3.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "through2" ];
+  };
+  by-spec."through2"."^0.6.1" =
+    self.by-version."through2"."0.6.1";
+  by-version."through2"."0.6.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-through2-0.6.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/through2/-/through2-0.6.1.tgz";
+        name = "through2-0.6.1.tgz";
+        sha1 = "f742b32893e8bd26146e789e4fd2ccb2c07a717e";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."through2" or []);
+    deps = [
+      self.by-version."readable-stream"."1.0.31"
+      self.by-version."xtend"."4.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "through2" ];
+  };
+  by-spec."through2"."^1.0.0" =
+    self.by-version."through2"."1.1.1";
+  by-version."through2"."1.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-through2-1.1.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/through2/-/through2-1.1.1.tgz";
+        name = "through2-1.1.1.tgz";
+        sha1 = "0847cbc4449f3405574dbdccd9bb841b83ac3545";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."through2" or []);
+    deps = [
+      self.by-version."readable-stream"."1.1.13"
+      self.by-version."xtend"."4.0.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "through2" ];
   };
   by-spec."through2"."~0.4.1" =
-    self.by-version."through2"."0.4.1";
-  by-spec."timers-browserify"."~1.0.1" =
-    self.by-version."timers-browserify"."1.0.1";
-  by-version."timers-browserify"."1.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-timers-browserify-1.0.1";
+    self.by-version."through2"."0.4.2";
+  by-version."through2"."0.4.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-through2-0.4.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/timers-browserify/-/timers-browserify-1.0.1.tgz";
-        name = "timers-browserify-1.0.1.tgz";
-        sha1 = "7c93257b543cb1e3003d3663b57d560ee1d27057";
+        url = "http://registry.npmjs.org/through2/-/through2-0.4.2.tgz";
+        name = "through2-0.4.2.tgz";
+        sha1 = "dbf5866031151ec8352bb6c4db64a2292a840b9b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."through2" or []);
+    deps = [
+      self.by-version."readable-stream"."1.0.31"
+      self.by-version."xtend"."2.1.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "through2" ];
+  };
+  by-spec."through2"."~0.5.1" =
+    self.by-version."through2"."0.5.1";
+  by-spec."timers-browserify"."^1.0.1" =
+    self.by-version."timers-browserify"."1.0.3";
+  by-version."timers-browserify"."1.0.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-timers-browserify-1.0.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/timers-browserify/-/timers-browserify-1.0.3.tgz";
+        name = "timers-browserify-1.0.3.tgz";
+        sha1 = "ffba70c9c12eed916fd67318e629ac6f32295551";
       })
     ];
     buildInputs =
@@ -17860,14 +18564,14 @@
     passthru.names = [ "timespan" ];
   };
   by-spec."timezone"."*" =
-    self.by-version."timezone"."0.0.30";
-  by-version."timezone"."0.0.30" = lib.makeOverridable self.buildNodePackage {
-    name = "node-timezone-0.0.30";
+    self.by-version."timezone"."0.0.34";
+  by-version."timezone"."0.0.34" = lib.makeOverridable self.buildNodePackage {
+    name = "node-timezone-0.0.34";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/timezone/-/timezone-0.0.30.tgz";
-        name = "timezone-0.0.30.tgz";
-        sha1 = "f83e46d35c017a33a684a4d8bb8fac3debed49bf";
+        url = "http://registry.npmjs.org/timezone/-/timezone-0.0.34.tgz";
+        name = "timezone-0.0.34.tgz";
+        sha1 = "be56c3259448897b7e2eab6e2aeac46d5ab718d4";
       })
     ];
     buildInputs =
@@ -17878,7 +18582,7 @@
     ];
     passthru.names = [ "timezone" ];
   };
-  "timezone" = self.by-version."timezone"."0.0.30";
+  "timezone" = self.by-version."timezone"."0.0.34";
   by-spec."tinycolor"."0.x" =
     self.by-version."tinycolor"."0.0.1";
   by-version."tinycolor"."0.0.1" = lib.makeOverridable self.buildNodePackage {
@@ -17923,7 +18627,7 @@
       self.by-version."optimist"."0.6.1"
       self.by-version."request"."2.27.0"
       self.by-version."semver"."2.2.1"
-      self.by-version."sprintf"."0.1.3"
+      self.by-version."sprintf"."0.1.4"
       self.by-version."temp"."0.6.0"
       self.by-version."winston"."0.6.2"
       self.by-version."wrench"."1.5.8"
@@ -17934,14 +18638,14 @@
   };
   "titanium" = self.by-version."titanium"."3.2.1";
   by-spec."tmp"."~0.0.20" =
-    self.by-version."tmp"."0.0.23";
-  by-version."tmp"."0.0.23" = lib.makeOverridable self.buildNodePackage {
-    name = "node-tmp-0.0.23";
+    self.by-version."tmp"."0.0.24";
+  by-version."tmp"."0.0.24" = lib.makeOverridable self.buildNodePackage {
+    name = "node-tmp-0.0.24";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/tmp/-/tmp-0.0.23.tgz";
-        name = "tmp-0.0.23.tgz";
-        sha1 = "de874aa5e974a85f0a32cdfdbd74663cb3bd9c74";
+        url = "http://registry.npmjs.org/tmp/-/tmp-0.0.24.tgz";
+        name = "tmp-0.0.24.tgz";
+        sha1 = "d6a5e198d14a9835cc6f2d7c3d9e302428c8cf12";
       })
     ];
     buildInputs =
@@ -17952,26 +18656,6 @@
     ];
     passthru.names = [ "tmp" ];
   };
-  by-spec."touch"."0.0.2" =
-    self.by-version."touch"."0.0.2";
-  by-version."touch"."0.0.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-touch-0.0.2";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/touch/-/touch-0.0.2.tgz";
-        name = "touch-0.0.2.tgz";
-        sha1 = "a65a777795e5cbbe1299499bdc42281ffb21b5f4";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."touch" or []);
-    deps = [
-      self.by-version."nopt"."1.0.10"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "touch" ];
-  };
   by-spec."tough-cookie".">=0.12.0" =
     self.by-version."tough-cookie"."0.12.1";
   by-version."tough-cookie"."0.12.1" = lib.makeOverridable self.buildNodePackage {
@@ -17986,7 +18670,7 @@
     buildInputs =
       (self.nativeDeps."tough-cookie" or []);
     deps = [
-      self.by-version."punycode"."1.2.4"
+      self.by-version."punycode"."1.3.1"
     ];
     peerDependencies = [
     ];
@@ -18006,12 +18690,34 @@
     buildInputs =
       (self.nativeDeps."tough-cookie" or []);
     deps = [
-      self.by-version."punycode"."1.2.4"
+      self.by-version."punycode"."1.3.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "tough-cookie" ];
   };
+  by-spec."traceur"."0.0.55" =
+    self.by-version."traceur"."0.0.55";
+  by-version."traceur"."0.0.55" = lib.makeOverridable self.buildNodePackage {
+    name = "traceur-0.0.55";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/traceur/-/traceur-0.0.55.tgz";
+        name = "traceur-0.0.55.tgz";
+        sha1 = "b1a44b69bfbabb9db2c7c284713f4ebacf46f733";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."traceur" or []);
+    deps = [
+      self.by-version."commander"."2.3.0"
+      self.by-version."glob"."4.0.5"
+      self.by-version."semver"."2.3.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "traceur" ];
+  };
   by-spec."transformers"."2.1.0" =
     self.by-version."transformers"."2.1.0";
   by-version."transformers"."2.1.0" = lib.makeOverridable self.buildNodePackage {
@@ -18034,25 +18740,6 @@
     ];
     passthru.names = [ "transformers" ];
   };
-  by-spec."traverse".">=0.3.0 <0.4" =
-    self.by-version."traverse"."0.3.9";
-  by-version."traverse"."0.3.9" = lib.makeOverridable self.buildNodePackage {
-    name = "node-traverse-0.3.9";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz";
-        name = "traverse-0.3.9.tgz";
-        sha1 = "717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."traverse" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "traverse" ];
-  };
   by-spec."truncate"."~1.0.2" =
     self.by-version."truncate"."1.0.2";
   by-version."truncate"."1.0.2" = lib.makeOverridable self.buildNodePackage {
@@ -18129,6 +18816,25 @@
     ];
     passthru.names = [ "tunnel-agent" ];
   };
+  by-spec."tunnel-agent"."~0.4.0" =
+    self.by-version."tunnel-agent"."0.4.0";
+  by-version."tunnel-agent"."0.4.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-tunnel-agent-0.4.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz";
+        name = "tunnel-agent-0.4.0.tgz";
+        sha1 = "b1184e312ffbcf70b3b4c78e8c219de7ebb1c550";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."tunnel-agent" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "tunnel-agent" ];
+  };
   by-spec."type-detect"."0.1.1" =
     self.by-version."type-detect"."0.1.1";
   by-version."type-detect"."0.1.1" = lib.makeOverridable self.buildNodePackage {
@@ -18168,26 +18874,70 @@
     ];
     passthru.names = [ "type-is" ];
   };
-  by-spec."type-is"."~1.1.0" =
-    self.by-version."type-is"."1.1.0";
-  by-version."type-is"."1.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-type-is-1.1.0";
+  by-spec."type-is"."1.2.1" =
+    self.by-version."type-is"."1.2.1";
+  by-version."type-is"."1.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-type-is-1.2.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/type-is/-/type-is-1.1.0.tgz";
-        name = "type-is-1.1.0.tgz";
-        sha1 = "d0245ec8b2676668d59dd0cf3255060676a57db6";
+        url = "http://registry.npmjs.org/type-is/-/type-is-1.2.1.tgz";
+        name = "type-is-1.2.1.tgz";
+        sha1 = "73d448080a4f1dd18acb1eefff62968c5b5d54a2";
       })
     ];
     buildInputs =
       (self.nativeDeps."type-is" or []);
     deps = [
-      self.by-version."mime"."1.2.11"
+      self.by-version."mime-types"."1.0.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "type-is" ];
   };
+  by-spec."type-is"."1.3.1" =
+    self.by-version."type-is"."1.3.1";
+  by-version."type-is"."1.3.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-type-is-1.3.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/type-is/-/type-is-1.3.1.tgz";
+        name = "type-is-1.3.1.tgz";
+        sha1 = "a6789b5a52138289ade1ef8f6d9f2874ffd70b6b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."type-is" or []);
+    deps = [
+      self.by-version."media-typer"."0.2.0"
+      self.by-version."mime-types"."1.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "type-is" ];
+  };
+  by-spec."type-is"."~1.3.1" =
+    self.by-version."type-is"."1.3.2";
+  by-version."type-is"."1.3.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-type-is-1.3.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/type-is/-/type-is-1.3.2.tgz";
+        name = "type-is-1.3.2.tgz";
+        sha1 = "4f2a5dc58775ca1630250afc7186f8b36309d1bb";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."type-is" or []);
+    deps = [
+      self.by-version."media-typer"."0.2.0"
+      self.by-version."mime-types"."1.0.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "type-is" ];
+  };
+  by-spec."type-is"."~1.3.2" =
+    self.by-version."type-is"."1.3.2";
   by-spec."typechecker"."~2.0.1" =
     self.by-version."typechecker"."2.0.8";
   by-version."typechecker"."2.0.8" = lib.makeOverridable self.buildNodePackage {
@@ -18208,14 +18958,14 @@
     passthru.names = [ "typechecker" ];
   };
   by-spec."typedarray"."~0.0.5" =
-    self.by-version."typedarray"."0.0.5";
-  by-version."typedarray"."0.0.5" = lib.makeOverridable self.buildNodePackage {
-    name = "node-typedarray-0.0.5";
+    self.by-version."typedarray"."0.0.6";
+  by-version."typedarray"."0.0.6" = lib.makeOverridable self.buildNodePackage {
+    name = "node-typedarray-0.0.6";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/typedarray/-/typedarray-0.0.5.tgz";
-        name = "typedarray-0.0.5.tgz";
-        sha1 = "c4158fcd96c8ef91ef03cc72584c95e032877664";
+        url = "http://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz";
+        name = "typedarray-0.0.6.tgz";
+        sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
       })
     ];
     buildInputs =
@@ -18247,21 +18997,21 @@
   };
   "typescript" = self.by-version."typescript"."1.0.1";
   by-spec."uglify-js"."*" =
-    self.by-version."uglify-js"."2.4.13";
-  by-version."uglify-js"."2.4.13" = lib.makeOverridable self.buildNodePackage {
-    name = "uglify-js-2.4.13";
+    self.by-version."uglify-js"."2.4.15";
+  by-version."uglify-js"."2.4.15" = lib.makeOverridable self.buildNodePackage {
+    name = "uglify-js-2.4.15";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.13.tgz";
-        name = "uglify-js-2.4.13.tgz";
-        sha1 = "18debc9e6ecfc20db1a5ea035f839d436a605aba";
+        url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.15.tgz";
+        name = "uglify-js-2.4.15.tgz";
+        sha1 = "12bc6d84345fbc306e13f7075d6437a8bf64d7e3";
       })
     ];
     buildInputs =
       (self.nativeDeps."uglify-js" or []);
     deps = [
       self.by-version."async"."0.2.10"
-      self.by-version."source-map"."0.1.33"
+      self.by-version."source-map"."0.1.34"
       self.by-version."optimist"."0.3.7"
       self.by-version."uglify-to-browserify"."1.0.2"
     ];
@@ -18269,7 +19019,7 @@
     ];
     passthru.names = [ "uglify-js" ];
   };
-  "uglify-js" = self.by-version."uglify-js"."2.4.13";
+  "uglify-js" = self.by-version."uglify-js"."2.4.15";
   by-spec."uglify-js"."1.2.5" =
     self.by-version."uglify-js"."1.2.5";
   by-version."uglify-js"."1.2.5" = lib.makeOverridable self.buildNodePackage {
@@ -18304,7 +19054,7 @@
       (self.nativeDeps."uglify-js" or []);
     deps = [
       self.by-version."async"."0.2.10"
-      self.by-version."source-map"."0.1.33"
+      self.by-version."source-map"."0.1.38"
       self.by-version."optimist"."0.3.7"
       self.by-version."uglify-to-browserify"."1.0.2"
     ];
@@ -18313,7 +19063,7 @@
     passthru.names = [ "uglify-js" ];
   };
   by-spec."uglify-js"."^2.4.0" =
-    self.by-version."uglify-js"."2.4.13";
+    self.by-version."uglify-js"."2.4.15";
   by-spec."uglify-js"."~2.2" =
     self.by-version."uglify-js"."2.2.5";
   by-version."uglify-js"."2.2.5" = lib.makeOverridable self.buildNodePackage {
@@ -18328,7 +19078,7 @@
     buildInputs =
       (self.nativeDeps."uglify-js" or []);
     deps = [
-      self.by-version."source-map"."0.1.33"
+      self.by-version."source-map"."0.1.38"
       self.by-version."optimist"."0.3.7"
     ];
     peerDependencies = [
@@ -18352,7 +19102,7 @@
       (self.nativeDeps."uglify-js" or []);
     deps = [
       self.by-version."async"."0.2.10"
-      self.by-version."source-map"."0.1.33"
+      self.by-version."source-map"."0.1.38"
       self.by-version."optimist"."0.3.7"
     ];
     peerDependencies = [
@@ -18362,9 +19112,9 @@
   by-spec."uglify-js"."~2.3.6" =
     self.by-version."uglify-js"."2.3.6";
   by-spec."uglify-js"."~2.4.0" =
-    self.by-version."uglify-js"."2.4.13";
+    self.by-version."uglify-js"."2.4.15";
   by-spec."uglify-js"."~2.4.12" =
-    self.by-version."uglify-js"."2.4.13";
+    self.by-version."uglify-js"."2.4.15";
   by-spec."uglify-to-browserify"."~1.0.0" =
     self.by-version."uglify-to-browserify"."1.0.2";
   by-version."uglify-to-browserify"."1.0.2" = lib.makeOverridable self.buildNodePackage {
@@ -18403,6 +19153,29 @@
     ];
     passthru.names = [ "uid-number" ];
   };
+  by-spec."uid-safe"."1" =
+    self.by-version."uid-safe"."1.0.1";
+  by-version."uid-safe"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-uid-safe-1.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/uid-safe/-/uid-safe-1.0.1.tgz";
+        name = "uid-safe-1.0.1.tgz";
+        sha1 = "5bd148460a2e84f54f193fd20352c8c3d7de6ac8";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."uid-safe" or []);
+    deps = [
+      self.by-version."mz"."1.0.1"
+      self.by-version."base64-url"."1.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "uid-safe" ];
+  };
+  by-spec."uid-safe"."1.0.1" =
+    self.by-version."uid-safe"."1.0.1";
   by-spec."uid2"."0.0.3" =
     self.by-version."uid2"."0.0.3";
   by-version."uid2"."0.0.3" = lib.makeOverridable self.buildNodePackage {
@@ -18422,17 +19195,15 @@
     ];
     passthru.names = [ "uid2" ];
   };
-  by-spec."uid2"."~0.0.2" =
-    self.by-version."uid2"."0.0.3";
-  by-spec."umd"."~2.0.0" =
-    self.by-version."umd"."2.0.0";
-  by-version."umd"."2.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "umd-2.0.0";
+  by-spec."umd"."^2.1.0" =
+    self.by-version."umd"."2.1.0";
+  by-version."umd"."2.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "umd-2.1.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/umd/-/umd-2.0.0.tgz";
-        name = "umd-2.0.0.tgz";
-        sha1 = "749683b0d514728ae0e1b6195f5774afc0ad4f8f";
+        url = "http://registry.npmjs.org/umd/-/umd-2.1.0.tgz";
+        name = "umd-2.1.0.tgz";
+        sha1 = "4a6307b762f17f02d201b5fa154e673396c263cf";
       })
     ];
     buildInputs =
@@ -18441,12 +19212,14 @@
       self.by-version."rfile"."1.0.0"
       self.by-version."ruglify"."1.0.0"
       self.by-version."through"."2.3.4"
-      self.by-version."uglify-js"."2.4.13"
+      self.by-version."uglify-js"."2.4.15"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "umd" ];
   };
+  by-spec."umd"."~2.1.0" =
+    self.by-version."umd"."2.1.0";
   by-spec."underscore"."*" =
     self.by-version."underscore"."1.6.0";
   by-version."underscore"."1.6.0" = lib.makeOverridable self.buildNodePackage {
@@ -18467,7 +19240,17 @@
     passthru.names = [ "underscore" ];
   };
   "underscore" = self.by-version."underscore"."1.6.0";
-  by-spec."underscore"."1.4.x" =
+  by-spec."underscore"."1.6.x" =
+    self.by-version."underscore"."1.6.0";
+  by-spec."underscore".">= 1.3.0" =
+    self.by-version."underscore"."1.6.0";
+  by-spec."underscore".">=1.1.7" =
+    self.by-version."underscore"."1.6.0";
+  by-spec."underscore".">=1.3.1" =
+    self.by-version."underscore"."1.6.0";
+  by-spec."underscore".">=1.5.0" =
+    self.by-version."underscore"."1.6.0";
+  by-spec."underscore"."~1.4.3" =
     self.by-version."underscore"."1.4.4";
   by-version."underscore"."1.4.4" = lib.makeOverridable self.buildNodePackage {
     name = "node-underscore-1.4.4";
@@ -18486,19 +19269,9 @@
     ];
     passthru.names = [ "underscore" ];
   };
-  by-spec."underscore".">=1.1.7" =
-    self.by-version."underscore"."1.6.0";
-  by-spec."underscore".">=1.3.1" =
-    self.by-version."underscore"."1.6.0";
-  by-spec."underscore".">=1.5.0" =
-    self.by-version."underscore"."1.6.0";
-  by-spec."underscore"."~1.4" =
-    self.by-version."underscore"."1.4.4";
-  by-spec."underscore"."~1.4.3" =
-    self.by-version."underscore"."1.4.4";
   by-spec."underscore"."~1.4.4" =
     self.by-version."underscore"."1.4.4";
-  by-spec."underscore"."~1.5" =
+  by-spec."underscore"."~1.5.2" =
     self.by-version."underscore"."1.5.2";
   by-version."underscore"."1.5.2" = lib.makeOverridable self.buildNodePackage {
     name = "node-underscore-1.5.2";
@@ -18517,8 +19290,6 @@
     ];
     passthru.names = [ "underscore" ];
   };
-  by-spec."underscore"."~1.5.2" =
-    self.by-version."underscore"."1.5.2";
   by-spec."underscore.string"."~2.2.1" =
     self.by-version."underscore.string"."2.2.1";
   by-version."underscore.string"."2.2.1" = lib.makeOverridable self.buildNodePackage {
@@ -18575,92 +19346,107 @@
     deps = [
       self.by-version."diff"."1.0.8"
       self.by-version."jsesc"."0.4.3"
-      self.by-version."ministyle"."0.1.3"
+      self.by-version."ministyle"."0.1.4"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "unfunk-diff" ];
   };
   by-spec."ungit"."*" =
-    self.by-version."ungit"."0.8.0";
-  by-version."ungit"."0.8.0" = lib.makeOverridable self.buildNodePackage {
-    name = "ungit-0.8.0";
+    self.by-version."ungit"."0.8.2";
+  by-version."ungit"."0.8.2" = lib.makeOverridable self.buildNodePackage {
+    name = "ungit-0.8.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/ungit/-/ungit-0.8.0.tgz";
-        name = "ungit-0.8.0.tgz";
-        sha1 = "ca1f166ee65fbfe54469459d51f77ca502f1c6a4";
+        url = "http://registry.npmjs.org/ungit/-/ungit-0.8.2.tgz";
+        name = "ungit-0.8.2.tgz";
+        sha1 = "11fe51329ab2aaafaccd155eb0c911a90036b27f";
       })
     ];
     buildInputs =
       (self.nativeDeps."ungit" or []);
     deps = [
-      self.by-version."express"."4.0.0"
-      self.by-version."superagent"."0.17.0"
+      self.by-version."express"."4.4.5"
+      self.by-version."superagent"."0.18.2"
       self.by-version."lodash"."2.4.1"
-      self.by-version."temp"."0.7.0"
-      self.by-version."socket.io"."0.9.16"
-      self.by-version."moment"."2.5.1"
-      self.by-version."async"."0.6.2"
-      self.by-version."rc"."0.3.5"
+      self.by-version."temp"."0.8.1"
+      self.by-version."socket.io"."0.9.17"
+      self.by-version."moment"."2.7.0"
+      self.by-version."async"."0.9.0"
+      self.by-version."rc"."0.4.0"
       self.by-version."uuid"."1.4.1"
       self.by-version."winston"."0.7.3"
       self.by-version."passport"."0.2.0"
       self.by-version."passport-local"."1.0.0"
-      self.by-version."semver"."2.2.1"
+      self.by-version."semver"."2.3.2"
       self.by-version."forever-monitor"."1.1.0"
-      self.by-version."open"."0.0.4"
+      self.by-version."open"."0.0.5"
       self.by-version."optimist"."0.6.1"
       self.by-version."crossroads"."0.12.0"
       self.by-version."signals"."1.0.0"
       self.by-version."hasher"."1.2.0"
       self.by-version."blueimp-md5"."1.1.0"
-      self.by-version."color"."0.5.0"
-      self.by-version."keen.io"."0.0.4"
+      self.by-version."color"."0.6.0"
+      self.by-version."keen.io"."0.1.2"
       self.by-version."getmac"."1.0.6"
-      self.by-version."deep-extend"."0.2.8"
-      self.by-version."raven"."0.6.3"
+      self.by-version."deep-extend"."0.2.11"
+      self.by-version."raven"."0.7.0"
       self.by-version."knockout"."3.1.0"
-      self.by-version."npm-registry-client"."0.4.7"
-      self.by-version."npmconf"."0.1.14"
-      self.by-version."mkdirp"."0.3.5"
-      self.by-version."less"."1.7.0"
-      self.by-version."browserify"."3.38.1"
-      self.by-version."body-parser"."1.0.2"
-      self.by-version."cookie-parser"."1.0.1"
-      self.by-version."express-session"."1.0.3"
-      self.by-version."serve-static"."1.0.4"
+      self.by-version."npm-registry-client"."3.0.6"
+      self.by-version."npmconf"."2.0.5"
+      self.by-version."mkdirp"."0.5.0"
+      self.by-version."body-parser"."1.4.3"
+      self.by-version."cookie-parser"."1.3.2"
+      self.by-version."express-session"."1.6.5"
+      self.by-version."serve-static"."1.3.2"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "ungit" ];
   };
-  "ungit" = self.by-version."ungit"."0.8.0";
-  by-spec."update-notifier"."~0.1.3" =
-    self.by-version."update-notifier"."0.1.8";
-  by-version."update-notifier"."0.1.8" = lib.makeOverridable self.buildNodePackage {
-    name = "node-update-notifier-0.1.8";
+  "ungit" = self.by-version."ungit"."0.8.2";
+  by-spec."unique-stream"."^1.0.0" =
+    self.by-version."unique-stream"."1.0.0";
+  by-version."unique-stream"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-unique-stream-1.0.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/update-notifier/-/update-notifier-0.1.8.tgz";
-        name = "update-notifier-0.1.8.tgz";
-        sha1 = "ebf5c698375f5c232031a419634fab66cc0322a6";
+        url = "http://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz";
+        name = "unique-stream-1.0.0.tgz";
+        sha1 = "d59a4a75427447d9aa6c91e70263f8d26a4b104b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."unique-stream" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "unique-stream" ];
+  };
+  by-spec."update-notifier"."~0.1.8" =
+    self.by-version."update-notifier"."0.1.10";
+  by-version."update-notifier"."0.1.10" = lib.makeOverridable self.buildNodePackage {
+    name = "node-update-notifier-0.1.10";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/update-notifier/-/update-notifier-0.1.10.tgz";
+        name = "update-notifier-0.1.10.tgz";
+        sha1 = "215cbe1053369f0d4a44f84b51eba7cb80484695";
       })
     ];
     buildInputs =
       (self.nativeDeps."update-notifier" or []);
     deps = [
-      self.by-version."request"."2.27.0"
-      self.by-version."configstore"."0.2.3"
-      self.by-version."semver"."2.1.0"
       self.by-version."chalk"."0.4.0"
+      self.by-version."configstore"."0.3.1"
+      self.by-version."request"."2.40.0"
+      self.by-version."semver"."2.3.2"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "update-notifier" ];
   };
-  by-spec."update-notifier"."~0.1.7" =
-    self.by-version."update-notifier"."0.1.8";
   by-spec."url"."~0.10.1" =
     self.by-version."url"."0.10.1";
   by-version."url"."0.10.1" = lib.makeOverridable self.buildNodePackage {
@@ -18681,36 +19467,15 @@
     ];
     passthru.names = [ "url" ];
   };
-  by-spec."url"."~0.7.9" =
-    self.by-version."url"."0.7.9";
-  by-version."url"."0.7.9" = lib.makeOverridable self.buildNodePackage {
-    name = "node-url-0.7.9";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/url/-/url-0.7.9.tgz";
-        name = "url-0.7.9.tgz";
-        sha1 = "1959b1a8b361fc017b59513a7c7fa9827f5e4ed0";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."url" or []);
-    deps = [
-      self.by-version."querystring"."0.1.0"
-      self.by-version."punycode"."1.0.0"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "url" ];
-  };
   by-spec."useragent"."~2.0.4" =
-    self.by-version."useragent"."2.0.8";
-  by-version."useragent"."2.0.8" = lib.makeOverridable self.buildNodePackage {
-    name = "node-useragent-2.0.8";
+    self.by-version."useragent"."2.0.9";
+  by-version."useragent"."2.0.9" = lib.makeOverridable self.buildNodePackage {
+    name = "node-useragent-2.0.9";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/useragent/-/useragent-2.0.8.tgz";
-        name = "useragent-2.0.8.tgz";
-        sha1 = "32caa86d3f404e92d7d4183831dd103ebc1a3125";
+        url = "http://registry.npmjs.org/useragent/-/useragent-2.0.9.tgz";
+        name = "useragent-2.0.9.tgz";
+        sha1 = "98c53e8b1c0191a3e4d0ad9d8153f19a5d453ac5";
       })
     ];
     buildInputs =
@@ -18722,25 +19487,6 @@
     ];
     passthru.names = [ "useragent" ];
   };
-  by-spec."userhome"."~0.1.0" =
-    self.by-version."userhome"."0.1.0";
-  by-version."userhome"."0.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-userhome-0.1.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/userhome/-/userhome-0.1.0.tgz";
-        name = "userhome-0.1.0.tgz";
-        sha1 = "bd2067d90b3f7ac6c026d87612c579d88fb89f86";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."userhome" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "userhome" ];
-  };
   by-spec."util"."0.10.2" =
     self.by-version."util"."0.10.2";
   by-version."util"."0.10.2" = lib.makeOverridable self.buildNodePackage {
@@ -18839,7 +19585,7 @@
       self.by-version."async"."0.1.22"
       self.by-version."deep-equal"."0.2.1"
       self.by-version."i"."0.3.2"
-      self.by-version."mkdirp"."0.3.5"
+      self.by-version."mkdirp"."0.5.0"
       self.by-version."ncp"."0.2.7"
       self.by-version."rimraf"."1.0.9"
     ];
@@ -18864,9 +19610,9 @@
       self.by-version."async"."0.2.10"
       self.by-version."deep-equal"."0.2.1"
       self.by-version."i"."0.3.2"
-      self.by-version."mkdirp"."0.3.5"
+      self.by-version."mkdirp"."0.5.0"
       self.by-version."ncp"."0.4.2"
-      self.by-version."rimraf"."2.2.6"
+      self.by-version."rimraf"."2.2.8"
     ];
     peerDependencies = [
     ];
@@ -18874,8 +19620,6 @@
   };
   by-spec."utile"."0.2.x" =
     self.by-version."utile"."0.2.1";
-  by-spec."utile"."~0.1.7" =
-    self.by-version."utile"."0.1.7";
   by-spec."utile"."~0.2.1" =
     self.by-version."utile"."0.2.1";
   by-spec."utils-merge"."1.0.0" =
@@ -18916,8 +19660,6 @@
     ];
     passthru.names = [ "uuid" ];
   };
-  by-spec."uuid"."~1.4.0" =
-    self.by-version."uuid"."1.4.1";
   by-spec."uuid"."~1.4.1" =
     self.by-version."uuid"."1.4.1";
   by-spec."validator"."0.4.x" =
@@ -18958,6 +19700,46 @@
     ];
     passthru.names = [ "vargs" ];
   };
+  by-spec."vary"."0.1.0" =
+    self.by-version."vary"."0.1.0";
+  by-version."vary"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-vary-0.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/vary/-/vary-0.1.0.tgz";
+        name = "vary-0.1.0.tgz";
+        sha1 = "df0945899e93c0cc5bd18cc8321d9d21e74f6176";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."vary" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "vary" ];
+  };
+  by-spec."vary"."~0.1.0" =
+    self.by-version."vary"."0.1.0";
+  by-spec."vary"."~1.0.0" =
+    self.by-version."vary"."1.0.0";
+  by-version."vary"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-vary-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/vary/-/vary-1.0.0.tgz";
+        name = "vary-1.0.0.tgz";
+        sha1 = "c5e76cec20d3820d8f2a96e7bee38731c34da1e7";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."vary" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "vary" ];
+  };
   by-spec."vasync"."1.3.3" =
     self.by-version."vasync"."1.3.3";
   by-version."vasync"."1.3.3" = lib.makeOverridable self.buildNodePackage {
@@ -18979,6 +19761,27 @@
     ];
     passthru.names = [ "vasync" ];
   };
+  by-spec."vasync"."1.4.3" =
+    self.by-version."vasync"."1.4.3";
+  by-version."vasync"."1.4.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-vasync-1.4.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/vasync/-/vasync-1.4.3.tgz";
+        name = "vasync-1.4.3.tgz";
+        sha1 = "c86d52e2b71613d29eedf159f3135dbe749cee37";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."vasync" or []);
+    deps = [
+      self.by-version."jsprim"."0.3.0"
+      self.by-version."verror"."1.1.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "vasync" ];
+  };
   by-spec."verror"."1.1.0" =
     self.by-version."verror"."1.1.0";
   by-version."verror"."1.1.0" = lib.makeOverridable self.buildNodePackage {
@@ -19039,15 +19842,15 @@
     ];
     passthru.names = [ "verror" ];
   };
-  by-spec."vhost"."1.0.0" =
-    self.by-version."vhost"."1.0.0";
-  by-version."vhost"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-vhost-1.0.0";
+  by-spec."vhost"."2.0.0" =
+    self.by-version."vhost"."2.0.0";
+  by-version."vhost"."2.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-vhost-2.0.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/vhost/-/vhost-1.0.0.tgz";
-        name = "vhost-1.0.0.tgz";
-        sha1 = "654513f289a4f898aab745bbd633e40180c9c4c0";
+        url = "http://registry.npmjs.org/vhost/-/vhost-2.0.0.tgz";
+        name = "vhost-2.0.0.tgz";
+        sha1 = "1e26770bd0fce86c40945591e6f284c6891791e2";
       })
     ];
     buildInputs =
@@ -19059,14 +19862,14 @@
     passthru.names = [ "vhost" ];
   };
   by-spec."view-helpers"."*" =
-    self.by-version."view-helpers"."0.1.4";
-  by-version."view-helpers"."0.1.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-view-helpers-0.1.4";
+    self.by-version."view-helpers"."0.1.5";
+  by-version."view-helpers"."0.1.5" = lib.makeOverridable self.buildNodePackage {
+    name = "node-view-helpers-0.1.5";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/view-helpers/-/view-helpers-0.1.4.tgz";
-        name = "view-helpers-0.1.4.tgz";
-        sha1 = "aeadfbcc2c21343d2b0ef4d4f20f805764286cee";
+        url = "http://registry.npmjs.org/view-helpers/-/view-helpers-0.1.5.tgz";
+        name = "view-helpers-0.1.5.tgz";
+        sha1 = "175d220a6afeca8e3b497b003e2337bcc596f761";
       })
     ];
     buildInputs =
@@ -19077,7 +19880,75 @@
     ];
     passthru.names = [ "view-helpers" ];
   };
-  "view-helpers" = self.by-version."view-helpers"."0.1.4";
+  "view-helpers" = self.by-version."view-helpers"."0.1.5";
+  by-spec."vinyl"."^0.2.3" =
+    self.by-version."vinyl"."0.2.3";
+  by-version."vinyl"."0.2.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-vinyl-0.2.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/vinyl/-/vinyl-0.2.3.tgz";
+        name = "vinyl-0.2.3.tgz";
+        sha1 = "bca938209582ec5a49ad538a00fa1f125e513252";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."vinyl" or []);
+    deps = [
+      self.by-version."clone-stats"."0.0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "vinyl" ];
+  };
+  by-spec."vinyl"."^0.3.2" =
+    self.by-version."vinyl"."0.3.2";
+  by-version."vinyl"."0.3.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-vinyl-0.3.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/vinyl/-/vinyl-0.3.2.tgz";
+        name = "vinyl-0.3.2.tgz";
+        sha1 = "2b422d7c5ff0abc0d22d90ed2275e409dab5e174";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."vinyl" or []);
+    deps = [
+      self.by-version."clone-stats"."0.0.1"
+      self.by-version."lodash"."2.4.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "vinyl" ];
+  };
+  by-spec."vinyl-fs"."^0.3.3" =
+    self.by-version."vinyl-fs"."0.3.6";
+  by-version."vinyl-fs"."0.3.6" = lib.makeOverridable self.buildNodePackage {
+    name = "node-vinyl-fs-0.3.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.6.tgz";
+        name = "vinyl-fs-0.3.6.tgz";
+        sha1 = "c96985527cd53eb4a3eeb8ffb3180bda3084ecfc";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."vinyl-fs" or []);
+    deps = [
+      self.by-version."glob-stream"."3.1.15"
+      self.by-version."glob-watcher"."0.0.6"
+      self.by-version."graceful-fs"."3.0.2"
+      self.by-version."lodash"."2.4.1"
+      self.by-version."mkdirp"."0.5.0"
+      self.by-version."strip-bom"."0.3.1"
+      self.by-version."through2"."0.5.1"
+      self.by-version."vinyl"."0.3.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "vinyl-fs" ];
+  };
   by-spec."vm-browserify"."~0.0.1" =
     self.by-version."vm-browserify"."0.0.4";
   by-version."vm-browserify"."0.0.4" = lib.makeOverridable self.buildNodePackage {
@@ -19120,26 +19991,26 @@
     passthru.names = [ "vows" ];
   };
   by-spec."walk"."*" =
-    self.by-version."walk"."2.3.1";
-  by-version."walk"."2.3.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-walk-2.3.1";
+    self.by-version."walk"."2.3.3";
+  by-version."walk"."2.3.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-walk-2.3.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/walk/-/walk-2.3.1.tgz";
-        name = "walk-2.3.1.tgz";
-        sha1 = "015e0ef7a636ac43185661a9673d459572a44050";
+        url = "http://registry.npmjs.org/walk/-/walk-2.3.3.tgz";
+        name = "walk-2.3.3.tgz";
+        sha1 = "b4c0e8c42464c16dbbe1d71666765eac07819e5f";
       })
     ];
     buildInputs =
       (self.nativeDeps."walk" or []);
     deps = [
-      self.by-version."forEachAsync"."2.2.1"
+      self.by-version."foreachasync"."3.0.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "walk" ];
   };
-  "walk" = self.by-version."walk"."2.3.1";
+  "walk" = self.by-version."walk"."2.3.3";
   by-spec."walk"."~2.2.1" =
     self.by-version."walk"."2.2.1";
   by-version."walk"."2.2.1" = lib.makeOverridable self.buildNodePackage {
@@ -19198,41 +20069,62 @@
     ];
     passthru.names = [ "watch" ];
   };
-  by-spec."wd"."~0.2.12" =
-    self.by-version."wd"."0.2.19";
-  by-version."wd"."0.2.19" = lib.makeOverridable self.buildNodePackage {
-    name = "wd-0.2.19";
+  by-spec."wcwidth.js"."~0.0.4" =
+    self.by-version."wcwidth.js"."0.0.4";
+  by-version."wcwidth.js"."0.0.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-wcwidth.js-0.0.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/wd/-/wd-0.2.19.tgz";
-        name = "wd-0.2.19.tgz";
-        sha1 = "347ae75adebc15ad642baec118742344d749f169";
+        url = "http://registry.npmjs.org/wcwidth.js/-/wcwidth.js-0.0.4.tgz";
+        name = "wcwidth.js-0.0.4.tgz";
+        sha1 = "44298a7c899c17501990fdaddd76ef6bd081be75";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."wcwidth.js" or []);
+    deps = [
+      self.by-version."underscore"."1.6.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "wcwidth.js" ];
+  };
+  by-spec."wd"."~0.3.4" =
+    self.by-version."wd"."0.3.4";
+  by-version."wd"."0.3.4" = lib.makeOverridable self.buildNodePackage {
+    name = "wd-0.3.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/wd/-/wd-0.3.4.tgz";
+        name = "wd-0.3.4.tgz";
+        sha1 = "da95a0998eb8acfd297e3a9baf28f610b6345543";
       })
     ];
     buildInputs =
       (self.nativeDeps."wd" or []);
     deps = [
-      self.by-version."async"."0.2.10"
-      self.by-version."vargs"."0.1.0"
-      self.by-version."q"."1.0.1"
-      self.by-version."request"."2.33.0"
-      self.by-version."archiver"."0.5.2"
+      self.by-version."archiver"."0.10.1"
+      self.by-version."async"."0.9.0"
+      self.by-version."colors"."0.6.2"
       self.by-version."lodash"."2.4.1"
+      self.by-version."q"."1.0.1"
+      self.by-version."request"."2.37.0"
       self.by-version."underscore.string"."2.3.3"
+      self.by-version."vargs"."0.1.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "wd" ];
   };
   by-spec."weak-map"."^1.0.4" =
-    self.by-version."weak-map"."1.0.4";
-  by-version."weak-map"."1.0.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-weak-map-1.0.4";
+    self.by-version."weak-map"."1.0.5";
+  by-version."weak-map"."1.0.5" = lib.makeOverridable self.buildNodePackage {
+    name = "node-weak-map-1.0.5";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/weak-map/-/weak-map-1.0.4.tgz";
-        name = "weak-map-1.0.4.tgz";
-        sha1 = "1acddee2cc90eb30950860b7415c79cefc5f07c9";
+        url = "http://registry.npmjs.org/weak-map/-/weak-map-1.0.5.tgz";
+        name = "weak-map-1.0.5.tgz";
+        sha1 = "79691584d98607f5070bd3b70a40e6bb22e401eb";
       })
     ];
     buildInputs =
@@ -19244,14 +20136,14 @@
     passthru.names = [ "weak-map" ];
   };
   by-spec."webdrvr"."*" =
-    self.by-version."webdrvr"."2.40.0";
-  by-version."webdrvr"."2.40.0" = lib.makeOverridable self.buildNodePackage {
-    name = "webdrvr-2.40.0";
+    self.by-version."webdrvr"."2.41.0-0";
+  by-version."webdrvr"."2.41.0-0" = lib.makeOverridable self.buildNodePackage {
+    name = "webdrvr-2.41.0-0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/webdrvr/-/webdrvr-2.40.0.tgz";
-        name = "webdrvr-2.40.0.tgz";
-        sha1 = "689f5d3fad5008ffc7b273d607eea9dd7d26ca42";
+        url = "http://registry.npmjs.org/webdrvr/-/webdrvr-2.41.0-0.tgz";
+        name = "webdrvr-2.41.0-0.tgz";
+        sha1 = "c74f22b27f0778d0c2b7e5cbda1edd113d782884";
       })
     ];
     buildInputs =
@@ -19260,25 +20152,25 @@
       self.by-version."adm-zip"."0.4.4"
       self.by-version."kew"."0.1.7"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."npmconf"."0.1.14"
-      self.by-version."phantomjs"."1.9.7-4"
-      self.by-version."tmp"."0.0.23"
+      self.by-version."npmconf"."0.1.16"
+      self.by-version."phantomjs"."1.9.7-15"
+      self.by-version."tmp"."0.0.24"
       self.by-version."follow-redirects"."0.0.3"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "webdrvr" ];
   };
-  "webdrvr" = self.by-version."webdrvr"."2.40.0";
-  by-spec."websocket-driver".">=0.3.0" =
-    self.by-version."websocket-driver"."0.3.2";
-  by-version."websocket-driver"."0.3.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-websocket-driver-0.3.2";
+  "webdrvr" = self.by-version."webdrvr"."2.41.0-0";
+  by-spec."websocket-driver".">=0.3.1" =
+    self.by-version."websocket-driver"."0.3.5";
+  by-version."websocket-driver"."0.3.5" = lib.makeOverridable self.buildNodePackage {
+    name = "node-websocket-driver-0.3.5";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/websocket-driver/-/websocket-driver-0.3.2.tgz";
-        name = "websocket-driver-0.3.2.tgz";
-        sha1 = "f177ef6611390e2401ae47f35e8386dda987daca";
+        url = "http://registry.npmjs.org/websocket-driver/-/websocket-driver-0.3.5.tgz";
+        name = "websocket-driver-0.3.5.tgz";
+        sha1 = "e3a51ff538f1653a49e62d78ecfc1eb1bde9e5a0";
       })
     ];
     buildInputs =
@@ -19289,8 +20181,6 @@
     ];
     passthru.names = [ "websocket-driver" ];
   };
-  by-spec."websocket-driver".">=0.3.1" =
-    self.by-version."websocket-driver"."0.3.2";
   by-spec."when"."~3.1.0" =
     self.by-version."when"."3.1.0";
   by-version."when"."3.1.0" = lib.makeOverridable self.buildNodePackage {
@@ -19439,28 +20329,6 @@
     self.by-version."winston"."0.7.3";
   by-spec."winston"."~0.7.3" =
     self.by-version."winston"."0.7.3";
-  by-spec."wiredep"."~1.0.0" =
-    self.by-version."wiredep"."1.0.0";
-  by-version."wiredep"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-wiredep-1.0.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/wiredep/-/wiredep-1.0.0.tgz";
-        name = "wiredep-1.0.0.tgz";
-        sha1 = "2e570465657b97e7494abf62978a3e52fc37ac52";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."wiredep" or []);
-    deps = [
-      self.by-version."lodash"."1.3.1"
-      self.by-version."chalk"."0.1.1"
-      self.by-version."glob"."3.2.9"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "wiredep" ];
-  };
   by-spec."with"."~1.1.0" =
     self.by-version."with"."1.1.1";
   by-version."with"."1.1.1" = lib.makeOverridable self.buildNodePackage {
@@ -19502,20 +20370,20 @@
     passthru.names = [ "with" ];
   };
   by-spec."with"."~3.0.0" =
-    self.by-version."with"."3.0.0";
-  by-version."with"."3.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-with-3.0.0";
+    self.by-version."with"."3.0.1";
+  by-version."with"."3.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-with-3.0.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/with/-/with-3.0.0.tgz";
-        name = "with-3.0.0.tgz";
-        sha1 = "38f5d5859bb974c9dad8812372b51dae4b9594cc";
+        url = "http://registry.npmjs.org/with/-/with-3.0.1.tgz";
+        name = "with-3.0.1.tgz";
+        sha1 = "08354da410243cf6173fb142bb04e6c66f96f854";
       })
     ];
     buildInputs =
       (self.nativeDeps."with" or []);
     deps = [
-      self.by-version."uglify-js"."2.4.13"
+      self.by-version."uglify-js"."2.4.15"
     ];
     peerDependencies = [
     ];
@@ -19544,25 +20412,6 @@
     self.by-version."wordwrap"."0.0.2";
   by-spec."wordwrap"."~0.0.2" =
     self.by-version."wordwrap"."0.0.2";
-  by-spec."wrench"."~1.4.3" =
-    self.by-version."wrench"."1.4.4";
-  by-version."wrench"."1.4.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-wrench-1.4.4";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/wrench/-/wrench-1.4.4.tgz";
-        name = "wrench-1.4.4.tgz";
-        sha1 = "7f523efdb71b0100e77dce834c06523cbe3d54e0";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."wrench" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "wrench" ];
-  };
   by-spec."wrench"."~1.5.0" =
     self.by-version."wrench"."1.5.8";
   by-version."wrench"."1.5.8" = lib.makeOverridable self.buildNodePackage {
@@ -19584,41 +20433,22 @@
   };
   by-spec."wrench"."~1.5.4" =
     self.by-version."wrench"."1.5.8";
-  by-spec."wru".">= 0.0.0" =
-    self.by-version."wru"."0.2.7";
-  by-version."wru"."0.2.7" = lib.makeOverridable self.buildNodePackage {
-    name = "wru-0.2.7";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/wru/-/wru-0.2.7.tgz";
-        name = "wru-0.2.7.tgz";
-        sha1 = "f6fa4fc7d54f44bec19d55c66c4667078d73062d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."wru" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "wru" ];
-  };
   by-spec."ws"."0.4.x" =
-    self.by-version."ws"."0.4.31";
-  by-version."ws"."0.4.31" = lib.makeOverridable self.buildNodePackage {
-    name = "ws-0.4.31";
+    self.by-version."ws"."0.4.32";
+  by-version."ws"."0.4.32" = lib.makeOverridable self.buildNodePackage {
+    name = "ws-0.4.32";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/ws/-/ws-0.4.31.tgz";
-        name = "ws-0.4.31.tgz";
-        sha1 = "5a4849e7a9ccd1ed5a81aeb4847c9fedf3122927";
+        url = "http://registry.npmjs.org/ws/-/ws-0.4.32.tgz";
+        name = "ws-0.4.32.tgz";
+        sha1 = "787a6154414f3c99ed83c5772153b20feb0cec32";
       })
     ];
     buildInputs =
       (self.nativeDeps."ws" or []);
     deps = [
-      self.by-version."commander"."0.6.1"
-      self.by-version."nan"."0.3.2"
+      self.by-version."commander"."2.1.0"
+      self.by-version."nan"."1.0.0"
       self.by-version."tinycolor"."0.0.1"
       self.by-version."options"."0.0.5"
     ];
@@ -19627,27 +20457,28 @@
     passthru.names = [ "ws" ];
   };
   by-spec."ws"."~0.4.31" =
-    self.by-version."ws"."0.4.31";
+    self.by-version."ws"."0.4.32";
   by-spec."wu"."*" =
-    self.by-version."wu"."0.1.8";
-  by-version."wu"."0.1.8" = lib.makeOverridable self.buildNodePackage {
-    name = "node-wu-0.1.8";
+    self.by-version."wu"."2.0.0";
+  by-version."wu"."2.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-wu-2.0.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/wu/-/wu-0.1.8.tgz";
-        name = "wu-0.1.8.tgz";
-        sha1 = "619bcdf64974a487894a25755ae095c5208b4a22";
+        url = "http://registry.npmjs.org/wu/-/wu-2.0.0.tgz";
+        name = "wu-2.0.0.tgz";
+        sha1 = "abda06a014dd1c54c2163862f5c2c5230721bc27";
       })
     ];
     buildInputs =
       (self.nativeDeps."wu" or []);
     deps = [
+      self.by-version."traceur"."0.0.55"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "wu" ];
   };
-  "wu" = self.by-version."wu"."0.1.8";
+  "wu" = self.by-version."wu"."2.0.0";
   by-spec."x509"."*" =
     self.by-version."x509"."0.0.7";
   by-version."x509"."0.0.7" = lib.makeOverridable self.buildNodePackage {
@@ -19688,49 +20519,51 @@
     ];
     passthru.names = [ "xml2js" ];
   };
-  by-spec."xml2js"."0.2.x" =
-    self.by-version."xml2js"."0.2.8";
-  by-version."xml2js"."0.2.8" = lib.makeOverridable self.buildNodePackage {
-    name = "node-xml2js-0.2.8";
+  by-spec."xml2js"."0.2.6" =
+    self.by-version."xml2js"."0.2.6";
+  by-version."xml2js"."0.2.6" = lib.makeOverridable self.buildNodePackage {
+    name = "node-xml2js-0.2.6";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/xml2js/-/xml2js-0.2.8.tgz";
-        name = "xml2js-0.2.8.tgz";
-        sha1 = "9b81690931631ff09d1957549faf54f4f980b3c2";
+        url = "http://registry.npmjs.org/xml2js/-/xml2js-0.2.6.tgz";
+        name = "xml2js-0.2.6.tgz";
+        sha1 = "d209c4e4dda1fc9c452141ef41c077f5adfdf6c4";
       })
     ];
     buildInputs =
       (self.nativeDeps."xml2js" or []);
     deps = [
-      self.by-version."sax"."0.5.8"
+      self.by-version."sax"."0.4.2"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "xml2js" ];
   };
   by-spec."xml2js".">= 0.0.1" =
-    self.by-version."xml2js"."0.4.2";
-  by-version."xml2js"."0.4.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-xml2js-0.4.2";
+    self.by-version."xml2js"."0.4.4";
+  by-version."xml2js"."0.4.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-xml2js-0.4.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/xml2js/-/xml2js-0.4.2.tgz";
-        name = "xml2js-0.4.2.tgz";
-        sha1 = "93911c393c4a332a2dce1222801eb571453b2f90";
+        url = "http://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz";
+        name = "xml2js-0.4.4.tgz";
+        sha1 = "3111010003008ae19240eba17497b57c729c555d";
       })
     ];
     buildInputs =
       (self.nativeDeps."xml2js" or []);
     deps = [
-      self.by-version."sax"."0.5.8"
-      self.by-version."xmlbuilder"."2.2.1"
+      self.by-version."sax"."0.6.0"
+      self.by-version."xmlbuilder"."2.4.3"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "xml2js" ];
   };
   by-spec."xml2js".">=0.1.7" =
-    self.by-version."xml2js"."0.4.2";
+    self.by-version."xml2js"."0.4.4";
+  by-spec."xml2js"."^0.4.4" =
+    self.by-version."xml2js"."0.4.4";
   by-spec."xmlbuilder"."0.4.2" =
     self.by-version."xmlbuilder"."0.4.2";
   by-version."xmlbuilder"."0.4.2" = lib.makeOverridable self.buildNodePackage {
@@ -19750,15 +20583,15 @@
     ];
     passthru.names = [ "xmlbuilder" ];
   };
-  by-spec."xmlbuilder".">=0.4.2" =
-    self.by-version."xmlbuilder"."2.2.1";
-  by-version."xmlbuilder"."2.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-xmlbuilder-2.2.1";
+  by-spec."xmlbuilder".">=1.0.0" =
+    self.by-version."xmlbuilder"."2.4.3";
+  by-version."xmlbuilder"."2.4.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-xmlbuilder-2.4.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.2.1.tgz";
-        name = "xmlbuilder-2.2.1.tgz";
-        sha1 = "9326430f130d87435d4c4086643aa2926e105a32";
+        url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.4.3.tgz";
+        name = "xmlbuilder-2.4.3.tgz";
+        sha1 = "0589eeee0986adf0af605e878f24ff6557d7697f";
       })
     ];
     buildInputs =
@@ -19808,7 +20641,7 @@
     ];
     passthru.names = [ "xmlhttprequest" ];
   };
-  by-spec."xoauth2"."~0.1" =
+  by-spec."xoauth2"."~0.1.8" =
     self.by-version."xoauth2"."0.1.8";
   by-version."xoauth2"."0.1.8" = lib.makeOverridable self.buildNodePackage {
     name = "node-xoauth2-0.1.8";
@@ -19827,6 +20660,46 @@
     ];
     passthru.names = [ "xoauth2" ];
   };
+  by-spec."xtend".">=4.0.0 <4.1.0-0" =
+    self.by-version."xtend"."4.0.0";
+  by-version."xtend"."4.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-xtend-4.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz";
+        name = "xtend-4.0.0.tgz";
+        sha1 = "8bc36ff87aedbe7ce9eaf0bca36b2354a743840f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."xtend" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "xtend" ];
+  };
+  by-spec."xtend"."^3.0.0" =
+    self.by-version."xtend"."3.0.0";
+  by-version."xtend"."3.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-xtend-3.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz";
+        name = "xtend-3.0.0.tgz";
+        sha1 = "5cce7407baf642cba7becda568111c493f59665a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."xtend" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "xtend" ];
+  };
+  by-spec."xtend"."^4.0.0" =
+    self.by-version."xtend"."4.0.0";
   by-spec."xtend"."~2.1.1" =
     self.by-version."xtend"."2.1.2";
   by-version."xtend"."2.1.2" = lib.makeOverridable self.buildNodePackage {
@@ -19849,144 +20722,28 @@
   };
   by-spec."xtend"."~2.1.2" =
     self.by-version."xtend"."2.1.2";
-  by-spec."yargs"."~1.1.2" =
-    self.by-version."yargs"."1.1.3";
-  by-version."yargs"."1.1.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-yargs-1.1.3";
+  by-spec."xtend"."~3.0.0" =
+    self.by-version."xtend"."3.0.0";
+  by-spec."yargs"."~1.2.1" =
+    self.by-version."yargs"."1.2.6";
+  by-version."yargs"."1.2.6" = lib.makeOverridable self.buildNodePackage {
+    name = "node-yargs-1.2.6";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/yargs/-/yargs-1.1.3.tgz";
-        name = "yargs-1.1.3.tgz";
-        sha1 = "c44ed2bb9c86d55b557f2179fea7c7013fe4c42a";
+        url = "http://registry.npmjs.org/yargs/-/yargs-1.2.6.tgz";
+        name = "yargs-1.2.6.tgz";
+        sha1 = "9c7b4a82fd5d595b2bf17ab6dcc43135432fe34b";
       })
     ];
     buildInputs =
       (self.nativeDeps."yargs" or []);
     deps = [
-      self.by-version."minimist"."0.0.8"
+      self.by-version."minimist"."0.1.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "yargs" ];
   };
-  by-spec."yeoman-generator"."~0.14.0" =
-    self.by-version."yeoman-generator"."0.14.2";
-  by-version."yeoman-generator"."0.14.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-yeoman-generator-0.14.2";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.14.2.tgz";
-        name = "yeoman-generator-0.14.2.tgz";
-        sha1 = "6d3e306d1118c83c25ac12a9d3dcb7870aa53397";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."yeoman-generator" or []);
-    deps = [
-      self.by-version."cheerio"."0.12.4"
-      self.by-version."rimraf"."2.2.6"
-      self.by-version."diff"."1.0.8"
-      self.by-version."mime"."1.2.11"
-      self.by-version."underscore.string"."2.3.3"
-      self.by-version."lodash"."2.2.1"
-      self.by-version."mkdirp"."0.3.5"
-      self.by-version."glob"."3.2.9"
-      self.by-version."debug"."0.7.4"
-      self.by-version."isbinaryfile"."0.1.9"
-      self.by-version."dargs"."0.1.0"
-      self.by-version."async"."0.2.10"
-      self.by-version."inquirer"."0.3.5"
-      self.by-version."iconv-lite"."0.2.11"
-      self.by-version."shelljs"."0.2.6"
-      self.by-version."findup-sync"."0.1.3"
-      self.by-version."chalk"."0.3.0"
-      self.by-version."text-table"."0.2.0"
-      self.by-version."download"."0.1.16"
-      self.by-version."request"."2.27.0"
-      self.by-version."file-utils"."0.1.5"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "yeoman-generator" ];
-  };
-  by-spec."yeoman-generator"."~0.16.0" =
-    self.by-version."yeoman-generator"."0.16.0";
-  by-version."yeoman-generator"."0.16.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-yeoman-generator-0.16.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.16.0.tgz";
-        name = "yeoman-generator-0.16.0.tgz";
-        sha1 = "0d1b655ea31660ab66837af1e686b795eae57c59";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."yeoman-generator" or []);
-    deps = [
-      self.by-version."cheerio"."0.13.1"
-      self.by-version."rimraf"."2.2.6"
-      self.by-version."diff"."1.0.8"
-      self.by-version."mime"."1.2.11"
-      self.by-version."underscore.string"."2.3.3"
-      self.by-version."lodash"."2.4.1"
-      self.by-version."mkdirp"."0.3.5"
-      self.by-version."glob"."3.2.9"
-      self.by-version."debug"."0.7.4"
-      self.by-version."isbinaryfile"."2.0.1"
-      self.by-version."dargs"."0.1.0"
-      self.by-version."async"."0.2.10"
-      self.by-version."inquirer"."0.4.1"
-      self.by-version."iconv-lite"."0.2.11"
-      self.by-version."shelljs"."0.2.6"
-      self.by-version."findup-sync"."0.1.3"
-      self.by-version."chalk"."0.4.0"
-      self.by-version."text-table"."0.2.0"
-      self.by-version."download"."0.1.16"
-      self.by-version."request"."2.30.0"
-      self.by-version."file-utils"."0.1.5"
-      self.by-version."class-extend"."0.1.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "yeoman-generator" ];
-  };
-  by-spec."yo"."*" =
-    self.by-version."yo"."1.1.2";
-  by-version."yo"."1.1.2" = lib.makeOverridable self.buildNodePackage {
-    name = "yo-1.1.2";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/yo/-/yo-1.1.2.tgz";
-        name = "yo-1.1.2.tgz";
-        sha1 = "a0d4da72e83fa0e0dbfe1d0ba258881b240ab854";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."yo" or []);
-    deps = [
-      self.by-version."yeoman-generator"."0.16.0"
-      self.by-version."nopt"."2.1.2"
-      self.by-version."lodash"."2.4.1"
-      self.by-version."update-notifier"."0.1.8"
-      self.by-version."insight"."0.3.1"
-      self.by-version."sudo-block"."0.3.0"
-      self.by-version."async"."0.2.10"
-      self.by-version."open"."0.0.4"
-      self.by-version."chalk"."0.4.0"
-      self.by-version."findup"."0.1.5"
-      self.by-version."shelljs"."0.2.6"
-    ];
-    peerDependencies = [
-      self.by-version."grunt-cli"."0.1.13"
-      self.by-version."bower"."1.3.2"
-    ];
-    passthru.names = [ "yo" ];
-  };
-  "yo" = self.by-version."yo"."1.1.2";
-  by-spec."yo".">=1.0.0" =
-    self.by-version."yo"."1.1.2";
-  by-spec."yo".">=1.0.0-rc.1.1" =
-    self.by-version."yo"."1.1.2";
   by-spec."zeparser"."0.0.5" =
     self.by-version."zeparser"."0.0.5";
   by-version."zeparser"."0.0.5" = lib.makeOverridable self.buildNodePackage {
@@ -20006,22 +20763,26 @@
     ];
     passthru.names = [ "zeparser" ];
   };
-  by-spec."zip-stream"."~0.1.0" =
-    self.by-version."zip-stream"."0.1.4";
-  by-version."zip-stream"."0.1.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-zip-stream-0.1.4";
+  by-spec."zip-stream"."~0.3.0" =
+    self.by-version."zip-stream"."0.3.7";
+  by-version."zip-stream"."0.3.7" = lib.makeOverridable self.buildNodePackage {
+    name = "node-zip-stream-0.3.7";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/zip-stream/-/zip-stream-0.1.4.tgz";
-        name = "zip-stream-0.1.4.tgz";
-        sha1 = "fe5b565bc366b8d73d5d4c1606e07c8947de1654";
+        url = "http://registry.npmjs.org/zip-stream/-/zip-stream-0.3.7.tgz";
+        name = "zip-stream-0.3.7.tgz";
+        sha1 = "c84d057eb0bcc0139747bd3c6c97280bcf5f2bb2";
       })
     ];
     buildInputs =
       (self.nativeDeps."zip-stream" or []);
     deps = [
-      self.by-version."readable-stream"."1.0.27-1"
-      self.by-version."lodash.defaults"."2.4.1"
+      self.by-version."buffer-crc32"."0.2.3"
+      self.by-version."crc32-stream"."0.2.0"
+      self.by-version."debug"."1.0.4"
+      self.by-version."deflate-crc32-stream"."0.1.1"
+      self.by-version."lodash"."2.4.1"
+      self.by-version."readable-stream"."1.0.31"
     ];
     peerDependencies = [
     ];
@@ -20047,6 +20808,4 @@
     ];
     passthru.names = [ "zlib-browserify" ];
   };
-  by-spec."zlib-browserify"."~0.0.3" =
-    self.by-version."zlib-browserify"."0.0.3";
 }
diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json
index 4d220a008290..fec7884eb251 100644
--- a/pkgs/top-level/node-packages.json
+++ b/pkgs/top-level/node-packages.json
@@ -69,16 +69,12 @@
 , "flatiron"
 , "ironhorse"
 , "fs-walk"
-, "yo"
-, "generator-webapp"
-, "generator-angular"
 , "statsd"
 , "statsd-librato-backend"
 , "stackdriver-statsd-backend"
 , "ungit"
 , { "node-uptime": "https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7" }
 , { "guifi-earth": "https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " }
-, "bower"
 , "grunt-cli"
 , "grunt-contrib-jshint"
 , "grunt-contrib-requirejs"
@@ -86,7 +82,6 @@
 , "grunt-contrib-cssmin"
 , "grunt-contrib-uglify"
 , "grunt-karma"
-, "grunt-bower-task"
 , "grunt-sed"
 , "karma"
 , "karma-mocha"
@@ -114,10 +109,7 @@
 , "posix"
 , "node-protobuf"
 , "rethinkdb"
-, "bower2nix"
-, "fetch-bower"
 , { "titanium": "3.2.1" }
-, "gh"
 , "deepmerge"
 , "slasp"
 , "react"

From 49fcac0d6b064d99ae00692763f6c638129b66d3 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Tue, 19 Aug 2014 10:40:17 -0300
Subject: [PATCH 0287/1453] Fluxbox: adding system support (as a module)

---
 nixos/modules/module-list.nix                 |  1 +
 .../services/x11/window-managers/fluxbox.nix  | 28 +++++++++++++++++++
 .../window-managers/fluxbox/default.nix       | 10 ++-----
 3 files changed, 31 insertions(+), 8 deletions(-)
 create mode 100644 nixos/modules/services/x11/window-managers/fluxbox.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 453899175e01..5b1b008a270c 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -293,6 +293,7 @@
   ./services/x11/window-managers/awesome.nix
   #./services/x11/window-managers/compiz.nix
   ./services/x11/window-managers/default.nix
+  ./services/x11/window-managers/fluxbox.nix
   ./services/x11/window-managers/icewm.nix
   ./services/x11/window-managers/bspwm.nix
   ./services/x11/window-managers/metacity.nix
diff --git a/nixos/modules/services/x11/window-managers/fluxbox.nix b/nixos/modules/services/x11/window-managers/fluxbox.nix
new file mode 100644
index 000000000000..4748ce99ccf2
--- /dev/null
+++ b/nixos/modules/services/x11/window-managers/fluxbox.nix
@@ -0,0 +1,28 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.xserver.windowManager.fluxbox;
+in
+{
+  ###### interface
+  options = {
+    services.xserver.windowManager.fluxbox.enable = mkOption {
+      default = false;
+      description = "Enable the Fluxbox window manager.";
+    };
+  };
+
+  ###### implementation
+  config = mkIf cfg.enable {
+    services.xserver.windowManager.session = singleton {
+      name = "fluxbox";
+      start = ''
+        ${pkgs.fluxbox}/bin/startfluxbox &
+        waitPID=$!
+      '';
+    };
+    environment.systemPackages = [ pkgs.fluxbox ];
+  };
+}
diff --git a/pkgs/applications/window-managers/fluxbox/default.nix b/pkgs/applications/window-managers/fluxbox/default.nix
index 6c91e773376f..af6545b61515 100644
--- a/pkgs/applications/window-managers/fluxbox/default.nix
+++ b/pkgs/applications/window-managers/fluxbox/default.nix
@@ -10,13 +10,7 @@ stdenv.mkDerivation rec {
   name = "fluxbox-${version}";
   version = "1.3.5";
 
-  buildInputs = [
-    pkgconfig
-    freetype fribidi
-    libXext libXft libXpm libXrandr libXrender xextproto
-    libXinerama
-    imlib2
-  ];
+  buildInputs = [ pkgconfig freetype fribidi libXext libXft libXpm libXrandr libXrender xextproto libXinerama imlib2 ];
 
   src = fetchurl {
     url = "mirror://sourceforge/fluxbox/${name}.tar.bz2";
@@ -24,7 +18,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = {
-    description = "Full-featured, light-resource X window manager.";
+    description = "Full-featured, light-resource X window manager";
     longDescription = ''
       Fluxbox is a X window manager based on Blackbox 0.61.1 window manager sources.
       It is very light on resources and easy to handle but yet full of features to make an easy,

From 8fb6a25c6bc4ff1f96b015b2dfe7a84e949f9be1 Mon Sep 17 00:00:00 2001
From: Hoang Xuan Phu <phuhimself@phunehehe.net>
Date: Thu, 21 Aug 2014 18:04:25 +0800
Subject: [PATCH 0288/1453] generate reserve using cabal2nix

---
 .../libraries/haskell/reserve/default.nix     | 21 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/reserve/default.nix

diff --git a/pkgs/development/libraries/haskell/reserve/default.nix b/pkgs/development/libraries/haskell/reserve/default.nix
new file mode 100644
index 000000000000..6d3bda1d3e01
--- /dev/null
+++ b/pkgs/development/libraries/haskell/reserve/default.nix
@@ -0,0 +1,21 @@
+{ cabal, baseCompat, hspec, httpConduit, httpKit, httpTypes
+, network, QuickCheck, warp
+}:
+
+cabal.mkDerivation (self: {
+  pname = "reserve";
+  version = "0.0.0";
+  sha256 = "06rj1dh8lsfbmfkslyhqc031abrz2qw780i8w2c5pc146938pdi3";
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [ baseCompat httpKit httpTypes network ];
+  testDepends = [
+    baseCompat hspec httpConduit httpKit httpTypes network QuickCheck
+    warp
+  ];
+  meta = {
+    description = "Reserve reloads web applications";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index be427ec90e8a..acf164d57c7a 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2006,6 +2006,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   ranges = callPackage ../development/libraries/haskell/ranges {};
 
+  reserve = callPackage ../development/libraries/haskell/reserve {};
+
   rvar = callPackage ../development/libraries/haskell/rvar {};
 
   reactiveBanana = callPackage ../development/libraries/haskell/reactive-banana {};

From 6a78135865247e9a93d035569aacffbbdc64969b Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Sun, 10 Aug 2014 21:06:39 -0300
Subject: [PATCH 0289/1453] Bochs: update to version 2.6.6

---
 .../virtualization/bochs/default.nix            | 17 ++++++++++-------
 pkgs/top-level/all-packages.nix                 |  2 +-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix
index 75afcb41f808..74ce7bdfcaa6 100644
--- a/pkgs/applications/virtualization/bochs/default.nix
+++ b/pkgs/applications/virtualization/bochs/default.nix
@@ -1,34 +1,34 @@
 { stdenv, fetchurl
+, pkgconfig, gtk
 , libX11 , mesa
 , sdlSupport ? true, SDL ? null
 , termSupport ? true , ncurses ? null, readline ? null
-, wxSupport ? true , gtk ? null , wxGTK ? null , pkgconfig ? null
+, wxSupport ? false, wxGTK ? null
 , wgetSupport ? false, wget ? null
 , curlSupport ? false, curl ? null
 }:
 
-
 assert sdlSupport -> (SDL != null);
 assert termSupport -> (ncurses != null&& readline != null);
-assert wxSupport -> (gtk != null && wxGTK != null && pkgconfig != null);
+assert wxSupport -> (gtk != null && wxGTK != null);
 assert wgetSupport -> (wget != null);
 assert curlSupport -> (curl != null);
 
 stdenv.mkDerivation rec {
 
   name = "bochs-${version}";
-  version = "2.6.2";
+  version = "2.6.6";
 
   src = fetchurl {
     url = "http://downloads.sourceforge.net/project/bochs/bochs/${version}/${name}.tar.gz";
-    sha256 = "042blm1xb9ig4fh2bv8nrrfpgkcxy4hq8yrkx7mrdpm5g4mvfwyr";
+    sha256 = "0nlrl218x93vz97n46aw2szsalx97r020mn43fjsif100v7zix6f";
   };
 
   buildInputs = with stdenv.lib;
-  [ libX11 mesa ]
+  [ pkgconfig gtk libX11 mesa ]
   ++ optionals sdlSupport [ SDL ]
   ++ optionals termSupport [ readline ncurses ]
-  ++ optionals wxSupport [ gtk wxGTK pkgconfig ]
+  ++ optionals wxSupport [ wxGTK ]
   ++ optionals wgetSupport [ wget ]
   ++ optionals curlSupport [ curl ];
 
@@ -50,6 +50,8 @@ stdenv.mkDerivation rec {
     --enable-pnic
 '';
 
+  NIX_CFLAGS_COMPILE="-I${gtk}/include/gtk-2.0/";
+	
   meta = {
     description = "An open-source IA-32 (x86) PC emulator";
     longDescription = ''
@@ -61,3 +63,4 @@ stdenv.mkDerivation rec {
     platforms = stdenv.lib.platforms.linux;
   };
 }
+# TODO: study config.bochs.* implementation (like config.ffmpeg.* options)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1c061bd8d3d2..945900a4a0ff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -579,7 +579,7 @@ let
 
   bmon = callPackage ../tools/misc/bmon { };
 
-  bochs = callPackage ../applications/virtualization/bochs { };
+  bochs = callPackage ../applications/virtualization/bochs { wxSupport = false; };
 
   boomerang = callPackage ../development/tools/boomerang { };
 

From 10ba4b67e4892cccf629a64884980a25fa89b541 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Thu, 21 Aug 2014 12:45:28 +0200
Subject: [PATCH 0290/1453] Emacs: Use gnutls instead of OpenSSL.

It looks like this error was introduced accidentally with 0132e1b. Emacs
can't use openssl to make secure connections.
---
 pkgs/applications/editors/emacs-24/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix
index 329fa3a5626e..3bfee481c9c0 100644
--- a/pkgs/applications/editors/emacs-24/default.nix
+++ b/pkgs/applications/editors/emacs-24/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, ncurses, x11, libXaw, libXpm, Xaw3d
 , pkgconfig, gtk, libXft, dbus, libpng, libjpeg, libungif
-, libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, openssl
+, libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls
 , alsaLib, cairo
 , withX ? !stdenv.isDarwin, withGTK ? true
 }:
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   patches = [ ./darwin-new-sections.patch ];
 
   buildInputs =
-    [ ncurses gconf libxml2 openssl alsaLib pkgconfig texinfo ]
+    [ ncurses gconf libxml2 gnutls alsaLib pkgconfig texinfo ]
     ++ stdenv.lib.optional stdenv.isLinux dbus
     ++ stdenv.lib.optionals withX
       [ x11 libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft

From 3353e8550f3bb294b2444143b1e83f6e5fe32ea0 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@immobiliare.it>
Date: Thu, 21 Aug 2014 12:46:41 +0200
Subject: [PATCH 0291/1453] sup: fix build for ZHF

---
 pkgs/applications/networking/mailreaders/sup/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/mailreaders/sup/default.nix b/pkgs/applications/networking/mailreaders/sup/default.nix
index 8efda554d732..b86579673abe 100644
--- a/pkgs/applications/networking/mailreaders/sup/default.nix
+++ b/pkgs/applications/networking/mailreaders/sup/default.nix
@@ -30,6 +30,7 @@ stdenv.mkDerivation rec {
 
   buildPhase = ''
     # the builder uses git to get a listing of the files
+    export EMAIL="nobody@in.here"
     git init >/dev/null
     git add .
     git commit -m "message" >/dev/null

From 21799aff98029c8b04c0bdaddac6f3f5dc4ea54d Mon Sep 17 00:00:00 2001
From: Simon Hengel <sol@typeful.net>
Date: Thu, 21 Aug 2014 19:47:49 +0800
Subject: [PATCH 0292/1453] Update haskell package reserve to 0.1.0

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

diff --git a/pkgs/development/libraries/haskell/reserve/default.nix b/pkgs/development/libraries/haskell/reserve/default.nix
index 6d3bda1d3e01..753368e07c77 100644
--- a/pkgs/development/libraries/haskell/reserve/default.nix
+++ b/pkgs/development/libraries/haskell/reserve/default.nix
@@ -1,11 +1,13 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, baseCompat, hspec, httpConduit, httpKit, httpTypes
 , network, QuickCheck, warp
 }:
 
 cabal.mkDerivation (self: {
   pname = "reserve";
-  version = "0.0.0";
-  sha256 = "06rj1dh8lsfbmfkslyhqc031abrz2qw780i8w2c5pc146938pdi3";
+  version = "0.1.0";
+  sha256 = "09b570l6hyn0wfd4nb9xpqrpdb97gbaxnbjlz25y6s0pfg5s1yzp";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ baseCompat httpKit httpTypes network ];

From 91db3f6b4518ca8ebea6cfe38766f72d142ce36b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 21 Aug 2014 12:15:45 +0200
Subject: [PATCH 0293/1453] kde4: security patch for CVE-2014-5033

---
 pkgs/desktops/kde-4.12/kdelibs/kdelibs.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/kde-4.12/kdelibs/kdelibs.nix b/pkgs/desktops/kde-4.12/kdelibs/kdelibs.nix
index 396adf9ba752..1698abfd00f7 100644
--- a/pkgs/desktops/kde-4.12/kdelibs/kdelibs.nix
+++ b/pkgs/desktops/kde-4.12/kdelibs/kdelibs.nix
@@ -4,7 +4,7 @@
 , automoc4, soprano, qca2, attica, enchant, libdbusmenu_qt, grantlee
 , docbook_xml_dtd_42, docbook_xsl, polkit_qt_1, acl, attr, libXtst
 , udev, herqq, phonon, libjpeg, xz, ilmbase, libxslt
-, pkgconfig
+, pkgconfig, fetchpatch
 }:
 
 kde {
@@ -28,7 +28,15 @@ kde {
   # There are a few hardcoded paths.
   # Split plugins from libs?
 
-  patches = [ ../files/polkit-install.patch ];
+  patches = [
+    ../files/polkit-install.patch
+    (fetchpatch {
+      name = "CVE-2014-5033.patch";
+      url = "http://quickgit.kde.org/?p=kdelibs.git"
+        + "&a=commit&h=e4e7b53b71e2659adaf52691d4accc3594203b23";
+      sha256 = "0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73";
+    })
+  ];
 
   cmakeFlags = [
     "-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook"

From 32f95153a182e010224a62136209b636fc6cbc9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 21 Aug 2014 11:49:14 +0200
Subject: [PATCH 0294/1453] ffmpeg (_1 and default _2): minor update, incl.
 security

CVE-2014-{5271,5272}
---
 pkgs/development/libraries/ffmpeg/1.x.nix | 4 ++--
 pkgs/development/libraries/ffmpeg/2.x.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/ffmpeg/1.x.nix b/pkgs/development/libraries/ffmpeg/1.x.nix
index a0dcf52dcce0..e2aa336d5d21 100644
--- a/pkgs/development/libraries/ffmpeg/1.x.nix
+++ b/pkgs/development/libraries/ffmpeg/1.x.nix
@@ -31,11 +31,11 @@ assert playSupport -> SDL != null;
 assert freetypeSupport -> freetype != null;
 
 stdenv.mkDerivation rec {
-  name = "ffmpeg-1.2.7";
+  name = "ffmpeg-1.2.8";
 
   src = fetchurl {
     url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
-    sha256 = "13nj5q5ad0kcrid8r5x6x8lqfhk8kms14pmncf6vbdbk6x45k6v6";
+    sha256 = "0n9fklr8zqkd60dc5ai161l6k4dbiac5hqy0pi1w82yamc25k6s2";
   };
 
   # `--enable-gpl' (as well as the `postproc' and `swscale') mean that
diff --git a/pkgs/development/libraries/ffmpeg/2.x.nix b/pkgs/development/libraries/ffmpeg/2.x.nix
index 19a4099a8b1c..8a25c4812b2c 100644
--- a/pkgs/development/libraries/ffmpeg/2.x.nix
+++ b/pkgs/development/libraries/ffmpeg/2.x.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ffmpeg-2.3.2";
+  name = "ffmpeg-2.3.3";
 
   src = fetchurl {
     url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
-    sha256 = "1lpzqjpklmcjzk327pz070m3qz3s1cwg8v90w6r1sdh8491kbqc4";
+    sha256 = "0ik4c06anh49r5b0d3rq9if4zl6ysjsa341655kzw22fl880sk5v";
   };
 
   subtitleSupport = config.ffmpeg.subtitle or true;

From 3775fa9ea22401b69219b9a46aa60f51b45a10db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 21 Aug 2014 11:52:07 +0200
Subject: [PATCH 0295/1453] subversion+serf: security update to fix
 CVE-2014-3504

Thanks to nixpkgs monitor again.
---
 pkgs/applications/version-management/subversion/default.nix | 4 ++--
 pkgs/development/libraries/serf/default.nix                 | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index 7526bb5f0437..6e3d2f3d4d53 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -17,13 +17,13 @@ assert javahlBindings -> jdk != null && perl != null;
 
 stdenv.mkDerivation rec {
 
-  version = "1.8.9";
+  version = "1.8.10";
 
   name = "subversion-${version}";
 
   src = fetchurl {
     url = "mirror://apache/subversion/${name}.tar.bz2";
-    sha1 = "424ee12708f39a126efd905886666083dcc4eeaf";
+    sha1 = "d6896d94bb53c1b4c6e9c5bb1a5c466477b19b2b";
   };
 
   buildInputs = [ zlib apr aprutil sqlite ]
diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix
index 409b5db01049..f0fedba5ac14 100644
--- a/pkgs/development/libraries/serf/default.nix
+++ b/pkgs/development/libraries/serf/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, krb5, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "serf-1.3.6";
+  name = "serf-1.3.7";
 
   src = fetchurl {
     url = "http://serf.googlecode.com/svn/src_releases/${name}.tar.bz2";
-    sha256 = "1wk3cplazs8jznjc9ylpd63rrk9k2y05xa7zqx7psycr0gmpnqya";
+    sha1 = "db9ae339dba10a2b47f9bdacf30a58fd8e36683a";
   };
 
   buildInputs = [ apr scons openssl aprutil zlib krb5 pkgconfig ];

From 2b75fe851b7e20ed05912be9e28963b2fb2d12ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 21 Aug 2014 10:50:52 +0200
Subject: [PATCH 0296/1453] readline-6.3: update, including security fixes

Close #3706 CVE-2014-2524 (likely not affecting any our program anyway).
---
 .../libraries/readline/readline6.3.nix        | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/readline/readline6.3.nix b/pkgs/development/libraries/readline/readline6.3.nix
index 9f5c9f7b5813..356c2c055bd5 100644
--- a/pkgs/development/libraries/readline/readline6.3.nix
+++ b/pkgs/development/libraries/readline/readline6.3.nix
@@ -1,11 +1,13 @@
-{ fetchurl, stdenv, ncurses }:
+{ fetchzip, stdenv, ncurses }:
 
 stdenv.mkDerivation (rec {
-  name = "readline-6.3";
+  name = "readline-6.3p08";
 
-  src = fetchurl {
-    url = "mirror://gnu/readline/${name}.tar.gz";
-    sha256 = "0hzxr9jxqqx5sxsv9vmlxdnvlr9vi4ih1avjb869hbs6p5qn1fjn";
+  src = fetchzip {
+    #url = "mirror://gnu/readline/${name}.tar.gz";
+    url = "http://git.savannah.gnu.org/cgit/readline.git/snapshot/"
+      + "readline-a73b98f779b388a5d0624e02e8bb187246e3e396.tar.gz";
+    sha256 = "19ji3wrv4fs79fd0nkacjy9q94pvy2cm66yb3aqysahg0cbrz5l1";
   };
 
   propagatedBuildInputs = [ncurses];
@@ -17,7 +19,7 @@ stdenv.mkDerivation (rec {
       ./no-arch_only-6.3.patch
     ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "GNU Readline, a library for interactive line editing";
 
     longDescription = ''
@@ -37,9 +39,11 @@ stdenv.mkDerivation (rec {
 
     homepage = http://savannah.gnu.org/projects/readline/;
 
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = licenses.gpl3Plus;
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ maintainers.ludo ];
+
+    platforms = platforms.unix;
   };
 }
 

From 50b65a7f8e097fffb6c561b806caaaa33473e939 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 21 Aug 2014 14:17:05 +0200
Subject: [PATCH 0297/1453] readline: use 6.3 by default

I found no build regressions with the most common dependents.

It's possible that older readline branches may be vulnerable,
although the last one announced seemed not to affect regular packages.
---
 pkgs/top-level/all-packages.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f2c8b83ada53..8a0a02d9c380 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2537,7 +2537,6 @@ let
 
   bashInteractive = appendToName "interactive" (callPackage ../shells/bash {
     interactive = true;
-    readline = readline63; # Includes many vi mode fixes
   });
 
   bashCompletion = callPackage ../shells/bash-completion { };
@@ -3526,7 +3525,6 @@ let
     suitesparse = null;
     openjdk = null;
     gnuplot = null;
-    readline = readline63;
   };
   octaveFull = (lowPrio (callPackage ../development/interpreters/octave {
     fltk = fltk13;
@@ -4199,7 +4197,6 @@ let
 
   gdb = callPackage ../development/tools/misc/gdb {
     hurd = gnu.hurdCross;
-    readline = readline63;
     inherit (gnu) mig;
   };
 
@@ -6060,13 +6057,14 @@ let
 
   raul = callPackage ../development/libraries/audio/raul { };
 
-  readline = readline6; # 6.2 works, 6.3 breaks python, parted
+  readline = readline6;
+  readline6 = readline63;
 
   readline4 = callPackage ../development/libraries/readline/readline4.nix { };
 
   readline5 = callPackage ../development/libraries/readline/readline5.nix { };
 
-  readline6 = callPackage ../development/libraries/readline/readline6.nix { };
+  readline62 = callPackage ../development/libraries/readline/readline6.nix { };
 
   readline63 = callPackage ../development/libraries/readline/readline6.3.nix { };
 

From 30fef8a3cffbc1586b448f227f8ebfa745bd1e95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 21 Aug 2014 14:28:33 +0200
Subject: [PATCH 0298/1453] readline: remove unused old versions 4 and 5

...including an unused patch.
---
 pkgs/development/libraries/readline/readline4.nix  | 10 ----------
 pkgs/development/libraries/readline/readline5.nix  | 14 --------------
 .../libraries/readline/shobj-darwin.patch          | 11 -----------
 pkgs/top-level/all-packages.nix                    |  4 ----
 4 files changed, 39 deletions(-)
 delete mode 100644 pkgs/development/libraries/readline/readline4.nix
 delete mode 100644 pkgs/development/libraries/readline/readline5.nix
 delete mode 100644 pkgs/development/libraries/readline/shobj-darwin.patch

diff --git a/pkgs/development/libraries/readline/readline4.nix b/pkgs/development/libraries/readline/readline4.nix
deleted file mode 100644
index d9dcdc9f048f..000000000000
--- a/pkgs/development/libraries/readline/readline4.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ stdenv, fetchurl, ncurses }:
-
-stdenv.mkDerivation {
-  name = "readline-4.3";
-  src = fetchurl {
-    url = mirror://gnu/readline/readline-4.3.tar.gz;
-    md5 = "f86f7cb717ab321fe15f1bbcb058c11e";
-  };
-  propagatedBuildInputs = [ncurses];
-}
diff --git a/pkgs/development/libraries/readline/readline5.nix b/pkgs/development/libraries/readline/readline5.nix
deleted file mode 100644
index c208d5b9fe6b..000000000000
--- a/pkgs/development/libraries/readline/readline5.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ stdenv, fetchurl, ncurses }:
-
-stdenv.mkDerivation {
-  name = "readline-5.2";
-  
-  src = fetchurl {
-    url = mirror://gnu/readline/readline-5.2.tar.gz;
-    sha256 = "0icz4hqqq8mlkwrpczyaha94kns0am9z0mh3a2913kg2msb8vs0j";
-  };
-  
-  propagatedBuildInputs = [ncurses];
-  
-  patches = stdenv.lib.optional stdenv.isDarwin ./shobj-darwin.patch;
-}
diff --git a/pkgs/development/libraries/readline/shobj-darwin.patch b/pkgs/development/libraries/readline/shobj-darwin.patch
deleted file mode 100644
index a9199ca3e89a..000000000000
--- a/pkgs/development/libraries/readline/shobj-darwin.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/support/shobj-conf.orig	2006-04-11 06:15:43.000000000 -0700
-+++ b/support/shobj-conf	2007-11-08 01:15:43.000000000 -0800
-@@ -171,7 +171,7 @@
- 	SHLIB_LIBSUFF='dylib'
- 
- 	case "${host_os}" in
--	darwin[78]*)	SHOBJ_LDFLAGS=''
-+	darwin[789]*)	SHOBJ_LDFLAGS=''
- 			SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
- 			;;
- 	*)		SHOBJ_LDFLAGS='-dynamic'
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8a0a02d9c380..02f99c1f9690 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6060,10 +6060,6 @@ let
   readline = readline6;
   readline6 = readline63;
 
-  readline4 = callPackage ../development/libraries/readline/readline4.nix { };
-
-  readline5 = callPackage ../development/libraries/readline/readline5.nix { };
-
   readline62 = callPackage ../development/libraries/readline/readline6.nix { };
 
   readline63 = callPackage ../development/libraries/readline/readline6.3.nix { };

From ead8f2ba0abba57cc6def5a14fe52a6b191ed57d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 21 Aug 2014 11:23:23 +0200
Subject: [PATCH 0299/1453] mesa: bugfix update

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

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index bbad10898bf4..54fd8d3810e3 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -24,7 +24,7 @@ else
 */
 
 let
-  version = "10.2.5";
+  version = "10.2.6";
   # this is the default search path for DRI drivers
   driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32";
 in
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
 
   src =  fetchurl {
     url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2";
-    sha256 = "039is15p8pkhf8m0yiyb72zybl63xb9ckqzcg3xwi8zlyw5ryidl";
+    sha256 = "01n8ib190s12m8hiiyi4wfm9jhkbqjd769npjwvf965smp918cqr";
   };
 
   prePatch = "patchShebangs .";

From 315b8ec8f69384b2ef29f00aee9ef50613f368f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 21 Aug 2014 14:10:22 +0200
Subject: [PATCH 0300/1453] orc: bugfix updates

---
 pkgs/development/compilers/orc/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix
index 7dfbe218bb7c..2ce3e89e897c 100644
--- a/pkgs/development/compilers/orc/default.nix
+++ b/pkgs/development/compilers/orc/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "orc-0.4.19";
+  name = "orc-0.4.21";
 
   src = fetchurl {
-    url = "http://gstreamer.freedesktop.org/src/orc/${name}.tar.gz";
-    sha256 = "17mmgwll2waz44m908lcxc5fd6n44yysh7p4pdw33hr138r507z2";
+    url = "http://gstreamer.freedesktop.org/src/orc/${name}.tar.xz";
+    sha256 = "187wrnq0ficwjj4y3yqci5fxcdkiazfs6k5js26k5b26hipzmham";
   };
 
   doCheck = true;

From c31c79f0dd82e9bf751dad16997388460a048dbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 21 Aug 2014 11:23:42 +0200
Subject: [PATCH 0301/1453] xorg.xcb (lib+proto): update (seems mainly bug
 fixes)

---
 pkgs/servers/x11/xorg/default.nix | 12 ++++++------
 pkgs/servers/x11/xorg/extra.list  |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 6945d6559fbb..8d00e8e5a495 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -915,11 +915,11 @@ let
   }) // {inherit ;};
 
   libxcb = (mkDerivation "libxcb" {
-    name = "libxcb-1.10";
+    name = "libxcb-1.11";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://xcb.freedesktop.org/dist/libxcb-1.10.tar.bz2;
-      sha256 = "1dfmyb1zjx6n0zhr4y40mc1crlmj3bfjjhmn0f30ip9nnq2spncq";
+      url = http://xcb.freedesktop.org/dist/libxcb-1.11.tar.bz2;
+      sha256 = "1xqgc81krx14f2c8yl5chzg5g2l26mhm2rwffy8dx7jv0iq5sqq3";
     };
     buildInputs = [pkgconfig libxslt libpthreadstubs python libXau xcbproto libXdmcp ];
   }) // {inherit libxslt libpthreadstubs python libXau xcbproto libXdmcp ;};
@@ -1175,11 +1175,11 @@ let
   }) // {inherit ;};
 
   xcbproto = (mkDerivation "xcbproto" {
-    name = "xcb-proto-1.10";
+    name = "xcb-proto-1.11";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://xcb.freedesktop.org/dist/xcb-proto-1.10.tar.bz2;
-      sha256 = "01dgp802i4ic9wkmpa7g1wm50pp547d3b96jjz2hnxavhpfhvx3y";
+      url = http://xcb.freedesktop.org/dist/xcb-proto-1.11.tar.bz2;
+      sha256 = "0bp3f53l9fy5x3mn1rkj1g81aiyzl90wacwvqdgy831aa3kfxb5l";
     };
     buildInputs = [pkgconfig python ];
   }) // {inherit python ;};
diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list
index 2d105241c2d1..84795ed980b3 100644
--- a/pkgs/servers/x11/xorg/extra.list
+++ b/pkgs/servers/x11/xorg/extra.list
@@ -1,6 +1,6 @@
 http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.bz2
-http://xcb.freedesktop.org/dist/libxcb-1.10.tar.bz2
-http://xcb.freedesktop.org/dist/xcb-proto-1.10.tar.bz2
+http://xcb.freedesktop.org/dist/libxcb-1.11.tar.bz2
+http://xcb.freedesktop.org/dist/xcb-proto-1.11.tar.bz2
 http://xcb.freedesktop.org/dist/xcb-util-0.3.9.tar.bz2
 http://xcb.freedesktop.org/dist/xcb-util-image-0.3.9.tar.bz2
 http://xcb.freedesktop.org/dist/xcb-util-keysyms-0.3.9.tar.bz2

From acf8919844a0bda2f8641028d17b6064557407c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 21 Aug 2014 11:26:28 +0200
Subject: [PATCH 0302/1453] xorg.xrandr: minor bugfix update

---
 pkgs/servers/x11/xorg/default.nix       | 6 +++---
 pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 8d00e8e5a495..d2978f59ec56 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -2025,11 +2025,11 @@ let
   }) // {inherit ;};
 
   xrandr = (mkDerivation "xrandr" {
-    name = "xrandr-1.4.2";
+    name = "xrandr-1.4.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xrandr-1.4.2.tar.bz2;
-      sha256 = "1g4hnj53wknsjwiqivyy3jl4qw7jwrpncz7d5p2z29zq5zlnxrxj";
+      url = mirror://xorg/individual/app/xrandr-1.4.3.tar.bz2;
+      sha256 = "06xy0kr6ih7ilrwl6b5g6ay75vm2j4lxnv1d5xlj6sdqhqsaqm3i";
     };
     buildInputs = [pkgconfig libX11 xproto libXrandr libXrender ];
   }) // {inherit libX11 xproto libXrandr libXrender ;};
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 417d12ddadc9..98386e3ff997 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -175,7 +175,7 @@ mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2
 mirror://xorg/individual/app/xprop-1.2.2.tar.bz2
 mirror://xorg/individual/proto/xproto-7.0.26.tar.bz2
-mirror://xorg/individual/app/xrandr-1.4.2.tar.bz2
+mirror://xorg/individual/app/xrandr-1.4.3.tar.bz2
 mirror://xorg/individual/app/xrdb-1.1.0.tar.bz2
 mirror://xorg/individual/app/xrefresh-1.0.5.tar.bz2
 mirror://xorg/individual/app/xset-1.2.3.tar.bz2

From 59e3e060765f8c8e477bebbbca87969bf84618ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 21 Aug 2014 11:46:25 +0200
Subject: [PATCH 0303/1453] xorg: update probably unused modules

---
 pkgs/servers/x11/xorg/default.nix       | 12 ++++++------
 pkgs/servers/x11/xorg/tarballs-7.7.list |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index d2978f59ec56..d64507ac3ba6 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1405,11 +1405,11 @@ let
   }) // {inherit inputproto xorgserver xproto ;};
 
   xf86inputmouse = (mkDerivation "xf86inputmouse" {
-    name = "xf86-input-mouse-1.9.0";
+    name = "xf86-input-mouse-1.9.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-input-mouse-1.9.0.tar.bz2;
-      sha256 = "12344w0cxac1ld54qqwynxwazbmmpvqh1mzcskmfkmakmr5iwq2x";
+      url = mirror://xorg/individual/driver/xf86-input-mouse-1.9.1.tar.bz2;
+      sha256 = "1kn5kx3qyn9qqvd6s24a2l1wfgck2pgfvzl90xpl024wfxsx719l";
     };
     buildInputs = [pkgconfig inputproto xorgserver xproto ];
   }) // {inherit inputproto xorgserver xproto ;};
@@ -1515,11 +1515,11 @@ let
   }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ;};
 
   xf86videogeode = (mkDerivation "xf86videogeode" {
-    name = "xf86-video-geode-2.11.15";
+    name = "xf86-video-geode-2.11.16";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-geode-2.11.15.tar.bz2;
-      sha256 = "1w4ghr2a41kaw4g9na8ws5fjbmy8zkbxpxa21vmqc8mkjzb3pnq0";
+      url = mirror://xorg/individual/driver/xf86-video-geode-2.11.16.tar.bz2;
+      sha256 = "19y13xl7yfrgyis92rmxi0ld95ajgr5il0n9j1dridwzw9aizz1q";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
   }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 98386e3ff997..d606f7daaa51 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -118,7 +118,7 @@ mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2
 mirror://xorg/individual/driver/xf86-input-evdev-2.8.4.tar.bz2
 mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2
 mirror://xorg/individual/driver/xf86-input-keyboard-1.8.0.tar.bz2
-mirror://xorg/individual/driver/xf86-input-mouse-1.9.0.tar.bz2
+mirror://xorg/individual/driver/xf86-input-mouse-1.9.1.tar.bz2
 mirror://xorg/individual/driver/xf86-input-synaptics-1.7.6.tar.bz2
 mirror://xorg/individual/driver/xf86-input-vmmouse-13.0.0.tar.bz2
 mirror://xorg/individual/driver/xf86-input-void-1.4.0.tar.bz2
@@ -130,7 +130,7 @@ mirror://xorg/individual/driver/xf86-video-nouveau-1.0.10.tar.bz2
 mirror://xorg/individual/driver/xf86-video-cirrus-1.5.2.tar.bz2
 mirror://xorg/individual/driver/xf86-video-dummy-0.3.7.tar.bz2
 mirror://xorg/individual/driver/xf86-video-fbdev-0.4.4.tar.bz2
-mirror://xorg/individual/driver/xf86-video-geode-2.11.15.tar.bz2
+mirror://xorg/individual/driver/xf86-video-geode-2.11.16.tar.bz2
 mirror://xorg/individual/driver/xf86-video-glide-1.2.2.tar.bz2
 mirror://xorg/individual/driver/xf86-video-glint-1.2.8.tar.bz2
 mirror://xorg/individual/driver/xf86-video-i128-1.3.6.tar.bz2

From b8826951e40626d1ad10958c1428871b97999d3e Mon Sep 17 00:00:00 2001
From: Vincent Laporte <vincent.laporte@gmail.com>
Date: Thu, 21 Aug 2014 15:24:43 +0200
Subject: [PATCH 0304/1453] Adds ocaml-sqlite3EZ and its dependency ocaml+twt

ocaml+twt is an alternative syntax for OCaml that uses indentation to group
multi-line expressions, like Python and Haskell.

Homepage: http://people.csail.mit.edu/mikelin/ocaml+twt/

sqlite3EZ is a thin wrapper for sqlite3-ocaml with a simplified interface. Query
results are processed with a functional map/fold, transactions are
aborted by exceptions, resource management is handled by the garbage
collector, etc.

Homepage: https://github.com/mlin/ocaml-sqlite3EZ
---
 .../ocaml-modules/sqlite3EZ/default.nix       | 23 +++++++++++++++
 .../development/ocaml-modules/twt/default.nix | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++
 3 files changed, 56 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/sqlite3EZ/default.nix
 create mode 100644 pkgs/development/ocaml-modules/twt/default.nix

diff --git a/pkgs/development/ocaml-modules/sqlite3EZ/default.nix b/pkgs/development/ocaml-modules/sqlite3EZ/default.nix
new file mode 100644
index 000000000000..e8ec8e6f5dac
--- /dev/null
+++ b/pkgs/development/ocaml-modules/sqlite3EZ/default.nix
@@ -0,0 +1,23 @@
+{stdenv, fetchurl, ocaml, findlib, twt, ocaml_sqlite3 }:
+
+stdenv.mkDerivation {
+  name = "ocaml-sqlite3EZ-0.1.0";
+
+  src = fetchurl {
+    url = https://github.com/mlin/ocaml-sqlite3EZ/archive/v0.1.0.tar.gz;
+    sha256 = "8ed2c5d5914a65cbd95589ef11bfb8b38a020eb850cdd49b8adce7ee3a563748";
+  };
+
+  buildInputs = [ ocaml findlib twt ];
+
+  propagatedBuildInputs = [ ocaml_sqlite3 ];
+
+  createFindlibDestdir = true;
+
+  meta = {
+    homepage = http://github.com/mlin/ocaml-sqlite3EZ;
+    description = "A thin wrapper for sqlite3-ocaml with a simplified interface";
+    license = stdenv.lib.licenses.mit;
+    platforms = ocaml.meta.platforms;
+  };
+}
diff --git a/pkgs/development/ocaml-modules/twt/default.nix b/pkgs/development/ocaml-modules/twt/default.nix
new file mode 100644
index 000000000000..e2a627aa3609
--- /dev/null
+++ b/pkgs/development/ocaml-modules/twt/default.nix
@@ -0,0 +1,29 @@
+{stdenv, fetchurl, ocaml, findlib }:
+
+stdenv.mkDerivation {
+  name = "ocaml-twt-0.93.2";
+
+  src = fetchurl {
+    url = https://github.com/mlin/twt/archive/v0.93.2.tar.gz;
+    sha256 = "aec091fbd1e6c4d252cf9664237418b4bc8c7d6b7a17475589be78365397e768";
+  };
+
+  buildInputs = [ ocaml findlib ];
+
+  createFindlibDestdir = true;
+
+  configurePhase = ''
+    mkdir $out/bin
+  '';
+
+  installPhase = ''
+    make install PREFIX=$out
+  '';
+
+  meta = {
+    homepage = http://people.csail.mit.edu/mikelin/ocaml+twt/;
+    description = "“The Whitespace Thing” for OCaml";
+    license = stdenv.lib.licenses.mit;
+    platforms = ocaml.meta.platforms;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 22138aa60daa..6fa8c4f91b93 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3303,6 +3303,10 @@ let
     opam_1_1 = callPackage ../development/tools/ocaml/opam/1.1.nix { };
     opam = opam_1_1;
 
+    sqlite3EZ = callPackage ../development/ocaml-modules/sqlite3EZ { };
+
+    twt = callPackage ../development/ocaml-modules/twt { };
+
     yojson = callPackage ../development/ocaml-modules/yojson { };
 
     zarith = callPackage ../development/ocaml-modules/zarith { };

From a5cf54a52b42d4caf3e967a1744a401cd0de79a2 Mon Sep 17 00:00:00 2001
From: Paul Koerbitz <paul.koerbitz@theppro.com>
Date: Thu, 21 Aug 2014 16:22:08 +0200
Subject: [PATCH 0305/1453] Add package for ClipIt, a lightweight GTK clipboard
 manager

---
 pkgs/applications/misc/clipit/default.nix | 20 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/applications/misc/clipit/default.nix

diff --git a/pkgs/applications/misc/clipit/default.nix b/pkgs/applications/misc/clipit/default.nix
new file mode 100644
index 000000000000..57f6c229a08f
--- /dev/null
+++ b/pkgs/applications/misc/clipit/default.nix
@@ -0,0 +1,20 @@
+{ fetchurl, stdenv, intltool, pkgconfig, gtk, xdotool }:
+
+stdenv.mkDerivation rec {
+  name = "clipit-${version}";
+  version = "1.4.2";
+
+  src = fetchurl {
+    url = "https://github.com/downloads/shantzu/ClipIt/${name}.tar.gz";
+    sha256 = "0jrwn8qfgb15rwspdp1p8hb1nc0ngmpvgr87d4k3lhlvqg2cfqva";
+  };
+
+  buildInputs = [ intltool pkgconfig gtk xdotool  ];
+
+  meta = with stdenv.lib; {
+    description = "Lightweight GTK+ Clipboard Manager";
+    homepage    = "http://clipit.rspwn.com";
+    license     = licenses.gpl3;
+    platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f4a1797c8909..cd814c3fd6a5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8240,6 +8240,8 @@ let
 
   cinelerra = callPackage ../applications/video/cinelerra { };
 
+  clipit = callPackage ../applications/misc/clipit { };
+
   cmus = callPackage ../applications/audio/cmus { };
 
   compiz = callPackage ../applications/window-managers/compiz {

From a9baea48dfd61f6650a9c72b9b106479329eaddf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 21 Aug 2014 16:24:45 +0200
Subject: [PATCH 0306/1453] openjade: Use default perl

---
 pkgs/tools/text/sgml/openjade/default.nix  |  2 ++
 pkgs/tools/text/sgml/openjade/msggen.patch | 34 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  4 +--
 3 files changed, 37 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/tools/text/sgml/openjade/msggen.patch

diff --git a/pkgs/tools/text/sgml/openjade/default.nix b/pkgs/tools/text/sgml/openjade/default.nix
index a2920345afa7..3427f62f15bc 100644
--- a/pkgs/tools/text/sgml/openjade/default.nix
+++ b/pkgs/tools/text/sgml/openjade/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "1l92sfvx1f0wmkbvzv1385y1gb3hh010xksi1iyviyclrjb7jb8x";
   };
 
+  patches = [ ./msggen.patch ];
+
   buildInputs = [ opensp perl ];
 
   configureFlags = [
diff --git a/pkgs/tools/text/sgml/openjade/msggen.patch b/pkgs/tools/text/sgml/openjade/msggen.patch
new file mode 100644
index 000000000000..d59573fa49cf
--- /dev/null
+++ b/pkgs/tools/text/sgml/openjade/msggen.patch
@@ -0,0 +1,34 @@
+http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-text/openjade/files/openjade-1.3.2-msggen.pl.patch?revision=1.2
+
+Use Getopt::Std in place of getopts.pl.
+https://bugs.gentoo.org/show_bug.cgi?id=420083
+
+--- a/msggen.pl
++++ b/msggen.pl
+@@ -4,6 +4,7 @@
+ # See the file COPYING for copying permission.
+ 
+ use POSIX;
++use Getopt::Std;
+ 
+ # Package and version.
+ $package = 'openjade';
+@@ -18,8 +19,7 @@
+ undef $opt_l;
+ undef $opt_p;
+ undef $opt_t;
+-do 'getopts.pl';
+-&Getopts('l:p:t:');
++getopts('l:p:t:');
+ $module = $opt_l;
+ $pot_file = $opt_p;
+ 
+@@ -72,7 +72,7 @@
+     else {
+ 	$field[0] =~ /^[IWQXE][0-9]$/ || &error("invalid first field");;
+ 	$type[$num] = substr($field[0], 0, 1);
+-	$argc = int(substr($field[0], 1, 1));
++	$argc = substr($field[0], 1, 1);
+     }
+     $nargs[$num] = $argc;
+     $field[1] =~ /^[a-zA-Z_][a-zA-Z0-9_]+$/ || &error("invalid tag");
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d77a615abae1..6bcb5a7a9bf3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1712,9 +1712,7 @@ let
 
   opendylan_bin = callPackage ../development/compilers/opendylan/bin.nix { };
 
-  openjade = callPackage ../tools/text/sgml/openjade {
-    perl = perl510;
-  };
+  openjade = callPackage ../tools/text/sgml/openjade { };
 
   openobex = callPackage ../tools/bluetooth/openobex { };
 

From 36a00a0f93eeb4610a65d12842df899259444825 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 21 Aug 2014 16:47:24 +0200
Subject: [PATCH 0307/1453] perl-5.10: Remove

---
 .../interpreters/perl/5.10/default.nix        |  62 ------
 .../interpreters/perl/5.10/no-sys-dirs.patch  | 201 ------------------
 .../interpreters/perl/5.10/setup-hook.sh      |   5 -
 pkgs/top-level/all-packages.nix               |  10 -
 4 files changed, 278 deletions(-)
 delete mode 100644 pkgs/development/interpreters/perl/5.10/default.nix
 delete mode 100644 pkgs/development/interpreters/perl/5.10/no-sys-dirs.patch
 delete mode 100644 pkgs/development/interpreters/perl/5.10/setup-hook.sh

diff --git a/pkgs/development/interpreters/perl/5.10/default.nix b/pkgs/development/interpreters/perl/5.10/default.nix
deleted file mode 100644
index 6af35e275c84..000000000000
--- a/pkgs/development/interpreters/perl/5.10/default.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{ stdenv, fetchurl }:
-
-let 
-  
-  libc = if stdenv ? gcc && stdenv.gcc.libc != null then stdenv.gcc.libc else "/usr";
-
-in
-
-stdenv.mkDerivation rec {
-  name = "perl-5.10.1";
-
-  src = fetchurl {
-    url = "mirror://cpan/src/${name}.tar.gz";
-    sha256 = "0dagnhjgmslfx1jawz986nvc3jh1klk7mn2l8djdca1b9gm2czyb";
-  };
-
-  patches = 
-    [ # Do not look in /usr etc. for dependencies.
-      ./no-sys-dirs.patch
-    ];
-
-  # Build a thread-safe Perl with a dynamic libperls.o.  We need the
-  # "installstyle" option to ensure that modules are put under
-  # $out/lib/perl5 - this is the general default, but because $out
-  # contains the string "perl", Configure would select $out/lib.
-  # Miniperl needs -lm. perl needs -lrt.
-  configureFlags = 
-    [ "-de"
-      "-Dcc=gcc"
-      "-Uinstallusrbinperl"
-      "-Dinstallstyle=lib/perl5"
-      "-Duseshrplib"
-      "-Dlocincpth=${libc}/include"
-      "-Dloclibpth=${libc}/lib"
-    ] 
-    ++ stdenv.lib.optional (stdenv ? glibc) "-Dusethreads";
-
-  configureScript = "${stdenv.shell} ./Configure";
-
-  dontAddPrefix = true;
-
-  enableParallelBuilding = true;
-
-  preConfigure =
-    ''
-      configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3"
-
-      ${stdenv.lib.optionalString stdenv.isArm ''
-        configureFlagsArray=(-Dldflags="-lm -lrt")
-      ''}
-    '';
-
-  preBuild = stdenv.lib.optionalString (!(stdenv ? gcc && stdenv.gcc.nativeTools))
-    ''
-      # Make Cwd work on NixOS (where we don't have a /bin/pwd).
-      substituteInPlace lib/Cwd.pm --replace "'/bin/pwd'" "'$(type -tP pwd)'"
-    '';
-
-  setupHook = ./setup-hook.sh;
-
-  passthru.libPrefix = "lib/perl5/site_perl";
-}
diff --git a/pkgs/development/interpreters/perl/5.10/no-sys-dirs.patch b/pkgs/development/interpreters/perl/5.10/no-sys-dirs.patch
deleted file mode 100644
index 29edf68bb647..000000000000
--- a/pkgs/development/interpreters/perl/5.10/no-sys-dirs.patch
+++ /dev/null
@@ -1,201 +0,0 @@
-diff -rc -x '*~' perl-5.10.1-orig/Configure perl-5.10.1/Configure
-*** perl-5.10.1-orig/Configure	2009-08-18 21:03:53.000000000 +0200
---- perl-5.10.1/Configure	2010-01-26 19:08:32.933792254 +0100
-***************
-*** 103,117 ****
-  fi
-  
-  : Proper PATH setting
-! paths='/bin /usr/bin /usr/local/bin /usr/ucb /usr/local /usr/lbin'
-! paths="$paths /opt/bin /opt/local/bin /opt/local /opt/lbin"
-! paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin"
-! paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin"
-! paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb"
-! paths="$paths /bsd4.3/usr/bin /usr/bsd /bsd43/bin /opt/ansic/bin /usr/ccs/bin"
-! paths="$paths /etc /usr/lib /usr/ucblib /lib /usr/ccs/lib"
-! paths="$paths /sbin /usr/sbin /usr/libexec"
-! paths="$paths /system/gnu_library/bin"
-  
-  for p in $paths
-  do
---- 103,109 ----
-  fi
-  
-  : Proper PATH setting
-! paths=''
-  
-  for p in $paths
-  do
-***************
-*** 1301,1317 ****
-  archname=''
-  libnames=''
-  : change the next line if compiling for Xenix/286 on Xenix/386
-! xlibpth='/usr/lib/386 /lib/386'
-  : Possible local library directories to search.
-! loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib"
-! loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib"
-  
-  : general looking path for locating libraries
-! glibpth="/lib /usr/lib $xlibpth"
-! glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib"
-! test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth"
-! test -f /shlib/libc.so     && glibpth="/shlib $glibpth"
-! test -d /usr/lib64         && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64"
-  
-  : Private path used by Configure to find libraries.  Its value
-  : is prepended to libpth. This variable takes care of special
---- 1293,1304 ----
-  archname=''
-  libnames=''
-  : change the next line if compiling for Xenix/286 on Xenix/386
-! xlibpth=''
-  : Possible local library directories to search.
-! loclibpth=""
-  
-  : general looking path for locating libraries
-! glibpth=""
-  
-  : Private path used by Configure to find libraries.  Its value
-  : is prepended to libpth. This variable takes care of special
-***************
-*** 1329,1336 ****
-  
-  : Possible local include directories to search.
-  : Set locincpth to "" in a hint file to defeat local include searches.
-! locincpth="/usr/local/include /opt/local/include /usr/gnu/include"
-! locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include"
-  :
-  : no include file wanted by default
-  inclwanted=''
---- 1316,1322 ----
-  
-  : Possible local include directories to search.
-  : Set locincpth to "" in a hint file to defeat local include searches.
-! locincpth=""
-  :
-  : no include file wanted by default
-  inclwanted=''
-***************
-*** 1358,1365 ****
-  libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD"
-  : We probably want to search /usr/shlib before most other libraries.
-  : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist.
-- glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'`
-- glibpth="/usr/shlib $glibpth"
-  : Do not use vfork unless overridden by a hint file.
-  usevfork=false
-  
---- 1344,1349 ----
-***************
-*** 2366,2372 ****
-  zip
-  "
-  pth=`echo $PATH | sed -e "s/$p_/ /g"`
-- pth="$pth /lib /usr/lib"
-  for file in $loclist; do
-  	eval xxx=\$$file
-  	case "$xxx" in
---- 2350,2355 ----
-***************
-*** 8361,8373 ****
-  echo " "
-  case "$sysman" in
-  '') 
-! 	syspath='/usr/share/man/man1 /usr/man/man1'
-! 	syspath="$syspath /usr/man/mann /usr/man/manl /usr/man/local/man1"
-! 	syspath="$syspath /usr/man/u_man/man1"
-! 	syspath="$syspath /usr/catman/u_man/man1 /usr/man/l_man/man1"
-! 	syspath="$syspath /usr/local/man/u_man/man1 /usr/local/man/l_man/man1"
-! 	syspath="$syspath /usr/man/man.L /local/man/man1 /usr/local/man/man1"
-! 	sysman=`./loc . /usr/man/man1 $syspath`
-  	;;
-  esac
-  if $test -d "$sysman"; then
---- 8344,8351 ----
-  echo " "
-  case "$sysman" in
-  '') 
-! 	syspath=''
-! 	sysman=''
-  	;;
-  esac
-  if $test -d "$sysman"; then
-***************
-*** 19476,19484 ****
-  case "$full_ar" in
-  '') full_ar=$ar ;;
-  esac
-  
-  : Store the full pathname to the sed program for use in the C program
-! full_sed=$sed
-  
-  : see what type gids are declared as in the kernel
-  echo " "
---- 19454,19463 ----
-  case "$full_ar" in
-  '') full_ar=$ar ;;
-  esac
-+ full_ar=ar
-  
-  : Store the full pathname to the sed program for use in the C program
-! full_sed=sed
-  
-  : see what type gids are declared as in the kernel
-  echo " "
-diff -rc -x '*~' perl-5.10.1-orig/ext/Errno/Errno_pm.PL perl-5.10.1/ext/Errno/Errno_pm.PL
-*** perl-5.10.1-orig/ext/Errno/Errno_pm.PL	2009-06-27 18:09:45.000000000 +0200
---- perl-5.10.1/ext/Errno/Errno_pm.PL	2010-01-26 18:08:09.552792021 +0100
-***************
-*** 144,154 ****
-  	if ($dep =~ /(\S+errno\.h)/) {
-  	     $file{$1} = 1;
-  	}
-!     } elsif ($^O eq 'linux' &&
-! 	      $Config{gccversion} ne '' && 
-! 	      $Config{gccversion} !~ /intel/i
-! 	      # might be using, say, Intel's icc
-! 	     ) {
-  	# Some Linuxes have weird errno.hs which generate
-  	# no #file or #line directives
-  	my $linux_errno_h = -e '/usr/include/errno.h' ?
---- 144,150 ----
-  	if ($dep =~ /(\S+errno\.h)/) {
-  	     $file{$1} = 1;
-  	}
-!     } elsif (0) {
-  	# Some Linuxes have weird errno.hs which generate
-  	# no #file or #line directives
-  	my $linux_errno_h = -e '/usr/include/errno.h' ?
-diff -rc -x '*~' perl-5.10.1-orig/hints/freebsd.sh perl-5.10.1/hints/freebsd.sh
-*** perl-5.10.1-orig/hints/freebsd.sh	2009-02-12 23:58:12.000000000 +0100
---- perl-5.10.1/hints/freebsd.sh	2010-01-26 18:30:01.181854620 +0100
-***************
-*** 118,130 ****
-          objformat=`/usr/bin/objformat`
-          if [ x$objformat = xaout ]; then
-              if [ -e /usr/lib/aout ]; then
-!                 libpth="/usr/lib/aout /usr/local/lib /usr/lib"
-!                 glibpth="/usr/lib/aout /usr/local/lib /usr/lib"
-              fi
-              lddlflags='-Bshareable'
-          else
-!             libpth="/usr/lib /usr/local/lib"
-!             glibpth="/usr/lib /usr/local/lib"
-              ldflags="-Wl,-E "
-              lddlflags="-shared "
-          fi
---- 118,130 ----
-          objformat=`/usr/bin/objformat`
-          if [ x$objformat = xaout ]; then
-              if [ -e /usr/lib/aout ]; then
-!                 libpth=""
-!                 glibpth=""
-              fi
-              lddlflags='-Bshareable'
-          else
-!             libpth=""
-!             glibpth=""
-              ldflags="-Wl,-E "
-              lddlflags="-shared "
-          fi
diff --git a/pkgs/development/interpreters/perl/5.10/setup-hook.sh b/pkgs/development/interpreters/perl/5.10/setup-hook.sh
deleted file mode 100644
index 6a144a7f7804..000000000000
--- a/pkgs/development/interpreters/perl/5.10/setup-hook.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-addPerlLibPath () {
-    addToSearchPath PERL5LIB $1/lib/perl5/site_perl
-}
-
-envHooks=(${envHooks[@]} addPerlLibPath)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6bcb5a7a9bf3..2a50c2a86272 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3542,8 +3542,6 @@ let
     impureLibcPath = if stdenv.isLinux then null else "/usr";
   };
 
-  perl510 = callPackage ../development/interpreters/perl/5.10 { };
-
   perl514 = callPackage ../development/interpreters/perl/5.14 { };
 
   perl516 = callPackage ../development/interpreters/perl/5.16 {
@@ -6560,14 +6558,6 @@ let
     overrides = (config.perlPackageOverrides or (p: {})) pkgs;
   });
 
-  perl510Packages = import ./perl-packages.nix {
-    pkgs = pkgs // {
-      perl = perl510;
-      buildPerlPackage = import ../development/perl-modules/generic perl510;
-    };
-    overrides = (config.perl510PackageOverrides or (p: {})) pkgs;
-  };
-
   perl514Packages = import ./perl-packages.nix {
     pkgs = pkgs // {
       perl = perl514;

From 0c781b3d8f988146ea289bc932daf538c1a8d05a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 21 Aug 2014 16:49:20 +0200
Subject: [PATCH 0308/1453] perl-5.8: Remove

---
 .../interpreters/perl/5.8/default.nix         |  67 -------
 .../interpreters/perl/5.8/gcc-4.2.patch       |  10 --
 .../interpreters/perl/5.8/no-sys-dirs.patch   | 164 ------------------
 .../interpreters/perl/5.8/setup-hook.sh       |   5 -
 pkgs/top-level/all-packages.nix               |   4 -
 5 files changed, 250 deletions(-)
 delete mode 100644 pkgs/development/interpreters/perl/5.8/default.nix
 delete mode 100644 pkgs/development/interpreters/perl/5.8/gcc-4.2.patch
 delete mode 100644 pkgs/development/interpreters/perl/5.8/no-sys-dirs.patch
 delete mode 100644 pkgs/development/interpreters/perl/5.8/setup-hook.sh

diff --git a/pkgs/development/interpreters/perl/5.8/default.nix b/pkgs/development/interpreters/perl/5.8/default.nix
deleted file mode 100644
index b23b95f72b5a..000000000000
--- a/pkgs/development/interpreters/perl/5.8/default.nix
+++ /dev/null
@@ -1,67 +0,0 @@
-{ stdenv, fetchurl
-, impureLibcPath ? null
-}:
-
-stdenv.mkDerivation {
-  name = "perl-5.8.8";
-
-  phases = "phase";
-  phase =
-   ''
-source $stdenv/setup
-
-if test "$NIX_ENFORCE_PURITY" = "1"; then
-    GLIBC=${if impureLibcPath == null then "$(cat $NIX_GCC/nix-support/orig-libc)" else impureLibcPath}
-    extraflags="-Dlocincpth=$GLIBC/include -Dloclibpth=$GLIBC/lib"
-fi
-
-configureScript=./Configure
-configureFlags="-de -Dcc=gcc -Dprefix=$out -Uinstallusrbinperl $extraflags"
-dontAddPrefix=1
-
-preBuild() {
-    # Make Cwd work on NixOS (where we don't have a /bin/pwd).
-    substituteInPlace lib/Cwd.pm --replace "'/bin/pwd'" "'$(type -tP pwd)'"
-}
-
-postInstall() {
-    mkdir -p "$out/nix-support"
-    cp $setupHook $out/nix-support/setup-hook
-}
-
-unset phases
-genericBuild
-
-   '';
-
-  src = fetchurl {
-    url = mirror://cpan/src/perl-5.8.8.tar.bz2;
-    sha256 = "1j8vzc6lva49mwdxkzhvm78dkxyprqs4n4057amqvsh4kh6i92l1";
-  };
-
-  patches = [
-    # This patch does the following:
-    # 1) Do use the PATH environment variable to find the `pwd' command.
-    #    By default, Perl will only look for it in /lib and /usr/lib.
-    #    !!! what are the security implications of this?
-    # 2) Force the use of <errno.h>, not /usr/include/errno.h, on Linux
-    #    systems.  (This actually appears to be due to a bug in Perl.)
-    ./no-sys-dirs.patch
-
-    # Patch to make Perl 5.8.8 build with GCC 4.2.  Taken from
-    # http://www.nntp.perl.org/group/perl.perl5.porters/2006/11/msg117738.html
-    ./gcc-4.2.patch
-
-    # Fix for "SysV.xs:7:25: error: asm/page.h: No such file or
-    # directory" on recent kernel headers.  From
-    # http://bugs.gentoo.org/show_bug.cgi?id=168312.
-    (fetchurl {
-      url = http://bugs.gentoo.org/attachment.cgi?id=111427;
-      sha256 = "017pj0nbqb7kwj3cs727c2l2d8c45l9cwxf71slgb807kn3ppgmn";
-    })
-  ];
-
-  setupHook = ./setup-hook.sh;
-
-  passthru.libPrefix = "lib/perl5/site_perl";
-}
diff --git a/pkgs/development/interpreters/perl/5.8/gcc-4.2.patch b/pkgs/development/interpreters/perl/5.8/gcc-4.2.patch
deleted file mode 100644
index 679a7abde3b6..000000000000
--- a/pkgs/development/interpreters/perl/5.8/gcc-4.2.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- perl-5.8.x/makedepend.SH	2006-06-13 15:31:22.000000000 -0400
-+++ perl-5.8.x-andy/makedepend.SH	2006-07-25 14:45:11.000000000 -0400
-@@ -167,6 +167,7 @@
-             -e '/^#.*<builtin>/d' \
-             -e '/^#.*<built-in>/d' \
-             -e '/^#.*<command line>/d' \
-+            -e '/^#.*<command-line>/d' \
- 	    -e '/^#.*"-"/d' \
- 	    -e '/: file path prefix .* never used$/d' \
- 	    -e 's#\.[0-9][0-9]*\.c#'"$file.c#" \
diff --git a/pkgs/development/interpreters/perl/5.8/no-sys-dirs.patch b/pkgs/development/interpreters/perl/5.8/no-sys-dirs.patch
deleted file mode 100644
index 48588d5a4291..000000000000
--- a/pkgs/development/interpreters/perl/5.8/no-sys-dirs.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-diff -rc perl-orig/Configure perl-5.8.6/Configure
-*** perl-orig/Configure	2004-09-10 08:25:52.000000000 +0200
---- perl-5.8.6/Configure	2005-03-10 12:53:28.000000000 +0100
-***************
-*** 86,100 ****
-  fi
-  
-  : Proper PATH setting
-! paths='/bin /usr/bin /usr/local/bin /usr/ucb /usr/local /usr/lbin'
-! paths="$paths /opt/bin /opt/local/bin /opt/local /opt/lbin"
-! paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin"
-! paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin"
-! paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb"
-! paths="$paths /bsd4.3/usr/bin /usr/bsd /bsd43/bin /opt/ansic/bin /usr/ccs/bin"
-! paths="$paths /etc /usr/lib /usr/ucblib /lib /usr/ccs/lib"
-! paths="$paths /sbin /usr/sbin /usr/libexec"
-! paths="$paths /system/gnu_library/bin"
-  
-  for p in $paths
-  do
---- 86,92 ----
-  fi
-  
-  : Proper PATH setting
-! paths=''
-  
-  for p in $paths
-  do
-***************
-*** 1221,1228 ****
-  archname=''
-  : Possible local include directories to search.
-  : Set locincpth to "" in a hint file to defeat local include searches.
-! locincpth="/usr/local/include /opt/local/include /usr/gnu/include"
-! locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include"
-  :
-  : no include file wanted by default
-  inclwanted=''
---- 1213,1219 ----
-  archname=''
-  : Possible local include directories to search.
-  : Set locincpth to "" in a hint file to defeat local include searches.
-! locincpth=""
-  :
-  : no include file wanted by default
-  inclwanted=''
-***************
-*** 1230,1245 ****
-  groupstype=''
-  libnames=''
-  : change the next line if compiling for Xenix/286 on Xenix/386
-! xlibpth='/usr/lib/386 /lib/386'
-  : Possible local library directories to search.
-! loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib"
-! loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib"
-  
-  : general looking path for locating libraries
-! glibpth="/lib /usr/lib $xlibpth"
-! glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib"
-! test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth"
-! test -f /shlib/libc.so     && glibpth="/shlib $glibpth"
-  
-  : Private path used by Configure to find libraries.  Its value
-  : is prepended to libpth. This variable takes care of special
---- 1221,1232 ----
-  groupstype=''
-  libnames=''
-  : change the next line if compiling for Xenix/286 on Xenix/386
-! xlibpth=''
-  : Possible local library directories to search.
-! loclibpth=""
-  
-  : general looking path for locating libraries
-! glibpth="$xlibpth"
-  
-  : Private path used by Configure to find libraries.  Its value
-  : is prepended to libpth. This variable takes care of special
-***************
-*** 1270,1277 ****
-  libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD"
-  : We probably want to search /usr/shlib before most other libraries.
-  : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist.
-- glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'`
-- glibpth="/usr/shlib $glibpth"
-  : Do not use vfork unless overridden by a hint file.
-  usevfork=false
-  
---- 1257,1262 ----
-***************
-*** 2267,2273 ****
-  zip
-  "
-  pth=`echo $PATH | sed -e "s/$p_/ /g"`
-- pth="$pth /lib /usr/lib"
-  for file in $loclist; do
-  	eval xxx=\$$file
-  	case "$xxx" in
---- 2252,2257 ----
-***************
-*** 7910,7922 ****
-  echo " "
-  case "$sysman" in
-  '') 
-! 	syspath='/usr/share/man/man1 /usr/man/man1'
-! 	syspath="$syspath /usr/man/mann /usr/man/manl /usr/man/local/man1"
-! 	syspath="$syspath /usr/man/u_man/man1"
-! 	syspath="$syspath /usr/catman/u_man/man1 /usr/man/l_man/man1"
-! 	syspath="$syspath /usr/local/man/u_man/man1 /usr/local/man/l_man/man1"
-! 	syspath="$syspath /usr/man/man.L /local/man/man1 /usr/local/man/man1"
-! 	sysman=`./loc . /usr/man/man1 $syspath`
-  	;;
-  esac
-  if $test -d "$sysman"; then
---- 7894,7901 ----
-  echo " "
-  case "$sysman" in
-  '') 
-! 	syspath=''
-! 	sysman=''
-  	;;
-  esac
-  if $test -d "$sysman"; then
-***************
-*** 17949,17957 ****
-  case "$full_ar" in
-  '') full_ar=$ar ;;
-  esac
-  
-  : Store the full pathname to the sed program for use in the C program
-! full_sed=$sed
-  
-  : see what type gids are declared as in the kernel
-  echo " "
---- 17928,17937 ----
-  case "$full_ar" in
-  '') full_ar=$ar ;;
-  esac
-+ full_ar=ar
-  
-  : Store the full pathname to the sed program for use in the C program
-! full_sed=sed
-  
-  : see what type gids are declared as in the kernel
-  echo " "
-diff -rc perl-orig/ext/Errno/Errno_pm.PL perl-5.8.6/ext/Errno/Errno_pm.PL
-*** perl-orig/ext/Errno/Errno_pm.PL	2004-11-01 15:31:59.000000000 +0100
---- perl-5.8.6/ext/Errno/Errno_pm.PL	2005-03-10 12:52:31.000000000 +0100
-***************
-*** 105,111 ****
-  	# Watch out for cross compiling for EPOC (usually done on linux)
-  	$file{'/usr/local/epocemx/epocsdk/include/libc/sys/errno.h'} = 1;
-      } elsif ($^O eq 'linux' &&
-! 	     $Config{gccversion} ne '' # might be using, say, Intel's icc
-  	     ) {
-  	# Some Linuxes have weird errno.hs which generate
-  	# no #file or #line directives
---- 105,111 ----
-  	# Watch out for cross compiling for EPOC (usually done on linux)
-  	$file{'/usr/local/epocemx/epocsdk/include/libc/sys/errno.h'} = 1;
-      } elsif ($^O eq 'linux' &&
-! 	     $Config{gccversion} eq '' # might be using, say, Intel's icc
-  	     ) {
-  	# Some Linuxes have weird errno.hs which generate
-  	# no #file or #line directives
diff --git a/pkgs/development/interpreters/perl/5.8/setup-hook.sh b/pkgs/development/interpreters/perl/5.8/setup-hook.sh
deleted file mode 100644
index d61ec82f4f08..000000000000
--- a/pkgs/development/interpreters/perl/5.8/setup-hook.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-addPerlLibPath () {
-    addToSearchPath PERL5LIB $1/lib/site_perl
-}
-
-envHooks=(${envHooks[@]} addPerlLibPath)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2a50c2a86272..751d4c0463fe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3538,10 +3538,6 @@ let
 
   ocropus = callPackage ../applications/misc/ocropus { };
 
-  perl58 = callPackage ../development/interpreters/perl/5.8 {
-    impureLibcPath = if stdenv.isLinux then null else "/usr";
-  };
-
   perl514 = callPackage ../development/interpreters/perl/5.14 { };
 
   perl516 = callPackage ../development/interpreters/perl/5.16 {

From 186589fdd1d24121ccce38572a157e8bac125332 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@immobiliare.it>
Date: Thu, 21 Aug 2014 17:10:32 +0200
Subject: [PATCH 0309/1453] leafnode: mark as broken for ZHF

---
 pkgs/servers/news/leafnode/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/news/leafnode/default.nix b/pkgs/servers/news/leafnode/default.nix
index 56d402397ecd..23f236a9a34e 100644
--- a/pkgs/servers/news/leafnode/default.nix
+++ b/pkgs/servers/news/leafnode/default.nix
@@ -24,5 +24,6 @@ stdenv.mkDerivation rec {
     description = "Leafnode implements a store & forward NNTP proxy";
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.unix;
+    broken = true; # The user check in the configure does not work in a chroot
   };
 }

From dcf17d3d5d9764c84874567ad4576419a968fecf Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@immobiliare.it>
Date: Thu, 21 Aug 2014 17:29:51 +0200
Subject: [PATCH 0310/1453] policycoreutils: fix build on i686 for ZHF

---
 pkgs/os-specific/linux/policycoreutils/default.nix    |  6 +++++-
 .../linux/policycoreutils/size_format.patch           | 11 +++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/os-specific/linux/policycoreutils/size_format.patch

diff --git a/pkgs/os-specific/linux/policycoreutils/default.nix b/pkgs/os-specific/linux/policycoreutils/default.nix
index d312e25fc2e4..ef7e76824db5 100644
--- a/pkgs/os-specific/linux/policycoreutils/default.nix
+++ b/pkgs/os-specific/linux/policycoreutils/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "1lpwxr5hw3dwhlp2p7y8jcr18mvfcrclwd8c2idz3lmmb3pglk46";
   };
 
-  patchPhase = ''
+  preConfigure = ''
     substituteInPlace po/Makefile --replace /usr/bin/install install
     find . -type f -exec sed -i 's,/usr/bin/python,${python}/bin/python,' {} \;
   '';
@@ -36,6 +36,10 @@ stdenv.mkDerivation rec {
 
   makeFlags = "PREFIX=$(out) DESTDIR=$(out) LOCALEDIR=$(out)/share/locale";
 
+  patches = [ ./size_format.patch ];
+
+  patchFlags = [ "-p0" ];
+
   meta = with stdenv.lib; {
     description = "SELinux policy core utilities";
     license = licenses.gpl2;
diff --git a/pkgs/os-specific/linux/policycoreutils/size_format.patch b/pkgs/os-specific/linux/policycoreutils/size_format.patch
new file mode 100644
index 000000000000..044320985479
--- /dev/null
+++ b/pkgs/os-specific/linux/policycoreutils/size_format.patch
@@ -0,0 +1,11 @@
+--- setfiles/restore.c.orig	2014-08-21 17:26:00.200788259 +0200
++++ setfiles/restore.c	2014-08-21 17:26:04.728888118 +0200
+@@ -118,7 +118,7 @@
+ 		r_opts->count++;
+ 		if (r_opts->count % STAR_COUNT == 0) {
+ 			if (r_opts->progress == 1) {
+-				fprintf(stdout, "\r%luk", (size_t) r_opts->count / STAR_COUNT );
++				fprintf(stdout, "\r%zuk", (size_t) r_opts->count / STAR_COUNT );
+ 			} else {
+ 				if (r_opts->nfile > 0) {
+ 					progress = (r_opts->count < r_opts->nfile) ? (100.0 * r_opts->count / r_opts->nfile) : 100;

From 8e8adfc11000a6f471fd4e7ff26a1770a9c369d4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 21 Aug 2014 17:53:36 +0200
Subject: [PATCH 0311/1453] boehm-gc: Update to 7.2f

---
 pkgs/development/libraries/boehm-gc/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix
index 3b2670d988ae..cc047da2758c 100644
--- a/pkgs/development/libraries/boehm-gc/default.nix
+++ b/pkgs/development/libraries/boehm-gc/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "boehm-gc-7.2d";
+  name = "boehm-gc-7.2f";
 
   src = fetchurl {
-    url = http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-7.2d.tar.gz;
-    sha256 = "0phwa5driahnpn79zqff14w9yc8sn3599cxz91m78hqdcpl0mznr";
+    url = http://www.hboehm.info/gc/gc_source/gc-7.2f.tar.gz;
+    sha256 = "119x7p1cqw40mpwj80xfq879l9m1dkc7vbc1f3bz3kvkf8bf6p16";
   };
 
   configureFlags = "--enable-cplusplus";

From 07e130108513db4aaa24a89ff0a225d758046305 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 21 Aug 2014 18:04:56 +0200
Subject: [PATCH 0312/1453] nixUnstable: Update to 1.8pre3766_809ca33

---
 pkgs/tools/package-management/nix/unstable.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix
index 731965d9a7cf..bba53b0002fc 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-1.8pre3748_02843ba";
+  name = "nix-1.8pre3766_809ca33";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/13483092/download/5/${name}.tar.xz";
-    sha256 = "074k5spq07bz6ljbiiwfzsnnnpqlwssigxirkyrcamcyjmig4v34";
+    url = "http://hydra.nixos.org/build/13584170/download/5/${name}.tar.xz";
+    sha256 = "e6d91e73aabf8e8912f9701bf87b66089c197c5b8c8fbcc1707b888c88b96dfd";
   };
 
   nativeBuildInputs = [ perl pkgconfig ];

From fc152248cea140504871893c82acc8f03c327c0a Mon Sep 17 00:00:00 2001
From: Sven Keidel <svenkeidel@googlemail.com>
Date: Tue, 19 Aug 2014 23:35:33 +0200
Subject: [PATCH 0313/1453] cool-old-term: add 0.9 (close #3685, #3575)

---
 .../misc/cool-old-term/default.nix            | 53 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 55 insertions(+)
 create mode 100644 pkgs/applications/misc/cool-old-term/default.nix

diff --git a/pkgs/applications/misc/cool-old-term/default.nix b/pkgs/applications/misc/cool-old-term/default.nix
new file mode 100644
index 000000000000..76d78f004024
--- /dev/null
+++ b/pkgs/applications/misc/cool-old-term/default.nix
@@ -0,0 +1,53 @@
+{ stdenv, fetchFromGitHub, qt53 }:
+
+stdenv.mkDerivation rec {
+  version = "0.9";
+  name = "cool-old-term-${version}";
+
+  src = fetchFromGitHub {
+    owner = "Swordifish90";
+    repo = "cool-old-term";
+    rev = "2494bc05228290545df8c59c05624a4b903e9068";
+    sha256 = "8462f3eded7b2219acc143258544b0dfac32d81e10cac61ff14276d426704c93";
+  };
+
+  buildInputs = [ qt53 ];
+
+  buildPhase = ''
+    pushd ./konsole-qml-plugin
+    qmake konsole-qml-plugin.pro PREFIX=$out
+    make
+    popd
+  '';
+
+  installPhase = ''
+    pushd ./konsole-qml-plugin
+    make install
+    popd
+
+    install -d $out/bin $out/lib/cool-old-term $out/share/cool-old-term
+    cp -a ./imports $out/lib/cool-old-term/
+    cp -a ./app     $out/share/cool-old-term/
+
+    cat > $out/bin/cool-old-term <<EOF
+    #!${stdenv.shell}
+    ${qt53}/bin/qmlscene -I $out/lib/cool-old-term/imports $out/share/cool-old-term/app/main.qml
+    EOF
+    chmod a+x $out/bin/cool-old-term
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "Terminal emulator which mimics the old cathode display";
+    longDescription = ''
+      cool-old-term is a terminal emulator which tries to mimic the look and
+      feel of the old cathode tube screens. It has been designed to be
+      eye-candy, customizable, and reasonably lightweight.
+    '';
+    homepage = "https://github.com/Swordifish90/cool-old-term";
+    licenses = with stdenv.lib.licenses; [ gpl2 gpl3 ];
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ skeidel ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 751d4c0463fe..f89d95cbc388 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -811,6 +811,8 @@ let
 
   convmv = callPackage ../tools/misc/convmv { };
 
+  cool-old-term = callPackage ../applications/misc/cool-old-term { };
+
   coreutils = callPackage ../tools/misc/coreutils
     {
       # TODO: Add ACL support for cross-Linux.

From bc7fe78d19870e6575573cb8ed874d9289016c3d Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 21 Aug 2014 19:40:13 +0200
Subject: [PATCH 0314/1453] mit-scheme: update from 9.1.1 to 9.2 and remove
 broken tag closes #3705

---
 .../compilers/mit-scheme/default.nix           | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/compilers/mit-scheme/default.nix b/pkgs/development/compilers/mit-scheme/default.nix
index c025fc8073bb..b10aaedb4837 100644
--- a/pkgs/development/compilers/mit-scheme/default.nix
+++ b/pkgs/development/compilers/mit-scheme/default.nix
@@ -1,7 +1,7 @@
 { fetchurl, stdenv, makeWrapper, gnum4, texinfo, texLive, automake }:
 
 let
-  version = "9.1.1";
+  version = "9.2";
   bootstrapFromC = ! (stdenv.isi686 || stdenv.isx86_64);
 
   arch = if      stdenv.isi686   then "-i386"
@@ -19,14 +19,14 @@ stdenv.mkDerivation {
     if stdenv.isi686
     then fetchurl {
       url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-${version}-i386.tar.gz";
-      sha256 = "0vi760fy550d9db538m0vzbq1mpdncvw9g8bk4lswk0kcdira55z";
+      sha256 = "1fmlpnhf5a75db93phajh4ysbdgrgl72v45lk3kznriprl0a7jc6";
     } else if stdenv.isx86_64
     then fetchurl {
       url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-${version}-x86-64.tar.gz";
-      sha256 = "1wcxm9hyfc53myvlcn93fyqrnnn4scwkknl9hkbp1cphc6mp291x";
+      sha256 = "1skzxxhr0iq96bf0j5m7mvf3i4sppfyfa6gpqn34mwgkw1fx8274";
     } else fetchurl {
       url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-c-${version}.tar.gz";
-      sha256 = "0pclakzwxbqgy6wqwvs6ml62wgby8ba8xzmwzdwhx1v8wv05yw1j";
+      sha256 = "0w5ib5vsidihb4hb6fma3sp596ykr8izagm57axvgd6lqzwicsjg";
     };
 
   configurePhase =
@@ -65,7 +65,7 @@ stdenv.mkDerivation {
   # XXX: The `check' target doesn't exist.
   doCheck = false;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "MIT/GNU Scheme, a native code Scheme compiler";
 
     longDescription =
@@ -78,14 +78,12 @@ stdenv.mkDerivation {
 
     homepage = http://www.gnu.org/software/mit-scheme/;
 
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = licenses.gpl2Plus;
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = with maintainers; [ ludo ];
 
     # Build fails on Cygwin and Darwin:
     # <http://article.gmane.org/gmane.lisp.scheme.mit-scheme.devel/489>.
-    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.freebsd;
-
-    broken = true;
+    platforms = platforms.gnu ++ platforms.freebsd;
   };
 }

From d2539c6ff59fc3716637f11e475c6011462b264b Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 21 Aug 2014 22:09:39 +0400
Subject: [PATCH 0315/1453] Adding Julia 0.3.0: some progress, but doesn't work
 yet

---
 pkgs/development/compilers/julia/0.3.0.nix    | 143 ++++++++++++++++++
 .../science/math/liblapack/3.5.0.nix          |  48 ++++++
 pkgs/top-level/all-packages.nix               |  10 ++
 3 files changed, 201 insertions(+)
 create mode 100644 pkgs/development/compilers/julia/0.3.0.nix
 create mode 100644 pkgs/development/libraries/science/math/liblapack/3.5.0.nix

diff --git a/pkgs/development/compilers/julia/0.3.0.nix b/pkgs/development/compilers/julia/0.3.0.nix
new file mode 100644
index 000000000000..4eb64aea5346
--- /dev/null
+++ b/pkgs/development/compilers/julia/0.3.0.nix
@@ -0,0 +1,143 @@
+{ stdenv, fetchgit, gfortran, perl, m4, llvm, gmp, pcre, zlib
+ , readline, fftwSinglePrec, fftw, libunwind, suitesparse, glpk, fetchurl
+ , ncurses, libunistring, lighttpd, patchelf, openblas, liblapack
+ , tcl, tk, xproto, libX11, git, mpfr, which
+ } :
+let
+  realGcc = stdenv.gcc.gcc;
+in
+stdenv.mkDerivation rec {
+  pname = "julia";
+  version = "0.3.0";
+  name = "${pname}-${version}";
+
+  dsfmt_ver = "2.2";
+  grisu_ver = "1.1.1";
+  openblas_ver = "v0.2.10";
+  lapack_ver = "3.5.0";
+  arpack_ver = "3.1.5";
+  lighttpd_ver = "1.4.29";
+  patchelf_ver = "0.6";
+  pcre_ver = "8.31";
+  utf8proc_ver = "1.1.6";
+
+  dsfmt_src = fetchurl {
+    url = "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${dsfmt_ver}.tar.gz";
+    name = "dsfmt-${dsfmt_ver}.tar.gz";
+    sha256 = "bc3947a9b2253a869fcbab8ff395416cb12958be9dba10793db2cd7e37b26899";
+  };
+  grisu_src = fetchurl {
+    url = "http://double-conversion.googlecode.com/files/double-conversion-${grisu_ver}.tar.gz";
+    sha256 = "e1cabb73fd69e74f145aea91100cde483aef8b79dc730fcda0a34466730d4d1d";
+  };
+  openblas_src = fetchurl {
+    url = "https://github.com/xianyi/OpenBLAS/tarball/${openblas_ver}";
+    name = "openblas-${openblas_ver}.tar.gz";
+    sha256 = "19ffec70f9678f5c159feadc036ca47720681b782910fbaa95aa3867e7e86d8e";
+  };
+  arpack_src = fetchurl rec {
+    url = "http://forge.scilab.org/index.php/p/arpack-ng/downloads/get/arpack-ng_${arpack_ver}.tar.gz";
+    sha256 = "05fmg4m0yri47rzgsl2mnr1qbzrs7qyd557p3v9wwxxw0rwcwsd2";
+  };
+  lapack_src = fetchurl {
+    url = "http://www.netlib.org/lapack/lapack-${lapack_ver}.tgz";
+    name = "lapack-${lapack_ver}.tgz";
+    sha256 = "93b910f94f6091a2e71b59809c4db4a14655db527cfc5821ade2e8c8ab75380f";
+  };
+  lighttpd_src = fetchurl {
+    url = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${lighttpd_ver}.tar.gz";
+    sha256 = "ff9f4de3901d03bb285634c5b149191223d17f1c269a16c863bac44238119c85";
+  };
+  patchelf_src = fetchurl {
+    url = "http://hydra.nixos.org/build/1524660/download/2/patchelf-${patchelf_ver}.tar.bz2";
+    sha256 = "00bw29vdsscsili65wcb5ay0gvg1w0ljd00sb5xc6br8bylpyzpw";
+  };
+  pcre_src = fetchurl {
+    url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${pcre_ver}.tar.bz2";
+    sha256 = "0g4c0z4h30v8g8qg02zcbv7n67j5kz0ri9cfhgkpwg276ljs0y2p";
+  };
+  utf8proc_src = fetchurl {
+    url = "http://www.public-software-group.org/pub/projects/utf8proc/v${utf8proc_ver}/utf8proc-v${utf8proc_ver}.tar.gz";
+    sha256 = "1rwr84pw92ajjlbcxq0da7yxgg3ijngmrj7vhh2qzsr2h2kqzp7y";
+  };
+
+  src = fetchgit {
+    url = "git://github.com/JuliaLang/julia.git";
+    rev = "refs/tags/v0.3.0";
+    sha256 = "1h7icqjiccw26f81r1zwsv31kk6yhavn038h7jp63iv5sdzh5r8i";
+  };
+
+  buildInputs = [ gfortran perl m4 gmp pcre llvm readline zlib
+    fftw fftwSinglePrec libunwind suitesparse glpk ncurses libunistring patchelf
+    openblas liblapack tcl tk xproto libX11 git mpfr which
+    ];
+
+  configurePhase = ''
+    for i in GMP LLVM PCRE LAPACK OPENBLAS BLAS READLINE FFTW LIBUNWIND SUITESPARSE GLPK LIGHTTPD ZLIB MPFR;
+    do
+      makeFlags="$makeFlags USE_SYSTEM_$i=1 "
+    done
+
+    copy_kill_hash(){
+      cp "$1" "$2/$(basename "$1" | sed -e 's/^[a-z0-9]*-//')"
+    }
+
+    for i in "${grisu_src}" "${dsfmt_src}" "${arpack_src}" "${patchelf_src}" "${pcre_src}" "${utf8proc_src}"; do
+      copy_kill_hash "$i" deps
+    done
+
+    ${if realGcc ==null then "" else 
+    ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${realGcc}/lib -L${realGcc}/lib64 -lpcre -llapack -lm -lfftw3f -lfftw3 -lglpk -lunistring -lz -lgmp -lmpfr"''}
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fPIC "
+
+    export LDFLAGS="-L${suitesparse}/lib -L$out/lib/julia -Wl,-rpath,$out/lib/julia"
+
+    export GLPK_PREFIX="${glpk}/include"
+
+    mkdir -p "$out/lib"
+    sed -e "s@/usr/local/lib@$out/lib@g" -i deps/Makefile
+    sed -e "s@/usr/lib@$out/lib@g" -i deps/Makefile
+
+    export makeFlags="$makeFlags PREFIX=$out SHELL=${stdenv.shell} prefix=$out"
+
+    export dontPatchELF=1
+
+    export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PWD/usr/lib:$PWD/usr/lib/julia"
+
+    patchShebangs . contrib
+  '';
+
+  preBuild = ''
+    mkdir -p usr/lib
+    
+    echo "$out"
+    mkdir -p "$out/lib"
+    (
+    cd "$(mktemp -d)"
+    for i in "${suitesparse}"/lib/lib*.a; do
+      ar -x $i
+    done
+    gcc *.o --shared -o "$out/lib/libsuitesparse.so"
+    )
+    cp "$out/lib/libsuitesparse.so" usr/lib
+    for i in umfpack cholmod amd camd colamd spqr; do
+      ln -s libsuitesparse.so "$out"/lib/lib$i.so;
+      ln -s libsuitesparse.so "usr"/lib/lib$i.so;
+    done
+  '';
+
+  enableParallelBuilding = false;
+
+  postInstall = ''
+    rm -f "$out"/lib/julia/sys.{so,dylib,dll}
+  '';
+
+  meta = {
+    description = "High-level performance-oriented dynamical language for technical computing";
+    homepage = "http://julialang.org/";
+    license = stdenv.lib.licenses.mit;
+    maintainers = [ stdenv.lib.maintainers.raskin ];
+    platforms = with stdenv.lib.platforms; linux;
+    broken = true;
+  };
+}
diff --git a/pkgs/development/libraries/science/math/liblapack/3.5.0.nix b/pkgs/development/libraries/science/math/liblapack/3.5.0.nix
new file mode 100644
index 000000000000..b2167449a2f9
--- /dev/null
+++ b/pkgs/development/libraries/science/math/liblapack/3.5.0.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchurl, gfortran, atlas, cmake, python, shared ? false }:
+let
+  atlasMaybeShared = atlas.override { inherit shared; };
+  usedLibExtension = if shared then ".so" else ".a";
+in
+stdenv.mkDerivation rec {
+  version = "3.5.0";
+  name = "liblapack-${version}";
+  src = fetchurl {
+    url = "http://www.netlib.org/lapack/lapack-${version}.tgz";
+    sha256 = "0lk3f97i9imqascnlf6wr5mjpyxqcdj73pgj97dj2mgvyg9z1n4s";
+  };
+
+  propagatedBuildInputs = [ atlasMaybeShared ];
+  buildInputs = [ gfortran cmake ];
+  nativeBuildInputs = [ python ];
+
+  cmakeFlags = [
+    "-DUSE_OPTIMIZED_BLAS=ON"
+    "-DBLAS_ATLAS_f77blas_LIBRARY=${atlasMaybeShared}/lib/libf77blas${usedLibExtension}"
+    "-DBLAS_ATLAS_atlas_LIBRARY=${atlasMaybeShared}/lib/libatlas${usedLibExtension}"
+    "-DCMAKE_Fortran_FLAGS=-fPIC"
+  ]
+  ++ (stdenv.lib.optional shared "-DBUILD_SHARED_LIBS=ON")
+  ;
+
+  doCheck = ! shared;
+
+  checkPhase = "
+    sed -i 's,^#!.*,#!${python}/bin/python,' lapack_testing.py
+    ctest
+  ";
+
+  enableParallelBuilding = true;
+
+  passthru = {
+    blas = atlas;
+  };
+
+  meta = {
+    description = "Linear Algebra PACKage";
+    homepage = "http://www.netlib.org/lapack/";
+    license = "revised-BSD";
+
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.simons ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f89d95cbc388..a934a7106388 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3099,6 +3099,15 @@ let
     liblapack = liblapack.override {shared = true;};
     llvm = llvm_33;
   };
+  julia030 = let
+    liblapack = liblapack_3_5_0.override {shared = true;};
+  in callPackage ../development/compilers/julia/0.3.0.nix {
+    inherit liblapack;
+    suitesparse = suitesparse.override {
+      inherit liblapack;
+    };
+    llvm = llvm_34;
+  };
   julia = julia021;
 
   lazarus = builderDefsPackage (import ../development/compilers/fpc/lazarus.nix) {
@@ -10823,6 +10832,7 @@ let
   jags = callPackage ../applications/science/math/jags { };
 
   liblapack = callPackage ../development/libraries/science/math/liblapack { };
+  liblapack_3_5_0 = callPackage ../development/libraries/science/math/liblapack/3.5.0.nix { };
 
   liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { };
 

From 380ba438ee17ccea1db1247f04583597241c7f4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 21 Aug 2014 20:28:25 +0200
Subject: [PATCH 0316/1453] libtar: fix CVE-2013-4420 by Debian patches

CC maintainer @bjornfor.
---
 pkgs/development/libraries/libtar/default.nix | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libtar/default.nix b/pkgs/development/libraries/libtar/default.nix
index 7a8dfa7a6227..212a3a23939b 100644
--- a/pkgs/development/libraries/libtar/default.nix
+++ b/pkgs/development/libraries/libtar/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchgit, autoreconfHook }:
+{ stdenv, fetchgit, fetchpatch, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   version = "1.2.20";
   name = "libtar-${version}";
-  
+
   # Maintenance repo for libtar (Arch Linux uses this)
   src = fetchgit {
     url = "git://repo.or.cz/libtar.git";
@@ -11,6 +11,19 @@ stdenv.mkDerivation rec {
     sha256 = "1pjsqnqjaqgkzf1j8m6y5h76bwprffsjjj6gk8rh2fjsha14rqn9";
   };
 
+  patches = let
+    fp =  name: sha256:
+      fetchpatch {
+        url = "http://sources.debian.net/data/main/libt/libtar/1.2.20-4/debian/patches/${name}.patch";
+        inherit sha256;
+      };
+    in [
+      (fp "no_static_buffers"         "0yv90bhvqjj0v650gzn8fbzhdhzx5z0r1lh5h9nv39wnww435bd0")
+      (fp "no_maxpathlen"             "11riv231wpbdb1cm4nbdwdsik97wny5sxcwdgknqbp61ibk572b7")
+      (fp "CVE-2013-4420"             "0d010190bqgr2ggy02qwxvjaymy9a22jmyfwdfh4086v876cbxpq")
+      (fp "th_get_size-unsigned-int"  "1ravbs5yrfac98mnkrzciw9hd2fxq4dc07xl3wx8y2pv1bzkwm41")
+    ];
+
   buildInputs = [ autoreconfHook ];
 
   meta = with stdenv.lib; {

From 084626deecaffcaa017af07eaab00682eff5d6f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 21 Aug 2014 21:15:32 +0200
Subject: [PATCH 0317/1453] glew: update, and tweak meta

---
 pkgs/development/libraries/glew/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix
index 9ec88799d0dd..5127311e7c91 100644
--- a/pkgs/development/libraries/glew/default.nix
+++ b/pkgs/development/libraries/glew/default.nix
@@ -3,11 +3,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "glew-1.10.0";
+  name = "glew-1.11.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/glew/${name}.tgz";
-    sha256 = "01zki46dr5khzlyywr3cg615bcal32dazfazkf360s1znqh17i4r";
+    sha256 = "1mhkllxz49l1x680dmzrv2i82qjrq017sykah3xc90f2d8qcxfv9";
   };
 
   nativeBuildInputs = [ x11 libXmu libXi ];
@@ -42,9 +42,11 @@ stdenv.mkDerivation rec {
   ] ++ optional (stdenv.cross.libc == "msvcrt") "SYSTEM=mingw"
     ++ optional (stdenv.cross.libc == "libSystem") "SYSTEM=darwin";
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "An OpenGL extension loading library for C(++)";
     homepage = http://glew.sourceforge.net/;
-    license = ["BSD" "GLX" "SGI-B" "GPL2"]; # License description copied from gentoo-1.4.0 
+    license = licenses.free; # different files under different licenses
+      #["BSD" "GLX" "SGI-B" "GPL2"]
+    platforms = platforms.mesaPlatforms;
   };
 }

From 1bfaed62b3d3a38168a3b792b50b2f987f355534 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 9 Aug 2014 21:04:06 +0200
Subject: [PATCH 0318/1453] quassel: add quassel and quassel-client without kde
 integration

Close #3508.
---
 pkgs/top-level/all-packages.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a934a7106388..094e410fafed 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10708,6 +10708,11 @@ let
 
       quassel = callPackage ../applications/networking/irc/quassel { dconf = gnome3.dconf; };
 
+      quasselWithoutKDE = (self.quassel.override {
+        withKDE = false;
+        tag = "-without-kde";
+      });
+
       quasselDaemon = (self.quassel.override {
         monolithic = false;
         daemon = true;
@@ -10720,6 +10725,11 @@ let
         tag = "-client";
       });
 
+      quasselClientWithoutKDE = (self.quasselClient.override {
+        withKDE = false;
+        tag = "-client-without-kde";
+      });
+
       rekonq = callPackage ../applications/networking/browsers/rekonq { };
 
       kwebkitpart = callPackage ../applications/networking/browsers/kwebkitpart { };

From 08e4d586009768e0f2a874125ac618424703b7f5 Mon Sep 17 00:00:00 2001
From: System administrator <robberer@freakmail.de>
Date: Fri, 22 Aug 2014 08:47:42 +0200
Subject: [PATCH 0319/1453] picard: Fix acoustid-fingerprinter binary path.

Signed-off-by: System administrator <robberer@freakmail.de>
Merges and closes pull request #3717.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/audio/picard/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix
index 1ce09a6dd884..07753216d3c3 100644
--- a/pkgs/applications/audio/picard/default.nix
+++ b/pkgs/applications/audio/picard/default.nix
@@ -13,7 +13,7 @@ pythonPackages.buildPythonPackage rec {
   };
 
   postPatch = let
-    fpr = "${acoustidFingerprinter}/bin/acoustid_fpcalc";
+    fpr = "${acoustidFingerprinter}/bin/acoustid-fingerprinter";
   in ''
     sed -ri -e 's|(TextOption.*"acoustid_fpcalc"[^"]*")[^"]*|\1${fpr}|' \
       picard/ui/options/fingerprinting.py

From 939b3548a492cea595922dd962168b271ccb697a Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Fri, 22 Aug 2014 00:13:42 -0700
Subject: [PATCH 0320/1453] Lens library updated to v4.4

also passes tests again, so doCheck is not needed
---
 .../libraries/haskell/lens/default.nix        | 29 +++++++++----------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix
index 655525e4d598..7a179d54f6bf 100644
--- a/pkgs/development/libraries/haskell/lens/default.nix
+++ b/pkgs/development/libraries/haskell/lens/default.nix
@@ -1,25 +1,23 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, aeson, attoparsec, bifunctors, comonad, contravariant
-, deepseq, distributive, doctest, exceptions, filepath, free
-, genericDeriving, hashable, hlint, HUnit, mtl, nats, parallel
-, primitive, profunctors, QuickCheck, reflection, scientific
-, semigroupoids, semigroups, simpleReflect, split, tagged
-, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
-, testFrameworkTh, text, transformers, transformersCompat
-, unorderedContainers, vector, void, zlib
+{ cabal, bifunctors, comonad, contravariant, deepseq, distributive
+, doctest, exceptions, filepath, free, genericDeriving, hashable
+, hlint, HUnit, mtl, nats, parallel, primitive, profunctors
+, QuickCheck, reflection, semigroupoids, semigroups, simpleReflect
+, split, tagged, testFramework, testFrameworkHunit
+, testFrameworkQuickcheck2, testFrameworkTh, text, transformers
+, transformersCompat, unorderedContainers, vector, void, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "lens";
-  version = "4.3.3";
-  sha256 = "0k7qslnh15xnrj86wwsp0mvz6g363ma4g0dxkmvvg4sa1bxljr1f";
+  version = "4.4";
+  sha256 = "06ha4px4ywfbi0n3imy2qqjq3656snsz1b0ggkwzvdzmi550sh8w";
   buildDepends = [
-    aeson attoparsec bifunctors comonad contravariant distributive
-    exceptions filepath free hashable mtl parallel primitive
-    profunctors reflection scientific semigroupoids semigroups split
-    tagged text transformers transformersCompat unorderedContainers
-    vector void zlib
+    bifunctors comonad contravariant distributive exceptions filepath
+    free hashable mtl parallel primitive profunctors reflection
+    semigroupoids semigroups split tagged text transformers
+    transformersCompat unorderedContainers vector void zlib
   ];
   testDepends = [
     deepseq doctest filepath genericDeriving hlint HUnit mtl nats
@@ -27,7 +25,6 @@ cabal.mkDerivation (self: {
     testFrameworkHunit testFrameworkQuickcheck2 testFrameworkTh text
     transformers unorderedContainers vector
   ];
-  doCheck = false;
   meta = {
     homepage = "http://github.com/ekmett/lens/";
     description = "Lenses, Folds and Traversals";

From fbecc246110edc8a6d934dc9897020d9a0abe096 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Fri, 22 Aug 2014 00:14:23 -0700
Subject: [PATCH 0321/1453] Add lens-aeson library, lens 4.4 split all aeson
 functionality to here

---
 .../libraries/haskell/lens-aeson/default.nix  | 24 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/lens-aeson/default.nix

diff --git a/pkgs/development/libraries/haskell/lens-aeson/default.nix b/pkgs/development/libraries/haskell/lens-aeson/default.nix
new file mode 100644
index 000000000000..d19b0bf6dd78
--- /dev/null
+++ b/pkgs/development/libraries/haskell/lens-aeson/default.nix
@@ -0,0 +1,24 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, aeson, attoparsec, doctest, filepath, genericDeriving
+, lens, scientific, semigroups, simpleReflect, text
+, unorderedContainers, vector
+}:
+
+cabal.mkDerivation (self: {
+  pname = "lens-aeson";
+  version = "1";
+  sha256 = "0zpfpba97kr92lzrmdfk08f3cl42alhx0d73w8sbbwxnnvv4489r";
+  buildDepends = [
+    aeson attoparsec lens scientific text unorderedContainers vector
+  ];
+  testDepends = [
+    doctest filepath genericDeriving semigroups simpleReflect
+  ];
+  meta = {
+    homepage = "http://github.com/lens/lens-aeson/";
+    description = "Law-abiding lenses for aeson";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index acf164d57c7a..d09f8119d8db 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1459,6 +1459,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   lens = callPackage ../development/libraries/haskell/lens {};
 
+  lensAeson = callPackage ../development/libraries/haskell/lens-aeson {};
+
   lensDatetime = callPackage ../development/libraries/haskell/lens-datetime {};
 
   lensFamilyCore = callPackage ../development/libraries/haskell/lens-family-core {};

From b5c1cdd7136b2b074f1009c95c4645d95fc5a28e Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Fri, 22 Aug 2014 00:15:07 -0700
Subject: [PATCH 0322/1453] jailbreak cabal-lens so that it builds with lens
 v4.4

bug report submitted to cabal-lens to request upper bound bump
---
 pkgs/development/libraries/haskell/cabal-lenses/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/cabal-lenses/default.nix b/pkgs/development/libraries/haskell/cabal-lenses/default.nix
index a4ac5164e1f3..ccd23434fe0d 100644
--- a/pkgs/development/libraries/haskell/cabal-lenses/default.nix
+++ b/pkgs/development/libraries/haskell/cabal-lenses/default.nix
@@ -7,6 +7,7 @@ cabal.mkDerivation (self: {
   version = "0.3";
   sha256 = "13nx9cn81cx9cj7fk07akqvz4qkl49dlgb5wl5wanag6bafa6vhl";
   buildDepends = [ Cabal lens unorderedContainers ];
+  jailbreak = true;
   meta = {
     description = "Lenses and traversals for the Cabal library";
     license = self.stdenv.lib.licenses.bsd3;

From fec81c392f255fed231d13e9ca363632648a05c5 Mon Sep 17 00:00:00 2001
From: Aycan iRiCAN <iricanaycan@gmail.com>
Date: Fri, 22 Aug 2014 12:38:10 +0300
Subject: [PATCH 0323/1453] Revert "Merge pull request #3718 from
 MP2E/lens_4_4_update"

This reverts commit 53fab4004e171a3490842c921abd8551a73278b1, reversing
changes made to 08e4d586009768e0f2a874125ac618424703b7f5.
---
 .../haskell/cabal-lenses/default.nix          |  1 -
 .../libraries/haskell/lens-aeson/default.nix  | 24 ---------------
 .../libraries/haskell/lens/default.nix        | 29 ++++++++++---------
 pkgs/top-level/haskell-packages.nix           |  2 --
 4 files changed, 16 insertions(+), 40 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/lens-aeson/default.nix

diff --git a/pkgs/development/libraries/haskell/cabal-lenses/default.nix b/pkgs/development/libraries/haskell/cabal-lenses/default.nix
index ccd23434fe0d..a4ac5164e1f3 100644
--- a/pkgs/development/libraries/haskell/cabal-lenses/default.nix
+++ b/pkgs/development/libraries/haskell/cabal-lenses/default.nix
@@ -7,7 +7,6 @@ cabal.mkDerivation (self: {
   version = "0.3";
   sha256 = "13nx9cn81cx9cj7fk07akqvz4qkl49dlgb5wl5wanag6bafa6vhl";
   buildDepends = [ Cabal lens unorderedContainers ];
-  jailbreak = true;
   meta = {
     description = "Lenses and traversals for the Cabal library";
     license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/lens-aeson/default.nix b/pkgs/development/libraries/haskell/lens-aeson/default.nix
deleted file mode 100644
index d19b0bf6dd78..000000000000
--- a/pkgs/development/libraries/haskell/lens-aeson/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, attoparsec, doctest, filepath, genericDeriving
-, lens, scientific, semigroups, simpleReflect, text
-, unorderedContainers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "lens-aeson";
-  version = "1";
-  sha256 = "0zpfpba97kr92lzrmdfk08f3cl42alhx0d73w8sbbwxnnvv4489r";
-  buildDepends = [
-    aeson attoparsec lens scientific text unorderedContainers vector
-  ];
-  testDepends = [
-    doctest filepath genericDeriving semigroups simpleReflect
-  ];
-  meta = {
-    homepage = "http://github.com/lens/lens-aeson/";
-    description = "Law-abiding lenses for aeson";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix
index 7a179d54f6bf..655525e4d598 100644
--- a/pkgs/development/libraries/haskell/lens/default.nix
+++ b/pkgs/development/libraries/haskell/lens/default.nix
@@ -1,23 +1,25 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, bifunctors, comonad, contravariant, deepseq, distributive
-, doctest, exceptions, filepath, free, genericDeriving, hashable
-, hlint, HUnit, mtl, nats, parallel, primitive, profunctors
-, QuickCheck, reflection, semigroupoids, semigroups, simpleReflect
-, split, tagged, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2, testFrameworkTh, text, transformers
-, transformersCompat, unorderedContainers, vector, void, zlib
+{ cabal, aeson, attoparsec, bifunctors, comonad, contravariant
+, deepseq, distributive, doctest, exceptions, filepath, free
+, genericDeriving, hashable, hlint, HUnit, mtl, nats, parallel
+, primitive, profunctors, QuickCheck, reflection, scientific
+, semigroupoids, semigroups, simpleReflect, split, tagged
+, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
+, testFrameworkTh, text, transformers, transformersCompat
+, unorderedContainers, vector, void, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "lens";
-  version = "4.4";
-  sha256 = "06ha4px4ywfbi0n3imy2qqjq3656snsz1b0ggkwzvdzmi550sh8w";
+  version = "4.3.3";
+  sha256 = "0k7qslnh15xnrj86wwsp0mvz6g363ma4g0dxkmvvg4sa1bxljr1f";
   buildDepends = [
-    bifunctors comonad contravariant distributive exceptions filepath
-    free hashable mtl parallel primitive profunctors reflection
-    semigroupoids semigroups split tagged text transformers
-    transformersCompat unorderedContainers vector void zlib
+    aeson attoparsec bifunctors comonad contravariant distributive
+    exceptions filepath free hashable mtl parallel primitive
+    profunctors reflection scientific semigroupoids semigroups split
+    tagged text transformers transformersCompat unorderedContainers
+    vector void zlib
   ];
   testDepends = [
     deepseq doctest filepath genericDeriving hlint HUnit mtl nats
@@ -25,6 +27,7 @@ cabal.mkDerivation (self: {
     testFrameworkHunit testFrameworkQuickcheck2 testFrameworkTh text
     transformers unorderedContainers vector
   ];
+  doCheck = false;
   meta = {
     homepage = "http://github.com/ekmett/lens/";
     description = "Lenses, Folds and Traversals";
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index d09f8119d8db..acf164d57c7a 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1459,8 +1459,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   lens = callPackage ../development/libraries/haskell/lens {};
 
-  lensAeson = callPackage ../development/libraries/haskell/lens-aeson {};
-
   lensDatetime = callPackage ../development/libraries/haskell/lens-datetime {};
 
   lensFamilyCore = callPackage ../development/libraries/haskell/lens-family-core {};

From 7cdb1bb8aa7a0f559958f56fb53e65608d751117 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 22 Aug 2014 11:37:31 +0200
Subject: [PATCH 0324/1453] Build a few NixOS system closures on Hydra

This will allow us to keep track of the evolution of closure sizes of
some typical configurations. (Hydra stores closure sizes in its
database.)
---
 nixos/release.nix | 52 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/nixos/release.nix b/nixos/release.nix
index ed413d3e928f..0620b46d46ad 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -78,6 +78,16 @@ let
         };
 
 
+  makeClosure = module: forAllSystems (system: (import ./lib/eval-config.nix {
+    inherit system;
+    modules = [ module ] ++ lib.singleton
+      ({ config, lib, ... }:
+      { fileSystems."/".device  = lib.mkDefault "/dev/sda1";
+        boot.loader.grub.device = lib.mkDefault "/dev/sda";
+      });
+  }).config.system.build.toplevel);
+
+
 in rec {
 
   channel =
@@ -242,4 +252,46 @@ in rec {
   tests.udisks2 = callTest tests/udisks2.nix {};
   tests.xfce = callTest tests/xfce.nix {};
 
+
+  /* Build a bunch of typical closures so that Hydra can keep track of
+     the evolution of closure sizes. */
+
+  closures = {
+
+    smallContainer = makeClosure ({ pkgs, ... }:
+      { boot.isContainer = true;
+        services.openssh.enable = true;
+      });
+
+    tinyContainer = makeClosure ({ pkgs, ... }:
+      { boot.isContainer = true;
+        imports = [ modules/profiles/minimal.nix ];
+      });
+
+    ec2 = makeClosure ({ pkgs, ... }:
+      { imports = [ modules/virtualisation/amazon-image.nix ];
+      });
+
+    kde = makeClosure ({ pkgs, ... }:
+      { services.xserver.enable = true;
+        services.xserver.displayManager.kdm.enable = true;
+        services.xserver.desktopManager.kde4.enable = true;
+      });
+
+    xfce = makeClosure ({ pkgs, ... }:
+      { services.xserver.enable = true;
+        services.xserver.desktopManager.xfce.enable = true;
+      });
+
+    # Linux/Apache/PostgreSQL/PHP stack.
+    lapp = makeClosure ({ pkgs, ... }:
+      { services.httpd.enable = true;
+        services.httpd.adminAddr = "foo@example.org";
+        services.postgresql.enable = true;
+        services.postgresql.package = pkgs.postgresql93;
+        environment.systemPackages = [ pkgs.php ];
+      });
+
+  };
+
 }

From ce6b86cc682f0150234a74a644b625e6b6973d83 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 22 Aug 2014 11:57:40 +0200
Subject: [PATCH 0325/1453] Fix various evaluation problems

http://hydra.nixos.org/build/13616685
---
 pkgs/applications/editors/idea/default.nix           | 2 ++
 pkgs/applications/ike/default.nix                    | 2 ++
 pkgs/applications/science/logic/verifast/default.nix | 2 ++
 pkgs/applications/science/logic/yices/default.nix    | 2 ++
 pkgs/development/compilers/cryptol/1.8.x.nix         | 2 ++
 pkgs/os-specific/linux/kernel/generic.nix            | 1 +
 pkgs/servers/http/openresty/default.nix              | 4 +++-
 pkgs/tools/security/hashcat/default.nix              | 2 ++
 8 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index e5cfbcdfe178..7cb99ae80ccc 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -2,6 +2,8 @@
 , coreutils, gnugrep, which, git
 }:
 
+assert stdenv.isLinux;
+
 let
 
   buildIdea =
diff --git a/pkgs/applications/ike/default.nix b/pkgs/applications/ike/default.nix
index 1414310ebf33..48f277ad4c98 100644
--- a/pkgs/applications/ike/default.nix
+++ b/pkgs/applications/ike/default.nix
@@ -1,6 +1,8 @@
 { stdenv, fetchurl, cmake, openssl, libedit, flex, bison, qt4, makeWrapper
 , gcc, nettools, iproute, linuxHeaders }:
 
+assert stdenv.isLinux;
+
 # NOTE: use $out/etc/iked.conf as sample configuration and also set: dhcp_file "/etc/iked.dhcp";
 # launch with "iked -f /etc/iked.conf"
 
diff --git a/pkgs/applications/science/logic/verifast/default.nix b/pkgs/applications/science/logic/verifast/default.nix
index 7ab08cf8799f..2685f5e53d06 100644
--- a/pkgs/applications/science/logic/verifast/default.nix
+++ b/pkgs/applications/science/logic/verifast/default.nix
@@ -1,6 +1,8 @@
 { stdenv, fetchurl, gtk, gdk_pixbuf, atk, pango, glib, cairo, freetype
 , fontconfig, libxml2, gnome2 }:
 
+assert stdenv.isLinux;
+
 let
   libPath = stdenv.lib.makeLibraryPath
     [ stdenv.gcc.libc stdenv.gcc.gcc gtk gdk_pixbuf atk pango glib cairo
diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix
index 5a1a4ef19922..b6b34d96d154 100644
--- a/pkgs/applications/science/logic/yices/default.nix
+++ b/pkgs/applications/science/logic/yices/default.nix
@@ -1,5 +1,7 @@
 { stdenv, fetchurl }:
 
+assert stdenv.isLinux;
+
 let
   libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.libc ];
 in
diff --git a/pkgs/development/compilers/cryptol/1.8.x.nix b/pkgs/development/compilers/cryptol/1.8.x.nix
index 4cf00ad3806d..17382ed9d567 100644
--- a/pkgs/development/compilers/cryptol/1.8.x.nix
+++ b/pkgs/development/compilers/cryptol/1.8.x.nix
@@ -1,5 +1,7 @@
 { stdenv, requireFile, gmp4, ncurses, zlib, clang_33, makeWrapper }:
 
+assert stdenv.isLinux;
+
 let
   name    = "cryptol-${version}-${rev}";
   version = "1.8.27";
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index 08611e448562..13250e45494f 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -28,6 +28,7 @@
 }:
 
 assert stdenv.platform.name == "sheevaplug" -> stdenv.platform.uboot != null;
+assert stdenv.isLinux;
 
 let
 
diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix
index e301cc429b9e..571cd215356c 100644
--- a/pkgs/servers/http/openresty/default.nix
+++ b/pkgs/servers/http/openresty/default.nix
@@ -1,6 +1,8 @@
 { stdenv, fetchurl, fetchgit, openssl, zlib, pcre, libxml2, libxslt, gd, geoip
 , perl }:
 
+assert stdenv.isLinux;
+
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
@@ -53,7 +55,7 @@ stdenv.mkDerivation rec {
     description = "A fast web application server built on Nginx";
     homepage    = http://openresty.org;
     license     = licenses.bsd2;
-    platforms   = platforms.all;
+    platforms   = platforms.linux;
     maintainers = with maintainers; [ thoughtpolice ];
   };
 }
diff --git a/pkgs/tools/security/hashcat/default.nix b/pkgs/tools/security/hashcat/default.nix
index 5e1737241904..699901ad59e9 100644
--- a/pkgs/tools/security/hashcat/default.nix
+++ b/pkgs/tools/security/hashcat/default.nix
@@ -1,5 +1,7 @@
 { stdenv, fetchurl, p7zip, patchelf }:
 
+assert stdenv.isLinux;
+
 let
   bits    = if stdenv.system == "x86_64-linux" then "64" else "32";
   libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.libc ];

From 007232ff8f99a086ce58c193d9aaa8ceaa023541 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@immobiliare.it>
Date: Fri, 22 Aug 2014 12:54:02 +0200
Subject: [PATCH 0326/1453] linphone: mark as broken for ZHF

---
 .../networking/instant-messengers/linphone/default.nix           | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix
index be12c7e8e2ae..e10b4f9c83c5 100644
--- a/pkgs/applications/networking/instant-messengers/linphone/default.nix
+++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix
@@ -28,5 +28,6 @@ stdenv.mkDerivation rec {
     description = "Open Source video SIP softphone";
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.gnu;
+    broken = true;
   };
 }

From e2db82874cf497c0dd156680d4c4a8f3b028125c Mon Sep 17 00:00:00 2001
From: Vincent Laporte <vincent.laporte@gmail.com>
Date: Fri, 22 Aug 2014 14:56:33 +0200
Subject: [PATCH 0327/1453] Updates merlin to 1.7.1

---
 pkgs/development/tools/ocaml/merlin/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix
index 8efb90a9ceff..970c07f35464 100644
--- a/pkgs/development/tools/ocaml/merlin/default.nix
+++ b/pkgs/development/tools/ocaml/merlin/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, ocaml, findlib, yojson, menhir}:
 stdenv.mkDerivation {
 
-  name = "merlin-1.7";
+  name = "merlin-1.7.1";
 
   src = fetchurl {
-    url = "https://github.com/the-lambda-church/merlin/archive/v1.7.tar.gz";
-    sha256 = "0grprrykah02g8va63lidbcb6n8sd18l2k9spb5rwlcs3xhfw42b";
+    url = https://github.com/the-lambda-church/merlin/archive/v1.7.1.tar.gz;
+    sha256 = "c3b60c7b3fddaa2860e0d8ac0d4fed2ed60e319875734c7ac1a93df524c67aff";
   };
 
   buildInputs = [ ocaml findlib yojson menhir ];

From 5e1475d76d886d50209b674b31999226381b1329 Mon Sep 17 00:00:00 2001
From: Aycan iRiCAN <iricanaycan@gmail.com>
Date: Fri, 22 Aug 2014 17:55:55 +0300
Subject: [PATCH 0328/1453] Revert "Revert "Merge pull request #3718 from
 MP2E/lens_4_4_update""

This reverts commit fec81c392f255fed231d13e9ca363632648a05c5.
---
 .../haskell/cabal-lenses/default.nix          |  1 +
 .../libraries/haskell/lens-aeson/default.nix  | 24 +++++++++++++++
 .../libraries/haskell/lens/default.nix        | 29 +++++++++----------
 pkgs/top-level/haskell-packages.nix           |  2 ++
 4 files changed, 40 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/lens-aeson/default.nix

diff --git a/pkgs/development/libraries/haskell/cabal-lenses/default.nix b/pkgs/development/libraries/haskell/cabal-lenses/default.nix
index a4ac5164e1f3..ccd23434fe0d 100644
--- a/pkgs/development/libraries/haskell/cabal-lenses/default.nix
+++ b/pkgs/development/libraries/haskell/cabal-lenses/default.nix
@@ -7,6 +7,7 @@ cabal.mkDerivation (self: {
   version = "0.3";
   sha256 = "13nx9cn81cx9cj7fk07akqvz4qkl49dlgb5wl5wanag6bafa6vhl";
   buildDepends = [ Cabal lens unorderedContainers ];
+  jailbreak = true;
   meta = {
     description = "Lenses and traversals for the Cabal library";
     license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/lens-aeson/default.nix b/pkgs/development/libraries/haskell/lens-aeson/default.nix
new file mode 100644
index 000000000000..d19b0bf6dd78
--- /dev/null
+++ b/pkgs/development/libraries/haskell/lens-aeson/default.nix
@@ -0,0 +1,24 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, aeson, attoparsec, doctest, filepath, genericDeriving
+, lens, scientific, semigroups, simpleReflect, text
+, unorderedContainers, vector
+}:
+
+cabal.mkDerivation (self: {
+  pname = "lens-aeson";
+  version = "1";
+  sha256 = "0zpfpba97kr92lzrmdfk08f3cl42alhx0d73w8sbbwxnnvv4489r";
+  buildDepends = [
+    aeson attoparsec lens scientific text unorderedContainers vector
+  ];
+  testDepends = [
+    doctest filepath genericDeriving semigroups simpleReflect
+  ];
+  meta = {
+    homepage = "http://github.com/lens/lens-aeson/";
+    description = "Law-abiding lenses for aeson";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix
index 655525e4d598..7a179d54f6bf 100644
--- a/pkgs/development/libraries/haskell/lens/default.nix
+++ b/pkgs/development/libraries/haskell/lens/default.nix
@@ -1,25 +1,23 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, aeson, attoparsec, bifunctors, comonad, contravariant
-, deepseq, distributive, doctest, exceptions, filepath, free
-, genericDeriving, hashable, hlint, HUnit, mtl, nats, parallel
-, primitive, profunctors, QuickCheck, reflection, scientific
-, semigroupoids, semigroups, simpleReflect, split, tagged
-, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
-, testFrameworkTh, text, transformers, transformersCompat
-, unorderedContainers, vector, void, zlib
+{ cabal, bifunctors, comonad, contravariant, deepseq, distributive
+, doctest, exceptions, filepath, free, genericDeriving, hashable
+, hlint, HUnit, mtl, nats, parallel, primitive, profunctors
+, QuickCheck, reflection, semigroupoids, semigroups, simpleReflect
+, split, tagged, testFramework, testFrameworkHunit
+, testFrameworkQuickcheck2, testFrameworkTh, text, transformers
+, transformersCompat, unorderedContainers, vector, void, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "lens";
-  version = "4.3.3";
-  sha256 = "0k7qslnh15xnrj86wwsp0mvz6g363ma4g0dxkmvvg4sa1bxljr1f";
+  version = "4.4";
+  sha256 = "06ha4px4ywfbi0n3imy2qqjq3656snsz1b0ggkwzvdzmi550sh8w";
   buildDepends = [
-    aeson attoparsec bifunctors comonad contravariant distributive
-    exceptions filepath free hashable mtl parallel primitive
-    profunctors reflection scientific semigroupoids semigroups split
-    tagged text transformers transformersCompat unorderedContainers
-    vector void zlib
+    bifunctors comonad contravariant distributive exceptions filepath
+    free hashable mtl parallel primitive profunctors reflection
+    semigroupoids semigroups split tagged text transformers
+    transformersCompat unorderedContainers vector void zlib
   ];
   testDepends = [
     deepseq doctest filepath genericDeriving hlint HUnit mtl nats
@@ -27,7 +25,6 @@ cabal.mkDerivation (self: {
     testFrameworkHunit testFrameworkQuickcheck2 testFrameworkTh text
     transformers unorderedContainers vector
   ];
-  doCheck = false;
   meta = {
     homepage = "http://github.com/ekmett/lens/";
     description = "Lenses, Folds and Traversals";
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index acf164d57c7a..d09f8119d8db 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1459,6 +1459,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   lens = callPackage ../development/libraries/haskell/lens {};
 
+  lensAeson = callPackage ../development/libraries/haskell/lens-aeson {};
+
   lensDatetime = callPackage ../development/libraries/haskell/lens-datetime {};
 
   lensFamilyCore = callPackage ../development/libraries/haskell/lens-family-core {};

From d0aceb402a7ae0e87f0353e673c95fa51d416f19 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 22 Aug 2014 21:34:17 +0400
Subject: [PATCH 0329/1453] Update The Buttefly Effect game

---
 pkgs/games/the-butterfly-effect/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/games/the-butterfly-effect/default.nix b/pkgs/games/the-butterfly-effect/default.nix
index 44d07cf3ffd5..3cf91e11a55e 100644
--- a/pkgs/games/the-butterfly-effect/default.nix
+++ b/pkgs/games/the-butterfly-effect/default.nix
@@ -1,6 +1,6 @@
 x@{builderDefsPackage
   , qt4, box2d, which
-  ,fetchsvn
+  ,fetchsvn, cmake
   , ...}:
 builderDefsPackage
 (a :
@@ -12,11 +12,11 @@ let
     (builtins.attrNames (builtins.removeAttrs x helperArgNames));
   sourceInfo = rec {
     baseName="tbe";
-    revision="1319";
+    revision="2048";
     version="r${revision}";
     name="${baseName}-${version}";
     url="https://tbe.svn.sourceforge.net/svnroot/tbe/trunk";
-    hash="e9a7c24f0668ba2f36c472c1d05238fa7d9ed2150d99ce8a927285d099cc0f7f";
+    hash="19pqpkil4r5y9j4nszkbs70lq720nvqw8g8magd8nf2n3l9nqm51";
   };
 in
 rec {
@@ -30,8 +30,7 @@ rec {
   inherit (sourceInfo) name version;
   inherit buildInputs;
 
-  phaseNames = ["setVars" "doConfigure" "doMakeInstall" "doDeploy"];
-  configureCommand = "sh configure";
+  phaseNames = ["setVars" "doCmake" "doMakeInstall" "doDeploy"];
 
   setVars = a.noDepEntry ''
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${a.box2d}/include/Box2D"

From a147ddc42ce96608aa424f7b8b8784bd938958c7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 22 Aug 2014 20:23:29 +0200
Subject: [PATCH 0330/1453] Check whether Nixpkgs evaluates with
 NIXPKGS_ALLOW_BROKEN=1

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

diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix
index 70330f4304f1..9856586a1832 100644
--- a/pkgs/top-level/make-tarball.nix
+++ b/pkgs/top-level/make-tarball.nix
@@ -66,7 +66,7 @@ releaseTools.sourceTarball rec {
     # Check that all-packages.nix evaluates on a number of platforms.
     for platform in i686-linux x86_64-linux x86_64-darwin i686-freebsd x86_64-freebsd; do
         header "checking pkgs/top-level/all-packages.nix on $platform"
-        nix-env -f pkgs/top-level/all-packages.nix \
+        NIXPKGS_ALLOW_BROKEN=1 nix-env -f pkgs/top-level/all-packages.nix \
             --show-trace --argstr system "$platform" \
             -qa \* --drv-path --system-filter \* --system --meta --xml > /dev/null
         stopNest

From 8a465c1dfaf59f7dd6b745d3f562262cd0b5ac70 Mon Sep 17 00:00:00 2001
From: Andrew Morsillo <andrew@peeramid.org>
Date: Wed, 20 Aug 2014 18:31:14 -0400
Subject: [PATCH 0331/1453] robomongo: update to 0.8.4 and fix broken build

---
 pkgs/applications/misc/robomongo/default.nix     |  9 ++++-----
 pkgs/applications/misc/robomongo/robomongo.patch | 13 +++++++++++++
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/robomongo/default.nix b/pkgs/applications/misc/robomongo/default.nix
index ab8a803b7cb4..8b0ba581612e 100644
--- a/pkgs/applications/misc/robomongo/default.nix
+++ b/pkgs/applications/misc/robomongo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, qt5, openssl, boost, cmake, scons, python, pcre, bzip2 }:
 
 stdenv.mkDerivation {
-  name = "robomongo-0.8.3";
+  name = "robomongo-0.8.4";
 
   src = fetchurl {
-    url = https://github.com/paralect/robomongo/archive/v0.8.3.tar.gz;
-    sha256 = "1x8vpmqvjscjcw30hf0i5vsrg3rldlwx6z52i1hymlck2jfzkank";
+    url = https://github.com/paralect/robomongo/archive/v0.8.4.tar.gz;
+    sha256 = "199fb08701wrw3ky7gcqyvb3z4027qjcqdnzrx5y7yi3rb4gvkzc";
   };
 
   patches = [ ./robomongo.patch ];
@@ -17,9 +17,8 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://robomongo.org/";
     description = "Query GUI for mongodb";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.gpl3;
     maintainers = [ stdenv.lib.maintainers.amorsillo ];
-    broken = true;
   };
 }
diff --git a/pkgs/applications/misc/robomongo/robomongo.patch b/pkgs/applications/misc/robomongo/robomongo.patch
index 2305ca732eae..3de6e940d9f9 100644
--- a/pkgs/applications/misc/robomongo/robomongo.patch
+++ b/pkgs/applications/misc/robomongo/robomongo.patch
@@ -1,6 +1,7 @@
 Remove check for QT_NO_STYLE_GTK to avoid building with QCleanlooksStyle which results in error due to missing QCleanlooksStyle
 Ensure environment is preserved for scons build -- scons clears the env but we want to keep the nix build environment
 Fix typo in cmakelists
+Add stdint.h include to mongo driver src
 diff -rupN robomongo-0.8.3/CMakeLists.txt robomongo-0.8.3-patched/CMakeLists.txt
 --- robomongo-0.8.3/CMakeLists.txt	2013-10-01 10:55:00.000000000 -0400
 +++ robomongo-0.8.3-patched/CMakeLists.txt	2013-12-06 12:22:06.070659856 -0500
@@ -46,3 +47,15 @@ diff -rupN robomongo-0.8.3/src/third-party/mongodb/SConstruct robomongo-0.8.3-pa
                     CLIENT_ARCHIVE='${CLIENT_DIST_BASENAME}${DIST_ARCHIVE_SUFFIX}',
                     CLIENT_DIST_BASENAME=get_option('client-dist-basename'),
                     CLIENT_LICENSE='#distsrc/client/LICENSE.txt',
+
+diff -rupN robomongo-0.8.4/src/third-party/mongodb/src/mongo/pch.h robomongo-0.8.4-patched/src/third-party/mongodb/src/mongo/pch.h
+--- robomongo-0.8.4/src/third-party/mongodb/src/mongo/pch.h	2013-12-13 12:56:35.000000000 -0500
++++ robomongo-0.8.4-patched/src/third-party/mongodb/src/mongo/pch.h	2014-08-20 18:16:31.788396489 -0400
+@@ -39,6 +39,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <signal.h>
++#include <stdint.h>
+ 
+ #include "time.h"
+ #include "string.h"

From e0f976ba55f54abcf93d1f5547398e23fbba614e Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Wed, 20 Aug 2014 18:08:07 -0300
Subject: [PATCH 0332/1453] vym: new package
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

VYM (View Your Mind) is a mind-mapping program.

[Bjørn: two whitespace adjustments and quote the "$out" variable.]
---
 pkgs/applications/misc/vym/default.nix | 35 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/applications/misc/vym/default.nix

diff --git a/pkgs/applications/misc/vym/default.nix b/pkgs/applications/misc/vym/default.nix
new file mode 100644
index 000000000000..c23be51c3e80
--- /dev/null
+++ b/pkgs/applications/misc/vym/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, pkgconfig, qt4 }:
+
+stdenv.mkDerivation rec {
+  name = "vym-${version}";
+  version = "2.2.4";
+
+  src = fetchurl {
+    url = "http://downloads.sourceforge.net/project/vym/${version}/${name}.tar.bz2";
+    sha256 = "1x4qp6wpszscbbs4czkfvskm7qjglvxm813nqv281bpy4y1hhvgs";
+  };
+
+  buildInputs = [ pkgconfig qt4 ];
+
+  configurePhase = ''
+    qmake PREFIX="$out"
+  '';
+
+  meta = {
+    description = "A mind-mapping software";
+    longDescription = ''
+      VYM (View Your Mind) is a tool to generate and manipulate maps which show your thoughts.
+      Such maps can help you to improve your creativity and effectivity. You can use them
+      for time management, to organize tasks, to get an overview over complex contexts,
+      to sort your ideas etc.
+      
+      Maps can be drawn by hand on paper or a flip chart and help to structure your thoughs.
+      While a tree like structure like shown on this page can be drawn by hand or any drawing software
+      vym offers much more features to work with such maps.
+    '';
+    homepage = http://www.insilmaril.de/vym/;
+    license = stdenv.lib.licenses.gpl2;
+    maintainer = stdenv.lib.maintainers.AndersonTorres;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 094e410fafed..15da2e5e4e1e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9957,6 +9957,8 @@ let
 
   vwm = callPackage ../applications/window-managers/vwm { };
 
+  vym = callPackage ../applications/misc/vym { };
+
   w3m = callPackage ../applications/networking/browsers/w3m {
     graphicsSupport = false;
   };

From 896ef91242afbad24c9885c97e3916d35b4fe932 Mon Sep 17 00:00:00 2001
From: "ambrop7@gmail.com" <Ambroz Bizjak>
Date: Wed, 20 Aug 2014 22:02:39 +0200
Subject: [PATCH 0333/1453] libuv: Add version 0.11.29.

---
 pkgs/development/libraries/libuv/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix
index bd1f926c9cbe..b11b889a8d99 100644
--- a/pkgs/development/libraries/libuv/default.nix
+++ b/pkgs/development/libraries/libuv/default.nix
@@ -100,4 +100,5 @@ in
     v0_11_24 = "1hygn81iwbdshzrq603qm6k1r7pjflx9qqazmlb72c3vy1hq21c6";
     v0_11_25 = "1abszivlxf0sddwvcj3jywfsip5q9vz6axvn40qqyl8sjs80zcvj";
     v0_11_26 = "1pfjdwrxhqz1vqcdm42g3j45ghrb4yl7wsngvraclhgqicff1sc3";
+    v0_11_29 = "1z07phfwryfy2155p3lxcm2a33h20sfl96lds5dghn157x6csz7m";
   }

From 85164955608e23d931ddb731e00391741db7ecf3 Mon Sep 17 00:00:00 2001
From: "ambrop7@gmail.com" <Ambroz Bizjak>
Date: Wed, 20 Aug 2014 22:03:28 +0200
Subject: [PATCH 0334/1453] python-pyuv: new package
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Pyuv is a Python interface to libuv, a cross-platform asychronous I/O
library.

The setup.py is tweaked to that the system version of libuv is used,
instead of tying to fetch one with git.

[Bjørn: change commit message]
---
 .../python-modules/pyuv-external-libuv.patch  | 27 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 20 ++++++++++++++
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/development/python-modules/pyuv-external-libuv.patch

diff --git a/pkgs/development/python-modules/pyuv-external-libuv.patch b/pkgs/development/python-modules/pyuv-external-libuv.patch
new file mode 100644
index 000000000000..33539d9b4b2c
--- /dev/null
+++ b/pkgs/development/python-modules/pyuv-external-libuv.patch
@@ -0,0 +1,27 @@
+diff --git a/setup.py b/setup.py
+index ec0caac..2c1fdb6 100644
+--- a/setup.py
++++ b/setup.py
+@@ -6,7 +6,6 @@ try:
+     from setuptools import setup, Extension
+ except ImportError:
+     from distutils.core import setup, Extension
+-from setup_libuv import libuv_build_ext, libuv_sdist
+ 
+ 
+ __version__ = "0.11.5"
+@@ -32,12 +31,11 @@ setup(name             = "pyuv",
+           "Programming Language :: Python :: 3.3",
+           "Programming Language :: Python :: 3.4"
+       ],
+-      cmdclass     = {'build_ext': libuv_build_ext,
+-                      'sdist'    : libuv_sdist},
+       ext_modules  = [Extension('pyuv',
+                                 sources = ['src/pyuv.c'],
++                                libraries = ['uv'],
+                                 define_macros=[('MODULE_VERSION', __version__),
+-                                               ('LIBUV_REVISION', libuv_build_ext.libuv_revision)]
++                                               ('LIBUV_REVISION', 'unknown')]
+                      )]
+      )
+ 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d42897857c1a..f7e3bf3c2ca9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8248,6 +8248,26 @@ rec {
     };
   });
 
+  pyuv = buildPythonPackage rec {
+    name = "pyuv-0.11.5";
+
+    src = fetchurl {
+      url = "https://github.com/saghul/pyuv/archive/${name}.tar.gz";
+      sha256 = "c251952cb4e54c92ab0e871decd13cf73d11ca5dba9f92962de51d12e3a310a9";
+    };
+
+    patches = [ ../development/python-modules/pyuv-external-libuv.patch ];
+
+    buildInputs = [ pkgs.libuvVersions.v0_11_29 ];
+
+    meta = {
+      description = "Python interface for libuv";
+      homepage = https://github.com/saghul/pyuv;
+      repositories.git = git://github.com/saghul/pyuv.git;
+      license = licenses.mit;
+    };
+  };
+
   virtualenv = buildPythonPackage rec {
     name = "virtualenv-1.11.6";
     src = fetchurl {

From 030439d8fe009772f692239aaa79bd08e506acb2 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Fri, 22 Aug 2014 11:21:25 +0100
Subject: [PATCH 0335/1453] haskellPackages.digestiveFunctorsAeson: Update to
 1.1.11

---
 .../digestive-functors-aeson/default.nix        | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix b/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix
index 924f8bb351d4..9bab1ad45db6 100644
--- a/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix
+++ b/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix
@@ -1,23 +1,22 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, digestiveFunctors, HUnit, lens, mtl, safe
-, scientific, tasty, tastyHunit, text, vector
+{ cabal, aeson, digestiveFunctors, HUnit, lens, lensAeson, mtl
+, safe, scientific, tasty, tastyHunit, text, vector
 }:
 
 cabal.mkDerivation (self: {
   pname = "digestive-functors-aeson";
-  version = "1.1.10";
-  sha256 = "0ar165rksnj09sb58qx5hm71kn8gzm936ixmfhf7sqbw2kcbw4nx";
-  buildDepends = [ aeson digestiveFunctors lens safe text vector ];
+  version = "1.1.11";
+  sha256 = "0jf62ssyc317x070xkjdnfbb2g8mb19a83hig08j95vyqwjgk4vg";
+  buildDepends = [
+    aeson digestiveFunctors lens lensAeson safe text vector
+  ];
   testDepends = [
     aeson digestiveFunctors HUnit mtl scientific tasty tastyHunit text
   ];
-  jailbreak = true;
   meta = {
     homepage = "http://github.com/ocharles/digestive-functors-aeson";
     description = "Run digestive-functors forms against JSON";
     license = self.stdenv.lib.licenses.gpl3;
     platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
+    maintainers = [ self.stdenv.lib.maintainers.ocharles ];
   };
 })

From a24775bf22dbdb4f9c21db3a15703d7e6e2c4016 Mon Sep 17 00:00:00 2001
From: Daniel Bergey <bergey@alum.mit.edu>
Date: Sat, 23 Aug 2014 02:05:39 +0000
Subject: [PATCH 0336/1453] haskell Diagrams libraries

latest versions support lens-4.4 - fix broken builds
add bergey as maintainer
---
 lib/maintainers.nix                                        | 1 +
 pkgs/development/libraries/haskell/diagrams/cairo.nix      | 6 +++---
 pkgs/development/libraries/haskell/diagrams/contrib.nix    | 6 +++---
 pkgs/development/libraries/haskell/diagrams/core.nix       | 6 +++---
 pkgs/development/libraries/haskell/diagrams/lib.nix        | 6 +++---
 pkgs/development/libraries/haskell/diagrams/postscript.nix | 7 +++----
 pkgs/development/libraries/haskell/diagrams/svg.nix        | 6 +++---
 .../development/libraries/haskell/force-layout/default.nix | 6 +++---
 8 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 184fd7036a0f..78f0d619cb0e 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -22,6 +22,7 @@
   bbenoist = "Baptist BENOIST <return_0@live.com>";
   bennofs = "Benno Fünfstück <benno.fuenfstueck@gmail.com>";
   berdario = "Dario Bertini <berdario@gmail.com>";
+  bergey = "Daniel Bergey <bergey@teallabs.org>";
   bjg = "Brian Gough <bjg@gnu.org>";
   bjornfor = "Bjørn Forsman <bjorn.forsman@gmail.com>";
   bluescreen303 = "Mathijs Kwik <mathijs@bluescreen303.nl>";
diff --git a/pkgs/development/libraries/haskell/diagrams/cairo.nix b/pkgs/development/libraries/haskell/diagrams/cairo.nix
index c0f678311b9a..c8763ca0a453 100644
--- a/pkgs/development/libraries/haskell/diagrams/cairo.nix
+++ b/pkgs/development/libraries/haskell/diagrams/cairo.nix
@@ -7,18 +7,18 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-cairo";
-  version = "1.2";
-  sha256 = "0vzjp1i5hk971r7f55gpdl0jibrjg9j4ny7p408kb8zl2ynlxv6l";
+  version = "1.2.0.1";
+  sha256 = "0y7llxxs34i814nc3c79ykv75znplzqq7njvq7a5fyxl81ji0z4c";
   buildDepends = [
     cairo colour dataDefaultClass diagramsCore diagramsLib filepath
     hashable JuicyPixels lens mtl optparseApplicative pango split
     statestack time transformers vector
   ];
-  jailbreak = true;
   meta = {
     homepage = "http://projects.haskell.org/diagrams";
     description = "Cairo backend for diagrams drawing EDSL";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.bergey ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/diagrams/contrib.nix b/pkgs/development/libraries/haskell/diagrams/contrib.nix
index 2dcc86d5c9b4..7c9e797e3057 100644
--- a/pkgs/development/libraries/haskell/diagrams/contrib.nix
+++ b/pkgs/development/libraries/haskell/diagrams/contrib.nix
@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-contrib";
-  version = "1.1.2";
-  sha256 = "1gljmzlhc6vck5lcsq9lhf2k4dik5pp62k85y2kkxgq0mxnmqf0g";
+  version = "1.1.2.1";
+  sha256 = "05jsqc9wm87hpnaclzfa376m5z8lnp4qgll6lqnfa5m49cqcabki";
   buildDepends = [
     arithmoi circlePacking colour dataDefault dataDefaultClass
     diagramsCore diagramsLib forceLayout lens MonadRandom mtl parsec
@@ -20,11 +20,11 @@ cabal.mkDerivation (self: {
     diagramsLib HUnit QuickCheck testFramework testFrameworkHunit
     testFrameworkQuickcheck2
   ];
-  jailbreak = true;
   meta = {
     homepage = "http://projects.haskell.org/diagrams/";
     description = "Collection of user contributions to diagrams EDSL";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.bergey ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/diagrams/core.nix b/pkgs/development/libraries/haskell/diagrams/core.nix
index 9a1245d04d0a..c7459972c394 100644
--- a/pkgs/development/libraries/haskell/diagrams/core.nix
+++ b/pkgs/development/libraries/haskell/diagrams/core.nix
@@ -6,17 +6,17 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-core";
-  version = "1.2.0.1";
-  sha256 = "01rzd2zdg0pv7b299z6s6i6l6xggiszb2qs00vh5dbss295n1sps";
+  version = "1.2.0.2";
+  sha256 = "10glkp05pnxx7c7f33654rjcvahslxx010v36wf6zsa8nscdrccn";
   buildDepends = [
     dualTree lens MemoTrie monoidExtras newtype semigroups vectorSpace
     vectorSpacePoints
   ];
-  jailbreak = true;
   meta = {
     homepage = "http://projects.haskell.org/diagrams";
     description = "Core libraries for diagrams EDSL";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.bergey ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/diagrams/lib.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix
index 77047d982917..75ee478ac3fc 100644
--- a/pkgs/development/libraries/haskell/diagrams/lib.nix
+++ b/pkgs/development/libraries/haskell/diagrams/lib.nix
@@ -8,19 +8,19 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-lib";
-  version = "1.2.0.1";
-  sha256 = "0p7rq97hnal90dciq1nln1s16kdb1xk9rrwaxhkxqr6kjjr2njf4";
+  version = "1.2.0.2";
+  sha256 = "0ylrsldq7nmqvprgwbw7bkwp31zhgbyxjx462lcayk0lbhqb5k5p";
   buildDepends = [
     active colour dataDefaultClass diagramsCore dualTree filepath
     fingertree hashable intervals JuicyPixels lens MemoTrie
     monoidExtras optparseApplicative safe semigroups tagged vectorSpace
     vectorSpacePoints
   ];
-  jailbreak = true;
   meta = {
     homepage = "http://projects.haskell.org/diagrams";
     description = "Embedded domain-specific language for declarative graphics";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.bergey ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/diagrams/postscript.nix b/pkgs/development/libraries/haskell/diagrams/postscript.nix
index 6ecd2dd4a410..c79f637c73f6 100644
--- a/pkgs/development/libraries/haskell/diagrams/postscript.nix
+++ b/pkgs/development/libraries/haskell/diagrams/postscript.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-postscript";
-  version = "1.1";
-  sha256 = "0l077libp6h8ka9ygkmajvzdymndlhx60nb5f6jaqvp7yx80hz3m";
+  version = "1.1.0.1";
+  sha256 = "03747g5y33kzf76hs4y0ak9q6b79r92z130b03bcc2892na62ad6";
   buildDepends = [
     dataDefaultClass diagramsCore diagramsLib dlist filepath hashable
     lens monoidExtras mtl semigroups split vectorSpace
@@ -18,7 +18,6 @@ cabal.mkDerivation (self: {
     description = "Postscript backend for diagrams drawing EDSL";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
+    maintainers = [ self.stdenv.lib.maintainers.bergey ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/diagrams/svg.nix b/pkgs/development/libraries/haskell/diagrams/svg.nix
index f982f427863b..fcd08ffce63a 100644
--- a/pkgs/development/libraries/haskell/diagrams/svg.nix
+++ b/pkgs/development/libraries/haskell/diagrams/svg.nix
@@ -7,18 +7,18 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-svg";
-  version = "1.1";
-  sha256 = "0b34rh35pay4x8dg0i06xvr3d865hbxzj2x77jly9l1j7sa1qaj1";
+  version = "1.1.0.1";
+  sha256 = "02krwy1v7rhcgg0ps7kd8ym50kh48dcfqm2xz3k6hr32jzqa5hlw";
   buildDepends = [
     base64Bytestring blazeMarkup blazeSvg colour diagramsCore
     diagramsLib filepath hashable JuicyPixels lens monoidExtras mtl
     split time vectorSpace
   ];
-  jailbreak = true;
   meta = {
     homepage = "http://projects.haskell.org/diagrams/";
     description = "SVG backend for diagrams drawing EDSL";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.bergey ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/force-layout/default.nix b/pkgs/development/libraries/haskell/force-layout/default.nix
index 77259cc1e401..f0f8ae1399db 100644
--- a/pkgs/development/libraries/haskell/force-layout/default.nix
+++ b/pkgs/development/libraries/haskell/force-layout/default.nix
@@ -4,15 +4,15 @@
 
 cabal.mkDerivation (self: {
   pname = "force-layout";
-  version = "0.3.0.6";
-  sha256 = "0qmzz9gbzf1jdk08w3nhnw7l3n5bq5sw5k4r0mdc5y11m38xpgm4";
+  version = "0.3.0.7";
+  sha256 = "1kq6fg90yj735rpipspykvkmzs2cnwyib6pkph58523bvahgi2dy";
   buildDepends = [
     dataDefaultClass lens vectorSpace vectorSpacePoints
   ];
-  jailbreak = true;
   meta = {
     description = "Simple force-directed layout";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.bergey ];
   };
 })

From 27e7d1ff0abf51e7c7dbea7c0afbd63a850ad322 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Fri, 22 Aug 2014 21:07:42 -0700
Subject: [PATCH 0337/1453] Lens update to v4.4.0.1

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

diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix
index 7a179d54f6bf..190dd3fd14ed 100644
--- a/pkgs/development/libraries/haskell/lens/default.nix
+++ b/pkgs/development/libraries/haskell/lens/default.nix
@@ -11,8 +11,8 @@
 
 cabal.mkDerivation (self: {
   pname = "lens";
-  version = "4.4";
-  sha256 = "06ha4px4ywfbi0n3imy2qqjq3656snsz1b0ggkwzvdzmi550sh8w";
+  version = "4.4.0.1";
+  sha256 = "0d1z6jix58g7x9r1jvm335hg2psflqc7w6sq54q486wil55c5vrw";
   buildDepends = [
     bifunctors comonad contravariant distributive exceptions filepath
     free hashable mtl parallel primitive profunctors reflection

From f0478220d888f247c37a882df4a2ec82571b932c Mon Sep 17 00:00:00 2001
From: Patrick Mahoney <pat@polycrystal.org>
Date: Fri, 22 Aug 2014 23:22:55 -0500
Subject: [PATCH 0338/1453] skalibs: new package

Skalibs is a set of general-purpose C programming libraries used for
building all software at skarnet.org.
---
 .../development/libraries/skalibs/default.nix | 58 +++++++++++++++++++
 .../libraries/skalibs/getpeereid.patch        | 28 +++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 88 insertions(+)
 create mode 100644 pkgs/development/libraries/skalibs/default.nix
 create mode 100644 pkgs/development/libraries/skalibs/getpeereid.patch

diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix
new file mode 100644
index 000000000000..842d74848df6
--- /dev/null
+++ b/pkgs/development/libraries/skalibs/default.nix
@@ -0,0 +1,58 @@
+{stdenv, fetchurl}:
+
+let
+
+  version = "1.6.0.0";
+
+in stdenv.mkDerivation rec {
+  name = "skalibs-${version}";
+
+  src = fetchurl {
+    url = "http://skarnet.org/software/skalibs/${name}.tar.gz";
+    sha256 = "0jz3farll9n5jvz3g6wri99s6njkgmnf0r9jqjlg03f20dzv8c8w";
+  };
+
+  sourceRoot = "prog/${name}";
+
+  # See http://skarnet.org/cgi-bin/archive.cgi?1:mss:75:201405:pkmodhckjklemogbplje
+  patches = [ ./getpeereid.patch ];
+
+  configurePhase = ''
+    pushd conf-compile
+
+    printf "$out/bin"     > conf-defaultpath
+    printf "$out/etc"     > conf-etc
+    printf "$out/bin"     > conf-install-command
+    printf "$out/include" > conf-install-include
+    printf "$out/libexec" > conf-install-libexec
+    printf "$out/lib"     > conf-install-library
+    printf "$out/lib"     > conf-install-library.so
+    printf "$out/sysdeps" > conf-install-sysdeps
+
+    # let nix builder strip things, cross-platform
+    truncate --size 0 conf-stripbins
+    truncate --size 0 conf-striplibs
+
+    rm -f flag-slashpackage
+    touch flag-allstatic
+    touch flag-forcedevr
+
+    popd
+  '';
+
+  preBuild = ''
+    patchShebangs src/sys
+  '';
+
+  preInstall = ''
+    mkdir -p "$out/etc"
+  '';
+
+  meta = {
+    homepage = http://skarnet.org/software/skalibs/;
+    description = "A set of general-purpose C programming libraries.";
+    platforms = stdenv.lib.platforms.all;
+    license = stdenv.lib.licenses.isc;
+  };
+
+}
diff --git a/pkgs/development/libraries/skalibs/getpeereid.patch b/pkgs/development/libraries/skalibs/getpeereid.patch
new file mode 100644
index 000000000000..c366780e2670
--- /dev/null
+++ b/pkgs/development/libraries/skalibs/getpeereid.patch
@@ -0,0 +1,28 @@
+--- a/src/libstddjb/getpeereid.h
++++ b/src/libstddjb/getpeereid.h
+@@ -3,6 +3,14 @@
+ #ifndef GETPEEREID_H
+ #define GETPEEREID_H
+ 
++#include "sysdeps.h"
++
++#ifdef HASGETPEEREID
++/* syscall exists - do nothing */
++
++#else
++
+ extern int getpeereid (int, int *, int *) ;
+ 
+ #endif
++#endif
+--- a/src/libstddjb/ipc_eid.c
++++ b/src/libstddjb/ipc_eid.c
+@@ -5,7 +5,7 @@
+ 
+ int ipc_eid (int s, unsigned int *u, unsigned int *g)
+ {
+-  int dummyu, dummyg ;
++  unsigned int dummyu, dummyg ;
+   if (getpeereid(s, &dummyu, &dummyg) < 0) return -1 ;
+   *u = (unsigned int)dummyu ;
+   *g = (unsigned int)dummyg ;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 15da2e5e4e1e..6b90a705f1cc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6169,6 +6169,8 @@ let
 
   sfml_git = callPackage ../development/libraries/sfml { };
 
+  skalibs = callPackage ../development/libraries/skalibs { };
+
   slang = callPackage ../development/libraries/slang { };
 
   slibGuile = callPackage ../development/libraries/slib {

From d8d7cd7ef222ed69258c84d54b95a4caaf2516f3 Mon Sep 17 00:00:00 2001
From: Patrick Mahoney <pat@polycrystal.org>
Date: Fri, 22 Aug 2014 23:40:52 -0500
Subject: [PATCH 0339/1453] execline: new package

Execline is a small scripting language, to be used in place of a shell
in non-interactive scripts.
---
 pkgs/tools/misc/execline/default.nix | 54 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 2 files changed, 56 insertions(+)
 create mode 100644 pkgs/tools/misc/execline/default.nix

diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix
new file mode 100644
index 000000000000..ba0784138b31
--- /dev/null
+++ b/pkgs/tools/misc/execline/default.nix
@@ -0,0 +1,54 @@
+{stdenv, fetchurl, skalibs}:
+
+let
+
+  version = "1.3.1.1";
+
+in stdenv.mkDerivation rec {
+
+  name = "execline-${version}";
+
+  src = fetchurl {
+    url = "http://skarnet.org/software/execline/${name}.tar.gz";
+    sha256 = "1br3qzif166kbp4k813ljbyq058p7mfsp2lj88n8vi4dmj935nzg";
+  };
+
+  buildInputs = [ skalibs ];
+
+  sourceRoot = "admin/${name}";
+
+  configurePhase = ''
+    pushd conf-compile
+
+    printf "$out/bin"     > conf-install-command
+    printf "$out/include" > conf-install-include
+    printf "$out/lib"     > conf-install-library
+    printf "$out/lib"     > conf-install-library.so
+    printf "$out/sysdeps" > conf-install-sysdeps
+
+    printf "${skalibs}/sysdeps" > import
+    printf "${skalibs}/include" > path-include
+    printf "${skalibs}/lib"     > path-library
+
+    # let nix builder strip things, cross-platform
+    truncate --size 0 conf-stripbins
+    truncate --size 0 conf-striplibs
+
+    rm -f flag-slashpackage
+    touch flag-allstatic
+
+    popd
+  '';
+
+  preBuild = ''
+    patchShebangs src/sys
+  '';
+
+  meta = {
+    homepage = http://skarnet.org/software/execline/;
+    description = "A small scripting language, to be used in place of a shell in non-interactive scripts.";
+    platforms = stdenv.lib.platforms.all;
+    license = stdenv.lib.licenses.isc;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6b90a705f1cc..60a49c10ff4a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -987,6 +987,8 @@ let
 
   exempi = callPackage ../development/libraries/exempi { };
 
+  execline = callPackage ../tools/misc/execline { };
+
   exercism = callPackage ../development/tools/exercism { };
 
   exif = callPackage ../tools/graphics/exif { };

From f254687071f220fac357eb738c6c8751c1d5149b Mon Sep 17 00:00:00 2001
From: Patrick Mahoney <pat@polycrystal.org>
Date: Fri, 22 Aug 2014 23:42:13 -0500
Subject: [PATCH 0340/1453] s6: new package

s6 is skarnet.org's small & secure supervision software suite.

The s6-log program is modified to call execlineb directly rather than
searching PATH.
---
 pkgs/servers/s6/default.nix     | 57 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 59 insertions(+)
 create mode 100644 pkgs/servers/s6/default.nix

diff --git a/pkgs/servers/s6/default.nix b/pkgs/servers/s6/default.nix
new file mode 100644
index 000000000000..045e31207ba0
--- /dev/null
+++ b/pkgs/servers/s6/default.nix
@@ -0,0 +1,57 @@
+{stdenv, fetchurl, skalibs, execline}:
+
+let
+
+  version = "1.1.3.2";
+
+in stdenv.mkDerivation rec {
+
+  name = "s6-${version}";
+
+  src = fetchurl {
+    url = "http://www.skarnet.org/software/s6/${name}.tar.gz";
+    sha256 = "0djxdd3d3mlp63sjqqs0ilf8p68m86c1s98d82fl0kgaaibpsikp";
+  };
+
+  buildInputs = [ skalibs execline ];
+
+  sourceRoot = "admin/${name}";
+
+  configurePhase = ''
+    pushd conf-compile
+
+    printf "$out/bin"           > conf-install-command
+    printf "$out/include"       > conf-install-include
+    printf "$out/lib"           > conf-install-library
+    printf "$out/lib"           > conf-install-library.so
+    printf "$out/sysdeps"       > conf-install-sysdeps
+
+    # let nix builder strip things, cross-platform
+    truncate --size 0 conf-stripbins
+    truncate --size 0 conf-striplibs
+
+    printf "${skalibs}/sysdeps" > import
+    printf "%s\n%s" "${skalibs}/include" "${execline}/include" > path-include
+    printf "%s\n%s" "${skalibs}/lib"     "${execline}/lib"     > path-library
+
+    rm -f flag-slashpackage
+    touch flag-allstatic
+
+    popd
+  '';
+
+  preBuild = ''
+    substituteInPlace "src/daemontools-extras/s6-log.c" \
+      --replace '"execlineb"' '"${execline}/bin/execlineb"'
+
+    patchShebangs src/sys
+  '';
+
+  meta = {
+    homepage = http://www.skarnet.org/software/s6/;
+    description = "skarnet.org's small & secure supervision software suite.";
+    platforms = stdenv.lib.platforms.all;
+    license = stdenv.lib.licenses.isc;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 60a49c10ff4a..8f5ce8da047e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6982,6 +6982,8 @@ let
 
   rippled = callPackage ../servers/rippled { };
 
+  s6 = callPackage ../servers/s6 { };
+
   spamassassin = callPackage ../servers/mail/spamassassin {
     inherit (perlPackages) HTMLParser NetDNS NetAddrIP DBFile
       HTTPDate MailDKIM LWP IOSocketSSL;

From 1615be91ef522cfc9aaeb4eb37b8d3519cd08ea7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Wed, 9 Jul 2014 00:43:26 +0200
Subject: [PATCH 0341/1453] Add mlmmj package and nixos module.

---
 nixos/modules/misc/ids.nix            |   2 +
 nixos/modules/module-list.nix         |   1 +
 nixos/modules/services/mail/mlmmj.nix | 128 ++++++++++++++++++++++++++
 pkgs/servers/mail/mlmmj/default.nix   |  21 +++++
 pkgs/top-level/all-packages.nix       |   2 +
 5 files changed, 154 insertions(+)
 create mode 100644 nixos/modules/services/mail/mlmmj.nix
 create mode 100644 pkgs/servers/mail/mlmmj/default.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 9f509ba8cb94..b49837efd50e 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -142,6 +142,7 @@
       gdm = 132;
       dhcpd = 133;
       siproxd = 134;
+      mlmmj = 135;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -258,6 +259,7 @@
       gdm = 132;
       tss = 133;
       siproxd = 134;
+      mlmmj = 135;
 
       # When adding a gid, make sure it doesn't match an existing uid. And don't use gids above 399!
 
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 1fc2959bd8a0..c25110fc5b14 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -142,6 +142,7 @@
   ./services/mail/dovecot.nix
   ./services/mail/freepops.nix
   ./services/mail/mail.nix
+  ./services/mail/mlmmj.nix
   ./services/mail/opensmtpd.nix
   ./services/mail/postfix.nix
   ./services/mail/spamassassin.nix
diff --git a/nixos/modules/services/mail/mlmmj.nix b/nixos/modules/services/mail/mlmmj.nix
new file mode 100644
index 000000000000..637974f05cd1
--- /dev/null
+++ b/nixos/modules/services/mail/mlmmj.nix
@@ -0,0 +1,128 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.mlmmj;
+  stateDir = "/var/lib/mlmmj";
+  spoolDir = "/var/spool/mlmmj";
+  listDir = domain: list: "${spoolDir}/${domain}/${list}";
+  listCtl = domain: list: "${listDir domain list}/control";
+  transport = domain: list: "${domain}--${list}@local.list.mlmmj mlmmj:${domain}/${list}";
+  virtual = domain: list: "${list}@${domain} ${domain}--${list}@local.list.mlmmj";
+  alias = domain: list: "${list}: \"|${pkgs.mlmmj}/mlmmj-receive -L ${listDir domain list}/\"";
+  subjectPrefix = list: "[${list}]";
+  listAddress = domain: list: "${list}@${domain}";
+  customHeaders = list: domain: [ "List-Id: ${list}" "Reply-To: ${list}@${domain}" ];
+  footer = domain: list: "To unsubscribe send a mail to ${list}+unsubscribe@${domain}";
+  createList = d: l: ''
+    ${pkgs.coreutils}/bin/mkdir -p ${listCtl d l}
+    echo ${listAddress d l} > ${listCtl d l}/listadress
+    echo "${lib.concatStringsSep "\n" (customHeaders d l)}" > ${listCtl d l}/customheaders
+    echo ${footer d l} > ${listCtl d l}/footer
+    echo ${subjectPrefix l} > ${listCtl d l}/prefix
+  '';
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.mlmmj = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Enable mlmmj";
+      };
+
+      user = mkOption {
+        type = types.str;
+        default = "mlmmj";
+        description = "mailinglist local user";
+      };
+
+      group = mkOption {
+        type = types.str;
+        default = "mlmmj";
+        description = "mailinglist local group";
+      };
+
+      listDomain = mkOption {
+        type = types.str;
+        default = "localhost";
+        description = "Set the mailing list domain";
+      };
+
+      mailLists = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        description = "The collection of hosted maillists";
+      };
+
+    };
+
+  };
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    users.extraUsers = singleton {
+      name = cfg.user;
+      description = "mlmmj user";
+      home = stateDir;
+      createHome = true;
+      uid = config.ids.uids.mlmmj;
+      group = cfg.group;
+      useDefaultShell = true;
+    };
+
+    users.extraGroups = singleton {
+      name = cfg.group;
+      gid = config.ids.gids.mlmmj;
+    };
+
+    services.postfix = {
+      enable = true;
+      recipientDelimiter= "+";
+      extraMasterConf = ''
+        mlmmj unix - n n - - pipe flags=ORhu user=mlmmj argv=${pkgs.mlmmj}/bin/mlmmj-recieve -F -L ${spoolDir}/$nextHop
+      '';
+
+      extraAliases = concatMapStrings (alias cfg.listDomain) cfg.mailLists;
+
+      extraConfig = ''
+        transport = hash:${stateDir}/transports
+        virtual = hash:${stateDir}/virtuals
+      '';
+    };
+
+    environment.systemPackages = [ pkgs.mlmmj ];
+
+    system.activationScripts.mlmmj = ''
+          ${pkgs.coreutils}/bin/mkdir -p ${stateDir} ${spoolDir}/${cfg.listDomain}
+          ${pkgs.coreutils}/bin/chown -R ${cfg.user}:${cfg.group} ${spoolDir}
+          ${lib.concatMapStrings (createList cfg.listDomain) cfg.mailLists}
+          echo ${lib.concatMapStrings (virtual cfg.listDomain) cfg.mailLists} > ${stateDir}/virtuals
+          echo ${cfg.listDomain} mailman: > ${stateDir}/transports
+          echo ${lib.concatMapStrings (transport cfg.listDomain) cfg.mailLists} >> ${stateDir}/transports
+    '';
+
+    systemd.services."mlmmj-maintd" = {
+      description = "mlmmj maintenance daemon";
+      wantedBy = [ "multi-user.target" ];
+
+      serviceConfig = {
+        User = cfg.user;
+        Group = cfg.group;
+        ExecStart = "${pkgs.mlmmj}/bin/mlmmj-maintd -F -d ${spoolDir}/${cfg.listDomain}";
+      };
+    };
+
+  };
+
+}
diff --git a/pkgs/servers/mail/mlmmj/default.nix b/pkgs/servers/mail/mlmmj/default.nix
new file mode 100644
index 000000000000..2ad6dedbf697
--- /dev/null
+++ b/pkgs/servers/mail/mlmmj/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, pkgconfig }:
+
+stdenv.mkDerivation rec {
+
+  name = "mlmmj-${version}";
+  version = "1.2.18.1";
+
+  src = fetchurl {
+    url = "http://mlmmj.org/releases/${name}.tar.gz";
+    sha256 = "336b6b20a6d7f0dcdc7445ecea0fe4bdacee241f624fcc710b4341780f35e383";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = http://mlmmj.org;
+    description = "Mailing List Management Made Joyful";
+    maintainers = [ maintainers.edwtjo ];
+    platforms = platforms.linux;
+    license = licenses.mit;
+  };
+
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8f5ce8da047e..f353314674fe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6853,6 +6853,8 @@ let
 
   miniHttpd = callPackage ../servers/http/mini-httpd {};
 
+  mlmmj = callPackage ../servers/mail/mlmmj { };
+
   myserver = callPackage ../servers/http/myserver { };
 
   nginx = callPackage ../servers/http/nginx {

From f439cc7cf6f989e79cfdb8bab90b51737da23e1a Mon Sep 17 00:00:00 2001
From: Vincent Laporte <vincent.laporte@gmail.com>
Date: Sun, 6 Jul 2014 17:41:40 +0200
Subject: [PATCH 0342/1453] Adds javalib and sawja

Javalib is a library that parses Java .class files into OCaml data
structures. Sawja is a library written in OCaml, relying on Javalib to
provide a high level representation of Java bytecode programs.

Homepage: http://sawja.inria.fr/
---
 .../ocaml-modules/extlib/default.nix          |  6 +--
 .../javalib/Makefile.config.example.patch     |  9 +++++
 .../ocaml-modules/javalib/configure.sh.patch  | 11 +++++
 .../ocaml-modules/javalib/default.nix         | 40 +++++++++++++++++++
 .../sawja/Makefile.config.example.patch       |  9 +++++
 .../ocaml-modules/sawja/configure.sh.patch    | 11 +++++
 .../ocaml-modules/sawja/default.nix           | 33 +++++++++++++++
 pkgs/top-level/all-packages.nix               |  9 +++++
 8 files changed, 125 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/ocaml-modules/javalib/Makefile.config.example.patch
 create mode 100644 pkgs/development/ocaml-modules/javalib/configure.sh.patch
 create mode 100644 pkgs/development/ocaml-modules/javalib/default.nix
 create mode 100644 pkgs/development/ocaml-modules/sawja/Makefile.config.example.patch
 create mode 100644 pkgs/development/ocaml-modules/sawja/configure.sh.patch
 create mode 100644 pkgs/development/ocaml-modules/sawja/default.nix

diff --git a/pkgs/development/ocaml-modules/extlib/default.nix b/pkgs/development/ocaml-modules/extlib/default.nix
index 8b977dd7c525..7bc7e3989488 100644
--- a/pkgs/development/ocaml-modules/extlib/default.nix
+++ b/pkgs/development/ocaml-modules/extlib/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ocaml, findlib}:
+{stdenv, fetchurl, ocaml, findlib, minimal ? true}:
 
 stdenv.mkDerivation {
   name = "ocaml-extlib-1.6.1";
@@ -14,8 +14,8 @@ stdenv.mkDerivation {
 
   configurePhase = "true";      # Skip configure
   # De facto, option minimal=1 seems to be the default.  See the README.
-  buildPhase     = "make minimal=1 build";
-  installPhase   = "make minimal=1 install";
+  buildPhase     = "make ${if minimal then "minimal=1" else ""} build";
+  installPhase   = "make ${if minimal then "minimal=1" else ""} install";
 
   meta = {
     homepage = http://code.google.com/p/ocaml-extlib/;
diff --git a/pkgs/development/ocaml-modules/javalib/Makefile.config.example.patch b/pkgs/development/ocaml-modules/javalib/Makefile.config.example.patch
new file mode 100644
index 000000000000..c06144a75c06
--- /dev/null
+++ b/pkgs/development/ocaml-modules/javalib/Makefile.config.example.patch
@@ -0,0 +1,9 @@
+--- javalib-2.3-orig/Makefile.config.example	2013-10-30 08:35:30.000000000 +0100
++++ javalib-2.3/Makefile.config.example	2014-07-06 17:32:29.799398394 +0200
+@@ -1,6 +1,3 @@
+-export OCAMLFIND_DESTDIR=$(LOCALDEST)
+-export OCAMLPATH=$(LOCALDEST)
+-
+ OCAMLC = $(FINDER) ocamlc $(FLAGS)
+ OCAMLOPT = $(FINDER) ocamlopt $(OPT_FLAGS)
+ OCAMLDOC = $(FINDER) ocamldoc
diff --git a/pkgs/development/ocaml-modules/javalib/configure.sh.patch b/pkgs/development/ocaml-modules/javalib/configure.sh.patch
new file mode 100644
index 000000000000..67e019b277af
--- /dev/null
+++ b/pkgs/development/ocaml-modules/javalib/configure.sh.patch
@@ -0,0 +1,11 @@
+--- javalib-2.3-orig/configure.sh	2013-10-30 08:35:30.000000000 +0100
++++ javalib-2.3/configure.sh	2014-07-06 17:28:39.025066199 +0200
+@@ -44,7 +44,7 @@
+ DESTDIR=
+ # The ocamlpath variable for the compiler to locate the locally-installed
+ # packages (depends on LOCALDEST)
+-OCAMLPATH=
++#OCAMLPATH=
+ # The packages that need to be made in addition to Savalib / Sawja
+ MAKEDEP=
+ # The packages that need to be made in addition to Savalib / Sawja
diff --git a/pkgs/development/ocaml-modules/javalib/default.nix b/pkgs/development/ocaml-modules/javalib/default.nix
new file mode 100644
index 000000000000..2fa72dcf07f1
--- /dev/null
+++ b/pkgs/development/ocaml-modules/javalib/default.nix
@@ -0,0 +1,40 @@
+{stdenv, fetchurl, which, ocaml, findlib, camlzip, extlib}:
+let
+  pname = "javalib";
+  version = "2.3";
+  webpage = "http://sawja.inria.fr/";
+  ocaml_version = (builtins.parseDrvName ocaml.name).version;
+in
+stdenv.mkDerivation rec {
+
+  name = "ocaml-${pname}-${version}";
+
+  src = fetchurl {
+    url = "https://gforge.inria.fr/frs/download.php/33090/${pname}-${version}.tar.bz2";
+    sha256 = "1i8djcanzm250mwilm3jfy37cz0k0x7jbnrz8a5vvdi91kyzh52j";
+  };
+
+  buildInputs = [ which ocaml findlib camlzip extlib ];
+
+  patches = [ ./configure.sh.patch ./Makefile.config.example.patch ];
+
+  createFindlibDestdir = true;
+
+  configureScript = "./configure.sh";
+  dontAddPrefix = "true";
+
+  preBuild = ''
+    make ptrees;
+    make installptrees;
+    export OCAMLPATH=$out/lib/ocaml/${ocaml_version}/site-lib/:$OCAMLPATH;
+  '';
+
+  propagatedBuildInputs = [ camlzip extlib ];
+
+  meta = {
+    description = "A library that parses Java .class files into OCaml data structures";
+    homepage = "${webpage}";
+    license = stdenv.lib.licenses.lgpl3;
+    platforms = ocaml.meta.platforms;
+  };
+}
diff --git a/pkgs/development/ocaml-modules/sawja/Makefile.config.example.patch b/pkgs/development/ocaml-modules/sawja/Makefile.config.example.patch
new file mode 100644
index 000000000000..4f2cc99e76b2
--- /dev/null
+++ b/pkgs/development/ocaml-modules/sawja/Makefile.config.example.patch
@@ -0,0 +1,9 @@
+--- sawja-1.5-orig/Makefile.config.example	2013-10-30 08:35:29.000000000 +0100
++++ sawja-1.5/Makefile.config.example	2014-07-05 18:54:37.902423482 +0200
+@@ -1,6 +1,3 @@
+-export OCAMLFIND_DESTDIR=$(LOCALDEST)
+-export OCAMLPATH=$(LOCALDEST)
+-
+ RECODE=-charset utf-8
+ DOCDIR = doc/api
+ 
diff --git a/pkgs/development/ocaml-modules/sawja/configure.sh.patch b/pkgs/development/ocaml-modules/sawja/configure.sh.patch
new file mode 100644
index 000000000000..8165de242f57
--- /dev/null
+++ b/pkgs/development/ocaml-modules/sawja/configure.sh.patch
@@ -0,0 +1,11 @@
+--- sawja-1.5-orig/configure.sh	2013-10-30 08:35:29.000000000 +0100
++++ sawja-1.5/configure.sh	2014-07-05 18:50:26.833798254 +0200
+@@ -39,7 +39,7 @@
+ DESTDIR=
+ # The ocamlpath variable for the compiler to locate the locally-installed
+ # packages (depends on LOCALDEST)
+-OCAMLPATH=
++#OCAMLPATH=
+ # The path to ocamlfind
+ FINDER=`which ocamlfind`
+ # The perl executable
diff --git a/pkgs/development/ocaml-modules/sawja/default.nix b/pkgs/development/ocaml-modules/sawja/default.nix
new file mode 100644
index 000000000000..bed87a50f81d
--- /dev/null
+++ b/pkgs/development/ocaml-modules/sawja/default.nix
@@ -0,0 +1,33 @@
+{stdenv, fetchurl, which, perl, ocaml, findlib, javalib }:
+let
+  pname = "sawja";
+  version = "1.5";
+  webpage = "http://sawja.inria.fr/";
+in
+stdenv.mkDerivation rec {
+
+  name = "ocaml-${pname}-${version}";
+
+  src = fetchurl {
+    url = "https://gforge.inria.fr/frs/download.php/33091/${pname}-${version}.tar.bz2";
+    sha256 = "0i8qgqkw9vgj6k2g6npss268ivxdkzx5qj2a52jbd8ih59rn68cm";
+  };
+
+  buildInputs = [ which perl ocaml findlib javalib ];
+
+  patches = [ ./configure.sh.patch ./Makefile.config.example.patch ];
+
+  createFindlibDestdir = true;
+
+  configureScript = "./configure.sh";
+  dontAddPrefix = "true";
+
+  propagatedBuildInputs = [ javalib ];
+
+  meta = {
+    description = "A library written in OCaml, relying on Javalib to provide a high level representation of Java bytecode programs";
+    homepage = "${webpage}";
+    license = stdenv.lib.licenses.gpl3Plus;
+    platforms = ocaml.meta.platforms;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c536e677dbee..a97f2c8c411d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3232,6 +3232,10 @@ let
 
     findlib = callPackage ../development/tools/ocaml/findlib { };
 
+    javalib = callPackage ../development/ocaml-modules/javalib {
+      extlib = ocaml_extlib_maximal;
+    };
+
     dypgen = callPackage ../development/ocaml-modules/dypgen { };
 
     patoline = callPackage ../tools/typesetting/patoline { };
@@ -3307,6 +3311,9 @@ let
     ocaml_sexplib = callPackage ../development/ocaml-modules/sexplib { };
 
     ocaml_extlib = callPackage ../development/ocaml-modules/extlib { };
+    ocaml_extlib_maximal = callPackage ../development/ocaml-modules/extlib {
+      minimal = false;
+    };
 
     pycaml = callPackage ../development/ocaml-modules/pycaml { };
 
@@ -3314,6 +3321,8 @@ let
     opam_1_1 = callPackage ../development/tools/ocaml/opam/1.1.nix { };
     opam = opam_1_1;
 
+    sawja = callPackage ../development/ocaml-modules/sawja { };
+
     uucd = callPackage ../development/ocaml-modules/uucd { };
     uunf = callPackage ../development/ocaml-modules/uunf { };
     uutf = callPackage ../development/ocaml-modules/uutf { };

From 6f50af7206950447cfc9232333e9a4a605c71a39 Mon Sep 17 00:00:00 2001
From: Jos van den Oever <jos@vandenoever.info>
Date: Sun, 25 May 2014 11:30:58 +0200
Subject: [PATCH 0343/1453] Some additional android runtimes.

---
 pkgs/development/mobile/androidenv/default.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix
index bc022bd70b4b..422c1516f2d0 100644
--- a/pkgs/development/mobile/androidenv/default.nix
+++ b/pkgs/development/mobile/androidenv/default.nix
@@ -52,6 +52,12 @@ rec {
     alsaLib_32bit = pkgs_i686.alsaLib;
   };
   
+  androidsdk_2_1 = androidsdk {
+    platformVersions = [ "7" ];
+    abiVersions = [ "armeabi-v7a" ];
+    useGoogleAPIs = true;
+  };
+  
   androidsdk_2_2 = androidsdk {
     platformVersions = [ "8" ];
     abiVersions = [ "armeabi-v7a" ];
@@ -82,6 +88,12 @@ rec {
     useGoogleAPIs = true;
   };
 
+  androidsdk_4_4 = androidsdk {
+    platformVersions = [ "19" ];
+    abiVersions = [ "armeabi-v7a" "x86" ];
+    useGoogleAPIs = true;
+  };
+
   androidndk = import ./androidndk.nix {
     inherit (pkgs) stdenv fetchurl zlib ncurses;
   };

From 503b8afa3faedf6398a5be8e86454bbf6af6baea Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sat, 16 Aug 2014 23:53:03 +0200
Subject: [PATCH 0344/1453] Add neo4j database

---
 pkgs/servers/nosql/neo4j/default.nix | 39 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/servers/nosql/neo4j/default.nix

diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix
new file mode 100644
index 000000000000..91c4472e0492
--- /dev/null
+++ b/pkgs/servers/nosql/neo4j/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchurl, makeWrapper, jre, which, gnused }:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  name = "neo4j-${version}";
+  version = "2.1.3";
+
+  src = fetchurl {
+    url = "http://dist.neo4j.org/neo4j-community-${version}-unix.tar.gz";
+    sha256 = "0gcyy6ayn8qvxj6za5463lgy320mn4rq7q5qysc26fxjd73drrrk";
+  };
+
+  buildInputs = [ makeWrapper jre which gnused ];
+
+  patchPhase = ''
+    substituteInPlace "bin/neo4j" --replace "NEO4J_INSTANCE=\$NEO4J_HOME" ""
+  '';
+
+  installPhase = ''
+    mkdir -p "$out/share/neo4j"
+    cp -R * "$out/share/neo4j"
+
+    mkdir -p "$out/bin"
+    makeWrapper "$out/share/neo4j/bin/neo4j" "$out/bin/neo4j" \
+        --prefix PATH : "${jre}/bin:${which}/bin:${gnused}/bin"
+    makeWrapper "$out/share/neo4j/bin/neo4j-shell" "$out/bin/neo4j-shell" \
+        --prefix PATH : "${jre}/bin:${which}/bin:${gnused}/bin"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "a highly scalable, robust (fully ACID) native graph database";
+    homepage = "http://www.neo4j.org/";
+    license = licenses.gpl3;
+
+    maintainers = [ maintainers.offline ];
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d448c606d37f..b93b3bdcfca5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6952,6 +6952,8 @@ let
 
   nagiosPluginsOfficial = callPackage ../servers/monitoring/nagios/plugins/official-2.x.nix { };
 
+  neo4j = callPackage ../servers/nosql/neo4j { };
+
   net_snmp = callPackage ../servers/monitoring/net-snmp { };
 
   oidentd = callPackage ../servers/identd/oidentd { };

From 84ea03fa3f91e40c68155a18919a28939c99d895 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sat, 16 Aug 2014 23:53:26 +0200
Subject: [PATCH 0345/1453] nixos: add neo4j database module

---
 nixos/modules/misc/ids.nix                 |   1 +
 nixos/modules/module-list.nix              |   1 +
 nixos/modules/services/databases/neo4j.nix | 143 +++++++++++++++++++++
 3 files changed, 145 insertions(+)
 create mode 100644 nixos/modules/services/databases/neo4j.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index b49837efd50e..515105d886ae 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -143,6 +143,7 @@
       dhcpd = 133;
       siproxd = 134;
       mlmmj = 135;
+      neo4j = 136;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index c25110fc5b14..553f8db36966 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -100,6 +100,7 @@
   ./services/databases/monetdb.nix
   ./services/databases/mongodb.nix
   ./services/databases/mysql.nix
+  ./services/databases/neo4j.nix 
   ./services/databases/openldap.nix
   ./services/databases/postgresql.nix
   ./services/databases/redis.nix
diff --git a/nixos/modules/services/databases/neo4j.nix b/nixos/modules/services/databases/neo4j.nix
new file mode 100644
index 000000000000..2ef49a95166e
--- /dev/null
+++ b/nixos/modules/services/databases/neo4j.nix
@@ -0,0 +1,143 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.neo4j;
+
+  serverConfig = pkgs.writeText "neo4j-server.properties" ''
+    org.neo4j.server.database.location=${cfg.dataDir}/data/graph.db
+    org.neo4j.server.webserver.address=${cfg.host}
+    org.neo4j.server.webserver.port=${toString cfg.port}
+    ${optionalString cfg.enableHttps ''
+      org.neo4j.server.webserver.https.enabled=true
+      org.neo4j.server.webserver.https.port=${toString cfg.httpsPort}
+      org.neo4j.server.webserver.https.cert.location=${cfg.cert}
+      org.neo4j.server.webserver.https.key.location=${cfg.key}
+      org.neo4j.server.webserver.https.keystore.location=${cfg.dataDir}/data/keystore
+    ''}
+    org.neo4j.server.webadmin.rrdb.location=${cfg.dataDir}/data/rrd
+    org.neo4j.server.webadmin.data.uri=/db/data/
+    org.neo4j.server.webadmin.management.uri=/db/manage/
+    org.neo4j.server.db.tuning.properties=${pkgs.neo4j}/share/neo4j/conf/neo4j.properties
+    org.neo4j.server.manage.console_engines=shell
+    ${cfg.extraServerConfig}
+  '';
+
+  loggingConfig = pkgs.writeText "logging.properties" cfg.loggingConfig;
+
+  wrapperConfig = pkgs.writeText "neo4j-wrapper.conf" ''
+    wrapper.java.additional=-Dorg.neo4j.server.properties=${serverConfig}
+    wrapper.java.additional=-Djava.util.logging.config.file=${loggingConfig}
+    wrapper.java.additional=-XX:+UseConcMarkSweepGC
+    wrapper.java.additional=-XX:+CMSClassUnloadingEnabled
+    wrapper.pidfile=${cfg.dataDir}/neo4j-server.pid
+    wrapper.name=neo4j
+  '';
+
+in {
+
+  ###### interface
+
+  options.services.neo4j = {
+    enable = mkOption {
+      description = "Whether to enable neo4j.";
+      default = false;
+      type = types.uniq types.bool;
+    };
+
+    host = mkOption {
+      description = "Neo4j listen address.";
+      default = "127.0.0.1";
+      type = types.str;
+    };
+
+    port = mkOption {
+      description = "Neo4j port to listen for HTTP traffic.";
+      default = 7474;
+      type = types.int;
+    };
+
+    enableHttps = mkOption {
+      description = "Enable https for Neo4j.";
+      default = false;
+      type = types.bool;
+    };
+
+    httpsPort = mkOption {
+      description = "Neo4j port to listen for HTTPS traffic.";
+      default = 7473;
+      type = types.int;
+    };
+
+    cert = mkOption {
+      description = "Neo4j https certificate.";
+      default = "${cfg.dataDir}/conf/ssl/neo4j.cert";
+      type = types.path;
+    };
+
+    key = mkOption {
+      description = "Neo4j https certificate key.";
+      default = "${cfg.dataDir}/conf/ssl/neo4j.key";
+      type = types.path;
+    };
+
+    dataDir = mkOption {
+      description = "Neo4j data directory.";
+      default = "/var/lib/neo4j";
+      type = types.path;
+    };
+
+    loggingConfig = mkOption {
+      description = "Neo4j logging configuration.";
+      default = ''
+        handlers=java.util.logging.ConsoleHandler
+        .level=INFO
+        org.neo4j.server.level=INFO
+
+        java.util.logging.ConsoleHandler.level=INFO
+        java.util.logging.ConsoleHandler.formatter=org.neo4j.server.logging.SimpleConsoleFormatter
+        java.util.logging.ConsoleHandler.filter=org.neo4j.server.logging.NeoLogFilter
+      '';
+      type = types.lines;
+    };
+
+    extraServerConfig = mkOption {
+      description = "Extra configuration for neo4j server.";
+      default = "";
+      type = types.lines;
+    };
+
+  };
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+    systemd.services.neo4j = {
+      description = "Neo4j Daemon";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network-interfaces.target" ];
+      environment = { NEO4J_INSTANCE = cfg.dataDir; };
+      serviceConfig = {
+        ExecStart = "${pkgs.neo4j}/bin/neo4j console";
+        User = "neo4j";
+        PermissionsStartOnly = true;
+      };
+      preStart = ''
+        mkdir -m 0700 -p ${cfg.dataDir}/{data/graph.db,conf}
+        ln -fs ${wrapperConfig} ${cfg.dataDir}/conf/neo4j-wrapper.conf
+        if [ "$(id -u)" = 0 ]; then chown -R neo4j ${cfg.dataDir}; fi
+      '';
+    };
+
+    environment.systemPackages = [ pkgs.neo4j ];
+
+    users.extraUsers = singleton {
+      name = "neo4j";
+      uid = config.ids.uids.neo4j;
+      description = "Neo4j daemon user";
+      home = cfg.dataDir;
+    };
+  };
+
+}

From 5722f4950a68d86674b982c10fd4bd182fdb5e3a Mon Sep 17 00:00:00 2001
From: Jos van den Oever <jos@vandenoever.info>
Date: Tue, 24 Jun 2014 17:03:58 +0200
Subject: [PATCH 0346/1453] Install runtime executables for k3b.

---
 pkgs/applications/misc/k3b/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/applications/misc/k3b/default.nix b/pkgs/applications/misc/k3b/default.nix
index 06565065ce54..b220c9127de6 100644
--- a/pkgs/applications/misc/k3b/default.nix
+++ b/pkgs/applications/misc/k3b/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, cmake, qt4, perl, shared_mime_info, libvorbis, taglib
 , flac, libsamplerate, libdvdread, lame, libsndfile, libmad, gettext
+, transcode, cdrdao, dvdplusrwtools, vcdimager
 , kdelibs, kdemultimedia, automoc4, phonon, libkcddb ? null
 }:
 
@@ -20,6 +21,11 @@ stdenv.mkDerivation rec {
     ];
 
   enableParallelBuilding = true;
+
+  # at runtime, k3b needs the executables cdrdao, cdrecord, dvd+rw-format,
+  # eMovix, growisofs, mkisofs, normalize, readcd, transcode, vcdxbuild,
+  # vcdxminfo, and vcdxrip
+  propagatedUserEnvPkgs = [ transcode dvdplusrwtools cdrdao vcdimager ];
                   
   meta = with stdenv.lib; {
     description = "CD/DVD Burning Application for KDE";

From 1ff1fe44d9b3ffd032f6a50fc8d7fd457740b711 Mon Sep 17 00:00:00 2001
From: Aycan iRiCAN <iricanaycan@gmail.com>
Date: Sat, 23 Aug 2014 12:28:35 +0300
Subject: [PATCH 0347/1453] Added myself to maintainer of hdaemonize and
 hweblib

---
 lib/maintainers.nix                                       | 1 +
 pkgs/development/libraries/haskell/hdaemonize/default.nix | 1 +
 pkgs/development/libraries/haskell/hweblib/default.nix    | 1 +
 3 files changed, 3 insertions(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 78f0d619cb0e..8c975b486f1e 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -19,6 +19,7 @@
   astsmtl = "Alexander Tsamutali <astsmtl@yandex.ru>";
   aszlig = "aszlig <aszlig@redmoonstudios.org>";
   auntie = "Jonathan Glines <auntieNeo@gmail.com>";
+  aycanirican = "Aycan iRiCAN <iricanaycan@gmail.com>";
   bbenoist = "Baptist BENOIST <return_0@live.com>";
   bennofs = "Benno Fünfstück <benno.fuenfstueck@gmail.com>";
   berdario = "Dario Bertini <berdario@gmail.com>";
diff --git a/pkgs/development/libraries/haskell/hdaemonize/default.nix b/pkgs/development/libraries/haskell/hdaemonize/default.nix
index e342773775d0..f5a67b49626d 100644
--- a/pkgs/development/libraries/haskell/hdaemonize/default.nix
+++ b/pkgs/development/libraries/haskell/hdaemonize/default.nix
@@ -12,5 +12,6 @@ cabal.mkDerivation (self: {
     description = "Library to handle the details of writing daemons for UNIX";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.aycanirican ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hweblib/default.nix b/pkgs/development/libraries/haskell/hweblib/default.nix
index 1ce64baa09cb..93e0bd622747 100644
--- a/pkgs/development/libraries/haskell/hweblib/default.nix
+++ b/pkgs/development/libraries/haskell/hweblib/default.nix
@@ -13,5 +13,6 @@ cabal.mkDerivation (self: {
     description = "Haskell Web Library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.aycanirican ];
   };
 })

From 01cc5a98d675ed7a95bc238dce1f8826a3eae8f6 Mon Sep 17 00:00:00 2001
From: Jos van den Oever <jos@vandenoever.info>
Date: Sat, 23 Aug 2014 11:21:51 +0200
Subject: [PATCH 0348/1453] qt-5.3: update to 5.3.1

---
 pkgs/development/libraries/qt-5/qt-5.3.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/qt-5.3.nix b/pkgs/development/libraries/qt-5/qt-5.3.nix
index 1722a1e52a19..18b464c6f248 100644
--- a/pkgs/development/libraries/qt-5/qt-5.3.nix
+++ b/pkgs/development/libraries/qt-5/qt-5.3.nix
@@ -18,7 +18,7 @@ with stdenv.lib;
 
 let
   v_maj = "5.3";
-  v_min = "0";
+  v_min = "1";
   ver = "${v_maj}.${v_min}";
 in
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchurl {
     url = "http://download.qt-project.org/official_releases/qt/"
       + "${v_maj}/${ver}/single/qt-everywhere-opensource-src-${ver}.tar.gz";
-    sha256 = "09gp19377zpqyfzk063b3pjz8gjm2x7xsj71bdpmnhs1scz0khcj";
+    sha256 = "189mgfqxjg0jp0vkfrj55p9brl018wzf7lir8yjr0pajp8jqd2ds";
   };
 
   # The version property must be kept because it will be included into the QtSDK package name

From bd32f323d81c59a9c9373422c49b5c57883296d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 23 Aug 2014 11:39:05 +0200
Subject: [PATCH 0349/1453] k3d: move patches into source

---
 .../graphics/k3d/debian-patches.nix           | 14 -----
 .../graphics/k3d/debian-patches.txt           |  3 --
 pkgs/applications/graphics/k3d/default.nix    | 12 +++--
 .../k3d/disable_mutable_in_boost_gil.patch    | 20 +++++++
 .../graphics/k3d/k3d-0.7.11.0-libpng14.patch  | 54 +++++++++++++++++++
 .../graphics/k3d/k3d_gtkmm224.patch           | 40 ++++++++++++++
 6 files changed, 121 insertions(+), 22 deletions(-)
 delete mode 100644 pkgs/applications/graphics/k3d/debian-patches.nix
 delete mode 100644 pkgs/applications/graphics/k3d/debian-patches.txt
 create mode 100644 pkgs/applications/graphics/k3d/disable_mutable_in_boost_gil.patch
 create mode 100644 pkgs/applications/graphics/k3d/k3d-0.7.11.0-libpng14.patch
 create mode 100644 pkgs/applications/graphics/k3d/k3d_gtkmm224.patch

diff --git a/pkgs/applications/graphics/k3d/debian-patches.nix b/pkgs/applications/graphics/k3d/debian-patches.nix
deleted file mode 100644
index cf6b47ee9597..000000000000
--- a/pkgs/applications/graphics/k3d/debian-patches.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# Generated by debian-patches.sh from debian-patches.txt
-let
-  prefix = "http://patch-tracker.debian.org/patch/series/dl/k3d/0.8.0.2-18";
-in
-[
-  {
-    url = "${prefix}/disable_mutable_in_boost_gil.patch";
-    sha256 = "037l86h2hszqgw8arqpzprz5qvngsb61i7lpww617mkvqrc4hiq3";
-  }
-  {
-    url = "${prefix}/k3d_gtkmm224.patch";
-    sha256 = "1c7z2zkqs9qw185q7bhz6vvzl6vlf1zpg9vlhc1f0cz9rgak3gji";
-  }
-]
diff --git a/pkgs/applications/graphics/k3d/debian-patches.txt b/pkgs/applications/graphics/k3d/debian-patches.txt
deleted file mode 100644
index a9b4abed2f09..000000000000
--- a/pkgs/applications/graphics/k3d/debian-patches.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-k3d/0.8.0.2-15
-disable_mutable_in_boost_gil.patch
-k3d_gtkmm224.patch
diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix
index 9f31d94ac7fb..35f3bed866d1 100644
--- a/pkgs/applications/graphics/k3d/default.nix
+++ b/pkgs/applications/graphics/k3d/default.nix
@@ -12,11 +12,13 @@ stdenv.mkDerivation rec {
     sha256 = "01fd2qb0zddif3wz1a2wdmwyzn81cf73678qp2gjs8iikmdz6w7x";
   };
 
-  patches = map fetchurl ((import ./debian-patches.nix) ++
-    [ {
-      url = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-gfx/k3d/files/k3d-0.7.11.0-libpng14.patch;
-      sha256 = "1vl7dbvxg9b54ay0n8dd2v2k3j001h8h1bpr1cbm3vrzv31lnwzx";
-    } ]);
+  patches = [
+    # debian package source
+    ./disable_mutable_in_boost_gil.patch
+    ./k3d_gtkmm224.patch
+    # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-gfx/k3d/files/k3d-0.7.11.0-libpng14.patch
+    ./k3d-0.7.11.0-libpng14.patch
+  ];
 
   preConfigure = ''
     export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/build/lib"
diff --git a/pkgs/applications/graphics/k3d/disable_mutable_in_boost_gil.patch b/pkgs/applications/graphics/k3d/disable_mutable_in_boost_gil.patch
new file mode 100644
index 000000000000..1774328c6186
--- /dev/null
+++ b/pkgs/applications/graphics/k3d/disable_mutable_in_boost_gil.patch
@@ -0,0 +1,20 @@
+--- a/k3dsdk/gil/boost/gil/extension/dynamic_image/apply_operation_base.hpp
++++ b/k3dsdk/gil/boost/gil/extension/dynamic_image/apply_operation_base.hpp
+@@ -114,7 +114,7 @@
+     template <typename T2, typename Op>
+     struct reduce_bind1 {
+         const T2& _t2;
+-        mutable Op&  _op;
++        Op&  _op;
+ 
+         typedef typename Op::result_type result_type;
+ 
+@@ -127,7 +127,7 @@
+     struct reduce_bind2 {
+         const Bits1& _bits1;
+         std::size_t _index1;
+-        mutable Op&  _op;
++        Op&  _op;
+ 
+         typedef typename Op::result_type result_type;
+ 
diff --git a/pkgs/applications/graphics/k3d/k3d-0.7.11.0-libpng14.patch b/pkgs/applications/graphics/k3d/k3d-0.7.11.0-libpng14.patch
new file mode 100644
index 000000000000..b54168227b40
--- /dev/null
+++ b/pkgs/applications/graphics/k3d/k3d-0.7.11.0-libpng14.patch
@@ -0,0 +1,54 @@
+diff -ur k3d-source-0.7.11.0.orig/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp k3d-source-0.7.11.0/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp
+--- k3d-source-0.7.11.0.orig/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp	2009-03-19 22:28:53.000000000 +0200
++++ k3d-source-0.7.11.0/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp	2010-05-12 12:21:50.000000000 +0300
+@@ -148,12 +148,12 @@
+         // allocate/initialize the image information data
+         _info_ptr = png_create_info_struct(_png_ptr);
+         if (_info_ptr == NULL) {
+-            png_destroy_read_struct(&_png_ptr,png_infopp_NULL,png_infopp_NULL);
++            png_destroy_read_struct(&_png_ptr,NULL,NULL);
+             io_error("png_get_file_size: fail to call png_create_info_struct()");
+         }
+         if (setjmp(png_jmpbuf(_png_ptr))) {
+             //free all of the memory associated with the png_ptr and info_ptr
+-            png_destroy_read_struct(&_png_ptr, &_info_ptr, png_infopp_NULL);
++            png_destroy_read_struct(&_png_ptr, &_info_ptr, NULL);
+             io_error("png_get_file_size: fail to call setjmp()");
+         }
+         png_init_io(_png_ptr, get());
+@@ -165,7 +165,7 @@
+     png_reader(const char* filename) : file_mgr(filename, "rb") { init(); }
+ 
+     ~png_reader() {
+-        png_destroy_read_struct(&_png_ptr,&_info_ptr,png_infopp_NULL);
++        png_destroy_read_struct(&_png_ptr,&_info_ptr,NULL);
+     }
+     point2<std::ptrdiff_t> get_dimensions() {
+         return point2<std::ptrdiff_t>(png_get_image_width(_png_ptr,_info_ptr),
+@@ -177,7 +177,7 @@
+         int bit_depth, color_type, interlace_type;
+         png_get_IHDR(_png_ptr, _info_ptr,
+                      &width, &height,&bit_depth,&color_type,&interlace_type,
+-                     int_p_NULL, int_p_NULL);
++                     (int *) NULL, (int *) NULL);
+         io_error_if(((png_uint_32)view.width()!=width || (png_uint_32)view.height()!= height),
+                     "png_read_view: input view size does not match PNG file size");
+         
+@@ -219,7 +219,7 @@
+         int bit_depth, color_type, interlace_type;
+         png_get_IHDR(_png_ptr, _info_ptr,
+                      &width, &height,&bit_depth,&color_type,&interlace_type,
+-                     int_p_NULL, int_p_NULL);
++                     (int *) NULL, (int *) NULL);
+         io_error_if(((png_uint_32)view.width()!=width || (png_uint_32)view.height()!= height),
+                     "png_reader_color_convert::apply(): input view size does not match PNG file size");
+         switch (color_type) {
+@@ -308,7 +308,7 @@
+         io_error_if(!_png_ptr,"png_write_initialize: fail to call png_create_write_struct()");
+         _info_ptr = png_create_info_struct(_png_ptr);
+         if (!_info_ptr) {
+-            png_destroy_write_struct(&_png_ptr,png_infopp_NULL);
++            png_destroy_write_struct(&_png_ptr,NULL);
+             io_error("png_write_initialize: fail to call png_create_info_struct()");
+         }
+         if (setjmp(png_jmpbuf(_png_ptr))) {
diff --git a/pkgs/applications/graphics/k3d/k3d_gtkmm224.patch b/pkgs/applications/graphics/k3d/k3d_gtkmm224.patch
new file mode 100644
index 000000000000..2484994531f0
--- /dev/null
+++ b/pkgs/applications/graphics/k3d/k3d_gtkmm224.patch
@@ -0,0 +1,40 @@
+--- a/k3dsdk/ngui/main_document_window.cpp
++++ b/k3dsdk/ngui/main_document_window.cpp
+@@ -1371,7 +1371,7 @@
+ 			Gtk::HBox import_box(false, 5);
+ 			Gtk::Label import_label(_("Choose import plugin:"));
+ 
+-			Gtk::ComboBox import_combo(model);
++			Gtk::ComboBox import_combo((Glib::RefPtr<Gtk::TreeModel> &) model);
+ 			import_combo.pack_start(columns.icon, false);
+ 			import_combo.pack_start(columns.label);
+ 			import_combo.set_active(0);
+@@ -1461,7 +1461,7 @@
+ 			Gtk::HBox export_box(false, 5);
+ 			Gtk::Label export_label(_("Choose export plugin:"));
+ 
+-			Gtk::ComboBox export_combo(model);
++			Gtk::ComboBox export_combo((Glib::RefPtr<Gtk::TreeModel> &) model);
+ 			export_combo.pack_start(columns.icon, false);
+ 			export_combo.pack_start(columns.label);
+ 			export_combo.set_active(0);
+--- a/k3dsdk/ngui/render.cpp
++++ b/k3dsdk/ngui/render.cpp
+@@ -169,7 +169,7 @@
+ 		row[columns.separator] = false;
+ 	}
+ 
+-	Gtk::ComboBox combo(model);
++	Gtk::ComboBox combo((Glib::RefPtr<Gtk::TreeModel> &) model);
+ 
+ 	combo.pack_start(columns.icon, false);
+ 
+@@ -295,7 +295,7 @@
+ 		row[columns.separator] = false;
+ 	}
+ 
+-	Gtk::ComboBox combo(model);
++	Gtk::ComboBox combo((Glib::RefPtr<Gtk::TreeModel> &) model);
+ 
+ 	combo.pack_start(columns.icon, false);
+ 

From a3625b5b2bc3613eb3d665ddb797d56a8b3eaee3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=BCdiger=20Sonderfeld?= <ruediger@c-plusplus.de>
Date: Tue, 19 Aug 2014 16:26:12 +0200
Subject: [PATCH 0350/1453] smplayer: Update to 14.3.0.

Requires mplayer to be compiled with FriBiDi support (4de6b9a).
---
 pkgs/applications/video/smplayer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix
index 8bd5b7c6160a..018be742a160 100644
--- a/pkgs/applications/video/smplayer/default.nix
+++ b/pkgs/applications/video/smplayer/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, qt4 }:
 
 stdenv.mkDerivation rec {
-  name = "smplayer-0.8.6";
+  name = "smplayer-14.3.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/smplayer/${name}.tar.bz2";
-    sha256 = "1p70929j8prc4mgqxvsbcjxy8zwp4r9jk0mp0iddxl7vfyck74g0";
+    sha256 = "9b8db20043d1528ee5c6054526779e88a172d2c757429bd7095c794d65ecbc18";
   };
 
   buildInputs = [ qt4 ];

From e93eb3305822010062678c30dd7250c14874f87a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 23 Aug 2014 11:46:43 +0200
Subject: [PATCH 0351/1453] gtkglext: cleanup

---
 pkgs/desktops/gnome-2/platform/gtkglext/default.nix | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix
index ee08975b9daa..b278dadfe24c 100644
--- a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix
+++ b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix
@@ -15,11 +15,9 @@ stdenv.mkDerivation rec {
   # `GTK_WIDGET_NO_WINDOW', all of which appear to be deprecated nowadays.
   CPPFLAGS = "-UGTK_DISABLE_DEPRECATED";
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://projects.gnome.org/gtkglext/;
-
     description = "GtkGLExt, an OpenGL extension to GTK+";
-
     longDescription =
       '' GtkGLExt is an OpenGL extension to GTK+. It provides additional GDK
          objects which support OpenGL rendering in GTK+ and GtkWidget API
@@ -27,9 +25,7 @@ stdenv.mkDerivation rec {
          Löf's GtkGLArea, GtkGLExt provides a GtkWidget API that enables
          OpenGL drawing for standard and custom GTK+ widgets.
       '';
-
-    license = stdenv.lib.licenses.lgpl2Plus;
-
-    maintainers = [ ];
+    license = licenses.lgpl2Plus;
+    platforms = platforms.linux;
   };
 }

From 116930f5ba52d09df998cd7bf4d991f7c950b7e8 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 23 Aug 2014 12:03:03 +0200
Subject: [PATCH 0352/1453] calibre: update from 1.48.0 to 2.0.0

---
 pkgs/applications/misc/calibre/default.nix | 36 ++++++++++++----------
 pkgs/top-level/all-packages.nix            |  4 ++-
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 3d814bf6a304..190b57e1070e 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -1,30 +1,29 @@
-{ stdenv, fetchurl, python, pyqt4, sip, popplerQt4, pkgconfig, libpng
-, imagemagick, libjpeg, fontconfig, podofo, qt48, icu, sqlite
+{ stdenv, fetchurl, python, pyqt5, sip_4_16, poppler, pkgconfig, libpng
+, imagemagick, libjpeg, fontconfig, podofo, qt5, icu, sqlite
 , pil, makeWrapper, unrar, chmlib, pythonPackages, xz, libusb1, libmtp
+, xdg_utils
 }:
 
 stdenv.mkDerivation rec {
-  name = "calibre-1.48.0";
+  name = "calibre-2.0.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/calibre/${name}.tar.xz";
-    sha256 = "0wplmf3p4s5zwn9ri8ry18bx7k3pw1c1ngrc4msf7i8icq7hj177";
+    sha256 = "1fpn8icfyag2ybj2ywd81sva56ycsin56gyap5m9j5crx63p4c91";
   };
 
   inherit python;
 
-  nativeBuildInputs = [ makeWrapper pkgconfig ];
-
   patchPhase = ''
-    tar xf ${qt48.src}
-    qtdir=$(realpath $(ls | grep qt | grep 4.8 | grep src))
-    sed -i setup/build_environment.py \
-        -e "s|^qt_private_inc = .*|qt_private_inc = ['$qtdir/include/%s'%(m) for m in ('QtGui', 'QtCore')]|"
+    sed -i "/pyqt_sip_dir/ s:=.*:= '${pyqt5}/share/sip':"  \
+      setup/build_environment.py
   '';
 
+  nativeBuildInputs = [ makeWrapper pkgconfig ];
+
   buildInputs =
-    [ python pyqt4 sip popplerQt4 libpng imagemagick libjpeg
-      fontconfig podofo qt48 pil chmlib icu sqlite libusb1 libmtp
+    [ python pyqt5 sip_4_16 poppler libpng imagemagick libjpeg
+      fontconfig podofo qt5 pil chmlib icu sqlite libusb1 libmtp xdg_utils
       pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil
       pythonPackages.cssutils pythonPackages.beautifulsoup pythonPackages.pillow
       pythonPackages.sqlite3 pythonPackages.netifaces pythonPackages.apsw
@@ -33,14 +32,15 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     export HOME=$TMPDIR/fakehome
-    export POPPLER_INC_DIR=${popplerQt4}/include/poppler
-    export POPPLER_LIB_DIR=${popplerQt4}/lib
+    export POPPLER_INC_DIR=${poppler}/include/poppler
+    export POPPLER_LIB_DIR=${poppler}/lib
     export MAGICK_INC=${imagemagick}/include/ImageMagick
     export MAGICK_LIB=${imagemagick}/lib
     export FC_INC_DIR=${fontconfig}/include/fontconfig
     export FC_LIB_DIR=${fontconfig}/lib
     export PODOFO_INC_DIR=${podofo}/include/podofo
     export PODOFO_LIB_DIR=${podofo}/lib
+    export SIP_BIN=${sip_4_16}/bin/sip
     python setup.py install --prefix=$out
 
     PYFILES="$out/bin/* $out/lib/calibre/calibre/web/feeds/*.py
@@ -48,8 +48,12 @@ stdenv.mkDerivation rec {
       $out/lib/calibre/calibre/ebooks/rtf2xml/*.py"
 
     sed -i "s/env python[0-9.]*/python/" $PYFILES
+    sed -i "2i import sys; sys.argv[0] = 'calibre'" $out/bin/calibre
+
     for a in $out/bin/*; do
-      wrapProgram $a --prefix PYTHONPATH : $PYTHONPATH --prefix LD_LIBRARY_PATH : ${unrar}/lib --prefix PATH : ${popplerQt4}/bin
+      wrapProgram $a --prefix PYTHONPATH : $PYTHONPATH \
+                     --prefix LD_LIBRARY_PATH : ${unrar}/lib \
+                     --prefix PATH : ${poppler}/bin
     done
   '';
 
@@ -57,7 +61,7 @@ stdenv.mkDerivation rec {
     description = "Comprehensive e-book software";
     homepage = http://calibre-ebook.com;
     license = licenses.gpl3;
-    maintainers = with maintainers; [ viric iElectric ];
+    maintainers = with maintainers; [ viric iElectric pSub ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dac0abde0ddb..3d4e983c048e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8277,7 +8277,9 @@ let
       inherit (gnome) libglade;
   };
 
-  calibre = callPackage ../applications/misc/calibre { };
+  calibre = callPackage ../applications/misc/calibre {
+    inherit (pythonPackages) pyqt5 sip_4_16;
+  };
 
   camlistore = callPackage ../applications/misc/camlistore { };
 

From 01560400aace3e535e4f05b8497d92b0fec6ad5e Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Thu, 21 Aug 2014 17:54:42 +0200
Subject: [PATCH 0353/1453] libvirt: Update from 1.2.5 to 1.2.7

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

diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 4027bd8a84e0..e2ff06fcd430 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -4,14 +4,14 @@
 , dnsmasq, libnl
 }:
 
-let version = "1.2.5"; in
+let version = "1.2.7"; in
 
 stdenv.mkDerivation rec {
   name = "libvirt-${version}";
 
   src = fetchurl {
     url = "http://libvirt.org/sources/${name}.tar.gz";
-    sha256 = "0igd74wkksgv24i2xaa8wx51iqpgjp1v7820pk93m0jv8gipvscf";
+    sha256 = "1z6yfzzbf9rvqjq1my7x1br73g8dz8kij3khpb4x520ip8n4dyrx";
   };
 
   buildInputs = [

From 52b53dc37022210385b83af58a07e67d4d104f69 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Sat, 23 Aug 2014 12:07:07 +0200
Subject: [PATCH 0354/1453] ruby gems: Add riemann-dash

---
 .../interpreters/ruby/generated.nix           | 1987 ++++++-----------
 1 file changed, 638 insertions(+), 1349 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix
index 84492e093861..01bbaa390f97 100644
--- a/pkgs/development/interpreters/ruby/generated.nix
+++ b/pkgs/development/interpreters/ruby/generated.nix
@@ -3,180 +3,140 @@
 g: # Get dependencies from patched gems
 {
   aliases = {
-    ZenTest = g.ZenTest_4_9_3;
-    actionmailer = g.actionmailer_4_0_0;
-    actionpack = g.actionpack_4_0_0;
-    activemodel = g.activemodel_4_0_0;
-    activerecord = g.activerecord_4_0_0;
-    activerecord_deprecated_finders = g.activerecord_deprecated_finders_1_0_3;
-    activesupport = g.activesupport_4_0_0;
-    addressable = g.addressable_2_3_5;
-    arel = g.arel_4_0_0;
-    atomic = g.atomic_1_1_14;
+    ZenTest = g.ZenTest_4_10_1;
+    actionmailer = g.actionmailer_4_1_5;
+    actionpack = g.actionpack_4_1_5;
+    actionview = g.actionview_4_1_5;
+    activemodel = g.activemodel_4_1_5;
+    activerecord = g.activerecord_4_1_5;
+    activesupport = g.activesupport_4_1_5;
+    addressable = g.addressable_2_3_6;
+    arel = g.arel_5_0_1_20140414130214;
     atoulme_Antwrap = g.atoulme_Antwrap_0_7_4;
-    autotest_rails = g.autotest_rails_4_1_2;
-    aws_sdk = g.aws_sdk_1_16_1;
-    backports = g.backports_3_3_3;
-    bitbucket_backup = g.bitbucket_backup_0_3_0;
+    autotest_rails = g.autotest_rails_4_2_1;
+    aws_sdk = g.aws_sdk_1_51_0;
+    backports = g.backports_3_6_0;
+    bitbucket_backup = g.bitbucket_backup_0_3_1;
     builder = g.builder_3_2_2;
-    buildr = g.buildr_1_4_12;
-    bundler = g.bundler_1_3_5;
-    celluloid = g.celluloid_0_15_2;
-    childprocess = g.childprocess_0_3_9;
-    chronic = g.chronic_0_10_1;
-    classifier = g.classifier_1_3_3;
-    coderay = g.coderay_1_0_9;
-    coffee_rails = g.coffee_rails_4_0_1;
-    coffee_script = g.coffee_script_2_2_0;
-    coffee_script_source = g.coffee_script_source_1_6_3;
-    colorator = g.colorator_0_1;
-    commander = g.commander_4_1_5;
-    cucumber = g.cucumber_1_3_8;
+    buildr = g.buildr_1_4_19;
+    bundler = g.bundler_1_7_0;
+    childprocess = g.childprocess_0_5_3;
+    chronic = g.chronic_0_10_2;
+    coderay = g.coderay_1_1_0;
+    cucumber = g.cucumber_1_3_16;
     daemons = g.daemons_1_1_9;
-    diff_lcs = g.diff_lcs_1_1_3;
+    diff_lcs = g.diff_lcs_1_2_5;
     dimensions = g.dimensions_1_2_0;
-    domain_name = g.domain_name_0_5_13;
-    dotenv = g.dotenv_0_9_0;
+    domain_name = g.domain_name_0_5_20;
+    dotenv = g.dotenv_0_11_1;
+    dotenv_deployment = g.dotenv_deployment_0_0_2;
     em_resolv_replace = g.em_resolv_replace_1_1_3;
     erubis = g.erubis_2_7_0;
-    ethon = g.ethon_0_6_1;
+    ethon = g.ethon_0_7_1;
     eventmachine = g.eventmachine_1_0_3;
     eventmachine_tail = g.eventmachine_tail_0_6_4;
-    excon = g.excon_0_25_3;
-    execjs = g.execjs_2_0_2;
-    fakes3 = g.fakes3_0_1_5;
-    faraday = g.faraday_0_8_8;
-    faraday_middleware = g.faraday_middleware_0_9_0;
-    fast_stemmer = g.fast_stemmer_1_0_2;
-    ffi = g.ffi_1_9_0;
+    fakes3 = g.fakes3_0_1_5_2;
+    faraday = g.faraday_0_9_0;
+    faraday_middleware = g.faraday_middleware_0_9_1;
+    ffi = g.ffi_1_9_3;
     file_tail = g.file_tail_1_0_12;
-    foreman = g.foreman_0_63_0;
-    formatador = g.formatador_0_2_4;
-    gettext = g.gettext_3_0_0;
-    gh = g.gh_0_12_0;
-    gherkin = g.gherkin_2_12_1;
-    guard = g.guard_2_2_4;
-    highline = g.highline_1_6_19;
+    foreman = g.foreman_0_74_0;
+    gettext = g.gettext_3_1_3;
+    gh = g.gh_0_13_2;
+    gherkin = g.gherkin_2_12_2;
+    highline = g.highline_1_6_21;
     hike = g.hike_1_2_3;
-    hoe = g.hoe_3_1_0;
-    http_cookie = g.http_cookie_1_0_1;
-    i18n = g.i18n_0_6_5;
-    iconv = g.iconv_1_0_3;
-    jekyll = g.jekyll_1_3_0;
-    jquery_rails = g.jquery_rails_3_0_4;
-    jruby_pageant = g.jruby_pageant_1_1_1;
-    jsduck = g.jsduck_5_1_0;
-    json = g.json_1_8_0;
+    hoe = g.hoe_3_7_1;
+    http_cookie = g.http_cookie_1_0_2;
+    i18n = g.i18n_0_6_11;
+    iconv = g.iconv_1_0_4;
+    jsduck = g.jsduck_5_3_4;
+    json = g.json_1_8_1;
     json_pure = g.json_pure_1_8_0;
-    launchy = g.launchy_2_3_0;
-    liquid = g.liquid_2_5_4;
-    listen = g.listen_2_2_0;
-    locale = g.locale_2_0_8;
-    lockfile = g.lockfile_2_1_0;
-    lumberjack = g.lumberjack_1_0_4;
-    macaddr = g.macaddr_1_6_1;
-    maruku = g.maruku_0_6_1;
-    mail = g.mail_2_5_4;
-    mechanize = g.mechanize_2_7_2;
+    launchy = g.launchy_2_4_2;
+    locale = g.locale_2_1_0;
+    lockfile = g.lockfile_2_1_3;
+    macaddr = g.macaddr_1_7_1;
+    mail = g.mail_2_6_1;
+    mechanize = g.mechanize_2_7_3;
     method_source = g.method_source_0_8_2;
-    mime_types = g.mime_types_1_25;
-    mini_portile = g.mini_portile_0_5_1;
-    minitar = g.minitar_0_5_3;
-    minitest = g.minitest_4_7_5;
-    mono_logger = g.mono_logger_1_1_0;
-    multi_json = g.multi_json_1_8_2;
-    multi_test = g.multi_test_0_0_2;
-    multipart_post = g.multipart_post_1_2_0;
+    mime_types = g.mime_types_2_3;
+    mini_portile = g.mini_portile_0_6_0;
+    minitar = g.minitar_0_5_4;
+    minitest = g.minitest_5_4_0;
+    multi_json = g.multi_json_1_10_1;
+    multi_test = g.multi_test_0_1_1;
+    multipart_post = g.multipart_post_2_0_0;
     net_http_digest_auth = g.net_http_digest_auth_1_4;
-    net_http_persistent = g.net_http_persistent_2_9;
+    net_http_persistent = g.net_http_persistent_2_9_4;
     net_http_pipeline = g.net_http_pipeline_1_0_1;
-    net_sftp = g.net_sftp_2_0_5;
-    net_ssh = g.net_ssh_2_6_8;
-    netrc = g.netrc_0_7_7;
+    net_sftp = g.net_sftp_2_1_2;
+    net_ssh = g.net_ssh_2_9_1;
     nix = g.nix_0_1_1;
-    nokogiri = g.nokogiri_1_6_0;
+    nokogiri = g.nokogiri_1_6_3_1;
     ntlm_http = g.ntlm_http_0_1_1;
-    papertrail = g.papertrail_0_9_7;
+    orderedhash = g.orderedhash_0_0_6;
+    papertrail = g.papertrail_0_9_10;
     papertrail_cli = g.papertrail_cli_0_9_3;
     parallel = g.parallel_0_7_1;
-    polyglot = g.polyglot_0_3_3;
-    posix_spawn = g.posix_spawn_0_3_6;
-    pry = g.pry_0_9_12_2;
-    pusher_client = g.pusher_client_0_3_1;
+    polyglot = g.polyglot_0_3_5;
+    pry = g.pry_0_9_12_6;
+    pusher_client = g.pusher_client_0_6_0;
     rack = g.rack_1_5_2;
-    rack_protection = g.rack_protection_1_5_1;
-    rails = g.rails_4_0_0;
-    railties = g.railties_4_0_0;
-    rake = g.rake_10_1_0;
-    rb_fsevent = g.rb_fsevent_0_9_3;
-    rb_inotify = g.rb_inotify_0_9_2;
-    rb_kqueue = g.rb_kqueue_0_2_0;
-    rdiscount = g.rdiscount_2_1_6;
-    redcarpet = g.redcarpet_2_3_0;
-    redis = g.redis_3_0_5;
-    redis_namespace = g.redis_namespace_1_3_1;
+    rack_protection = g.rack_protection_1_5_3;
+    rack_test = g.rack_test_0_6_2;
+    rails = g.rails_4_1_5;
+    railties = g.railties_4_1_5;
+    rake = g.rake_10_3_2;
+    rb_fsevent = g.rb_fsevent_0_9_4;
+    rdiscount = g.rdiscount_2_1_7_1;
     remote_syslog = g.remote_syslog_1_6_14;
-    resque = g.resque_1_25_1;
-    resque_web = g.resque_web_0_0_3;
-    rest_client = g.rest_client_1_6_7;
+    riemann_dash = g.riemann_dash_0_2_9;
     right_aws = g.right_aws_3_1_0;
-    right_http_connection = g.right_http_connection_1_4_0;
-    rjb = g.rjb_1_4_8;
-    rkelly_remix = g.rkelly_remix_0_0_4;
-    rmagick = g.rmagick_2_13_2;
+    right_http_connection = g.right_http_connection_1_5_0;
+    rjb = g.rjb_1_4_9;
+    rkelly_remix = g.rkelly_remix_0_0_6;
     rmail = g.rmail_1_0_0;
-    rmail_sup = g.rmail_sup_1_0_1;
-    rspec = g.rspec_2_11_0;
-    rspec_core = g.rspec_core_2_11_1;
-    rspec_expectations = g.rspec_expectations_2_11_3;
-    rspec_mocks = g.rspec_mocks_2_11_3;
-    ruby_hmac = g.ruby_hmac_0_4_0;
-    rubyforge = g.rubyforge_2_0_4;
-    rubyzip = g.rubyzip_0_9_9;
-    safe_yaml = g.safe_yaml_0_9_7;
-    sass = g.sass_3_2_12;
-    sass_rails = g.sass_rails_4_0_1;
-    selenium_webdriver = g.selenium_webdriver_2_35_1;
+    rspec = g.rspec_2_14_1;
+    rspec_core = g.rspec_core_2_14_8;
+    rspec_expectations = g.rspec_expectations_2_14_5;
+    rspec_mocks = g.rspec_mocks_2_14_6;
+    rubyzip = g.rubyzip_1_1_6;
+    sass = g.sass_3_4_0;
+    selenium_webdriver = g.selenium_webdriver_2_42_0;
     servolux = g.servolux_0_10_0;
-    sinatra = g.sinatra_1_4_4;
-    slop = g.slop_3_4_6;
-    sprockets = g.sprockets_2_10_0;
-    sprockets_rails = g.sprockets_rails_2_0_1;
-    syntax = g.syntax_1_0_0;
+    sinatra = g.sinatra_1_4_5;
+    slop = g.slop_3_6_0;
+    sprockets = g.sprockets_2_12_1;
+    sprockets_rails = g.sprockets_rails_2_1_3;
     syslog_protocol = g.syslog_protocol_0_9_2;
-    systemu = g.systemu_2_5_2;
+    systemu = g.systemu_2_6_4;
     taskjuggler = g.taskjuggler_3_5_0;
-    term_ansicolor = g.term_ansicolor_1_2_2;
-    terminal_notifier = g.terminal_notifier_1_5_1;
-    text = g.text_1_2_3;
-    thin = g.thin_1_5_1;
-    thor = g.thor_0_18_1;
-    thread_safe = g.thread_safe_0_1_3;
+    term_ansicolor = g.term_ansicolor_1_3_0;
+    text = g.text_1_3_0;
+    thin = g.thin_1_6_2;
+    thor = g.thor_0_19_1;
+    thread_safe = g.thread_safe_0_3_4;
     tilt = g.tilt_1_4_1;
-    timers = g.timers_1_1_0;
-    tins = g.tins_0_9_0;
-    travis = g.travis_1_5_3;
+    tins = g.tins_1_3_2;
+    travis = g.travis_1_7_1;
     treetop = g.treetop_1_4_15;
     trollop = g.trollop_2_0;
-    twitter_bootstrap_rails = g.twitter_bootstrap_rails_2_2_8;
-    typhoeus = g.typhoeus_0_6_5;
-    tzinfo = g.tzinfo_0_3_38;
-    unf = g.unf_0_1_2;
+    typhoeus = g.typhoeus_0_6_9;
+    tzinfo = g.tzinfo_1_2_2;
+    unf = g.unf_0_1_4;
     unf_ext = g.unf_ext_0_0_6;
-    unicode = g.unicode_0_4_4;
     uuid = g.uuid_2_3_7;
-    uuidtools = g.uuidtools_2_1_4;
-    vegas = g.vegas_0_1_11;
+    webrick = g.webrick_1_3_1;
     webrobots = g.webrobots_0_1_1;
-    websocket = g.websocket_1_0_7;
+    websocket = g.websocket_1_2_0;
     xapian_full = g.xapian_full_1_2_3;
-    xapian_ruby = g.xapian_ruby_1_2_15_1;
-    xml_simple = g.xml_simple_1_1_1;
-    yajl_ruby = g.yajl_ruby_1_1_0;
+    xapian_ruby = g.xapian_ruby_1_2_17;
+    xml_simple = g.xml_simple_1_1_2;
   };
-  gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''cucumber'' ''fakes3'' ''foreman'' ''gettext'' ''iconv'' ''jsduck'' ''lockfile'' ''mechanize'' ''nix'' ''papertrail-cli'' ''rails'' ''rake'' ''rb-fsevent'' ''remote_syslog'' ''right_aws'' ''rmail'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''taskjuggler'' ''thin'' ''travis'' ''trollop'' ''uuid'' ''xapian-full'' ''xapian-ruby'' ];
+  gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''cucumber'' ''fakes3'' ''foreman'' ''gettext'' ''iconv'' ''jsduck'' ''lockfile'' ''mechanize'' ''nix'' ''papertrail-cli'' ''rails'' ''rake'' ''rb-fsevent'' ''remote_syslog'' ''riemann-dash'' ''right_aws'' ''rmail'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''taskjuggler'' ''thin'' ''travis'' ''trollop'' ''uuid'' ''xapian-full'' ''xapian-ruby'' ];
   gems = {
-    ZenTest_4_9_3 = {
+    ZenTest_4_10_1 = {
       basename = ''ZenTest'';
       meta = {
         description = ''ZenTest provides 4 different tools: zentest, unit_diff, autotest, and multiruby'';
@@ -203,77 +163,77 @@ multiruby runs anything you want on multiple versions of ruby. Great
 for compatibility checking! Use multiruby_setup to manage your
 installed versions.'';
       };
-      name = ''ZenTest-4.9.3'';
+      name = ''ZenTest-4.10.1'';
       requiredGems = [  ];
-      sha256 = ''0rd07scqhdy9sfygbgbdick895pk4pbamcl70hr78cylhqpk6m38'';
+      sha256 = ''1jyk0lag27s71idna2h72ljskimj0snsiw7diyjx5rqxnz6fj7z1'';
     };
-    actionmailer_4_0_0 = {
+    actionmailer_4_1_5 = {
       basename = ''actionmailer'';
       meta = {
         description = ''Email composition, delivery, and receiving framework (part of Rails).'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''Email on Rails. Compose, deliver, receive, and test emails using the familiar controller/view pattern. First-class support for multipart email and attachments.'';
       };
-      name = ''actionmailer-4.0.0'';
-      requiredGems = [ g.actionpack_4_0_0 g.mail_2_5_4 ];
-      sha256 = ''0d63hmddll0vdbzzxj4zl6njv1pm7j2njvqfccvvyypwsynfjkgk'';
+      name = ''actionmailer-4.1.5'';
+      requiredGems = [ g.actionpack_4_1_5 g.actionview_4_1_5 g.mail_2_5_4 ];
+      sha256 = ''19frz9njy6jbxh7yasx62l4ifns3dxfkfqvnxlqb4pwsz7lqcp9c'';
     };
-    actionpack_4_0_0 = {
+    actionpack_4_1_5 = {
       basename = ''actionpack'';
       meta = {
         description = ''Web-flow and rendering framework putting the VC in MVC (part of Rails).'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''Web apps on Rails. Simple, battle-tested conventions for building and testing MVC web applications. Works with any Rack-compatible server.'';
       };
-      name = ''actionpack-4.0.0'';
-      requiredGems = [ g.activesupport_4_0_0 g.builder_3_1_4 g.rack_1_5_2 g.rack_test_0_6_2 g.erubis_2_7_0 ];
-      sha256 = ''0hx9hdbqqm73l81p5r520zdk218739414yhw9yrys905ks2f5j4d'';
+      name = ''actionpack-4.1.5'';
+      requiredGems = [ g.activesupport_4_1_5 g.rack_1_5_2 g.rack_test_0_6_2 g.actionview_4_1_5 ];
+      sha256 = ''05wh3c5rw3c0rsza3bnpmr6s63n481d4gkbhsp3ngwn9lpp3jdb6'';
     };
-    activemodel_4_0_0 = {
+    actionview_4_1_5 = {
+      basename = ''actionview'';
+      meta = {
+        description = ''Rendering framework putting the V in MVC (part of Rails).'';
+        homepage = ''http://www.rubyonrails.org'';
+        longDescription = ''Simple, battle-tested conventions and helpers for building web pages.'';
+      };
+      name = ''actionview-4.1.5'';
+      requiredGems = [ g.activesupport_4_1_5 g.builder_3_2_2 g.erubis_2_7_0 ];
+      sha256 = ''02zb4xi2farzh892j9awxshyly7ijlvbj39g6cwq5mhs5cx59qk8'';
+    };
+    activemodel_4_1_5 = {
       basename = ''activemodel'';
       meta = {
         description = ''A toolkit for building modeling frameworks (part of Rails).'';
         homepage = ''http://www.rubyonrails.org'';
-        longDescription = ''A toolkit for building modeling frameworks like Active Record. Rich support for attributes, callbacks, validations, observers, serialization, internationalization, and testing.'';
+        longDescription = ''A toolkit for building modeling frameworks like Active Record. Rich support for attributes, callbacks, validations, serialization, internationalization, and testing.'';
       };
-      name = ''activemodel-4.0.0'';
-      requiredGems = [ g.activesupport_4_0_0 g.builder_3_1_4 ];
-      sha256 = ''0vsq5bzsyfrzgnhizlipivmh7m9p0ky29avx47wnaqwjlpkir5m2'';
+      name = ''activemodel-4.1.5'';
+      requiredGems = [ g.activesupport_4_1_5 g.builder_3_2_2 ];
+      sha256 = ''1anbjwdfgdjfxiv5vzysrdd98mapvd2h8xjkayq3vq54n13ymjvl'';
     };
-    activerecord_4_0_0 = {
+    activerecord_4_1_5 = {
       basename = ''activerecord'';
       meta = {
         description = ''Object-relational mapper framework (part of Rails).'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''Databases on Rails. Build a persistent domain model by mapping database tables to Ruby classes. Strong conventions for associations, validations, aggregations, migrations, and testing come baked-in.'';
       };
-      name = ''activerecord-4.0.0'';
-      requiredGems = [ g.activesupport_4_0_0 g.activemodel_4_0_0 g.arel_4_0_0 g.activerecord_deprecated_finders_1_0_3 ];
-      sha256 = ''0lhksb0172kz23yhibr1rxihyp01h2ajqxd0l4nahs2qc9jlr722'';
+      name = ''activerecord-4.1.5'';
+      requiredGems = [ g.activesupport_4_1_5 g.activemodel_4_1_5 g.arel_5_0_1_20140414130214 ];
+      sha256 = ''1z8awkkl4bn4ghdp432n2qpagbb8569ffq63kmgkbwf8127kmzrc'';
     };
-    activerecord_deprecated_finders_1_0_3 = {
-      basename = ''activerecord_deprecated_finders'';
-      meta = {
-        description = ''This gem contains deprecated finder APIs extracted from Active Record.'';
-        homepage = ''https://github.com/rails/activerecord-deprecated_finders'';
-        longDescription = ''Deprecated finder APIs extracted from Active Record.'';
-      };
-      name = ''activerecord-deprecated_finders-1.0.3'';
-      requiredGems = [  ];
-      sha256 = ''1z2g7h2ywhplrsjrsh8961agf17s9rj8ypdwjj482mw86if3dslp'';
-    };
-    activesupport_4_0_0 = {
+    activesupport_4_1_5 = {
       basename = ''activesupport'';
       meta = {
         description = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework.'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework. Rich support for multibyte strings, internationalization, time zones, and testing.'';
       };
-      name = ''activesupport-4.0.0'';
-      requiredGems = [ g.i18n_0_6_5 g.multi_json_1_7_9 g.tzinfo_0_3_37 g.minitest_4_7_5 g.thread_safe_0_1_2 ];
-      sha256 = ''0agxkvjhhv6r9rpm0lcgjny4sn1ihhvhlgs46rgi3fz0y1d93ids'';
+      name = ''activesupport-4.1.5'';
+      requiredGems = [ g.i18n_0_6_11 g.json_1_8_1 g.tzinfo_1_2_2 g.minitest_5_4_0 g.thread_safe_0_3_4 ];
+      sha256 = ''0vmf58q96469dci509hhbqxwr7gaxq4yjsb37xd56ggpqn3qm30k'';
     };
-    addressable_2_3_5 = {
+    addressable_2_3_6 = {
       basename = ''addressable'';
       meta = {
         description = ''URI Implementation'';
@@ -283,11 +243,11 @@ Ruby's standard library. It more closely conforms to the relevant RFCs and
 adds support for IRIs and URI templates.
 '';
       };
-      name = ''addressable-2.3.5'';
+      name = ''addressable-2.3.6'';
       requiredGems = [  ];
-      sha256 = ''11hv69v6h39j7m4v51a4p7my7xwjbhxbsg3y7ja156z7by10wkg7'';
+      sha256 = ''137fj0whmn1kvaq8wjalp8x4qbblwzvg3g4bfx8d8lfi6f0w48p8'';
     };
-    arel_4_0_0 = {
+    arel_5_0_1_20140414130214 = {
       basename = ''arel'';
       meta = {
         description = ''Arel is a SQL AST manager for Ruby'';
@@ -295,37 +255,15 @@ adds support for IRIs and URI templates.
         longDescription = ''Arel is a SQL AST manager for Ruby. It
 
 1. Simplifies the generation of complex SQL queries
-2. Adapts to various RDBMS systems
+2. Adapts to various RDBMSes
 
 It is intended to be a framework framework; that is, you can build your own ORM
 with it, focusing on innovative object and collection modeling as opposed to
 database compatibility and query generation.'';
       };
-      name = ''arel-4.0.0'';
+      name = ''arel-5.0.1.20140414130214'';
       requiredGems = [  ];
-      sha256 = ''19xzg8jhp4p18xlf6sp4yhf6vdpc3hl8lm23n6glikclm7rvgick'';
-    };
-    atomic_1_1_13 = {
-      basename = ''atomic'';
-      meta = {
-        description = ''An atomic reference implementation for JRuby, Rubinius, and MRI'';
-        homepage = ''http://github.com/headius/ruby-atomic'';
-        longDescription = ''An atomic reference implementation for JRuby, Rubinius, and MRI'';
-      };
-      name = ''atomic-1.1.13'';
-      requiredGems = [  ];
-      sha256 = ''0sdy8fcncm6p2cba3p8v7dnbsa4z41f4cs1dd0myf4fq7axrrh0s'';
-    };
-    atomic_1_1_14 = {
-      basename = ''atomic'';
-      meta = {
-        description = ''An atomic reference implementation for JRuby, Rubinius, and MRI'';
-        homepage = ''http://github.com/headius/ruby-atomic'';
-        longDescription = ''An atomic reference implementation for JRuby, Rubinius, and MRI'';
-      };
-      name = ''atomic-1.1.14'';
-      requiredGems = [  ];
-      sha256 = ''09dzi1gxr5yj273s6s6ss7l2sq4ayavpg95561kib3n4kzvxrhk4'';
+      sha256 = ''0dhnc20h1v8ml3nmkxq92rr7qxxpk6ixhwvwhgl2dbw9mmxz0hf9'';
     };
     atoulme_Antwrap_0_7_4 = {
       basename = ''atoulme_Antwrap'';
@@ -346,10 +284,10 @@ database compatibility and query generation.'';
 	check out Buildr!'';
       };
       name = ''atoulme-Antwrap-0.7.4'';
-      requiredGems = [ g.rjb_1_4_8 ];
+      requiredGems = [ g.rjb_1_4_9 ];
       sha256 = ''0sh9capkya88qm9mvixwly32fwb2c4nzif9j9vv0f73rqw8kz4j4'';
     };
-    autotest_rails_4_1_2 = {
+    autotest_rails_4_2_1 = {
       basename = ''autotest_rails'';
       meta = {
         description = ''This is an autotest plugin to provide rails support'';
@@ -357,74 +295,42 @@ database compatibility and query generation.'';
         longDescription = ''This is an autotest plugin to provide rails support. It provides basic
 rails support and extra plugins for migrations and fixtures.'';
       };
-      name = ''autotest-rails-4.1.2'';
-      requiredGems = [ g.ZenTest_4_9_3 ];
-      sha256 = ''1wkb5jayb39yx0i8ly7sibygf9f9c3w24jg2z1qgm135zlb070v4'';
+      name = ''autotest-rails-4.2.1'';
+      requiredGems = [ g.ZenTest_4_10_1 ];
+      sha256 = ''1v1dm9zlhdlrxvk90zs8d439ldar674ix41s7pncddgyswcfgg5l'';
     };
-    aws_sdk_1_16_1 = {
+    aws_sdk_1_51_0 = {
       basename = ''aws_sdk'';
       meta = {
         description = ''AWS SDK for Ruby'';
         homepage = ''http://aws.amazon.com/sdkforruby'';
         longDescription = ''AWS SDK for Ruby'';
       };
-      name = ''aws-sdk-1.16.1'';
-      requiredGems = [ g.uuidtools_2_1_4 g.nokogiri_1_5_10 g.json_1_8_0 ];
-      sha256 = ''1i6njmzfcmjb9xdaqw727pdqr17w3gad1nl5zln4mv6i4x0nbc3n'';
+      name = ''aws-sdk-1.51.0'';
+      requiredGems = [ g.nokogiri_1_6_3_1 g.json_1_8_1 ];
+      sha256 = ''092a7km6ar7zvyyzgiqsb0dm354sqa6mzx7sa0c8ndwm918lbqai'';
     };
-    backports_3_3_3 = {
+    backports_3_6_0 = {
       basename = ''backports'';
       meta = {
         description = ''Backports of Ruby features for older Ruby.'';
         homepage = ''http://github.com/marcandre/backports'';
         longDescription = ''Essential backports that enable many of the nice features of Ruby 1.8.7 up to 2.0.0 for earlier versions.'';
       };
-      name = ''backports-3.3.3'';
+      name = ''backports-3.6.0'';
       requiredGems = [  ];
-      sha256 = ''0y1la483wlv7gam1470shskc0bjsif9hld6qikx165yw9gmbgxsy'';
+      sha256 = ''1pinn0m4fmq124adc6xjl2hk9799xq5jw4bva82cdzd4h2hwrgq5'';
     };
-    bitbucket_backup_0_3_0 = {
+    bitbucket_backup_0_3_1 = {
       basename = ''bitbucket_backup'';
       meta = {
         description = ''A tool to backup Bitbucket repos.'';
         homepage = ''https://bitbucket.org/seth/bitbucket-backup'';
         longDescription = ''A tool to backup Bitbucket repos.'';
       };
-      name = ''bitbucket-backup-0.3.0'';
-      requiredGems = [ g.highline_1_6_19 g.json_1_8_0 ];
-      sha256 = ''075bz4bhxim2kh5191qc9kpq7z81aa2smgqq5bfldjqvk70hr87y'';
-    };
-    builder_3_1_3 = {
-      basename = ''builder'';
-      meta = {
-        description = ''Builders for MarkUp.'';
-        homepage = ''http://onestepback.org'';
-        longDescription = ''Builder provides a number of builder objects that make creating structured data
-simple to do.  Currently the following builder objects are supported:
-
-* XML Markup
-* XML Events
-'';
-      };
-      name = ''builder-3.1.3'';
-      requiredGems = [  ];
-      sha256 = ''0w6xsq9vyvzdy0xb52sajgipr9ml2bbpivk6dxm69c6987dk7him'';
-    };
-    builder_3_1_4 = {
-      basename = ''builder'';
-      meta = {
-        description = ''Builders for MarkUp.'';
-        homepage = ''http://onestepback.org'';
-        longDescription = ''Builder provides a number of builder objects that make creating structured data
-simple to do.  Currently the following builder objects are supported:
-
-* XML Markup
-* XML Events
-'';
-      };
-      name = ''builder-3.1.4'';
-      requiredGems = [  ];
-      sha256 = ''1p0bjy1vb0zbswd6bsh5qda0f0br53p8vak8cm7hls62094r405p'';
+      name = ''bitbucket-backup-0.3.1'';
+      requiredGems = [ g.highline_1_6_21 g.json_1_8_1 ];
+      sha256 = ''17d2pfk0z3cxcx9m90avcp5wxhdbrq23zd665263m3hh9b5qi0fj'';
     };
     builder_3_2_2 = {
       basename = ''builder'';
@@ -442,7 +348,7 @@ simple to do.  Currently the following builder objects are supported:
       requiredGems = [  ];
       sha256 = ''14fii7ab8qszrvsvhz6z2z3i4dw0h41a62fjr2h1j8m41vbrmyv2'';
     };
-    buildr_1_4_12 = {
+    buildr_1_4_19 = {
       basename = ''buildr'';
       meta = {
         description = ''Build like you code'';
@@ -454,87 +360,42 @@ to do, and it takes care of the rest.  But also something we can easily extend
 for those one-off tasks, with a language that's a joy to use.
 '';
       };
-      name = ''buildr-1.4.12'';
-      requiredGems = [ g.rake_0_9_2_2 g.builder_3_1_3 g.net_ssh_2_6_0 g.net_sftp_2_0_5 g.rubyzip_0_9_9 g.highline_1_6_2 g.json_pure_1_7_5 g.rubyforge_2_0_4 g.hoe_3_1_0 g.rjb_1_4_2 g.atoulme_Antwrap_0_7_4 g.diff_lcs_1_1_3 g.rspec_expectations_2_11_3 g.rspec_mocks_2_11_3 g.rspec_core_2_11_1 g.rspec_2_11_0 g.xml_simple_1_1_1 g.minitar_0_5_3 g.bundler_1_3_5 ];
-      sha256 = ''0hsy9bkfp1pq5f3jx8i6fsk0r309nmq778ykk6w103rkrdb3l6s6'';
+      name = ''buildr-1.4.19'';
+      requiredGems = [ g.rake_0_9_2_2 g.builder_3_2_2 g.net_ssh_2_7_0 g.net_sftp_2_1_2 g.rubyzip_0_9_9 g.json_pure_1_8_0 g.hoe_3_7_1 g.rjb_1_4_8 g.atoulme_Antwrap_0_7_4 g.diff_lcs_1_2_4 g.rspec_expectations_2_14_3 g.rspec_mocks_2_14_3 g.rspec_core_2_14_5 g.rspec_2_14_1 g.xml_simple_1_1_2 g.minitar_0_5_4 g.bundler_1_7_0 g.orderedhash_0_0_6 ];
+      sha256 = ''07k6z149si7v1h5m1bvdhjcv0nnjwkd2c6a8n1779l8g47ckccj0'';
     };
-    bundler_1_3_5 = {
+    bundler_1_7_0 = {
       basename = ''bundler'';
       meta = {
         description = ''The best way to manage your application's dependencies'';
-        homepage = ''http://gembundler.com'';
+        homepage = ''http://bundler.io'';
         longDescription = ''Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably'';
       };
-      name = ''bundler-1.3.5'';
+      name = ''bundler-1.7.0'';
       requiredGems = [  ];
-      sha256 = ''1r7zx8qfwzr3pbgrjbsml7z5qgscwyyv33x2jzhz6adqyx3r1f08'';
+      sha256 = ''0vcbqmr1h98yfaixjbpdyzz1b90ms8gf86kd3c0q0ydwh9yr7b1j'';
     };
-    celluloid_0_15_2 = {
-      basename = ''celluloid'';
-      meta = {
-        description = ''Actor-based concurrent object framework for Ruby'';
-        homepage = ''https://github.com/celluloid/celluloid'';
-        longDescription = ''Celluloid enables people to build concurrent programs out of concurrent objects just as easily as they build sequential programs out of sequential objects'';
-      };
-      name = ''celluloid-0.15.2'';
-      requiredGems = [ g.timers_1_1_0 ];
-      sha256 = ''0lpa97m7f4p5hgzaaa47y1d5c78n8pp4xd8qb0sn5llqd0klkd9b'';
-    };
-    childprocess_0_3_9 = {
+    childprocess_0_5_3 = {
       basename = ''childprocess'';
       meta = {
         description = ''This gem aims at being a simple and reliable solution for controlling external programs running in the background on any Ruby / OS combination.'';
         homepage = ''http://github.com/jarib/childprocess'';
         longDescription = ''This gem aims at being a simple and reliable solution for controlling external programs running in the background on any Ruby / OS combination.'';
       };
-      name = ''childprocess-0.3.9'';
-      requiredGems = [ g.ffi_1_9_0 ];
-      sha256 = ''0jbz2ix7ff9ry8717lhcq9w8j8yd45akw48giwgdqccay5mlph7d'';
+      name = ''childprocess-0.5.3'';
+      requiredGems = [ g.ffi_1_9_3 ];
+      sha256 = ''12djpdr487fddq55sav8gw1pjglcbb0ab0s6npga0ywgsqdyvsww'';
     };
-    chronic_0_9_1 = {
+    chronic_0_10_2 = {
       basename = ''chronic'';
       meta = {
         description = ''Natural language date/time parsing.'';
         homepage = ''http://github.com/mojombo/chronic'';
         longDescription = ''Chronic is a natural language date/time parser written in pure Ruby.'';
       };
-      name = ''chronic-0.9.1'';
+      name = ''chronic-0.10.2'';
       requiredGems = [  ];
-      sha256 = ''0kspaxpfy7yvyk1lvpx31w852qfj8wb9z04mcj5bzi70ljb9awqk'';
-    };
-    classifier_1_3_3 = {
-      basename = ''classifier'';
-      meta = {
-        description = ''A general classifier module to allow Bayesian and other types of classifications.'';
-        homepage = ''http://classifier.rufy.com/'';
-        longDescription = ''   A general classifier module to allow Bayesian and other types of classifications.
-'';
-      };
-      name = ''classifier-1.3.3'';
-      requiredGems = [ g.fast_stemmer_1_0_2 ];
-      sha256 = ''1kq1cd8fq6wvyxbjy3r6ya3d3sk3rcp1b560xlqvflpsirm47r9g'';
-    };
-    chronic_0_10_1 = {
-      basename = ''chronic'';
-      meta = {
-        description = ''Natural language date/time parsing.'';
-        homepage = ''http://github.com/mojombo/chronic'';
-        longDescription = ''Chronic is a natural language date/time parser written in pure Ruby.'';
-      };
-      name = ''chronic-0.10.1'';
-      requiredGems = [  ];
-      sha256 = ''0p822hry4njncxpf59nrvjayg2pxk1zh8gykjgsmqrphdkqqmp1w'';
-    };
-    coderay_1_0_9 = {
-      basename = ''coderay'';
-      meta = {
-        description = ''Fast syntax highlighting for selected languages.'';
-        homepage = ''http://coderay.rubychan.de'';
-        longDescription = ''Fast and easy syntax highlighting for selected languages, written in Ruby. Comes with RedCloth integration and LOC counter.'';
-      };
-      name = ''coderay-1.0.9'';
-      requiredGems = [  ];
-      sha256 = ''1pbjsvd6r2daxd6aicp19fnb1j5z7fxadflsm1h0r33cy3vi7iy8'';
+      sha256 = ''1hrdkn4g8x7dlzxwb1rfgr8kw3bp4ywg5l4y4i9c2g5cwv62yvvn'';
     };
     coderay_1_1_0 = {
       basename = ''coderay'';
@@ -547,77 +408,16 @@ for those one-off tasks, with a language that's a joy to use.
       requiredGems = [  ];
       sha256 = ''059wkzlap2jlkhg460pkwc1ay4v4clsmg1bp4vfzjzkgwdckr52s'';
     };
-    coffee_rails_4_0_1 = {
-      basename = ''coffee_rails'';
-      meta = {
-        description = ''CoffeeScript adapter for the Rails asset pipeline.'';
-        homepage = ''https://github.com/rails/coffee-rails'';
-        longDescription = ''CoffeeScript adapter for the Rails asset pipeline.'';
-      };
-      name = ''coffee-rails-4.0.1'';
-      requiredGems = [ g.coffee_script_2_2_0 g.railties_4_0_0 ];
-      sha256 = ''12nqw61xfs43qap4bxp123q4fgj41gvxirdal95ymdd2qzr3cvig'';
-    };
-    coffee_script_2_2_0 = {
-      basename = ''coffee_script'';
-      meta = {
-        description = ''Ruby CoffeeScript Compiler'';
-        homepage = ''http://github.com/josh/ruby-coffee-script'';
-        longDescription = ''    Ruby CoffeeScript is a bridge to the JS CoffeeScript compiler.
-'';
-      };
-      name = ''coffee-script-2.2.0'';
-      requiredGems = [ g.coffee_script_source_1_6_3 g.execjs_2_0_2 ];
-      sha256 = ''133cp4znfp44wwnv12myw8s0z6qws74ilqmw88iwzkshg689zpdc'';
-    };
-    coffee_script_source_1_6_3 = {
-      basename = ''coffee_script_source'';
-      meta = {
-        description = ''The CoffeeScript Compiler'';
-        homepage = ''http://jashkenas.github.com/coffee-script/'';
-        longDescription = ''      CoffeeScript is a little language that compiles into JavaScript.
-      Underneath all of those embarrassing braces and semicolons,
-      JavaScript has always had a gorgeous object model at its heart.
-      CoffeeScript is an attempt to expose the good parts of JavaScript
-      in a simple way.
-'';
-      };
-      name = ''coffee-script-source-1.6.3'';
-      requiredGems = [  ];
-      sha256 = ''0p33h0rdj1n8xhm2d5hzqbb8br6wn4rx0gk4hyhc6rxkaxsy79b4'';
-    };
-    colorator_0_1 = {
-      basename = ''colorator'';
-      meta = {
-        description = ''String core extensions for terminal coloring.'';
-        homepage = ''https://github.com/octopress/colorator'';
-        longDescription = ''Colorize your text in the terminal.'';
-      };
-      name = ''colorator-0.1'';
-      requiredGems = [  ];
-      sha256 = ''09zp15hyd9wlbgf1kmrf4rnry8cpvh1h9fj7afarlqcy4hrfdpvs'';
-    };
-    commander_4_1_5 = {
-      basename = ''commander'';
-      meta = {
-        description = ''The complete solution for Ruby command-line executables'';
-        homepage = ''http://visionmedia.github.com/commander'';
-        longDescription = ''The complete solution for Ruby command-line executables. Commander bridges the gap between other terminal related libraries you know and love (OptionParser, HighLine), while providing many new features, and an elegant API.'';
-      };
-      name = ''commander-4.1.5'';
-      requiredGems = [ g.highline_1_6_20 ];
-      sha256 = ''040x2gjpl55g64kh5f9nby0870hnzx8cd7clxg771z0wjs7nzalc'';
-    };
-    cucumber_1_3_8 = {
+    cucumber_1_3_16 = {
       basename = ''cucumber'';
       meta = {
-        description = ''cucumber-1.3.8'';
+        description = ''cucumber-1.3.16'';
         homepage = ''http://cukes.info'';
         longDescription = ''Behaviour Driven Development with elegance and joy'';
       };
-      name = ''cucumber-1.3.8'';
-      requiredGems = [ g.builder_3_2_2 g.diff_lcs_1_2_4 g.gherkin_2_12_1 g.multi_json_1_7_9 g.multi_test_0_0_2 ];
-      sha256 = ''0b4igj1vxlcwky11nkrrgg57chbc0n5gmv984dld5s0f1ilkx1ma'';
+      name = ''cucumber-1.3.16'';
+      requiredGems = [ g.builder_3_2_2 g.diff_lcs_1_2_5 g.gherkin_2_12_2 g.multi_json_1_10_1 g.multi_test_0_1_1 ];
+      sha256 = ''11cjw2d03r41b5pn5in6q822s3v6bpd8isxc9dl7by01jrzi0662'';
     };
     daemons_1_1_9 = {
       basename = ''daemons'';
@@ -630,31 +430,6 @@ for those one-off tasks, with a language that's a joy to use.
       requiredGems = [  ];
       sha256 = ''1j1m64pirsldhic6x6sg4lcrmp1bs1ihpd49xm8m1b2rc1c3irzy'';
     };
-    diff_lcs_1_1_3 = {
-      basename = ''diff_lcs'';
-      meta = {
-        description = ''Diff::LCS is a port of Perl's Algorithm::Diff that uses the McIlroy-Hunt longest common subsequence (LCS) algorithm to compute intelligent differences between two sequenced enumerable containers'';
-        longDescription = ''Diff::LCS is a port of Perl's Algorithm::Diff that uses the McIlroy-Hunt
-longest common subsequence (LCS) algorithm to compute intelligent differences
-between two sequenced enumerable containers. The implementation is based on
-Mario I. Wolczko's {Smalltalk version 1.2}[ftp://st.cs.uiuc.edu/pub/Smalltalk/MANCHESTER/manchester/4.0/diff.st]
-(1993) and Ned Konz's Perl version
-{Algorithm::Diff 1.15}[http://search.cpan.org/~nedkonz/Algorithm-Diff-1.15/].
-
-This is release 1.1.3, fixing several small bugs found over the years. Version
-1.1.0 added new features, including the ability to #patch and #unpatch changes
-as well as a new contextual diff callback, Diff::LCS::ContextDiffCallbacks,
-that should improve the context sensitivity of patching.
-
-This library is called Diff::LCS because of an early version of Algorithm::Diff
-which was restrictively licensed. This version has seen a minor license change:
-instead of being under Ruby's license as an option, the third optional license
-is the MIT license.'';
-      };
-      name = ''diff-lcs-1.1.3'';
-      requiredGems = [  ];
-      sha256 = ''15wqs3md9slif6ag43vp6gw63r3a2zdqiyfapnnzkb7amgg930pv'';
-    };
     diff_lcs_1_2_4 = {
       basename = ''diff_lcs'';
       meta = {
@@ -677,6 +452,28 @@ We are happy to report that this issue has been resolved.'';
       requiredGems = [  ];
       sha256 = ''09xbffjg639y8n43zp88ki0m489vv2c86znmfib2fg1di6svi1xd'';
     };
+    diff_lcs_1_2_5 = {
+      basename = ''diff_lcs'';
+      meta = {
+        description = ''Diff::LCS computes the difference between two Enumerable sequences using the McIlroy-Hunt longest common subsequence (LCS) algorithm'';
+        homepage = ''http://diff-lcs.rubyforge.org/'';
+        longDescription = ''Diff::LCS computes the difference between two Enumerable sequences using the
+McIlroy-Hunt longest common subsequence (LCS) algorithm. It includes utilities
+to create a simple HTML diff output format and a standard diff-like tool.
+
+This is release 1.2.4, fixing a bug introduced after diff-lcs 1.1.3 that did
+not properly prune common sequences at the beginning of a comparison set.
+Thanks to Paul Kunysch for fixing this issue.
+
+Coincident with the release of diff-lcs 1.2.3, we reported an issue with
+Rubinius in 1.9 mode
+({rubinius/rubinius#2268}[https://github.com/rubinius/rubinius/issues/2268]).
+We are happy to report that this issue has been resolved.'';
+      };
+      name = ''diff-lcs-1.2.5'';
+      requiredGems = [  ];
+      sha256 = ''1vf9civd41bnqi6brr5d9jifdw73j9khc6fkhfl1f8r9cpkdvlx1'';
+    };
     dimensions_1_2_0 = {
       basename = ''dimensions'';
       meta = {
@@ -688,7 +485,7 @@ We are happy to report that this issue has been resolved.'';
       requiredGems = [  ];
       sha256 = ''1pqb7yzjcpbgbyi196ifqbd1wy570cn12bkzcvpcha4xilhajja0'';
     };
-    domain_name_0_5_13 = {
+    domain_name_0_5_20 = {
       basename = ''domain_name'';
       meta = {
         description = ''Domain Name manipulation library for Ruby'';
@@ -699,20 +496,30 @@ It can also be used for cookie domain validation based on the Public
 Suffix List.
 '';
       };
-      name = ''domain_name-0.5.13'';
-      requiredGems = [ g.unf_0_1_2 ];
-      sha256 = ''0m57vacj2bmdfp094gjylfzz5gqdpn95pcypk5friab3svrambxv'';
+      name = ''domain_name-0.5.20'';
+      requiredGems = [ g.unf_0_1_4 ];
+      sha256 = ''17ls88kp18dxjc93q8kmyx2anknva0vbmny60xbgpbwq3hg0qv6s'';
     };
-    dotenv_0_9_0 = {
+    dotenv_0_11_1 = {
       basename = ''dotenv'';
       meta = {
         description = ''Loads environment variables from `.env`.'';
         homepage = ''https://github.com/bkeepers/dotenv'';
         longDescription = ''Loads environment variables from `.env`.'';
       };
-      name = ''dotenv-0.9.0'';
+      name = ''dotenv-0.11.1'';
+      requiredGems = [ g.dotenv_deployment_0_0_2 ];
+      sha256 = ''09z0y0d6bks7i0sqvd8szfqj9i1kkj01anzly7shi83b3gxhrq9m'';
+    };
+    dotenv_deployment_0_0_2 = {
+      basename = ''dotenv_deployment'';
+      meta = {
+        description = ''Deployment concerns for dotenv'';
+        homepage = ''https://github.com/bkeepers/dotenv-deployment'';
+      };
+      name = ''dotenv-deployment-0.0.2'';
       requiredGems = [  ];
-      sha256 = ''1gl0m6s8d6m72wcm4p86kzzjdihyryi5mh6v70qkqd0dl1gj73l3'';
+      sha256 = ''1ad66jq9a09qq1js8wsyil97018s7y6x0vzji0dy34gh65sbjz8c'';
     };
     em_resolv_replace_1_1_3 = {
       basename = ''em_resolv_replace'';
@@ -747,16 +554,16 @@ Suffix List.
       requiredGems = [  ];
       sha256 = ''1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3'';
     };
-    ethon_0_6_1 = {
+    ethon_0_7_1 = {
       basename = ''ethon'';
       meta = {
         description = ''Libcurl wrapper.'';
         homepage = ''https://github.com/typhoeus/ethon'';
         longDescription = ''Very lightweight libcurl wrapper.'';
       };
-      name = ''ethon-0.6.1'';
-      requiredGems = [ g.ffi_1_9_0 g.mime_types_1_25 ];
-      sha256 = ''05mw10bh4pif0j6pjzyhcsm8kzv7xn94dcjcb15dmbjx2za0daa7'';
+      name = ''ethon-0.7.1'';
+      requiredGems = [ g.ffi_1_9_3 ];
+      sha256 = ''0b762cmnj20fjlrlzk5vsndzv4ac3ybdi4vikx5c11abl7x5wbg6'';
     };
     eventmachine_1_0_3 = {
       basename = ''eventmachine'';
@@ -789,91 +596,36 @@ using TCP/IP, especially if custom protocols are required.'';
       requiredGems = [ g.eventmachine_1_0_3 ];
       sha256 = ''1pvlb34vdzd81kf9f3xyibb4f55xjqm7lqqy28dgyci5cyv50y61'';
     };
-    excon_0_25_3 = {
-      basename = ''excon'';
-      meta = {
-        description = ''speed, persistence, http(s)'';
-        homepage = ''https://github.com/geemus/excon'';
-        longDescription = ''EXtended http(s) CONnections'';
-      };
-      name = ''excon-0.25.3'';
-      requiredGems = [  ];
-      sha256 = ''1d552jhvrpmnzrg3di88397l07ngrz04s2al17klpam6crxqw2b2'';
-    };
-    execjs_2_0_2 = {
-      basename = ''execjs'';
-      meta = {
-        description = ''Run JavaScript code from Ruby'';
-        homepage = ''https://github.com/sstephenson/execjs'';
-        longDescription = ''ExecJS lets you run JavaScript code from Ruby.'';
-      };
-      name = ''execjs-2.0.2'';
-      requiredGems = [  ];
-      sha256 = ''167kbkyql7nvvwjsgdw5z8j66ngq7kc59gxfwsxhqi5fl1z0jbjs'';
-    };
-    fakes3_0_1_5 = {
+    fakes3_0_1_5_2 = {
       basename = ''fakes3'';
       meta = {
         description = ''FakeS3 is a server that simulates S3 commands so you can test your S3 functionality in your projects'';
         longDescription = ''Use FakeS3 to test basic S3 functionality without actually connecting to S3'';
       };
-      name = ''fakes3-0.1.5'';
-      requiredGems = [ g.thor_0_18_1 g.builder_3_2_2 ];
-      sha256 = ''1na5wrbarla6s414svqmr5spbpv6vmcgpswal444x4clcpmadhib'';
+      name = ''fakes3-0.1.5.2'';
+      requiredGems = [ g.thor_0_19_1 g.builder_3_2_2 ];
+      sha256 = ''1gmg428s1jpdwn7bd9pi4ikxg8440nq9yqs22wv0k355z5cqb8by'';
     };
-    faraday_0_8_8 = {
+    faraday_0_9_0 = {
       basename = ''faraday'';
       meta = {
         description = ''HTTP/REST API client library.'';
         homepage = ''https://github.com/lostisland/faraday'';
       };
-      name = ''faraday-0.8.8'';
-      requiredGems = [ g.multipart_post_1_2_0 ];
-      sha256 = ''1cnyj5japrnv6wvl01la5amf7hikckfznh8234ad21n730b2wci4'';
+      name = ''faraday-0.9.0'';
+      requiredGems = [ g.multipart_post_2_0_0 ];
+      sha256 = ''13wi8y7j6mp0mszps50gqr0fyddiz45wqkvpnnrv797gklr9sh46'';
     };
-    faraday_middleware_0_8_8 = {
+    faraday_middleware_0_9_1 = {
       basename = ''faraday_middleware'';
       meta = {
         description = ''Various middleware for Faraday'';
-        homepage = ''https://github.com/pengwynn/faraday_middleware'';
+        homepage = ''https://github.com/lostisland/faraday_middleware'';
         longDescription = ''Various middleware for Faraday'';
       };
-      name = ''faraday_middleware-0.8.8'';
-      requiredGems = [ g.faraday_0_8_8 ];
-      sha256 = ''1n0g8pm7ynx6ffyqhscc1cqw97zhvd8isr31yfyj15335j1jsncz'';
-    };
-    faraday_middleware_0_9_0 = {
-      basename = ''faraday_middleware'';
-      meta = {
-        description = ''Various middleware for Faraday'';
-        homepage = ''https://github.com/pengwynn/faraday_middleware'';
-        longDescription = ''Various middleware for Faraday'';
-      };
-      name = ''faraday_middleware-0.9.0'';
-      requiredGems = [ g.faraday_0_8_8 ];
-      sha256 = ''1kwvi2sdxd6j764a7q5iir73dw2v6816zx3l8cgfv0wr2m47icq2'';
-    };
-    fast_stemmer_1_0_2 = {
-      basename = ''fast_stemmer'';
-      meta = {
-        description = ''Fast Porter stemmer based on a C version of algorithm'';
-        homepage = ''http://github.com/romanbsd/fast-stemmer'';
-        longDescription = ''Fast Porter stemmer based on a C version of algorithm'';
-      };
-      name = ''fast-stemmer-1.0.2'';
-      requiredGems = [  ];
-      sha256 = ''0688clyk4xxh3kdb18vi089k90mca8ji5fwaknh3da5wrzcrzanh'';
-    };
-    ffi_1_9_0 = {
-      basename = ''ffi'';
-      meta = {
-        description = ''Ruby FFI'';
-        homepage = ''http://wiki.github.com/ffi/ffi'';
-        longDescription = ''Ruby FFI library'';
-      };
-      name = ''ffi-1.9.0'';
-      requiredGems = [  ];
-      sha256 = ''0rnh9yyfzcpdmi8m7giyd21lgqj00afgxvgbx41hsi2ls1ghfwvy'';
+      name = ''faraday_middleware-0.9.1'';
+      requiredGems = [ g.faraday_0_9_0 ];
+      sha256 = ''1kndkrww1biz9j64fnyaqgis1gdiawxfv0ncadsz06gd555fgs6q'';
     };
     ffi_1_9_3 = {
       basename = ''ffi'';
@@ -894,32 +646,21 @@ using TCP/IP, especially if custom protocols are required.'';
         longDescription = ''Library to tail files in Ruby'';
       };
       name = ''file-tail-1.0.12'';
-      requiredGems = [ g.tins_0_9_0 ];
+      requiredGems = [ g.tins_0_13_2 ];
       sha256 = ''0mzxxnwj7k5pwxs0rdbmb3b41zgvzw7x40sf3qlkch4zdfx91i1j'';
     };
-    foreman_0_63_0 = {
+    foreman_0_74_0 = {
       basename = ''foreman'';
       meta = {
         description = ''Process manager for applications with multiple components'';
         homepage = ''http://github.com/ddollar/foreman'';
         longDescription = ''Process manager for applications with multiple components'';
       };
-      name = ''foreman-0.63.0'';
-      requiredGems = [ g.thor_0_18_1 g.dotenv_0_9_0 ];
-      sha256 = ''0yqyjix9jm4iwyc4f3wc32vxr28rpjcw1c9ni5brs4s2a24inzlk'';
+      name = ''foreman-0.74.0'';
+      requiredGems = [ g.thor_0_19_1 g.dotenv_0_11_1 ];
+      sha256 = ''0jqblq0myzmdp2cywzz7flvgqnhf267ykcdn250cccy68s9wm37m'';
     };
-    formatador_0_2_4 = {
-      basename = ''formatador'';
-      meta = {
-        description = ''Ruby STDOUT text formatting'';
-        homepage = ''http://github.com/geemus/formatador'';
-        longDescription = ''STDOUT text formatting'';
-      };
-      name = ''formatador-0.2.4'';
-      requiredGems = [  ];
-      sha256 = ''0pgmk1h6i6m3cslnfyjqld06a4c2xbbvmngxg2axddf39xwz6f12'';
-    };
-    gettext_3_0_0 = {
+    gettext_3_1_3 = {
       basename = ''gettext'';
       meta = {
         description = ''Gettext is a pure Ruby libary and tools to localize messages.'';
@@ -929,44 +670,33 @@ The catalog file(po-file) is same format with GNU gettext.
 So you can use GNU gettext tools for maintaining.
 '';
       };
-      name = ''gettext-3.0.0'';
-      requiredGems = [ g.locale_2_0_8 g.text_1_2_3 ];
-      sha256 = ''1qlqd6c39bjn930qh93i40gbz1bs20gzpwvw3d8rxnkls5a6pl1y'';
+      name = ''gettext-3.1.3'';
+      requiredGems = [ g.locale_2_1_0 g.text_1_3_0 ];
+      sha256 = ''066x2dbryab02kdbk6km79h4j9b0f0ynsnzcygjgvzn9001ybf9q'';
     };
-    gh_0_12_0 = {
+    gh_0_13_2 = {
       basename = ''gh'';
       meta = {
         description = ''layered github client'';
         homepage = ''http://gh.rkh.im/'';
         longDescription = ''multi-layer client for the github api v3'';
       };
-      name = ''gh-0.12.0'';
-      requiredGems = [ g.faraday_0_8_8 g.backports_3_3_3 g.multi_json_1_7_9 g.addressable_2_3_5 g.net_http_persistent_2_9 g.net_http_pipeline_1_0_1 ];
-      sha256 = ''180jmg6rwilzcbzvyg74q27zpr09pv6pw3cfcjxr0bcklv203q3n'';
+      name = ''gh-0.13.2'';
+      requiredGems = [ g.faraday_0_9_0 g.backports_3_6_0 g.multi_json_1_10_1 g.addressable_2_3_6 g.net_http_persistent_2_9_4 g.net_http_pipeline_1_0_1 ];
+      sha256 = ''17scqa35j6ghpykzk986gnd6dvbrh8nn60ib04hb2gbyh9dns1dj'';
     };
-    gherkin_2_12_1 = {
+    gherkin_2_12_2 = {
       basename = ''gherkin'';
       meta = {
-        description = ''gherkin-2.12.1'';
+        description = ''gherkin-2.12.2'';
         homepage = ''http://github.com/cucumber/gherkin'';
         longDescription = ''A fast Gherkin lexer/parser based on the Ragel State Machine Compiler.'';
       };
-      name = ''gherkin-2.12.1'';
-      requiredGems = [ g.multi_json_1_7_9 ];
-      sha256 = ''07nzchdvkkd35m9k7d9k8j72jm3imv56ccn734mxa5klv1xx2d45'';
+      name = ''gherkin-2.12.2'';
+      requiredGems = [ g.multi_json_1_10_1 ];
+      sha256 = ''1mxfgw15pii1jmq00xxbyp77v71mh3bp99ndgwzfwkxvbcisha25'';
     };
-    guard_2_2_4 = {
-      basename = ''guard'';
-      meta = {
-        description = ''Guard keeps an eye on your file modifications'';
-        homepage = ''http://guardgem.org'';
-        longDescription = ''Guard is a command line tool to easily handle events on file system modifications.'';
-      };
-      name = ''guard-2.2.4'';
-      requiredGems = [ g.thor_0_18_1 g.listen_2_2_0 g.pry_0_9_12_3 g.lumberjack_1_0_4 g.formatador_0_2_4 ];
-      sha256 = ''0z427rkcpzy82g21cgq7i5sn1vxn8hm8j4d78kj9vlaqgilcybhq'';
-    };
-    highline_1_6_19 = {
+    highline_1_6_21 = {
       basename = ''highline'';
       meta = {
         description = ''HighLine is a high-level command-line IO library.'';
@@ -977,39 +707,9 @@ crank out anything from simple list selection to complete shells with just
 minutes of work.
 '';
       };
-      name = ''highline-1.6.19'';
+      name = ''highline-1.6.21'';
       requiredGems = [  ];
-      sha256 = ''0gylnz2cdaswgszgl8x2qx0c87md4246r1i0blgm3nqvgd4hlsxd'';
-    };
-    highline_1_6_20 = {
-      basename = ''highline'';
-      meta = {
-        description = ''HighLine is a high-level command-line IO library.'';
-        homepage = ''http://highline.rubyforge.org'';
-        longDescription = ''A high-level IO library that provides validation, type conversion, and more for
-command-line interfaces. HighLine also includes a complete menu system that can
-crank out anything from simple list selection to complete shells with just
-minutes of work.
-'';
-      };
-      name = ''highline-1.6.20'';
-      requiredGems = [  ];
-      sha256 = ''0gk7mpw2r5lv60vr4hb0090wbnqh0fsbyrrcvxiqk7hyhxdz08iv'';
-    };
-    highline_1_6_2 = {
-      basename = ''highline'';
-      meta = {
-        description = ''HighLine is a high-level command-line IO library.'';
-        homepage = ''http://highline.rubyforge.org'';
-        longDescription = ''A high-level IO library that provides validation, type conversion, and more for
-command-line interfaces. HighLine also includes a complete menu system that can
-crank out anything from simple list selection to complete shells with just
-minutes of work.
-'';
-      };
-      name = ''highline-1.6.2'';
-      requiredGems = [  ];
-      sha256 = ''0azmahb70f1nlg6lq5wljbzcijhfb9lz8skwb4k2977kdml07mcn'';
+      sha256 = ''06bml1fjsnrhd956wqq5k3w8cyd09rv1vixdpa3zzkl6xs72jdn1'';
     };
     hike_1_2_3 = {
       basename = ''hike'';
@@ -1022,7 +722,7 @@ minutes of work.
       requiredGems = [  ];
       sha256 = ''0i6c9hrszzg3gn2j41v3ijnwcm8cc2931fnjiv6mnpl4jcjjykhm'';
     };
-    hoe_3_1_0 = {
+    hoe_3_7_1 = {
       basename = ''hoe'';
       meta = {
         description = ''Hoe is a rake/rubygems helper for project Rakefiles'';
@@ -1038,108 +738,64 @@ below.
 
 For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
       };
-      name = ''hoe-3.1.0'';
-      requiredGems = [ g.rake_0_9_6 ];
-      sha256 = ''0i961x0hrd6fs1nsfham87dhn64gqpnai27l14jag7qbnp3a79yp'';
+      name = ''hoe-3.7.1'';
+      requiredGems = [ g.rake_10_3_2 ];
+      sha256 = ''0lyrdbzxj4isxzyfp93w0q1g9sqw6grkjp91xirzlw1z1714qsw3'';
     };
-    http_cookie_1_0_1 = {
+    http_cookie_1_0_2 = {
       basename = ''http_cookie'';
       meta = {
         description = ''A Ruby library to handle HTTP Cookies based on RFC 6265'';
         homepage = ''https://github.com/sparklemotion/http-cookie'';
         longDescription = ''HTTP::Cookie is a Ruby library to handle HTTP Cookies based on RFC 6265.  It has with security, standards compliance and compatibility in mind, to behave just the same as today's major web browsers.  It has builtin support for the legacy cookies.txt and the latest cookies.sqlite formats of Mozilla Firefox, and its modular API makes it easy to add support for a new backend store.'';
       };
-      name = ''http-cookie-1.0.1'';
-      requiredGems = [ g.domain_name_0_5_13 ];
-      sha256 = ''0gzghirmim217g7gf1rq3xiav8gfg32r38mcz0w9vznk30psy7d9'';
+      name = ''http-cookie-1.0.2'';
+      requiredGems = [ g.domain_name_0_5_20 ];
+      sha256 = ''0cz2fdkngs3jc5w32a6xcl511hy03a7zdiy988jk1sf3bf5v3hdw'';
     };
-    i18n_0_6_5 = {
+    i18n_0_6_11 = {
       basename = ''i18n'';
       meta = {
         description = ''New wave Internationalization support for Ruby'';
         homepage = ''http://github.com/svenfuchs/i18n'';
         longDescription = ''New wave Internationalization support for Ruby.'';
       };
-      name = ''i18n-0.6.5'';
+      name = ''i18n-0.6.11'';
       requiredGems = [  ];
-      sha256 = ''0cv15pi9f530fx9q3b83im7afy947dd86jf5ffqs9bvw8iykmil1'';
+      sha256 = ''0fwjlgmgry2blf8zlxn9c555cf4a16p287l599kz5104ncjxlzdk'';
     };
-    iconv_1_0_3 = {
+    iconv_1_0_4 = {
       basename = ''iconv'';
       meta = {
         description = ''iconv wrapper library'';
         homepage = ''https://github.com/nurse/iconv'';
         longDescription = ''iconv wrapper library'';
       };
-      name = ''iconv-1.0.3'';
+      name = ''iconv-1.0.4'';
       requiredGems = [  ];
-      sha256 = ''1nhjn07h2fqivdj6xqzi2x2kzh28vigx8z3q5fv2cqn9aqmbdacl'';
+      sha256 = ''16sgj6gqs4bgwv6q4vv811fb43908psr33dz7sphn1z8la3y7m2v'';
     };
-    jekyll_1_3_0 = {
-      basename = ''jekyll'';
-      meta = {
-        description = ''A simple, blog aware, static site generator.'';
-        homepage = ''http://github.com/mojombo/jekyll'';
-        longDescription = ''Jekyll is a simple, blog aware, static site generator.'';
-      };
-      name = ''jekyll-1.3.0'';
-      requiredGems = [ g.liquid_2_5_4 g.classifier_1_3_3 g.listen_1_3_1 g.maruku_0_6_1 g.pygments_rb_0_5_4 g.commander_4_1_5 g.safe_yaml_0_9_7 g.colorator_0_1 g.redcarpet_2_3_0 ];
-      sha256 = ''0hq9sdyivfifba0d4d7g113jbd3jwm8jpdc9i09mv0nfhdcbc3k4'';
-    };
-    jquery_rails_3_0_4 = {
-      basename = ''jquery_rails'';
-      meta = {
-        description = ''Use jQuery with Rails 3'';
-        homepage = ''http://rubygems.org/gems/jquery-rails'';
-        longDescription = ''This gem provides jQuery and the jQuery-ujs driver for your Rails 3 application.'';
-      };
-      name = ''jquery-rails-3.0.4'';
-      requiredGems = [ g.railties_4_0_0 g.thor_0_18_1 ];
-      sha256 = ''0k13mcl9d0zxa2azml0d06y14ggk5yl2xvzsc9l2qv2cwc9xxajm'';
-    };
-    jruby_pageant_1_1_1 = {
-      basename = ''jruby_pageant'';
-      meta = {
-        description = ''jruby-pageant allows Pageant access on JRuby + Windows'';
-        homepage = ''http://github.com/arturaz/jruby-pageant'';
-        longDescription = ''This is a convenience gem packaging required JNA/JSCH jars.'';
-      };
-      name = ''jruby-pageant-1.1.1'';
-      requiredGems = [  ];
-      sha256 = ''1kgqsn0bagr41gf5kbqaxbs38a7s5bm85m0pdx4qz7d70v9nc9cl'';
-    };
-    jsduck_5_1_0 = {
+    jsduck_5_3_4 = {
       basename = ''jsduck'';
       meta = {
         description = ''Simple JavaScript Duckumentation generator'';
         homepage = ''https://github.com/senchalabs/jsduck'';
         longDescription = ''Documentation generator for Sencha JS frameworks'';
       };
-      name = ''jsduck-5.1.0'';
-      requiredGems = [ g.rdiscount_2_1_6 g.json_1_8_0 g.parallel_0_7_1 g.rkelly_remix_0_0_4 g.dimensions_1_2_0 ];
-      sha256 = ''05l2729524w6i1jywyb2kgbp8w04za8wbvx5w914f7mcsry98rn4'';
+      name = ''jsduck-5.3.4'';
+      requiredGems = [ g.rdiscount_2_1_7_1 g.json_1_8_1 g.parallel_0_7_1 g.rkelly_remix_0_0_6 g.dimensions_1_2_0 ];
+      sha256 = ''0hac7g9g6gg10bigbm8dskwwbv1dfch8ca353gh2bkwf244qq2xr'';
     };
-    json_1_8_0 = {
+    json_1_8_1 = {
       basename = ''json'';
       meta = {
         description = ''JSON Implementation for Ruby'';
         homepage = ''http://flori.github.com/json'';
         longDescription = ''This is a JSON implementation as a Ruby extension in C.'';
       };
-      name = ''json-1.8.0'';
+      name = ''json-1.8.1'';
       requiredGems = [  ];
-      sha256 = ''0a8prb853nwz9xqjhcd4rm9a5ng8arcn06hlacf0kcizzz69rr47'';
-    };
-    json_pure_1_7_5 = {
-      basename = ''json_pure'';
-      meta = {
-        description = ''JSON Implementation for Ruby'';
-        homepage = ''http://flori.github.com/json'';
-        longDescription = ''This is a JSON implementation in pure Ruby.'';
-      };
-      name = ''json_pure-1.7.5'';
-      requiredGems = [  ];
-      sha256 = ''14nwwf001mh70qnynpb3h8c0kgcfi666yrg2frib4p6lr57jx8ap'';
+      sha256 = ''0002bsycvizvkmk1jyv8px1hskk6wrjfk4f7x5byi8gxm6zzn6wn'';
     };
     json_pure_1_8_0 = {
       basename = ''json_pure'';
@@ -1152,61 +808,18 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
       requiredGems = [  ];
       sha256 = ''0kkn5zhiffav2cffj43wwvzj07825r4j463ilfjgik034vnbjs83'';
     };
-    launchy_2_3_0 = {
+    launchy_2_4_2 = {
       basename = ''launchy'';
       meta = {
         description = ''Launchy is helper class for launching cross-platform applications in a fire and forget manner.'';
         homepage = ''http://github.com/copiousfreetime/launchy'';
         longDescription = ''Launchy is helper class for launching cross-platform applications in a fire and forget manner. There are application concepts (browser, email client, etc) that are common across all platforms, and they may be launched differently on each platform. Launchy is here to make a common approach to launching external application from within ruby programs.'';
       };
-      name = ''launchy-2.3.0'';
-      requiredGems = [ g.addressable_2_3_5 ];
-      sha256 = ''0ckvs40f29ancs0ki12pqb94k380cz41b4gbjplm85ly6kd57sph'';
+      name = ''launchy-2.4.2'';
+      requiredGems = [ g.addressable_2_3_6 ];
+      sha256 = ''0i1nmlrqpnk2q6f7iq85cqaa7b8fw4bmqm57w60g92lsfmszs8iv'';
     };
-    launchy_2_4_0 = {
-      basename = ''launchy'';
-      meta = {
-        description = ''Launchy is helper class for launching cross-platform applications in a fire and forget manner.'';
-        homepage = ''http://github.com/copiousfreetime/launchy'';
-        longDescription = ''Launchy is helper class for launching cross-platform applications in a fire and forget manner. There are application concepts (browser, email client, etc) that are common across all platforms, and they may be launched differently on each platform. Launchy is here to make a common approach to launching external application from within ruby programs.'';
-      };
-      name = ''launchy-2.4.0'';
-      requiredGems = [ g.addressable_2_3_5 ];
-      sha256 = ''0vxc3m4sjxyjjzw2rmsginf9nbxfyv7hhxshmn6kxkvcpjxx5di0'';
-    };
-    liquid_2_5_4 = {
-      basename = ''liquid'';
-      meta = {
-        description = ''A secure, non-evaling end user template engine with aesthetic markup.'';
-        homepage = ''http://www.liquidmarkup.org'';
-      };
-      name = ''liquid-2.5.4'';
-      requiredGems = [  ];
-      sha256 = ''0adb1fz20jwcyx1ia133426i59mrrz9iq9lpcmzq6jx0dlaa4amv'';
-    };
-    listen_1_3_1 = {
-      basename = ''listen'';
-      meta = {
-        description = ''Listen to file modifications'';
-        homepage = ''https://github.com/guard/listen'';
-        longDescription = ''The Listen gem listens to file modifications and notifies you about the changes. Works everywhere!'';
-      };
-      name = ''listen-1.3.1'';
-      requiredGems = [ g.rb_fsevent_0_9_3 g.rb_inotify_0_9_2 g.rb_kqueue_0_2_0 ];
-      sha256 = ''1p1rqz26ixx0fzc0hy3psq2bb3pwkv9awixv76zkaaqj1czabzbs'';
-    };
-    listen_2_2_0 = {
-      basename = ''listen'';
-      meta = {
-        description = ''Listen to file modifications'';
-        homepage = ''https://github.com/guard/listen'';
-        longDescription = ''The Listen gem listens to file modifications and notifies you about the changes. Works everywhere!'';
-      };
-      name = ''listen-2.2.0'';
-      requiredGems = [ g.celluloid_0_15_2 g.rb_fsevent_0_9_3 g.rb_inotify_0_9_2 ];
-      sha256 = ''1fm6cp5d4xbd5wdd0d804m3p2cc5rjrr5yzqzzh1ndzgbs94sv5c'';
-    };
-    locale_2_0_8 = {
+    locale_2_1_0 = {
       basename = ''locale'';
       meta = {
         description = ''Ruby-Locale is the pure ruby library which provides basic APIs for localization.'';
@@ -1214,42 +827,31 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
         longDescription = ''Ruby-Locale is the pure ruby library which provides basic APIs for localization.
 '';
       };
-      name = ''locale-2.0.8'';
+      name = ''locale-2.1.0'';
       requiredGems = [  ];
-      sha256 = ''1hmixxg4aigl3h1qmz4fdsrv81p0bblcjbks32nrcvcpwmlylf12'';
+      sha256 = ''18bb0g24flq9dr8qv4j7pm7w9i2vmvmqrbmry95ibf1r1c4s60yj'';
     };
-    lockfile_2_1_0 = {
+    lockfile_2_1_3 = {
       basename = ''lockfile'';
       meta = {
         description = ''lockfile'';
         homepage = ''https://github.com/ahoward/lockfile'';
-        longDescription = ''description: lockfile kicks the ass'';
+        longDescription = ''a ruby library for creating perfect and NFS safe lockfiles'';
       };
-      name = ''lockfile-2.1.0'';
+      name = ''lockfile-2.1.3'';
       requiredGems = [  ];
-      sha256 = ''1yfpz9k0crb7q7y5bcaavf2jzbc170dj84hqz13qp75rj7bl3qhf'';
+      sha256 = ''0dij3ijywylvfgrpi2i0k17f6w0wjhnjjw0k9030f54z56cz7jrr'';
     };
-    lumberjack_1_0_4 = {
-      basename = ''lumberjack'';
-      meta = {
-        description = ''A simple, powerful, and very fast logging utility that can be a drop in replacement for Logger or ActiveSupport::BufferedLogger.'';
-        homepage = ''http://github.com/bdurand/lumberjack'';
-        longDescription = ''A simple, powerful, and very fast logging utility that can be a drop in replacement for Logger or ActiveSupport::BufferedLogger. Provides support for automatically rolling log files even with multiple processes writing the same log file.'';
-      };
-      name = ''lumberjack-1.0.4'';
-      requiredGems = [  ];
-      sha256 = ''1mj6m12hnmkvzl4w2yh04ak3z45pwksj6ra7v30za8snw9kg919d'';
-    };
-    macaddr_1_6_1 = {
+    macaddr_1_7_1 = {
       basename = ''macaddr'';
       meta = {
         description = ''macaddr'';
         homepage = ''https://github.com/ahoward/macaddr'';
-        longDescription = ''description: macaddr kicks the ass'';
+        longDescription = ''cross platform mac address determination for ruby'';
       };
-      name = ''macaddr-1.6.1'';
-      requiredGems = [ g.systemu_2_5_2 ];
-      sha256 = ''1vd9l1d0lc0sq3rn1ya816wrzgxxqdzq6pgq0y0435qm6ikwy7ch'';
+      name = ''macaddr-1.7.1'';
+      requiredGems = [ g.systemu_2_6_4 ];
+      sha256 = ''1clii8mvhmh5lmnm95ljnjygyiyhdpja85c5vy487rhxn52scn0b'';
     };
     mail_2_5_4 = {
       basename = ''mail'';
@@ -1259,24 +861,21 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
         longDescription = ''A really Ruby Mail handler.'';
       };
       name = ''mail-2.5.4'';
-      requiredGems = [ g.mime_types_1_25 g.treetop_1_4_15 ];
+      requiredGems = [ g.mime_types_1_25_1 g.treetop_1_4_15 ];
       sha256 = ''0z15ksb8blcppchv03g34844f7xgf36ckp484qjj2886ig1qara4'';
     };
-    maruku_0_6_1 = {
-      basename = ''maruku'';
+    mail_2_6_1 = {
+      basename = ''mail'';
       meta = {
-        description = ''Maruku is a Markdown-superset interpreter written in Ruby.'';
-        homepage = ''http://github.com/bhollis/maruku'';
-        longDescription = ''Maruku is a Markdown interpreter in Ruby.
-	It features native export to HTML and PDF (via Latex). The
-	output is really beautiful!
-	'';
+        description = ''Mail provides a nice Ruby DSL for making, sending and reading emails.'';
+        homepage = ''http://github.com/mikel/mail'';
+        longDescription = ''A really Ruby Mail handler.'';
       };
-      name = ''maruku-0.6.1'';
-      requiredGems = [ g.syntax_1_0_0 ];
-      sha256 = ''01xc4l480k79jbicr0j37d9bmd4dsnrjh5hwdrh2djvy06l77ngz'';
+      name = ''mail-2.6.1'';
+      requiredGems = [ g.mime_types_2_3 ];
+      sha256 = ''17gsw57nc7ihk4xnbq9lidzv6h1ivh4l5m16hy790vs219n22mhx'';
     };
-    mechanize_2_7_2 = {
+    mechanize_2_7_3 = {
       basename = ''mechanize'';
       meta = {
         description = ''The Mechanize library is used for automating interaction with websites'';
@@ -1287,9 +886,9 @@ and can follow links and submit forms.  Form fields can be populated and
 submitted.  Mechanize also keeps track of the sites that you have visited as
 a history.'';
       };
-      name = ''mechanize-2.7.2'';
-      requiredGems = [ g.net_http_digest_auth_1_4 g.net_http_persistent_2_9 g.mime_types_1_25 g.http_cookie_1_0_1 g.nokogiri_1_6_0 g.ntlm_http_0_1_1 g.webrobots_0_1_1 g.domain_name_0_5_13 ];
-      sha256 = ''1w1rnn6jps1393gywi38saw5iqrvyai3vmvbv2kbc9j0zj5csyrl'';
+      name = ''mechanize-2.7.3'';
+      requiredGems = [ g.net_http_digest_auth_1_4 g.net_http_persistent_2_9_4 g.mime_types_2_3 g.http_cookie_1_0_2 g.nokogiri_1_6_3_1 g.ntlm_http_0_1_1 g.webrobots_0_1_1 g.domain_name_0_5_20 ];
+      sha256 = ''00jkazj8fqnynaxca0lnwx5a084irxrnw8n8i0kppq4vg71g7rrx'';
     };
     method_source_0_8_2 = {
       basename = ''method_source'';
@@ -1302,20 +901,22 @@ a history.'';
       requiredGems = [  ];
       sha256 = ''1g5i4w0dmlhzd18dijlqw5gk27bv6dj2kziqzrzb7mpgxgsd1sf2'';
     };
-    mime_types_1_25 = {
+    mime_types_1_25_1 = {
       basename = ''mime_types'';
       meta = {
         description = ''This library allows for the identification of a file's likely MIME content type'';
         homepage = ''http://mime-types.rubyforge.org/'';
         longDescription = ''This library allows for the identification of a file's likely MIME content
-type. This is release 1.25, adding experimental caching and lazy loading
-functionality.
+type. This is release 1.25.1, fixing an issue with priority comparison for
+mime-types 1.x. The current release is 2.0, which only supports Ruby 1.9 or
+later.
 
-The caching and lazy loading features were initially implemented by Greg
-Brockman (gdb). As these features are experimental, they are disabled by
-default and must be enabled through the use of environment variables. The cache
-is invalidated on a per-version basis; the cache for version 1.25 will not be
-reused for version 1.26.
+Release 1.25.1 contains all features of 1.25, including the experimental
+caching and lazy loading functionality. The caching and lazy loading features
+were initially implemented by Greg Brockman (gdb). As these features are
+experimental, they are disabled by default and must be enabled through the use
+of environment variables. The cache is invalidated on a per-version basis; the
+cache for version 1.25 will not be reused for any later version.
 
 To use lazy loading, set the environment variable +RUBY_MIME_TYPES_LAZY_LOAD+
 to any value other than 'false'. When using lazy loading, the initial startup
@@ -1346,8 +947,7 @@ complete; don't hesitate to ask to add additional information. This library
 follows the IANA collection of MIME types (see below for reference).
 
 MIME::Types for Ruby was originally based on MIME::Types for Perl by Mark
-Overmeer, copyright 2001 - 2009. As of version 1.15, the data format for the
-MIME::Type list has changed and the synchronization will no longer happen.
+Overmeer, copyright 2001 - 2009.
 
 MIME::Types is built to conform to the MIME types of RFCs 2045 and 2231. It
 tracks the {IANA registry}[http://www.iana.org/assignments/media-types/]
@@ -1355,15 +955,15 @@ tracks the {IANA registry}[http://www.iana.org/assignments/media-types/]
 added from the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp]
 and added by the users of MIME::Types.'';
       };
-      name = ''mime-types-1.25'';
+      name = ''mime-types-1.25.1'';
       requiredGems = [  ];
-      sha256 = ''0hd6hpl05jyx3siznk70z46bmrzwmcyrr24yfaqg6nar35zw8bgf'';
+      sha256 = ''0mhzsanmnzdshaba7gmsjwnv168r1yj8y0flzw88frw1cickrvw8'';
     };
-    mime_types_2_0 = {
+    mime_types_2_3 = {
       basename = ''mime_types'';
       meta = {
         description = ''The mime-types library provides a library and registry for information about MIME content type definitions'';
-        homepage = ''http://mime-types.rubyforge.org/'';
+        homepage = ''https://github.com/halostatue/mime-types/'';
         longDescription = ''The mime-types library provides a library and registry for information about
 MIME content type definitions. It can be used to determine defined filename
 extensions for MIME types, or to use filename extensions to look up the likely
@@ -1379,46 +979,50 @@ add additional type definitions (see Contributing.rdoc). The primary sources
 for MIME type definitions found in mime-types is the IANA collection of
 registrations (see below for the link), RFCs, and W3C recommendations.
 
-The mime-types library uses semantic versioning. This is release 2.0; there are
-incompatible changes in the API provided by mime-types, mostly around registry
-initialization (see History.rdoc for full details), and the removal of support
-for Ruby 1.8 interpreters.
+This is release 2.2, mostly changing how the MIME type registry is updated from
+the IANA registry (the format of which was incompatibly changed shortly before
+this release) and taking advantage of the extra data available from IANA
+registry in the form of MIME::Type#xrefs. In addition, the {LTSW
+list}[http://www.ltsw.se/knbase/internet/mime.htp] has been dropped as a
+supported list.
+
+As a reminder, mime-types 2.x is no longer compatible with Ruby 1.8 and
+mime-types 1.x is only being maintained for security issues. No new MIME types
+or features will be added.
 
 mime-types (previously called MIME::Types for Ruby) was originally based on
 MIME::Types for Perl by Mark Overmeer, copyright 2001 - 2009. It is built to
-conform to the MIME types of RFCs 2045 and 2231. It tracks the {IANA
-registry}[http://www.iana.org/assignments/media-types/]
-({ftp}[ftp://ftp.iana.org/assignments/media-types]) with some unofficial types
-added from the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp]
-and added by the users of mime-types.'';
+conform to the MIME types of RFCs 2045 and 2231. It tracks the {IANA Media
+Types registry}[https://www.iana.org/assignments/media-types/media-types.xhtml]
+with some types added by the users of mime-types.'';
       };
-      name = ''mime-types-2.0'';
+      name = ''mime-types-2.3'';
       requiredGems = [  ];
-      sha256 = ''1q1s22l3mm0am2f7n9qjqp8zl0smr9zlqr2ywwyfjkid2sj3prfk'';
+      sha256 = ''0j0mwzr2q9fmisp3r8rp7j95dns2gw7sd8c5sb5y6z0dfj56a4vd'';
     };
-    mini_portile_0_5_1 = {
+    mini_portile_0_6_0 = {
       basename = ''mini_portile'';
       meta = {
         description = ''Simplistic port-like solution for developers'';
         homepage = ''http://github.com/luislavena/mini_portile'';
         longDescription = ''Simplistic port-like solution for developers. It provides a standard and simplified way to compile against dependency libraries without messing up your system.'';
       };
-      name = ''mini_portile-0.5.1'';
+      name = ''mini_portile-0.6.0'';
       requiredGems = [  ];
-      sha256 = ''0cafnlhdzakzl5vqcm9b97kchj9bvhlcf4ylkyr85lz1263hbagg'';
+      sha256 = ''09kcn4g63xrdirgwxgjikqg976rr723bkc9bxfr29pk22cj3wavn'';
     };
-    minitar_0_5_3 = {
+    minitar_0_5_4 = {
       basename = ''minitar'';
       meta = {
         description = ''Provides POSIX tarchive management from Ruby programs.'';
-        homepage = ''http://rubyforge.org/projects/ruwiki/'';
-        longDescription = ''Archive::Tar::Minitar is a pure-Ruby library and command-line utility that provides the ability to deal with POSIX tar(1) archive files. The implementation is based heavily on Mauricio Ferna'ndez's implementation in rpa-base, but has been reorganised to promote reuse in other projects.'';
+        homepage = ''http://www.github.com/atoulme/minitar'';
+        longDescription = ''Archive::Tar::Minitar is a pure-Ruby library and command-line utility that provides the ability to deal with POSIX tar(1) archive files. The implementation is based heavily on Mauricio Ferna'ndez's implementation in rpa-base, but has been reorganised to promote reuse in other projects. Antoine Toulme forked the original project on rubyforge to place it on github, under http://www.github.com/atoulme/minitar'';
       };
-      name = ''minitar-0.5.3'';
+      name = ''minitar-0.5.4'';
       requiredGems = [  ];
-      sha256 = ''035vs1knnnjsb8arfp8vx75warvwcdpiljjwv38lqljai9v8fq53'';
+      sha256 = ''1vpdjfmdq1yc4i620frfp9af02ia435dnpj8ybsd7dc3rypkvbka'';
     };
-    minitest_4_7_5 = {
+    minitest_5_4_0 = {
       basename = ''minitest'';
       meta = {
         description = ''minitest provides a complete suite of testing facilities supporting TDD, BDD, mocking, and benchmarking'';
@@ -1477,64 +1081,53 @@ classes, modules, inheritance, methods. This means you only have to
 learn ruby to use minitest and all of your regular OO practices like
 extract-method refactorings still apply.'';
       };
-      name = ''minitest-4.7.5'';
+      name = ''minitest-5.4.0'';
       requiredGems = [  ];
-      sha256 = ''03p6iban9gcpcflzp4z901s1hgj9369p6515h967ny6hlqhcf2iy'';
+      sha256 = ''002xflqz5wl8gcj9gw4q66mq5jkp445zgd9c5vs6cw6lsfsyg4rl'';
     };
-    mono_logger_1_1_0 = {
-      basename = ''mono_logger'';
-      meta = {
-        description = ''A lock-free logger compatible with Ruby 2.0.'';
-        homepage = ''http://github.com/steveklabnik/mono_logger'';
-        longDescription = ''A lock-free logger compatible with Ruby 2.0. Ruby does not allow you to request a lock in a trap handler because that could deadlock, so Logger is not sufficient.'';
-      };
-      name = ''mono_logger-1.1.0'';
-      requiredGems = [  ];
-      sha256 = ''18yplq3xxv5crwpfwbw2sb6brqd3g51si7x9fbh9bcimg4ipzayp'';
-    };
-    multi_json_1_7_9 = {
+    multi_json_1_10_1 = {
       basename = ''multi_json'';
       meta = {
         description = ''A common interface to multiple JSON libraries.'';
         homepage = ''http://github.com/intridea/multi_json'';
         longDescription = ''A common interface to multiple JSON libraries, including Oj, Yajl, the JSON gem (with C-extensions), the pure-Ruby JSON gem, NSJSONSerialization, gson.rb, JrJackson, and OkJson.'';
       };
-      name = ''multi_json-1.7.9'';
+      name = ''multi_json-1.10.1'';
       requiredGems = [  ];
-      sha256 = ''1q13ldcc8shlfisy90k19zrar87208gs3za6jmr78p11ip21picx'';
+      sha256 = ''1ll21dz01jjiplr846n1c8yzb45kj5hcixgb72rz0zg8fyc9g61c'';
     };
-    multi_json_1_8_2 = {
+    multi_json_1_3_6 = {
       basename = ''multi_json'';
       meta = {
-        description = ''A common interface to multiple JSON libraries.'';
+        description = ''A gem to provide swappable JSON backends.'';
         homepage = ''http://github.com/intridea/multi_json'';
-        longDescription = ''A common interface to multiple JSON libraries, including Oj, Yajl, the JSON gem (with C-extensions), the pure-Ruby JSON gem, NSJSONSerialization, gson.rb, JrJackson, and OkJson.'';
+        longDescription = ''A gem to provide easy switching between different JSON backends, including Oj, Yajl, the JSON gem (with C-extensions), the pure-Ruby JSON gem, and OkJson.'';
       };
-      name = ''multi_json-1.8.2'';
+      name = ''multi_json-1.3.6'';
       requiredGems = [  ];
-      sha256 = ''1ffmnwsfwdgspk86x1g98cq2ivqlgqpqngyrvs07zsnvgdimahdb'';
+      sha256 = ''0q2zjfvd2ibds9g9nzf2p1b47fc1wqliwfywv5pw85w15lmy91yr'';
     };
-    multi_test_0_0_2 = {
+    multi_test_0_1_1 = {
       basename = ''multi_test'';
       meta = {
-        description = ''multi-test-0.0.2'';
+        description = ''multi-test-0.1.1'';
         homepage = ''http://cukes.info'';
         longDescription = ''Wafter-thin gem to help control rogue test/unit/autorun requires'';
       };
-      name = ''multi_test-0.0.2'';
+      name = ''multi_test-0.1.1'';
       requiredGems = [  ];
-      sha256 = ''0y8i0v0awc87laicqz1348k54z6wsyf141xqd7gh2bjgm9pc9pkr'';
+      sha256 = ''1dd810limbdc8k7ss83g83krrsjjqs79nicbdxk74l1a2sp2jhwv'';
     };
-    multipart_post_1_2_0 = {
+    multipart_post_2_0_0 = {
       basename = ''multipart_post'';
       meta = {
         description = ''A multipart form post accessory for Net::HTTP.'';
         homepage = ''https://github.com/nicksieger/multipart-post'';
         longDescription = ''Use with Net::HTTP to do multipart form posts.  IO values that have #content_type, #original_filename, and #local_path will be posted as a binary file.'';
       };
-      name = ''multipart-post-1.2.0'';
+      name = ''multipart-post-2.0.0'';
       requiredGems = [  ];
-      sha256 = ''12p7lnmc52di1r4h73h6xrpppplzyyhani9p7wm8l4kgf1hnmwnc'';
+      sha256 = ''09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x'';
     };
     net_http_digest_auth_1_4 = {
       basename = ''net_http_digest_auth'';
@@ -1553,7 +1146,7 @@ for an example.'';
       requiredGems = [  ];
       sha256 = ''14801gr34g0rmqz9pv4rkfa3crfdbyfk6r48vpg5a5407v0sixqi'';
     };
-    net_http_persistent_2_9 = {
+    net_http_persistent_2_9_4 = {
       basename = ''net_http_persistent'';
       meta = {
         description = ''Manages persistent connections using Net::HTTP plus a speed fix for Ruby 1.8'';
@@ -1569,9 +1162,9 @@ Net::HTTP supports persistent connections with some API methods but does not
 handle reconnection gracefully.  Net::HTTP::Persistent supports reconnection
 and retry according to RFC 2616.'';
       };
-      name = ''net-http-persistent-2.9'';
+      name = ''net-http-persistent-2.9.4'';
       requiredGems = [  ];
-      sha256 = ''0k9bp7q5fsh908jnkwfj71ky04i4ih0ky6sqi5vl6zcpjsczgfcb'';
+      sha256 = ''1y9fhaax0d9kkslyiqi1zys6cvpaqx9a0y0cywp24rpygwh4s9r4'';
     };
     net_http_pipeline_1_0_1 = {
       basename = ''net_http_pipeline'';
@@ -1586,49 +1179,38 @@ The server will respond in-order.'';
       requiredGems = [  ];
       sha256 = ''0bxjy33yhxwsbnld8xj3zv64ibgfjn9rjpiqkyd5ipmz50pww8v9'';
     };
-    net_sftp_2_0_5 = {
+    net_sftp_2_1_2 = {
       basename = ''net_sftp'';
       meta = {
         description = ''A pure Ruby implementation of the SFTP client protocol'';
-        homepage = ''http://net-ssh.rubyforge.org/sftp'';
+        homepage = ''https://github.com/net-ssh/net-sftp'';
         longDescription = ''A pure Ruby implementation of the SFTP client protocol'';
       };
-      name = ''net-sftp-2.0.5'';
-      requiredGems = [ g.net_ssh_2_6_8 ];
-      sha256 = ''0lqk735wspm8rbiyxpbil8ikrqcyg00ss1df7fny0761c3as6m0v'';
+      name = ''net-sftp-2.1.2'';
+      requiredGems = [ g.net_ssh_2_9_1 ];
+      sha256 = ''04674g4n6mryjajlcd82af8g8k95la4b1bj712dh71hw1c9vhw1y'';
     };
-    net_ssh_2_6_0 = {
-      basename = ''net_ssh'';
-      meta = {
-        description = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol.'';
-        homepage = ''http://github.com/net-ssh/net-ssh'';
-        longDescription = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol. It allows you to write programs that invoke and interact with processes on remote servers, via SSH2.'';
-      };
-      name = ''net-ssh-2.6.0'';
-      requiredGems = [ g.jruby_pageant_1_1_1 ];
-      sha256 = ''18fsgps4a9dfrjszkl3py8j7vw0xwi70bcp59ccj2rlr6i1jv5gw'';
-    };
-    net_ssh_2_6_8 = {
+    net_ssh_2_7_0 = {
       basename = ''net_ssh'';
       meta = {
         description = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol.'';
         homepage = ''https://github.com/net-ssh/net-ssh'';
         longDescription = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol. It allows you to write programs that invoke and interact with processes on remote servers, via SSH2.'';
       };
-      name = ''net-ssh-2.6.8'';
+      name = ''net-ssh-2.7.0'';
       requiredGems = [  ];
-      sha256 = ''0vf9w8b9f5ha94nwhvwxyqk4lfpy42ihl1g0qib8dfvswlkqw3mx'';
+      sha256 = ''14v0cq2fws54kxpgz249xmjlajynhcs4s2szl8kjxgn4c78lrkmr'';
     };
-    netrc_0_7_7 = {
-      basename = ''netrc'';
+    net_ssh_2_9_1 = {
+      basename = ''net_ssh'';
       meta = {
-        description = ''Library to read and write netrc files.'';
-        homepage = ''https://github.com/geemus/netrc'';
-        longDescription = ''This library can read and update netrc files, preserving formatting including comments and whitespace.'';
+        description = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol.'';
+        homepage = ''https://github.com/net-ssh/net-ssh'';
+        longDescription = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol. It allows you to write programs that invoke and interact with processes on remote servers, via SSH2.'';
       };
-      name = ''netrc-0.7.7'';
+      name = ''net-ssh-2.9.1'';
       requiredGems = [  ];
-      sha256 = ''1y64v93hsxdwgx3dfkyzdki3zqd1slm42dmi23v0zy3kap4vpard'';
+      sha256 = ''1vscp4r58jisiigqc6d6752w19m1m6hmi3jkzmp3ydxai7h3jb2j'';
     };
     nix_0_1_1 = {
       basename = ''nix'';
@@ -1641,22 +1223,7 @@ The server will respond in-order.'';
       requiredGems = [  ];
       sha256 = ''0kwrbkkg0gxibhsz9dpd5zabcf2wqsicg28yiazyb3dc9dslk26k'';
     };
-    nokogiri_1_5_10 = {
-      basename = ''nokogiri'';
-      meta = {
-        description = ''Nokogiri (鋸) is an HTML, XML, SAX, and Reader parser'';
-        homepage = ''http://nokogiri.org'';
-        longDescription = ''Nokogiri (鋸) is an HTML, XML, SAX, and Reader parser.  Among Nokogiri's
-many features is the ability to search documents via XPath or CSS3 selectors.
-
-XML is like violence - if it doesn’t solve your problems, you are not using
-enough of it.'';
-      };
-      name = ''nokogiri-1.5.10'';
-      requiredGems = [  ];
-      sha256 = ''0dblphzwzl705xmlqcflz8s60xzbcgi4xqzx7984l4kcssbkn71b'';
-    };
-    nokogiri_1_6_0 = {
+    nokogiri_1_6_3_1 = {
       basename = ''nokogiri'';
       meta = {
         description = ''Nokogiri (鋸) is an HTML, XML, SAX, and Reader parser'';
@@ -1667,9 +1234,9 @@ many features is the ability to search documents via XPath or CSS3 selectors.
 XML is like violence - if it doesn’t solve your problems, you are not using
 enough of it.'';
       };
-      name = ''nokogiri-1.6.0'';
-      requiredGems = [ g.mini_portile_0_5_1 ];
-      sha256 = ''1icrny9w2hd0pm7cyq5wqdkbzr57dkma1lbyrr0x14lsnangkidb'';
+      name = ''nokogiri-1.6.3.1'';
+      requiredGems = [ g.mini_portile_0_6_0 ];
+      sha256 = ''11958hlfd8i3i9y0wk1b6ck9x0j95l4zdbbixmdnnh1r8ijilxli'';
     };
     ntlm_http_0_1_1 = {
       basename = ''ntlm_http'';
@@ -1682,16 +1249,26 @@ enough of it.'';
       requiredGems = [  ];
       sha256 = ''0yx01ffrw87wya1syivqzf8hz02axk7jdpw6aw221xwvib767d36'';
     };
-    papertrail_0_9_7 = {
+    orderedhash_0_0_6 = {
+      basename = ''orderedhash'';
+      meta = {
+        description = ''orderedhash'';
+        homepage = ''http://codeforpeople.com/lib/ruby/orderedhash/'';
+      };
+      name = ''orderedhash-0.0.6'';
+      requiredGems = [  ];
+      sha256 = ''0fryy7f9jbpx33jq5m402yqj01zcg563k9fsxlqbhmq638p4bzd7'';
+    };
+    papertrail_0_9_10 = {
       basename = ''papertrail'';
       meta = {
         description = ''Command-line client for Papertrail hosted log management service.'';
         homepage = ''http://github.com/papertrail/papertrail-cli'';
         longDescription = ''Command-line client for Papertrail hosted log management service. Tails and searches app server logs and system syslog. Supports Boolean search and works with grep and pipe output (Unix).'';
       };
-      name = ''papertrail-0.9.7'';
-      requiredGems = [ g.addressable_2_3_5 g.yajl_ruby_1_1_0 g.chronic_0_10_1 g.faraday_0_8_8 g.faraday_middleware_0_8_8 ];
-      sha256 = ''0v0m1v0qabbr9pmyl77znz39qy1m7p0xwvf3lf9hyq6n524f2dwr'';
+      name = ''papertrail-0.9.10'';
+      requiredGems = [ g.chronic_0_10_2 ];
+      sha256 = ''1v2acc896w5q72m5pfxc8rx36gzih4fivyiqp0kxwypgyh0f0x58'';
     };
     papertrail_cli_0_9_3 = {
       basename = ''papertrail_cli'';
@@ -1701,7 +1278,7 @@ enough of it.'';
         longDescription = ''Placeholder gem to point to new papertrail gem.'';
       };
       name = ''papertrail-cli-0.9.3'';
-      requiredGems = [ g.papertrail_0_9_7 ];
+      requiredGems = [ g.papertrail_0_9_10 ];
       sha256 = ''1914dcfqsmw5rl4xd1zwjrfbgwglyncxm8km06bgxaqn4wnaq5iv'';
     };
     parallel_0_7_1 = {
@@ -1714,7 +1291,7 @@ enough of it.'';
       requiredGems = [  ];
       sha256 = ''1kzz6ydg7r23ks2b7zbpx4vz3h186n19vhgnjcwi7xwd6h2f1fsq'';
     };
-    polyglot_0_3_3 = {
+    polyglot_0_3_5 = {
       basename = ''polyglot'';
       meta = {
         description = ''Augment 'require' to load non-Ruby file types'';
@@ -1724,64 +1301,31 @@ The Polyglot library allows a Ruby module to register a loader
 for the file type associated with a filename extension, and it
 augments 'require' to find and load matching files.'';
       };
-      name = ''polyglot-0.3.3'';
+      name = ''polyglot-0.3.5'';
       requiredGems = [  ];
-      sha256 = ''082zmail2h3cxd9z1wnibhk6aj4sb1f3zzwra6kg9bp51kx2c00v'';
+      sha256 = ''1bqnxwyip623d8pr29rg6m8r0hdg08fpr2yb74f46rn1wgsnxmjr'';
     };
-    posix_spawn_0_3_6 = {
-      basename = ''posix_spawn'';
-      meta = {
-        description = ''posix_spawnp(2) for ruby'';
-        homepage = ''http://github.com/rtomayko/posix-spawn'';
-        longDescription = ''posix-spawn uses posix_spawnp(2) for faster process spawning'';
-      };
-      name = ''posix-spawn-0.3.6'';
-      requiredGems = [  ];
-      sha256 = ''0f2mqka8024yz55iw8wbihvmakwqnbrdr4a1ffl3x2zi104yvb43'';
-    };
-    pry_0_9_12_2 = {
+    pry_0_9_12_6 = {
       basename = ''pry'';
       meta = {
         description = ''An IRB alternative and runtime developer console'';
         homepage = ''http://pry.github.com'';
         longDescription = ''An IRB alternative and runtime developer console'';
       };
-      name = ''pry-0.9.12.2'';
-      requiredGems = [ g.coderay_1_0_9 g.slop_3_4_6 g.method_source_0_8_2 ];
-      sha256 = ''141slzb62zfzdhrygqjmrzh68s3vzrb4mwyipy2lhps5q4b46y9s'';
+      name = ''pry-0.9.12.6'';
+      requiredGems = [ g.coderay_1_1_0 g.slop_3_6_0 g.method_source_0_8_2 ];
+      sha256 = ''0wmgamn83m1zb1fbqc22hiszjf2a2xij5jd95w2gvm5x6l5p61q1'';
     };
-    pry_0_9_12_3 = {
-      basename = ''pry'';
-      meta = {
-        description = ''An IRB alternative and runtime developer console'';
-        homepage = ''http://pry.github.com'';
-        longDescription = ''An IRB alternative and runtime developer console'';
-      };
-      name = ''pry-0.9.12.3'';
-      requiredGems = [ g.coderay_1_1_0 g.slop_3_4_7 g.method_source_0_8_2 ];
-      sha256 = ''1dn80vnyq1l6192sg3p29d0yz6rswnsl8rn3lkf75c86a2qqxpy3'';
-    };
-    pusher_client_0_3_1 = {
+    pusher_client_0_6_0 = {
       basename = ''pusher_client'';
       meta = {
         description = ''Client for consuming WebSockets from http://pusher.com'';
         homepage = ''http://github.com/pusher/pusher-ruby-client'';
         longDescription = ''Client for consuming WebSockets from http://pusher.com'';
       };
-      name = ''pusher-client-0.3.1'';
-      requiredGems = [ g.websocket_1_0_7 g.ruby_hmac_0_4_0 ];
-      sha256 = ''1mxqy960iln065fypk1ww3xgv7q396fpl6v0rp7ipls6aj86j970'';
-    };
-    pygments_rb_0_5_4 = {
-      basename = ''pygments_rb'';
-      meta = {
-        description = ''pygments wrapper for ruby'';
-        homepage = ''http://github.com/tmm1/pygments.rb'';
-        longDescription = ''pygments.rb exposes the pygments syntax highlighter to Ruby'';
-      };
-      name = ''pygments.rb-0.5.4'';
-      requiredGems = [ g.yajl_ruby_1_1_0 g.posix_spawn_0_3_6 ];
-      sha256 = ''0ryl0f0zp0rffaggd978cmrkzsmf83x452fcinw6p705xdk4zbvl'';
+      name = ''pusher-client-0.6.0'';
+      requiredGems = [ g.websocket_1_2_0 g.json_1_8_1 ];
+      sha256 = ''0n7l630qg6wgzak45b6gfjg9a0fmpbrs7mwchqqbja9mjs95r8qy'';
     };
     rack_1_5_2 = {
       basename = ''rack'';
@@ -1801,27 +1345,16 @@ Also see http://rack.github.com/.
       requiredGems = [  ];
       sha256 = ''19szfw76cscrzjldvw30jp3461zl00w4xvw1x9lsmyp86h1g0jp6'';
     };
-    rack_protection_1_5_0 = {
+    rack_protection_1_5_3 = {
       basename = ''rack_protection'';
       meta = {
         description = ''You should use protection!'';
         homepage = ''http://github.com/rkh/rack-protection'';
         longDescription = ''You should use protection!'';
       };
-      name = ''rack-protection-1.5.0'';
+      name = ''rack-protection-1.5.3'';
       requiredGems = [ g.rack_1_5_2 ];
-      sha256 = ''10wm67f2mp9pryg0s8qapbyxd2lcrpb8ywsbicg29cv2xprhbl4j'';
-    };
-    rack_protection_1_5_1 = {
-      basename = ''rack_protection'';
-      meta = {
-        description = ''You should use protection!'';
-        homepage = ''http://github.com/rkh/rack-protection'';
-        longDescription = ''You should use protection!'';
-      };
-      name = ''rack-protection-1.5.1'';
-      requiredGems = [ g.rack_1_5_2 ];
-      sha256 = ''0qxq5ld15nljxzdcx2wmbc3chw8nb6la1ap838vf263lnjcpx3dd'';
+      sha256 = ''0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r'';
     };
     rack_test_0_6_2 = {
       basename = ''rack_test'';
@@ -1837,27 +1370,27 @@ request helpers feature.'';
       requiredGems = [ g.rack_1_5_2 ];
       sha256 = ''01mk715ab5qnqf6va8k3hjsvsmplrfqpz6g58qw4m3l8mim0p4ky'';
     };
-    rails_4_0_0 = {
+    rails_4_1_5 = {
       basename = ''rails'';
       meta = {
         description = ''Full-stack web application framework.'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''Ruby on Rails is a full-stack web framework optimized for programmer happiness and sustainable productivity. It encourages beautiful code by favoring convention over configuration.'';
       };
-      name = ''rails-4.0.0'';
-      requiredGems = [ g.activesupport_4_0_0 g.actionpack_4_0_0 g.activerecord_4_0_0 g.actionmailer_4_0_0 g.railties_4_0_0 g.bundler_1_3_5 g.sprockets_rails_2_0_0 ];
-      sha256 = ''12q2z2zpqpr61rqdx8can2ay6y1xxi6ghmlkyvfvxnnwwzxypavf'';
+      name = ''rails-4.1.5'';
+      requiredGems = [ g.activesupport_4_1_5 g.actionpack_4_1_5 g.actionview_4_1_5 g.activemodel_4_1_5 g.activerecord_4_1_5 g.actionmailer_4_1_5 g.railties_4_1_5 g.bundler_1_7_0 g.sprockets_rails_2_1_3 ];
+      sha256 = ''12s3jkvd6bn40apxc3973czgs7s6y36aclbwif6j770v7sjd9qj7'';
     };
-    railties_4_0_0 = {
+    railties_4_1_5 = {
       basename = ''railties'';
       meta = {
         description = ''Tools for creating, working with, and running Rails applications.'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''Rails internals: application bootup, plugins, generators, and rake tasks.'';
       };
-      name = ''railties-4.0.0'';
-      requiredGems = [ g.activesupport_4_0_0 g.actionpack_4_0_0 g.rake_10_1_0 g.thor_0_18_1 ];
-      sha256 = ''063yyp75b87z0nr1mayzyq462nnhfm834mn97fcyg2mf3zr8qbly'';
+      name = ''railties-4.1.5'';
+      requiredGems = [ g.activesupport_4_1_5 g.actionpack_4_1_5 g.rake_10_3_2 g.thor_0_19_1 ];
+      sha256 = ''18jkjvny51vk53l2g9ibcnjk3gjj1vgh3pyrskmk69csqm2hmaha'';
     };
     rake_0_9_2_2 = {
       basename = ''rake'';
@@ -1870,109 +1403,58 @@ request helpers feature.'';
       requiredGems = [  ];
       sha256 = ''19n4qp5gzbcqy9ajh56kgwqv9p9w2hnczhyvaqz0nlvk9diyng6q'';
     };
-    rake_0_9_6 = {
+    rake_10_3_2 = {
       basename = ''rake'';
       meta = {
-        description = ''Ruby based make-like utility.'';
-        homepage = ''http://rake.rubyforge.org'';
-        longDescription = ''Rake is a Make-like program implemented in Ruby. Tasks and dependencies arespecified in standard Ruby syntax.'';
+        description = ''Rake is a Make-like program implemented in Ruby'';
+        homepage = ''https://github.com/jimweirich/rake'';
+        longDescription = ''Rake is a Make-like program implemented in Ruby. Tasks and dependencies are
+specified in standard Ruby syntax.
+
+Rake has the following features:
+
+* Rakefiles (rake's version of Makefiles) are completely defined in
+  standard Ruby syntax.  No XML files to edit.  No quirky Makefile
+  syntax to worry about (is that a tab or a space?)
+
+* Users can specify tasks with prerequisites.
+
+* Rake supports rule patterns to synthesize implicit tasks.
+
+* Flexible FileLists that act like arrays but know about manipulating
+  file names and paths.
+
+* A library of prepackaged tasks to make building rakefiles easier. For example,
+  tasks for building tarballs and publishing to FTP or SSH sites.  (Formerly
+  tasks for building RDoc and Gems were included in rake but they're now
+  available in RDoc and RubyGems respectively.)
+
+* Supports parallel execution of tasks.'';
       };
-      name = ''rake-0.9.6'';
+      name = ''rake-10.3.2'';
       requiredGems = [  ];
-      sha256 = ''09kyh351gddn6gjz255hbaza1cw235xvfz9dc15rhyq9phvqdphc'';
+      sha256 = ''0nvpkjrpsk8xxnij2wd1cdn6arja9q11sxx4aq4fz18bc6fss15m'';
     };
-    rake_10_1_0 = {
-      basename = ''rake'';
-      meta = {
-        description = ''Ruby based make-like utility.'';
-        homepage = ''http://rake.rubyforge.org'';
-        longDescription = ''Rake is a Make-like program implemented in Ruby. Tasks and dependencies arespecified in standard Ruby syntax.'';
-      };
-      name = ''rake-10.1.0'';
-      requiredGems = [  ];
-      sha256 = ''1frsqpihi39x3yqaa7m9vbls1kd24wckbj5cpiwqix8xmcwnic7q'';
-    };
-    rb_fsevent_0_9_3 = {
+    rb_fsevent_0_9_4 = {
       basename = ''rb_fsevent'';
       meta = {
         description = ''Very simple &amp; usable FSEvents API'';
         homepage = ''http://rubygems.org/gems/rb-fsevent'';
         longDescription = ''FSEvents API with Signals catching (without RubyCocoa)'';
       };
-      name = ''rb-fsevent-0.9.3'';
+      name = ''rb-fsevent-0.9.4'';
       requiredGems = [  ];
-      sha256 = ''0bdnxwdxj4r1kdxfi5nszbsb126njrr81p912g64xxs2bgxd1bp1'';
+      sha256 = ''12if5xsik64kihxf5awsyavlp595y47g9qz77vfp2zvkxgglaka7'';
     };
-    rb_inotify_0_9_2 = {
-      basename = ''rb_inotify'';
-      meta = {
-        description = ''A Ruby wrapper for Linux's inotify, using FFI'';
-        homepage = ''http://github.com/nex3/rb-inotify'';
-        longDescription = ''A Ruby wrapper for Linux's inotify, using FFI'';
-      };
-      name = ''rb-inotify-0.9.2'';
-      requiredGems = [ g.ffi_1_9_3 ];
-      sha256 = ''0752fhgfrx370b2jnhxzs8sjv2l8yrnwqj337kx9v100igd1c7iv'';
-    };
-    rb_kqueue_0_2_0 = {
-      basename = ''rb_kqueue'';
-      meta = {
-        description = ''A Ruby wrapper for BSD's kqueue, using FFI'';
-        homepage = ''http://github.com/mat813/rb-kqueue'';
-        longDescription = ''A Ruby wrapper for BSD's kqueue, using FFI'';
-      };
-      name = ''rb-kqueue-0.2.0'';
-      requiredGems = [ g.ffi_1_9_3 ];
-      sha256 = ''1f2wimhq93a1zy2fbyj7iyh7hvzmzwn3pzhkwb3npy4mj1df83n3'';
-    };
-    rdiscount_2_1_6 = {
+    rdiscount_2_1_7_1 = {
       basename = ''rdiscount'';
       meta = {
         description = ''Fast Implementation of Gruber's Markdown in C'';
         homepage = ''http://dafoster.net/projects/rdiscount/'';
       };
-      name = ''rdiscount-2.1.6'';
+      name = ''rdiscount-2.1.7.1'';
       requiredGems = [  ];
-      sha256 = ''180ln9gwxn0cyflg0i1viv7jyalmjqvqr34cb65xsmmsz1nz55q2'';
-    };
-    redcarpet_2_3_0 = {
-      basename = ''redcarpet'';
-      meta = {
-        description = ''Markdown that smells nice'';
-        homepage = ''http://github.com/vmg/redcarpet'';
-        longDescription = ''A fast, safe and extensible Markdown to (X)HTML parser'';
-      };
-      name = ''redcarpet-2.3.0'';
-      requiredGems = [  ];
-      sha256 = ''1fghh7n9kz6n6bdhgix5s8lyj5sw6q44zizf4mdgz5xsgwqcr6sw'';
-    };
-    redis_3_0_5 = {
-      basename = ''redis'';
-      meta = {
-        description = ''A Ruby client library for Redis'';
-        homepage = ''https://github.com/redis/redis-rb'';
-        longDescription = ''    A Ruby client that tries to match Redis' API one-to-one, while still
-    providing an idiomatic interface. It features thread-safety,
-    client-side sharding, pipelining, and an obsession for performance.
-'';
-      };
-      name = ''redis-3.0.5'';
-      requiredGems = [  ];
-      sha256 = ''01gg3mgh3yznfhxschcka593a3ivsyw5g5vr0g5apiz4lfh6dlkn'';
-    };
-    redis_namespace_1_3_1 = {
-      basename = ''redis_namespace'';
-      meta = {
-        description = ''Namespaces Redis commands.'';
-        homepage = ''http://github.com/resque/redis-namespace'';
-        longDescription = ''Adds a Redis::Namespace class which can be used to namespace calls
-to Redis. This is useful when using a single instance of Redis with
-multiple, different applications.
-'';
-      };
-      name = ''redis-namespace-1.3.1'';
-      requiredGems = [ g.redis_3_0_5 ];
-      sha256 = ''1l6a64z09ni5pi6mbgvsph0lp14cnp180aj7mxnq2nb38sig4iw5'';
+      sha256 = ''1g70vsgv7mdwcyk9rxja7wm4qqap67prqwkj335c460vlzs6pqii'';
     };
     remote_syslog_1_6_14 = {
       basename = ''remote_syslog'';
@@ -1985,52 +1467,16 @@ multiple, different applications.
       requiredGems = [ g.servolux_0_10_0 g.file_tail_1_0_12 g.eventmachine_1_0_3 g.eventmachine_tail_0_6_4 g.syslog_protocol_0_9_2 g.em_resolv_replace_1_1_3 ];
       sha256 = ''1f2yjyqhbdc4vlx52zli1b33f6yn8qc1kd4n0dpv27zswj9qfdkr'';
     };
-    resque_1_25_1 = {
-      basename = ''resque'';
+    riemann_dash_0_2_9 = {
+      basename = ''riemann_dash'';
       meta = {
-        description = ''Resque is a Redis-backed queueing system.'';
-        homepage = ''http://github.com/defunkt/resque'';
-        longDescription = ''    Resque is a Redis-backed Ruby library for creating background jobs,
-    placing those jobs on multiple queues, and processing them later.
-
-    Background jobs can be any Ruby class or module that responds to
-    perform. Your existing classes can easily be converted to background
-    jobs or you can create new classes specifically to do work. Or, you
-    can do both.
-
-    Resque is heavily inspired by DelayedJob (which rocks) and is
-    comprised of three parts:
-
-    * A Ruby library for creating, querying, and processing jobs
-    * A Rake task for starting a worker which processes jobs
-    * A Sinatra app for monitoring queues, jobs, and workers.
-'';
+        description = ''HTTP dashboard for the distributed event system Riemann.'';
+        homepage = ''https://github.com/aphyr/riemann-dash'';
+        longDescription = ''HTTP dashboard for the distributed event system Riemann.'';
       };
-      name = ''resque-1.25.1'';
-      requiredGems = [ g.redis_namespace_1_3_1 g.vegas_0_1_11 g.sinatra_1_4_4 g.multi_json_1_8_2 g.mono_logger_1_1_0 ];
-      sha256 = ''0p9kpj900cyb888wmpqx6ms9b0hza09glr4cvrwqwp1vqya25lpy'';
-    };
-    resque_web_0_0_3 = {
-      basename = ''resque_web'';
-      meta = {
-        description = ''Rails-based Resque web interface'';
-        homepage = ''https://github.com/resque/resque-web'';
-        longDescription = ''A Rails-based frontend to the Resque job queue system.'';
-      };
-      name = ''resque-web-0.0.3'';
-      requiredGems = [ g.resque_1_25_1 g.twitter_bootstrap_rails_2_2_8 g.jquery_rails_3_0_4 g.sass_rails_4_0_1 g.coffee_rails_4_0_1 ];
-      sha256 = ''1v4g0zrlq9n0pkhdiwxqcmis5p8hpxm475vchldk63mi1vy4fvr2'';
-    };
-    rest_client_1_6_7 = {
-      basename = ''rest_client'';
-      meta = {
-        description = ''Simple HTTP and REST client for Ruby, inspired by microframework syntax for specifying actions.'';
-        homepage = ''http://github.com/archiloque/rest-client'';
-        longDescription = ''A simple HTTP and REST client for Ruby, inspired by the Sinatra microframework style of specifying actions: get, put, post, delete.'';
-      };
-      name = ''rest-client-1.6.7'';
-      requiredGems = [ g.mime_types_2_0 ];
-      sha256 = ''0nn7zalgidz2yj0iqh3xvzh626krm2al79dfiij19jdhp0rk8853'';
+      name = ''riemann-dash-0.2.9'';
+      requiredGems = [ g.erubis_2_7_0 g.sinatra_1_4_5 g.sass_3_4_0 g.webrick_1_3_1 g.multi_json_1_3_6 ];
+      sha256 = ''0ws5wmjbv8w9lcr3i2mdinj2qm91p6c85k6c067i67cf0p90jxq3'';
     };
     right_aws_3_1_0 = {
       basename = ''right_aws'';
@@ -2077,10 +1523,10 @@ The RightScale AWS gems comprise:
 '';
       };
       name = ''right_aws-3.1.0'';
-      requiredGems = [ g.right_http_connection_1_4_0 ];
+      requiredGems = [ g.right_http_connection_1_5_0 ];
       sha256 = ''1a3l5vyvq078nq976rzkrd6fbj522sbgrxpdq3p9z373h0awha09'';
     };
-    right_http_connection_1_4_0 = {
+    right_http_connection_1_5_0 = {
       basename = ''right_http_connection'';
       meta = {
         description = ''RightScale's robust HTTP/S connection module'';
@@ -2095,21 +1541,9 @@ algorithm for low-level network errors.
 - HTTPS certificate checking
 '';
       };
-      name = ''right_http_connection-1.4.0'';
+      name = ''right_http_connection-1.5.0'';
       requiredGems = [  ];
-      sha256 = ''0m4phly7srnwyvfqp01lpaxrgrybhszar0p23zl8b12r6bdjl84g'';
-    };
-    rjb_1_4_2 = {
-      basename = ''rjb'';
-      meta = {
-        description = ''Ruby Java bridge'';
-        homepage = ''http://rjb.rubyforge.org/'';
-        longDescription = ''RJB is a bridge program that connect between Ruby and Java with Java Native Interface.
-'';
-      };
-      name = ''rjb-1.4.2'';
-      requiredGems = [  ];
-      sha256 = ''1cgbwpc45djs0mw05ydxf5apmb9ibj61n240ylqwzrajf13banzh'';
+      sha256 = ''0shd8v24aqxdvim1gdqzwxpanjhfgkhdaw0m0lzz7sybkb02j8qf'';
     };
     rjb_1_4_8 = {
       basename = ''rjb'';
@@ -2123,29 +1557,29 @@ algorithm for low-level network errors.
       requiredGems = [  ];
       sha256 = ''06ps4ssaxb8jwja53h7v7kb31hsdr997b8na89d1yasm5zyraliw'';
     };
-    rkelly_remix_0_0_4 = {
+    rjb_1_4_9 = {
+      basename = ''rjb'';
+      meta = {
+        description = ''Ruby Java bridge'';
+        homepage = ''http://rjb.rubyforge.org/'';
+        longDescription = ''RJB is a bridge program that connect between Ruby and Java with Java Native Interface.
+'';
+      };
+      name = ''rjb-1.4.9'';
+      requiredGems = [  ];
+      sha256 = ''062f7bjwz6iz6da49nzzbbx4xn8ahqqha2smqvqhbf0i7kd5v0yz'';
+    };
+    rkelly_remix_0_0_6 = {
       basename = ''rkelly_remix'';
       meta = {
-        description = ''Fork of the RKelly library to make it suitable as the JavaScript parser in JSDuck'';
-        longDescription = ''Fork of the RKelly library to make it suitable as the JavaScript parser
-in JSDuck.
-
-* http://rkelly.rubyforge.org/'';
+        description = ''RKelly Remix is a fork of the RKelly[https://github.com/tenderlove/rkelly] JavaScript parser.'';
+        homepage = ''https://github.com/nene/rkelly-remix'';
+        longDescription = ''RKelly Remix is a fork of the
+RKelly[https://github.com/tenderlove/rkelly] JavaScript parser.'';
       };
-      name = ''rkelly-remix-0.0.4'';
+      name = ''rkelly-remix-0.0.6'';
       requiredGems = [  ];
-      sha256 = ''1w6yr5n3b8yd0rsba9q3zyxr0n2hbpkz4v2k1qx6j1ywvl9rc2c1'';
-    };
-    rmagick_2_13_2 = {
-      basename = ''rmagick'';
-      meta = {
-        description = ''Ruby binding to ImageMagick'';
-        homepage = ''http://rubyforge.org/projects/rmagick'';
-        longDescription = ''RMagick is an interface between Ruby and ImageMagick.'';
-      };
-      name = ''rmagick-2.13.2'';
-      requiredGems = [  ];
-      sha256 = ''1fw5rs5yqi5ayh44d18gjq68chiz14byx01h33c8jvkdxz3b9wz4'';
+      sha256 = ''1ihsns5v8nx96gvj7sqw5m8d6dsnmpfzpd07y860bldjhkjsxp1z'';
     };
     rmail_1_0_0 = {
       basename = ''rmail'';
@@ -2158,94 +1592,82 @@ in JSDuck.
       requiredGems = [  ];
       sha256 = ''0nsg7yda1gdwa96j4hlrp2s0m06vrhcc4zy5mbq7gxmlmwf9yixp'';
     };
-    rmail_sup_1_0_1 = {
-      basename = ''rmail_sup'';
-      meta = {
-        description = ''A MIME mail parsing and generation library.'';
-        homepage = ''http://supmua.org'';
-        longDescription = ''    RMail is a lightweight mail library containing various utility classes and
-    modules that allow ruby scripts to parse, modify, and generate MIME mail
-    messages.
-'';
-      };
-      name = ''rmail-sup-1.0.1'';
-      requiredGems = [  ];
-      sha256 = ''1xswk101s560lxqaax3plqh8vjx7jjspnggdwb3q80m358f92q9g'';
-    };
-    rspec_2_11_0 = {
+    rspec_2_14_1 = {
       basename = ''rspec'';
       meta = {
-        description = ''rspec-2.11.0'';
+        description = ''rspec-2.14.1'';
         homepage = ''http://github.com/rspec'';
         longDescription = ''BDD for Ruby'';
       };
-      name = ''rspec-2.11.0'';
-      requiredGems = [ g.rspec_core_2_11_1 g.rspec_expectations_2_11_3 g.rspec_mocks_2_11_3 ];
-      sha256 = ''0k55akvs2xhs57kz81g37s4v56vybq46sjs7f8wpybrwxryg1vxs'';
+      name = ''rspec-2.14.1'';
+      requiredGems = [ g.rspec_core_2_14_8 g.rspec_expectations_2_14_5 g.rspec_mocks_2_14_6 ];
+      sha256 = ''134y4wzk1prninb5a0bhxgm30kqfzl8dg06af4js5ylnhv2wd7sg'';
     };
-    rspec_core_2_11_1 = {
+    rspec_core_2_14_5 = {
       basename = ''rspec_core'';
       meta = {
-        description = ''rspec-core-2.11.1'';
+        description = ''rspec-core-2.14.5'';
         homepage = ''http://github.com/rspec/rspec-core'';
         longDescription = ''BDD for Ruby. RSpec runner and example groups.'';
       };
-      name = ''rspec-core-2.11.1'';
+      name = ''rspec-core-2.14.5'';
       requiredGems = [  ];
-      sha256 = ''035ki561pryy05y8cvv3mkihjwp9r2ychnazb7s33gl7q0l0jni4'';
+      sha256 = ''18zk2y5agzj4ps16hh1jlcqmyj0bmlcr24bl0m8gyhwf0gk1xmcr'';
     };
-    rspec_expectations_2_11_3 = {
+    rspec_core_2_14_8 = {
+      basename = ''rspec_core'';
+      meta = {
+        description = ''rspec-core-2.14.8'';
+        homepage = ''http://github.com/rspec/rspec-core'';
+        longDescription = ''BDD for Ruby. RSpec runner and example groups.'';
+      };
+      name = ''rspec-core-2.14.8'';
+      requiredGems = [  ];
+      sha256 = ''0psjy5kdlz3ph39br0m01w65i1ikagnqlg39f8p65jh5q7dz8hwc'';
+    };
+    rspec_expectations_2_14_3 = {
       basename = ''rspec_expectations'';
       meta = {
-        description = ''rspec-expectations-2.11.3'';
+        description = ''rspec-expectations-2.14.3'';
         homepage = ''http://github.com/rspec/rspec-expectations'';
         longDescription = ''rspec expectations (should[_not] and matchers)'';
       };
-      name = ''rspec-expectations-2.11.3'';
-      requiredGems = [ g.diff_lcs_1_1_3 ];
-      sha256 = ''0vqqw4hkaff6v6i6kinki4jxp9xv8b2nbmz91qa1yhjd3wr14ai5'';
+      name = ''rspec-expectations-2.14.3'';
+      requiredGems = [ g.diff_lcs_1_2_5 ];
+      sha256 = ''0gv5sqizmw0hdj1gl57mynp5i27kj4i0gpksrwwg9gazciq898n2'';
     };
-    rspec_mocks_2_11_3 = {
+    rspec_expectations_2_14_5 = {
+      basename = ''rspec_expectations'';
+      meta = {
+        description = ''rspec-expectations-2.14.5'';
+        homepage = ''http://github.com/rspec/rspec-expectations'';
+        longDescription = ''rspec expectations (should[_not] and matchers)'';
+      };
+      name = ''rspec-expectations-2.14.5'';
+      requiredGems = [ g.diff_lcs_1_2_5 ];
+      sha256 = ''1ni8kw8kjv76jvwjzi4jba00k3qzj9f8wd94vm6inz0jz3gwjqf9'';
+    };
+    rspec_mocks_2_14_3 = {
       basename = ''rspec_mocks'';
       meta = {
-        description = ''rspec-mocks-2.11.3'';
+        description = ''rspec-mocks-2.14.3'';
         homepage = ''http://github.com/rspec/rspec-mocks'';
         longDescription = ''RSpec's 'test double' framework, with support for stubbing and mocking'';
       };
-      name = ''rspec-mocks-2.11.3'';
+      name = ''rspec-mocks-2.14.3'';
       requiredGems = [  ];
-      sha256 = ''1rna3ii52rlhhca49zigk692hdcmz7qib42i4hhny478k04wx0qg'';
+      sha256 = ''1xfhjisvpmb212jhb3k4r1ji3rrlv509mphcf345ij5b75gaybzr'';
     };
-    ruby_hmac_0_4_0 = {
-      basename = ''ruby_hmac'';
+    rspec_mocks_2_14_6 = {
+      basename = ''rspec_mocks'';
       meta = {
-        description = ''This module provides common interface to HMAC functionality'';
-        homepage = ''http://ruby-hmac.rubyforge.org'';
-        longDescription = ''This module provides common interface to HMAC functionality. HMAC is a kind of "Message Authentication Code" (MAC) algorithm whose standard is documented in RFC2104. Namely, a MAC provides a way to check the integrity of information transmitted over or stored in an unreliable medium, based on a secret key.
-
-Originally written by Daiki Ueno. Converted to a RubyGem by Geoffrey Grosenbach'';
+        description = ''rspec-mocks-2.14.6'';
+        homepage = ''http://github.com/rspec/rspec-mocks'';
+        longDescription = ''RSpec's 'test double' framework, with support for stubbing and mocking'';
       };
-      name = ''ruby-hmac-0.4.0'';
+      name = ''rspec-mocks-2.14.6'';
       requiredGems = [  ];
-      sha256 = ''01zym41f8fqbmxfz8zv19627swi62ka3gp33bfbkc87v5k7mw954'';
-    };
-    rubyforge_2_0_4 = {
-      basename = ''rubyforge'';
-      meta = {
-        description = ''A script which automates a limited set of rubyforge operations'';
-        homepage = ''http://codeforpeople.rubyforge.org/rubyforge/'';
-        longDescription = ''A script which automates a limited set of rubyforge operations.
-
-* Run 'rubyforge help' for complete usage.
-* Setup: For first time users AND upgrades to 0.4.0:
-  * rubyforge setup (deletes your username and password, so run sparingly!)
-  * edit ~/.rubyforge/user-config.yml
-  * rubyforge config
-* For all rubyforge upgrades, run 'rubyforge config' to ensure you have latest.'';
-      };
-      name = ''rubyforge-2.0.4'';
-      requiredGems = [ g.json_pure_1_8_0 ];
-      sha256 = ''1wdaa4nzy39yzy848fa1rybi72qlyf9vhi1ra9wpx9rpi810fwh1'';
+      sha256 = ''1fwsmijd6w6cmqyh4ky2nq89jrpzh56hzmndx9wgkmdgfhfakv30'';
     };
     rubyzip_0_9_9 = {
       basename = ''rubyzip'';
@@ -2257,28 +1679,17 @@ Originally written by Daiki Ueno. Converted to a RubyGem by Geoffrey Grosenbach'
       requiredGems = [  ];
       sha256 = ''1khf6d903agnwd8965f5f8b353rzmfvygxp53z1199rqzw8h46q2'';
     };
-    rubyzip_1_1_0 = {
+    rubyzip_1_1_6 = {
       basename = ''rubyzip'';
       meta = {
         description = ''rubyzip is a ruby module for reading and writing zip files'';
         homepage = ''http://github.com/rubyzip/rubyzip'';
       };
-      name = ''rubyzip-1.1.0'';
+      name = ''rubyzip-1.1.6'';
       requiredGems = [  ];
-      sha256 = ''0kxpcs047fb52lz0imp6vl3hr5khqpk0jfbr2knfbp612ynzyzcl'';
+      sha256 = ''17ha7kmgcnhnxyfp9wgyrd2synp17v9g8j1pknhfd2v9x5g475m9'';
     };
-    safe_yaml_0_9_7 = {
-      basename = ''safe_yaml'';
-      meta = {
-        description = ''SameYAML provides an alternative implementation of YAML.load suitable for accepting user input in Ruby applications.'';
-        homepage = ''http://dtao.github.com/safe_yaml/'';
-        longDescription = ''Parse YAML safely, without that pesky arbitrary object deserialization vulnerability'';
-      };
-      name = ''safe_yaml-0.9.7'';
-      requiredGems = [  ];
-      sha256 = ''0y34vpak8gim18rq02rgd144jsvk5is4xni16wm3shbhivzqb4hk'';
-    };
-    sass_3_2_10 = {
+    sass_3_4_0 = {
       basename = ''sass'';
       meta = {
         description = ''A powerful but elegant CSS compiler that makes CSS fun again.'';
@@ -2289,46 +1700,20 @@ Originally written by Daiki Ueno. Converted to a RubyGem by Geoffrey Grosenbach'
       command line tool or a web-framework plugin.
 '';
       };
-      name = ''sass-3.2.10'';
+      name = ''sass-3.4.0'';
       requiredGems = [  ];
-      sha256 = ''0anfff4hz8fz1wbimmp9vv4mjfl1swg7ww74j549788x41l4x283'';
+      sha256 = ''1v2kda9ff69nmz2qcxfmc1w5nxv81nays450nql0mbpy8pvydfr2'';
     };
-    sass_3_2_12 = {
-      basename = ''sass'';
-      meta = {
-        description = ''A powerful but elegant CSS compiler that makes CSS fun again.'';
-        homepage = ''http://sass-lang.com/'';
-        longDescription = ''      Sass makes CSS fun again. Sass is an extension of CSS3, adding
-      nested rules, variables, mixins, selector inheritance, and more.
-      It's translated to well-formatted, standard CSS using the
-      command line tool or a web-framework plugin.
-'';
-      };
-      name = ''sass-3.2.12'';
-      requiredGems = [  ];
-      sha256 = ''074118ia17nx68i97mbkly2f08y57j52b2yfhdc3s02s4s5593f8'';
-    };
-    sass_rails_4_0_1 = {
-      basename = ''sass_rails'';
-      meta = {
-        description = ''Sass adapter for the Rails asset pipeline.'';
-        homepage = ''https://github.com/rails/sass-rails'';
-        longDescription = ''Sass adapter for the Rails asset pipeline.'';
-      };
-      name = ''sass-rails-4.0.1'';
-      requiredGems = [ g.sass_3_2_12 g.railties_4_0_0 g.sprockets_rails_2_0_1 ];
-      sha256 = ''01sacnipgvl7ad39zzbr6iip6jja7blxfbpjg2dnm6w8gi6smxh1'';
-    };
-    selenium_webdriver_2_35_1 = {
+    selenium_webdriver_2_42_0 = {
       basename = ''selenium_webdriver'';
       meta = {
         description = ''The next generation developer focused tool for automated testing of webapps'';
         homepage = ''http://selenium.googlecode.com'';
         longDescription = ''WebDriver is a tool for writing automated tests of websites. It aims to mimic the behaviour of a real user, and as such interacts with the HTML of the application.'';
       };
-      name = ''selenium-webdriver-2.35.1'';
-      requiredGems = [ g.multi_json_1_7_9 g.rubyzip_0_9_9 g.childprocess_0_3_9 g.websocket_1_0_7 ];
-      sha256 = ''0251nbh6kbb96dv21n6fgbnw31p5gqr7anvhl8phrar5ylircqj6'';
+      name = ''selenium-webdriver-2.42.0'';
+      requiredGems = [ g.multi_json_1_10_1 g.rubyzip_1_1_6 g.childprocess_0_5_3 g.websocket_1_0_7 ];
+      sha256 = ''04yjwzc7cy2ax5xgp618z9jbm55cx4b5l546l7xnxj1hk30znw6q'';
     };
     servolux_0_10_0 = {
       basename = ''servolux'';
@@ -2352,81 +1737,51 @@ interpreters.'';
         longDescription = ''Sinatra is a DSL for quickly creating web applications in Ruby with minimal effort.'';
       };
       name = ''sinatra-1.3.2'';
-      requiredGems = [ g.rack_1_5_2 g.rack_protection_1_5_0 g.tilt_1_4_1 ];
+      requiredGems = [ g.rack_1_5_2 g.rack_protection_1_5_3 g.tilt_1_4_1 ];
       sha256 = ''05blf915zpiwyz7agcn9rwdmddwxz0z4l3gd4qlqmrgd2vkw4sxc'';
     };
-    sinatra_1_4_4 = {
+    sinatra_1_4_5 = {
       basename = ''sinatra'';
       meta = {
         description = ''Classy web-development dressed in a DSL'';
         homepage = ''http://www.sinatrarb.com/'';
         longDescription = ''Sinatra is a DSL for quickly creating web applications in Ruby with minimal effort.'';
       };
-      name = ''sinatra-1.4.4'';
-      requiredGems = [ g.rack_1_5_2 g.tilt_1_4_1 g.rack_protection_1_5_1 ];
-      sha256 = ''12iy0f92d3zyk4759flgcracrbzc3x6cilpgdkzhzgjrsm9aa5hs'';
+      name = ''sinatra-1.4.5'';
+      requiredGems = [ g.rack_1_5_2 g.tilt_1_4_1 g.rack_protection_1_5_3 ];
+      sha256 = ''0qyna3wzlnvsz69d21lxcm3ixq7db08mi08l0a88011qi4qq701s'';
     };
-    slop_3_4_6 = {
-      basename = ''slop'';
-      meta = {
-        description = ''Simple Lightweight Option Parsing'';
-        homepage = ''http://github.com/injekt/slop'';
-        longDescription = ''A simple DSL for gathering options and parsing the command line'';
-      };
-      name = ''slop-3.4.6'';
-      requiredGems = [  ];
-      sha256 = ''0fdp3nkljjs2d5yhgjzcqi0f6xq67byfbrayg5aj7r76rsw0hmal'';
-    };
-    slop_3_4_7 = {
+    slop_3_6_0 = {
       basename = ''slop'';
       meta = {
         description = ''Simple Lightweight Option Parsing'';
         homepage = ''http://github.com/leejarvis/slop'';
         longDescription = ''A simple DSL for gathering options and parsing the command line'';
       };
-      name = ''slop-3.4.7'';
+      name = ''slop-3.6.0'';
       requiredGems = [  ];
-      sha256 = ''1x3dwljqvkzj314rwn2bxgim9xvgwnfipzg5g0kwwxfn90fpv2sn'';
+      sha256 = ''00w8g3j7k7kl8ri2cf1m58ckxk8rn350gp4chfscmgv6pq1spk3n'';
     };
-    sprockets_2_10_0 = {
+    sprockets_2_12_1 = {
       basename = ''sprockets'';
       meta = {
         description = ''Rack-based asset packaging system'';
         homepage = ''http://getsprockets.org/'';
         longDescription = ''Sprockets is a Rack-based asset packaging system that concatenates and serves JavaScript, CoffeeScript, CSS, LESS, Sass, and SCSS.'';
       };
-      name = ''sprockets-2.10.0'';
-      requiredGems = [ g.hike_1_2_3 g.multi_json_1_7_9 g.rack_1_5_2 g.tilt_1_4_1 ];
-      sha256 = ''1z0kiaymvqm07wqqy479vd8a60ggr3f3520b4splljbn2055fn3s'';
+      name = ''sprockets-2.12.1'';
+      requiredGems = [ g.hike_1_2_3 g.multi_json_1_10_1 g.rack_1_5_2 g.tilt_1_4_1 ];
+      sha256 = ''0fi5f32i3bj739qb0zn050k5jjkfqzkn8fjz5dfjwhmh9hl5pb1y'';
     };
-    sprockets_rails_2_0_0 = {
+    sprockets_rails_2_1_3 = {
       basename = ''sprockets_rails'';
       meta = {
         description = ''Sprockets Rails integration'';
         homepage = ''https://github.com/rails/sprockets-rails'';
       };
-      name = ''sprockets-rails-2.0.0'';
-      requiredGems = [ g.sprockets_2_10_0 g.actionpack_4_0_0 g.activesupport_4_0_0 ];
-      sha256 = ''068w0ly7x1vciy4j6mwgsnz6a983pld4rzk1fpvfsmkdqcizb20x'';
-    };
-    sprockets_rails_2_0_1 = {
-      basename = ''sprockets_rails'';
-      meta = {
-        description = ''Sprockets Rails integration'';
-        homepage = ''https://github.com/rails/sprockets-rails'';
-      };
-      name = ''sprockets-rails-2.0.1'';
-      requiredGems = [ g.sprockets_2_10_0 g.actionpack_4_0_0 g.activesupport_4_0_0 ];
-      sha256 = ''170llk1qsvzhhslmasqk4hp5lrv9ibwy44q32yg6kn9s7sh0c1wy'';
-    };
-    syntax_1_0_0 = {
-      basename = ''syntax'';
-      meta = {
-        description = ''Syntax is Ruby library for performing simple syntax highlighting.'';
-      };
-      name = ''syntax-1.0.0'';
-      requiredGems = [  ];
-      sha256 = ''1z93kkhdq55vq3fg9wljhm591cj59qis58dk97l09b8bfxi2ypk0'';
+      name = ''sprockets-rails-2.1.3'';
+      requiredGems = [ g.sprockets_2_12_1 g.actionpack_4_1_5 g.activesupport_4_1_5 ];
+      sha256 = ''12kdy9vjn3ygrxhn9jxxx0rvsq601vayrkgbr3rqcpyhqhl4s4wy'';
     };
     syslog_protocol_0_9_2 = {
       basename = ''syslog_protocol'';
@@ -2439,16 +1794,16 @@ interpreters.'';
       requiredGems = [  ];
       sha256 = ''1yb2cmbyj0zmb2yhkgnmghcngrkhcxs4g1svcmgfj90l2hs23nmc'';
     };
-    systemu_2_5_2 = {
+    systemu_2_6_4 = {
       basename = ''systemu'';
       meta = {
         description = ''systemu'';
         homepage = ''https://github.com/ahoward/systemu'';
-        longDescription = ''description: systemu kicks the ass'';
+        longDescription = ''universal capture of stdout and stderr and handling of child process pid for windows, *nix, etc.'';
       };
-      name = ''systemu-2.5.2'';
+      name = ''systemu-2.6.4'';
       requiredGems = [  ];
-      sha256 = ''0h834ajdg9w4xrijp31fn98pjfj08gi08xjvp5xh3i6hz9a25fhr'';
+      sha256 = ''16k94azpsy1r958r6ysk4ksnpp54rqmh5hyamad9kwc3lk83i32z'';
     };
     taskjuggler_3_5_0 = {
       basename = ''taskjuggler'';
@@ -2467,84 +1822,63 @@ management.
 '';
       };
       name = ''taskjuggler-3.5.0'';
-      requiredGems = [ g.mail_2_5_4 g.term_ansicolor_1_2_2 ];
+      requiredGems = [ g.mail_2_6_1 g.term_ansicolor_1_3_0 ];
       sha256 = ''0r84rlc7a6w7p9nc9mgycbs5h0hq0kzscjq7zj3296xyf0afiwj2'';
     };
-    term_ansicolor_1_2_2 = {
+    term_ansicolor_1_3_0 = {
       basename = ''term_ansicolor'';
       meta = {
         description = ''Ruby library that colors strings using ANSI escape sequences'';
         homepage = ''http://flori.github.com/term-ansicolor'';
         longDescription = ''This library uses ANSI escape sequences to control the attributes of terminal output'';
       };
-      name = ''term-ansicolor-1.2.2'';
-      requiredGems = [ g.tins_0_9_0 ];
-      sha256 = ''1b41q1q6mqcgzq9fhzhmjvfg5sfs5v7gkb8z57r4hajcp89lflxr'';
+      name = ''term-ansicolor-1.3.0'';
+      requiredGems = [ g.tins_1_3_2 ];
+      sha256 = ''1a2gw7gmpmx57sdpyhjwl0zn4bqp7jyjz7aslpvvphd075layp4b'';
     };
-    terminal_notifier_1_5_1 = {
-      basename = ''terminal_notifier'';
-      meta = {
-        description = ''Send User Notifications on Mac OS X 10.8 or higher.'';
-        homepage = ''https://github.com/alloy/terminal-notifier'';
-      };
-      name = ''terminal-notifier-1.5.1'';
-      requiredGems = [  ];
-      sha256 = ''1vvdfj83bsa2rglwbqmk11yghivsywl6ka76zb51c3xm7gdd768k'';
-    };
-    text_1_2_3 = {
+    text_1_3_0 = {
       basename = ''text'';
       meta = {
         description = ''A collection of text algorithms'';
         homepage = ''http://github.com/threedaymonk/text'';
         longDescription = ''A collection of text algorithms: Levenshtein, Soundex, Metaphone, Double Metaphone, Porter Stemming'';
       };
-      name = ''text-1.2.3'';
+      name = ''text-1.3.0'';
       requiredGems = [  ];
-      sha256 = ''14p1b3m7sxjs4ckjnd1whz82hkv0cj08j3rpkvcbavwbm07zpsd0'';
+      sha256 = ''1bfn0rm2a7gpsxplx3dii3a7q16hi7idsqp54fh92b3j9sqgidj7'';
     };
-    thin_1_5_1 = {
+    thin_1_6_2 = {
       basename = ''thin'';
       meta = {
         description = ''A thin and fast web server'';
         homepage = ''http://code.macournoyer.com/thin/'';
         longDescription = ''A thin and fast web server'';
       };
-      name = ''thin-1.5.1'';
+      name = ''thin-1.6.2'';
       requiredGems = [ g.rack_1_5_2 g.eventmachine_1_0_3 g.daemons_1_1_9 ];
-      sha256 = ''0hrq9m3hb6pm8yrqshhg0gafkphdpvwcqmr7k722kgdisp3w91ga'';
+      sha256 = ''0v90rnnai8sc40c02dxj9aawj2mi1mhjnmi4ws0rg4yrkc6fxvmq'';
     };
-    thor_0_18_1 = {
+    thor_0_19_1 = {
       basename = ''thor'';
       meta = {
-        description = ''A scripting framework that replaces rake, sake and rubigen'';
+        description = ''Thor is a toolkit for building powerful command-line interfaces.'';
         homepage = ''http://whatisthor.com/'';
-        longDescription = ''A scripting framework that replaces rake, sake and rubigen'';
+        longDescription = ''Thor is a toolkit for building powerful command-line interfaces.'';
       };
-      name = ''thor-0.18.1'';
+      name = ''thor-0.19.1'';
       requiredGems = [  ];
-      sha256 = ''0d1g37j6sc7fkidf8rqlm3wh9zgyg3g7y8h2x1y34hmil5ywa8c3'';
+      sha256 = ''08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z'';
     };
-    thread_safe_0_1_2 = {
+    thread_safe_0_3_4 = {
       basename = ''thread_safe'';
       meta = {
         description = ''A collection of data structures and utilities to make thread-safe programming in Ruby easier'';
         homepage = ''https://github.com/headius/thread_safe'';
         longDescription = ''Thread-safe collections and utilities for Ruby'';
       };
-      name = ''thread_safe-0.1.2'';
-      requiredGems = [ g.atomic_1_1_13 ];
-      sha256 = ''1bxyh5l11inadbk7pjyz5s98g24qj8xavh55bc56nrzj51y9aavy'';
-    };
-    thread_safe_0_1_3 = {
-      basename = ''thread_safe'';
-      meta = {
-        description = ''A collection of data structures and utilities to make thread-safe programming in Ruby easier'';
-        homepage = ''https://github.com/headius/thread_safe'';
-        longDescription = ''Thread-safe collections and utilities for Ruby'';
-      };
-      name = ''thread_safe-0.1.3'';
-      requiredGems = [ g.atomic_1_1_14 ];
-      sha256 = ''0f2w62x5nx95d2c2lrn9v4g60xhykf8zw7jaddkrgal913dzifgq'';
+      name = ''thread_safe-0.3.4'';
+      requiredGems = [  ];
+      sha256 = ''1cil2zcdzqkyr8zrwhlg7gywryg36j4mxlxw0h0x0j0wjym5nc8n'';
     };
     tilt_1_4_1 = {
       basename = ''tilt'';
@@ -2557,38 +1891,38 @@ management.
       requiredGems = [  ];
       sha256 = ''00sr3yy7sbqaq7cb2d2kpycajxqf1b1wr1yy33z4bnzmqii0b0ir'';
     };
-    timers_1_1_0 = {
-      basename = ''timers'';
-      meta = {
-        description = ''Schedule procs to run after a certain time, or at periodic intervals, using any API that accepts a timeout'';
-        homepage = ''https://github.com/tarcieri/timers'';
-        longDescription = ''Pure Ruby one-shot and periodic timers'';
-      };
-      name = ''timers-1.1.0'';
-      requiredGems = [  ];
-      sha256 = ''0x3vnkxy3bg9f6v1nhkfqkajr19glrzkmqd5a1wy8hrylx8rdfrv'';
-    };
-    tins_0_9_0 = {
+    tins_0_13_2 = {
       basename = ''tins'';
       meta = {
         description = ''Useful stuff.'';
         homepage = ''http://flori.github.com/tins'';
         longDescription = ''All the stuff that isn't good/big enough for a real library.'';
       };
-      name = ''tins-0.9.0'';
+      name = ''tins-0.13.2'';
       requiredGems = [  ];
-      sha256 = ''17147yzxhbcby9ycswai6sgc9cxdlbfa897amjsimkyqv1lh9pbc'';
+      sha256 = ''1ygkm4ava7x6ap61qz6pn79193g6g29248fa04mwknsz6acfjs2y'';
     };
-    travis_1_5_3 = {
+    tins_1_3_2 = {
+      basename = ''tins'';
+      meta = {
+        description = ''Useful stuff.'';
+        homepage = ''http://flori.github.com/tins'';
+        longDescription = ''All the stuff that isn't good/big enough for a real library.'';
+      };
+      name = ''tins-1.3.2'';
+      requiredGems = [  ];
+      sha256 = ''1i27zj1bhmgq19f3i5i08njprfnlv3yi5frm8ax6w0b342p6v8ly'';
+    };
+    travis_1_7_1 = {
       basename = ''travis'';
       meta = {
         description = ''Travis CI client'';
-        homepage = ''https://github.com/travis-ci/travis'';
+        homepage = ''https://github.com/travis-ci/travis.rb'';
         longDescription = ''CLI and Ruby client library for Travis CI'';
       };
-      name = ''travis-1.5.3'';
-      requiredGems = [ g.faraday_0_8_8 g.faraday_middleware_0_9_0 g.highline_1_6_19 g.netrc_0_7_7 g.backports_3_3_3 g.gh_0_12_0 g.launchy_2_3_0 g.pry_0_9_12_2 g.typhoeus_0_6_5 g.pusher_client_0_3_1 ];
-      sha256 = ''052kqfd0280ar9ci9vplihbc4a69l06m8chfrriygvjxc14npx97'';
+      name = ''travis-1.7.1'';
+      requiredGems = [ g.faraday_0_9_0 g.faraday_middleware_0_9_1 g.highline_1_6_21 g.backports_3_6_0 g.gh_0_13_2 g.launchy_2_4_2 g.pry_0_9_12_6 g.typhoeus_0_6_9 g.pusher_client_0_6_0 g.addressable_2_3_6 ];
+      sha256 = ''1h0xajfzkz7pdrbhs2650nl5www8qfmgazmmmw0bcr3dai5kimdf'';
     };
     treetop_1_4_15 = {
       basename = ''treetop'';
@@ -2597,7 +1931,7 @@ management.
         homepage = ''https://github.com/cjheath/treetop'';
       };
       name = ''treetop-1.4.15'';
-      requiredGems = [ g.polyglot_0_3_3 g.polyglot_0_3_3 ];
+      requiredGems = [ g.polyglot_0_3_5 g.polyglot_0_3_5 ];
       sha256 = ''1zqj5y0mvfvyz11nhsb4d5ch0i0rfcyj64qx19mw4qhg3hh8z9pz'';
     };
     trollop_2_0 = {
@@ -2615,51 +1949,29 @@ specify.'';
       requiredGems = [  ];
       sha256 = ''0iz5k7ax7a5jm9x6p81k6f4mgp48wxxb0j55ypnwxnznih8fsghz'';
     };
-    twitter_bootstrap_rails_2_2_8 = {
-      basename = ''twitter_bootstrap_rails'';
-      meta = {
-        description = ''Bootstrap CSS toolkit for Rails 3.1 Asset Pipeline'';
-        homepage = ''https://github.com/seyhunak/twitter-bootstrap-rails'';
-        longDescription = ''twitter-bootstrap-rails project integrates Bootstrap CSS toolkit for Rails 3.1 Asset Pipeline'';
-      };
-      name = ''twitter-bootstrap-rails-2.2.8'';
-      requiredGems = [ g.railties_4_0_0 g.actionpack_4_0_0 g.execjs_2_0_2 g.rails_4_0_0 ];
-      sha256 = ''06n836l2kj5ld7w6b1pb5q423mhqnahf4phk5ai5vl927p4g3bgy'';
-    };
-    typhoeus_0_6_5 = {
+    typhoeus_0_6_9 = {
       basename = ''typhoeus'';
       meta = {
         description = ''Parallel HTTP library on top of libcurl multi.'';
         homepage = ''https://github.com/typhoeus/typhoeus'';
         longDescription = ''Like a modern code version of the mythical beast with 100 serpent heads, Typhoeus runs HTTP requests in parallel while cleanly encapsulating handling logic.'';
       };
-      name = ''typhoeus-0.6.5'';
-      requiredGems = [ g.ethon_0_6_1 ];
-      sha256 = ''13xwy86iv98ypagrb6d95k1xf6yllnfqnh4ipfqix87npirjaxji'';
+      name = ''typhoeus-0.6.9'';
+      requiredGems = [ g.ethon_0_7_1 ];
+      sha256 = ''1j4l2zwx821hzsfqskcq47xpk6b7yzl30mhzmdrfrsrhsigmayar'';
     };
-    tzinfo_0_3_37 = {
+    tzinfo_1_2_2 = {
       basename = ''tzinfo'';
       meta = {
-        description = ''Daylight-savings aware timezone library'';
-        homepage = ''http://tzinfo.rubyforge.org/'';
-        longDescription = ''TZInfo is a Ruby library that uses the standard tz (Olson) database to provide daylight savings aware transformations between times in different time zones.'';
-      };
-      name = ''tzinfo-0.3.37'';
-      requiredGems = [  ];
-      sha256 = ''0pi2vabsg73h6z4wfwyd27k63issp2qp1nh0vd74rdk740gmb3kc'';
-    };
-    tzinfo_0_3_38 = {
-      basename = ''tzinfo'';
-      meta = {
-        description = ''Daylight-savings aware timezone library'';
+        description = ''Daylight savings aware timezone library'';
         homepage = ''http://tzinfo.github.io'';
-        longDescription = ''TZInfo is a Ruby library that uses the standard tz (Olson) database to provide daylight savings aware transformations between times in different time zones.'';
+        longDescription = ''TZInfo provides daylight savings aware transformations between times in different time zones.'';
       };
-      name = ''tzinfo-0.3.38'';
-      requiredGems = [  ];
-      sha256 = ''1s339ravgk0rqm5dhv1l0yi81sczjvdiryn8ihi2czkb0md55j68'';
+      name = ''tzinfo-1.2.2'';
+      requiredGems = [ g.thread_safe_0_3_4 ];
+      sha256 = ''1c01p3kg6xvy1cgjnzdfq45fggbwish8krd0h864jvbpybyx7cgx'';
     };
-    unf_0_1_2 = {
+    unf_0_1_4 = {
       basename = ''unf'';
       meta = {
         description = ''A wrapper library to bring Unicode Normalization Form support to Ruby/JRuby'';
@@ -2668,9 +1980,9 @@ specify.'';
 to Ruby/JRuby.
 '';
       };
-      name = ''unf-0.1.2'';
+      name = ''unf-0.1.4'';
       requiredGems = [ g.unf_ext_0_0_6 ];
-      sha256 = ''1g6agdd14yylawwd9ifgcpxwfyiydqj9l7cq6ipypj70v1l46i1s'';
+      sha256 = ''0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9'';
     };
     unf_ext_0_0_6 = {
       basename = ''unf_ext'';
@@ -2683,17 +1995,6 @@ to Ruby/JRuby.
       requiredGems = [  ];
       sha256 = ''07zbmkzcid6pzdqgla3456ipfdka7j1v4hsx1iaa8rbnllqbmkdg'';
     };
-    unicode_0_4_4 = {
-      basename = ''unicode'';
-      meta = {
-        description = ''Unicode normalization library.'';
-        homepage = ''http://www.yoshidam.net/Ruby.html#unicode'';
-        longDescription = ''Unicode normalization library.'';
-      };
-      name = ''unicode-0.4.4'';
-      requiredGems = [  ];
-      sha256 = ''0la9dyxj7pr57g5727gj1h5c6h5kpbjdjpiv2vqi5gw5iglg0yqi'';
-    };
     uuid_2_3_7 = {
       basename = ''uuid'';
       meta = {
@@ -2704,31 +2005,18 @@ to Ruby/JRuby.
 '';
       };
       name = ''uuid-2.3.7'';
-      requiredGems = [ g.macaddr_1_6_1 ];
+      requiredGems = [ g.macaddr_1_7_1 ];
       sha256 = ''04q10an3v40zwjihvdwm23fw6vl39fbkhdiwfw78a51ym9airnlp'';
     };
-    uuidtools_2_1_4 = {
-      basename = ''uuidtools'';
+    webrick_1_3_1 = {
+      basename = ''webrick'';
       meta = {
-        description = ''UUID generator'';
-        homepage = ''http://uuidtools.rubyforge.org/'';
-        longDescription = ''A simple universally unique ID generation library.
-'';
+        description = ''WEBrick is an HTTP server toolkit that can be configured as an HTTPS server,'';
+        homepage = ''http://github.com/nahi/webrick'';
       };
-      name = ''uuidtools-2.1.4'';
+      name = ''webrick-1.3.1'';
       requiredGems = [  ];
-      sha256 = ''1w0bhnkp5515f3yx5fakfrfkawxjpb4fjm1r2c6lk691xlr696s3'';
-    };
-    vegas_0_1_11 = {
-      basename = ''vegas'';
-      meta = {
-        description = ''Vegas aims to solve the simple problem of creating executable versions of Sinatra/Rack apps.'';
-        homepage = ''http://code.quirkey.com/vegas'';
-        longDescription = ''Vegas aims to solve the simple problem of creating executable versions of Sinatra/Rack apps. It includes a class Vegas::Runner that wraps Rack/Sinatra applications and provides a simple command line interface and launching mechanism.'';
-      };
-      name = ''vegas-0.1.11'';
-      requiredGems = [ g.rack_1_5_2 ];
-      sha256 = ''0kzv0v1zb8vvm188q4pqwahb6468bmiamn6wpsbiq6r5i69s1bs5'';
+      sha256 = ''0s42mxihcl2bx0h9q0v2syl70qndydfkl39a06h9il17p895ya8g'';
     };
     webrobots_0_1_1 = {
       basename = ''webrobots'';
@@ -2753,6 +2041,17 @@ to Ruby/JRuby.
       requiredGems = [  ];
       sha256 = ''1jrfz4295qbnjaxv37fw9jzxyxz61izp7c0683mnscacpx262zw0'';
     };
+    websocket_1_2_0 = {
+      basename = ''websocket'';
+      meta = {
+        description = ''Universal Ruby library to handle WebSocket protocol'';
+        homepage = ''http://github.com/imanel/websocket-ruby'';
+        longDescription = ''Universal Ruby library to handle WebSocket protocol'';
+      };
+      name = ''websocket-1.2.0'';
+      requiredGems = [  ];
+      sha256 = ''17q3fsqwa44cali3x852jzjpzgcvvly0n8gszmkaqx520lb9r5l4'';
+    };
     xapian_full_1_2_3 = {
       basename = ''xapian_full'';
       meta = {
@@ -2763,35 +2062,25 @@ to Ruby/JRuby.
       requiredGems = [  ];
       sha256 = ''02z0wsir38jsp5d6sqrkgv5prk8s6sdf6g2h718j2374kpnkyrxv'';
     };
-    xapian_ruby_1_2_15_1 = {
+    xapian_ruby_1_2_17 = {
       basename = ''xapian_ruby'';
       meta = {
         description = ''xapian libraries and ruby bindings'';
         homepage = ''https://github.com/garaio/xapian-ruby'';
       };
-      name = ''xapian-ruby-1.2.15.1'';
+      name = ''xapian-ruby-1.2.17'';
       requiredGems = [  ];
-      sha256 = ''02v3l931246asbcivkr4j0x99pl4i4fjvfsr8ga8v6lkvz0ls1xp'';
+      sha256 = ''1vhqykr0b877pb8x5n3v4fb4znm92mqhijinss7mvqzfimwfbxfg'';
     };
-    xml_simple_1_1_1 = {
+    xml_simple_1_1_2 = {
       basename = ''xml_simple'';
       meta = {
         description = ''A simple API for XML processing.'';
-        homepage = ''http://xml-simple.rubyforge.org'';
+        homepage = ''https://github.com/maik/xml-simple'';
       };
-      name = ''xml-simple-1.1.1'';
+      name = ''xml-simple-1.1.2'';
       requiredGems = [  ];
-      sha256 = ''0zlwz8kvpm45m227aazg369fapbqyhvd5v9aga8cvxyhqnq0b87i'';
-    };
-    yajl_ruby_1_1_0 = {
-      basename = ''yajl_ruby'';
-      meta = {
-        description = ''Ruby C bindings to the excellent Yajl JSON stream-based parser library.'';
-        homepage = ''http://github.com/brianmario/yajl-ruby'';
-      };
-      name = ''yajl-ruby-1.1.0'';
-      requiredGems = [  ];
-      sha256 = ''0sj46j47icb12hdhcfh76rnvddyiic5ifqzkh3kla1vcr505kf4m'';
+      sha256 = ''0ni8cbkj7l2k5pc4fs2jzp1ymxy4xqa2jc681l4y9iy9chrayddb'';
     };
   };
 }

From 9bec5e1288da73da8226e7fe3402e8e2af51e7d9 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Sat, 23 Aug 2014 12:39:15 +0200
Subject: [PATCH 0355/1453] New package: riemann 0.2.6

---
 pkgs/servers/monitoring/riemann/default.nix | 28 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/servers/monitoring/riemann/default.nix

diff --git a/pkgs/servers/monitoring/riemann/default.nix b/pkgs/servers/monitoring/riemann/default.nix
new file mode 100644
index 000000000000..5278e5438133
--- /dev/null
+++ b/pkgs/servers/monitoring/riemann/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "riemann-${version}";
+  version = "0.2.6";
+
+  src = fetchurl {
+    url = "http://aphyr.com/riemann/${name}.tar.bz2";
+    sha256 = "1m1vkvdcpcc93ipzpdlq0lig81yw172qfiqbxlrbjyb0x6j1984d";
+  };
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  installPhase = ''
+    mkdir -p $out/share/java
+    mv lib/riemann.jar $out/share/java/
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "http://riemann.io/";
+    description = ''
+      A network monitoring system.
+    '';
+    license = licenses.epl10;
+    platforms = platforms.all;
+    maintainers = [ maintainers.rickynils ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3d4e983c048e..a4f275e3c6e9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6958,6 +6958,8 @@ let
 
   net_snmp = callPackage ../servers/monitoring/net-snmp { };
 
+  riemann = callPackage ../servers/monitoring/riemann { };
+
   oidentd = callPackage ../servers/identd/oidentd { };
 
   openfire = callPackage ../servers/xmpp/openfire { };

From aafb5aafe45b1e9576977928afa7e6209cece224 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Sat, 23 Aug 2014 12:55:24 +0200
Subject: [PATCH 0356/1453] libvirt-python: Update from 1.2.5 to 1.2.7

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f7e3bf3c2ca9..3ed195612dea 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9705,11 +9705,11 @@ rec {
 
   libvirt = pkgs.stdenv.mkDerivation rec {
     name = "libvirt-python-${version}";
-    version = "1.2.5";
+    version = "1.2.7";
 
     src = fetchurl {
       url = "http://libvirt.org/sources/python/${name}.tar.gz";
-      sha256 = "0r0v48nkkxfagckizbcf67xkmyd1bnq36d30b58zmhvl0abryz7p";
+      sha256 = "0wg0pnvrwfjdl8haxr2dyfhdasddq97zy6l27xwrvd1hnh1394f1";
     };
 
     buildInputs = [ python pkgs.pkgconfig pkgs.libvirt lxml ];

From 7405af72e6c25b4cfb07b1d0f16bc10926590d41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 23 Aug 2014 13:31:17 +0200
Subject: [PATCH 0357/1453] qt: make package names of "full" variants appear as
 such

Currently there is no distinction in the package names of Qt packages
whether they are "full" or not (i.e. coming from a qt5Full or qt5
attribute).

Currently:
  $ nix-env -f. -qaP | grep "^qt[45]"
  qt48Full   qt-4.8.6
  qt5Full    qt-5.2.1
  qt5        qt-5.2.1
  qt53       qt-5.3.1
  qt53Full   qt-5.3.1
  [...]

With this change:
  $ nix-env -f. -qaP | grep "^qt[45]"
  qt5        qt-5.2.1
  qt53       qt-5.3.1
  qt48Full   qt-full-4.8.6
  qt5Full    qt-full-5.2.1
  qt53Full   qt-full-5.3.1
  [...]
---
 pkgs/top-level/all-packages.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a4f275e3c6e9..f307614260ed 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6024,24 +6024,24 @@ let
       else stdenv;
   };
 
-  qt48Full = qt48.override {
+  qt48Full = appendToName "full" (qt48.override {
     docs = true;
     demos = true;
     examples = true;
     developerBuild = true;
-  };
+  });
 
   qt4SDK = qtcreator.override {
     sdkBuild = true;
     qtLib = qt48Full;
   };
 
-  qt53Full = qt53.override {
+  qt53Full = appendToName "full" (qt53.override {
     buildDocs = true;
     buildExamples = true;
     buildTests = true;
     developerBuild = true;
-  };
+  });
 
   qt53 = callPackage ../development/libraries/qt-5/qt-5.3.nix {
     mesa = mesa_noglu;
@@ -6059,12 +6059,12 @@ let
     bison = bison2; # error: too few arguments to function 'int yylex(...
   };
 
-  qt5Full = qt5.override {
+  qt5Full = appendToName "full" (qt5.override {
     buildDocs = true;
     buildExamples = true;
     buildTests = true;
     developerBuild = true;
-  };
+  });
 
   qt5SDK = qtcreator.override {
     sdkBuild = true;

From 9fbd7d7ad50399a4d58b59e4655fe2f9139c590a Mon Sep 17 00:00:00 2001
From: Danny Chan <chan_dhf@yahoo.de>
Date: Sat, 23 Aug 2014 14:00:21 +0200
Subject: [PATCH 0358/1453] Add new package ghcParser

---
 .../libraries/haskell/ghc-parser/default.nix     | 16 ++++++++++++++++
 pkgs/top-level/haskell-packages.nix              |  2 ++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/ghc-parser/default.nix

diff --git a/pkgs/development/libraries/haskell/ghc-parser/default.nix b/pkgs/development/libraries/haskell/ghc-parser/default.nix
new file mode 100644
index 000000000000..a6fd1032dd50
--- /dev/null
+++ b/pkgs/development/libraries/haskell/ghc-parser/default.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, happy, cpphs }:
+
+cabal.mkDerivation (self: {
+  pname = "ghc-parser";
+  version = "0.1.3.0";
+  sha256 = "13p09mj92jh4y0v2r672d49fmlz3l5r2r1lqg0jjy6kj045wcfdn";
+  buildTools = [ happy cpphs ];
+  meta = {
+    homepage = "https://github.com/gibiansky/IHaskell";
+    description = "Haskell source parser from GHC";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index d09f8119d8db..15e1b368f737 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -911,6 +911,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   ghcPaths = callPackage ../development/libraries/haskell/ghc-paths {};
 
+  ghcParser = callPackage ../development/libraries/haskell/ghc-parser {};
+
   ghcSyb = callPackage ../development/libraries/haskell/ghc-syb {};
 
   ghcSybUtils = callPackage ../development/libraries/haskell/ghc-syb-utils {};

From 624fb66605a61685fbbb0e33cdf09bd5708ed653 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 23 Aug 2014 14:20:37 +0200
Subject: [PATCH 0359/1453] sup: mark as broken

Several of its buildInputs (given in all-packages.nix) does not exist
anymore (version updates and attribute renaming?).

Mark as broken to unblock nixpkgs channel.
---
 pkgs/applications/networking/mailreaders/sup/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/mailreaders/sup/default.nix b/pkgs/applications/networking/mailreaders/sup/default.nix
index b86579673abe..3d537d83f430 100644
--- a/pkgs/applications/networking/mailreaders/sup/default.nix
+++ b/pkgs/applications/networking/mailreaders/sup/default.nix
@@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
     license     = stdenv.lib.licenses.gpl2;
     maintainers = with stdenv.lib.maintainers; [ lovek323 ];
     platforms   = stdenv.lib.platforms.unix;
+    broken = true;
   };
 
   dontStrip = true;

From 0df6ccb4b61892954dc222f0c34a3b3b7f52bc24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 23 Aug 2014 11:41:41 +0200
Subject: [PATCH 0360/1453] orc: disable tests on i686

The failing test doesn't even work in the commit that introduced it.
---
 pkgs/development/compilers/orc/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix
index 2ce3e89e897c..ca5eadc8a649 100644
--- a/pkgs/development/compilers/orc/default.nix
+++ b/pkgs/development/compilers/orc/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "187wrnq0ficwjj4y3yqci5fxcdkiazfs6k5js26k5b26hipzmham";
   };
 
-  doCheck = true;
+  doCheck = stdenv.is64bit; # see https://bugzilla.gnome.org/show_bug.cgi?id=728129#c7
 
   meta = {
     description = "The Oil Runtime Compiler";

From 6525bdf2136381c5153af2bc140562cd970affe9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=BCdiger=20Sonderfeld?= <ruediger@c-plusplus.de>
Date: Tue, 19 Aug 2014 18:00:06 +0200
Subject: [PATCH 0361/1453] Add Fira font.

Fira is the font for FirefoxOS.

- https://github.com/mozilla/Fira
- http://www.carrois.com/fira-3-1/
---
 pkgs/data/fonts/fira/default.nix | 36 ++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix  |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/data/fonts/fira/default.nix

diff --git a/pkgs/data/fonts/fira/default.nix b/pkgs/data/fonts/fira/default.nix
new file mode 100644
index 000000000000..56fa9f51a474
--- /dev/null
+++ b/pkgs/data/fonts/fira/default.nix
@@ -0,0 +1,36 @@
+{stdenv, fetchurl, unzip }:
+
+stdenv.mkDerivation rec {
+  name = "fira-3.111";
+
+  src = fetchurl {
+    url = "http://www.carrois.com/wordpress/downloads/fira_3_1/FiraFonts3111.zip";
+    sha256 = "3ced3df236b0b0eec1b390885c53ac02f3e3f830e9449414230717334a0b2457";
+  };
+
+  buildInputs = [unzip];
+  phases = [ "unpackPhase" "installPhase" ];
+
+  installPhase = ''
+    mkdir -p $out/share/fonts/opentype
+    find . -name "*.otf" -exec cp -v {} $out/share/fonts/opentype \;
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://www.carrois.com/fira-3-1/;
+    description = "Sans-serif and monospace font for Firefox OS";
+    longDescription = ''
+      Fira Sans is a sans-serif font designed by Erik Spiekermann,
+      Ralph du Carrois, Anja Meiners and Botio Nikoltchev of Carrois
+      Type Design for Mozilla Firefox OS.  It is closely related to
+      Spiekermann's FF Meta typeface.  Available in Two, Four, Eight,
+      Hair, Thin, Ultra Light, Extra Light, Light, Book, Regular,
+      Medium, Semi Bold, Bold, Extra Bold, Heavy weights with
+      corresponding italic versions.  Fira Mono is a matching
+      monospace variant of Fira Sans.  It is available in regular, and
+      bold weights.
+    '';
+    license = licenses.ofl;
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a4f275e3c6e9..dea12651a913 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8024,6 +8024,8 @@ let
 
   eb-garamond = callPackage ../data/fonts/eb-garamond { };
 
+  fira = callPackage ../data/fonts/fira { };
+
   freefont_ttf = callPackage ../data/fonts/freefont-ttf { };
 
   freepats = callPackage ../data/misc/freepats { };

From a79241aa1528313b0b1ec5514366396b9f4d6600 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Thu, 21 Aug 2014 20:51:38 +0200
Subject: [PATCH 0362/1453] add: emulationstation 1.0.2

---
 .../emulators/emulationstation/default.nix    | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/misc/emulators/emulationstation/default.nix

diff --git a/pkgs/misc/emulators/emulationstation/default.nix b/pkgs/misc/emulators/emulationstation/default.nix
new file mode 100644
index 000000000000..5767786e814a
--- /dev/null
+++ b/pkgs/misc/emulators/emulationstation/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, pkgconfig, cmake, boost, eigen, freeimage, freetype
+, mesa, SDL, dejavu_fonts }:
+
+stdenv.mkDerivation rec {
+  name = "emulationstation-${version}";
+  version = "1.0.2";
+  src = fetchurl {
+    url = "https://github.com/Aloshi/EmulationStation/archive/v${version}.tar.gz";
+    sha256 = "809d67aaa727809c1426fb543e36bb788ca6a3404f8c46dd1917088b57ab5f50";
+  };
+
+  buildInputs = [ pkgconfig cmake boost eigen freeimage freetype mesa SDL ];
+
+  prePatch = ''
+    sed -i \
+      -e 's,/usr\(.*\)/ttf-dejavu\(.*\),${dejavu_fonts}\1\2,' src/Font.cpp
+  '';
+
+  buildPhase = "cmake . && make";
+  installPhase = ''
+    mkdir -p $out/bin
+    mv ../emulationstation $out/bin/.
+  '';
+
+  meta = {
+    description = "A flexible emulator front-end supporting keyboardless navigation and custom system themes";
+    homepage = "http://emulationstation.org";
+    maintainers = [ stdenv.lib.maintainers.edwtjo ];
+    license = stdenv.lib.licenses.mit;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dea12651a913..9a0d9270808f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11162,6 +11162,8 @@ let
 
   ekiga = newScope pkgs.gnome ../applications/networking/instant-messengers/ekiga { };
 
+  emulationstation = callPackage ../misc/emulators/emulationstation { };
+
   electricsheep = callPackage ../misc/screensavers/electricsheep { };
 
   fakenes = callPackage ../misc/emulators/fakenes { };

From b236d88f36dfbb06e92bcf5cd3b9841880167ea5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 23 Aug 2014 16:20:59 +0200
Subject: [PATCH 0363/1453] pythonPackages.django: update 1.4, 1.5, 1.6 due to
 security fixes

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3ed195612dea..25a64d830746 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2876,11 +2876,11 @@ rec {
 
   django_1_6 = buildPythonPackage rec {
     name = "Django-${version}";
-    version = "1.6.3";
+    version = "1.6.6";
 
     src = fetchurl {
       url = "http://www.djangoproject.com/m/releases/1.6/${name}.tar.gz";
-      sha256 = "1wdqb2x0w0c10annbyz7rrrgrv9mpa9f8pz8006lf2csix33r7bd";
+      sha256 = "143yp984n8a2bs1dflxjp1s7skmji0cwkw05s9ikbfikwmabsv2k";
     };
 
     # error: invalid command 'test'
@@ -2894,11 +2894,11 @@ rec {
 
   django_1_5 = buildPythonPackage rec {
     name = "Django-${version}";
-    version = "1.5.6";
+    version = "1.5.9";
 
     src = fetchurl {
       url = "http://www.djangoproject.com/m/releases/1.5/${name}.tar.gz";
-      sha256 = "1bxzz71sfvh0zgdzv4x3wdr4ffzd5cfnvq7iq2g1i282sacwnzwv";
+      sha256 = "1lm0pa6m9f4cd6pv239lqj32z1snf8xjbvlbh8bqihs6a1f51kj7";
     };
 
     # error: invalid command 'test'
@@ -2912,11 +2912,11 @@ rec {
 
   django_1_4 = buildPythonPackage rec {
     name = "Django-${version}";
-    version = "1.4.11";
+    version = "1.4.14";
 
     src = fetchurl {
       url = "http://www.djangoproject.com/m/releases/1.4/${name}.tar.gz";
-      sha256 = "00f2jlls3fhddrg7q4sjkwj6dmclh28n0vqm1m7kzcq5fjrxh6a8";
+      sha256 = "173ci9ml2vs1z2x51wahssfn8mrmhd02varmg9kibm8z460svvc1";
     };
 
     # error: invalid command 'test'

From 14b5f9d58136333c427a3f25f3d3a86aa2caa012 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 23 Aug 2014 16:28:35 +0200
Subject: [PATCH 0364/1453] pythonPackages: fix webtest

---
 pkgs/top-level/python-packages.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 25a64d830746..c40b9552a00c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8458,13 +8458,17 @@ rec {
 
 
   webtest = buildPythonPackage rec {
-    version = "2.0.11";
+    version = "2.0.15";
     name = "webtest-${version}";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/W/WebTest/WebTest-${version}.zip";
-      md5 = "e51da21da8815cef07f543d8688effea";
+      md5 = "49314bdba23f4d0bd807facb2a6d3f90";
     };
+    
+    preConfigure = ''
+      substituteInPlace setup.py --replace "nose<1.3.0" "nose"
+    '';
 
     # XXX: skipping two tests fails in python2.6
     doCheck = ! isPy26;

From e083de9c29f58ff964842307394527c5034f4277 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 23 Aug 2014 16:33:22 +0200
Subject: [PATCH 0365/1453] pythonPackages.psycopg2: 2.5.2 -> 2.5.3

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c40b9552a00c..72139546fffa 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5602,14 +5602,14 @@ rec {
 
 
   psycopg2 = buildPythonPackage rec {
-    name = "psycopg2-2.5.2";
+    name = "psycopg2-2.5.3";
 
     # error: invalid command 'test'
     doCheck = false;
 
     src = fetchurl {
       url = "https://pypi.python.org/packages/source/p/psycopg2/${name}.tar.gz";
-      sha256 = "0bmxlmi9k995n6pz16awjaap0y02y1v2d31jbxhkqv510f3jsf2h";
+      sha256 = "02h33barxigsczpympnwa0yvw9hgdv8d63bxm5x251ri26xz6b9s";
     };
 
     propagatedBuildInputs = [ pkgs.postgresql ];

From 3194d5cc321eb09e4b6d936317cf3aba4cca6037 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 23 Aug 2014 17:38:28 +0200
Subject: [PATCH 0366/1453] zope.testing: 4.1.2 -> 4.1.3 (also, fix pypy build)

---
 pkgs/development/interpreters/pypy/2.3/default.nix | 1 +
 pkgs/top-level/python-packages.nix                 | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/pypy/2.3/default.nix b/pkgs/development/interpreters/pypy/2.3/default.nix
index d67f1c2a8215..1b3261313c52 100644
--- a/pkgs/development/interpreters/pypy/2.3/default.nix
+++ b/pkgs/development/interpreters/pypy/2.3/default.nix
@@ -81,6 +81,7 @@ let
     passthru = {
       inherit zlibSupport libPrefix;
       executable = "pypy";
+      isPypy = true;
     };
 
     enableParallelBuilding = true;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 72139546fffa..3c3380a3dfad 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9087,12 +9087,14 @@ rec {
 
   zope_testing = buildPythonPackage rec {
     name = "zope.testing-${version}";
-    version = "4.1.2";
+    version = "4.1.3";
 
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.testing/${name}.zip";
-      md5 = "01c30c342c6a18002a762bd5d320a6e9";
+      url = "http://pypi.python.org/packages/source/z/zope.testing/${name}.tar.gz";
+      md5 = "6c73c5b668a67fdc116a25b884058ed9";
     };
+    
+    doCheck = !python.isPypy;
 
     propagatedBuildInputs = [ zope_interface zope_exceptions zope_location ];
 

From e9252cb35e0b0b09d0cb16a9d8b1f62c8233bc0a Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Sat, 23 Aug 2014 17:04:34 +0200
Subject: [PATCH 0367/1453] Add NixOS module for Riemann monitoring server.

---
 nixos/modules/misc/ids.nix                    |  2 +
 nixos/modules/module-list.nix                 |  1 +
 nixos/modules/services/monitoring/riemann.nix | 77 +++++++++++++++++++
 3 files changed, 80 insertions(+)
 create mode 100644 nixos/modules/services/monitoring/riemann.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 515105d886ae..78b3bc2f3112 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -144,6 +144,7 @@
       siproxd = 134;
       mlmmj = 135;
       neo4j = 136;
+      riemann = 137;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -261,6 +262,7 @@
       tss = 133;
       siproxd = 134;
       mlmmj = 135;
+      riemann = 137;
 
       # When adding a gid, make sure it doesn't match an existing uid. And don't use gids above 399!
 
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index feb590ad2491..532083aa6bdd 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -170,6 +170,7 @@
   ./services/monitoring/monit.nix
   ./services/monitoring/munin.nix
   ./services/monitoring/nagios.nix
+  ./services/monitoring/riemann.nix
   ./services/monitoring/smartd.nix
   ./services/monitoring/statsd.nix
   ./services/monitoring/systemhealth.nix
diff --git a/nixos/modules/services/monitoring/riemann.nix b/nixos/modules/services/monitoring/riemann.nix
new file mode 100644
index 000000000000..e8d32af1b830
--- /dev/null
+++ b/nixos/modules/services/monitoring/riemann.nix
@@ -0,0 +1,77 @@
+{ config, pkgs, ... }:
+
+with pkgs;
+with pkgs.lib;
+
+let
+
+  cfg = config.services.riemann;
+
+  classpath = concatStringsSep ":" (
+    cfg.extraClasspathEntries ++ [ "${riemann}/share/java/riemann.jar" ]
+  );
+
+  launcher = writeScriptBin "riemann" ''
+    #!/bin/sh
+    exec ${openjdk}/bin/java ${concatStringsSep "\n" cfg.extraJavaOpts} \
+      -cp ${classpath} \
+      riemann.bin ${writeText "riemann.config" cfg.config}
+  '';
+
+in {
+
+  options = {
+
+    services.riemann = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Enable the Riemann network monitoring daemon.
+        '';
+      };
+      config = mkOption {
+        type = types.lines;
+        description = ''
+          Contents of the Riemann configuration file.
+        '';
+      };
+      extraClasspathEntries = mkOption {
+        type = with types; listOf str;
+        default = [];
+        description = ''
+          Extra entries added to the Java classpath when running Riemann.
+        '';
+      };
+      extraJavaOpts = mkOption {
+        type = with types; listOf str;
+        default = [];
+        description = ''
+          Extra Java options used when launching Riemann.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+
+    users.extraGroups.riemann.gid = config.ids.gids.riemann;
+
+    users.extraUsers.riemann = {
+      description = "riemann daemon user";
+      uid = config.ids.uids.riemann;
+      group = "riemann";
+    };
+
+    systemd.services.riemann = {
+      wantedBy = [ "multi-user.target" ];
+      path = [ inetutils ];
+      serviceConfig = {
+        User = "riemann";
+        ExecStart = "${launcher}/bin/riemann";
+      };
+    };
+
+  };
+
+}

From b1d225b64521058869a1570c6d58b76caf21f6e3 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Sat, 23 Aug 2014 17:39:45 +0200
Subject: [PATCH 0368/1453] Add NixOS module for the Riemann dashboard server

---
 nixos/modules/misc/ids.nix                    |  2 +
 nixos/modules/module-list.nix                 |  1 +
 .../services/monitoring/riemann-dash.nix      | 79 +++++++++++++++++++
 3 files changed, 82 insertions(+)
 create mode 100644 nixos/modules/services/monitoring/riemann-dash.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 78b3bc2f3112..98f1b52aba41 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -145,6 +145,7 @@
       mlmmj = 135;
       neo4j = 136;
       riemann = 137;
+      riemanndash = 138;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -263,6 +264,7 @@
       siproxd = 134;
       mlmmj = 135;
       riemann = 137;
+      riemanndash = 138;
 
       # When adding a gid, make sure it doesn't match an existing uid. And don't use gids above 399!
 
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 532083aa6bdd..c45fa3e3f058 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -171,6 +171,7 @@
   ./services/monitoring/munin.nix
   ./services/monitoring/nagios.nix
   ./services/monitoring/riemann.nix
+  ./services/monitoring/riemann-dash.nix
   ./services/monitoring/smartd.nix
   ./services/monitoring/statsd.nix
   ./services/monitoring/systemhealth.nix
diff --git a/nixos/modules/services/monitoring/riemann-dash.nix b/nixos/modules/services/monitoring/riemann-dash.nix
new file mode 100644
index 000000000000..f647b92f9149
--- /dev/null
+++ b/nixos/modules/services/monitoring/riemann-dash.nix
@@ -0,0 +1,79 @@
+{ config, pkgs, ... }:
+
+with pkgs;
+with pkgs.lib;
+
+let
+
+  cfg = config.services.riemann-dash;
+
+  conf = writeText "config.rb" ''
+    riemann_base = "${cfg.dataDir}"
+    config.store[:ws_config] = "#{riemann_base}/config/config.json"
+    ${cfg.config}
+  '';
+
+  launcher = writeScriptBin "riemann-dash" ''
+    #!/bin/sh
+    exec ${rubyLibs.riemann_dash}/bin/riemann-dash ${conf}
+  '';
+
+in {
+
+  options = {
+
+    services.riemann-dash = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Enable the riemann-dash dashboard daemon.
+        '';
+      };
+      config = mkOption {
+        type = types.lines;
+        description = ''
+          Contents added to the end of the riemann-dash configuration file.
+        '';
+      };
+      dataDir = mkOption {
+        type = types.str;
+        default = "/var/riemann-dash";
+        description = ''
+          Location of the riemann-base dir. The dashboard configuration file is
+          is stored to this directory. The directory is created automatically on
+          service start, and owner is set to the riemanndash user.
+        '';
+      };
+    };
+
+  };
+
+  config = mkIf cfg.enable {
+
+    users.extraGroups.riemanndash.gid = config.ids.gids.riemanndash;
+
+    users.extraUsers.riemanndash = {
+      description = "riemann-dash daemon user";
+      uid = config.ids.uids.riemanndash;
+      group = "riemanndash";
+    };
+
+    systemd.services.riemann-dash = {
+      wantedBy = [ "multi-user.target" ];
+      wants = [ "riemann.service" ];
+      after = [ "riemann.service" ];
+      preStart = ''
+        mkdir -p ${cfg.dataDir}/config
+        chown -R riemanndash:riemanndash ${cfg.dataDir}
+      '';
+      serviceConfig = {
+        User = "riemanndash";
+        ExecStart = "${launcher}/bin/riemann-dash";
+        PermissionsStartOnly = true;
+      };
+    };
+
+  };
+
+}

From fab4eb2e7b5b3ea2feabdd4d8fd964a1a7d1198d Mon Sep 17 00:00:00 2001
From: Ian-Woo Kim <ianwookim@gmail.com>
Date: Sat, 23 Aug 2014 12:44:41 -0400
Subject: [PATCH 0369/1453] yesod-auth-hashdb haskell package added

---
 .../haskell/yesod-auth-hashdb/default.nix     | 22 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/yesod-auth-hashdb/default.nix

diff --git a/pkgs/development/libraries/haskell/yesod-auth-hashdb/default.nix b/pkgs/development/libraries/haskell/yesod-auth-hashdb/default.nix
new file mode 100644
index 000000000000..9f577fc4520b
--- /dev/null
+++ b/pkgs/development/libraries/haskell/yesod-auth-hashdb/default.nix
@@ -0,0 +1,22 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, cryptohash, pwstoreFast, text, yesodAuth, yesodCore
+, yesodForm, yesodPersistent
+}:
+
+cabal.mkDerivation (self: {
+  pname = "yesod-auth-hashdb";
+  version = "1.3.0.1";
+  sha256 = "0q78mw09g6b04zaz54s03222mh59nm604qh8gyw5kka06f93hk4q";
+  buildDepends = [
+    cryptohash pwstoreFast text yesodAuth yesodCore yesodForm
+    yesodPersistent
+  ];
+  meta = {
+    homepage = "http://www.yesodweb.com/";
+    description = "Authentication plugin for Yesod";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index d09f8119d8db..7f0946e8c271 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2799,6 +2799,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   yesodAuth = callPackage ../development/libraries/haskell/yesod-auth {};
 
+  yesodAuthHashdb = callPackage ../development/libraries/haskell/yesod-auth-hashdb {};
+
   yesodBin = callPackage ../development/libraries/haskell/yesod-bin {};
 
   yesodCore = callPackage ../development/libraries/haskell/yesod-core {};

From 99e300c4f8888d0d4a4e4e3c7e75613019c93bd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 23 Aug 2014 18:54:54 +0200
Subject: [PATCH 0370/1453] xorg: add xf86-video-qxl

---
 pkgs/servers/x11/xorg/default.nix       | 10 ++++++++++
 pkgs/servers/x11/xorg/overrides.nix     |  6 +++++-
 pkgs/servers/x11/xorg/tarballs-7.7.list |  1 +
 pkgs/top-level/all-packages.nix         |  2 +-
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 6945d6559fbb..c4dfa983f55f 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1644,6 +1644,16 @@ let
     buildInputs = [pkgconfig fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ];
   }) // {inherit fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ;};
 
+  xf86videoqxl = (mkDerivation "xf86videoqxl" {
+    name = "xf86-video-qxl-0.1.2";
+    builder = ./builder.sh;
+    src = fetchurl {
+      url = mirror://xorg/individual/driver/xf86-video-qxl-0.1.2.tar.bz2;
+      sha256 = "09sjpkg7klzzg9sagmqpsw911501vqk9wdd4nr0jkqqanvkx39s3";
+    };
+    buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xf86dgaproto xorgserver xproto ];
+  }) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xf86dgaproto xorgserver xproto ;};
+
   xf86videor128 = (mkDerivation "xf86videor128" {
     name = "xf86-video-r128-6.9.2";
     builder = ./builder.sh;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index a81b1a4ac225..7d8fd4d8b756 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -202,7 +202,11 @@ in
   };
 
   xf86videovmware = attrs: attrs // {
-    buildInputs =  attrs.buildInputs ++ [ args.mesa_drivers ]; # for libxatracker
+    buildinputs =  attrs.buildinputs ++ [ args.mesa_drivers ]; # for libxatracker
+  };
+
+  xf86videoqxl = attrs: attrs // {
+    buildInputs =  attrs.buildInputs ++ [ args.spice_protocol ];
   };
 
   xdriinfo = attrs: attrs // {
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 417d12ddadc9..93acd927f3bf 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -138,6 +138,7 @@ mirror://xorg/individual/driver/xf86-video-intel-2.21.15.tar.bz2
 mirror://xorg/individual/driver/xf86-video-mach64-6.9.4.tar.bz2
 mirror://xorg/individual/driver/xf86-video-mga-1.6.3.tar.bz2
 mirror://xorg/individual/driver/xf86-video-modesetting-0.9.0.tar.bz2
+mirror://xorg/individual/driver/xf86-video-qxl-0.1.2.tar.bz2
 mirror://xorg/individual/driver/xf86-video-neomagic-1.2.8.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86-video-newport-0.2.4.tar.bz2
 mirror://xorg/individual/driver/xf86-video-nv-2.1.20.tar.bz2
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9a0d9270808f..19cf171d20f3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7076,7 +7076,7 @@ let
 
   xorg = recurseIntoAttrs (import ../servers/x11/xorg/default.nix {
     inherit clangStdenv fetchurl fetchgit fetchpatch stdenv pkgconfig intltool freetype fontconfig
-      libxslt expat libpng zlib perl mesa_drivers
+      libxslt expat libpng zlib perl mesa_drivers spice_protocol
       dbus libuuid openssl gperf m4
       autoconf automake libtool xmlto asciidoc flex bison python mtdev pixman;
     mesa = mesa_noglu;

From f1a1c89f5032aecd5a42ab2ed89d2a2db46a5064 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 23 Aug 2014 19:17:59 +0200
Subject: [PATCH 0371/1453] PIL: use python executable names

---
 pkgs/development/python-modules/pil/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pil/default.nix b/pkgs/development/python-modules/pil/default.nix
index 35a1e913bf7b..e9375d1daad2 100644
--- a/pkgs/development/python-modules/pil/default.nix
+++ b/pkgs/development/python-modules/pil/default.nix
@@ -21,8 +21,8 @@ buildPythonPackage {
             s|^ZLIB_ROOT =.*$|ZLIB_ROOT = libinclude("${zlib}")|g ;'
   '';
 
-  checkPhase   = "python selftest.py";
-  buildPhase   = "python setup.py build_ext -i";
+  checkPhase   = "${python}/bin/${python.executable} selftest.py";
+  buildPhase   = "${python}/bin/${python.executable} setup.py build_ext -i";
 
   postInstall = ''
     cd "$out"/lib/python*/site-packages

From 9cbc21657669fd4b68760ecd7a44fe245c34415f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 23 Aug 2014 19:18:12 +0200
Subject: [PATCH 0372/1453] pypyPackages.pycrypto: make it work

---
 pkgs/development/python-modules/pycrypto/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pycrypto/default.nix b/pkgs/development/python-modules/pycrypto/default.nix
index c8f0f74c1ff1..59bd9affef67 100644
--- a/pkgs/development/python-modules/pycrypto/default.nix
+++ b/pkgs/development/python-modules/pycrypto/default.nix
@@ -9,10 +9,9 @@ buildPythonPackage rec {
     sha256 = "0g0ayql5b9mkjam8hym6zyg6bv77lbh66rv1fyvgqb17kfc1xkpj";
   };
 
-  buildInputs = [ gmp ];
-
-  doCheck = !stdenv.isDarwin; # error: AF_UNIX path too long
+  buildInputs = stdenv.lib.optional (!python.isPypy or false) gmp; # optional for pypy
 
+  doCheck = !(python.isPypy or stdenv.isDarwin); # error: AF_UNIX path too long
 
   meta = {
     homepage = "http://www.pycrypto.org/";

From 78e5234ae9a6563980df97c4ec92716351a64ca4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 23 Aug 2014 19:28:25 +0200
Subject: [PATCH 0373/1453] fix eval

---
 pkgs/top-level/all-packages.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 19cf171d20f3..1753771e511f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9373,8 +9373,11 @@ let
       cursesSupport = true;
     };
 
-    inherit gettext highline iconv locale lockfile rmail_sup
-      text trollop unicode xapian_ruby which;
+    inherit gettext highline iconv locale lockfile
+      text trollop xapian_ruby which;
+
+    rmail_sup = ""; # missing
+    unicode = "";
 
     # See https://github.com/NixOS/nixpkgs/issues/1804 and
     # https://github.com/NixOS/nixpkgs/issues/2146
@@ -9383,12 +9386,11 @@ let
         dontPatchShebangs = 1;
       }
     );
-
-    chronic      = chronic_0_9_1;
+    chronic      = chronic;
     gpgme        = ruby_gpgme;
-    mime_types   = mime_types_1_25;
+    mime_types   = mime_types;
     ncursesw_sup = ruby_ncursesw_sup;
-    rake         = rubyLibs.rake_10_1_0;
+    rake         = rake;
   };
 
   synfigstudio = callPackage ../applications/graphics/synfigstudio { };

From c4a7d019a66e8cc55f37647dd282c22ce9a6e11c Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Sat, 23 Aug 2014 21:04:33 +0100
Subject: [PATCH 0374/1453] haskell-poppler: update to 0.13

Fixed by upstream.
---
 pkgs/development/libraries/haskell/poppler/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/poppler/default.nix b/pkgs/development/libraries/haskell/poppler/default.nix
index 327744560acb..28e7e515c2b2 100644
--- a/pkgs/development/libraries/haskell/poppler/default.nix
+++ b/pkgs/development/libraries/haskell/poppler/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "poppler";
-  version = "0.12.3";
-  sha256 = "1ny2r1cpsshpg00w6bd0f5mw26xsy99l7dgx2xq8f01zcwdy4nrp";
+  version = "0.13";
+  sha256 = "1fv0h2ixanzv5vy4l2ln23f9n8ghmgdxzlyx54hh69bwhrcg049s";
   buildDepends = [ cairo glib gtk mtl ];
   buildTools = [ gtk2hsBuildtools ];
   extraLibraries = [ libc ];
@@ -18,7 +18,5 @@ cabal.mkDerivation (self: {
     license = self.stdenv.lib.licenses.gpl2;
     platforms = self.ghc.meta.platforms;
     maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
   };
 })

From d576fa175fce433e5e921ff67820299fdbca764d Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Sat, 23 Aug 2014 13:12:30 -0700
Subject: [PATCH 0375/1453] Update cabal-lenses to v3.1, no longer needs to be
 jailbroken

---
 pkgs/development/libraries/haskell/cabal-lenses/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/cabal-lenses/default.nix b/pkgs/development/libraries/haskell/cabal-lenses/default.nix
index ccd23434fe0d..b5427b3b7472 100644
--- a/pkgs/development/libraries/haskell/cabal-lenses/default.nix
+++ b/pkgs/development/libraries/haskell/cabal-lenses/default.nix
@@ -4,10 +4,9 @@
 
 cabal.mkDerivation (self: {
   pname = "cabal-lenses";
-  version = "0.3";
-  sha256 = "13nx9cn81cx9cj7fk07akqvz4qkl49dlgb5wl5wanag6bafa6vhl";
+  version = "0.3.1";
+  sha256 = "17piwqyzd33shp12qa6j4s579rrs34l44x19p2nzz69anhc4g1j7";
   buildDepends = [ Cabal lens unorderedContainers ];
-  jailbreak = true;
   meta = {
     description = "Lenses and traversals for the Cabal library";
     license = self.stdenv.lib.licenses.bsd3;

From 33ef69390bb2d4522bf4da4dc3a92a6195a7db5c Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 24 Aug 2014 00:24:46 +0400
Subject: [PATCH 0376/1453] =?UTF-8?q?Fix=20Julia=200.3.0=20build=20(for=20?=
 =?UTF-8?q?most=20purposes).=20Not=20making=20default=20yet=20because=20it?=
 =?UTF-8?q?=20is=20unclear=20if=20I=20missed=20something=20important.=20Fa?=
 =?UTF-8?q?iled=20to=20make=20it=20use=20external=20openblas=20and=20lapac?=
 =?UTF-8?q?k=20correctly=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/compilers/julia/0.3.0.nix    | 25 +++++++++++----
 .../science/math/liblapack/3.5.0.nix          |  1 +
 .../science/math/liblapack/default.nix        |  8 +++--
 .../science/math/openblas/0.2.10.nix          | 32 +++++++++++++++++++
 .../science/math/openblas/default.nix         |  9 ++----
 pkgs/top-level/all-packages.nix               |  4 +++
 6 files changed, 62 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/development/libraries/science/math/openblas/0.2.10.nix

diff --git a/pkgs/development/compilers/julia/0.3.0.nix b/pkgs/development/compilers/julia/0.3.0.nix
index 4eb64aea5346..82d7eda1d260 100644
--- a/pkgs/development/compilers/julia/0.3.0.nix
+++ b/pkgs/development/compilers/julia/0.3.0.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   openblas_src = fetchurl {
     url = "https://github.com/xianyi/OpenBLAS/tarball/${openblas_ver}";
     name = "openblas-${openblas_ver}.tar.gz";
-    sha256 = "19ffec70f9678f5c159feadc036ca47720681b782910fbaa95aa3867e7e86d8e";
+    sha256 = "06i0q4qnd5q5xljzrgvda0gjsczc6l2pl9hw6dn2qjpw38al73za";
   };
   arpack_src = fetchurl rec {
     url = "http://forge.scilab.org/index.php/p/arpack-ng/downloads/get/arpack-ng_${arpack_ver}.tar.gz";
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
   lapack_src = fetchurl {
     url = "http://www.netlib.org/lapack/lapack-${lapack_ver}.tgz";
     name = "lapack-${lapack_ver}.tgz";
-    sha256 = "93b910f94f6091a2e71b59809c4db4a14655db527cfc5821ade2e8c8ab75380f";
+    sha256 = "0lk3f97i9imqascnlf6wr5mjpyxqcdj73pgj97dj2mgvyg9z1n4s";
   };
   lighttpd_src = fetchurl {
     url = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${lighttpd_ver}.tar.gz";
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
     ];
 
   configurePhase = ''
-    for i in GMP LLVM PCRE LAPACK OPENBLAS BLAS READLINE FFTW LIBUNWIND SUITESPARSE GLPK LIGHTTPD ZLIB MPFR;
+    for i in GMP LLVM PCRE READLINE FFTW LIBUNWIND SUITESPARSE GLPK LIGHTTPD ZLIB MPFR;
     do
       makeFlags="$makeFlags USE_SYSTEM_$i=1 "
     done
@@ -82,12 +82,13 @@ stdenv.mkDerivation rec {
       cp "$1" "$2/$(basename "$1" | sed -e 's/^[a-z0-9]*-//')"
     }
 
-    for i in "${grisu_src}" "${dsfmt_src}" "${arpack_src}" "${patchelf_src}" "${pcre_src}" "${utf8proc_src}"; do
+    for i in "${grisu_src}" "${dsfmt_src}" "${arpack_src}" "${patchelf_src}" \
+        "${pcre_src}" "${utf8proc_src}" "${lapack_src}" "${openblas_src}"; do
       copy_kill_hash "$i" deps
     done
 
     ${if realGcc ==null then "" else 
-    ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${realGcc}/lib -L${realGcc}/lib64 -lpcre -llapack -lm -lfftw3f -lfftw3 -lglpk -lunistring -lz -lgmp -lmpfr"''}
+    ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${realGcc}/lib -L${realGcc}/lib64 -lpcre -llapack -lm -lfftw3f -lfftw3 -lglpk -lunistring -lz -lgmp -lmpfr -lblas -lopenblas -L$out/lib"''}
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fPIC "
 
     export LDFLAGS="-L${suitesparse}/lib -L$out/lib/julia -Wl,-rpath,$out/lib/julia"
@@ -105,6 +106,14 @@ stdenv.mkDerivation rec {
     export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PWD/usr/lib:$PWD/usr/lib/julia"
 
     patchShebangs . contrib
+
+    export PATH="$PATH:${stdenv.gcc.libc}/sbin"
+
+    # ldconfig doesn't seem to ever work on NixOS; system-wide ldconfig cache
+    # is probably not what we want anyway on non-NixOS
+    sed -e "s@/sbin/ldconfig@true@" -i src/ccall.*
+
+    ln -s "${openblas}/lib/libopenblas.so" "$out/lib/libblas.so"
   '';
 
   preBuild = ''
@@ -126,7 +135,9 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  enableParallelBuilding = false;
+  dontStrip = true;
+
+  enableParallelBuilding = true;
 
   postInstall = ''
     rm -f "$out"/lib/julia/sys.{so,dylib,dll}
@@ -138,6 +149,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.mit;
     maintainers = [ stdenv.lib.maintainers.raskin ];
     platforms = with stdenv.lib.platforms; linux;
-    broken = true;
+    broken = false;
   };
 }
diff --git a/pkgs/development/libraries/science/math/liblapack/3.5.0.nix b/pkgs/development/libraries/science/math/liblapack/3.5.0.nix
index b2167449a2f9..0b4badf26e7a 100644
--- a/pkgs/development/libraries/science/math/liblapack/3.5.0.nix
+++ b/pkgs/development/libraries/science/math/liblapack/3.5.0.nix
@@ -38,6 +38,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = {
+    inherit version;
     description = "Linear Algebra PACKage";
     homepage = "http://www.netlib.org/lapack/";
     license = "revised-BSD";
diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix
index f1c99397452d..9f4f43311a47 100644
--- a/pkgs/development/libraries/science/math/liblapack/default.nix
+++ b/pkgs/development/libraries/science/math/liblapack/default.nix
@@ -2,11 +2,12 @@
 let
   atlasMaybeShared = atlas.override { inherit shared; };
   usedLibExtension = if shared then ".so" else ".a";
+  version = "3.4.1";
 in
-stdenv.mkDerivation {
-  name = "liblapack-3.4.1";
+stdenv.mkDerivation rec {
+  name = "liblapack-${version}";
   src = fetchurl {
-    url = "http://www.netlib.org/lapack/lapack-3.4.1.tgz";
+    url = "http://www.netlib.org/lapack/lapack-${version}.tgz";
     sha256 = "93b910f94f6091a2e71b59809c4db4a14655db527cfc5821ade2e8c8ab75380f";
   };
 
@@ -37,6 +38,7 @@ stdenv.mkDerivation {
   };
 
   meta = {
+    inherit version;
     description = "Linear Algebra PACKage";
     homepage = "http://www.netlib.org/lapack/";
     license = "revised-BSD";
diff --git a/pkgs/development/libraries/science/math/openblas/0.2.10.nix b/pkgs/development/libraries/science/math/openblas/0.2.10.nix
new file mode 100644
index 000000000000..a8db06319111
--- /dev/null
+++ b/pkgs/development/libraries/science/math/openblas/0.2.10.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, gfortran, perl, liblapack }:
+
+stdenv.mkDerivation rec {
+  version = "0.2.10";
+
+  name = "openblas-${version}";
+  src = fetchurl {
+    url = "https://github.com/xianyi/OpenBLAS/tarball/v${version}";
+    sha256 = "06i0q4qnd5q5xljzrgvda0gjsczc6l2pl9hw6dn2qjpw38al73za";
+    name = "openblas-${version}.tar.gz";
+  };
+
+  preBuild = "cp ${liblapack.src} lapack-${liblapack.meta.version}.tgz";
+
+  buildInputs = [gfortran perl];
+
+  cpu = builtins.head (stdenv.lib.splitString "-" stdenv.system);
+
+  target = if cpu == "i686" then "P2" else 
+    if cpu == "x86_64" then "CORE2" else
+     # allow autodetect
+      "";
+
+  makeFlags = "${if target != "" then "TARGET=" else ""}${target} FC=gfortran CC=cc PREFIX=\"\$(out)\" INTERFACE64=1";
+
+  meta = {
+    description = "Basic Linear Algebra Subprograms";
+    license = stdenv.lib.licenses.bsd3;
+    homepage = "https://github.com/xianyi/OpenBLAS";
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index 6ea7333f6986..c535b1a39dbb 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -1,12 +1,7 @@
-{ stdenv, fetchurl, gfortran, perl }:
+{ stdenv, fetchurl, gfortran, perl, liblapack }:
 
 stdenv.mkDerivation rec {
   version = "0.2.2";
-  lapack_version = "3.4.1";
-  lapack_src = fetchurl {
-    url = "http://www.netlib.org/lapack/lapack-${lapack_version}.tgz";
-    sha256 = "93b910f94f6091a2e71b59809c4db4a14655db527cfc5821ade2e8c8ab75380f";
-  };
 
   name = "openblas-${version}";
   src = fetchurl {
@@ -15,7 +10,7 @@ stdenv.mkDerivation rec {
     name = "openblas-${version}.tar.gz";
   };
 
-  preBuild = "cp ${lapack_src} lapack-${lapack_version}.tgz";
+  preBuild = "cp ${liblapack.src} lapack-${liblapack.meta.version}.tgz";
 
   buildInputs = [gfortran perl];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1753771e511f..856f8718b16b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3112,6 +3112,7 @@ let
     suitesparse = suitesparse.override {
       inherit liblapack;
     };
+    openblas = openblas_0_2_10;
     llvm = llvm_34;
   };
   julia = julia021;
@@ -10893,6 +10894,9 @@ let
   liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { };
 
   openblas = callPackage ../development/libraries/science/math/openblas { };
+  openblas_0_2_10 = callPackage ../development/libraries/science/math/openblas/0.2.10.nix { 
+    liblapack = liblapack_3_5_0;
+  };
 
   mathematica = callPackage ../applications/science/math/mathematica { };
 

From c23bf4ec746b03e66730f9ca3ddb5957923ca9c1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 23 Aug 2014 23:28:03 +0200
Subject: [PATCH 0377/1453] systemd: Update to 216

---
 nixos/modules/system/boot/systemd.nix      |   1 +
 pkgs/os-specific/linux/systemd/default.nix |  34 +++-
 pkgs/os-specific/linux/systemd/fixes.patch | 196 ++++-----------------
 3 files changed, 66 insertions(+), 165 deletions(-)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index e353e9246b0e..366faf1b73de 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -81,6 +81,7 @@ let
       "systemd-journal-flush.service"
       "systemd-journal-gatewayd.socket"
       "systemd-journal-gatewayd.service"
+      "systemd-journald-dev-log.socket"
       "syslog.socket"
 
       # SysV init compatibility.
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 3445c3cd2dd3..7084ebc5e629 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -3,7 +3,6 @@
 , glib, kbd, libxslt, coreutils, libgcrypt, sysvtools, docbook_xsl
 , kexectools, libmicrohttpd, linuxHeaders
 , pythonPackages ? null, pythonSupport ? false
-, autoreconfHook
 }:
 
 assert stdenv.isLinux;
@@ -11,17 +10,17 @@ assert stdenv.isLinux;
 assert pythonSupport -> pythonPackages != null;
 
 stdenv.mkDerivation rec {
-  version = "212";
+  version = "216";
   name = "systemd-${version}";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/systemd/${name}.tar.xz";
-    sha256 = "1hpjcc42svrs06q3isjm3m5aphgkpfdylmvpnif71zh46ys0cab5";
+    sha256 = "1wr8jxhp2rmbzabm743rmrhp2c8kir1990x6iblzzmj0v2vkspcl";
   };
 
   patches =
     [ # These are all changes between upstream and
-      # https://github.com/edolstra/systemd/tree/nixos-v212.
+      # https://github.com/edolstra/systemd/tree/nixos-v216.
       ./fixes.patch
     ];
 
@@ -29,7 +28,6 @@ stdenv.mkDerivation rec {
     [ pkgconfig intltool gperf libcap kmod xz pam acl
       /* cryptsetup */ libuuid m4 glib libxslt libgcrypt docbook_xsl
       libmicrohttpd linuxHeaders
-      autoreconfHook
     ] ++ stdenv.lib.optionals pythonSupport [pythonPackages.python pythonPackages.lxml];
 
   configureFlags =
@@ -45,9 +43,24 @@ stdenv.mkDerivation rec {
       "--with-dbussessionservicedir=$(out)/share/dbus-1/services"
       "--with-firmware-path=/root/test-firmware:/run/current-system/firmware"
       "--with-tty-gid=3" # tty in NixOS has gid 3
-      "--disable-networkd" # enable/use eventually
       "--enable-compat-libs" # get rid of this eventually
       "--disable-tests"
+      "--disable-manpages" # FIXME
+
+      "--disable-hostnamed"
+      "--disable-networkd" # enable/use eventually
+      "--disable-sysusers"
+      "--disable-timedated"
+      "--disable-timesyncd"
+      "--disable-readahead"
+      "--disable-firstboot"
+      "--disable-localed"
+      "--disable-resolved"
+      "--disable-split-usr"
+
+      "--with-sysvinit-path="
+      "--with-sysvrcnd-path="
+      "--with-rc-local-script-path-stop=/etc/halt.local"
     ];
 
   preConfigure =
@@ -88,6 +101,8 @@ stdenv.mkDerivation rec {
       # currently running systemd (/run/current-system/systemd) so
       # that we don't use an obsolete/garbage-collected release agent.
       "-USYSTEMD_CGROUP_AGENT_PATH" "-DSYSTEMD_CGROUP_AGENT_PATH=\"/run/current-system/systemd/lib/systemd/systemd-cgroups-agent\""
+
+      "-USYSTEMD_BINARY_PATH" "-DSYSTEMD_BINARY_PATH=\"/run/current-system/systemd/lib/systemd/systemd\""
     ];
 
   # Use /var/lib/udev rather than /etc/udev for the generated hardware
@@ -104,9 +119,14 @@ stdenv.mkDerivation rec {
       "pamconfdir=$(out)/etc/pam.d"
     ];
 
-  # Get rid of configuration-specific data.
   postInstall =
     ''
+      # sysinit.target: Don't depend on
+      # systemd-tmpfiles-setup.service. This interferes with NixOps's
+      # send-keys feature (since sshd.service depends indirectly on
+      # sysinit.target).
+      mv $out/lib/systemd/system/sysinit.target.wants/systemd-tmpfiles-setup-dev.service $out/lib/systemd/system/multi-user.target.wants/
+
       mkdir -p $out/example/systemd
       mv $out/lib/{modules-load.d,binfmt.d,sysctl.d,tmpfiles.d} $out/example
       mv $out/lib/systemd/{system,user} $out/example/systemd
diff --git a/pkgs/os-specific/linux/systemd/fixes.patch b/pkgs/os-specific/linux/systemd/fixes.patch
index 7410c87e277e..416be6248c7e 100644
--- a/pkgs/os-specific/linux/systemd/fixes.patch
+++ b/pkgs/os-specific/linux/systemd/fixes.patch
@@ -1,20 +1,5 @@
-diff --git a/Makefile.am b/Makefile.am
-index 3d9e5c1..4d43cb4 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1707,7 +1707,9 @@ dist_tmpfiles_DATA += \
- endif
- 
- SYSINIT_TARGET_WANTS += \
--	systemd-tmpfiles-setup-dev.service \
-+	systemd-tmpfiles-setup-dev.service
-+
-+MULTI_USER_TARGET_WANTS += \
- 	systemd-tmpfiles-setup.service
- 
- dist_zshcompletion_DATA += \
 diff --git a/rules/99-systemd.rules.in b/rules/99-systemd.rules.in
-index db72373..2fc12ca 100644
+index aa435c4..46a2cd4 100644
 --- a/rules/99-systemd.rules.in
 +++ b/rules/99-systemd.rules.in
 @@ -14,10 +14,6 @@ KERNEL=="vport*", TAG+="systemd"
@@ -28,79 +13,11 @@ index db72373..2fc12ca 100644
  # Ignore raid devices that are not yet assembled and started
  SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", KERNEL=="md*", TEST!="md/array_state", ENV{SYSTEMD_READY}="0"
  SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", KERNEL=="md*", ATTR{md/array_state}=="|clear|inactive", ENV{SYSTEMD_READY}="0"
-diff --git a/src/core/main.c b/src/core/main.c
-index 41605ee..8517369 100644
---- a/src/core/main.c
-+++ b/src/core/main.c
-@@ -1883,7 +1883,7 @@ finish:
-                         char_array_0(sfd);
- 
-                         i = 0;
--                        args[i++] = SYSTEMD_BINARY_PATH;
-+                        args[i++] = "/run/current-system/systemd/lib/systemd/systemd";
-                         if (switch_root_dir)
-                                 args[i++] = "--switched-root";
-                         args[i++] = arg_running_as == SYSTEMD_SYSTEM ? "--system" : "--user";
-diff --git a/src/core/service.c b/src/core/service.c
-index ae3695a..6b3aa45 100644
---- a/src/core/service.c
-+++ b/src/core/service.c
-@@ -1096,11 +1096,6 @@ static int service_verify(Service *s) {
-                 return -EINVAL;
-         }
- 
--        if (s->type == SERVICE_ONESHOT && s->restart != SERVICE_RESTART_NO) {
--                log_error_unit(UNIT(s)->id, "%s has Restart setting other than no, which isn't allowed for Type=oneshot services. Refusing.", UNIT(s)->id);
--                return -EINVAL;
--        }
--
-         if (s->type == SERVICE_DBUS && !s->bus_name) {
-                 log_error_unit(UNIT(s)->id, "%s is of type D-Bus but no D-Bus service name has been specified. Refusing.", UNIT(s)->id);
-                 return -EINVAL;
-diff --git a/src/core/socket.c b/src/core/socket.c
-index 7c18a2b..eba67d5 100644
---- a/src/core/socket.c
-+++ b/src/core/socket.c
-@@ -663,16 +663,25 @@ static int instance_from_socket(int fd, unsigned nr, char **instance) {
-                 int k;
- 
-                 k = getpeercred(fd, &ucred);
--                if (k < 0)
-+                if (k == -ENODATA) {
-+                        /* This handles the case where somebody is
-+                         * connecting from another pid/uid namespace
-+                         * (e.g. from outside of our container). */
-+                        if (asprintf(&r,
-+                                     "%u-unknown",
-+                                     nr) < 0)
-+                                return -ENOMEM;
-+                }
-+                else if (k < 0)
-                         return k;
--
--                if (asprintf(&r,
--                             "%u-%lu-%lu",
--                             nr,
--                             (unsigned long) ucred.pid,
--                             (unsigned long) ucred.uid) < 0)
--                        return -ENOMEM;
--
-+                else {
-+                        if (asprintf(&r,
-+                                     "%u-%lu-%lu",
-+                                     nr,
-+                                     (unsigned long) ucred.pid,
-+                                     (unsigned long) ucred.uid) < 0)
-+                                return -ENOMEM;
-+                }
-                 break;
-         }
- 
 diff --git a/src/core/umount.c b/src/core/umount.c
-index d1258f0..0311812 100644
+index cffa453..4d1a9ff 100644
 --- a/src/core/umount.c
 +++ b/src/core/umount.c
-@@ -404,6 +404,8 @@ static int mount_points_list_umount(MountPoint **head, bool *changed, bool log_e
+@@ -385,6 +385,8 @@ static int mount_points_list_umount(MountPoint **head, bool *changed, bool log_e
                   * anyway, since we are running from it. They have
                   * already been remounted ro. */
                  if (path_equal(m->path, "/")
@@ -110,32 +27,24 @@ index d1258f0..0311812 100644
                      || path_equal(m->path, "/usr")
  #endif
 diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
-index 18f2aca..2a2b1ea 100644
+index dfe97bc..71cd8f4 100644
 --- a/src/fsck/fsck.c
 +++ b/src/fsck/fsck.c
-@@ -285,7 +285,7 @@ int main(int argc, char *argv[]) {
- 
-         type = udev_device_get_property_value(udev_device, "ID_FS_TYPE");
-         if (type) {
--                const char *checker = strappenda("/sbin/fsck.", type);
-+                const char *checker = strappenda("/run/current-system/sw/sbin/fsck.", type);
-                 r = access(checker, X_OK);
-                 if (r < 0) {
-                         if (errno == ENOENT) {
-@@ -302,7 +302,7 @@ int main(int argc, char *argv[]) {
+@@ -315,8 +315,7 @@ int main(int argc, char *argv[]) {
                          return EXIT_FAILURE;
                  }
  
 -        cmdline[i++] = "/sbin/fsck";
+-        cmdline[i++] =  arg_repair;
 +        cmdline[i++] = "/run/current-system/sw/sbin/fsck";
-         cmdline[i++] = "-a";
          cmdline[i++] = "-T";
-         cmdline[i++] = "-l";
+ 
+         /*
 diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
-index 9a9ed9d..9e46e18 100644
+index d01da45..4976f9a 100644
 --- a/src/nspawn/nspawn.c
 +++ b/src/nspawn/nspawn.c
-@@ -2667,6 +2667,7 @@ int main(int argc, char *argv[]) {
+@@ -2985,6 +2985,7 @@ int main(int argc, char *argv[]) {
                                  goto finish;
                          }
                  } else {
@@ -143,7 +52,7 @@ index 9a9ed9d..9e46e18 100644
                          const char *p;
  
                          p = strappenda(arg_directory,
-@@ -2676,6 +2677,7 @@ int main(int argc, char *argv[]) {
+@@ -2994,6 +2995,7 @@ int main(int argc, char *argv[]) {
                                  goto finish;
  
                          }
@@ -151,39 +60,11 @@ index 9a9ed9d..9e46e18 100644
                  }
          } else {
                  char template[] = "/tmp/nspawn-root-XXXXXX";
-diff --git a/src/nss-myhostname/netlink.c b/src/nss-myhostname/netlink.c
-index d61ecdf..228a3a4 100644
---- a/src/nss-myhostname/netlink.c
-+++ b/src/nss-myhostname/netlink.c
-@@ -112,6 +112,10 @@ static int read_reply(int fd, struct address **list, unsigned *n_list) {
-                     ifaddrmsg->ifa_scope == RT_SCOPE_NOWHERE)
-                         continue;
- 
-+                if (ifaddrmsg->ifa_family == AF_INET6 &&
-+                    ifaddrmsg->ifa_scope == RT_SCOPE_LINK)
-+                        continue;
-+
-                 if (ifaddrmsg->ifa_flags & IFA_F_DEPRECATED)
-                         continue;
- 
-diff --git a/src/shared/generator.c b/src/shared/generator.c
-index 6110303..e679cb1 100644
---- a/src/shared/generator.c
-+++ b/src/shared/generator.c
-@@ -48,7 +48,7 @@ int generator_write_fsck_deps(
-                 const char *checker;
-                 int r;
- 
--                checker = strappenda("/sbin/fsck.", fstype);
-+                checker = strappenda("/run/current-system/sw/sbin/fsck.", fstype);
-                 r = access(checker, X_OK);
-                 if (r < 0) {
-                         log_warning("Checking was requested for %s, but %s cannot be used: %m", what, checker);
 diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
-index 0887bc3..6b502ce 100644
+index 36db652..b1ba6e9 100644
 --- a/src/systemctl/systemctl.c
 +++ b/src/systemctl/systemctl.c
-@@ -2561,7 +2561,7 @@ static int start_unit_one(
+@@ -2607,7 +2607,7 @@ static int start_unit_one(
  
                  log_debug("Adding %s to the set", p);
                  r = set_consume(s, p);
@@ -217,7 +98,7 @@ index 4f7794b..bad2a9a 100644
  Restart=always
  RestartSec=0
 diff --git a/units/emergency.service.in b/units/emergency.service.in
-index 94c090f..0d20640 100644
+index 91fc1bb..6a37434 100644
 --- a/units/emergency.service.in
 +++ b/units/emergency.service.in
 @@ -15,7 +15,6 @@ Before=shutdown.target
@@ -226,10 +107,10 @@ index 94c090f..0d20640 100644
  WorkingDirectory=/root
 -ExecStartPre=-/bin/plymouth quit
  ExecStartPre=-/bin/echo -e 'Welcome to emergency mode! After logging in, type "journalctl -xb" to view\\nsystem logs, "systemctl reboot" to reboot, "systemctl default" to try again\\nto boot into default mode.'
- ExecStart=-/sbin/sulogin
- ExecStopPost=@SYSTEMCTL@ --fail --no-block default
+ ExecStart=-/bin/sh -c "/sbin/sulogin; @SYSTEMCTL@ --fail --no-block default"
+ Type=idle
 diff --git a/units/getty@.service.m4 b/units/getty@.service.m4
-index aa853b8..8bcc647 100644
+index 46164ab..f194a31 100644
 --- a/units/getty@.service.m4
 +++ b/units/getty@.service.m4
 @@ -23,11 +23,12 @@ IgnoreOnIsolate=yes
@@ -248,23 +129,23 @@ index aa853b8..8bcc647 100644
  Restart=always
  RestartSec=0
 diff --git a/units/kmod-static-nodes.service.in b/units/kmod-static-nodes.service.in
-index 368f980..d0c1bd2 100644
+index 0934a87..7e30c9e 100644
 --- a/units/kmod-static-nodes.service.in
 +++ b/units/kmod-static-nodes.service.in
 @@ -10,7 +10,6 @@ Description=Create list of required static device nodes for the current kernel
  DefaultDependencies=no
  Before=sysinit.target systemd-tmpfiles-setup-dev.service
- ConditionCapability=CAP_MKNOD
+ ConditionCapability=CAP_SYS_MODULE
 -ConditionPathExists=/lib/modules/%v/modules.devname
  
  [Service]
  Type=oneshot
 diff --git a/units/local-fs.target b/units/local-fs.target
-index ae3cedc..0e36840 100644
+index d2e5429..d26984b 100644
 --- a/units/local-fs.target
 +++ b/units/local-fs.target
-@@ -13,3 +13,5 @@ DefaultDependencies=no
- Conflicts=shutdown.target
+@@ -13,3 +13,5 @@ Conflicts=shutdown.target
+ After=local-fs-pre.target
  OnFailure=emergency.target
  OnFailureJobMode=replace-irreversibly
 +
@@ -282,7 +163,7 @@ index 43ffa5c..156a681 100644
  [Install]
  WantedBy=multi-user.target
 diff --git a/units/rescue.service.m4.in b/units/rescue.service.m4.in
-index 552ef89..af3915f 100644
+index ef54369..0c841b3 100644
 --- a/units/rescue.service.m4.in
 +++ b/units/rescue.service.m4.in
 @@ -16,7 +16,6 @@ Before=shutdown.target
@@ -291,10 +172,10 @@ index 552ef89..af3915f 100644
  WorkingDirectory=/root
 -ExecStartPre=-/bin/plymouth quit
  ExecStartPre=-/bin/echo -e 'Welcome to rescue mode! Type "systemctl default" or ^D to enter default mode.\\nType "journalctl -xb" to view system logs. Type "systemctl reboot" to reboot.'
- ExecStart=-/sbin/sulogin
- ExecStopPost=-@SYSTEMCTL@ --fail --no-block default
+ ExecStart=-/bin/sh -c "/sbin/sulogin; @SYSTEMCTL@ --fail --no-block default"
+ Type=idle
 diff --git a/units/serial-getty@.service.m4 b/units/serial-getty@.service.m4
-index 4ac51e7..86a3b59 100644
+index 4522d0d..96daa5c 100644
 --- a/units/serial-getty@.service.m4
 +++ b/units/serial-getty@.service.m4
 @@ -22,7 +22,6 @@ Before=getty.target
@@ -304,19 +185,18 @@ index 4ac51e7..86a3b59 100644
 -ExecStart=-/sbin/agetty --keep-baud 115200,38400,9600 %I $TERM
  Type=idle
  Restart=always
- RestartSec=0
+ UtmpIdentifier=%I
 diff --git a/units/sysinit.target b/units/sysinit.target
-index 8f4fb8f..e0f0147 100644
+index ec33503..4ac47b9 100644
 --- a/units/sysinit.target
 +++ b/units/sysinit.target
-@@ -9,6 +9,5 @@
+@@ -9,5 +9,4 @@
  Description=System Initialization
  Documentation=man:systemd.special(7)
  Conflicts=emergency.service emergency.target
 -Wants=local-fs.target swap.target
 -After=local-fs.target swap.target emergency.service emergency.target
 +After=emergency.service emergency.target
- RefuseManualStart=yes
 diff --git a/units/systemd-backlight@.service.in b/units/systemd-backlight@.service.in
 index e945d87..77728f2 100644
 --- a/units/systemd-backlight@.service.in
@@ -342,10 +222,10 @@ index 503e8a6..fe23b8b 100644
  [Service]
  ExecStart=@rootbindir@/systemctl kill --kill-who=main --signal=SIGUSR1 systemd-journald.service
 diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in
-index de93879..c9a49f3 100644
+index 7013979..5241d08 100644
 --- a/units/systemd-journald.service.in
 +++ b/units/systemd-journald.service.in
-@@ -25,3 +25,8 @@ WatchdogSec=1min
+@@ -26,3 +26,8 @@ WatchdogSec=1min
  # Increase the default a bit in order to allow many simultaneous
  # services being run since we keep one fd open per service.
  LimitNOFILE=16384
@@ -373,18 +253,18 @@ index 9d264a2..c505535 100644
  ExecStop=@rootlibexecdir@/systemd-rfkill save %I
 +X-RestartIfChanged=false
 diff --git a/units/systemd-tmpfiles-setup.service.in b/units/systemd-tmpfiles-setup.service.in
-index 01043b7..507f820 100644
+index 72ab083..4f77e8f 100644
 --- a/units/systemd-tmpfiles-setup.service.in
 +++ b/units/systemd-tmpfiles-setup.service.in
-@@ -12,7 +12,7 @@ DefaultDependencies=no
- Wants=local-fs.target
+@@ -11,7 +11,7 @@ Documentation=man:tmpfiles.d(5) man:systemd-tmpfiles(8)
+ DefaultDependencies=no
  Conflicts=shutdown.target
- After=systemd-readahead-collect.service systemd-readahead-replay.service local-fs.target
+ After=systemd-readahead-collect.service systemd-readahead-replay.service local-fs.target systemd-sysusers.service
 -Before=sysinit.target shutdown.target
 +Before=shutdown.target
- ConditionDirectoryNotEmpty=|/usr/lib/tmpfiles.d
- ConditionDirectoryNotEmpty=|/lib/tmpfiles.d
- ConditionDirectoryNotEmpty=|/usr/local/lib/tmpfiles.d
+ RefuseManualStop=yes
+ 
+ [Service]
 diff --git a/units/systemd-update-utmp.service.in b/units/systemd-update-utmp.service.in
 index da7dda7..e638145 100644
 --- a/units/systemd-update-utmp.service.in

From 2af1a92a28875c06b5bb620ce6961067e0a7b882 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 23 Aug 2014 17:02:44 -0500
Subject: [PATCH 0378/1453] haskell-ghc-mod-5.0.1: use wrapProgram

Use wrapProgram from makeWrapper to wrap ghc-mod and ghc-modi like
haddock. The wrapper code is clearer and hopefully more maintainable. As
a side-effect, the bug where emacs would hang while loading ghc-modi is
fixed.
---
 .../libraries/haskell/ghc-mod/5.0.1.nix       | 23 +++++++------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/libraries/haskell/ghc-mod/5.0.1.nix b/pkgs/development/libraries/haskell/ghc-mod/5.0.1.nix
index ad9207214513..1151cdfa51da 100644
--- a/pkgs/development/libraries/haskell/ghc-mod/5.0.1.nix
+++ b/pkgs/development/libraries/haskell/ghc-mod/5.0.1.nix
@@ -3,7 +3,7 @@
 { cabal, Cabal, convertible, deepseq, djinnGhc, doctest, emacs
 , filepath, ghcPaths, ghcSybUtils, haskellSrcExts, hlint, hspec
 , ioChoice, monadControl, monadJournal, mtl, split, syb, text, time
-, transformers, transformersBase
+, transformers, transformersBase, makeWrapper
 }:
 
 cabal.mkDerivation (self: {
@@ -22,9 +22,11 @@ cabal.mkDerivation (self: {
     ghcSybUtils haskellSrcExts hlint hspec ioChoice monadControl
     monadJournal mtl split syb text time transformers transformersBase
   ];
-  buildTools = [ emacs ];
+  buildTools = [ emacs makeWrapper ];
   doCheck = false;
   configureFlags = "--datasubdir=${self.pname}-${self.version}";
+  # The method used below to wrap ghc-mod and ghc-modi was borrowed from the
+  # wrapper for haddock.
   postInstall = ''
     cd $out/share/$pname-$version
     make
@@ -32,20 +34,11 @@ cabal.mkDerivation (self: {
     cd ..
     ensureDir "$out/share/emacs"
     mv $pname-$version emacs/site-lisp
-    mv $out/bin/ghc-mod $out/bin/.ghc-mod-wrapped
-    cat - > $out/bin/ghc-mod <<EOF
-    #! ${self.stdenv.shell}
-    eval exec $out/bin/.ghc-mod-wrapped \$( ${self.ghc.GHCGetPackages} ${self.ghc.version} | tr " " "\n" | tail -n +2 | paste -d " " - - | sed 's/.*/-g "&"/' | tr "\n" " ") "\$@"
-    EOF
 
-    mv $out/bin/ghc-modi $out/bin/.ghc-modi-wrapped
-    cat - > $out/bin/ghc-modi <<EOF
-    #! ${self.stdenv.shell}
-    eval exec $out/bin/.ghc-modi-wrapped \$( ${self.ghc.GHCGetPackages} ${self.ghc.version} | tr " " "\n" | tail -n +2 | paste -d " " - - | sed 's/.*/-g "&"/' | tr "\n" " ") "\$@"
-    EOF
-
-    chmod +x $out/bin/ghc-mod
-    chmod +x $out/bin/ghc-modi
+    wrapProgram $out/bin/ghc-mod --add-flags \
+      "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"-g -package-db -g\")"
+    wrapProgram $out/bin/ghc-modi --add-flags \
+      "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"-g -package-db -g\")"
   '';
   meta = {
     homepage = "http://www.mew.org/~kazu/proj/ghc-mod/";

From 72132d5ed0b39a832ce8e6719f9b6cc6dbca68b4 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Sat, 19 Apr 2014 16:33:00 -0300
Subject: [PATCH 0379/1453] Xiphos - New Package (version 3.2.1)

This is a new expression for Xiphos 3.2.1,
followed by an update of Sword library to 1.7.3 (required)
---
 pkgs/applications/misc/xiphos/default.nix    | 57 ++++++++++++++++++++
 pkgs/development/libraries/sword/default.nix |  4 +-
 pkgs/top-level/all-packages.nix              |  7 +++
 3 files changed, 66 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/applications/misc/xiphos/default.nix

diff --git a/pkgs/applications/misc/xiphos/default.nix b/pkgs/applications/misc/xiphos/default.nix
new file mode 100644
index 000000000000..b8cd2ff25840
--- /dev/null
+++ b/pkgs/applications/misc/xiphos/default.nix
@@ -0,0 +1,57 @@
+{stdenv, fetchurl, pkgconfig
+, python
+, intltool
+, docbook2x, docbook_xml_dtd_412, libxslt
+, sword, clucene_core
+, gnome_doc_utils
+, libgsf, gconf
+, gtkhtml, libgtkhtml, libglade, scrollkeeper
+, webkitgtk
+, dbus_glib, enchant, isocodes, libuuid
+}:
+
+stdenv.mkDerivation rec {
+  name = "xiphos-${version}";  
+  version = "3.2.1";
+
+  src = fetchurl {
+    url = "http://downloads.sourceforge.net/project/gnomesword/Xiphos/${version}/${name}.tar.gz";
+    sha256 = "0xff31f89as1p7fn3vq8ishjhbmx6qhc25msh5ypa0zg8hm5dxbb";
+  };
+
+  buildInputs = [ pkgconfig python intltool docbook2x docbook_xml_dtd_412 libxslt sword clucene_core gnome_doc_utils libgsf gconf gtkhtml libgtkhtml libglade scrollkeeper webkitgtk dbus_glib enchant isocodes libuuid ];
+
+  prePatch = ''
+    patchShebangs .;
+  '';
+
+  preConfigure =  ''
+    export CLUCENE_HOME=${clucene_core};
+    export SWORD_HOME=${sword};
+  '';
+  
+  configurePhase = ''
+    python waf configure --prefix=$out    
+  '';
+  
+  buildPhase = ''
+    python waf build
+  '';
+
+  installPhase = ''
+    python waf install
+  '';
+
+  meta =  {
+    description = "A GTK Bible study tool";
+    longDescription = ''
+    Xiphos (formerly known as GnomeSword) is a Bible study tool written for Linux, UNIX,
+    and Windows using GTK, offering a rich and featureful environment for reading, study,
+    and research using modules from The SWORD Project and elsewhere.    
+    '';
+    homepage = http://www.xiphos.org/;
+    license = stdenv.lib.licenses.gpl2Plus;
+    maintainers = [ stdenv.lib.maintainers.AndersonTorres ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/sword/default.nix b/pkgs/development/libraries/sword/default.nix
index 28afdf85dfbc..5c276ead23aa 100644
--- a/pkgs/development/libraries/sword/default.nix
+++ b/pkgs/development/libraries/sword/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
 
-  version = "1.7.2";
+  version = "1.7.3";
 
   name = "sword-${version}";
 
   src = fetchurl {
     url = "http://www.crosswire.org/ftpmirror/pub/sword/source/v1.7/${name}.tar.gz";
-    sha256 = "ac7aace0ecb7a405d4b4b211ee1ae5b2250bb5c57c9197179747c9e830787871";
+    sha256 = "1sm9ivypsx3mraqnziic7qkxjx1b7crvlln0zq6cnpjx2pzqfgas";
   };
 
   buildInputs = [ pkgconfig icu clucene_core curl ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 094e410fafed..312e9718afc1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10097,6 +10097,13 @@ let
     inherit (gnome) libglade GConf;
   };
 
+  xiphos = callPackage ../applications/misc/xiphos {
+    gconf = gnome2.GConf;
+    inherit (gnome2) gtkhtml libgtkhtml libglade scrollkeeper;
+    python = python27;
+    webkitgtk = webkitgtk2;
+  };
+
   xournal = callPackage ../applications/graphics/xournal {
     inherit (gnome) libgnomeprint libgnomeprintui libgnomecanvas;
   };

From 85ec51a4ff0b606d00466d0a882bc0cc6be694bb Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Sun, 24 Aug 2014 01:50:31 +0200
Subject: [PATCH 0380/1453] vimb: Update from 2.6 to 2.7

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

diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix
index 7c5b983f1b49..996bda67323a 100644
--- a/pkgs/applications/networking/browsers/vimb/default.nix
+++ b/pkgs/applications/networking/browsers/vimb/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "vimb-${version}";
-  version = "2.6";
+  version = "2.7";
 
   src = fetchurl {
     url = "https://github.com/fanglingsu/vimb/archive/${version}.tar.gz";
-    sha256 = "1g6zm5fk3k52jk3vbbzj7rm0kanykd4zgxrqhlvj3qzj2nsn4a21";
+    sha256 = "05i5p9827rgga4h27qy3qh4ps8aynkcr55j681ddhn16ci3dk8zr";
   };
 
   # Nixos default ca bundle

From 0f6ae6403e9aa198def43c413f9557e14561deab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 24 Aug 2014 09:53:31 +0200
Subject: [PATCH 0381/1453] xorg: fix typo from the last xorg commit

Thanks to @falsifian for noticing it.
---
 pkgs/servers/x11/xorg/overrides.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 7d8fd4d8b756..93afa06a7f24 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -202,7 +202,7 @@ in
   };
 
   xf86videovmware = attrs: attrs // {
-    buildinputs =  attrs.buildinputs ++ [ args.mesa_drivers ]; # for libxatracker
+    buildInputs =  attrs.buildInputs ++ [ args.mesa_drivers ]; # for libxatracker
   };
 
   xf86videoqxl = attrs: attrs // {

From 84fa62b4f3fe4a912174897468b31b0380a85c3a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 24 Aug 2014 09:59:26 +0200
Subject: [PATCH 0382/1453] systemd: Build manpages

---
 pkgs/os-specific/linux/systemd/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 7084ebc5e629..d2144188cc67 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -45,7 +45,6 @@ stdenv.mkDerivation rec {
       "--with-tty-gid=3" # tty in NixOS has gid 3
       "--enable-compat-libs" # get rid of this eventually
       "--disable-tests"
-      "--disable-manpages" # FIXME
 
       "--disable-hostnamed"
       "--disable-networkd" # enable/use eventually

From 891657b634092a110e15947623e750f1e7200ce4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 24 Aug 2014 10:04:55 +0200
Subject: [PATCH 0383/1453] systemd: Drop unnecessary dependency

---
 pkgs/os-specific/linux/systemd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index d2144188cc67..87faae0467f1 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, intltool, gperf, libcap, dbus, kmod
 , xz, pam, acl, cryptsetup, libuuid, m4, utillinux
-, glib, kbd, libxslt, coreutils, libgcrypt, sysvtools, docbook_xsl
+, glib, kbd, libxslt, coreutils, libgcrypt, sysvtools
 , kexectools, libmicrohttpd, linuxHeaders
 , pythonPackages ? null, pythonSupport ? false
 }:
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ pkgconfig intltool gperf libcap kmod xz pam acl
-      /* cryptsetup */ libuuid m4 glib libxslt libgcrypt docbook_xsl
+      /* cryptsetup */ libuuid m4 glib libxslt libgcrypt
       libmicrohttpd linuxHeaders
     ] ++ stdenv.lib.optionals pythonSupport [pythonPackages.python pythonPackages.lxml];
 

From 33879427b7a334f29b0a61ab2bd4a9432f1f460e Mon Sep 17 00:00:00 2001
From: Nathaniel Baxter <nathaniel.baxter@gmail.com>
Date: Sun, 24 Aug 2014 12:36:37 +1000
Subject: [PATCH 0384/1453] maintainers: add myself as a maintainer to obconf
 and teamspeak_client

---
 lib/maintainers.nix                                              | 1 +
 .../networking/instant-messengers/teamspeak/client.nix           | 1 +
 pkgs/tools/X11/obconf/default.nix                                | 1 +
 3 files changed, 3 insertions(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 8c975b486f1e..b55eb22a7207 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -60,6 +60,7 @@
   kkallio = "Karn Kallio <tierpluspluslists@gmail.com>";
   ktosiek = "Tomasz Kontusz <tomasz.kontusz@gmail.com>";
   lethalman = "Luca Bruno <lucabru@src.gnome.org>";
+  lhvwb = "Nathaniel Baxter <nathaniel.baxter@gmail.com>";
   linquize = "Linquize <linquize@yahoo.com.hk>";
   lovek323 = "Jason O'Conal <jason@oconal.id.au>";
   ludo = "Ludovic Courtès <ludo@gnu.org>";
diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
index eb052af13690..d7dc755e9abb 100644
--- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
+++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
@@ -77,6 +77,7 @@ stdenv.mkDerivation rec {
     description = "The TeamSpeak voice communication tool";
     homepage = http://teamspeak.com/;
     license = "http://www.teamspeak.com/?page=downloads&type=ts3_linux_client_latest";
+    maintainers = [ stdenv.lib.maintainers.lhvwb ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/X11/obconf/default.nix b/pkgs/tools/X11/obconf/default.nix
index 589b684e69b3..e1a2e0dd496d 100644
--- a/pkgs/tools/X11/obconf/default.nix
+++ b/pkgs/tools/X11/obconf/default.nix
@@ -22,5 +22,6 @@ stdenv.mkDerivation rec {
     description = "GUI configuration tool for openbox";
     homepage = "http://openbox.org/wiki/ObConf";
     license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.lhvwb ];
   };
 }

From f61fb466eb09c4c7432d29838b752d5285163388 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=BCdiger=20Sonderfeld?= <ruediger@c-plusplus.de>
Date: Sat, 23 Aug 2014 21:08:04 +0200
Subject: [PATCH 0385/1453] man-pages: Update to 3.71.

---
 pkgs/data/documentation/man-pages/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix
index d4c0b4a6461a..2eefa31691ee 100644
--- a/pkgs/data/documentation/man-pages/default.nix
+++ b/pkgs/data/documentation/man-pages/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "man-pages-3.70";
+  name = "man-pages-3.71";
 
   src = fetchurl {
     url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz";
-    sha256 = "1qnhlicshlcz2da9k9czp75cfj7a6y90m0bhik7gzxa3s3b4f43j";
+    sha256 = "981038ecffcf6db490c0bc4359f489c318654068a6ba5aa086962ac41b0d2894";
   };
 
   preBuild =

From 4ac4440e2ffc0fdcc5964cd5d4d8e224c797a258 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 24 Aug 2014 10:13:55 +0200
Subject: [PATCH 0386/1453] pypy: verify tkinter module

---
 pkgs/development/interpreters/pypy/2.3/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/interpreters/pypy/2.3/default.nix b/pkgs/development/interpreters/pypy/2.3/default.nix
index 1b3261313c52..a364b24c04c5 100644
--- a/pkgs/development/interpreters/pypy/2.3/default.nix
+++ b/pkgs/development/interpreters/pypy/2.3/default.nix
@@ -75,6 +75,9 @@ let
        ln -s $out/pypy-c/include $out/include/${libPrefix}
        ln -s $out/pypy-c/lib-python/${pythonVersion} $out/lib/${libPrefix}
 
+       # verify cffi modules
+       $out/bin/pypy -c "import Tkinter"
+
        # TODO: compile python files?
     '';
 

From 549fae867626b51ec5c07b31bb0649470a3d02b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 24 Aug 2014 10:16:41 +0200
Subject: [PATCH 0387/1453] pypyPackages.paramiko: fix

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3c3380a3dfad..651a10063b6a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5253,7 +5253,7 @@ rec {
 
     propagatedBuildInputs = [ pycrypto ecdsa ];
 
-    checkPhase = "python test.py";
+    checkPhase = "${python}/bin/${python.executable} test.py";
 
     meta = {
       homepage = "https://github.com/paramiko/paramiko/";

From 85cdd7ce334442bab5af03b5072f29ce03f98d3a Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Sun, 3 Aug 2014 10:49:32 -0700
Subject: [PATCH 0388/1453] Add SDL2_net v2.0.0

---
 lib/maintainers.nix                           |  1 +
 .../libraries/SDL2_net/default.nix            | 22 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/libraries/SDL2_net/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index b55eb22a7207..6fadaa10952b 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -72,6 +72,7 @@
   mornfall = "Petr Ročkai <me@mornfall.net>";
   msackman = "Matthew Sackman <matthew@wellquite.org>";
   nathan-gs = "Nathan Bijnens <nathan@nathan.gs>";
+  MP2E = "Cray Elliott <MP2E@archlinux.us>";
   notthemessiah = "Brian Cohen <brian.cohen.88@gmail.com>";
   ocharles = "Oliver Charles <ollie@ocharles.org.uk>";
   offline = "Jaka Hudoklin <jakahudoklin@gmail.com>";
diff --git a/pkgs/development/libraries/SDL2_net/default.nix b/pkgs/development/libraries/SDL2_net/default.nix
new file mode 100644
index 000000000000..e41546512e94
--- /dev/null
+++ b/pkgs/development/libraries/SDL2_net/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, SDL2 }:
+
+stdenv.mkDerivation rec {
+  name = "SDL2_net-2.0.0";
+
+  src = fetchurl {
+    url = "http://www.libsdl.org/projects/SDL_net/release/${name}.tar.gz";
+    sha256 = "d715be30783cc99e541626da52079e308060b21d4f7b95f0224b1d06c1faacab";
+  };
+
+  propagatedBuildInputs = [SDL2];
+
+  postInstall = "ln -s $out/include/SDL2/SDL_net.h $out/include/";
+
+  meta = with stdenv.lib; {
+    description = "SDL multiplatform networking library";
+    homepage = https://www.libsdl.org/projects/SDL_net;
+    license = licenses.zlib;
+    maintainers = [ maintainers.MP2E ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 856f8718b16b..4f05d5240744 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6179,6 +6179,8 @@ let
 
   SDL2_mixer = callPackage ../development/libraries/SDL2_mixer { };
 
+  SDL2_net = callPackage ../development/libraries/SDL2_net { };
+
   SDL2_gfx = callPackage ../development/libraries/SDL2_gfx { };
 
   serd = callPackage ../development/libraries/serd {};

From ede8be928159db2ed5557419d151a11de2389cc9 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 24 Aug 2014 12:54:56 +0400
Subject: [PATCH 0389/1453] Fix tarball evaluation; had to regenerate Ruby gem
 list

---
 .../interpreters/ruby/generated.nix           | 35 ++++++++++++-------
 pkgs/top-level/python-packages.nix            |  2 +-
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix
index 01bbaa390f97..6ec0f4f73e5d 100644
--- a/pkgs/development/interpreters/ruby/generated.nix
+++ b/pkgs/development/interpreters/ruby/generated.nix
@@ -19,7 +19,7 @@ g: # Get dependencies from patched gems
     bitbucket_backup = g.bitbucket_backup_0_3_1;
     builder = g.builder_3_2_2;
     buildr = g.buildr_1_4_19;
-    bundler = g.bundler_1_7_0;
+    bundler = g.bundler_1_7_1;
     childprocess = g.childprocess_0_5_3;
     chronic = g.chronic_0_10_2;
     coderay = g.coderay_1_1_0;
@@ -102,7 +102,7 @@ g: # Get dependencies from patched gems
     rspec_expectations = g.rspec_expectations_2_14_5;
     rspec_mocks = g.rspec_mocks_2_14_6;
     rubyzip = g.rubyzip_1_1_6;
-    sass = g.sass_3_4_0;
+    sass = g.sass_3_4_1;
     selenium_webdriver = g.selenium_webdriver_2_42_0;
     servolux = g.servolux_0_10_0;
     sinatra = g.sinatra_1_4_5;
@@ -113,6 +113,7 @@ g: # Get dependencies from patched gems
     systemu = g.systemu_2_6_4;
     taskjuggler = g.taskjuggler_3_5_0;
     term_ansicolor = g.term_ansicolor_1_3_0;
+    terminal_notifier = g.terminal_notifier_1_6_1;
     text = g.text_1_3_0;
     thin = g.thin_1_6_2;
     thor = g.thor_0_19_1;
@@ -134,7 +135,7 @@ g: # Get dependencies from patched gems
     xapian_ruby = g.xapian_ruby_1_2_17;
     xml_simple = g.xml_simple_1_1_2;
   };
-  gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''cucumber'' ''fakes3'' ''foreman'' ''gettext'' ''iconv'' ''jsduck'' ''lockfile'' ''mechanize'' ''nix'' ''papertrail-cli'' ''rails'' ''rake'' ''rb-fsevent'' ''remote_syslog'' ''riemann-dash'' ''right_aws'' ''rmail'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''taskjuggler'' ''thin'' ''travis'' ''trollop'' ''uuid'' ''xapian-full'' ''xapian-ruby'' ];
+  gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''cucumber'' ''fakes3'' ''foreman'' ''gettext'' ''iconv'' ''jsduck'' ''lockfile'' ''mechanize'' ''nix'' ''papertrail-cli'' ''rails'' ''rake'' ''rb-fsevent'' ''remote_syslog'' ''riemann-dash'' ''right_aws'' ''rmail'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''taskjuggler'' ''terminal-notifier'' ''thin'' ''travis'' ''trollop'' ''uuid'' ''xapian-full'' ''xapian-ruby'' ];
   gems = {
     ZenTest_4_10_1 = {
       basename = ''ZenTest'';
@@ -361,19 +362,19 @@ for those one-off tasks, with a language that's a joy to use.
 '';
       };
       name = ''buildr-1.4.19'';
-      requiredGems = [ g.rake_0_9_2_2 g.builder_3_2_2 g.net_ssh_2_7_0 g.net_sftp_2_1_2 g.rubyzip_0_9_9 g.json_pure_1_8_0 g.hoe_3_7_1 g.rjb_1_4_8 g.atoulme_Antwrap_0_7_4 g.diff_lcs_1_2_4 g.rspec_expectations_2_14_3 g.rspec_mocks_2_14_3 g.rspec_core_2_14_5 g.rspec_2_14_1 g.xml_simple_1_1_2 g.minitar_0_5_4 g.bundler_1_7_0 g.orderedhash_0_0_6 ];
+      requiredGems = [ g.rake_0_9_2_2 g.builder_3_2_2 g.net_ssh_2_7_0 g.net_sftp_2_1_2 g.rubyzip_0_9_9 g.json_pure_1_8_0 g.hoe_3_7_1 g.rjb_1_4_8 g.atoulme_Antwrap_0_7_4 g.diff_lcs_1_2_4 g.rspec_expectations_2_14_3 g.rspec_mocks_2_14_3 g.rspec_core_2_14_5 g.rspec_2_14_1 g.xml_simple_1_1_2 g.minitar_0_5_4 g.bundler_1_7_1 g.orderedhash_0_0_6 ];
       sha256 = ''07k6z149si7v1h5m1bvdhjcv0nnjwkd2c6a8n1779l8g47ckccj0'';
     };
-    bundler_1_7_0 = {
+    bundler_1_7_1 = {
       basename = ''bundler'';
       meta = {
         description = ''The best way to manage your application's dependencies'';
         homepage = ''http://bundler.io'';
         longDescription = ''Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably'';
       };
-      name = ''bundler-1.7.0'';
+      name = ''bundler-1.7.1'';
       requiredGems = [  ];
-      sha256 = ''0vcbqmr1h98yfaixjbpdyzz1b90ms8gf86kd3c0q0ydwh9yr7b1j'';
+      sha256 = ''144yqbmi89gl933rh8dv58bm7ia14s4a098qdi2z0q09ank9n5h2'';
     };
     childprocess_0_5_3 = {
       basename = ''childprocess'';
@@ -1378,7 +1379,7 @@ request helpers feature.'';
         longDescription = ''Ruby on Rails is a full-stack web framework optimized for programmer happiness and sustainable productivity. It encourages beautiful code by favoring convention over configuration.'';
       };
       name = ''rails-4.1.5'';
-      requiredGems = [ g.activesupport_4_1_5 g.actionpack_4_1_5 g.actionview_4_1_5 g.activemodel_4_1_5 g.activerecord_4_1_5 g.actionmailer_4_1_5 g.railties_4_1_5 g.bundler_1_7_0 g.sprockets_rails_2_1_3 ];
+      requiredGems = [ g.activesupport_4_1_5 g.actionpack_4_1_5 g.actionview_4_1_5 g.activemodel_4_1_5 g.activerecord_4_1_5 g.actionmailer_4_1_5 g.railties_4_1_5 g.bundler_1_7_1 g.sprockets_rails_2_1_3 ];
       sha256 = ''12s3jkvd6bn40apxc3973czgs7s6y36aclbwif6j770v7sjd9qj7'';
     };
     railties_4_1_5 = {
@@ -1475,7 +1476,7 @@ Rake has the following features:
         longDescription = ''HTTP dashboard for the distributed event system Riemann.'';
       };
       name = ''riemann-dash-0.2.9'';
-      requiredGems = [ g.erubis_2_7_0 g.sinatra_1_4_5 g.sass_3_4_0 g.webrick_1_3_1 g.multi_json_1_3_6 ];
+      requiredGems = [ g.erubis_2_7_0 g.sinatra_1_4_5 g.sass_3_4_1 g.webrick_1_3_1 g.multi_json_1_3_6 ];
       sha256 = ''0ws5wmjbv8w9lcr3i2mdinj2qm91p6c85k6c067i67cf0p90jxq3'';
     };
     right_aws_3_1_0 = {
@@ -1689,7 +1690,7 @@ RKelly[https://github.com/tenderlove/rkelly] JavaScript parser.'';
       requiredGems = [  ];
       sha256 = ''17ha7kmgcnhnxyfp9wgyrd2synp17v9g8j1pknhfd2v9x5g475m9'';
     };
-    sass_3_4_0 = {
+    sass_3_4_1 = {
       basename = ''sass'';
       meta = {
         description = ''A powerful but elegant CSS compiler that makes CSS fun again.'';
@@ -1700,9 +1701,9 @@ RKelly[https://github.com/tenderlove/rkelly] JavaScript parser.'';
       command line tool or a web-framework plugin.
 '';
       };
-      name = ''sass-3.4.0'';
+      name = ''sass-3.4.1'';
       requiredGems = [  ];
-      sha256 = ''1v2kda9ff69nmz2qcxfmc1w5nxv81nays450nql0mbpy8pvydfr2'';
+      sha256 = ''0f997m7g6gcd4yaxxrf1nylk2x8ynf7w2l631sby51zfn21rfli4'';
     };
     selenium_webdriver_2_42_0 = {
       basename = ''selenium_webdriver'';
@@ -1836,6 +1837,16 @@ management.
       requiredGems = [ g.tins_1_3_2 ];
       sha256 = ''1a2gw7gmpmx57sdpyhjwl0zn4bqp7jyjz7aslpvvphd075layp4b'';
     };
+    terminal_notifier_1_6_1 = {
+      basename = ''terminal_notifier'';
+      meta = {
+        description = ''Send User Notifications on Mac OS X 10.8 or higher.'';
+        homepage = ''https://github.com/alloy/terminal-notifier'';
+      };
+      name = ''terminal-notifier-1.6.1'';
+      requiredGems = [  ];
+      sha256 = ''0j14sblviiypzc9vb508ldd78winba4vhnm9nhg3zpq07p3528g7'';
+    };
     text_1_3_0 = {
       basename = ''text'';
       meta = {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 651a10063b6a..9d3ef800f550 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9094,7 +9094,7 @@ rec {
       md5 = "6c73c5b668a67fdc116a25b884058ed9";
     };
     
-    doCheck = !python.isPypy;
+    doCheck = !(python.isPypy or false);
 
     propagatedBuildInputs = [ zope_interface zope_exceptions zope_location ];
 

From 76ac17d36b3ed1525151b3cd10d1fe68ef034dfd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 24 Aug 2014 10:55:53 +0200
Subject: [PATCH 0390/1453] Nixpkgs manual: Fix validity

---
 doc/meta.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/meta.xml b/doc/meta.xml
index eb644b3b0ee2..3a6b0b105d2e 100644
--- a/doc/meta.xml
+++ b/doc/meta.xml
@@ -120,12 +120,12 @@ interpretation:</para>
 
   <varlistentry>
     <term><varname>license</varname></term>
-    <listitem><para>The license for the package. One from attribute set defined in
-      <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/licenses.nix">
-      <filename>nixpkgs/lib/licenses.nix</filename></link>.
-      Example:
-      <literal>stdenv.lib.licenses.gpl3</literal>.</para></listitem>
-      See details in <xref linkend='sec-meta-license'/>,
+    <listitem><para>The license for the package. One from the
+    attribute set defined in <link
+    xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/licenses.nix">
+    <filename>nixpkgs/lib/licenses.nix</filename></link>.  Example:
+    <literal>stdenv.lib.licenses.gpl3</literal>. For details, see
+    <xref linkend='sec-meta-license'/>.</para></listitem>
   </varlistentry>
 
   <varlistentry>

From 14f48dd5c2c4f4f4a2409d4ced1dd4ca2cab5e74 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 24 Aug 2014 10:56:35 +0200
Subject: [PATCH 0391/1453] Nixpkgs manual: Drop author bla bla

---
 doc/manual.xml | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/doc/manual.xml b/doc/manual.xml
index 145e3e12dd92..5eb62e811c69 100644
--- a/doc/manual.xml
+++ b/doc/manual.xml
@@ -8,21 +8,6 @@
     <subtitle>Draft (Version <xi:include href="../.version"
     parse="text" />)</subtitle>
 
-    <author>
-      <personname>
-        <firstname>Eelco</firstname>
-        <surname>Dolstra</surname>
-      </personname>
-      <affiliation>
-        <orgname>LogicBlox</orgname>
-      </affiliation>
-    </author>
-
-    <copyright>
-      <year>2008-2012</year>
-      <holder>Eelco Dolstra</holder>
-    </copyright>
-
   </info>
 
   <xi:include href="introduction.xml" />
@@ -33,6 +18,5 @@
   <xi:include href="package-notes.xml" />
   <xi:include href="coding-conventions.xml" />
   <xi:include href="contributing.xml" />
-  
-        
+
 </book>

From 438b9c543d535f525ac50affd045bdf41a3239d6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 24 Aug 2014 11:02:23 +0200
Subject: [PATCH 0392/1453] Nixpkgs manual: Add a Nix expression to build

---
 doc/Makefile                    | 41 --------------------------------
 doc/default.nix                 | 42 +++++++++++++++++++++++++++++++++
 doc/manual.xml                  |  5 ++--
 pkgs/top-level/make-tarball.nix | 29 +----------------------
 pkgs/top-level/release.nix      |  2 ++
 5 files changed, 47 insertions(+), 72 deletions(-)
 delete mode 100644 doc/Makefile
 create mode 100644 doc/default.nix

diff --git a/doc/Makefile b/doc/Makefile
deleted file mode 100644
index 39988cdd414e..000000000000
--- a/doc/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# You may need to override this.
-docbookxsl = $(HOME)/.nix-profile/xml/xsl/docbook
-dblatex = dblatex
-
-XMLLINT = xmllint --catalogs
-XSLTPROC = xsltproc --catalogs \
- --param section.autolabel 1 \
- --param section.label.includes.component.label 1 \
- --param html.stylesheet \'style.css\' \
- --param xref.with.number.and.title 1 \
- --param toc.section.depth 3 \
- --param admon.style \'\' \
- --param callout.graphics.extension \'.gif\'
-
-NEWS_OPTS = \
- --stringparam generate.toc "article nop" \
- --stringparam section.autolabel.max.depth 0 \
- --stringparam header.rule 0
-
-all: NEWS.html NEWS.txt manual.html manual.pdf
-
-NEWS.html: release-notes.xml
-	$(XSLTPROC) --nonet --xinclude --output $@ $(NEWS_OPTS) \
-	  $(docbookxsl)/xhtml/docbook.xsl release-notes.xml
-
-NEWS.txt: release-notes.xml
-	$(XSLTPROC) --nonet --xinclude quote-literals.xsl release-notes.xml | \
-	  $(XSLTPROC) --nonet --output $@.tmp.html $(NEWS_OPTS) \
-	  $(docbookxsl)/xhtml/docbook.xsl -
-	LANG=en_US w3m -dump $@.tmp.html > $@
-	rm $@.tmp.html
-
-manual.html: *.xml
-	$(XSLTPROC) --nonet --xinclude --output manual.html \
-	  $(docbookxsl)/xhtml/docbook.xsl manual.xml
-
-manual.pdf: *.xml
-	$(dblatex) \
-	  -P doc.collab.show=0 \
-	  -P latex.output.revhistory=0 \
-	  manual.xml
diff --git a/doc/default.nix b/doc/default.nix
new file mode 100644
index 000000000000..1e8974d60266
--- /dev/null
+++ b/doc/default.nix
@@ -0,0 +1,42 @@
+with import ./.. { };
+with lib;
+
+stdenv.mkDerivation {
+  name = "nixpkgs-manual";
+
+  sources = sourceFilesBySuffices ./. [".xml"];
+
+  buildInputs = [ libxml2 libxslt ];
+
+  xsltFlags = ''
+    --param section.autolabel 1
+    --param section.label.includes.component.label 1
+    --param html.stylesheet 'style.css'
+    --param xref.with.number.and.title 1
+    --param toc.section.depth 3
+    --param admon.style '''
+    --param callout.graphics.extension '.gif'
+  '';
+
+  buildCommand = ''
+    ln -s $sources/*.xml . # */
+
+    echo ${nixpkgsVersion} > .version
+
+    xmllint --noout --nonet --xinclude --noxincludenode \
+      --relaxng ${docbook5}/xml/rng/docbook/docbook.rng \
+      manual.xml
+
+    dst=$out/share/doc/nixpkgs
+    mkdir -p $dst
+    xsltproc $xsltFlags --nonet --xinclude \
+      --output $dst/manual.html \
+      ${docbook5_xsl}/xml/xsl/docbook/xhtml/docbook.xsl \
+      ./manual.xml
+
+    cp ${./style.css} $dst/style.css
+
+    mkdir -p $out/nix-support
+    echo "doc manual $dst manual.html" >> $out/nix-support/hydra-build-products
+  '';
+}
diff --git a/doc/manual.xml b/doc/manual.xml
index 5eb62e811c69..01373b4f5b1d 100644
--- a/doc/manual.xml
+++ b/doc/manual.xml
@@ -3,10 +3,9 @@
 
   <info>
 
-    <title>Nixpkgs Manual</title>
+    <title>Nixpkgs Contributors Guide</title>
 
-    <subtitle>Draft (Version <xi:include href="../.version"
-    parse="text" />)</subtitle>
+    <subtitle>Version <xi:include href=".version" parse="text" /></subtitle>
 
   </info>
 
diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix
index 9856586a1832..356368d137d3 100644
--- a/pkgs/top-level/make-tarball.nix
+++ b/pkgs/top-level/make-tarball.nix
@@ -14,14 +14,7 @@ releaseTools.sourceTarball rec {
   version = builtins.readFile ../../.version;
   versionSuffix = "pre${toString nixpkgs.revCount}.${nixpkgs.shortRev}";
 
-  buildInputs = [
-    lzma
-    libxml2 # Needed for the release notes.
-    libxslt
-    w3m
-    nix # Needed to check whether the expressions are valid.
-    tetex dblatex
-  ];
+  buildInputs = [ nix ];
 
   configurePhase = ''
     eval "$preConfigure"
@@ -32,13 +25,6 @@ releaseTools.sourceTarball rec {
 
   dontBuild = false;
 
-  buildPhase = ''
-    echo "building docs..."
-    export VARTEXFONTS=$TMPDIR/texfonts
-    make -C doc docbookxsl=${docbook5_xsl}/xml/xsl/docbook
-    ln -s doc/NEWS.txt NEWS
-  '';
-
   doCheck = true;
 
   checkPhase = ''
@@ -87,19 +73,6 @@ releaseTools.sourceTarball rec {
     cp -prd . ../$releaseName
     echo nixpkgs > ../$releaseName/channel-name
     (cd .. && tar cfa $out/tarballs/$releaseName.tar.xz $releaseName) || false
-
-    mkdir -p $out/release-notes
-    cp doc/NEWS.html $out/release-notes/index.html
-    cp doc/style.css $out/release-notes/
-    echo "doc release-notes $out/release-notes" >> $out/nix-support/hydra-build-products
-
-    mkdir -p $out/manual
-    cp doc/manual.html $out/manual/index.html
-    cp doc/style.css $out/manual/
-    echo "doc manual $out/manual" >> $out/nix-support/hydra-build-products
-
-    cp doc/manual.pdf $out/manual.pdf
-    echo "doc-pdf manual $out/manual.pdf" >> $out/nix-support/hydra-build-products
   '';
 
   meta = {
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index ff66756aa8b4..be76c63685bc 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -22,6 +22,8 @@ let
   jobs =
     { tarball = import ./make-tarball.nix { inherit nixpkgs officialRelease; };
 
+      manual = import ../../doc;
+
       unstable = pkgs.releaseTools.aggregate
         { name = "nixpkgs-${jobs.tarball.version}";
           meta.description = "Release-critical builds for the Nixpkgs unstable channel";

From 9b6db1c9643a6bdfd0618c09b78b74875fde5358 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Aug 2014 11:45:56 +0200
Subject: [PATCH 0393/1453] Re-generate Haskell packages with cabal2nix.

---
 pkgs/development/libraries/haskell/diagrams/cairo.nix         | 2 +-
 pkgs/development/libraries/haskell/diagrams/contrib.nix       | 2 +-
 pkgs/development/libraries/haskell/diagrams/core.nix          | 2 +-
 pkgs/development/libraries/haskell/diagrams/lib.nix           | 2 +-
 pkgs/development/libraries/haskell/diagrams/postscript.nix    | 2 +-
 pkgs/development/libraries/haskell/diagrams/svg.nix           | 2 +-
 .../libraries/haskell/digestive-functors-aeson/default.nix    | 4 +++-
 pkgs/development/libraries/haskell/force-layout/default.nix   | 2 +-
 pkgs/development/libraries/haskell/hdaemonize/default.nix     | 2 +-
 pkgs/development/libraries/haskell/hweblib/default.nix        | 2 +-
 10 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/haskell/diagrams/cairo.nix b/pkgs/development/libraries/haskell/diagrams/cairo.nix
index c8763ca0a453..3a695fa82037 100644
--- a/pkgs/development/libraries/haskell/diagrams/cairo.nix
+++ b/pkgs/development/libraries/haskell/diagrams/cairo.nix
@@ -19,6 +19,6 @@ cabal.mkDerivation (self: {
     description = "Cairo backend for diagrams drawing EDSL";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.bergey ];
+    maintainers = with self.stdenv.lib.maintainers; [ bergey ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/diagrams/contrib.nix b/pkgs/development/libraries/haskell/diagrams/contrib.nix
index 7c9e797e3057..f1044870f3a4 100644
--- a/pkgs/development/libraries/haskell/diagrams/contrib.nix
+++ b/pkgs/development/libraries/haskell/diagrams/contrib.nix
@@ -25,6 +25,6 @@ cabal.mkDerivation (self: {
     description = "Collection of user contributions to diagrams EDSL";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.bergey ];
+    maintainers = with self.stdenv.lib.maintainers; [ bergey ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/diagrams/core.nix b/pkgs/development/libraries/haskell/diagrams/core.nix
index c7459972c394..18f362e0c21f 100644
--- a/pkgs/development/libraries/haskell/diagrams/core.nix
+++ b/pkgs/development/libraries/haskell/diagrams/core.nix
@@ -17,6 +17,6 @@ cabal.mkDerivation (self: {
     description = "Core libraries for diagrams EDSL";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.bergey ];
+    maintainers = with self.stdenv.lib.maintainers; [ bergey ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/diagrams/lib.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix
index 75ee478ac3fc..b15f05dbf27b 100644
--- a/pkgs/development/libraries/haskell/diagrams/lib.nix
+++ b/pkgs/development/libraries/haskell/diagrams/lib.nix
@@ -21,6 +21,6 @@ cabal.mkDerivation (self: {
     description = "Embedded domain-specific language for declarative graphics";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.bergey ];
+    maintainers = with self.stdenv.lib.maintainers; [ bergey ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/diagrams/postscript.nix b/pkgs/development/libraries/haskell/diagrams/postscript.nix
index c79f637c73f6..557aae73db56 100644
--- a/pkgs/development/libraries/haskell/diagrams/postscript.nix
+++ b/pkgs/development/libraries/haskell/diagrams/postscript.nix
@@ -18,6 +18,6 @@ cabal.mkDerivation (self: {
     description = "Postscript backend for diagrams drawing EDSL";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.bergey ];
+    maintainers = with self.stdenv.lib.maintainers; [ bergey ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/diagrams/svg.nix b/pkgs/development/libraries/haskell/diagrams/svg.nix
index fcd08ffce63a..8393d7c6f982 100644
--- a/pkgs/development/libraries/haskell/diagrams/svg.nix
+++ b/pkgs/development/libraries/haskell/diagrams/svg.nix
@@ -19,6 +19,6 @@ cabal.mkDerivation (self: {
     description = "SVG backend for diagrams drawing EDSL";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.bergey ];
+    maintainers = with self.stdenv.lib.maintainers; [ bergey ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix b/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix
index 9bab1ad45db6..1958307e869c 100644
--- a/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix
+++ b/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, aeson, digestiveFunctors, HUnit, lens, lensAeson, mtl
 , safe, scientific, tasty, tastyHunit, text, vector
 }:
@@ -17,6 +19,6 @@ cabal.mkDerivation (self: {
     description = "Run digestive-functors forms against JSON";
     license = self.stdenv.lib.licenses.gpl3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.ocharles ];
+    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/force-layout/default.nix b/pkgs/development/libraries/haskell/force-layout/default.nix
index f0f8ae1399db..09a22c0ac601 100644
--- a/pkgs/development/libraries/haskell/force-layout/default.nix
+++ b/pkgs/development/libraries/haskell/force-layout/default.nix
@@ -13,6 +13,6 @@ cabal.mkDerivation (self: {
     description = "Simple force-directed layout";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.bergey ];
+    maintainers = with self.stdenv.lib.maintainers; [ bergey ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hdaemonize/default.nix b/pkgs/development/libraries/haskell/hdaemonize/default.nix
index f5a67b49626d..1fdca2c4f9aa 100644
--- a/pkgs/development/libraries/haskell/hdaemonize/default.nix
+++ b/pkgs/development/libraries/haskell/hdaemonize/default.nix
@@ -12,6 +12,6 @@ cabal.mkDerivation (self: {
     description = "Library to handle the details of writing daemons for UNIX";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.aycanirican ];
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hweblib/default.nix b/pkgs/development/libraries/haskell/hweblib/default.nix
index 93e0bd622747..1d7d17085dc3 100644
--- a/pkgs/development/libraries/haskell/hweblib/default.nix
+++ b/pkgs/development/libraries/haskell/hweblib/default.nix
@@ -13,6 +13,6 @@ cabal.mkDerivation (self: {
     description = "Haskell Web Library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.aycanirican ];
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })

From 25e0377e5146e138f4ebf7fa5bffabdfcbd2e6c6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Aug 2014 11:49:20 +0200
Subject: [PATCH 0394/1453] haddock-2.14.3: enable test suite

https://github.com/NixOS/cabal2nix/pull/86
---
 pkgs/development/tools/documentation/haddock/2.14.3.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/documentation/haddock/2.14.3.nix b/pkgs/development/tools/documentation/haddock/2.14.3.nix
index a16994b1f2ed..7ce4782bb60c 100644
--- a/pkgs/development/tools/documentation/haddock/2.14.3.nix
+++ b/pkgs/development/tools/documentation/haddock/2.14.3.nix
@@ -12,7 +12,7 @@ cabal.mkDerivation (self: {
   isExecutable = true;
   buildDepends = [ Cabal deepseq filepath ghcPaths xhtml ];
   testDepends = [ Cabal deepseq filepath hspec QuickCheck ];
-  doCheck = false;
+  preCheck = "unset GHC_PACKAGE_PATH";
   meta = {
     homepage = "http://www.haskell.org/haddock/";
     description = "A documentation-generation tool for Haskell libraries";

From 4da69cb7da731b2728edfa11ee758dff8f459b3e Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 24 Aug 2014 02:51:04 -0700
Subject: [PATCH 0395/1453] radvd: Upsate 1.8.1 -> 2.5

---
 pkgs/tools/networking/radvd/default.nix | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/networking/radvd/default.nix b/pkgs/tools/networking/radvd/default.nix
index 14d0d99119dc..e74106ec67f4 100644
--- a/pkgs/tools/networking/radvd/default.nix
+++ b/pkgs/tools/networking/radvd/default.nix
@@ -1,16 +1,20 @@
-{ stdenv, fetchurl, bison, flex }:
+{ stdenv, fetchurl, pkgconfig, libdaemon, bison, flex, check }:
 
 stdenv.mkDerivation rec {
-  name = "radvd-1.8.1";
+  name = "radvd-2.5";
   
   src = fetchurl {
-    url = "http://www.litech.org/radvd/dist/${name}.tar.gz";
-    sha256 = "1sg3halppbz3vwr88lbcdv7mndzwl4nkqnrafkyf2a248wwz2cbc";
+    url = "http://www.litech.org/radvd/dist/${name}.tar.xz";
+    sha256 = "0hsa647l236q9rhrwjb44xqmjfz4fxzcixlbf2chk4lzh8lzwjp0";
   };
 
-  buildInputs = [ bison flex ];
+  buildInputs = [ pkgconfig libdaemon bison flex check ];
 
-  meta.homepage = http://www.litech.org/radvd/;
-  meta.description = "IPv6 Router Advertisement Daemon";
-  meta.platforms = stdenv.lib.platforms.linux;
+  meta = with stdenv.lib; {
+    homepage = http://www.litech.org/radvd/;
+    description = "IPv6 Router Advertisement Daemon";
+    platforms = platforms.linux;
+    license = licenses.bsdOriginal;
+    maintainers = with maintainers; [ wkennington ];
+  };
 }

From aa77fe0fb0f2b6636a57fd2ced4afd6636b4c1e1 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 27 Jun 2014 01:45:04 -0500
Subject: [PATCH 0396/1453] nixos/radvd: Convert to a systemd unit

Additionally, remove the automatic initialization of the ipv6 forwarding
sysctl as this should be handled by the end user. This really should not
be an issue as most people running radvd are likely forwarding ipv6
packets.
---
 nixos/modules/misc/ids.nix                  |  1 +
 nixos/modules/services/networking/radvd.nix | 32 +++++++++++++--------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 98f1b52aba41..99a33f68735c 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -146,6 +146,7 @@
       neo4j = 136;
       riemann = 137;
       riemanndash = 138;
+      radvd = 139;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
diff --git a/nixos/modules/services/networking/radvd.nix b/nixos/modules/services/networking/radvd.nix
index 08762c9c8372..0199502163a3 100644
--- a/nixos/modules/services/networking/radvd.nix
+++ b/nixos/modules/services/networking/radvd.nix
@@ -52,24 +52,32 @@ in
 
   config = mkIf cfg.enable {
 
-    environment.systemPackages = [ pkgs.radvd ];
+    users.extraUsers.radvd =
+      { uid = config.ids.uids.radvd;
+        description = "Router Advertisement Daemon User";
+      };
 
-    jobs.radvd =
+    systemd.services.radvd =
       { description = "IPv6 Router Advertisement Daemon";
 
-        startOn = "started network-interfaces";
+        wantedBy = [ "multi-user.target" ];
 
-        preStart =
-          ''
-            # !!! Radvd only works if IPv6 forwarding is enabled.  But
-            # this should probably be done somewhere else (and not
-            # necessarily for all interfaces).
-            echo 1 > /proc/sys/net/ipv6/conf/all/forwarding
-          '';
+        after = [ "network.target" ];
 
-        exec = "${pkgs.radvd}/sbin/radvd -m syslog -s -C ${confFile}";
+        path = [ pkgs.radvd ];
 
-        daemonType = "fork";
+        preStart = ''
+          mkdir -m 755 -p /run/radvd
+          chown radvd /run/radvd
+        '';
+
+        serviceConfig =
+          { ExecStart = "@${pkgs.radvd}/sbin/radvd radvd"
+              + " -p /run/radvd/radvd.pid -m syslog -u radvd -C ${confFile}";
+            Restart = "always";
+            Type = "forking";
+            PIDFile = "/run/radvd/radvd.pid";
+          };
       };
 
   };

From 72df3f37e55aa1e14733b03482c602114bf56dcd Mon Sep 17 00:00:00 2001
From: Matthew Brown <matt@ederoyd.co.uk>
Date: Sun, 24 Aug 2014 11:17:31 +0100
Subject: [PATCH 0397/1453] Updated definition file as per comments from the
 collaborator

---
 pkgs/servers/search/sphinxsearch/default.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/servers/search/sphinxsearch/default.nix b/pkgs/servers/search/sphinxsearch/default.nix
index 9264ae996098..27bbb91fb186 100644
--- a/pkgs/servers/search/sphinxsearch/default.nix
+++ b/pkgs/servers/search/sphinxsearch/default.nix
@@ -1,12 +1,10 @@
-{ stdenv, fetchurl, pkgconfig, mysql }:
-
-let
-  version = "2.1.9";
+{ stdenv, fetchurl, pkgconfig, mysql,
+  version = "2.1.9",
   mainSrc = fetchurl {
     url = "http://sphinxsearch.com/files/sphinx-${version}-release.tar.gz";
     sha256 = "00vwxf3zr0g1fq9mls1z2rd8nxw74b76pkl1j466lig1qc5am2b2";
-  };
-in
+  }
+}:
 
 stdenv.mkDerivation rec {
   name = "sphinxsearch-${version}";
@@ -22,7 +20,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = {
-    description = "Sphinx is an open source full text search server.";
+    description = "An open source full text search server";
     homepage    = http://sphinxsearch.com;
     license     = stdenv.lib.licenses.gpl2;
     platforms   = stdenv.lib.platforms.all;

From 0f2d1019759b73a01bf6450f8f33c86d958f638a Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Sun, 24 Aug 2014 02:55:45 +0100
Subject: [PATCH 0398/1453] cantata: update to 1.4.0

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

diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix
index 31d5240529f7..015d887a5846 100644
--- a/pkgs/applications/audio/cantata/default.nix
+++ b/pkgs/applications/audio/cantata/default.nix
@@ -39,7 +39,7 @@ assert withOnlineServices -> withTaglib;
 assert withReplaygain -> withTaglib;
 
 let
-  version = "1.3.4";
+  version = "1.4.0";
   pname = "cantata";
   fstat = x: fn: "-DENABLE_" + fn + "=" + (if x then "ON" else "OFF");
   fstats = x: map (fstat x);
@@ -50,8 +50,8 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     inherit name;
-    url = "https://drive.google.com/uc?export=download&id=0Bzghs6gQWi60WTYtaXk3c1IzNVU";
-    sha256 = "0ris41v44nwd68f3zis9n9lyyc089dyhlxp37rrzflanrc6glpwq";
+    url = "https://drive.google.com/uc?export=download&id=0Bzghs6gQWi60WDI1WjRtUDJ4QlU";
+    sha256 = "63a03872ec9a2b212c497d4b10e255d5654f96370734e86420bf711354048e01";
   };
 
   buildInputs =
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional (withTaglib && !withKDE4 && withDevices) udisks2;
 
   unpackPhase = "tar -xvf $src";
-  sourceRoot = "cantata-1.3.4";
+  sourceRoot = "cantata-1.4.0";
 
   # Qt4 is implicit when KDE is switched off.
   cmakeFlags = stdenv.lib.flatten [

From 0263a8f86064a9d02e8b4eb8fa8839dfec2b087f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 24 Aug 2014 12:27:32 +0200
Subject: [PATCH 0399/1453] NixOS containers: Use exit status 133 for reboots

---
 nixos/modules/virtualisation/containers.nix | 5 ++++-
 pkgs/top-level/all-packages.nix             | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 292b96e6eb24..ca3de4089d24 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -267,9 +267,12 @@ in
 
           NotifyAccess = "all";
 
-          # Note that on reboot, systemd-nspawn returns 10, so this
+          # Note that on reboot, systemd-nspawn returns 133, so this
           # unit will be restarted. On poweroff, it returns 0, so the
           # unit won't be restarted.
+          RestartForceExitStatus = "133";
+          SuccessExitStatus = "133";
+
           Restart = "on-failure";
 
           # Hack: we don't want to kill systemd-nspawn, since we call
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a4f275e3c6e9..e2f11d0b135e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7785,6 +7785,10 @@ let
     linuxHeaders = linuxHeaders_3_14;
   };
 
+  systemd_test = callPackage ../os-specific/linux/systemd/test.nix {
+    linuxHeaders = linuxHeaders_3_14;
+  };
+
   systemtap = callPackage ../development/tools/profiling/systemtap {
     inherit (gnome) libglademm;
   };

From 61a5054953297ef12fd2a1cd843e32016d1ca249 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: Sun, 24 Aug 2014 11:33:19 +0100
Subject: [PATCH 0400/1453] New Haskell package: network-fancy

---
 .../libraries/haskell/network-fancy/default.nix    | 14 ++++++++++++++
 pkgs/top-level/haskell-packages.nix                |  2 ++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/network-fancy/default.nix

diff --git a/pkgs/development/libraries/haskell/network-fancy/default.nix b/pkgs/development/libraries/haskell/network-fancy/default.nix
new file mode 100644
index 000000000000..8e0cf7578345
--- /dev/null
+++ b/pkgs/development/libraries/haskell/network-fancy/default.nix
@@ -0,0 +1,14 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "network-fancy";
+  version = "0.1.5.2";
+  sha256 = "039yrrir17sphkzarwl7hncj7fb4x471mh2lvpqixl3a6nij141c";
+  meta = {
+    homepage = "http://github.com/taruti/network-fancy";
+    description = "Networking support with a cleaner API";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+  preConfigure = ''substituteInPlace Setup.hs --replace '-> rt' '-> return ()' '';
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 7f0946e8c271..4c4de9165126 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1714,6 +1714,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   networkConduit = callPackage ../development/libraries/haskell/network-conduit {};
   networkConduitTls = callPackage ../development/libraries/haskell/network-conduit-tls {};
 
+  networkFancy = callPackage ../development/libraries/haskell/network-fancy {};
+
   networkInfo = callPackage ../development/libraries/haskell/network-info {};
 
   networkMetrics = callPackage ../development/libraries/haskell/network-metrics {};

From 6949e24366586289f5b611da3f660b408776a865 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 12 Aug 2014 21:27:00 +0200
Subject: [PATCH 0401/1453] nixos: add fail2ban to module-list.nix

Now that the fail2ban service has the ".enable" option, I think it's
time to add it to the module list, so that we can enable it in
configuration.nix like this:

  services.fail2ban.enable = true;
---
 nixos/modules/module-list.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index c45fa3e3f058..59c69f060b9a 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -257,6 +257,7 @@
   ./services/search/elasticsearch.nix
   ./services/search/solr.nix
   ./services/security/clamav.nix
+  ./services/security/fail2ban.nix
   ./services/security/fprot.nix
   ./services/security/frandom.nix
   ./services/security/haveged.nix

From 93106b319ba1081410e1e148bd702b61a17badce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sun, 24 Aug 2014 15:11:22 +0200
Subject: [PATCH 0402/1453] ffado: update from 2.1.0 to 2.2.1

---
 pkgs/os-specific/linux/ffado/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix
index e024a608a0b6..dc8d7b3d7933 100644
--- a/pkgs/os-specific/linux/ffado/default.nix
+++ b/pkgs/os-specific/linux/ffado/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "libffado-${version}";
-  version = "2.1.0";
+  version = "2.2.1";
 
   src = fetchurl {
     url = "http://www.ffado.org/files/${name}.tgz";
-    sha256 = "11cxmy31c19720j2171l735rpg7l8i41icsgqscfd2vkbscfmh6y";
+    sha256 = "1ximic90l0av91njb123ra2zp6mg23yg5iz8xa5371cqrn79nacz";
   };
 
   buildInputs =

From b743dd393aa141435feeaf262316306680086ed6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sun, 24 Aug 2014 15:18:08 +0200
Subject: [PATCH 0403/1453] keymon: update from 1.16 to 1.17

---
 pkgs/applications/video/key-mon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/key-mon/default.nix b/pkgs/applications/video/key-mon/default.nix
index cb00ac813842..57c8ca574b41 100644
--- a/pkgs/applications/video/key-mon/default.nix
+++ b/pkgs/applications/video/key-mon/default.nix
@@ -3,12 +3,12 @@
 
 buildPythonPackage rec {
   name = "key-mon-${version}";
-  version = "1.16";
+  version = "1.17";
   namePrefix = "";
 
   src = fetchurl {
     url = "http://key-mon.googlecode.com/files/${name}.tar.gz";
-    sha256 = "1pfki1fyh3q29sj6kq1chhi1h2v9ki6sp09qyww59rjraypvzsis";
+    sha256 = "1liz0dxcqmchbnl1xhlxkqm3gh76wz9jxdxn9pa7dy77fnrjkl5q";
   };
 
   propagatedBuildInputs =

From 4203cdec22f527acddcf1930b7da7a37cbcce95d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sun, 24 Aug 2014 15:19:08 +0200
Subject: [PATCH 0404/1453] xf86_input_wacom: update from 0.25.0 to 0.25.99.1

---
 pkgs/os-specific/linux/xf86-input-wacom/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix
index d4786037b5af..962aca777532 100644
--- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix
+++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix
@@ -3,11 +3,11 @@
 , ncurses, pkgconfig, randrproto, xorgserver, xproto, udev, libXinerama, pixman }:
 
 stdenv.mkDerivation rec {
-  name = "xf86-input-wacom-0.25.0";
+  name = "xf86-input-wacom-0.25.99.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/linuxwacom/${name}.tar.bz2";
-    sha256 = "06kwcxmgja0xwc5glzwmxm237bsv9fk52k2d6ffq4naqfzn2k31k";
+    sha256 = "0vjl4m1w6j5j9yr2kw6f66n723ghq5jwxivbdjmacjw6r3ml4l9r";
   };
 
   buildInputs = [ inputproto libX11 libXext libXi libXrandr libXrender

From 3529af087ae4d36185845f415479e69c22fd2657 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sun, 24 Aug 2014 15:21:09 +0200
Subject: [PATCH 0405/1453] movit: update from 1.1.1 to 1.1.2

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

diff --git a/pkgs/development/libraries/movit/default.nix b/pkgs/development/libraries/movit/default.nix
index bfd474c88e71..88f18003977b 100644
--- a/pkgs/development/libraries/movit/default.nix
+++ b/pkgs/development/libraries/movit/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "movit-${version}";
-  version = "1.1.1";
+  version = "1.1.2";
 
   src = fetchurl {
     url = "http://movit.sesse.net/${name}.tar.gz";
-    sha256 = "1k3qbkxapcplpsx22xh4m4ccp9fhsjfcj3pjzbcnrc51103aklag";
+    sha256 = "0jka9l3cx7q09rpz5x6rv6ii8kbgm2vc419gx2rb9rc8sl81hzj1";
   };
 
   GTEST_DIR = "${gtest}";

From c77fde78100b9a92c173a5744467edd24a872e2e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 24 Aug 2014 15:25:19 +0200
Subject: [PATCH 0406/1453] yelp: Fix description

---
 pkgs/desktops/gnome-3/3.10/core/yelp/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/3.10/core/yelp/default.nix b/pkgs/desktops/gnome-3/3.10/core/yelp/default.nix
index b58aa99721e2..983e7f416a6d 100644
--- a/pkgs/desktops/gnome-3/3.10/core/yelp/default.nix
+++ b/pkgs/desktops/gnome-3/3.10/core/yelp/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Yelp;
-    description = "Yelp is the help viewer in Gnome.";
+    description = "The Gnome help viewer";
     maintainers = with maintainers; [ lethalman ];
     license = licenses.gpl2;
     platforms = platforms.linux;

From 9237e86d9979e6e6d510bade6ab87f5707c54ffc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 24 Aug 2014 15:55:12 +0200
Subject: [PATCH 0407/1453] Doh

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e2f11d0b135e..a4f275e3c6e9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7785,10 +7785,6 @@ let
     linuxHeaders = linuxHeaders_3_14;
   };
 
-  systemd_test = callPackage ../os-specific/linux/systemd/test.nix {
-    linuxHeaders = linuxHeaders_3_14;
-  };
-
   systemtap = callPackage ../development/tools/profiling/systemtap {
     inherit (gnome) libglademm;
   };

From fc5f6e4e79b42922cb6cd06986dd30b14edca156 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 24 Aug 2014 12:52:07 +0200
Subject: [PATCH 0408/1453] tarball fixes

---
 pkgs/development/compilers/julia/0.3.0.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/compilers/julia/0.3.0.nix b/pkgs/development/compilers/julia/0.3.0.nix
index 82d7eda1d260..3259fee55bfc 100644
--- a/pkgs/development/compilers/julia/0.3.0.nix
+++ b/pkgs/development/compilers/julia/0.3.0.nix
@@ -3,6 +3,9 @@
  , ncurses, libunistring, lighttpd, patchelf, openblas, liblapack
  , tcl, tk, xproto, libX11, git, mpfr, which
  } :
+
+assert stdenv.isLinux; 
+
 let
   realGcc = stdenv.gcc.gcc;
 in

From 47673e43c9d6d1141380c1be7974c064282a4e87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 24 Aug 2014 16:01:21 +0200
Subject: [PATCH 0409/1453] buildPythonPackage: introduce "disabled" argument

Useful to disable the package for specific python versions.

Typically usage: disable = isPy3k;
---
 pkgs/development/python-modules/generic/default.nix | 7 ++++++-
 pkgs/top-level/python-packages.nix                  | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix
index 75fb974e7355..0f5d84994541 100644
--- a/pkgs/development/python-modules/generic/default.nix
+++ b/pkgs/development/python-modules/generic/default.nix
@@ -34,7 +34,10 @@
 # The difference is that `pythonPath' is not propagated to the user
 # environment.  This is preferrable for programs because it doesn't
 # pollute the user environment.
-,  pythonPath ? []
+, pythonPath ? []
+
+# used to disable derivation, useful for specific python versions
+, disabled ? false
 
 , meta ? {}
 
@@ -46,6 +49,8 @@
 
 , ... } @ attrs:
 
+assert (!disabled);
+
 # Keep extra attributes from `attrs`, e.g., `patchPhase', etc.
 python.stdenv.mkDerivation (attrs // {
   inherit doCheck;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9d3ef800f550..61aa8162f93a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7,6 +7,7 @@ let
   isPy33 = python.majorVersion == "3.3";
   isPy34 = python.majorVersion == "3.4";
   isPyPy = python.executable == "pypy";
+  isPy3k = strings.substring 0 1 python.majorVersion == "3";
 
   # Unique python version identifier
   pythonName =
@@ -537,6 +538,8 @@ rec {
   avro = buildPythonPackage (rec {
     name = "avro-1.7.6";
 
+    disabled = isPy3k;
+    
     src = fetchurl {
       url = "https://pypi.python.org/packages/source/a/avro/${name}.tar.gz";
       md5 = "7f4893205e5ad69ac86f6b44efb7df72";
@@ -550,7 +553,9 @@ rec {
 
   avro3k = pkgs.lowPrio (buildPythonPackage (rec {
     name = "avro3k-1.7.7-SNAPSHOT";
-
+    
+    disabled = (!isPy3k);
+    
     src = fetchurl {
       url = "https://pypi.python.org/packages/source/a/avro3k/${name}.tar.gz";
       sha256 = "15ahl0irwwj558s964abdxg4vp6iwlabri7klsm2am6q5r0ngsky";

From a272e855a339361ae88c9f43a2f4019acf6b42f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 24 Aug 2014 16:07:14 +0200
Subject: [PATCH 0410/1453] pythonPackages.pg8000: 1.09 -> 1.9.14

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 61aa8162f93a..3c6a7388e00f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5406,11 +5406,11 @@ rec {
 
 
   pg8000 = buildPythonPackage rec {
-    name = "pg8000-1.09";
+    name = "pg8000-1.9.14";
 
     src = fetchurl {
-      url = "http://pg8000.googlecode.com/files/${name}.zip";
-      sha256 = "0kdc4rg47k1qkq22inghd50xlxjdkfcilym8mxff8wy4h091xykw";
+      url = "http://pypi.python.org/packages/source/p/pg8000/${name}.tar.gz";
+      sha256 = "1vandvfaf1m3a1fbc7nbm6syfqr9bazhzsnmai0jpjkbmb349izs";
     };
 
     propagatedBuildInputs = [ pytz ];

From 6418007dabe7d3d2e5775d68b46956b1c3f20e27 Mon Sep 17 00:00:00 2001
From: Georges Dubus <georges.dubus@compiletoi.net>
Date: Sun, 24 Aug 2014 14:17:17 +0200
Subject: [PATCH 0411/1453] nixbang: add expession

---
 .../tools/misc/nixbang/default.nix            | 20 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/tools/misc/nixbang/default.nix

diff --git a/pkgs/development/tools/misc/nixbang/default.nix b/pkgs/development/tools/misc/nixbang/default.nix
new file mode 100644
index 000000000000..762e6f2c4db6
--- /dev/null
+++ b/pkgs/development/tools/misc/nixbang/default.nix
@@ -0,0 +1,20 @@
+{ lib, pythonPackages, fetchgit }:
+
+let version = "0.1.1"; in
+pythonPackages.buildPythonPackage {
+  name = "nixbang-${version}";
+  namePrefix = "";
+
+  src = fetchgit {
+    url = "git://github.com/madjar/nixbang.git";
+    rev = "refs/tags/${version}";
+    sha256 = "1n8jq32r2lzk3g0d95ksfq7vdqciz34jabribrr4hcnz4nlijshf";
+  };
+
+  meta = {
+    homepage = https://github.com/madjar/nixbang;
+    description = "A special shebang to run scripts in a nix-shell";
+    maintainers = [ lib.maintainers.madjar ];
+    platforms = lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4f05d5240744..ebfd4715d4b3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4088,6 +4088,10 @@ let
 
   ninja = callPackage ../development/tools/build-managers/ninja { };
 
+  nixbang = callPackage ../development/tools/misc/nixbang {
+      pythonPackages = python3Packages;
+  };
+
   node_webkit = callPackage ../development/tools/node-webkit {
     gconf = pkgs.gnome.GConf;
   };

From 46afdaf78384ef44107dfc67ad761796bef47f2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 24 Aug 2014 16:19:53 +0200
Subject: [PATCH 0412/1453] pythonPackages.iptools: 0.4.0 -> 0.6.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3c6a7388e00f..43a5017bf9ca 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3857,13 +3857,15 @@ rec {
   }) else null;
 
   iptools = buildPythonPackage rec {
-    version = "0.4.0";
+    version = "0.6.1";
     name = "iptools-${version}";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/i/iptools/iptools-${version}.tar.gz";
-      md5 = "de60e5fab861f29dbf5f4446f8576532";
+      md5 = "aed4045638fd40c16f8d9bb04606f700";
     };
+    
+    buildInputs = [ nose ];
 
     meta = {
       description = "Utilities for manipulating IP addresses including a class that can be used to include CIDR network blocks in Django's INTERNAL_IPS setting.";

From f002a27a8057c9b17ba67d1218ef25cff37c1147 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 24 Aug 2014 16:34:53 +0200
Subject: [PATCH 0413/1453] Remove obsolete directory

---
 nixos/doc/config-examples/basic.nix           | 21 -----------
 .../closed-install-configuration.nix          | 32 -----------------
 nixos/doc/config-examples/root-on-lvm.nix     | 27 --------------
 nixos/doc/config-examples/svn-server.nix      | 36 -------------------
 nixos/doc/config-examples/x86_64-usbstick.nix | 20 -----------
 5 files changed, 136 deletions(-)
 delete mode 100644 nixos/doc/config-examples/basic.nix
 delete mode 100644 nixos/doc/config-examples/closed-install-configuration.nix
 delete mode 100644 nixos/doc/config-examples/root-on-lvm.nix
 delete mode 100644 nixos/doc/config-examples/svn-server.nix
 delete mode 100644 nixos/doc/config-examples/x86_64-usbstick.nix

diff --git a/nixos/doc/config-examples/basic.nix b/nixos/doc/config-examples/basic.nix
deleted file mode 100644
index da37cfb8c286..000000000000
--- a/nixos/doc/config-examples/basic.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  boot = {
-    loader.grub.device = "/dev/sda";
-  };
-
-  fileSystems = [
-    { mountPoint = "/";
-      device = "/dev/sda1";
-    }
-  ];
-
-  swapDevices = [
-    { device = "/dev/sdb1"; }
-  ];
-
-  services = {
-    openssh = {
-      enable = true;
-    };
-  };
-}
diff --git a/nixos/doc/config-examples/closed-install-configuration.nix b/nixos/doc/config-examples/closed-install-configuration.nix
deleted file mode 100644
index 0cebacdb0ccd..000000000000
--- a/nixos/doc/config-examples/closed-install-configuration.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  boot = {
-    loader.grub.device = "/dev/sda";
-    copyKernels = true;
-    bootMount = "(hd0,0)";
-  };
-
-  fileSystems = [
-    { mountPoint = "/";
-      device = "/dev/sda3";
-    }
-    { mountPoint = "/boot";
-      device = "/dev/sda1";
-      neededForBoot = true;
-    }
-  ];
-
-  swapDevices = [
-    { device = "/dev/sda2"; }
-  ];
-
-  services = {
-    sshd = {
-      enable = true;
-    };
-  };
-
-  fonts = {
-    enableFontConfig = false;
-  };
-
-}
diff --git a/nixos/doc/config-examples/root-on-lvm.nix b/nixos/doc/config-examples/root-on-lvm.nix
deleted file mode 100644
index 2ea1e547921f..000000000000
--- a/nixos/doc/config-examples/root-on-lvm.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# This configuration has / on a LVM volume.  Since Grub
-# doesn't know about LVM, a separate /boot is therefore
-# needed.
-#
-# In this example, labels are used for file systems and
-# swap devices: "boot" might be /dev/sda1, "root" might be
-# /dev/my-volume-group/root, and "swap" might be /dev/sda2.
-# In particular there is no specific reference to the fact
-# that / is on LVM; that's figured out automatically.
-
-{
-  boot.loader.grub.device = "/dev/sda";
-  boot.initrd.kernelModules = ["ata_piix"];
-
-  fileSystems = [
-    { mountPoint = "/";
-      label = "root";
-    }
-    { mountPoint = "/boot";
-      label = "boot";
-    }
-  ];
-
-  swapDevices = [
-    { label = "swap"; }
-  ];
-}
diff --git a/nixos/doc/config-examples/svn-server.nix b/nixos/doc/config-examples/svn-server.nix
deleted file mode 100644
index e727007117b1..000000000000
--- a/nixos/doc/config-examples/svn-server.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  boot = {
-    loader.grub.device = "/dev/sda";
-  };
-
-  fileSystems = [
-    { mountPoint = "/";
-      device = "/dev/sda1";
-    }
-  ];
-
-  services = {
-
-    sshd = {
-      enable = true;
-    };
-
-    httpd = {
-      enable = true;
-      adminAddr = "admin@example.org";
-
-      subservices = {
-
-        subversion = {
-          enable = true;
-          dataDir = "/data/subversion";
-          notificationSender = "svn@example.org";
-        };
-
-      };
-
-    };
-
-  };
-
-}
diff --git a/nixos/doc/config-examples/x86_64-usbstick.nix b/nixos/doc/config-examples/x86_64-usbstick.nix
deleted file mode 100644
index 374d3ba3bc74..000000000000
--- a/nixos/doc/config-examples/x86_64-usbstick.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# Configuration file used to install NixOS-x86_64 on a USB stick.
-
-{
-  boot = {
-    loader.grub.device = "/dev/sda";
-    initrd = {
-      kernelModules = ["usb_storage" "ehci_hcd" "ohci_hcd"];
-    };
-  };
-
-  fileSystems = [
-    { mountPoint = "/";
-      label = "nixos-usb";
-    }
-  ];
-
-  fonts = {
-    enableFontConfig = false;
-  };
-}

From de258456d8ad6a157c4924f4dd14a97886f9837a Mon Sep 17 00:00:00 2001
From: Jaka Kranjc <smgl@lynxlynx.info>
Date: Sun, 24 Aug 2014 16:36:46 +0200
Subject: [PATCH 0414/1453] meta.xml: fixed small omission

---
 doc/meta.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/meta.xml b/doc/meta.xml
index 3a6b0b105d2e..e91f94d15c24 100644
--- a/doc/meta.xml
+++ b/doc/meta.xml
@@ -27,7 +27,7 @@ meta = {
 
 <para>Meta-attributes are not passed to the builder of the package.
 Thus, a change to a meta-attribute doesn’t trigger a recompilation of
-the package.  The value of a meta-attribute must a string.</para>
+the package.  The value of a meta-attribute must be a string.</para>
 
 <para>The meta-attributes of a package can be queried from the
 command-line using <command>nix-env</command>:

From ecb77869d2ac2f40252cd6d8839a8bfbf32eb2d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 24 Aug 2014 16:53:52 +0200
Subject: [PATCH 0415/1453] pythonPackages.pil: put it inside
 python-packages.nix and disable on py3k

---
 .../python-modules/pil/default.nix            | 45 -----------------
 pkgs/top-level/python-packages.nix            | 50 ++++++++++++++++---
 2 files changed, 44 insertions(+), 51 deletions(-)
 delete mode 100644 pkgs/development/python-modules/pil/default.nix

diff --git a/pkgs/development/python-modules/pil/default.nix b/pkgs/development/python-modules/pil/default.nix
deleted file mode 100644
index e9375d1daad2..000000000000
--- a/pkgs/development/python-modules/pil/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ fetchurl, stdenv, python, buildPythonPackage, libjpeg, zlib, freetype }:
-
-let version = "1.1.7"; in
-
-buildPythonPackage {
-  name = "imaging-${version}";
-  
-  src = fetchurl {
-    url = "http://effbot.org/downloads/Imaging-${version}.tar.gz";
-    sha256 = "04aj80jhfbmxqzvmq40zfi4z3cw6vi01m3wkk6diz3lc971cfnw9";
-  };
-
-  buildInputs = [ python libjpeg zlib freetype ];
-
-  doCheck = true;
-
-  preConfigure = ''
-    sed -i "setup.py" \
-        -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = libinclude("${freetype}")|g ;
-            s|^JPEG_ROOT =.*$|JPEG_ROOT = libinclude("${libjpeg}")|g ;
-            s|^ZLIB_ROOT =.*$|ZLIB_ROOT = libinclude("${zlib}")|g ;'
-  '';
-
-  checkPhase   = "${python}/bin/${python.executable} selftest.py";
-  buildPhase   = "${python}/bin/${python.executable} setup.py build_ext -i";
-
-  postInstall = ''
-    cd "$out"/lib/python*/site-packages
-    ln -s $PWD PIL
-  '';
-
-  meta = {
-    homepage = http://www.pythonware.com/products/pil/;
-    description = "The Python Imaging Library (PIL)";
-
-    longDescription = ''
-      The Python Imaging Library (PIL) adds image processing
-      capabilities to your Python interpreter.  This library
-      supports many file formats, and provides powerful image
-      processing and graphics capabilities.
-    '';
-
-    license = "http://www.pythonware.com/products/pil/license.htm";
-  };
-}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 43a5017bf9ca..25810d0358a4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -28,7 +28,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
 # Python packages for all python versions
 rec {
 
-  inherit python isPy26 isPy27 isPy33 isPy34 isPyPy pythonName;
+  inherit python isPy26 isPy27 isPy33 isPy34 isPyPy isPy3k pythonName;
   inherit (pkgs) fetchurl fetchsvn fetchgit stdenv unzip;
 
   # helpers
@@ -112,11 +112,6 @@ rec {
   # version of nixpart.
   nixpart0 = nixpart;
 
-  pil = import ../development/python-modules/pil {
-    inherit (pkgs) fetchurl stdenv libjpeg zlib freetype;
-    inherit python buildPythonPackage;
-  };
-
   pitz = import ../applications/misc/pitz {
     inherit (pkgs) stdenv fetchurl;
     inherit buildPythonPackage tempita jinja2 pyyaml clepy mock nose decorator docutils;
@@ -5447,6 +5442,49 @@ rec {
 
     propagatedBuildInputs = [ unittest2 ];
   };
+  
+  pil = buildPythonPackage rec {
+    name = "PIL-${version}";
+    version = "1.1.7";
+    
+    src = fetchurl {
+      url = "http://effbot.org/downloads/Imaging-${version}.tar.gz";
+      sha256 = "04aj80jhfbmxqzvmq40zfi4z3cw6vi01m3wkk6diz3lc971cfnw9";
+    };
+  
+    buildInputs = [ python pkgs.libjpeg pkgs.zlib pkgs.freetype ];
+  
+    disabled = isPy3k;
+  
+    doCheck = true;
+  
+    preConfigure = ''
+      sed -i "setup.py" \
+          -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = libinclude("${pkgs.freetype}")|g ;
+              s|^JPEG_ROOT =.*$|JPEG_ROOT = libinclude("${pkgs.libjpeg}")|g ;
+              s|^ZLIB_ROOT =.*$|ZLIB_ROOT = libinclude("${pkgs.zlib}")|g ;'
+    '';
+  
+    checkPhase   = "${python}/bin/${python.executable} selftest.py";
+    buildPhase   = "${python}/bin/${python.executable} setup.py build_ext -i";
+  
+    postInstall = ''
+      cd "$out"/lib/python*/site-packages
+      ln -s $PWD PIL
+    '';
+  
+    meta = {
+      homepage = http://www.pythonware.com/products/pil/;
+      description = "The Python Imaging Library (PIL)";
+      longDescription = ''
+        The Python Imaging Library (PIL) adds image processing
+        capabilities to your Python interpreter.  This library
+        supports many file formats, and provides powerful image
+        processing and graphics capabilities.
+      '';
+      license = "http://www.pythonware.com/products/pil/license.htm";
+    };
+  };
 
 
   pillow = buildPythonPackage rec {

From 3eedd29fb89169aa946a57251444eb0d45f05bf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 24 Aug 2014 16:55:08 +0200
Subject: [PATCH 0416/1453] pythonPackages.manuel: 1.6.1 -> 1.8.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 25810d0358a4..1aa990bf1512 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4251,11 +4251,11 @@ rec {
 
   manuel = buildPythonPackage rec {
     name = "manuel-${version}";
-    version = "1.6.1";
+    version = "1.8.0";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/m/manuel/${name}.tar.gz";
-      sha256 = "1h35ys31zkjd9jssqn9lzwmw8s17ikr4jn2xp5zby1v771ibbbqr";
+      sha256 = "1diyj6a8bvz2cdf9m0g2bbx9z2yjjnn3ylbg1zinpcjj6vldfx59";
     };
 
     propagatedBuildInputs = [ six zope_testing ];

From d3b9a14e884a80ee2c32fb63c3ac431a969faea6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 24 Aug 2014 16:57:50 +0200
Subject: [PATCH 0417/1453] python3Packages.afew: fix build

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1aa990bf1512..80379325ebc8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -255,9 +255,8 @@ rec {
 
     propagatedBuildInputs = [
       pythonPackages.notmuch
-      pythonPackages.subprocess32
       pythonPackages.chardet
-    ];
+    ] ++ optional (!isPy3k) pythonPackages.subprocess32;
 
     doCheck = false;
 

From 8edee2cd477e77bbdd03eaac5005ef6b742b5236 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 24 Aug 2014 17:00:17 +0200
Subject: [PATCH 0418/1453] python3Packages.autopep8: fix build

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 80379325ebc8..60593ca3784d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -507,11 +507,11 @@ rec {
   });
 
   autopep8 = buildPythonPackage (rec {
-    name = "autopep8-1.0";
+    name = "autopep8-1.0.3";
 
     src = fetchurl {
       url = "https://pypi.python.org/packages/source/a/autopep8/${name}.tar.gz";
-      md5 = "41782e66efcbaf9d761bb45a2d2929bb";
+      md5 = "7c16d385cf9ad7c1d7fbcfcea2588a56";
     };
 
     propagatedBuildInputs = [ pep8 ];

From 8dc216a768029ace1a772765847835b209bd6eb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 24 Aug 2014 17:04:31 +0200
Subject: [PATCH 0419/1453] pythonPackages.beaker: disable on py3k

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 60593ca3784d..ef38fe02cb68 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -634,6 +634,8 @@ rec {
 
   beaker = buildPythonPackage rec {
     name = "Beaker-1.6.4";
+    
+    disabled = isPy3k;
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/B/Beaker/${name}.tar.gz";

From 0a4b70e5b7cf86d837488e38399800f2cc411582 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 24 Aug 2014 17:07:10 +0200
Subject: [PATCH 0420/1453] pythonPackages.eventlet: 0.9.16 -> 0.15.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ef38fe02cb68..b4974e008540 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3173,11 +3173,11 @@ rec {
 
 
   eventlet = buildPythonPackage rec {
-    name = "eventlet-0.9.16";
+    name = "eventlet-0.15.1";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/e/eventlet/${name}.tar.gz";
-      md5 = "4728e3bd7f72763c1e5dccac0296f8ea";
+      md5 = "7155780824bb6344651a573838416f21";
     };
 
     buildInputs = [ nose httplib2  ];

From 2bc609155d31d214b21a509956504a83d184502b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 24 Aug 2014 17:07:25 +0200
Subject: [PATCH 0421/1453] pythonPackages.greenlet: 0.3.1 -> 0.4.3

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b4974e008540..95126fe40b9e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3631,11 +3631,11 @@ rec {
   };
 
   greenlet = buildPythonPackage rec {
-    name = "greenlet-0.3.1";
+    name = "greenlet-0.4.3";
 
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/g/greenlet/${name}.tar.gz";
-      md5 = "8d75d7f3f659e915e286e1b0fa0e1c4d";
+      url = "http://pypi.python.org/packages/source/g/greenlet/${name}.zip";
+      md5 = "a5e467a5876c415cd357c1ab9027e06c";
     };
 
     meta = {

From 9c5236f7ca0a68902c1bbe54e6335bde70bddcd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 24 Aug 2014 17:09:13 +0200
Subject: [PATCH 0422/1453] pythonPackages.tarman: disable for py3k

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 95126fe40b9e..b66bbbb235ec 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9286,6 +9286,8 @@ rec {
   tarman = buildPythonPackage rec {
     version = "0.1.3";
     name = "tarman-${version}";
+    
+    disabled = isPy3k;
 
     src = fetchurl {
       url = "https://pypi.python.org/packages/source/t/tarman/tarman-${version}.zip";

From 8a445f923710ff1a4885c268a16cb931e3b639f0 Mon Sep 17 00:00:00 2001
From: Gergely Risko <errge@nilcons.com>
Date: Sat, 23 Aug 2014 20:34:01 +0200
Subject: [PATCH 0423/1453] Refactor fetchurl handling in stdenvLinux

All the different stages of stdenv had the fetchurl inherited anyways,
so make this generic in stdenvBootFun.

This commit doesn't change the outhash (or drvhash) of the stdenv.
---
 pkgs/stdenv/linux/default.nix | 29 ++++++++++-------------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 23cccf223f4f..71b23a396d9a 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -46,7 +46,7 @@ rec {
     builder = bootstrapFiles.sh;
 
     args =
-      if system == "armv5tel-linux" || system == "armv6l-linux" 
+      if system == "armv5tel-linux" || system == "armv6l-linux"
         || system == "armv7l-linux"
       then [ ./scripts/unpack-bootstrap-tools-arm.sh ]
       else [ ./scripts/unpack-bootstrap-tools.sh ];
@@ -69,9 +69,9 @@ rec {
   # This function builds the various standard environments used during
   # the bootstrap.
   stdenvBootFun =
-    {gcc, extraAttrs ? {}, overrides ? (pkgs: {}), extraPath ? [], fetchurl}:
+    {gcc, extraAttrs ? {}, overrides ? (pkgs: {}), extraPath ? []}:
 
-    import ../generic {
+    let thisStdenv = import ../generic {
       inherit system config;
       name = "stdenv-linux-boot";
       preHook =
@@ -83,27 +83,22 @@ rec {
         '';
       shell = "${bootstrapTools}/bin/sh";
       initialPath = [bootstrapTools] ++ extraPath;
-      fetchurlBoot = fetchurl;
+      fetchurlBoot = import ../../build-support/fetchurl {
+        stdenv = stdenvLinuxBoot0;
+        curl = bootstrapTools;
+      };
       inherit gcc;
       # Having the proper 'platform' in all the stdenvs allows getting proper
       # linuxHeaders for example.
       extraAttrs = extraAttrs // { inherit platform; };
-      overrides = pkgs: (overrides pkgs) // {
-        inherit fetchurl;
-      };
+      overrides = pkgs: (overrides pkgs) // { fetchurl = thisStdenv.fetchurlBoot; };
     };
+    in thisStdenv;
 
   # Build a dummy stdenv with no GCC or working fetchurl.  This is
   # because we need a stdenv to build the GCC wrapper and fetchurl.
   stdenvLinuxBoot0 = stdenvBootFun {
     gcc = "/no-such-path";
-    fetchurl = null;
-  };
-
-
-  fetchurl = import ../../build-support/fetchurl {
-    stdenv = stdenvLinuxBoot0;
-    curl = bootstrapTools;
   };
 
 
@@ -142,7 +137,6 @@ rec {
       binutils = bootstrapTools;
       coreutils = bootstrapTools;
     };
-    inherit fetchurl;
   };
 
 
@@ -168,7 +162,6 @@ rec {
     overrides = pkgs: {
       inherit (stdenvLinuxBoot1Pkgs) perl;
     };
-    inherit fetchurl;
   };
 
 
@@ -211,7 +204,6 @@ rec {
       glibc = stdenvLinuxGlibc;   # Required by gcc47 build
     };
     extraPath = [ stdenvLinuxBoot1Pkgs.paxctl ];
-    inherit fetchurl;
   };
 
 
@@ -238,7 +230,6 @@ rec {
       inherit (stdenvLinuxBoot1Pkgs) perl;
       inherit (stdenvLinuxBoot3Pkgs) gettext gnum4 gmp;
     };
-    inherit fetchurl;
   };
 
 
@@ -281,7 +272,7 @@ rec {
 
     shell = stdenvLinuxBoot4Pkgs.bash + "/bin/bash";
 
-    fetchurlBoot = fetchurl;
+    fetchurlBoot = stdenvLinuxBoot0.fetchurlBoot;
 
     extraAttrs = {
       inherit (stdenvLinuxBoot3Pkgs) glibc;

From d73025a5fe56e765bcb82c0f3740958debeaf3ce Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 24 Aug 2014 17:08:55 +0200
Subject: [PATCH 0424/1453] Enable systemd's mymachines NSS module

It makes every local container registered with machined resolvable.
---
 nixos/modules/config/nsswitch.nix      | 42 ++++++++++++--------------
 nixos/modules/services/system/nscd.nix |  2 +-
 2 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/nixos/modules/config/nsswitch.nix b/nixos/modules/config/nsswitch.nix
index 45695d9cb89f..549e731f3b08 100644
--- a/nixos/modules/config/nsswitch.nix
+++ b/nixos/modules/config/nsswitch.nix
@@ -35,29 +35,27 @@ in
 
   config = {
 
-    environment.etc =
-      [ # Name Service Switch configuration file.  Required by the C library.
-        # !!! Factor out the mdns stuff.  The avahi module should define
-        # an option used by this module.
-        { source = pkgs.writeText "nsswitch.conf"
-            ''
-              passwd:    files ldap
-              group:     files ldap
-              shadow:    files ldap
-              hosts:     files ${optionalString nssmdns "mdns_minimal [NOTFOUND=return]"} dns ${optionalString nssmdns "mdns"} ${optionalString nsswins "wins"} myhostname
-              networks:  files dns
-              ethers:    files
-              services:  files
-              protocols: files
-            '';
-          target = "nsswitch.conf";
-        }
-      ];
+    # Name Service Switch configuration file.  Required by the C
+    # library.  !!! Factor out the mdns stuff.  The avahi module
+    # should define an option used by this module.
+    environment.etc."nsswitch.conf".text =
+      ''
+        passwd:    files ldap
+        group:     files ldap
+        shadow:    files ldap
+        hosts:     files ${optionalString nssmdns "mdns_minimal [NOTFOUND=return]"} dns ${optionalString nssmdns "mdns"} ${optionalString nsswins "wins"} myhostname mymachines
+        networks:  files dns
+        ethers:    files
+        services:  files
+        protocols: files
+      '';
 
-    # Use nss-myhostname to ensure that our hostname always resolves to
-    # a valid IP address.  It returns all locally configured IP
-    # addresses, or ::1 and 127.0.0.2 as fallbacks.
-    system.nssModules = [ pkgs.systemd ];
+    # Systemd provides nss-myhostname to ensure that our hostname
+    # always resolves to a valid IP address.  It returns all locally
+    # configured IP addresses, or ::1 and 127.0.0.2 as
+    # fallbacks. Systemd also provides nss-mymachines to return IP
+    # addresses of local containers.
+    system.nssModules = [ config.systemd.package ];
 
   };
 }
diff --git a/nixos/modules/services/system/nscd.nix b/nixos/modules/services/system/nscd.nix
index 5460e962ea2c..0879d9b85bd8 100644
--- a/nixos/modules/services/system/nscd.nix
+++ b/nixos/modules/services/system/nscd.nix
@@ -62,7 +62,7 @@ in
             mkdir -m 0755 -p /var/db/nscd
           '';
 
-        restartTriggers = [ config.environment.etc.hosts.source ];
+        restartTriggers = [ config.environment.etc.hosts.source config.environment.etc."nsswitch.conf".source ];
 
         serviceConfig =
           { ExecStart = "@${pkgs.glibc}/sbin/nscd nscd -f ${cfgFile}";

From 142970b9eb1925d67b4b9b41d060533fe249f2ec Mon Sep 17 00:00:00 2001
From: Gergely Risko <errge@nilcons.com>
Date: Sat, 23 Aug 2014 20:45:32 +0200
Subject: [PATCH 0425/1453] Refactor wrapGCC in stdenvLinux

Don't use default parameter values, to make the callsites more readable
and for easier debuggability/changability.  Also reordered the
callsites' parameter ordering for consistency.

In the final stdenv don't repeat the name of the shell.

This commit doesn't change the outhash (or drvhash) of the stdenv.
---
 pkgs/stdenv/linux/default.nix | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 71b23a396d9a..d2c36b9dc0db 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -118,12 +118,12 @@ rec {
 
   # A helper function to call gcc-wrapper.
   wrapGCC =
-    { gcc ? bootstrapTools, libc, binutils, coreutils, shell ? "", name ? "bootstrap-gcc-wrapper" }:
+    { gcc, libc, binutils, coreutils, name }:
 
     lib.makeOverridable (import ../../build-support/gcc-wrapper) {
       nativeTools = false;
       nativeLibc = false;
-      inherit gcc binutils coreutils libc shell name;
+      inherit gcc binutils coreutils libc name;
       stdenv = stdenvLinuxBoot0;
     };
 
@@ -133,9 +133,11 @@ rec {
   # configure script happy.
   stdenvLinuxBoot1 = stdenvBootFun {
     gcc = wrapGCC {
+      gcc = bootstrapTools;
       libc = bootstrapGlibc;
       binutils = bootstrapTools;
       coreutils = bootstrapTools;
+      name = "bootstrap-gcc-wrapper";
     };
   };
 
@@ -155,9 +157,11 @@ rec {
   # 3) 2nd stdenv that we will use to build only Glibc.
   stdenvLinuxBoot2 = stdenvBootFun {
     gcc = wrapGCC {
+      gcc = bootstrapTools;
       libc = bootstrapGlibc;
       binutils = binutils1;
       coreutils = bootstrapTools;
+      name = "bootstrap-gcc-wrapper";
     };
     overrides = pkgs: {
       inherit (stdenvLinuxBoot1Pkgs) perl;
@@ -183,9 +187,11 @@ rec {
   #    binutils and rest of the bootstrap tools, including GCC.
   stdenvLinuxBoot3 = stdenvBootFun {
     gcc = wrapGCC {
+      gcc = bootstrapTools;
+      libc = stdenvLinuxGlibc;
       binutils = binutils1;
       coreutils = bootstrapTools;
-      libc = stdenvLinuxGlibc;
+      name = "bootstrap-gcc-wrapper";
     };
     overrides = pkgs: {
       glibc = stdenvLinuxGlibc;
@@ -219,10 +225,10 @@ rec {
   #    (e.g. coreutils) are still from the bootstrap tools.
   stdenvLinuxBoot4 = stdenvBootFun {
     gcc = wrapGCC rec {
+      gcc = stdenvLinuxBoot3Pkgs.gcc.gcc;
+      libc = stdenvLinuxGlibc;
       binutils = binutils1;
       coreutils = bootstrapTools;
-      libc = stdenvLinuxGlibc;
-      gcc = stdenvLinuxBoot3Pkgs.gcc.gcc;
       name = "";
     };
     extraPath = [ stdenvLinuxBoot3Pkgs.xz ];
@@ -262,16 +268,15 @@ rec {
       ((import ../common-path.nix) {pkgs = stdenvLinuxBoot4Pkgs;})
       ++ [stdenvLinuxBoot4Pkgs.patchelf stdenvLinuxBoot4Pkgs.paxctl ];
 
-    gcc = wrapGCC rec {
-      inherit (stdenvLinuxBoot4Pkgs) binutils coreutils;
-      libc = stdenvLinuxGlibc;
-      gcc = stdenvLinuxBoot4.gcc.gcc;
-      shell = stdenvLinuxBoot4Pkgs.bash + "/bin/bash";
-      name = "";
-    };
-
     shell = stdenvLinuxBoot4Pkgs.bash + "/bin/bash";
 
+    gcc = (wrapGCC rec {
+      gcc = stdenvLinuxBoot4.gcc.gcc;
+      libc = stdenvLinuxGlibc;
+      inherit (stdenvLinuxBoot4Pkgs) binutils coreutils;
+      name = "";
+    }).override { inherit shell; };
+
     fetchurlBoot = stdenvLinuxBoot0.fetchurlBoot;
 
     extraAttrs = {

From 350022247a0b59abf42228d1d3fbb4222974b130 Mon Sep 17 00:00:00 2001
From: Gergely Risko <errge@nilcons.com>
Date: Sat, 23 Aug 2014 21:26:37 +0200
Subject: [PATCH 0426/1453] Refactor stage handling in stdenvLinux

Make stages explicit and generalize the pattern of having an stdenv and
a pkgs collection for all stages to a common stage generating function
called stageFun.

Rewrite all stage handling with this new function.

This commit doesn't change the outhash (or drvhash) of the stdenv.
---
 pkgs/stdenv/linux/default.nix | 187 +++++++++++++++-------------------
 1 file changed, 80 insertions(+), 107 deletions(-)

diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index d2c36b9dc0db..6c910c284a5c 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -35,8 +35,8 @@ rec {
   # The bootstrap process proceeds in several steps.
 
 
-  # 1) Create a standard environment by downloading pre-built binaries
-  # of coreutils, GCC, etc.
+  # Create a standard environment by downloading pre-built binaries of
+  # coreutils, GCC, etc.
 
 
   # Download and unpack the bootstrap tools (coreutils, GCC, Glibc, ...).
@@ -67,11 +67,13 @@ rec {
 
 
   # This function builds the various standard environments used during
-  # the bootstrap.
-  stdenvBootFun =
+  # the bootstrap.  In all stages, we build an stdenv and the package
+  # set that can be built with that stdenv.
+  stageFun =
     {gcc, extraAttrs ? {}, overrides ? (pkgs: {}), extraPath ? []}:
 
-    let thisStdenv = import ../generic {
+    let
+    thisStdenv = import ../generic {
       inherit system config;
       name = "stdenv-linux-boot";
       preHook =
@@ -84,7 +86,7 @@ rec {
       shell = "${bootstrapTools}/bin/sh";
       initialPath = [bootstrapTools] ++ extraPath;
       fetchurlBoot = import ../../build-support/fetchurl {
-        stdenv = stdenvLinuxBoot0;
+        stdenv = stage0.stdenv;
         curl = bootstrapTools;
       };
       inherit gcc;
@@ -93,26 +95,32 @@ rec {
       extraAttrs = extraAttrs // { inherit platform; };
       overrides = pkgs: (overrides pkgs) // { fetchurl = thisStdenv.fetchurlBoot; };
     };
-    in thisStdenv;
+    thisPkgs = allPackages {
+      inherit system platform;
+      bootStdenv = thisStdenv;
+    };
+    in { stdenv = thisStdenv; pkgs = thisPkgs; };
 
   # Build a dummy stdenv with no GCC or working fetchurl.  This is
   # because we need a stdenv to build the GCC wrapper and fetchurl.
-  stdenvLinuxBoot0 = stdenvBootFun {
+  stage0 = stageFun {
     gcc = "/no-such-path";
-  };
 
-
-  # The Glibc include directory cannot have the same prefix as the GCC
-  # include directory, since GCC gets confused otherwise (it will
-  # search the Glibc headers before the GCC headers).  So create a
-  # dummy Glibc.
-  bootstrapGlibc = stdenvLinuxBoot0.mkDerivation {
-    name = "bootstrap-glibc";
-    buildCommand = ''
-      mkdir -p $out
-      ln -s ${bootstrapTools}/lib $out/lib
-      ln -s ${bootstrapTools}/include-glibc $out/include
-    '';
+    overrides = pkgs: {
+      # The Glibc include directory cannot have the same prefix as the
+      # GCC include directory, since GCC gets confused otherwise (it
+      # will search the Glibc headers before the GCC headers).  So
+      # create a dummy Glibc here, which will be used in the stdenv of
+      # stage1.
+      glibc = stage0.stdenv.mkDerivation {
+        name = "bootstrap-glibc";
+        buildCommand = ''
+          mkdir -p $out
+          ln -s ${bootstrapTools}/lib $out/lib
+          ln -s ${bootstrapTools}/include-glibc $out/include
+        '';
+      };
+    };
   };
 
 
@@ -124,78 +132,58 @@ rec {
       nativeTools = false;
       nativeLibc = false;
       inherit gcc binutils coreutils libc name;
-      stdenv = stdenvLinuxBoot0;
+      stdenv = stage0.stdenv;
     };
 
 
   # Create the first "real" standard environment.  This one consists
   # of bootstrap tools only, and a minimal Glibc to keep the GCC
   # configure script happy.
-  stdenvLinuxBoot1 = stdenvBootFun {
+  stage1 = stageFun {
     gcc = wrapGCC {
       gcc = bootstrapTools;
-      libc = bootstrapGlibc;
+      libc = stage0.pkgs.glibc;
       binutils = bootstrapTools;
       coreutils = bootstrapTools;
       name = "bootstrap-gcc-wrapper";
     };
+    # Rebuild binutils to use from stage2 onwards.
+    overrides = pkgs: {
+      binutils = pkgs.binutils.override { gold = false; };
+    };
   };
 
 
-  # 2) These are the packages that we can build with the first
-  #    stdenv.  We only need binutils, because recent Glibcs
-  #    require recent Binutils, and those in bootstrap-tools may
-  #    be too old.
-  stdenvLinuxBoot1Pkgs = allPackages {
-    inherit system platform;
-    bootStdenv = stdenvLinuxBoot1;
-  };
-
-  binutils1 = stdenvLinuxBoot1Pkgs.binutils.override { gold = false; };
-
-
-  # 3) 2nd stdenv that we will use to build only Glibc.
-  stdenvLinuxBoot2 = stdenvBootFun {
+  # 2nd stdenv that contains our own rebuilt binutils and is used for
+  # compiling our own Glibc.
+  stage2 = stageFun {
     gcc = wrapGCC {
       gcc = bootstrapTools;
-      libc = bootstrapGlibc;
-      binutils = binutils1;
+      libc = stage0.pkgs.glibc;
+      binutils = stage1.pkgs.binutils;
       coreutils = bootstrapTools;
       name = "bootstrap-gcc-wrapper";
     };
     overrides = pkgs: {
-      inherit (stdenvLinuxBoot1Pkgs) perl;
+      inherit (stage1.pkgs) perl;
+      # This also contains the full, dynamically linked, final Glibc.
     };
   };
 
 
-  # 4) These are the packages that we can build with the 2nd
-  #    stdenv.
-  stdenvLinuxBoot2Pkgs = allPackages {
-    inherit system platform;
-    bootStdenv = stdenvLinuxBoot2;
-  };
-
-
-  # 5) Build Glibc with the bootstrap tools.  The result is the full,
-  #    dynamically linked, final Glibc.
-  stdenvLinuxGlibc = stdenvLinuxBoot2Pkgs.glibc;
-
-
-  # 6) Construct a third stdenv identical to the 2nd, except that this
-  #    one uses the Glibc built in step 5.  It still uses the recent
-  #    binutils and rest of the bootstrap tools, including GCC.
-  stdenvLinuxBoot3 = stdenvBootFun {
+  # Construct a third stdenv identical to the 2nd, except that this
+  # one uses the rebuilt Glibc from stage2.  It still uses the recent
+  # binutils and rest of the bootstrap tools, including GCC.
+  stage3 = stageFun {
     gcc = wrapGCC {
       gcc = bootstrapTools;
-      libc = stdenvLinuxGlibc;
-      binutils = binutils1;
+      libc = stage2.pkgs.glibc;
+      binutils = stage1.pkgs.binutils;
       coreutils = bootstrapTools;
       name = "bootstrap-gcc-wrapper";
     };
     overrides = pkgs: {
-      glibc = stdenvLinuxGlibc;
-      inherit (stdenvLinuxBoot1Pkgs) perl;
+      inherit (stage2.pkgs) glibc perl;
       # Link GCC statically against GMP etc.  This makes sense because
       # these builds of the libraries are only used by GCC, so it
       # reduces the size of the stdenv closure.
@@ -207,52 +195,37 @@ rec {
       ppl = pkgs.ppl.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
     };
     extraAttrs = {
-      glibc = stdenvLinuxGlibc;   # Required by gcc47 build
+      glibc = stage2.pkgs.glibc;  # Required by gcc47 build
     };
-    extraPath = [ stdenvLinuxBoot1Pkgs.paxctl ];
+    extraPath = [ stage1.pkgs.paxctl ];
   };
 
 
-  # 7) The packages that can be built using the third stdenv.
-  stdenvLinuxBoot3Pkgs = allPackages {
-    inherit system platform;
-    bootStdenv = stdenvLinuxBoot3;
-  };
-
-
-  # 8) Construct a fourth stdenv identical to the second, except that
-  #    this one uses the new GCC from step 7.  The other tools
-  #    (e.g. coreutils) are still from the bootstrap tools.
-  stdenvLinuxBoot4 = stdenvBootFun {
-    gcc = wrapGCC rec {
-      gcc = stdenvLinuxBoot3Pkgs.gcc.gcc;
-      libc = stdenvLinuxGlibc;
-      binutils = binutils1;
+  # Construct a fourth stdenv that uses the new GCC.  But coreutils is
+  # still from the bootstrap tools.
+  stage4 = stageFun {
+    gcc = wrapGCC {
+      gcc = stage3.pkgs.gcc.gcc;
+      libc = stage2.pkgs.glibc;
+      binutils = stage1.pkgs.binutils;
       coreutils = bootstrapTools;
       name = "";
     };
-    extraPath = [ stdenvLinuxBoot3Pkgs.xz ];
+    extraPath = [ stage3.pkgs.xz ];
     overrides = pkgs: {
-      inherit (stdenvLinuxBoot1Pkgs) perl;
-      inherit (stdenvLinuxBoot3Pkgs) gettext gnum4 gmp;
+      inherit (stage1.pkgs) perl;
+      inherit (stage3.pkgs) gettext gnum4 gmp glibc;
     };
   };
 
 
-  # 9) The packages that can be built using the fourth stdenv.
-  stdenvLinuxBoot4Pkgs = allPackages {
-    inherit system platform;
-    bootStdenv = stdenvLinuxBoot4;
-  };
-
-
-  # 10) Construct the final stdenv.  It uses the Glibc and GCC, and
-  #     adds in a new binutils that doesn't depend on bootstrap-tools,
-  #     as well as dynamically linked versions of all other tools.
+  # Construct the final stdenv.  It uses the Glibc and GCC, and adds
+  # in a new binutils that doesn't depend on bootstrap-tools, as well
+  # as dynamically linked versions of all other tools.
   #
-  #     When updating stdenvLinux, make sure that the result has no
-  #     dependency (`nix-store -qR') on bootstrapTools or the
-  #     first binutils built.
+  # When updating stdenvLinux, make sure that the result has no
+  # dependency (`nix-store -qR') on bootstrapTools or the first
+  # binutils built.
   stdenvLinux = import ../generic rec {
     inherit system config;
 
@@ -265,31 +238,31 @@ rec {
       '';
 
     initialPath =
-      ((import ../common-path.nix) {pkgs = stdenvLinuxBoot4Pkgs;})
-      ++ [stdenvLinuxBoot4Pkgs.patchelf stdenvLinuxBoot4Pkgs.paxctl ];
+      ((import ../common-path.nix) {pkgs = stage4.pkgs;})
+      ++ [stage4.pkgs.patchelf stage4.pkgs.paxctl ];
 
-    shell = stdenvLinuxBoot4Pkgs.bash + "/bin/bash";
+    shell = stage4.pkgs.bash + "/bin/bash";
 
     gcc = (wrapGCC rec {
-      gcc = stdenvLinuxBoot4.gcc.gcc;
-      libc = stdenvLinuxGlibc;
-      inherit (stdenvLinuxBoot4Pkgs) binutils coreutils;
+      gcc = stage4.stdenv.gcc.gcc;
+      libc = stage4.pkgs.glibc;
+      inherit (stage4.pkgs) binutils coreutils;
       name = "";
     }).override { inherit shell; };
 
-    fetchurlBoot = stdenvLinuxBoot0.fetchurlBoot;
+    fetchurlBoot = stage4.stdenv.fetchurl;
 
     extraAttrs = {
-      inherit (stdenvLinuxBoot3Pkgs) glibc;
+      inherit (stage4.pkgs) glibc;
       inherit platform bootstrapTools;
-      shellPackage = stdenvLinuxBoot4Pkgs.bash;
+      shellPackage = stage4.pkgs.bash;
     };
 
     overrides = pkgs: {
       inherit gcc;
-      inherit (stdenvLinuxBoot3Pkgs) glibc;
-      inherit (stdenvLinuxBoot4Pkgs) binutils;
-      inherit (stdenvLinuxBoot4Pkgs)
+      inherit (stage3.pkgs) glibc;
+      inherit (stage4.pkgs) binutils;
+      inherit (stage4.pkgs)
         gzip bzip2 xz bash coreutils diffutils findutils gawk
         gnumake gnused gnutar gnugrep gnupatch patchelf
         attr acl paxctl;

From 49e5837780b9811f5cb9f36979a3a3b737b2d94f Mon Sep 17 00:00:00 2001
From: Gergely Risko <errge@nilcons.com>
Date: Sun, 24 Aug 2014 15:47:10 +0200
Subject: [PATCH 0427/1453] Move wrapGCC helper up

This commit doesn't change the outhash (or drvhash) of the stdenv.
---
 pkgs/stdenv/linux/default.nix | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 6c910c284a5c..2d96869f23e2 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -66,6 +66,18 @@ rec {
   };
 
 
+  # A helper function to call gcc-wrapper.
+  wrapGCC =
+    { gcc, libc, binutils, coreutils, name }:
+
+    lib.makeOverridable (import ../../build-support/gcc-wrapper) {
+      nativeTools = false;
+      nativeLibc = false;
+      inherit gcc binutils coreutils libc name;
+      stdenv = stage0.stdenv;
+    };
+
+
   # This function builds the various standard environments used during
   # the bootstrap.  In all stages, we build an stdenv and the package
   # set that can be built with that stdenv.
@@ -101,6 +113,7 @@ rec {
     };
     in { stdenv = thisStdenv; pkgs = thisPkgs; };
 
+
   # Build a dummy stdenv with no GCC or working fetchurl.  This is
   # because we need a stdenv to build the GCC wrapper and fetchurl.
   stage0 = stageFun {
@@ -124,18 +137,6 @@ rec {
   };
 
 
-  # A helper function to call gcc-wrapper.
-  wrapGCC =
-    { gcc, libc, binutils, coreutils, name }:
-
-    lib.makeOverridable (import ../../build-support/gcc-wrapper) {
-      nativeTools = false;
-      nativeLibc = false;
-      inherit gcc binutils coreutils libc name;
-      stdenv = stage0.stdenv;
-    };
-
-
   # Create the first "real" standard environment.  This one consists
   # of bootstrap tools only, and a minimal Glibc to keep the GCC
   # configure script happy.

From ea65229f70fe75ebc8440d69575a9b8f2e573da0 Mon Sep 17 00:00:00 2001
From: Gergely Risko <errge@nilcons.com>
Date: Sun, 24 Aug 2014 15:55:14 +0200
Subject: [PATCH 0428/1453] Refactor stages to only ever refer to the previous
 stage

This commit doesn't change the outhash (or drvhash) of the stdenv.
---
 pkgs/stdenv/linux/default.nix | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 2d96869f23e2..6d54228978f4 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -140,6 +140,13 @@ rec {
   # Create the first "real" standard environment.  This one consists
   # of bootstrap tools only, and a minimal Glibc to keep the GCC
   # configure script happy.
+  #
+  # For clarity, we only use the previous stage when specifying these
+  # stages.  So stageN should only ever have references for stage{N-1}.
+  #
+  # If we ever need to use a package from more than one stage back, we
+  # simply re-export those packages in the middle stage(s) using the
+  # overrides attribute and the inherit syntax.
   stage1 = stageFun {
     gcc = wrapGCC {
       gcc = bootstrapTools;
@@ -151,6 +158,7 @@ rec {
     # Rebuild binutils to use from stage2 onwards.
     overrides = pkgs: {
       binutils = pkgs.binutils.override { gold = false; };
+      inherit (stage0.pkgs) glibc;
     };
   };
 
@@ -160,13 +168,13 @@ rec {
   stage2 = stageFun {
     gcc = wrapGCC {
       gcc = bootstrapTools;
-      libc = stage0.pkgs.glibc;
+      libc = stage1.pkgs.glibc;
       binutils = stage1.pkgs.binutils;
       coreutils = bootstrapTools;
       name = "bootstrap-gcc-wrapper";
     };
     overrides = pkgs: {
-      inherit (stage1.pkgs) perl;
+      inherit (stage1.pkgs) perl binutils paxctl;
       # This also contains the full, dynamically linked, final Glibc.
     };
   };
@@ -179,12 +187,12 @@ rec {
     gcc = wrapGCC {
       gcc = bootstrapTools;
       libc = stage2.pkgs.glibc;
-      binutils = stage1.pkgs.binutils;
+      binutils = stage2.pkgs.binutils;
       coreutils = bootstrapTools;
       name = "bootstrap-gcc-wrapper";
     };
     overrides = pkgs: {
-      inherit (stage2.pkgs) glibc perl;
+      inherit (stage2.pkgs) binutils glibc perl;
       # Link GCC statically against GMP etc.  This makes sense because
       # these builds of the libraries are only used by GCC, so it
       # reduces the size of the stdenv closure.
@@ -198,7 +206,7 @@ rec {
     extraAttrs = {
       glibc = stage2.pkgs.glibc;  # Required by gcc47 build
     };
-    extraPath = [ stage1.pkgs.paxctl ];
+    extraPath = [ stage2.pkgs.paxctl ];
   };
 
 
@@ -207,15 +215,14 @@ rec {
   stage4 = stageFun {
     gcc = wrapGCC {
       gcc = stage3.pkgs.gcc.gcc;
-      libc = stage2.pkgs.glibc;
-      binutils = stage1.pkgs.binutils;
+      libc = stage3.pkgs.glibc;
+      binutils = stage3.pkgs.binutils;
       coreutils = bootstrapTools;
       name = "";
     };
     extraPath = [ stage3.pkgs.xz ];
     overrides = pkgs: {
-      inherit (stage1.pkgs) perl;
-      inherit (stage3.pkgs) gettext gnum4 gmp glibc;
+      inherit (stage3.pkgs) gettext gnum4 gmp perl glibc;
     };
   };
 
@@ -261,11 +268,9 @@ rec {
 
     overrides = pkgs: {
       inherit gcc;
-      inherit (stage3.pkgs) glibc;
-      inherit (stage4.pkgs) binutils;
       inherit (stage4.pkgs)
-        gzip bzip2 xz bash coreutils diffutils findutils gawk
-        gnumake gnused gnutar gnugrep gnupatch patchelf
+        gzip bzip2 xz bash binutils coreutils diffutils findutils gawk
+        glibc gnumake gnused gnutar gnugrep gnupatch patchelf
         attr acl paxctl;
     };
   };

From 6fb942c030b7c9653a199cd7ea779813880a3121 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 24 Aug 2014 17:14:34 +0200
Subject: [PATCH 0429/1453] pythonPackages.zope_proxy: 4.1.1 -> 4.1.4

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b66bbbb235ec..ef0eff2658f9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9026,11 +9026,11 @@ rec {
 
 
   zope_proxy = buildPythonPackage rec {
-    name = "zope.proxy-4.1.1";
+    name = "zope.proxy-4.1.4";
 
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.proxy/zope.proxy-4.1.1.tar.gz";
-      md5 = "c36691f0abee7573f4ddcc378603cefd";
+      url = "http://pypi.python.org/packages/source/z/zope.proxy/${name}.tar.gz";
+      md5 = "3bcaf8b8512a99649ecf2f158c11d05b";
     };
 
     propagatedBuildInputs = [ zope_interface ];

From 8d12a359ce4d4f700e2ec0eec0e2741001419340 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 24 Aug 2014 17:14:52 +0200
Subject: [PATCH 0430/1453] pythonPackages.zope_security: 3.7.4 -> 4.0.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ef0eff2658f9..2a86c177e5cb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9076,7 +9076,7 @@ rec {
 
 
   zope_security = buildPythonPackage rec {
-    name = "zope.security-3.7.4";
+    name = "zope.security-4.0.1";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/z/zope.security/zope.security-3.7.4.tar.gz";
@@ -9089,7 +9089,7 @@ rec {
     ];
 
     meta = {
-        maintainers = [ stdenv.lib.maintainers.goibhniu ];
+      maintainers = [ stdenv.lib.maintainers.goibhniu ];
     };
   };
 

From dd0cdefe2eff85115450bdb210440c762203fb4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 24 Aug 2014 17:17:48 +0200
Subject: [PATCH 0431/1453] pythonPackages.paramiko: 1.12.1 -> 1.14.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2a86c177e5cb..8eaec397d4dd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5247,15 +5247,18 @@ rec {
   };
 
   paramiko = buildPythonPackage rec {
-    name = "paramiko-1.12.1";
+    name = "paramiko-1.14.0";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/p/paramiko/${name}.tar.gz";
-      md5 = "ae4544dc0a1419b141342af89fcf0dd9";
+      md5 = "e26324fd398af68ad506fe98853835c3";
     };
 
     propagatedBuildInputs = [ pycrypto ecdsa ];
 
+    # tests failures since 1.14.0 release..
+    doCheck = false;
+    
     checkPhase = "${python}/bin/${python.executable} test.py";
 
     meta = {

From 169b901818ed5c969791096eced0078119fb7341 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 24 Aug 2014 17:19:59 +0200
Subject: [PATCH 0432/1453] pythonPackages.zc_buidout{152,171}: disable on py3k

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8eaec397d4dd..10c12929f742 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1004,8 +1004,11 @@ rec {
       maintainers = [ stdenv.lib.maintainers.garbas ];
     };
   };
+  
   zc_buildout171 = buildPythonPackage rec {
     name = "zc.buildout-1.7.1";
+    
+    disabled = isPy3k;
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/z/zc.buildout/${name}.tar.gz";
@@ -1019,8 +1022,11 @@ rec {
       maintainers = [ stdenv.lib.maintainers.garbas ];
     };
   };
+  
   zc_buildout152 = buildPythonPackage rec {
     name = "zc.buildout-1.5.2";
+    
+    disabled = isPy3k;
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/z/zc.buildout/${name}.tar.gz";

From aee5d6ac3bdbc6b1c11b6726bbf11cad7214aabb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 24 Aug 2014 17:23:35 +0200
Subject: [PATCH 0433/1453] pythonPackages.tempita: 0.4 -> 0.5.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 10c12929f742..6295ae90ed25 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7961,14 +7961,16 @@ rec {
   };
 
   tempita = buildPythonPackage rec {
-    version = "0.4";
+    version = "0.5.2";
     name = "tempita-${version}";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/T/Tempita/Tempita-${version}.tar.gz";
-      md5 = "0abe015a72e748d0c6284679a497426c";
+      md5 = "4c2f17bb9d481821c41b6fbee904cea1";
     };
-
+    
+    disabled = isPy3k;
+    
     buildInputs = [ nose ];
 
     meta = {

From 88391a5c65c15ecb83bf4a1bd5532cc956f96b5a Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sun, 24 Aug 2014 17:29:15 +0200
Subject: [PATCH 0434/1453] docker: update to 1.2.0

---
 pkgs/applications/virtualization/docker/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 4571e979c6c7..f4d329221ff3 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -3,11 +3,11 @@ btrfsProgs, iptables, bash, e2fsprogs}:
 
 stdenv.mkDerivation rec {
   name = "docker-${version}";
-  version = "1.1.2";
+  version = "1.2.0";
 
   src = fetchurl {
     url = "https://github.com/dotcloud/docker/archive/v${version}.tar.gz";
-    sha256 = "1pa6k3gx940ap3r96xdry6apzkm0ymqra92b2mrp25b25264cqcy";
+    sha256 = "1nk74p9k17bllgw4992ixx7z3w87icp2wabbpbgfyi20k2q9mayp";
   };
 
   buildInputs = [ makeWrapper go sqlite lxc iproute bridge_utils devicemapper btrfsProgs iptables e2fsprogs];
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   buildPhase = ''
     patchShebangs ./hack
     export AUTO_GOPATH=1
-    export DOCKER_GITCOMMIT="d84a070"
+    export DOCKER_GITCOMMIT="fa7b24f"
     ./hack/make.sh dynbinary
   '';
 

From 3df019067dc8c8ce16114a229031cb2c0c73edd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 24 Aug 2014 17:33:27 +0200
Subject: [PATCH 0435/1453] pypy: add tcl support

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

diff --git a/pkgs/development/interpreters/pypy/2.3/default.nix b/pkgs/development/interpreters/pypy/2.3/default.nix
index a364b24c04c5..b45805ab2414 100644
--- a/pkgs/development/interpreters/pypy/2.3/default.nix
+++ b/pkgs/development/interpreters/pypy/2.3/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi
-, sqlite, openssl, ncurses, pythonFull, expat }:
+, sqlite, openssl, ncurses, pythonFull, expat, tcl, tk }:
 
 assert zlibSupport -> zlib != null;
 
@@ -20,7 +20,7 @@ let
       sha256 = "0fg4l48c7n59n5j3b1dgcsr927xzylkfny4a6pnk6z0pq2bhvl9z";
     };
 
-    buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite ]
+    buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite tk tcl ]
       ++ stdenv.lib.optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc
       ++ stdenv.lib.optional zlibSupport zlib;
 

From 1d67ea1ce3c6ba27273445dca01418fba044e0bb Mon Sep 17 00:00:00 2001
From: Jaka Kranjc <smgl@lynxlynx.info>
Date: Sun, 24 Aug 2014 15:57:00 +0200
Subject: [PATCH 0436/1453] nixos-install.sh: added --root parameter

Previously:
- setting the mountpoint was only possible through an environment variable
- a discrepancy from nixos-generate-config, which has --root
---
 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 a55eda1cb8fd..86952486ade0 100644
--- a/nixos/modules/installer/tools/nixos-install.sh
+++ b/nixos/modules/installer/tools/nixos-install.sh
@@ -30,6 +30,9 @@ while [ "$#" -gt 0 ]; do
             absolute_path=$(readlink -m $given_path)
             extraBuildFlags+=("$i" "/mnt$absolute_path")
             ;;
+        --root)
+            mountPoint="$1"; shift 1
+            ;;
         --show-trace)
             extraBuildFlags+=("$i")
             ;;

From be6ae818dcabf16068ff13ad397056547dd74cc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 24 Aug 2014 17:47:38 +0200
Subject: [PATCH 0437/1453] libtoxcore: upgrade for a few rev to get i686-linux
 build working

---
 pkgs/development/libraries/libtoxcore/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix
index 6741838d33b6..b5665fe402e7 100644
--- a/pkgs/development/libraries/libtoxcore/default.nix
+++ b/pkgs/development/libraries/libtoxcore/default.nix
@@ -2,8 +2,8 @@
 , libvpx, check, libconfig, pkgconfig }:
 
 let
-  version = "e1158be5a6";
-  date = "20140728";
+  version = "f83fcbb13c0";
+  date = "20140811";
 in
 stdenv.mkDerivation rec {
   name = "tox-core-${date}-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchurl {
     url = "https://github.com/irungentoo/toxcore/tarball/${version}";
     name = "${name}.tar.gz";
-    sha256 = "1rsh1pbwvngsx5slmd6608b1zqs3jvq70bjr9zyziap9vxka3z1v";
+    sha256 = "09g74h3qnx9adyxxvzay8m2idbgbln7m4kkm7sg9925mvi5abb1w";
   };
 
   NIX_LDFLAGS = "-lgcc_s";

From 041f6a181ba2a84e2455da105e4e907f51323cc7 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Sun, 24 Aug 2014 16:58:58 +0100
Subject: [PATCH 0438/1453] haskell-equational-reasoning: add version 0.2.0.4

---
 .../haskell/equational-reasoning/default.nix     | 16 ++++++++++++++++
 pkgs/top-level/haskell-packages.nix              |  2 ++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/equational-reasoning/default.nix

diff --git a/pkgs/development/libraries/haskell/equational-reasoning/default.nix b/pkgs/development/libraries/haskell/equational-reasoning/default.nix
new file mode 100644
index 000000000000..fa88fbfe2e80
--- /dev/null
+++ b/pkgs/development/libraries/haskell/equational-reasoning/default.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, singletons, tagged, void }:
+
+cabal.mkDerivation (self: {
+  pname = "equational-reasoning";
+  version = "0.2.0.4";
+  sha256 = "1f94y6h7qg7rck7rxf6j8sygkh1xmfk0z1lr71inx6s74agjyc9j";
+  buildDepends = [ singletons tagged void ];
+  meta = {
+    description = "Proof assistant for Haskell using DataKinds & PolyKinds";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 4c4de9165126..ed02d2beca1b 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -751,6 +751,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   entropy = callPackage ../development/libraries/haskell/entropy {};
 
+  equationalReasoning = callPackage ../development/libraries/haskell/equational-reasoning {};
+
   equivalence_0_2_3 = callPackage ../development/libraries/haskell/equivalence/0.2.3.nix {};
   equivalence_0_2_5 = callPackage ../development/libraries/haskell/equivalence/0.2.5.nix {};
   equivalence = self.equivalence_0_2_5;

From a39488f4f1874147efc52179d1413594e9f2f580 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Sun, 24 Aug 2014 17:00:06 +0100
Subject: [PATCH 0439/1453] haskell-monomorphic: add 0.0.3.2

---
 .../libraries/haskell/monomorphic/default.nix    | 16 ++++++++++++++++
 pkgs/top-level/haskell-packages.nix              |  2 ++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/monomorphic/default.nix

diff --git a/pkgs/development/libraries/haskell/monomorphic/default.nix b/pkgs/development/libraries/haskell/monomorphic/default.nix
new file mode 100644
index 000000000000..e160878b6802
--- /dev/null
+++ b/pkgs/development/libraries/haskell/monomorphic/default.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "monomorphic";
+  version = "0.0.3.2";
+  sha256 = "13zw506wifz2lf7n4a48rkn7ym44jpiqag21zc1py6xxdlkbrhh2";
+  meta = {
+    homepage = "https://github.com/konn/monomorphic";
+    description = "Library to convert polymorphic datatypes to/from its monomorphic represetation";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index ed02d2beca1b..762dafa46cd9 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1639,6 +1639,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   mongoDB = callPackage ../development/libraries/haskell/mongoDB {};
 
+  monomorphic = callPackage ../development/libraries/haskell/monomorphic {};
+
   monoTraversable = callPackage ../development/libraries/haskell/mono-traversable {};
 
   mmorph = callPackage ../development/libraries/haskell/mmorph {};

From 780070afa030851d3876d357bf31f6132e525421 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Sun, 24 Aug 2014 17:01:08 +0100
Subject: [PATCH 0440/1453] haskell-type-natural: add 0.2.3.1

---
 .../haskell/type-natural/default.nix          | 20 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/type-natural/default.nix

diff --git a/pkgs/development/libraries/haskell/type-natural/default.nix b/pkgs/development/libraries/haskell/type-natural/default.nix
new file mode 100644
index 000000000000..2e56f8c396b4
--- /dev/null
+++ b/pkgs/development/libraries/haskell/type-natural/default.nix
@@ -0,0 +1,20 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, constraints, equationalReasoning, monomorphic, singletons
+}:
+
+cabal.mkDerivation (self: {
+  pname = "type-natural";
+  version = "0.2.3.1";
+  sha256 = "0qi5b3d0vkm1b2kda3ifw6g7djx91wj7q36la02yadlvmb4jcp1g";
+  buildDepends = [
+    constraints equationalReasoning monomorphic singletons
+  ];
+  meta = {
+    homepage = "https://github.com/konn/type-natural";
+    description = "Type-level natural and proofs of their properties";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 762dafa46cd9..d8ae2e9d3945 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2554,6 +2554,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   typeEquality = callPackage ../development/libraries/haskell/type-equality {};
 
+  typeNatural = callPackage ../development/libraries/haskell/type-natural {};
+
   typeLevelNaturalNumber = callPackage ../development/libraries/haskell/type-level-natural-number {};
 
   tz = callPackage ../development/libraries/haskell/tz {

From 2a94f8916a48bf353972598f9efe64ab6b8af600 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Sun, 24 Aug 2014 17:01:26 +0100
Subject: [PATCH 0441/1453] haskell-sized: add 0.1.0.0

---
 .../libraries/haskell/sized/default.nix        | 18 ++++++++++++++++++
 pkgs/top-level/haskell-packages.nix            |  2 ++
 2 files changed, 20 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/sized/default.nix

diff --git a/pkgs/development/libraries/haskell/sized/default.nix b/pkgs/development/libraries/haskell/sized/default.nix
new file mode 100644
index 000000000000..ae75ff26e4c4
--- /dev/null
+++ b/pkgs/development/libraries/haskell/sized/default.nix
@@ -0,0 +1,18 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, constraints, ListLike, monomorphic, typeNatural, vector }:
+
+cabal.mkDerivation (self: {
+  pname = "sized";
+  version = "0.1.0.0";
+  sha256 = "00n9fb7kk3c6dy4j19d9ikmynllpxc7yd51sign0rhvnasmyrghl";
+  buildDepends = [
+    constraints ListLike monomorphic typeNatural vector
+  ];
+  meta = {
+    description = "Sized sequence data-types";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index d8ae2e9d3945..fbff5087cc0d 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2175,6 +2175,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   silently = callPackage ../development/libraries/haskell/silently {};
 
+  sized = callPackage ../development/libraries/haskell/sized {};
+
   sizedTypes = callPackage ../development/libraries/haskell/sized-types {};
 
   skein = callPackage ../development/libraries/haskell/skein {};

From 669e1a56d6eddc7011a1a29709fbeef243584604 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?=
 =?UTF-8?q?=D0=A6=D0=B0=D0=BC=D1=83=D1=82=D0=B0=D0=BB=D0=B8?=
 <astsmtl@yandex.ru>
Date: Sun, 24 Aug 2014 20:05:40 +0400
Subject: [PATCH 0442/1453] data/fonts/terminus-font: Update to 4.39.

---
 pkgs/data/fonts/terminus-font/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/terminus-font/default.nix b/pkgs/data/fonts/terminus-font/default.nix
index 3487a8012dc0..fa9eb0ac42d5 100644
--- a/pkgs/data/fonts/terminus-font/default.nix
+++ b/pkgs/data/fonts/terminus-font/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl, bdftopcf, mkfontdir, mkfontscale }:
 
 stdenv.mkDerivation rec {
-  name = "terminus-font-4.38";
+  name = "terminus-font-4.39";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/terminus-font/${name}/${name}.tar.gz";
-    sha256 = "1dwpxmg0wiyhp7hh18mvw18gnf0y2jgbn80c4xya7rmb9mm8gx7n";
+    sha256 = "1gzmn7zakvy6yrvmswyjfklnsvqrjm0imhq8rjws8rdkhqwkh21i";
   };
 
   buildInputs = [ perl bdftopcf mkfontdir mkfontscale ];

From 626b1eca5c306fac0495f3adbce9c18a3a20a3ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 24 Aug 2014 18:07:27 +0200
Subject: [PATCH 0443/1453] icecat-3: mark as broken correctly

---
 pkgs/applications/networking/browsers/icecat-3/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/icecat-3/default.nix b/pkgs/applications/networking/browsers/icecat-3/default.nix
index ef2c69422b62..91a71a4b4c40 100644
--- a/pkgs/applications/networking/browsers/icecat-3/default.nix
+++ b/pkgs/applications/networking/browsers/icecat-3/default.nix
@@ -106,7 +106,7 @@ stdenv.mkDerivation {
 
     homepage = http://www.gnu.org/software/gnuzilla/;
     license = [ "GPLv2+" "LGPLv2+" "MPLv1+" ];
-
+    broken = true;
     maintainers = [ ];
     platforms = stdenv.lib.platforms.gnu;
   };
@@ -114,6 +114,5 @@ stdenv.mkDerivation {
   passthru = {
     inherit gtk version;
     isFirefox3Like = true;
-    broken = true;
   };
 }

From 27d39849355d1a39f8538d09c52e04f8f87510ea Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 24 Aug 2014 18:08:23 +0200
Subject: [PATCH 0444/1453] Indentation

---
 pkgs/stdenv/linux/default.nix | 53 ++++++++++++++++++-----------------
 1 file changed, 28 insertions(+), 25 deletions(-)

diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 6d54228978f4..80bc982267b5 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -85,32 +85,35 @@ rec {
     {gcc, extraAttrs ? {}, overrides ? (pkgs: {}), extraPath ? []}:
 
     let
-    thisStdenv = import ../generic {
-      inherit system config;
-      name = "stdenv-linux-boot";
-      preHook =
-        ''
-          # Don't patch #!/interpreter because it leads to retained
-          # dependencies on the bootstrapTools in the final stdenv.
-          dontPatchShebangs=1
-          ${commonPreHook}
-        '';
-      shell = "${bootstrapTools}/bin/sh";
-      initialPath = [bootstrapTools] ++ extraPath;
-      fetchurlBoot = import ../../build-support/fetchurl {
-        stdenv = stage0.stdenv;
-        curl = bootstrapTools;
+
+      thisStdenv = import ../generic {
+        inherit system config;
+        name = "stdenv-linux-boot";
+        preHook =
+          ''
+            # Don't patch #!/interpreter because it leads to retained
+            # dependencies on the bootstrapTools in the final stdenv.
+            dontPatchShebangs=1
+            ${commonPreHook}
+          '';
+        shell = "${bootstrapTools}/bin/sh";
+        initialPath = [bootstrapTools] ++ extraPath;
+        fetchurlBoot = import ../../build-support/fetchurl {
+          stdenv = stage0.stdenv;
+          curl = bootstrapTools;
+        };
+        inherit gcc;
+        # Having the proper 'platform' in all the stdenvs allows getting proper
+        # linuxHeaders for example.
+        extraAttrs = extraAttrs // { inherit platform; };
+        overrides = pkgs: (overrides pkgs) // { fetchurl = thisStdenv.fetchurlBoot; };
       };
-      inherit gcc;
-      # Having the proper 'platform' in all the stdenvs allows getting proper
-      # linuxHeaders for example.
-      extraAttrs = extraAttrs // { inherit platform; };
-      overrides = pkgs: (overrides pkgs) // { fetchurl = thisStdenv.fetchurlBoot; };
-    };
-    thisPkgs = allPackages {
-      inherit system platform;
-      bootStdenv = thisStdenv;
-    };
+
+      thisPkgs = allPackages {
+        inherit system platform;
+        bootStdenv = thisStdenv;
+      };
+
     in { stdenv = thisStdenv; pkgs = thisPkgs; };
 
 

From 4a4c051a95b6b8da3a13d7955087e915e6dd4bf7 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 24 Aug 2014 18:19:56 +0200
Subject: [PATCH 0445/1453] nixos: Remove modprobe.d/nixos.conf from initrd.

For example in VM tests, this causes firmware to be included in the
initrd. So until we have a better fix for adding early-stage module
options, I'll remove this.

Fixes a regression introduced by 0aa2c1d and closes #3764.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/modules/system/boot/stage-1.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index 1d3878054432..426da778f434 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -199,9 +199,6 @@ let
         { object = pkgs.writeText "mdadm.conf" config.boot.initrd.mdadmConf;
           symlink = "/etc/mdadm.conf";
         }
-        { object = config.environment.etc."modprobe.d/nixos.conf".source;
-          symlink = "/etc/modprobe.d/nixos.conf";
-        }
         { object = pkgs.stdenv.mkDerivation {
             name = "initrd-kmod-blacklist-ubuntu";
             builder = pkgs.writeText "builder.sh" ''

From c224b5e9497feebd365966a923469ea31af2660c Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sun, 24 Aug 2014 18:19:58 +0200
Subject: [PATCH 0446/1453] xbmc: update from 13.1 to 13.2

---
 pkgs/applications/video/xbmc/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/video/xbmc/default.nix b/pkgs/applications/video/xbmc/default.nix
index 3232267fa94b..26c54c537ae0 100644
--- a/pkgs/applications/video/xbmc/default.nix
+++ b/pkgs/applications/video/xbmc/default.nix
@@ -34,11 +34,11 @@ assert vdpauSupport -> libvdpau != null && ffmpeg.vdpauSupport;
 assert pulseSupport -> pulseaudio != null;
 
 stdenv.mkDerivation rec {
-    name = "xbmc-13.1";
+    name = "xbmc-13.2";
 
     src = fetchurl {
-      url = "https://github.com/xbmc/xbmc/archive/13.1-Gotham.tar.gz";
-      sha256 = "0y56c5csfp8xhk088g47m3bzrri73z868yfx6b04gnrdmr760jrl";
+      url = "https://github.com/xbmc/xbmc/archive/13.2-Gotham.tar.gz";
+      sha256 = "11g5a3h6kxz1vmnhagfjhg9nqf11wy0wzqqf4h338jh3lgzmvgxc";
     };
 
     buildInputs = [

From bce42c282a9f58191362e25a3fa91d261bd7e388 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 24 Aug 2014 18:33:33 +0200
Subject: [PATCH 0447/1453] rubyLibs.nokogiri: fix build

---
 pkgs/development/interpreters/ruby/patches.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/patches.nix b/pkgs/development/interpreters/ruby/patches.nix
index 10cbf1ecfe56..9d694eac1e42 100644
--- a/pkgs/development/interpreters/ruby/patches.nix
+++ b/pkgs/development/interpreters/ruby/patches.nix
@@ -1,6 +1,6 @@
 { fetchurl, writeScript, ruby, ncurses, sqlite, libxml2, libxslt, libffi
 , zlib, libuuid, gems, jdk, python, stdenv, libiconvOrEmpty, imagemagick
-, pkgconfig }:
+, pkgconfig, libiconv }:
 
 let
 
@@ -80,9 +80,10 @@ in
   };
 
   nokogiri = {
+    buildInputs = [ libxml2 ];
     buildFlags =
       [ "--with-xml2-dir=${libxml2} --with-xml2-include=${libxml2}/include/libxml2"
-        "--with-xslt-dir=${libxslt}"
+        "--with-xslt-dir=${libxslt} --with-iconv-dir=${libiconv} --use-system-libraries"
       ];
   };
 

From 2d6d43c02cd8f69668e961d7953b7bf1a9f63cf2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 24 Aug 2014 18:52:34 +0200
Subject: [PATCH 0448/1453] Fix tarball build

---
 pkgs/applications/networking/browsers/firefox-bin/default.nix  | 2 ++
 .../networking/mailreaders/thunderbird-bin/default.nix         | 2 ++
 pkgs/development/compilers/go/1.3.nix                          | 2 ++
 pkgs/development/compilers/rustc/0.11.nix                      | 2 ++
 pkgs/development/compilers/rustc/head.nix                      | 2 ++
 pkgs/development/libraries/glib/default.nix                    | 2 ++
 pkgs/games/adom/default.nix                                    | 2 ++
 pkgs/servers/nosql/influxdb/default.nix                        | 2 ++
 pkgs/tools/filesystems/yandex-disk/default.nix                 | 3 +++
 9 files changed, 19 insertions(+)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 969ced923b3d..56ba95c661f5 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -37,6 +37,8 @@
 , systemd
 }:
 
+assert stdenv.isLinux;
+
 let
   version = "31.0";
   sources = [
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
index 15acd5af8dfd..6add41edf7c3 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
@@ -37,6 +37,8 @@
 , pango
 }:
 
+assert stdenv.isLinux;
+
 let
   version = "31.0";
   sources = [
diff --git a/pkgs/development/compilers/go/1.3.nix b/pkgs/development/compilers/go/1.3.nix
index 06decd16190a..1dcdd89b5bf4 100644
--- a/pkgs/development/compilers/go/1.3.nix
+++ b/pkgs/development/compilers/go/1.3.nix
@@ -1,5 +1,7 @@
 { stdenv, lib, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc }:
 
+assert stdenv.gcc.gcc != null;
+
 let
   loader386 = "${glibc}/lib/ld-linux.so.2";
   loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2";
diff --git a/pkgs/development/compilers/rustc/0.11.nix b/pkgs/development/compilers/rustc/0.11.nix
index 1c3b09b0985a..a7246e44a73d 100644
--- a/pkgs/development/compilers/rustc/0.11.nix
+++ b/pkgs/development/compilers/rustc/0.11.nix
@@ -1,5 +1,7 @@
 {stdenv, fetchurl, which, file, perl, curl, python27, makeWrapper}:
 
+assert stdenv.gcc.gcc != null;
+
 /* Rust's build process has a few quirks :
 
 - It requires some patched in llvm that haven't landed upstream, so it
diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix
index ad33906ae6e9..4f512096a423 100644
--- a/pkgs/development/compilers/rustc/head.nix
+++ b/pkgs/development/compilers/rustc/head.nix
@@ -1,5 +1,7 @@
 {stdenv, fetchurl, fetchgit, which, file, perl, curl, python27, makeWrapper}:
 
+assert stdenv.gcc.gcc != null;
+
 /* Rust's build process has a few quirks :
 
 - It requires some patched in llvm that haven't landed upstream, so it
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index f4157cdd8d0a..4f7c6042f136 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -7,6 +7,8 @@
 
 with stdenv.lib;
 
+assert stdenv.gcc.gcc != null;
+
 # TODO:
 # * Add gio-module-fam
 #     Problem: cyclic dependency on gamin
diff --git a/pkgs/games/adom/default.nix b/pkgs/games/adom/default.nix
index e83f50df1b78..ef5aba96d092 100644
--- a/pkgs/games/adom/default.nix
+++ b/pkgs/games/adom/default.nix
@@ -1,6 +1,8 @@
 { stdenv, patchelf, zlib, libmad, libpng12, libcaca, mesa, alsaLib, pulseaudio
 , xlibs, plowshare }:
 
+assert stdenv.isLinux;
+
 let
 
   inherit (xlibs) libXext libX11;
diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix
index 77852b6d2ed9..6c6fb213cb8c 100644
--- a/pkgs/servers/nosql/influxdb/default.nix
+++ b/pkgs/servers/nosql/influxdb/default.nix
@@ -1,5 +1,7 @@
 { stdenv, fetchurl, makeWrapper }:
 
+assert stdenv.isLinux;
+
 stdenv.mkDerivation rec {
   name = "influxdb-${version}";
   version = "0.7.0";
diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix
index 24dbae08fab3..c9078a0cb8be 100644
--- a/pkgs/tools/filesystems/yandex-disk/default.nix
+++ b/pkgs/tools/filesystems/yandex-disk/default.nix
@@ -1,4 +1,7 @@
 { stdenv, fetchurl, writeText, zlib, rpm, cpio, patchelf, which }:
+
+assert stdenv.isLinux;
+
 let
   p = if stdenv.is64bit then {
       arch = "x86_64";

From 2478e77d8ac2d447eb0ee012f001e6c7d1a59d56 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 24 Aug 2014 18:53:29 +0200
Subject: [PATCH 0449/1453] Make the manual release-critical

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

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index be76c63685bc..246adb4e1c10 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -29,6 +29,7 @@ let
           meta.description = "Release-critical builds for the Nixpkgs unstable channel";
           constituents =
             [ jobs.tarball
+              jobs.manual
               jobs.stdenv.x86_64-linux
               jobs.stdenv.i686-linux
               jobs.stdenv.x86_64-darwin

From df88d893320113a3768bc32af6b109d6d55c1e92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sun, 24 Aug 2014 19:50:22 +0200
Subject: [PATCH 0450/1453] FFADO: fix build on i686

---
 pkgs/os-specific/linux/ffado/default.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix
index dc8d7b3d7933..70c13be9ab4b 100644
--- a/pkgs/os-specific/linux/ffado/default.nix
+++ b/pkgs/os-specific/linux/ffado/default.nix
@@ -19,6 +19,17 @@ stdenv.mkDerivation rec {
 
   patches = [ ./enable-mixer-and-dbus.patch ];
 
+  # SConstruct checks cpuinfo and an objdump of /bin/mount to determine the appropriate arch
+  # Let's just skip this and tell it which to build
+  postPatch = if stdenv.isi686 then ''
+    sed '/def is_userspace_32bit(cpuinfo):/a\
+        return True' -i SConstruct
+  ''
+  else ''
+    sed '/def is_userspace_32bit(cpuinfo):/a\
+        return False' -i SConstruct
+  '';
+
   # TODO fix ffado-diag, it doesn't seem to use PYPKGDIR
   buildPhase = ''
     export PYLIBSUFFIX=lib/${python.libPrefix}/site-packages

From 4903ec028124ed111f5ce579f11267dde0ad5d01 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Sun, 24 Aug 2014 03:34:39 -0700
Subject: [PATCH 0451/1453] xml-lens upper bounds jailbroken, built and tested
 with lens v4.4.0.1

bug filed upstream to bump upper bounds
---
 pkgs/development/libraries/haskell/xml-lens/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/xml-lens/default.nix b/pkgs/development/libraries/haskell/xml-lens/default.nix
index fd9609ec25f7..f9e604419752 100644
--- a/pkgs/development/libraries/haskell/xml-lens/default.nix
+++ b/pkgs/development/libraries/haskell/xml-lens/default.nix
@@ -7,6 +7,7 @@ cabal.mkDerivation (self: {
   version = "0.1.6.1";
   sha256 = "093grvlpm19l3g10ka82xpzl2wr0gli71kfkbvk4gvg3194fkw4h";
   buildDepends = [ lens text xmlConduit ];
+  jailbreak = true;
   meta = {
     homepage = "https://github.com/fumieval/xml-lens";
     description = "Lenses, traversals, prisms for xml-conduit";

From 8e9ab29d43d42178134b5d3288c3a3fbc47b4729 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Sun, 24 Aug 2014 03:40:48 -0700
Subject: [PATCH 0452/1453] mark wreq as broken, issue made upstream

breaks because of incompatibility with lens > 4.4
---
 pkgs/development/libraries/haskell/wreq/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/haskell/wreq/default.nix b/pkgs/development/libraries/haskell/wreq/default.nix
index 9772418173bc..62fa1d2abf81 100644
--- a/pkgs/development/libraries/haskell/wreq/default.nix
+++ b/pkgs/development/libraries/haskell/wreq/default.nix
@@ -24,6 +24,8 @@ cabal.mkDerivation (self: {
     homepage = "http://www.serpentine.com/wreq";
     description = "An easy-to-use HTTP client library";
     license = self.stdenv.lib.licenses.bsd3;
+    broken = true;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
     platforms = self.ghc.meta.platforms;
     maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
   };

From 478f96d6c390d33e47090b71c1b59b35add8b29e Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Sun, 24 Aug 2014 03:47:00 -0700
Subject: [PATCH 0453/1453] Update twitter-conduit, fixes breakage

---
 .../haskell/twitter-conduit/default.nix         | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/haskell/twitter-conduit/default.nix b/pkgs/development/libraries/haskell/twitter-conduit/default.nix
index bf2652fa792e..6736f28cac6c 100644
--- a/pkgs/development/libraries/haskell/twitter-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/twitter-conduit/default.nix
@@ -2,27 +2,27 @@
 
 { cabal, aeson, attoparsec, authenticateOauth, caseInsensitive
 , conduit, conduitExtra, dataDefault, doctest, filepath, hlint
-, hspec, httpClient, httpConduit, httpTypes, lens, monadControl
-, monadLogger, network, resourcet, shakespeare, text, time
+, hspec, httpClient, httpConduit, httpTypes, lens, lensAeson
+, monadControl, monadLogger, networkUri, resourcet, text, time
 , transformers, transformersBase, twitterTypes
 }:
 
 cabal.mkDerivation (self: {
   pname = "twitter-conduit";
-  version = "0.0.5.5";
-  sha256 = "13wk863xjlg8g62yhbq4aar7z77n0awh500l6v41fam99lihzxab";
+  version = "0.0.5.6";
+  sha256 = "1l6gk4538nqknrj082hkdy2jp4gzyq3y473p8gg4mm2n67417r9m";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     aeson attoparsec authenticateOauth conduit conduitExtra dataDefault
-    httpClient httpConduit httpTypes lens monadLogger resourcet
-    shakespeare text time transformers twitterTypes
+    httpClient httpConduit httpTypes lens lensAeson monadLogger
+    networkUri resourcet text time transformers twitterTypes
   ];
   testDepends = [
     aeson attoparsec authenticateOauth caseInsensitive conduit
     conduitExtra dataDefault doctest filepath hlint hspec httpClient
-    httpConduit httpTypes lens monadControl monadLogger network
-    resourcet shakespeare text time transformers transformersBase
+    httpConduit httpTypes lens lensAeson monadControl monadLogger
+    networkUri resourcet text time transformers transformersBase
     twitterTypes
   ];
   meta = {
@@ -30,6 +30,5 @@ cabal.mkDerivation (self: {
     description = "Twitter API package with conduit interface and Streaming API support";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
   };
 })

From eec21600264cf9fda49408413856d9e7aa060558 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Sun, 24 Aug 2014 03:53:35 -0700
Subject: [PATCH 0454/1453] update hsimport to 0.5.1, fixes breakage

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

diff --git a/pkgs/development/libraries/haskell/hsimport/default.nix b/pkgs/development/libraries/haskell/hsimport/default.nix
index 8f080fe6e25a..62ab4cc35b04 100644
--- a/pkgs/development/libraries/haskell/hsimport/default.nix
+++ b/pkgs/development/libraries/haskell/hsimport/default.nix
@@ -6,19 +6,17 @@
 
 cabal.mkDerivation (self: {
   pname = "hsimport";
-  version = "0.5";
-  sha256 = "18rhldw6vbkjcpx373m784sppadccm2b3xx3zzr0l45dwmsh6rb4";
+  version = "0.5.1";
+  sha256 = "17yzfikfl8qvm6vp3d472l6p0kzzw694ng19xn3fmrb43qvki4jj";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     attoparsec cmdargs dyre haskellSrcExts lens mtl split text
   ];
   testDepends = [ filepath haskellSrcExts tasty tastyGolden ];
-  doCheck = false;
   meta = {
     description = "A command line program for extending the import list of a Haskell source file";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
   };
 })

From 81a67653d2fcbeb0bc3e7a5e28905fa365445d80 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Sun, 24 Aug 2014 03:50:11 -0700
Subject: [PATCH 0455/1453] mark json-assertions as broken for now

needs lens-aeson package and upper bounds bump
---
 pkgs/development/libraries/haskell/json-assertions/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/haskell/json-assertions/default.nix b/pkgs/development/libraries/haskell/json-assertions/default.nix
index fce4d5d79227..4ee1f4b57799 100644
--- a/pkgs/development/libraries/haskell/json-assertions/default.nix
+++ b/pkgs/development/libraries/haskell/json-assertions/default.nix
@@ -10,6 +10,8 @@ cabal.mkDerivation (self: {
   meta = {
     homepage = "http://github.com/ocharles/json-assertions.git";
     description = "Test that your (Aeson) JSON encoding matches your expectations";
+    broken = true;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = with self.stdenv.lib.maintainers; [ ocharles ];

From bfb82ef138170faa343cc096033f47e8e9230a66 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Sun, 24 Aug 2014 04:05:10 -0700
Subject: [PATCH 0456/1453] restore maintainer information that cabal2nix
 stripped

---
 pkgs/development/libraries/haskell/hsimport/default.nix        | 1 +
 pkgs/development/libraries/haskell/twitter-conduit/default.nix | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/haskell/hsimport/default.nix b/pkgs/development/libraries/haskell/hsimport/default.nix
index 62ab4cc35b04..96bcecddc30c 100644
--- a/pkgs/development/libraries/haskell/hsimport/default.nix
+++ b/pkgs/development/libraries/haskell/hsimport/default.nix
@@ -18,5 +18,6 @@ cabal.mkDerivation (self: {
     description = "A command line program for extending the import list of a Haskell source file";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/twitter-conduit/default.nix b/pkgs/development/libraries/haskell/twitter-conduit/default.nix
index 6736f28cac6c..5b0bf7cd4081 100644
--- a/pkgs/development/libraries/haskell/twitter-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/twitter-conduit/default.nix
@@ -30,5 +30,6 @@ cabal.mkDerivation (self: {
     description = "Twitter API package with conduit interface and Streaming API support";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
   };
 })

From 40fdda7237b035f4934de646df2a6cddff5c92ae Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Aug 2014 11:57:09 +0200
Subject: [PATCH 0457/1453] haskell-cabal2nix: update to version 1.69

---
 pkgs/development/tools/haskell/cabal2nix/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix
index 978ebde7e293..db7e472934c3 100644
--- a/pkgs/development/tools/haskell/cabal2nix/default.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/default.nix
@@ -1,15 +1,18 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, Cabal, doctest, filepath, hackageDb, HTTP, mtl, regexPosix
+{ cabal, Cabal, doctest, filepath, hackageDb, mtl, regexPosix
+, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "cabal2nix";
-  version = "1.68";
-  sha256 = "0w9ayvr3ljfxgi17yaayqvyxflbgf7b5245pc3m011lp3cfnj849";
+  version = "1.69";
+  sha256 = "0430086lh1h7w8wxc42aqrdjb8i12vz8m0jr1q2c45h3k6brb5r5";
   isLibrary = false;
   isExecutable = true;
-  buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ];
+  buildDepends = [
+    Cabal filepath hackageDb mtl regexPosix transformers
+  ];
   testDepends = [ doctest ];
   doCheck = self.stdenv.lib.versionOlder "7.6" self.ghc.version;
   meta = {

From a8c17fb227a05a4b80a04ce6c74959f2eb28669f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Aug 2014 11:57:14 +0200
Subject: [PATCH 0458/1453] haskell-taffybar: update to version 0.4.1

---
 pkgs/applications/misc/taffybar/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/taffybar/default.nix b/pkgs/applications/misc/taffybar/default.nix
index 6b282116343d..09eb186013f3 100644
--- a/pkgs/applications/misc/taffybar/default.nix
+++ b/pkgs/applications/misc/taffybar/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "taffybar";
-  version = "0.4.0";
-  sha256 = "1l6zl5mlpkdsvs3id6ivh4b74p65n6jr17k23y2cdwj2fr9prvr8";
+  version = "0.4.1";
+  sha256 = "0b4x78sq5x1w0xnc5fk4ixpbkl8cwjfyb4fq8vy21shf4n0fri26";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From a3a1ea58f66fbe3849f78c111c8f13d6d88f16e5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Aug 2014 11:57:16 +0200
Subject: [PATCH 0459/1453] haskell-GLUtil: update to version 0.8.1

---
 pkgs/development/libraries/haskell/GLUtil/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/GLUtil/default.nix b/pkgs/development/libraries/haskell/GLUtil/default.nix
index ce4b41c93e0a..ee99ccc4fee6 100644
--- a/pkgs/development/libraries/haskell/GLUtil/default.nix
+++ b/pkgs/development/libraries/haskell/GLUtil/default.nix
@@ -1,15 +1,16 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, cpphs, JuicyPixels, linear, OpenGL, OpenGLRaw
+{ cabal, cpphs, filepath, JuicyPixels, linear, OpenGL, OpenGLRaw
 , transformers, vector
 }:
 
 cabal.mkDerivation (self: {
   pname = "GLUtil";
-  version = "0.8";
-  sha256 = "00r9gmwsb9gx6bcc012rhz0z0hj3my8k1i0yjnaw0jmlqswm45h8";
+  version = "0.8.1";
+  sha256 = "026w6rsgs0vmjx9fj4x3r93rifdyjygb83spcwmch31a7qng6l7w";
   buildDepends = [
-    cpphs JuicyPixels linear OpenGL OpenGLRaw transformers vector
+    cpphs filepath JuicyPixels linear OpenGL OpenGLRaw transformers
+    vector
   ];
   buildTools = [ cpphs ];
   meta = {

From 5d8bf16d87e9e41db7978e4e99e52fda9bcd81c4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Aug 2014 11:57:19 +0200
Subject: [PATCH 0460/1453] haskell-aws: update to version 0.10.3

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

diff --git a/pkgs/development/libraries/haskell/aws/default.nix b/pkgs/development/libraries/haskell/aws/default.nix
index d6e8a5fb5ad6..3df47d956186 100644
--- a/pkgs/development/libraries/haskell/aws/default.nix
+++ b/pkgs/development/libraries/haskell/aws/default.nix
@@ -11,8 +11,8 @@
 
 cabal.mkDerivation (self: {
   pname = "aws";
-  version = "0.10.2";
-  sha256 = "15yr06z54wxnl37a94515ajlxrb7z9kii5dd0ssan32izh4nfrl2";
+  version = "0.10.3";
+  sha256 = "042vx5nhafvgw0crymkw8pyhiawhpxwj03n1k538y2wr181hmz5f";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 040e46ebc5c8cf40ea0a426cbc9ecdc3d1743bf6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Aug 2014 11:57:21 +0200
Subject: [PATCH 0461/1453] haskell-cabal-cargs: update to version 0.7.1

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

diff --git a/pkgs/development/libraries/haskell/cabal-cargs/default.nix b/pkgs/development/libraries/haskell/cabal-cargs/default.nix
index 85015f5d4acc..a74e54f7e438 100644
--- a/pkgs/development/libraries/haskell/cabal-cargs/default.nix
+++ b/pkgs/development/libraries/haskell/cabal-cargs/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cabal-cargs";
-  version = "0.7";
-  sha256 = "1dzmvwmb9sxwdgkzszhk9d5qvq2alnqmprx83dlb17sdi6f9jns1";
+  version = "0.7.1";
+  sha256 = "0y6v663mw4giwypdv34qr2l2fy1q7zdjvgw39m16sjna5lbwvm1n";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 8f31973d6e9165bb5fea01039f8a577d7899b543 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Aug 2014 11:57:23 +0200
Subject: [PATCH 0462/1453] haskell-compdata: update to version 0.9

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

diff --git a/pkgs/development/libraries/haskell/compdata/default.nix b/pkgs/development/libraries/haskell/compdata/default.nix
index 2e26d9ac781a..ecaec5c4dd04 100644
--- a/pkgs/development/libraries/haskell/compdata/default.nix
+++ b/pkgs/development/libraries/haskell/compdata/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "compdata";
-  version = "0.8.1.3";
-  sha256 = "0rnvw5bdypl6i2k1wnc727a17hapl4hs7n208h16ngk075841gpb";
+  version = "0.9";
+  sha256 = "1wk9vj834l3fc64fcsrgc9hz5f2z7461hs8lv1ldkfsixx4mxyqc";
   buildDepends = [
     deepseq derive mtl QuickCheck thExpandSyns transformers treeView
   ];

From 8dbf7f3262298fc4e4a60191cb37f536327dbb9b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Aug 2014 11:57:25 +0200
Subject: [PATCH 0463/1453] haskell-gitit: update to version 0.10.5

---
 .../libraries/haskell/gitit/default.nix       | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix
index 44a04cc53807..0e0f147bab9f 100644
--- a/pkgs/development/libraries/haskell/gitit/default.nix
+++ b/pkgs/development/libraries/haskell/gitit/default.nix
@@ -1,23 +1,26 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, base64Bytestring, blazeHtml, ConfigFile, feed, filepath
-, filestore, ghcPaths, happstackServer, highlightingKate, hslogger
-, HStringTemplate, HTTP, json, mtl, network, pandoc, pandocTypes
-, parsec, random, recaptcha, safe, SHA, split, syb, tagsoup, text
-, time, uri, url, utf8String, xhtml, xml, xssSanitize, zlib
+{ cabal, aeson, base64Bytestring, blazeHtml, ConfigFile, feed
+, filepath, filestore, ghcPaths, happstackServer, highlightingKate
+, hoauth2, hslogger, HStringTemplate, HTTP, httpClient
+, httpClientTls, json, mtl, network, networkUri, pandoc
+, pandocTypes, parsec, random, recaptcha, safe, SHA, split, syb
+, tagsoup, text, time, uri, url, utf8String, xhtml, xml
+, xssSanitize, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "gitit";
-  version = "0.10.4";
-  sha256 = "1z06v1pamrpm70zisrw3z3kv0d19dsjkmm75pvj5yxkacxv7qk7n";
+  version = "0.10.5";
+  sha256 = "0p2x2l729rwals0kx8ymk6j3fqvlyjvrj6mmh8slcg93h4smwb4j";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    base64Bytestring blazeHtml ConfigFile feed filepath filestore
-    ghcPaths happstackServer highlightingKate hslogger HStringTemplate
-    HTTP json mtl network pandoc pandocTypes parsec random recaptcha
-    safe SHA split syb tagsoup text time uri url utf8String xhtml xml
+    aeson base64Bytestring blazeHtml ConfigFile feed filepath filestore
+    ghcPaths happstackServer highlightingKate hoauth2 hslogger
+    HStringTemplate HTTP httpClient httpClientTls json mtl network
+    networkUri pandoc pandocTypes parsec random recaptcha safe SHA
+    split syb tagsoup text time uri url utf8String xhtml xml
     xssSanitize zlib
   ];
   jailbreak = true;
@@ -26,7 +29,5 @@ cabal.mkDerivation (self: {
     description = "Wiki using happstack, git or darcs, and pandoc";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
   };
 })

From 11ca9c9aa71e54abc1fd9f971ff3262be3a65f5b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Aug 2014 11:57:27 +0200
Subject: [PATCH 0464/1453] haskell-hplayground: update to version 0.1.0.3

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

diff --git a/pkgs/development/libraries/haskell/hplayground/default.nix b/pkgs/development/libraries/haskell/hplayground/default.nix
index b12024f59452..db38dbc23991 100644
--- a/pkgs/development/libraries/haskell/hplayground/default.nix
+++ b/pkgs/development/libraries/haskell/hplayground/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hplayground";
-  version = "0.1.0.2";
-  sha256 = "13lzw0fhv305zh2ry0d74y5k7vxppjlwsb8vi3iri5zpkkdpfhij";
+  version = "0.1.0.3";
+  sha256 = "1k46b94n9wkbh7374mjyg5jnwxxrhj8ai53q3r4lysx1rzgw7ak6";
   buildDepends = [
     dataDefault hasteCompiler hastePerch monadsTf transformers
   ];

From 4b128ae8ea1df94a0a0ed28b4ec87ce659f43210 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Aug 2014 11:57:31 +0200
Subject: [PATCH 0465/1453] haskell-lifted-async: update to version 0.2.0.2

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

diff --git a/pkgs/development/libraries/haskell/lifted-async/default.nix b/pkgs/development/libraries/haskell/lifted-async/default.nix
index 04c589b54792..97a252d13d50 100644
--- a/pkgs/development/libraries/haskell/lifted-async/default.nix
+++ b/pkgs/development/libraries/haskell/lifted-async/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "lifted-async";
-  version = "0.2.0.1";
-  sha256 = "1x3qdgy0jkqx71xndjh769lw3wrwq63k2kc33pxn6x11yyklcf1j";
+  version = "0.2.0.2";
+  sha256 = "07sqgd3lxplfwrpys4jhz0068sx99765lpx8n4nj3k117z32slgf";
   buildDepends = [ async liftedBase monadControl transformersBase ];
   testDepends = [
     async HUnit liftedBase monadControl mtl tasty tastyHunit tastyTh

From 37557002ede88252d08db5b713b789554ca70e84 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Aug 2014 11:57:33 +0200
Subject: [PATCH 0466/1453] haskell-rest-core: update to version 0.32

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

diff --git a/pkgs/development/libraries/haskell/rest-core/default.nix b/pkgs/development/libraries/haskell/rest-core/default.nix
index 134c39f9f246..53c3ede3ec12 100644
--- a/pkgs/development/libraries/haskell/rest-core/default.nix
+++ b/pkgs/development/libraries/haskell/rest-core/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "rest-core";
-  version = "0.31.1";
-  sha256 = "1cx1zmy1zr43n9nlrbar828izccpkvrvjkrda03ra9fkcjgd6qy6";
+  version = "0.32";
+  sha256 = "130kz1gsrbamw8gs4vc0fqfjh1gi7i52xxmj4fg1vl2dr77gf6my";
   buildDepends = [
     aeson aesonUtils either errors fclabels hxt hxtPickleUtils
     jsonSchema mtl multipart random restStringmap restTypes safe split

From c8baea2590021e68bc1aca3c1acaaf52b2d62879 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Aug 2014 11:57:35 +0200
Subject: [PATCH 0467/1453] haskell-rest-gen: update to version 0.14.2.1

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

diff --git a/pkgs/development/libraries/haskell/rest-gen/default.nix b/pkgs/development/libraries/haskell/rest-gen/default.nix
index afa2f612c014..012f6db8bf24 100644
--- a/pkgs/development/libraries/haskell/rest-gen/default.nix
+++ b/pkgs/development/libraries/haskell/rest-gen/default.nix
@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "rest-gen";
-  version = "0.14.2";
-  sha256 = "1hmf77hs3pp6lf4glh3lbbwfjr029js185v69bk8ycr1c4ib8nbp";
+  version = "0.14.2.1";
+  sha256 = "1dvcs25ndmzwdann5yq4567zjirirzskf9v31gkrki0im8mi9x14";
   buildDepends = [
     aeson blazeHtml Cabal codeBuilder fclabels filepath hashable
     haskellSrcExts hslogger HStringTemplate hxt jsonSchema restCore

From bcdf38e4ef90ab5e8f619854b802c5955e25f83d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Aug 2014 11:57:37 +0200
Subject: [PATCH 0468/1453] haskell-rest-happstack: update to version 0.2.10.1

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

diff --git a/pkgs/development/libraries/haskell/rest-happstack/default.nix b/pkgs/development/libraries/haskell/rest-happstack/default.nix
index 74c5f2a06cbd..4c79bc58c065 100644
--- a/pkgs/development/libraries/haskell/rest-happstack/default.nix
+++ b/pkgs/development/libraries/haskell/rest-happstack/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "rest-happstack";
-  version = "0.2.10";
-  sha256 = "1np8y0v6jnk2lw0aqlzb9dn1vlk8cg75xrhkjmm6qh0z90fy3p6z";
+  version = "0.2.10.1";
+  sha256 = "0p4km3l8n50flj9cnxvjl34pp3msxz2yq4d91r318di8pacrgnxc";
   buildDepends = [ happstackServer mtl restCore restGen utf8String ];
   meta = {
     description = "Rest driver for Happstack";

From 4781970e5409afbc84f09b412d233a1f74ca97fc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Aug 2014 11:57:39 +0200
Subject: [PATCH 0469/1453] haskell-rest-snap: update to version 0.1.17.13

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

diff --git a/pkgs/development/libraries/haskell/rest-snap/default.nix b/pkgs/development/libraries/haskell/rest-snap/default.nix
index 5305c2d113f8..8e9bc69eb013 100644
--- a/pkgs/development/libraries/haskell/rest-snap/default.nix
+++ b/pkgs/development/libraries/haskell/rest-snap/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "rest-snap";
-  version = "0.1.17.12";
-  sha256 = "0hhpscdbph34psfn2h1g0znds0cz7ja9byr6bg7jmj0h86plz8al";
+  version = "0.1.17.13";
+  sha256 = "13c143dzxhfrshn19ylqfmhnxjirixfif8d1fmzagz1v893narkz";
   buildDepends = [
     caseInsensitive restCore safe snapCore unorderedContainers
     uriEncode utf8String

From 23e4cc3d8eb5f00ba7172935826889c6ba7ab0f2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Aug 2014 11:57:41 +0200
Subject: [PATCH 0470/1453] haskell-rest-types: update to version 1.10.2

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

diff --git a/pkgs/development/libraries/haskell/rest-types/default.nix b/pkgs/development/libraries/haskell/rest-types/default.nix
index 157cab5e979c..41b8044b5931 100644
--- a/pkgs/development/libraries/haskell/rest-types/default.nix
+++ b/pkgs/development/libraries/haskell/rest-types/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "rest-types";
-  version = "1.10.1";
-  sha256 = "0i4y1s35ybly1nayqj9c2zqwikpxnzjamq24qbhg0lpqr0dpc1rg";
+  version = "1.10.2";
+  sha256 = "1j8fpv4xdhbf1awy0v9zn9a3sjwl42l6472wczp3wwwcpsi65d9q";
   buildDepends = [
     aeson genericAeson hxt jsonSchema mtl regular regularXmlpickler
     restStringmap text uuid

From e4d7f90b80210513803b45ca46a018c19a51d6cf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Aug 2014 11:57:42 +0200
Subject: [PATCH 0471/1453] haskell-rest-wai: update to version 0.1.0.3

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

diff --git a/pkgs/development/libraries/haskell/rest-wai/default.nix b/pkgs/development/libraries/haskell/rest-wai/default.nix
index 7ddb500265b1..d23d81da33de 100644
--- a/pkgs/development/libraries/haskell/rest-wai/default.nix
+++ b/pkgs/development/libraries/haskell/rest-wai/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "rest-wai";
-  version = "0.1.0.2";
-  sha256 = "06wnazy0262b2875q4km2xy9zz7l681vlfj3ny1ha9valnqr3q6w";
+  version = "0.1.0.3";
+  sha256 = "08pprgn9xnd3ipr6clify3snm4ahshlws869mfvziplc4hdcnb59";
   buildDepends = [
     caseInsensitive httpTypes mimeTypes mtl restCore restTypes text
     unorderedContainers utf8String wai

From d81a81b2317b865b8c0c38f78c159863e9ce55ab Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Aug 2014 11:57:44 +0200
Subject: [PATCH 0472/1453] haskell-shelly: update to version 1.5.5

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

diff --git a/pkgs/development/libraries/haskell/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix
index 587c42d6033e..6deaa209dc87 100644
--- a/pkgs/development/libraries/haskell/shelly/default.nix
+++ b/pkgs/development/libraries/haskell/shelly/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shelly";
-  version = "1.5.4.1";
-  sha256 = "0h38j6vkdgaddj7xardyywibdj5w0wryqxwwpc62idgzlp7mgpb2";
+  version = "1.5.5";
+  sha256 = "1865f5z5wm2qf3ccws9jy8ps7n8slkmfgn0l2m9apja3q2jajqb1";
   buildDepends = [
     async enclosedExceptions exceptions liftedAsync liftedBase
     monadControl mtl systemFileio systemFilepath text time transformers

From dc3f01d180a53fd06a1e81a2ca8835f4bda5905b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Aug 2014 11:57:46 +0200
Subject: [PATCH 0473/1453] haskell-statvfs: update to version 0.2

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

diff --git a/pkgs/development/libraries/haskell/statvfs/default.nix b/pkgs/development/libraries/haskell/statvfs/default.nix
index bb1ebb1b9d8f..15454aa0c971 100644
--- a/pkgs/development/libraries/haskell/statvfs/default.nix
+++ b/pkgs/development/libraries/haskell/statvfs/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "statvfs";
-  version = "0.1";
-  sha256 = "1v45lx7wr27f5sx7cpfsapx1r6akgf1q3hpip1ibbsbhj65ws2r2";
+  version = "0.2";
+  sha256 = "16z9fddgvf5sl7zy7p74fng9lkdw5m9i5np3q4s2h8jdi43mwmg1";
   meta = {
     description = "Get unix filesystem statistics with statfs, statvfs";
     license = self.stdenv.lib.licenses.bsd3;

From e3184a2f13f617358080124874d65ea580d2340b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Aug 2014 11:57:48 +0200
Subject: [PATCH 0474/1453] haskell-tasty-hunit: update to version 0.9

---
 .../libraries/haskell/tasty-hunit/default.nix            | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/tasty-hunit/default.nix b/pkgs/development/libraries/haskell/tasty-hunit/default.nix
index c7e5b53548fa..067e60818183 100644
--- a/pkgs/development/libraries/haskell/tasty-hunit/default.nix
+++ b/pkgs/development/libraries/haskell/tasty-hunit/default.nix
@@ -1,13 +1,14 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, HUnit, mtl, tasty }:
+{ cabal, tasty }:
 
 cabal.mkDerivation (self: {
   pname = "tasty-hunit";
-  version = "0.8.0.1";
-  sha256 = "0a84j8yjqp9x59dy5nbb50vnscb7iimgc60s8vz1p5721gqi62r5";
-  buildDepends = [ HUnit mtl tasty ];
+  version = "0.9";
+  sha256 = "1ivp9h34cdrahqy8i0y10fa0mqxa947dpbwvhr46sjja053asjxc";
+  buildDepends = [ tasty ];
   meta = {
+    homepage = "http://documentup.com/feuerbach/tasty";
     description = "HUnit support for the Tasty test framework";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;

From 9cab2fbdf5b2115957170ec79ab90f6796813ebe Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Aug 2014 11:57:52 +0200
Subject: [PATCH 0475/1453] haskell-twitter-types: update to version 0.5.0

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

diff --git a/pkgs/development/libraries/haskell/twitter-types/default.nix b/pkgs/development/libraries/haskell/twitter-types/default.nix
index 1848211dc3e8..4a3df6f1b9f8 100644
--- a/pkgs/development/libraries/haskell/twitter-types/default.nix
+++ b/pkgs/development/libraries/haskell/twitter-types/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "twitter-types";
-  version = "0.4.20140809";
-  sha256 = "0f32gjvpzcy5ld2j6mhsvaxaiyzyp5pvqjvmgawaiy78c3kxi8gh";
+  version = "0.5.0";
+  sha256 = "0nnis96rki60ily7ydq155nawmhz7dn51d1d3hwikb1vz16ji47a";
   buildDepends = [ aeson httpTypes text unorderedContainers ];
   testDepends = [
     aeson attoparsec filepath httpTypes HUnit testFramework

From 05cc6c7aa12ed7e159d7bdda9d8893e77554281e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Aug 2014 11:57:54 +0200
Subject: [PATCH 0476/1453] haskell-wai-extra: update to version 3.0.2.1

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

diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix
index 184adcc03dda..39514c8a3bd3 100644
--- a/pkgs/development/libraries/haskell/wai-extra/default.nix
+++ b/pkgs/development/libraries/haskell/wai-extra/default.nix
@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai-extra";
-  version = "3.0.2";
-  sha256 = "1xynrcm8i8iyyc4dy7nsziy0g4yc6gqx0h5vs86f85i1j0mrf3xv";
+  version = "3.0.2.1";
+  sha256 = "02jamvina7m9wjz0hd7gj309d1vcmhgdwyh9y1bfpvq29ngqkkca";
   buildDepends = [
     ansiTerminal base64Bytestring blazeBuilder caseInsensitive
     dataDefaultClass deepseq fastLogger httpTypes liftedBase network

From 66e3d388643477c4da352551979d70ef67b3a43b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Aug 2014 11:57:56 +0200
Subject: [PATCH 0477/1453] haskell-wl-pprint-terminfo: update to version
 3.7.1.1

---
 .../libraries/haskell/wl-pprint-terminfo/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix b/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix
index 5a3c75f61657..37dc11b1f0f4 100644
--- a/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix
+++ b/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wl-pprint-terminfo";
-  version = "3.7.1";
-  sha256 = "04220hgrjjsz0ir65s6ynrjgdmqlfcw49fb158w7wgxxh69kc7h6";
+  version = "3.7.1.1";
+  sha256 = "1mjnbkk3cw2v7nda7qxdkl21pmclz6m17sviqp4qf3rc8rgin3zd";
   buildDepends = [
     nats semigroups terminfo text transformers wlPprintExtras
   ];

From 99a863f3063ed1e3907e51edb7b8b8048b7b2fd6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Aug 2014 11:57:58 +0200
Subject: [PATCH 0478/1453] haskell-cabal-bounds: update to version 0.8.5

---
 pkgs/development/tools/haskell/cabal-bounds/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/haskell/cabal-bounds/default.nix b/pkgs/development/tools/haskell/cabal-bounds/default.nix
index 213ba6f9d132..97dac34af3be 100644
--- a/pkgs/development/tools/haskell/cabal-bounds/default.nix
+++ b/pkgs/development/tools/haskell/cabal-bounds/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cabal-bounds";
-  version = "0.8.4";
-  sha256 = "00vj6ca9liqlqg69d4ziacsxz6x9365sbyc1ag6g18bhibyinsh2";
+  version = "0.8.5";
+  sha256 = "19lai2gdxs76mrvcz77sjsx7hh87cf1f4qmy7z1zcd130z11q04a";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 963c45ecf89650fe40a0cf8f14e66c78271cebb3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Aug 2014 11:58:37 +0200
Subject: [PATCH 0479/1453] haskell-random: update to version 1.0.1.3

Don't update the library for GHC <= 7.4.x: https://github.com/haskell/random/issues/10
---
 .../libraries/haskell/random/1.0.1.3.nix          | 15 +++++++++++++++
 pkgs/top-level/haskell-defaults.nix               |  1 +
 pkgs/top-level/haskell-packages.nix               |  3 ++-
 3 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/haskell/random/1.0.1.3.nix

diff --git a/pkgs/development/libraries/haskell/random/1.0.1.3.nix b/pkgs/development/libraries/haskell/random/1.0.1.3.nix
new file mode 100644
index 000000000000..26763deb10a6
--- /dev/null
+++ b/pkgs/development/libraries/haskell/random/1.0.1.3.nix
@@ -0,0 +1,15 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, time }:
+
+cabal.mkDerivation (self: {
+  pname = "random";
+  version = "1.0.1.3";
+  sha256 = "06mbjx05c54iz5skn4biyjy9sqdr1qi6d33an8wya7sndnpakd21";
+  buildDepends = [ time ];
+  meta = {
+    description = "random number library";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index 20f695a0d236..3c5311b83bb9 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -62,6 +62,7 @@
     hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_16_0_3; };
     haddock = self.haddock_2_11_0;
     haskeline = super.haskeline.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
+    random = self.random_1_0_1_1;       # requires base >= 4.6.x
     shelly = self.shelly_0_15_4_1;
   };
 
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index fbff5087cc0d..7d9c9067a0e1 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2002,7 +2002,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   RangedSets = callPackage ../development/libraries/haskell/Ranged-sets {};
 
   random_1_0_1_1 = callPackage ../development/libraries/haskell/random/1.0.1.1.nix {};
-  random = self.random_1_0_1_1;
+  random_1_0_1_3 = callPackage ../development/libraries/haskell/random/1.0.1.3.nix {};
+  random = self.random_1_0_1_3;
 
   randomFu = callPackage ../development/libraries/haskell/random-fu {};
 

From 9ca9a23abe46911df25ca16253d8db7400faa4aa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Aug 2014 11:59:48 +0200
Subject: [PATCH 0480/1453] haskell-network: add version 2.6.0.1

We cannot use this version anywhere because of https://github.com/haskell/HTTP/issues/75
---
 .../libraries/haskell/network/2.6.0.1.nix        | 16 ++++++++++++++++
 pkgs/top-level/haskell-packages.nix              |  3 ++-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/haskell/network/2.6.0.1.nix

diff --git a/pkgs/development/libraries/haskell/network/2.6.0.1.nix b/pkgs/development/libraries/haskell/network/2.6.0.1.nix
new file mode 100644
index 000000000000..d5d302fbd8e6
--- /dev/null
+++ b/pkgs/development/libraries/haskell/network/2.6.0.1.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, HUnit, testFramework, testFrameworkHunit }:
+
+cabal.mkDerivation (self: {
+  pname = "network";
+  version = "2.6.0.1";
+  sha256 = "0qfffsdbvrf9gs8wr9ps7iv5h6drz4vb2ja9rprmc7ypswsacxsq";
+  testDepends = [ HUnit testFramework testFrameworkHunit ];
+  meta = {
+    homepage = "https://github.com/haskell/network";
+    description = "Low-level networking interface";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 7d9c9067a0e1..45acd27a5b82 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1711,7 +1711,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   network_2_3_1_0 = callPackage ../development/libraries/haskell/network/2.3.1.0.nix {};
   network_2_4_1_2 = callPackage ../development/libraries/haskell/network/2.4.1.2.nix {};
   network_2_5_0_0 = callPackage ../development/libraries/haskell/network/2.5.0.0.nix {};
-  network = self.network_2_5_0_0;
+  network_2_6_0_1 = callPackage ../development/libraries/haskell/network/2.6.0.1.nix {};
+  network = self.network_2_5_0_0; # the latest version break HTTP on all platforms
 
   networkCarbon = callPackage ../development/libraries/haskell/network-carbon {};
 

From af49e4a2b0b9d5d3fbb016ebaf89c29036d2b1fd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Aug 2014 12:00:52 +0200
Subject: [PATCH 0481/1453] haskell-vty: update to version 5.2.0

---
 .../libraries/haskell/vty/{5.1.4.nix => 5.2.0.nix}            | 4 ++--
 pkgs/top-level/haskell-packages.nix                           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename pkgs/development/libraries/haskell/vty/{5.1.4.nix => 5.2.0.nix} (92%)

diff --git a/pkgs/development/libraries/haskell/vty/5.1.4.nix b/pkgs/development/libraries/haskell/vty/5.2.0.nix
similarity index 92%
rename from pkgs/development/libraries/haskell/vty/5.1.4.nix
rename to pkgs/development/libraries/haskell/vty/5.2.0.nix
index 24d123d67cc8..80ccaf6db8ed 100644
--- a/pkgs/development/libraries/haskell/vty/5.1.4.nix
+++ b/pkgs/development/libraries/haskell/vty/5.2.0.nix
@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "vty";
-  version = "5.1.4";
-  sha256 = "157saacy6lp2ngl0dz9ri4ji1vj191d1239x1xykna8y618r0vqf";
+  version = "5.2.0";
+  sha256 = "0mlh90i44fb6hlifb2gwb9ny68zgg7m6xq3v6bz3dmqfz6dnlf8v";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 45acd27a5b82..c437e6d582c0 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2667,8 +2667,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   void = callPackage ../development/libraries/haskell/void {};
 
   vty_4_7_5 = callPackage ../development/libraries/haskell/vty/4.7.5.nix {};
-  vty_5_1_4 = callPackage ../development/libraries/haskell/vty/5.1.4.nix {};
-  vty = self.vty_5_1_4;
+  vty_5_2_0 = callPackage ../development/libraries/haskell/vty/5.2.0.nix {};
+  vty = self.vty_5_2_0;
 
   vtyUi = callPackage ../development/libraries/haskell/vty-ui {
     vty = self.vty_4_7_5;

From 5ec6492ea078a1710f027e49bdd7c0e7ab45babf Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Sun, 24 Aug 2014 03:30:21 -0700
Subject: [PATCH 0482/1453] Mark yi and yi-contrib as broken

They no longer build with lens v4.4.0.1 and up
---
 pkgs/applications/editors/yi/yi-contrib.nix | 2 ++
 pkgs/applications/editors/yi/yi.nix         | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/pkgs/applications/editors/yi/yi-contrib.nix b/pkgs/applications/editors/yi/yi-contrib.nix
index 59b6992a3692..2678f0a00489 100644
--- a/pkgs/applications/editors/yi/yi-contrib.nix
+++ b/pkgs/applications/editors/yi/yi-contrib.nix
@@ -13,7 +13,9 @@ cabal.mkDerivation (self: {
     homepage = "http://haskell.org/haskellwiki/Yi";
     description = "Add-ons to Yi, the Haskell-Scriptable Editor";
     license = "GPL";
+    broken = true;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
     maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
   };
 })
diff --git a/pkgs/applications/editors/yi/yi.nix b/pkgs/applications/editors/yi/yi.nix
index ae5e9a83452f..9b9287a50f12 100644
--- a/pkgs/applications/editors/yi/yi.nix
+++ b/pkgs/applications/editors/yi/yi.nix
@@ -58,6 +58,8 @@ cabal.mkDerivation (self: {
     description = "The Haskell-Scriptable Editor";
     license = self.stdenv.lib.licenses.gpl2;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
     maintainers = [ self.stdenv.lib.maintainers.fuuzetsu ];
+    broken = true;
   };
 })

From cbc67e17043adc8c019d30d961986233571b7aba Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Aug 2014 12:57:51 +0200
Subject: [PATCH 0483/1453] hsyslog: build with a recent version of Cabal on
 GHC 6.10.4 (and don't run Haddock)

---
 pkgs/development/libraries/haskell/hsyslog/default.nix | 1 +
 pkgs/top-level/haskell-defaults.nix                    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/haskell/hsyslog/default.nix b/pkgs/development/libraries/haskell/hsyslog/default.nix
index 1a5cbd5b8e63..89bd035eaf10 100644
--- a/pkgs/development/libraries/haskell/hsyslog/default.nix
+++ b/pkgs/development/libraries/haskell/hsyslog/default.nix
@@ -7,6 +7,7 @@ cabal.mkDerivation (self: {
   version = "2.0";
   sha256 = "02v698grn43bvikqhqiz9ys8x2amngdmhvl3i0ar9203p2x8q3pq";
   testDepends = [ doctest ];
+  noHaddock = self.stdenv.lib.versionOlder self.ghc.version "6.11";
   meta = {
     homepage = "http://github.com/peti/hsyslog";
     description = "FFI interface to syslog(3) from POSIX.1-2001";
diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index 3c5311b83bb9..10d453c1d6c2 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -119,6 +119,7 @@
     happy = super.happy.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
     hashable = super.hashable.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
     hashtables = super.hashtables.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
+    hsyslog = super.hsyslog.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
     HTTP = super.HTTP.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
     HUnit = super.HUnit.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
     network = super.network_2_2_1_7.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };

From d72b7796d1a479cae6e9c18b3ae65677ffaee6b9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Aug 2014 13:08:46 +0200
Subject: [PATCH 0484/1453] haskell-MonadRandom: add version 0.2

We cannot use it anywhere except HEAD, unfortunately, because the
package depends on transformers 0.4.x, which is a core package and
cannot be updated.
---
 .../MonadRandom/{default.nix => 0.1.13.nix}       |  0
 .../libraries/haskell/MonadRandom/0.2.nix         | 15 +++++++++++++++
 pkgs/top-level/haskell-defaults.nix               |  1 +
 pkgs/top-level/haskell-packages.nix               |  4 +++-
 4 files changed, 19 insertions(+), 1 deletion(-)
 rename pkgs/development/libraries/haskell/MonadRandom/{default.nix => 0.1.13.nix} (100%)
 create mode 100644 pkgs/development/libraries/haskell/MonadRandom/0.2.nix

diff --git a/pkgs/development/libraries/haskell/MonadRandom/default.nix b/pkgs/development/libraries/haskell/MonadRandom/0.1.13.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/MonadRandom/default.nix
rename to pkgs/development/libraries/haskell/MonadRandom/0.1.13.nix
diff --git a/pkgs/development/libraries/haskell/MonadRandom/0.2.nix b/pkgs/development/libraries/haskell/MonadRandom/0.2.nix
new file mode 100644
index 000000000000..e40a3d8a2c65
--- /dev/null
+++ b/pkgs/development/libraries/haskell/MonadRandom/0.2.nix
@@ -0,0 +1,15 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, mtl, random, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "MonadRandom";
+  version = "0.2";
+  sha256 = "0wxn1n47mx7npxzc6iv2hj3ikj3d0s11xsndz2gfm9y5pwm3h44c";
+  buildDepends = [ mtl random transformers ];
+  meta = {
+    description = "Random-number generation monad";
+    license = "unknown";
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index 10d453c1d6c2..bcdcddbc8524 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -23,6 +23,7 @@
   ghc783Prefs = self : super : ghcHEADPrefs self super // {
     cabalInstall_1_20_0_3 = super.cabalInstall_1_20_0_3.override { Cabal = self.Cabal_1_20_0_2; };
     codex = super.codex.override { hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_20_0_2; }; };
+    MonadRandom = self.MonadRandom_0_1_13; # requires transformers >= 0.4.x
     mtl = self.mtl_2_1_2;
   };
 
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index c437e6d582c0..66245c72e360 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1623,7 +1623,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   MonadPrompt = callPackage ../development/libraries/haskell/MonadPrompt {};
 
-  MonadRandom = callPackage ../development/libraries/haskell/MonadRandom {};
+  MonadRandom_0_1_13 = callPackage ../development/libraries/haskell/MonadRandom/0.1.13.nix {};
+  MonadRandom_0_2 = callPackage ../development/libraries/haskell/MonadRandom/0.2.nix {};
+  MonadRandom = self.MonadRandom_0_2;
 
   monadStm = callPackage ../development/libraries/haskell/monad-stm {};
 

From 70d2f6928d7768e6975dfe8853e4541b7d7b9719 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Aug 2014 13:10:57 +0200
Subject: [PATCH 0485/1453] Re-generate Haskell packages with cabal2nix.

---
 pkgs/development/libraries/haskell/MonadRandom/0.1.13.nix | 1 +
 pkgs/development/libraries/haskell/network/2.5.0.0.nix    | 1 +
 pkgs/development/libraries/haskell/random/1.0.1.1.nix     | 1 +
 3 files changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/haskell/MonadRandom/0.1.13.nix b/pkgs/development/libraries/haskell/MonadRandom/0.1.13.nix
index fb2415fd6fa0..0cbd926b1f18 100644
--- a/pkgs/development/libraries/haskell/MonadRandom/0.1.13.nix
+++ b/pkgs/development/libraries/haskell/MonadRandom/0.1.13.nix
@@ -11,5 +11,6 @@ cabal.mkDerivation (self: {
     description = "Random-number generation monad";
     license = "unknown";
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
   };
 })
diff --git a/pkgs/development/libraries/haskell/network/2.5.0.0.nix b/pkgs/development/libraries/haskell/network/2.5.0.0.nix
index dd4278a0052e..59a338a79077 100644
--- a/pkgs/development/libraries/haskell/network/2.5.0.0.nix
+++ b/pkgs/development/libraries/haskell/network/2.5.0.0.nix
@@ -17,5 +17,6 @@ cabal.mkDerivation (self: {
     description = "Low-level networking interface";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
   };
 })
diff --git a/pkgs/development/libraries/haskell/random/1.0.1.1.nix b/pkgs/development/libraries/haskell/random/1.0.1.1.nix
index 5a64573a8903..031c251fbb7b 100644
--- a/pkgs/development/libraries/haskell/random/1.0.1.1.nix
+++ b/pkgs/development/libraries/haskell/random/1.0.1.1.nix
@@ -11,5 +11,6 @@ cabal.mkDerivation (self: {
     description = "random number library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
   };
 })

From cd274d60b210462d82df8bc01e294836b73b3c1d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Aug 2014 13:24:16 +0200
Subject: [PATCH 0486/1453] haskell-json-schema: jailbreak to fix build with
 tasty-hunit 0.9.x

---
 pkgs/development/libraries/haskell/json-schema/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/json-schema/default.nix b/pkgs/development/libraries/haskell/json-schema/default.nix
index 4eb407646730..8ae6763d0a43 100644
--- a/pkgs/development/libraries/haskell/json-schema/default.nix
+++ b/pkgs/development/libraries/haskell/json-schema/default.nix
@@ -17,6 +17,7 @@ cabal.mkDerivation (self: {
     aeson attoparsec genericAeson HUnit tagged tasty tastyHunit tastyTh
     text
   ];
+  jailbreak = true;
   meta = {
     description = "Types and type classes for defining JSON schemas";
     license = self.stdenv.lib.licenses.bsd3;

From 7287a9fd846eb0ea60e06494d1d7cc5d6154c09e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Aug 2014 14:44:48 +0200
Subject: [PATCH 0487/1453] haskell-hcltest: mark "broken"

Can't deal with lens 4.4: http://hydra.cryp.to/build/180379/nixlog/1/raw
---
 pkgs/development/libraries/haskell/hcltest/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/haskell/hcltest/default.nix b/pkgs/development/libraries/haskell/hcltest/default.nix
index af598965498e..01f683b55683 100644
--- a/pkgs/development/libraries/haskell/hcltest/default.nix
+++ b/pkgs/development/libraries/haskell/hcltest/default.nix
@@ -20,5 +20,7 @@ cabal.mkDerivation (self: {
     description = "A testing library for command line applications";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
+    broken = true;
   };
 })

From bd672dc335058c96af6319ef78b32e14c0476b32 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Aug 2014 19:37:41 +0200
Subject: [PATCH 0488/1453] haskell-arbtt: update to version 0.8.1.1

---
 pkgs/applications/misc/arbtt/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/arbtt/default.nix b/pkgs/applications/misc/arbtt/default.nix
index 0c3939b5c256..6e4c041ee3d1 100644
--- a/pkgs/applications/misc/arbtt/default.nix
+++ b/pkgs/applications/misc/arbtt/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "arbtt";
-  version = "0.8.1";
-  sha256 = "1qzmqjm8pfj59h0hrm28pp6qhzz2am5xq81mirnnchsgg52wrfn0";
+  version = "0.8.1.1";
+  sha256 = "1qid9qs0sjyqpbnv20rmwjkibjsic9p4kil7gjhwi6panfan9x10";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
@@ -21,7 +21,6 @@ cabal.mkDerivation (self: {
     tastyGolden tastyHunit time transformers utf8String
   ];
   extraLibraries = [ libXScrnSaver ];
-  jailbreak = true;
   meta = {
     homepage = "http://arbtt.nomeata.de/";
     description = "Automatic Rule-Based Time Tracker";

From e7b4a47f449c909e2f57458d93423cd130813d79 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Aug 2014 19:37:43 +0200
Subject: [PATCH 0489/1453] haskell-auto-update: update to version 0.1.1.2

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

diff --git a/pkgs/development/libraries/haskell/auto-update/default.nix b/pkgs/development/libraries/haskell/auto-update/default.nix
index b7c314f9ff97..e047e938dae2 100644
--- a/pkgs/development/libraries/haskell/auto-update/default.nix
+++ b/pkgs/development/libraries/haskell/auto-update/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "auto-update";
-  version = "0.1.1.1";
-  sha256 = "0ksclbh3d7p2511ji86ind8f6jrh58mz61mc441kfz51ippkdk59";
+  version = "0.1.1.2";
+  sha256 = "0901zqky70wyxl17vwz6smhnpsfjnsk0f2xqiyz902vl7apx66c6";
   testDepends = [ hspec ];
   meta = {
     homepage = "https://github.com/yesodweb/wai";

From 9d4faaddbcc37368d2bbe366e34101d863612677 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Aug 2014 19:37:45 +0200
Subject: [PATCH 0490/1453] haskell-yaml: update to version 0.8.9

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

diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix
index b5438fabc123..26cb0dec098d 100644
--- a/pkgs/development/libraries/haskell/yaml/default.nix
+++ b/pkgs/development/libraries/haskell/yaml/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yaml";
-  version = "0.8.8.4";
-  sha256 = "1mh5xv66cqvk0r5n6pwcm11m9489y40l69ca417yvymkksmncc7b";
+  version = "0.8.9";
+  sha256 = "13qqqil19yi1qbl9gqma6kxwkz8j5iq6z347fabk916gy9jng3dl";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From c6107230dc4a3975ae8c9086850a5b3c0e25a9f2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Aug 2014 19:38:48 +0200
Subject: [PATCH 0491/1453] haskell-ghc-mod: update to version 5.0.1.1

---
 .../haskell/ghc-mod/{5.0.1.nix => 5.0.1.1.nix}        | 11 ++++-------
 pkgs/top-level/haskell-packages.nix                   | 10 ++--------
 2 files changed, 6 insertions(+), 15 deletions(-)
 rename pkgs/development/libraries/haskell/ghc-mod/{5.0.1.nix => 5.0.1.1.nix} (84%)

diff --git a/pkgs/development/libraries/haskell/ghc-mod/5.0.1.nix b/pkgs/development/libraries/haskell/ghc-mod/5.0.1.1.nix
similarity index 84%
rename from pkgs/development/libraries/haskell/ghc-mod/5.0.1.nix
rename to pkgs/development/libraries/haskell/ghc-mod/5.0.1.1.nix
index 1151cdfa51da..3eefe056218d 100644
--- a/pkgs/development/libraries/haskell/ghc-mod/5.0.1.nix
+++ b/pkgs/development/libraries/haskell/ghc-mod/5.0.1.1.nix
@@ -2,14 +2,14 @@
 
 { cabal, Cabal, convertible, deepseq, djinnGhc, doctest, emacs
 , filepath, ghcPaths, ghcSybUtils, haskellSrcExts, hlint, hspec
-, ioChoice, monadControl, monadJournal, mtl, split, syb, text, time
-, transformers, transformersBase, makeWrapper
+, ioChoice, makeWrapper, monadControl, monadJournal, mtl, split
+, syb, text, time, transformers, transformersBase
 }:
 
 cabal.mkDerivation (self: {
   pname = "ghc-mod";
-  version = "5.0.1";
-  sha256 = "01awsi5rfzq6433shfvvnr69ifxb7h8v90mlknxv3dl34zmrhv19";
+  version = "5.0.1.1";
+  sha256 = "0qyl1653dj14ap3035kjj7xl8rsmgpwh32bj2lnwrmdm2223m8a3";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -25,8 +25,6 @@ cabal.mkDerivation (self: {
   buildTools = [ emacs makeWrapper ];
   doCheck = false;
   configureFlags = "--datasubdir=${self.pname}-${self.version}";
-  # The method used below to wrap ghc-mod and ghc-modi was borrowed from the
-  # wrapper for haddock.
   postInstall = ''
     cd $out/share/$pname-$version
     make
@@ -34,7 +32,6 @@ cabal.mkDerivation (self: {
     cd ..
     ensureDir "$out/share/emacs"
     mv $pname-$version emacs/site-lisp
-
     wrapProgram $out/bin/ghc-mod --add-flags \
       "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"-g -package-db -g\")"
     wrapProgram $out/bin/ghc-modi --add-flags \
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 66245c72e360..d5a94dcabeb2 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -899,14 +899,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   ghcjsCodemirror = callPackage ../development/libraries/haskell/ghcjs-codemirror {};
 
-  ghcMod_4_1_6 = callPackage ../development/libraries/haskell/ghc-mod/4.1.6.nix {
-    inherit (pkgs) emacs;
-  };
-
-  ghcMod_5_0_1 = callPackage ../development/libraries/haskell/ghc-mod/5.0.1.nix {
-    inherit (pkgs) emacs;
-  };
-
+  ghcMod_4_1_6 = callPackage ../development/libraries/haskell/ghc-mod/4.1.6.nix { inherit (pkgs) emacs; };
+  ghcMod_5_0_1_1 = callPackage ../development/libraries/haskell/ghc-mod/5.0.1.1.nix { inherit (pkgs) emacs; };
   ghcMod = self.ghcMod_4_1_6;
 
   ghcMtl = callPackage ../development/libraries/haskell/ghc-mtl {};

From adfb7f8daa036f4f2b126a5c980666fa54ef0528 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Aug 2014 19:40:43 +0200
Subject: [PATCH 0492/1453] haskell-MonadRandom: don't try to build version 0.2
 on Hydra

---
 pkgs/development/libraries/haskell/MonadRandom/0.2.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/MonadRandom/0.2.nix b/pkgs/development/libraries/haskell/MonadRandom/0.2.nix
index e40a3d8a2c65..a0f9a2f641fb 100644
--- a/pkgs/development/libraries/haskell/MonadRandom/0.2.nix
+++ b/pkgs/development/libraries/haskell/MonadRandom/0.2.nix
@@ -11,5 +11,6 @@ cabal.mkDerivation (self: {
     description = "Random-number generation monad";
     license = "unknown";
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
   };
 })

From 5af8b24cf28e959b7ec9cb2824f2f882ef72fe54 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Aug 2014 19:43:29 +0200
Subject: [PATCH 0493/1453] haskell-twitter-conduit: mark package broken
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Web/Twitter/Conduit/Api.hs:643:39:
    Ambiguous occurrence ‘UploadedMedia’
    It could refer to either ‘Web.Twitter.Types.UploadedMedia’,
                             imported from ‘Web.Twitter.Types’ at Web/Twitter/Conduit/Api.hs:136:1-24
                          or ‘Web.Twitter.Conduit.Types.UploadedMedia’,
                             imported from ‘Web.Twitter.Conduit.Types’ at Web/Twitter/Conduit/Api.hs:137:1-32
                             (and originally defined
                                at Web/Twitter/Conduit/Types.hs:(99,1)-(103,19))
---
 pkgs/development/libraries/haskell/twitter-conduit/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/haskell/twitter-conduit/default.nix b/pkgs/development/libraries/haskell/twitter-conduit/default.nix
index 5b0bf7cd4081..0d5766800442 100644
--- a/pkgs/development/libraries/haskell/twitter-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/twitter-conduit/default.nix
@@ -31,5 +31,7 @@ cabal.mkDerivation (self: {
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
+    hydraPlatforms = self.stdenv.lib.platforms.none;
+    broken = true;
   };
 })

From 09b7323abf1eb411054f67aea1a266e260b5b078 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Aug 2014 19:55:14 +0200
Subject: [PATCH 0494/1453] haskell-yesod-core: disable test suite to fix the
 build

https://github.com/yesodweb/yesod/issues/813
---
 pkgs/development/libraries/haskell/yesod-core/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix
index 90d354a22cff..8f3b90db6c7a 100644
--- a/pkgs/development/libraries/haskell/yesod-core/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-core/default.nix
@@ -31,6 +31,7 @@ cabal.mkDerivation (self: {
     transformers wai waiExtra waiTest
   ];
   jailbreak = true;
+  doCheck = false;
   meta = {
     homepage = "http://www.yesodweb.com/";
     description = "Creation of type-safe, RESTful web applications";

From 2a6c7e2874a3ada9b1c544db61402e03091556db Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Aug 2014 19:55:27 +0200
Subject: [PATCH 0495/1453] arbtt: jailbreak to fix the build

---
 pkgs/applications/misc/arbtt/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/misc/arbtt/default.nix b/pkgs/applications/misc/arbtt/default.nix
index 6e4c041ee3d1..239305c546e7 100644
--- a/pkgs/applications/misc/arbtt/default.nix
+++ b/pkgs/applications/misc/arbtt/default.nix
@@ -21,6 +21,7 @@ cabal.mkDerivation (self: {
     tastyGolden tastyHunit time transformers utf8String
   ];
   extraLibraries = [ libXScrnSaver ];
+  jailbreak = true;
   meta = {
     homepage = "http://arbtt.nomeata.de/";
     description = "Automatic Rule-Based Time Tracker";

From c9baba9212feb6e39151118647d45b34b029a6df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 24 Aug 2014 16:21:08 +0200
Subject: [PATCH 0496/1453] Fix many package descriptions

(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
---
 pkgs/applications/audio/beast/default.nix                | 2 +-
 pkgs/applications/audio/cmus/default.nix                 | 2 +-
 pkgs/applications/audio/moc/default.nix                  | 2 +-
 pkgs/applications/audio/mp3info/default.nix              | 2 +-
 pkgs/applications/audio/mpc123/default.nix               | 2 +-
 pkgs/applications/audio/mpg321/default.nix               | 2 +-
 pkgs/applications/audio/pamixer/default.nix              | 2 +-
 pkgs/applications/audio/spotify/default.nix              | 2 +-
 pkgs/applications/editors/ed/default.nix                 | 2 +-
 pkgs/applications/editors/mg/default.nix                 | 2 +-
 pkgs/applications/editors/texmacs/default.nix            | 2 +-
 pkgs/applications/graphics/geeqie/default.nix            | 2 +-
 pkgs/applications/graphics/grafx2/default.nix            | 2 +-
 pkgs/applications/graphics/jbrout/default.nix            | 2 +-
 pkgs/applications/graphics/ocrad/default.nix             | 2 +-
 pkgs/applications/graphics/qiv/default.nix               | 2 +-
 pkgs/applications/graphics/ufraw/default.nix             | 2 +-
 pkgs/applications/graphics/viewnior/default.nix          | 2 +-
 pkgs/applications/graphics/xaos/default.nix              | 2 +-
 pkgs/applications/misc/bitcoin/default.nix               | 2 +-
 pkgs/applications/misc/camlistore/default.nix            | 2 +-
 pkgs/applications/misc/gpsbabel/default.nix              | 2 +-
 pkgs/applications/misc/gv/default.nix                    | 2 +-
 pkgs/applications/misc/posterazor/default.nix            | 2 +-
 pkgs/applications/misc/stardict/stardict.nix             | 3 +--
 pkgs/applications/misc/tangogps/default.nix              | 2 +-
 pkgs/applications/misc/viking/default.nix                | 2 +-
 pkgs/applications/misc/wordnet/default.nix               | 2 +-
 pkgs/applications/misc/xfe/default.nix                   | 2 +-
 .../applications/networking/browsers/firefox/default.nix | 2 +-
 pkgs/applications/networking/browsers/opera/default.nix  | 2 +-
 pkgs/applications/networking/ids/snort/default.nix       | 2 +-
 .../networking/instant-messengers/bitlbee/default.nix    | 2 +-
 .../networking/instant-messengers/carrier/2.5.0.nix      | 2 +-
 .../networking/instant-messengers/ekiga/default.nix      | 2 +-
 .../networking/instant-messengers/fuze/default.nix       | 2 +-
 .../networking/instant-messengers/hipchat/default.nix    | 2 +-
 .../networking/instant-messengers/pidgin/default.nix     | 2 +-
 pkgs/applications/networking/jmeter/default.nix          | 2 +-
 .../networking/mailreaders/notmuch/default.nix           | 3 +--
 .../applications/networking/newsreaders/slrn/default.nix | 2 +-
 pkgs/applications/networking/p2p/gnunet/default.nix      | 2 +-
 pkgs/applications/networking/remote/rdesktop/default.nix | 2 +-
 pkgs/applications/networking/remote/remmina/default.nix  | 2 +-
 pkgs/applications/networking/syncthing/default.nix       | 2 +-
 pkgs/applications/office/gnucash/default.nix             | 2 +-
 pkgs/applications/office/libreoffice/default.nix         | 2 +-
 pkgs/applications/science/astronomy/gravit/default.nix   | 2 +-
 pkgs/applications/science/biology/emboss/default.nix     | 2 +-
 pkgs/applications/science/logic/alt-ergo/default.nix     | 2 +-
 pkgs/applications/science/logic/coq/default.nix          | 2 +-
 pkgs/applications/science/logic/matita/default.nix       | 2 +-
 pkgs/applications/science/logic/prooftree/default.nix    | 2 +-
 pkgs/applications/science/logic/twelf/default.nix        | 2 +-
 pkgs/applications/science/math/fricas/default.nix        | 2 +-
 pkgs/applications/science/math/glsurf/default.nix        | 2 +-
 pkgs/applications/science/math/jags/default.nix          | 2 +-
 pkgs/applications/science/math/maxima/default.nix        | 2 +-
 pkgs/applications/science/misc/fityk/default.nix         | 2 +-
 pkgs/applications/science/misc/simgrid/default.nix       | 2 +-
 .../science/molecular-dynamics/gromacs/default.nix       | 2 +-
 pkgs/applications/science/spyder/default.nix             | 2 +-
 .../version-management/git-and-tools/git/default.nix     | 2 +-
 pkgs/applications/version-management/rcs/default.nix     | 2 +-
 pkgs/applications/video/gnash/default.nix                | 2 +-
 pkgs/applications/video/kino/default.nix                 | 2 +-
 pkgs/applications/video/xbmc/default.nix                 | 2 +-
 pkgs/applications/window-managers/ratpoison/default.nix  | 2 +-
 pkgs/desktops/e17/enlightenment/default.nix              | 2 +-
 pkgs/development/compilers/bigloo/default.nix            | 2 +-
 pkgs/development/compilers/gambit/default.nix            | 2 +-
 pkgs/development/compilers/hugs/default.nix              | 2 +-
 pkgs/development/compilers/ikarus/default.nix            | 2 +-
 pkgs/development/compilers/mercury/default.nix           | 2 +-
 pkgs/development/compilers/ocaml/3.10.0.nix              | 2 +-
 pkgs/development/compilers/ocaml/3.11.2.nix              | 2 +-
 pkgs/development/compilers/ocaml/3.12.1.nix              | 2 +-
 pkgs/development/compilers/ocaml/4.00.1.nix              | 2 +-
 pkgs/development/compilers/ocaml/4.01.0.nix              | 2 +-
 pkgs/development/compilers/ocaml/ber-metaocaml-003.nix   | 2 +-
 pkgs/development/compilers/qi/default.nix                | 2 +-
 pkgs/development/compilers/rdmd/default.nix              | 2 +-
 pkgs/development/compilers/scala/default.nix             | 2 +-
 pkgs/development/compilers/tinycc/default.nix            | 2 +-
 pkgs/development/interpreters/guile/default.nix          | 2 +-
 pkgs/development/interpreters/maude/default.nix          | 2 +-
 pkgs/development/interpreters/php/5.3.nix                | 2 +-
 pkgs/development/interpreters/php/5.4.nix                | 2 +-
 pkgs/development/interpreters/pypy/2.3/default.nix       | 2 +-
 pkgs/development/libraries/boost/1.44.nix                | 2 +-
 pkgs/development/libraries/boost/1.49.nix                | 2 +-
 pkgs/development/libraries/boost/1.55.nix                | 2 +-
 pkgs/development/libraries/ccrtp/default.nix             | 2 +-
 pkgs/development/libraries/celt/default.nix              | 2 +-
 pkgs/development/libraries/cfitsio/default.nix           | 2 +-
 pkgs/development/libraries/check/default.nix             | 2 +-
 pkgs/development/libraries/chipmunk/default.nix          | 2 +-
 pkgs/development/libraries/cloog/default.nix             | 2 +-
 pkgs/development/libraries/clutter-gst/default.nix       | 2 +-
 pkgs/development/libraries/clutter/default.nix           | 2 +-
 pkgs/development/libraries/fox/default.nix               | 2 +-
 pkgs/development/libraries/gettext/default.nix           | 2 +-
 pkgs/development/libraries/glib/default.nix              | 2 +-
 pkgs/development/libraries/glog/default.nix              | 2 +-
 pkgs/development/libraries/gmp/4.3.2.nix                 | 2 +-
 pkgs/development/libraries/gmp/5.0.5.nix                 | 2 +-
 pkgs/development/libraries/gmp/5.1.x.nix                 | 2 +-
 pkgs/development/libraries/gss/default.nix               | 2 +-
 .../libraries/gstreamer/legacy/gnonlin/default.nix       | 2 +-
 .../libraries/gstreamer/legacy/gstreamer/default.nix     | 2 +-
 pkgs/development/libraries/gtkimageview/default.nix      | 2 +-
 pkgs/development/libraries/gtkmathview/default.nix       | 2 +-
 pkgs/development/libraries/gupnp/default.nix             | 2 +-
 pkgs/development/libraries/hwloc/default.nix             | 2 +-
 pkgs/development/libraries/jasper/default.nix            | 2 +-
 pkgs/development/libraries/java/classpath/default.nix    | 2 +-
 pkgs/development/libraries/java/rhino/default.nix        | 2 +-
 pkgs/development/libraries/libassuan/default.nix         | 2 +-
 pkgs/development/libraries/libcddb/default.nix           | 2 +-
 pkgs/development/libraries/libchamplain/default.nix      | 2 +-
 pkgs/development/libraries/libchop/default.nix           | 2 +-
 pkgs/development/libraries/libdaemon/default.nix         | 2 +-
 pkgs/development/libraries/libdnet/default.nix           | 2 +-
 pkgs/development/libraries/libelf/default.nix            | 2 +-
 pkgs/development/libraries/libevent/default.nix          | 2 +-
 pkgs/development/libraries/libextractor/default.nix      | 2 +-
 pkgs/development/libraries/libgcrypt/default.nix         | 2 +-
 pkgs/development/libraries/libiconv/default.nix          | 2 +-
 pkgs/development/libraries/libidn/default.nix            | 2 +-
 pkgs/development/libraries/libksba/default.nix           | 2 +-
 pkgs/development/libraries/libmicrohttpd/default.nix     | 2 +-
 pkgs/development/libraries/libofa/default.nix            | 2 +-
 pkgs/development/libraries/libsigsegv/default.nix        | 2 +-
 pkgs/development/libraries/libspectre/default.nix        | 2 +-
 pkgs/development/libraries/libtasn1/default.nix          | 2 +-
 pkgs/development/libraries/libunistring/default.nix      | 2 +-
 pkgs/development/libraries/libxmi/default.nix            | 2 +-
 pkgs/development/libraries/lightning/default.nix         | 2 +-
 pkgs/development/libraries/ming/default.nix              | 2 +-
 pkgs/development/libraries/mpc/default.nix               | 2 +-
 pkgs/development/libraries/mpfr/default.nix              | 2 +-
 pkgs/development/libraries/mpich2/default.nix            | 2 +-
 pkgs/development/libraries/ncurses/default.nix           | 2 +-
 pkgs/development/libraries/nettle/default.nix            | 2 +-
 pkgs/development/libraries/oniguruma/default.nix         | 2 +-
 pkgs/development/libraries/opal/default.nix              | 2 +-
 pkgs/development/libraries/openal/default.nix            | 2 +-
 pkgs/development/libraries/plib/default.nix              | 2 +-
 pkgs/development/libraries/ppl/default.nix               | 2 +-
 pkgs/development/libraries/readline/readline6.3.nix      | 2 +-
 pkgs/development/libraries/readline/readline6.nix        | 2 +-
 .../libraries/science/biology/biolib/default.nix         | 2 +-
 pkgs/development/libraries/szip/default.nix              | 4 +---
 pkgs/development/libraries/talloc/default.nix            | 2 +-
 pkgs/development/libraries/tdb/default.nix               | 2 +-
 pkgs/development/libraries/tecla/default.nix             | 2 +-
 pkgs/development/libraries/ucommon/default.nix           | 2 +-
 pkgs/development/libraries/v8/default.nix                | 2 +-
 pkgs/development/libraries/xapian/default.nix            | 2 +-
 pkgs/development/libraries/xbase/default.nix             | 2 +-
 pkgs/development/libraries/xylib/default.nix             | 2 +-
 pkgs/development/python-modules/ecdsa/default.nix        | 4 ++--
 pkgs/development/python-modules/numeric/default.nix      | 4 ++--
 pkgs/development/tools/analysis/lcov/default.nix         | 2 +-
 pkgs/development/tools/analysis/sparse/default.nix       | 2 +-
 pkgs/development/tools/analysis/valgrind/default.nix     | 2 +-
 pkgs/development/tools/build-managers/gradle/default.nix | 2 +-
 pkgs/development/tools/documentation/doxygen/default.nix | 2 +-
 pkgs/development/tools/java/fastjar/default.nix          | 2 +-
 pkgs/development/tools/misc/binutils/default.nix         | 2 +-
 pkgs/development/tools/misc/cflow/default.nix            | 2 +-
 pkgs/development/tools/misc/coccinelle/default.nix       | 2 +-
 pkgs/development/tools/misc/complexity/default.nix       | 2 +-
 pkgs/development/tools/misc/cppi/default.nix             | 2 +-
 pkgs/development/tools/misc/cscope/default.nix           | 2 +-
 pkgs/development/tools/misc/ctags/default.nix            | 2 +-
 pkgs/development/tools/misc/gdb/default.nix              | 2 +-
 pkgs/development/tools/misc/gengetopt/default.nix        | 2 +-
 pkgs/development/tools/misc/global/default.nix           | 2 +-
 pkgs/development/tools/misc/gperf/default.nix            | 2 +-
 pkgs/development/tools/misc/help2man/default.nix         | 2 +-
 pkgs/development/tools/misc/libtool/default.nix          | 2 +-
 pkgs/development/tools/misc/sloccount/default.nix        | 2 +-
 pkgs/development/tools/misc/swig/default.nix             | 2 +-
 pkgs/development/tools/misc/texinfo/4.13a.nix            | 2 +-
 pkgs/development/tools/misc/texinfo/5.2.nix              | 2 +-
 pkgs/development/tools/ocaml/omake/default.nix           | 2 +-
 pkgs/development/tools/parsing/bison/2.x.nix             | 2 +-
 pkgs/development/tools/parsing/bison/3.x.nix             | 2 +-
 pkgs/development/tools/profiling/oprofile/default.nix    | 2 +-
 pkgs/development/tools/profiling/sysprof/default.nix     | 2 +-
 pkgs/development/tools/sqsh/default.nix                  | 2 +-
 pkgs/games/banner/default.nix                            | 2 +-
 pkgs/games/chessdb/default.nix                           | 2 +-
 pkgs/games/construo/default.nix                          | 2 +-
 pkgs/games/crafty/default.nix                            | 2 +-
 pkgs/games/eboard/default.nix                            | 2 +-
 pkgs/games/openspades/default.nix                        | 2 +-
 pkgs/games/openttd/default.nix                           | 2 +-
 pkgs/games/opentyrian/default.nix                        | 2 +-
 pkgs/games/teeworlds/default.nix                         | 2 +-
 pkgs/misc/ghostscript/default.nix                        | 4 ++--
 pkgs/misc/xosd/default.nix                               | 2 +-
 pkgs/os-specific/linux/conky/default.nix                 | 2 +-
 pkgs/servers/dico/default.nix                            | 2 +-
 pkgs/servers/dns/bind/default.nix                        | 2 +-
 pkgs/servers/felix/default.nix                           | 2 +-
 pkgs/servers/firebird/default.nix                        | 2 +-
 pkgs/servers/http/couchdb/default.nix                    | 2 +-
 pkgs/servers/http/jboss/default.nix                      | 2 +-
 pkgs/servers/pies/default.nix                            | 2 +-
 pkgs/servers/pulseaudio/default.nix                      | 2 +-
 pkgs/servers/shishi/default.nix                          | 2 +-
 pkgs/shells/rush/default.nix                             | 2 +-
 pkgs/tools/X11/hsetroot/default.nix                      | 2 +-
 pkgs/tools/X11/wmctrl/default.nix                        | 2 +-
 pkgs/tools/X11/xnee/default.nix                          | 2 +-
 pkgs/tools/X11/xtrace/default.nix                        | 2 +-
 pkgs/tools/admin/tightvnc/default.nix                    | 2 +-
 pkgs/tools/archivers/sharutils/default.nix               | 2 +-
 pkgs/tools/backup/partclone/default.nix                  | 8 +++++++-
 pkgs/tools/cd-dvd/xorriso/default.nix                    | 2 +-
 pkgs/tools/compression/gzip/default.nix                  | 2 +-
 pkgs/tools/compression/rzip/default.nix                  | 2 +-
 pkgs/tools/filesystems/chunkfs/default.nix               | 2 +-
 pkgs/tools/filesystems/encfs/default.nix                 | 2 +-
 pkgs/tools/filesystems/mtools/default.nix                | 2 +-
 pkgs/tools/filesystems/svnfs/default.nix                 | 2 +-
 pkgs/tools/filesystems/wdfs/default.nix                  | 2 +-
 pkgs/tools/graphics/cuneiform/default.nix                | 2 +-
 pkgs/tools/graphics/plotutils/default.nix                | 2 +-
 pkgs/tools/misc/goaccess/default.nix                     | 2 +-
 pkgs/tools/misc/idutils/default.nix                      | 2 +-
 pkgs/tools/misc/lbdb/default.nix                         | 2 +-
 pkgs/tools/misc/ldapvi/default.nix                       | 6 +++++-
 pkgs/tools/misc/minicom/default.nix                      | 2 +-
 pkgs/tools/misc/most/default.nix                         | 3 ++-
 pkgs/tools/misc/parallel/default.nix                     | 2 +-
 pkgs/tools/misc/parted/default.nix                       | 2 +-
 pkgs/tools/misc/pg_top/default.nix                       | 2 +-
 pkgs/tools/misc/recutils/default.nix                     | 2 +-
 pkgs/tools/misc/time/default.nix                         | 2 +-
 pkgs/tools/misc/tmpwatch/default.nix                     | 2 +-
 pkgs/tools/misc/tmux/default.nix                         | 2 +-
 pkgs/tools/misc/yad/default.nix                          | 2 +-
 pkgs/tools/networking/cntlm/default.nix                  | 2 +-
 pkgs/tools/networking/connman/default.nix                | 2 +-
 pkgs/tools/networking/flvstreamer/default.nix            | 2 +-
 pkgs/tools/networking/host/default.nix                   | 2 +-
 pkgs/tools/networking/inetutils/default.nix              | 2 +-
 pkgs/tools/networking/jnettop/default.nix                | 2 +-
 pkgs/tools/networking/lsh/default.nix                    | 2 +-
 pkgs/tools/networking/mailutils/default.nix              | 2 +-
 pkgs/tools/networking/minidlna/default.nix               | 2 +-
 pkgs/tools/networking/tcpdump/default.nix                | 2 +-
 pkgs/tools/networking/wget/default.nix                   | 2 +-
 pkgs/tools/package-management/nix/default.nix            | 9 ++++++++-
 pkgs/tools/security/scrypt/default.nix                   | 2 +-
 pkgs/tools/security/steghide/default.nix                 | 2 +-
 pkgs/tools/security/tboot/default.nix                    | 4 +---
 pkgs/tools/security/tor/default.nix                      | 2 +-
 pkgs/tools/security/tpm-tools/default.nix                | 9 ++++++---
 pkgs/tools/security/trousers/default.nix                 | 2 +-
 pkgs/tools/system/cron/default.nix                       | 2 +-
 pkgs/tools/system/freeipmi/default.nix                   | 2 +-
 pkgs/tools/system/hardlink/default.nix                   | 2 +-
 pkgs/tools/system/mcron/default.nix                      | 2 +-
 pkgs/tools/text/enscript/default.nix                     | 2 +-
 pkgs/tools/text/mpage/default.nix                        | 2 +-
 pkgs/tools/text/namazu/default.nix                       | 2 +-
 pkgs/tools/text/wdiff/default.nix                        | 2 +-
 pkgs/tools/typesetting/lout/default.nix                  | 2 +-
 pkgs/tools/typesetting/rubber/default.nix                | 2 +-
 pkgs/tools/typesetting/xmlto/default.nix                 | 2 +-
 pkgs/tools/video/dvgrab/default.nix                      | 2 +-
 275 files changed, 301 insertions(+), 286 deletions(-)

diff --git a/pkgs/applications/audio/beast/default.nix b/pkgs/applications/audio/beast/default.nix
index 61b11c05de77..340a83e7963f 100644
--- a/pkgs/applications/audio/beast/default.nix
+++ b/pkgs/applications/audio/beast/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
     ];
 
   meta = { 
-    description = "BEAST - the Bedevilled Sound Engine";
+    description = "A music composition and modular synthesis application";
     homepage = http://beast.gtk.org;
     license = ["GPL-2" "LGPL-2.1"];
   };
diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix
index 2ea37e2bd237..4f9c491a3a59 100644
--- a/pkgs/applications/audio/cmus/default.nix
+++ b/pkgs/applications/audio/cmus/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ ncurses pkgconfig alsaLib flac libmad ffmpeg libvorbis mpc mp4v2 ];
 
   meta = {
-    description = "cmus is a small, fast and powerful console music player for Linux and *BSD";
+    description = "Small, fast and powerful console music player for Linux and *BSD";
     homepage = http://cmus.sourceforge.net;
     license = stdenv.lib.licenses.gpl2;
   };
diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix
index e5264f5c3d2f..5c6a1d6ac54e 100644
--- a/pkgs/applications/audio/moc/default.nix
+++ b/pkgs/applications/audio/moc/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = {
-    description = "MOC (music on console) is a console audio player for LINUX/UNIX designed to be powerful and easy to use.";
+    description = "An ncurses console audio player designed to be powerful and easy to use";
     homepage = http://moc.daper.net/;
     license = stdenv.lib.licenses.gpl2;
   };
diff --git a/pkgs/applications/audio/mp3info/default.nix b/pkgs/applications/audio/mp3info/default.nix
index 0f33726eaeed..ede31ac9beb6 100644
--- a/pkgs/applications/audio/mp3info/default.nix
+++ b/pkgs/applications/audio/mp3info/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     '';
 
   meta = {
-    description = "MP3Info, an MP3 technical info viewer and ID3 1.x tag editor";
+    description = "MP3 technical info viewer and ID3 1.x tag editor";
 
     longDescription =
       '' MP3Info is a little utility used to read and modify the ID3 tags of
diff --git a/pkgs/applications/audio/mpc123/default.nix b/pkgs/applications/audio/mpc123/default.nix
index cd4343b1beb4..ac945bee7f74 100644
--- a/pkgs/applications/audio/mpc123/default.nix
+++ b/pkgs/applications/audio/mpc123/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://mpc123.sourceforge.net/;
 
-    description = "mpc123, a Musepack (.mpc) audio player";
+    description = "A Musepack (.mpc) audio player";
 
     license = stdenv.lib.licenses.gpl2Plus;
 
diff --git a/pkgs/applications/audio/mpg321/default.nix b/pkgs/applications/audio/mpg321/default.nix
index e58397350cb1..939c9f79e4d4 100644
--- a/pkgs/applications/audio/mpg321/default.nix
+++ b/pkgs/applications/audio/mpg321/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   buildInputs = [libao libid3tag libmad zlib];
 
   meta = {
-    description = "mpg321, a command-line MP3 player";
+    description = "Command-line MP3 player";
     homepage = http://mpg321.sourceforge.net/;
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ ];
diff --git a/pkgs/applications/audio/pamixer/default.nix b/pkgs/applications/audio/pamixer/default.nix
index acdda1799d03..d273c2381778 100644
--- a/pkgs/applications/audio/pamixer/default.nix
+++ b/pkgs/applications/audio/pamixer/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "pamixer is like amixer but for pulseaudio.";
+    description = "Like amixer but for pulseaudio";
     longDescription = "Features:
       - Get the current volume of the default sink, the default source or a selected one by his id
       - Set the volume for the default sink, the default source or any other device
diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index 59b82d155da9..47919a7d7f88 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -148,7 +148,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = https://www.spotify.com/;
-    description = "Spotify for Linux allows you to play music from the Spotify music service";
+    description = "Play music from the Spotify music service";
     license = stdenv.lib.licenses.unfree;
     maintainers = [ stdenv.lib.maintainers.eelco ];
   };
diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix
index d3e9a4c46794..0c764fcf8f86 100644
--- a/pkgs/applications/editors/ed/default.nix
+++ b/pkgs/applications/editors/ed/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = {
-    description = "GNU ed, an implementation of the standard Unix editor";
+    description = "An implementation of the standard Unix editor";
 
     longDescription = ''
       GNU ed is a line-oriented text editor.  It is used to create,
diff --git a/pkgs/applications/editors/mg/default.nix b/pkgs/applications/editors/mg/default.nix
index 058a54c45a71..6901aed774ba 100644
--- a/pkgs/applications/editors/mg/default.nix
+++ b/pkgs/applications/editors/mg/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://homepage.boetes.org/software/mg/;
-    description = "mg is Micro GNU/emacs, this is a portable version of the mg maintained by the OpenBSD team";
+    description = "Micro GNU/emacs, a portable version of the mg maintained by the OpenBSD team";
     license = "public domain";
     platforms = stdenv.lib.platforms.all;
   };
diff --git a/pkgs/applications/editors/texmacs/default.nix b/pkgs/applications/editors/texmacs/default.nix
index ce863312251c..a258b6341057 100644
--- a/pkgs/applications/editors/texmacs/default.nix
+++ b/pkgs/applications/editors/texmacs/default.nix
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
         "${xmodmap}/bin:${which}/bin";
 
   meta = {
-    description = "GNU TeXmacs, a free WYSIWYW editing platform with special features for scientists";
+    description = "WYSIWYW editing platform with special features for scientists";
     longDescription =
       '' GNU TeXmacs is a free wysiwyw (what you see is what you want)
          editing platform with special features for scientists.  The software
diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix
index b170b784aaa4..de906e3d8443 100644
--- a/pkgs/applications/graphics/geeqie/default.nix
+++ b/pkgs/applications/graphics/geeqie/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     '';
 
   meta = {
-    description = "Geeqie, a lightweight GTK+ based image viewer";
+    description = "Lightweight GTK+ based image viewer";
 
     longDescription =
       ''
diff --git a/pkgs/applications/graphics/grafx2/default.nix b/pkgs/applications/graphics/grafx2/default.nix
index 6b7c9a27694a..ee9df683c0a2 100644
--- a/pkgs/applications/graphics/grafx2/default.nix
+++ b/pkgs/applications/graphics/grafx2/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   installPhase = ''make install prefix="$out"'';
 
   meta = {
-    description = "GrafX2 is a bitmap paint program inspired by the Amiga programs Deluxe Paint and Brilliance.";
+    description = "Bitmap paint program inspired by the Amiga programs Deluxe Paint and Brilliance";
     homepage = http://code.google.co/p/grafx2/;
     license = stdenv.lib.licenses.gpl2;
     platforms = [ "x86_64-linux" "i686-linux" ];
diff --git a/pkgs/applications/graphics/jbrout/default.nix b/pkgs/applications/graphics/jbrout/default.nix
index 2207e8884f0c..496078ffdb2e 100644
--- a/pkgs/applications/graphics/jbrout/default.nix
+++ b/pkgs/applications/graphics/jbrout/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage {
   buildInputs = [ python pyGtkGlade makeWrapper pyexiv2 lxml pil fbida which ];
   meta = {
     homepage = "http://code.google.com/p/jbrout";
-    description = "jBrout is a photo manager";
+    description = "Photo manager";
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/applications/graphics/ocrad/default.nix b/pkgs/applications/graphics/ocrad/default.nix
index 4c20a41061ae..201b59ad5e12 100644
--- a/pkgs/applications/graphics/ocrad/default.nix
+++ b/pkgs/applications/graphics/ocrad/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = {
-    description = "GNU Ocrad, optical character recognition (OCR) program & library";
+    description = "Optical character recognition (OCR) program & library";
 
     longDescription =
       '' GNU Ocrad is an OCR (Optical Character Recognition) program based on
diff --git a/pkgs/applications/graphics/qiv/default.nix b/pkgs/applications/graphics/qiv/default.nix
index 86891f2cb937..01b0a1414a74 100644
--- a/pkgs/applications/graphics/qiv/default.nix
+++ b/pkgs/applications/graphics/qiv/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (rec {
   '';
 
   meta = {
-    description = "qiv (quick image viewer)";
+    description = "Quick image viewer";
     homepage = http://spiegl.de/qiv/;
     inherit version;
   };
diff --git a/pkgs/applications/graphics/ufraw/default.nix b/pkgs/applications/graphics/ufraw/default.nix
index 783832abd003..dbfda4e58195 100644
--- a/pkgs/applications/graphics/ufraw/default.nix
+++ b/pkgs/applications/graphics/ufraw/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://ufraw.sourceforge.net/;
 
-    description = "UFRaw, a utility to read and manipulate raw images from digital cameras";
+    description = "Utility to read and manipulate raw images from digital cameras";
 
     longDescription =
       '' The Unidentified Flying Raw (UFRaw) is a utility to read and
diff --git a/pkgs/applications/graphics/viewnior/default.nix b/pkgs/applications/graphics/viewnior/default.nix
index dd8e01298ff4..478553d2c00a 100644
--- a/pkgs/applications/graphics/viewnior/default.nix
+++ b/pkgs/applications/graphics/viewnior/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "Viewnior is a fast and simple image viewer for GNU/Linux";
+    description = "Fast and simple image viewer";
     longDescription =
       '' Viewnior is insipred by big projects like Eye of Gnome, because of it's
          usability and richness,and by GPicView, because of it's lightweight design and
diff --git a/pkgs/applications/graphics/xaos/default.nix b/pkgs/applications/graphics/xaos/default.nix
index 8387b3486d4d..cacefc9bcc12 100644
--- a/pkgs/applications/graphics/xaos/default.nix
+++ b/pkgs/applications/graphics/xaos/default.nix
@@ -28,7 +28,7 @@ rec {
   name = "xaos-" + version;
   meta = {
     homepage = http://xaos.sourceforge.net/;
-    description = "XaoS - fractal viewer";
+    description = "Fractal viewer";
     license = a.stdenv.lib.licenses.gpl2Plus;
   };
 }
diff --git a/pkgs/applications/misc/bitcoin/default.nix b/pkgs/applications/misc/bitcoin/default.nix
index e38d427be8d5..d7c1fbc487b7 100644
--- a/pkgs/applications/misc/bitcoin/default.nix
+++ b/pkgs/applications/misc/bitcoin/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-      description = "Bitcoin is a peer-to-peer currency";
+      description = "Peer-to-peer electronic cash system";
       longDescription= ''
         Bitcoin is a free open source peer-to-peer electronic cash system that is
         completely decentralized, without the need for a central server or trusted
diff --git a/pkgs/applications/misc/camlistore/default.nix b/pkgs/applications/misc/camlistore/default.nix
index 56131425ab4b..9adac335c0c7 100644
--- a/pkgs/applications/misc/camlistore/default.nix
+++ b/pkgs/applications/misc/camlistore/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "Camlistore is a way of storing, syncing, sharing, modelling and backing up content";
+    description = "A way of storing, syncing, sharing, modelling and backing up content";
     homepage = https://camlistore.org;
     license = licenses.asl20;
     maintainers = with maintainers; [ cstrahan ];
diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix
index bf44f91056d7..5d4c2634952d 100644
--- a/pkgs/applications/misc/gpsbabel/default.nix
+++ b/pkgs/applications/misc/gpsbabel/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
   doCheck = true;
 
   meta = {
-    description = "GPSBabel, a tool to convert, upload and download data from GPS and Map programs";
+    description = "Convert, upload and download data from GPS and Map programs";
 
     longDescription = ''
       GPSBabel converts waypoints, tracks, and routes between popular
diff --git a/pkgs/applications/misc/gv/default.nix b/pkgs/applications/misc/gv/default.nix
index 4867bef1f719..3fad634b18b7 100644
--- a/pkgs/applications/misc/gv/default.nix
+++ b/pkgs/applications/misc/gv/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = http://www.gnu.org/software/gv/;
-    description = "GNU gv, a PostScript/PDF document viewer";
+    description = "PostScript/PDF document viewer";
 
     longDescription = ''
       GNU gv allows users to view and navigate through PostScript and
diff --git a/pkgs/applications/misc/posterazor/default.nix b/pkgs/applications/misc/posterazor/default.nix
index 0cad2fbd2cd3..38fac21322cc 100644
--- a/pkgs/applications/misc/posterazor/default.nix
+++ b/pkgs/applications/misc/posterazor/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://posterazor.sourceforge.net/";
-    description = "The PosteRazor cuts a raster image into pieces which can afterwards be printed out and assembled to a poster";
+    description = "Cuts a raster image into pieces which can afterwards be printed out and assembled to a poster";
     maintainers = [ stdenv.lib.maintainers.madjar ];
     platforms = stdenv.lib.platforms.all;
   };
diff --git a/pkgs/applications/misc/stardict/stardict.nix b/pkgs/applications/misc/stardict/stardict.nix
index 1ca8ec045d61..d4c41edde30e 100644
--- a/pkgs/applications/misc/stardict/stardict.nix
+++ b/pkgs/applications/misc/stardict/stardict.nix
@@ -37,8 +37,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "stardict";
-    homepage = "A international dictionary supporting fuzzy and glob style matching";
+    description = "An international dictionary supporting fuzzy and glob style matching";
     license = stdenv.lib.licenses.lgpl3;
     maintainers = with stdenv.lib.maintainers; [qknight];
   };
diff --git a/pkgs/applications/misc/tangogps/default.nix b/pkgs/applications/misc/tangogps/default.nix
index aa1df2c9d1a6..0a2c1c88c239 100644
--- a/pkgs/applications/misc/tangogps/default.nix
+++ b/pkgs/applications/misc/tangogps/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "tangoGPS, a user friendly map and GPS user interface";
+    description = "User friendly map and GPS user interface";
 
     longDescription = ''
       tangoGPS is an easy to use, fast and lightweight mapping
diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix
index 6508b12e1de8..9afabe0372d1 100644
--- a/pkgs/applications/misc/viking/default.nix
+++ b/pkgs/applications/misc/viking/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
   doCheck = true;
 
   meta = {
-    description = "Viking, a GPS data editor and analyzer";
+    description = "GPS data editor and analyzer";
 
     longDescription = ''
       Viking is a free/open source program to manage GPS data.  You
diff --git a/pkgs/applications/misc/wordnet/default.nix b/pkgs/applications/misc/wordnet/default.nix
index 7594014d769e..6ead69db2209 100644
--- a/pkgs/applications/misc/wordnet/default.nix
+++ b/pkgs/applications/misc/wordnet/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    description = "WordNet, a lexical database for the English language";
+    description = "Lexical database for the English language";
 
     longDescription =
       '' WordNet® is a large lexical database of English.  Nouns, verbs,
diff --git a/pkgs/applications/misc/xfe/default.nix b/pkgs/applications/misc/xfe/default.nix
index d09a899b897f..e216b19fab5a 100644
--- a/pkgs/applications/misc/xfe/default.nix
+++ b/pkgs/applications/misc/xfe/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    description = "X File Explorer (Xfe) is an MS-Explorer like file manager for X";
+    description = "MS-Explorer like file manager for X";
     longDescription = ''
       X File Explorer (Xfe) is an MS-Explorer like file manager for X.
       It is based on the popular, but discontinued, X Win Commander, which was developed by Maxim Baranov.
diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index ad2ea75bd704..e23a6d94ec1a 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -94,7 +94,7 @@ stdenv.mkDerivation rec {
     '';
 
   meta = {
-    description = "Mozilla Firefox - the browser, reloaded";
+    description = "Web browser";
     homepage = http://www.mozilla.com/en-US/firefox/;
     maintainers = with lib.maintainers; [ eelco wizeman ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix
index 80b09bcd8a8e..201a6b947c1a 100644
--- a/pkgs/applications/networking/browsers/opera/default.nix
+++ b/pkgs/applications/networking/browsers/opera/default.nix
@@ -81,6 +81,6 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://www.opera.com;
-    description = "The Opera web browser";
+    description = "Web browser";
   };
 }
diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix
index 858e99c245ba..580591c18ade 100644
--- a/pkgs/applications/networking/ids/snort/default.nix
+++ b/pkgs/applications/networking/ids/snort/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ libpcap pcre libdnet daq zlib flex bison ];
   
   meta = {
-    description = "Snort is an open source network intrusion prevention and detection system (IDS/IPS)";
+    description = "Network intrusion prevention and detection system (IDS/IPS)";
     homepage = http://www.snort.org;
     license = stdenv.lib.licenses.gpl2;
   };
diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
index ec614bf4b8c1..cf10c1e6fe20 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = {
-    description = "BitlBee, an IRC to other chat networks gateway";
+    description = "IRC instant messaging gateway";
 
     longDescription = ''
       BitlBee brings IM (instant messaging) to IRC clients.  It's a
diff --git a/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix b/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix
index 9cf2558ef320..909d6404193c 100644
--- a/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix
+++ b/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix
@@ -41,7 +41,7 @@ rec {
       
   name = "carrier-2.5.0";
   meta = {
-    description = "Carrier - PidginIM GUI fork with user-friendly development model";
+    description = "PidginIM GUI fork with user-friendly development model";
     homepage = http://funpidgin.sf.net; 
   };
 } // (if externalPurple2 then {
diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix
index 07730a8c0ee1..e46956f3ccae 100644
--- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "Ekiga SIP client";
+    description = "VOIP/Videoconferencing app with full SIP and H.323 support";
     maintainers = [ maintainers.raskin ];
     platforms = platforms.linux;
   };
diff --git a/pkgs/applications/networking/instant-messengers/fuze/default.nix b/pkgs/applications/networking/instant-messengers/fuze/default.nix
index 9ccada87fe2f..41ffb421f8e6 100644
--- a/pkgs/applications/networking/instant-messengers/fuze/default.nix
+++ b/pkgs/applications/networking/instant-messengers/fuze/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    description = "Fuze for Linux";
+    description = "Internet and mobile based unified communications solutions (Linux client)";
     homepage = http://www.fuzebox.com;
     license = "unknown";
   };
diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix
index 6da12905f560..cf4c2e22ad6b 100644
--- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix
+++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix
@@ -94,7 +94,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    description = "HipChat Desktop Client";
+    description = "Desktop client for HipChat services";
     homepage = http://www.hipchat.com;
     license = stdenv.lib.licenses.unfree;
     platforms = [ "i686-linux" "x86_64-linux" ];
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
index 6e6fd6d0eb6c..814a191c457a 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
   + (lib.optionalString (gnutls != null) " --enable-gnutls=yes --enable-nss=no")
   ;
   meta = with stdenv.lib; {
-    description = "Pidgin IM - XMPP(Jabber), AIM/ICQ, IRC, SIP etc client";
+    description = "Multi-protocol instant messaging client";
     homepage = http://pidgin.im;
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
diff --git a/pkgs/applications/networking/jmeter/default.nix b/pkgs/applications/networking/jmeter/default.nix
index 2d5e6b66bf05..77aeb64478f0 100644
--- a/pkgs/applications/networking/jmeter/default.nix
+++ b/pkgs/applications/networking/jmeter/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "Apache JMeter is a 100% pure Java desktop application designed to load test functional behavior and measure performance.";
+    description = "A 100% pure Java desktop application designed to load test functional behavior and measure performance";
     longDescription = ''
       The Apache JMeter desktop application is open source software, a 100%
       pure Java application designed to load test functional behavior and
diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index 7a1eddfa8690..75ccb93ca954 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -70,8 +70,7 @@ stdenv.mkDerivation rec {
   checkTarget = "test";
 
   meta = {
-    description = "Notmuch -- The mail indexer";
-    longDescription = "";
+    description = "Mail indexer";
     license = stdenv.lib.licenses.gpl3;
     maintainers = with stdenv.lib.maintainers; [ chaoflow garbas ];
     platforms = stdenv.lib.platforms.gnu;
diff --git a/pkgs/applications/networking/newsreaders/slrn/default.nix b/pkgs/applications/networking/newsreaders/slrn/default.nix
index c933460af43b..fe13c756bd7f 100644
--- a/pkgs/applications/networking/newsreaders/slrn/default.nix
+++ b/pkgs/applications/networking/newsreaders/slrn/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
   buildInputs = [ slang ncurses ];
 
   meta = {
-    description = "The slrn (S-Lang read news) newsreader";
+    description = "Text-based newsreader";
     homepage = http://slrn.sourceforge.net/index.html;
     license = stdenv.lib.licenses.gpl2;
   };
diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix
index 6c28840f7e5f..052c53112536 100644
--- a/pkgs/applications/networking/p2p/gnunet/default.nix
+++ b/pkgs/applications/networking/p2p/gnunet/default.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
   */
 
   meta = {
-    description = "GNUnet, GNU's decentralized anonymous and censorship-resistant P2P framework";
+    description = "GNU's decentralized anonymous and censorship-resistant P2P framework";
 
     longDescription = ''
       GNUnet is a framework for secure peer-to-peer networking that
diff --git a/pkgs/applications/networking/remote/rdesktop/default.nix b/pkgs/applications/networking/remote/rdesktop/default.nix
index 9ba9e3aa3fc4..09c20618d668 100644
--- a/pkgs/applications/networking/remote/rdesktop/default.nix
+++ b/pkgs/applications/networking/remote/rdesktop/default.nix
@@ -19,6 +19,6 @@ stdenv.mkDerivation (rec {
   ];
 
   meta = {
-    description = "rdesktop is an open source client for Windows Terminal Services";
+    description = "Open source client for Windows Terminal Services";
   };
 })
diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix
index 8fb929d53e10..8304f6dc091b 100644
--- a/pkgs/applications/networking/remote/remmina/default.nix
+++ b/pkgs/applications/networking/remote/remmina/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     license = stdenv.lib.licenses.gpl2;
     homepage = "http://remmina.sourceforge.net/";
-    description = "Remmina is a remote desktop client written in GTK+";
+    description = "Remote desktop client written in GTK+";
     maintainers = [];
     platforms = platforms.linux;
   };
diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index 226b7f6d097b..64bf287b44f0 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://syncthing.net/;
-    description = "Syncthing replaces Dropbox and BitTorrent Sync with something open, trustworthy and decentralized";
+    description = "Replaces Dropbox and BitTorrent Sync with something open, trustworthy and decentralized";
     license = with stdenv.lib.licenses; mit;
     maintainers = with stdenv.lib.maintainers; [ matejc ];
     platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix
index 9c255f493d3f..8d6de404f986 100644
--- a/pkgs/applications/office/gnucash/default.nix
+++ b/pkgs/applications/office/gnucash/default.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    description = "GnuCash, a personal and small-business financial-accounting application";
+    description = "Personal and small-business financial-accounting application";
 
     longDescription = ''
       GnuCash is personal and small-business financial-accounting software,
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 41cf1ebc33df..63d4db20af37 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -252,7 +252,7 @@ stdenv.mkDerivation rec {
     ];
 
   meta = with stdenv.lib; {
-    description = "LibreOffice is a comprehensive, professional-quality productivity suite, a variant of openoffice.org";
+    description = "Comprehensive, professional-quality productivity suite, a variant of openoffice.org";
     homepage = http://libreoffice.org/;
     license = licenses.lgpl3;
     maintainers = [ maintainers.viric maintainers.raskin ];
diff --git a/pkgs/applications/science/astronomy/gravit/default.nix b/pkgs/applications/science/astronomy/gravit/default.nix
index 696890f95f1e..1be1328da271 100644
--- a/pkgs/applications/science/astronomy/gravit/default.nix
+++ b/pkgs/applications/science/astronomy/gravit/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://gravit.slowchop.com";
-    description = "A beautiful OpenGL-based gravity simulator";
+    description = "Beautiful OpenGL-based gravity simulator";
     license = stdenv.lib.licenses.gpl2;
 
     longDescription = ''
diff --git a/pkgs/applications/science/biology/emboss/default.nix b/pkgs/applications/science/biology/emboss/default.nix
index 96181c8ee6cb..c9974660da36 100644
--- a/pkgs/applications/science/biology/emboss/default.nix
+++ b/pkgs/applications/science/biology/emboss/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
   # '';
 
   meta = {
-    description     = "EMBOSS is 'The European Molecular Biology Open Software Suite'";
+    description     = "The European Molecular Biology Open Software Suite";
     longDescription = ''EMBOSS is a free Open Source software analysis package
     specially developed for the needs of the molecular biology (e.g. EMBnet)
     user community, including libraries. The software automatically copes with
diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix
index 2a95d0cd65bb..62359baf2bc6 100644
--- a/pkgs/applications/science/logic/alt-ergo/default.nix
+++ b/pkgs/applications/science/logic/alt-ergo/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     [ ocaml findlib ocamlgraph zarith lablgtk gmp ];
 
   meta = {
-    description = "Alt-Ergo is a high-performance theorem prover and SMT solver";
+    description = "High-performance theorem prover and SMT solver";
     homepage    = "http://alt-ergo.ocamlpro.com/";
     license     = stdenv.lib.licenses.cecill-c; # LGPL-2 compatible
     platforms   = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index 678ec6a4b049..da77a4c5a9aa 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
   buildFlags = "revision coq coqide";
 
   meta = {
-    description = "Coq proof assistant";
+    description = "Formal proof management system";
     longDescription = ''
       Coq is a formal proof management system.  It provides a formal language
       to write mathematical definitions, executable algorithms and theorems
diff --git a/pkgs/applications/science/logic/matita/default.nix b/pkgs/applications/science/logic/matita/default.nix
index f601f97de62e..0f393b419f1d 100644
--- a/pkgs/applications/science/logic/matita/default.nix
+++ b/pkgs/applications/science/logic/matita/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = http://matita.cs.unibo.it/;
-    description = "Matita is an experimental, interactive theorem prover";
+    description = "Experimental, interactive theorem prover";
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = [ stdenv.lib.maintainers.roconnor ];
   };
diff --git a/pkgs/applications/science/logic/prooftree/default.nix b/pkgs/applications/science/logic/prooftree/default.nix
index caaf4a94a1ed..94b1d5907620 100644
--- a/pkgs/applications/science/logic/prooftree/default.nix
+++ b/pkgs/applications/science/logic/prooftree/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (rec {
   configureFlags = [ "--prefix" "$(out)" ];
 
   meta = {
-    description = "Prooftree is a program for proof-tree visualization";
+    description = "A program for proof-tree visualization";
     longDescription = ''
       Prooftree is a program for proof-tree visualization during interactive
       proof development in a theorem prover. It is currently being developed
diff --git a/pkgs/applications/science/logic/twelf/default.nix b/pkgs/applications/science/logic/twelf/default.nix
index c6c7e4d9c1a7..f9680b475797 100644
--- a/pkgs/applications/science/logic/twelf/default.nix
+++ b/pkgs/applications/science/logic/twelf/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "Twelf logic proof assistant";
+    description = "Logic proof assistant";
     longDescription = ''
       Twelf is a language used to specify, implement, and prove properties of
       deductive systems such as programming languages and logics. Large
diff --git a/pkgs/applications/science/math/fricas/default.nix b/pkgs/applications/science/math/fricas/default.nix
index 1817c43ed7be..6e187843404d 100644
--- a/pkgs/applications/science/math/fricas/default.nix
+++ b/pkgs/applications/science/math/fricas/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://fricas.sourceforge.net/;
-    description = "Fricas CAS";
+    description = "An advanced computer algebra system";
     license = stdenv.lib.licenses.bsd3;
 
     hydraPlatforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix
index c4352c46f92e..1439d327d6ec 100644
--- a/pkgs/applications/science/math/glsurf/default.nix
+++ b/pkgs/applications/science/math/glsurf/default.nix
@@ -26,6 +26,6 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = http://www.lama.univ-savoie.fr/~raffalli/glsurf;
-    description = "GlSurf: a program to draw implicit surfaces and curves";
+    description = "A program to draw implicit surfaces and curves";
   };
 }
diff --git a/pkgs/applications/science/math/jags/default.nix b/pkgs/applications/science/math/jags/default.nix
index a93386149bd4..785c2460bb49 100644
--- a/pkgs/applications/science/math/jags/default.nix
+++ b/pkgs/applications/science/math/jags/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   buildInputs = [gfortran liblapack blas];
 
   meta = {
-    description = "JAGS: Just Another Gibbs Sampler";
+    description = "Just Another Gibbs Sampler";
     license     = "GPL2";
     homepage    = http://www-ice.iarc.fr/~martyn/software/jags/;
     maintainers = [stdenv.lib.maintainers.andres];
diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix
index 096796a859d0..3277d94d99b6 100644
--- a/pkgs/applications/science/math/maxima/default.nix
+++ b/pkgs/applications/science/math/maxima/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation {
   enableParallelBuilding = true;
 
   meta = {
-    description = "Maxima computer algebra system";
+    description = "Computer algebra system";
     homepage = "http://maxima.sourceforge.net";
     license = stdenv.lib.licenses.gpl2;
 
diff --git a/pkgs/applications/science/misc/fityk/default.nix b/pkgs/applications/science/misc/fityk/default.nix
index db79839ba669..4c93eef2b1c0 100644
--- a/pkgs/applications/science/misc/fityk/default.nix
+++ b/pkgs/applications/science/misc/fityk/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   buildInputs = [wxGTK30 boost lua zlib bzip2 xylib readline gnuplot ];
 
   meta = {
-    description = "Fityk -- curve fitting and peak fitting software";
+    description = "Curve fitting and peak fitting software";
     license = "GPL2";
     homepage = http://fityk.nieto.pl/;
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix
index 29a7caf769be..7656668f0564 100644
--- a/pkgs/applications/science/misc/simgrid/default.nix
+++ b/pkgs/applications/science/misc/simgrid/default.nix
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
   doCheck = false;
 
   meta = {
-    description = "SimGrid, a simulator for distributed applications in heterogeneous environments";
+    description = "Simulator for distributed applications in heterogeneous environments";
 
     longDescription =
       '' SimGrid is a toolkit that provides core functionalities for the
diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
index b9abf7b55b48..879690bc91ed 100644
--- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
+++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
   meta = {
     homepage    = "http://www.gromacs.org";
     license     = "GPLv2";
-    description = "The GROMACS molecular dynamics software package";
+    description = "Molecular dynamics software package";
     longDescription = ''
       GROMACS is a versatile package to perform molecular dynamics,
       i.e. simulate the Newtonian equations of motion for systems
diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/applications/science/spyder/default.nix
index 1079a153ca16..806d2f546cf5 100644
--- a/pkgs/applications/science/spyder/default.nix
+++ b/pkgs/applications/science/spyder/default.nix
@@ -43,7 +43,7 @@ buildPythonPackage rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "Scientific PYthon Development EnviRonment (SPYDER)";
+    description = "Scientific python development environment";
     longDescription = ''
       Spyder (previously known as Pydee) is a powerful interactive development
       environment for the Python language with advanced editing, interactive
diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index a4d16e460607..877c65afccf5 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -133,7 +133,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = http://git-scm.com/;
-    description = "Git, a popular distributed version control system";
+    description = "Distributed version control system";
     license = stdenv.lib.licenses.gpl2Plus;
 
     longDescription = ''
diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/applications/version-management/rcs/default.nix
index e71d23132aca..823638669b68 100644
--- a/pkgs/applications/version-management/rcs/default.nix
+++ b/pkgs/applications/version-management/rcs/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://www.gnu.org/software/rcs/;
-    description = "GNU RCS, a revision control system";
+    description = "Revision control system";
     longDescription =
       '' The GNU Revision Control System (RCS) manages multiple revisions of
          files. RCS automates the storing, retrieval, logging,
diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix
index 06122619066a..515e2591461f 100644
--- a/pkgs/applications/video/gnash/default.nix
+++ b/pkgs/applications/video/gnash/default.nix
@@ -103,7 +103,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://www.gnu.org/software/gnash/;
-    description = "GNU Gnash, a libre SWF (Flash) movie player";
+    description = "A libre SWF (Flash) movie player";
 
     longDescription = ''
       Gnash is a GNU Flash movie player.  Flash is an animation file format
diff --git a/pkgs/applications/video/kino/default.nix b/pkgs/applications/video/kino/default.nix
index 16bd57bef34a..7dd089537b73 100644
--- a/pkgs/applications/video/kino/default.nix
+++ b/pkgs/applications/video/kino/default.nix
@@ -85,7 +85,7 @@ stdenv.mkDerivation {
 
 
   meta = { 
-      description = "Kino is a non-linear DV editor for GNU/Linux";
+      description = "Non-linear DV editor for GNU/Linux";
       homepage = http://www.kinodv.org/;
       license = stdenv.lib.licenses.gpl2;
   };
diff --git a/pkgs/applications/video/xbmc/default.nix b/pkgs/applications/video/xbmc/default.nix
index 26c54c537ae0..875ed48c102f 100644
--- a/pkgs/applications/video/xbmc/default.nix
+++ b/pkgs/applications/video/xbmc/default.nix
@@ -96,7 +96,7 @@ stdenv.mkDerivation rec {
 
     meta = {
       homepage = http://xbmc.org/;
-      description = "XBMC Media Center";
+      description = "Media center";
       license = "GPLv2";
       platforms = stdenv.lib.platforms.linux; 
       maintainers = [ stdenv.lib.maintainers.iElectric ];
diff --git a/pkgs/applications/window-managers/ratpoison/default.nix b/pkgs/applications/window-managers/ratpoison/default.nix
index 65264c20db35..0eb28464e590 100644
--- a/pkgs/applications/window-managers/ratpoison/default.nix
+++ b/pkgs/applications/window-managers/ratpoison/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://www.nongnu.org/ratpoison/";
-    description = "Ratpoison, a simple mouse-free tiling window manager";
+    description = "Simple mouse-free tiling window manager";
     license = stdenv.lib.licenses.gpl2Plus;
 
     longDescription = ''
diff --git a/pkgs/desktops/e17/enlightenment/default.nix b/pkgs/desktops/e17/enlightenment/default.nix
index 1c3edb07ecf1..953c90e80032 100644
--- a/pkgs/desktops/e17/enlightenment/default.nix
+++ b/pkgs/desktops/e17/enlightenment/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     --disable-illume2
   '';
   meta = {
-    description = "Enlightenment, the window manager";
+    description = "A window manager";
     longDescription = ''
       The Enlightenment Desktop shell provides an efficient yet
       breathtaking window manager based on the Enlightenment
diff --git a/pkgs/development/compilers/bigloo/default.nix b/pkgs/development/compilers/bigloo/default.nix
index 16dfa580a193..8564175d363d 100644
--- a/pkgs/development/compilers/bigloo/default.nix
+++ b/pkgs/development/compilers/bigloo/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   checkTarget = "test";
 
   meta = {
-    description = "Bigloo, an efficient Scheme compiler";
+    description = "Efficient Scheme compiler";
 
     longDescription = ''
       Bigloo is a Scheme implementation devoted to one goal: enabling
diff --git a/pkgs/development/compilers/gambit/default.nix b/pkgs/development/compilers/gambit/default.nix
index 265b08c1fbdf..3d9f2596c96c 100644
--- a/pkgs/development/compilers/gambit/default.nix
+++ b/pkgs/development/compilers/gambit/default.nix
@@ -18,7 +18,7 @@ rec {
   phaseNames = ["doConfigure" "doMakeInstall"];
       
   meta = {
-    description = "Gambit Scheme to C compiler";
+    description = "Scheme to C compiler";
     maintainers = [
       a.lib.maintainers.raskin
     ];
diff --git a/pkgs/development/compilers/hugs/default.nix b/pkgs/development/compilers/hugs/default.nix
index c3f14826c8a2..14751799795a 100644
--- a/pkgs/development/compilers/hugs/default.nix
+++ b/pkgs/development/compilers/hugs/default.nix
@@ -47,7 +47,7 @@ composableDerivation.composableDerivation {} {
 
   meta = {
     license = "as-is"; # gentoo is calling it this way..
-    description = "The HUGS 98 Haskell interpreter";
+    description = "Haskell interpreter";
     homepage = http://www.haskell.org/hugs;
   };
 }
diff --git a/pkgs/development/compilers/ikarus/default.nix b/pkgs/development/compilers/ikarus/default.nix
index 070f29e16f64..e9bf6c8bb5b6 100644
--- a/pkgs/development/compilers/ikarus/default.nix
+++ b/pkgs/development/compilers/ikarus/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ gmp ];
 
   meta = {
-    description = "Ikarus - a Scheme compiler, aiming at R6RS";
+    description = "Scheme compiler, aiming at R6RS";
     homepage = http://ikarus-scheme.org/;
     license = stdenv.lib.licenses.gpl3;
   };
diff --git a/pkgs/development/compilers/mercury/default.nix b/pkgs/development/compilers/mercury/default.nix
index 21af582c594b..de9b44a44146 100644
--- a/pkgs/development/compilers/mercury/default.nix
+++ b/pkgs/development/compilers/mercury/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "Mercury is a pure logic programming language.";
+    description = "A pure logic programming language";
     longDescription = ''
       Mercury is a logic/functional programming language which combines the
       clarity and expressiveness of declarative programming with advanced
diff --git a/pkgs/development/compilers/ocaml/3.10.0.nix b/pkgs/development/compilers/ocaml/3.10.0.nix
index 281aa1a9de6f..1d68585d93a1 100644
--- a/pkgs/development/compilers/ocaml/3.10.0.nix
+++ b/pkgs/development/compilers/ocaml/3.10.0.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation (rec {
   meta = {
     homepage = http://caml.inria.fr/ocaml;
     license = "QPL, LGPL2 (library part)";
-    desctiption = "Most popular variant of the Caml language";
+    description = "Most popular variant of the Caml language";
   };
 
 })
diff --git a/pkgs/development/compilers/ocaml/3.11.2.nix b/pkgs/development/compilers/ocaml/3.11.2.nix
index 64cf8a9f9f7b..195e83e7313b 100644
--- a/pkgs/development/compilers/ocaml/3.11.2.nix
+++ b/pkgs/development/compilers/ocaml/3.11.2.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://caml.inria.fr/ocaml;
     license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
-    description = "Objective Caml, the most popular variant of the Caml language";
+    description = "Most popular variant of the Caml language";
 
     longDescription =
       '' Objective Caml is the most popular variant of the Caml language.
diff --git a/pkgs/development/compilers/ocaml/3.12.1.nix b/pkgs/development/compilers/ocaml/3.12.1.nix
index f916f5a79233..16c3cb1d7872 100644
--- a/pkgs/development/compilers/ocaml/3.12.1.nix
+++ b/pkgs/development/compilers/ocaml/3.12.1.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://caml.inria.fr/ocaml;
     license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
-    description = "OCaml, the most popular variant of the Caml language";
+    description = "Most popular variant of the Caml language";
 
     longDescription =
       ''
diff --git a/pkgs/development/compilers/ocaml/4.00.1.nix b/pkgs/development/compilers/ocaml/4.00.1.nix
index 8662db70c26c..5b1e69b86b08 100644
--- a/pkgs/development/compilers/ocaml/4.00.1.nix
+++ b/pkgs/development/compilers/ocaml/4.00.1.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://caml.inria.fr/ocaml;
     license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
-    description = "OCaml, the most popular variant of the Caml language";
+    description = "Most popular variant of the Caml language";
 
     longDescription =
       ''
diff --git a/pkgs/development/compilers/ocaml/4.01.0.nix b/pkgs/development/compilers/ocaml/4.01.0.nix
index 0f68014fad64..2876bce9caff 100644
--- a/pkgs/development/compilers/ocaml/4.01.0.nix
+++ b/pkgs/development/compilers/ocaml/4.01.0.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://caml.inria.fr/ocaml;
     license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
-    description = "OCaml, the most popular variant of the Caml language";
+    description = "Most popular variant of the Caml language";
 
     longDescription =
       ''
diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix b/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix
index 9c5fa3764bad..8b86c805c61f 100644
--- a/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix
+++ b/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix
@@ -58,6 +58,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://okmij.org/ftp/ML/index.html#ber-metaocaml";
     license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
-    description = "a conservative extension of OCaml with the primitive type of code values, and three basic multi-stage expression forms: Brackets, Escape, and Run";
+    description = "A conservative extension of OCaml with the primitive type of code values, and three basic multi-stage expression forms: Brackets, Escape, and Run";
   };
 }
diff --git a/pkgs/development/compilers/qi/default.nix b/pkgs/development/compilers/qi/default.nix
index ecb022d942a9..5665fc5da6c1 100644
--- a/pkgs/development/compilers/qi/default.nix
+++ b/pkgs/development/compilers/qi/default.nix
@@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs [allBuild doForceShare doPropagate]);
 	meta = {
-		description = "Qi - next generation on top of Common Lisp";
+		description = "Functional programming language, built top of Common Lisp";
 	};
 }
diff --git a/pkgs/development/compilers/rdmd/default.nix b/pkgs/development/compilers/rdmd/default.nix
index 9177ad5e25b5..621ace195bbe 100644
--- a/pkgs/development/compilers/rdmd/default.nix
+++ b/pkgs/development/compilers/rdmd/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    description = "rdmd wrapper for D language compiler";
+    description = "Wrapper for D language compiler";
     homepage = http://dlang.org/rdmd.html;
     license = lib.licenses.boost;
     maintainers = with stdenv.lib.maintainers; [ vlstill ];
diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix
index bd81e4c055d5..e299be9144eb 100644
--- a/pkgs/development/compilers/scala/default.nix
+++ b/pkgs/development/compilers/scala/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "Scala is a general purpose programming language";
+    description = "General purpose programming language";
     longDescription = ''
       Scala is a general purpose programming language designed to express
       common programming patterns in a concise, elegant, and type-safe way.
diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix
index 1e82e03f16c0..bd71ab7b27fc 100644
--- a/pkgs/development/compilers/tinycc/default.nix
+++ b/pkgs/development/compilers/tinycc/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   checkTarget = "test";
 
   meta = {
-    description = "TinyCC, a small, fast, and embeddable C compiler and interpreter";
+    description = "Small, fast, and embeddable C compiler and interpreter";
 
     longDescription =
       '' TinyCC (aka TCC) is a small but hyper fast C compiler.  Unlike
diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix
index 6e4051ff46eb..2ddad5cde677 100644
--- a/pkgs/development/interpreters/guile/default.nix
+++ b/pkgs/development/interpreters/guile/default.nix
@@ -65,7 +65,7 @@
 
 
   meta = {
-    description = "GNU Guile 2.0, an embeddable Scheme implementation";
+    description = "Embeddable Scheme implementation";
     homepage    = http://www.gnu.org/software/guile/;
     license     = stdenv.lib.licenses.lgpl3Plus;
     maintainers = with stdenv.lib.maintainers; [ ludo lovek323 ];
diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix
index e112a5ae43d4..e14132a8acfd 100644
--- a/pkgs/development/interpreters/maude/default.nix
+++ b/pkgs/development/interpreters/maude/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://maude.cs.uiuc.edu/";
-    description = "Maude -- a high-level specification language";
+    description = "High-level specification language";
     license = stdenv.lib.licenses.gpl2;
 
     longDescription = ''
diff --git a/pkgs/development/interpreters/php/5.3.nix b/pkgs/development/interpreters/php/5.3.nix
index ed5feeacf613..c1d02064fe1c 100644
--- a/pkgs/development/interpreters/php/5.3.nix
+++ b/pkgs/development/interpreters/php/5.3.nix
@@ -233,7 +233,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
   };
 
   meta = {
-    description = "The PHP language runtime engine";
+    description = "An HTML-embedded scripting language";
     homepage    = http://www.php.net/;
     license     = "PHP-3";
     maintainers = with stdenv.lib.maintainers; [ lovek323 ];
diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix
index e5069fc2ae46..e39661b224ad 100644
--- a/pkgs/development/interpreters/php/5.4.nix
+++ b/pkgs/development/interpreters/php/5.4.nix
@@ -253,7 +253,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
   };
 
   meta = {
-    description = "The PHP language runtime engine";
+    description = "An HTML-embedded scripting language";
     homepage = http://www.php.net/;
     license = "PHP-3";
   };
diff --git a/pkgs/development/interpreters/pypy/2.3/default.nix b/pkgs/development/interpreters/pypy/2.3/default.nix
index b45805ab2414..626f56ccc466 100644
--- a/pkgs/development/interpreters/pypy/2.3/default.nix
+++ b/pkgs/development/interpreters/pypy/2.3/default.nix
@@ -91,7 +91,7 @@ let
 
     meta = with stdenv.lib; {
       homepage = "http://pypy.org/";
-      description = "PyPy is a fast, compliant alternative implementation of the Python language (2.7.3)";
+      description = "Fast, compliant alternative implementation of the Python language (2.7.3)";
       license = licenses.mit;
       platforms = platforms.linux;
       maintainers = with maintainers; [ iElectric ];
diff --git a/pkgs/development/libraries/boost/1.44.nix b/pkgs/development/libraries/boost/1.44.nix
index b188586e84f0..c192acd23bde 100644
--- a/pkgs/development/libraries/boost/1.44.nix
+++ b/pkgs/development/libraries/boost/1.44.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = "http://boost.org/";
-    description = "Boost C++ Library Collection";
+    description = "Collection of C++ libraries";
     license = "boost-license";
 
     maintainers = [ stdenv.lib.maintainers.simons ];
diff --git a/pkgs/development/libraries/boost/1.49.nix b/pkgs/development/libraries/boost/1.49.nix
index fca4249e963d..9e61683238fa 100644
--- a/pkgs/development/libraries/boost/1.49.nix
+++ b/pkgs/development/libraries/boost/1.49.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = "http://boost.org/";
-    description = "Boost C++ Library Collection";
+    description = "Collection of C++ libraries";
     license = "boost-license";
 
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/libraries/boost/1.55.nix b/pkgs/development/libraries/boost/1.55.nix
index bf355f7169c6..1e9d2134d120 100644
--- a/pkgs/development/libraries/boost/1.55.nix
+++ b/pkgs/development/libraries/boost/1.55.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = "http://boost.org/";
-    description = "Boost C++ Library Collection";
+    description = "Collection of C++ libraries";
     license = "boost-license";
 
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/libraries/ccrtp/default.nix b/pkgs/development/libraries/ccrtp/default.nix
index 2111e1b4a55a..3e75cb45a733 100644
--- a/pkgs/development/libraries/ccrtp/default.nix
+++ b/pkgs/development/libraries/ccrtp/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   doCheck = true;
 
   meta = {
-    description = "GNU ccRTP, an implementation of the IETF real-time transport protocol (RTP)";
+    description = "An implementation of the IETF real-time transport protocol (RTP)";
     homepage = http://www.gnu.org/software/ccrtp/;
     license = stdenv.lib.licenses.gpl2;
     maintainers = with stdenv.lib.maintainers; [ marcweber ];
diff --git a/pkgs/development/libraries/celt/default.nix b/pkgs/development/libraries/celt/default.nix
index 28e51efbc4b7..ca25be905048 100644
--- a/pkgs/development/libraries/celt/default.nix
+++ b/pkgs/development/libraries/celt/default.nix
@@ -29,7 +29,7 @@ rec {
   phaseNames = ["doConfigure" "doMakeInstall"];
       
   meta = {
-    description = "CELT - low-delay audio codec";
+    description = "Low-delay audio codec";
     maintainers = with a.lib.maintainers;
     [
       raskin
diff --git a/pkgs/development/libraries/cfitsio/default.nix b/pkgs/development/libraries/cfitsio/default.nix
index 06f2deb3a7cd..54e5988eda6e 100644
--- a/pkgs/development/libraries/cfitsio/default.nix
+++ b/pkgs/development/libraries/cfitsio/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://heasarc.gsfc.nasa.gov/fitsio/;
 
-    description = "CFITSIO, a library for reading and writing FITS data files";
+    description = "Library for reading and writing FITS data files";
 
     longDescription =
       '' CFITSIO is a library of C and Fortran subroutines for reading and
diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix
index 4e75cda0c239..a782ff61e287 100644
--- a/pkgs/development/libraries/check/default.nix
+++ b/pkgs/development/libraries/check/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   doCheck = false;
 
   meta = {
-    description = "Check, a unit testing framework for C";
+    description = "Unit testing framework for C";
 
     longDescription =
       '' Check is a unit testing framework for C.  It features a simple
diff --git a/pkgs/development/libraries/chipmunk/default.nix b/pkgs/development/libraries/chipmunk/default.nix
index d148c4d829a3..63c5959960ac 100644
--- a/pkgs/development/libraries/chipmunk/default.nix
+++ b/pkgs/development/libraries/chipmunk/default.nix
@@ -34,6 +34,6 @@ rec {
       
   name = "chipmunk-" + version;
   meta = {
-    description = "Chipmunk 2D physics engine";
+    description = "2D physics engine";
   };
 }
diff --git a/pkgs/development/libraries/cloog/default.nix b/pkgs/development/libraries/cloog/default.nix
index da4501285e12..7ea7e597d409 100644
--- a/pkgs/development/libraries/cloog/default.nix
+++ b/pkgs/development/libraries/cloog/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = {
-    description = "CLooG, the Chunky Loop Generator";
+    description = "Library that generates loops for scanning polyhedra";
 
     longDescription = ''
       CLooG is a free software library to generate code for scanning
diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix
index 59c64b0de9f7..c73aac074e7f 100644
--- a/pkgs/development/libraries/clutter-gst/default.nix
+++ b/pkgs/development/libraries/clutter-gst/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   postBuild = "rm -rf $out/share/gtk-doc";
 
   meta = {
-    description = "Clutter-GST";
+    description = "GStreamer bindings for clutter";
 
     homepage = http://www.clutter-project.org/;
 
diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix
index 027b90d8e11c..67de04050afe 100644
--- a/pkgs/development/libraries/clutter/default.nix
+++ b/pkgs/development/libraries/clutter/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   #doCheck = true; # no tests possible without a display
 
   meta = {
-    description = "Clutter, a library for creating fast, dynamic graphical user interfaces";
+    description = "Library for creating fast, dynamic graphical user interfaces";
 
     longDescription =
       '' Clutter is free software library for creating fast, compelling,
diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix
index 63acc14521c6..6d7d7a838790 100644
--- a/pkgs/development/libraries/fox/default.nix
+++ b/pkgs/development/libraries/fox/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    description = "FOX is a C++ based class library for building Graphical User Interfaces";
+    description = "C++ based class library for building Graphical User Interfaces";
     longDescription = ''
         FOX stands for Free Objects for X.
         It is a C++ based class library for building Graphical User Interfaces.
diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix
index 4d400a6ea7da..9d62472c27e7 100644
--- a/pkgs/development/libraries/gettext/default.nix
+++ b/pkgs/development/libraries/gettext/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation (rec {
   };
 
   meta = {
-    description = "GNU gettext, a well integrated set of translation tools and documentation";
+    description = "Well integrated set of translation tools and documentation";
 
     longDescription = ''
       Usually, programs are written and documented in English, and use
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 4f7c6042f136..93e96bef536a 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -107,7 +107,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = with stdenv.lib; {
-    description = "GLib, a C library of programming buildings blocks";
+    description = "C library of programming buildings blocks";
     homepage    = http://www.gtk.org/;
     license     = licenses.lgpl2Plus;
     maintainers = with maintainers; [ lovek323 raskin urkud ];
diff --git a/pkgs/development/libraries/glog/default.nix b/pkgs/development/libraries/glog/default.nix
index 098643ae70f0..d3f74f4043a9 100644
--- a/pkgs/development/libraries/glog/default.nix
+++ b/pkgs/development/libraries/glog/default.nix
@@ -11,6 +11,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://code.google.com/p/google-glog/;
     license = "BSD";
-    description = "The glog library implements application-level logging.";
+    description = "Library for application-level logging";
   };
 }
diff --git a/pkgs/development/libraries/gmp/4.3.2.nix b/pkgs/development/libraries/gmp/4.3.2.nix
index d0559c46795b..e9cfda032b17 100644
--- a/pkgs/development/libraries/gmp/4.3.2.nix
+++ b/pkgs/development/libraries/gmp/4.3.2.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   doCheck = false;
 
   meta = {
-    description = "GMP, the GNU multiple precision arithmetic library";
+    description = "GNU multiple precision arithmetic library";
 
     longDescription =
       '' GMP is a free library for arbitrary precision arithmetic, operating
diff --git a/pkgs/development/libraries/gmp/5.0.5.nix b/pkgs/development/libraries/gmp/5.0.5.nix
index c96c830e2f7f..5f3690f67a94 100644
--- a/pkgs/development/libraries/gmp/5.0.5.nix
+++ b/pkgs/development/libraries/gmp/5.0.5.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = {
-    description = "GMP, the GNU multiple precision arithmetic library";
+    description = "GNU multiple precision arithmetic library";
 
     longDescription =
       '' GMP is a free library for arbitrary precision arithmetic, operating
diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix
index 9e28334804bd..14a6d34d932b 100644
--- a/pkgs/development/libraries/gmp/5.1.x.nix
+++ b/pkgs/development/libraries/gmp/5.1.x.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation (rec {
 
   meta = with stdenv.lib; {
     homepage = "http://gmplib.org/";
-    description = "GMP, the GNU multiple precision arithmetic library";
+    description = "GNU multiple precision arithmetic library";
     license = licenses.gpl3Plus;
 
     longDescription =
diff --git a/pkgs/development/libraries/gss/default.nix b/pkgs/development/libraries/gss/default.nix
index 207b82486981..75ae4054592d 100644
--- a/pkgs/development/libraries/gss/default.nix
+++ b/pkgs/development/libraries/gss/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = {
-    description = "GNU GSS Generic Security Service";
+    description = "Generic Security Service";
 
     longDescription =
       '' GSS is an implementation of the Generic Security Service Application
diff --git a/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix b/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix
index ff26e727e9f3..777f4a06313b 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://gstreamer.freedesktop.org/modules/gnonlin.html";
-    description = "http://gstreamer.freedesktop.org/modules/gnonlin.html";
+    description = "Gstreamer Non-Linear Multimedia Editing Plugins";
     license = stdenv.lib.licenses.gpl2Plus;
   };
 }
diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix
index f781c624cea1..b608f891533b 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://gstreamer.freedesktop.org;
 
-    description = "GStreamer, a library for constructing graphs of media-handling components";
+    description = "Library for constructing graphs of media-handling components";
 
     longDescription = ''
       GStreamer is a library for constructing graphs of media-handling
diff --git a/pkgs/development/libraries/gtkimageview/default.nix b/pkgs/development/libraries/gtkimageview/default.nix
index 6905adcd71e3..b57c91c4455f 100644
--- a/pkgs/development/libraries/gtkimageview/default.nix
+++ b/pkgs/development/libraries/gtkimageview/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://trac.bjourne.webfactional.com/;
 
-    description = "The GtkImageView image viewer widget for GTK+";
+    description = "Image viewer widget for GTK+";
 
     longDescription =
       '' GtkImageView is a simple image viewer widget for GTK+.  Similar to
diff --git a/pkgs/development/libraries/gtkmathview/default.nix b/pkgs/development/libraries/gtkmathview/default.nix
index 2620d9cc120c..8a6914cfcd3b 100644
--- a/pkgs/development/libraries/gtkmathview/default.nix
+++ b/pkgs/development/libraries/gtkmathview/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = http://helm.cs.unibo.it/mml-widget/;
-    description = "GtkMathView is a C++ rendering engine for MathML documents";
+    description = "C++ rendering engine for MathML documents";
     license = stdenv.lib.licenses.lgpl3Plus;
     maintainers = [ stdenv.lib.maintainers.roconnor ];
   };
diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix
index bae0639a61c9..e278980e1e12 100644
--- a/pkgs/development/libraries/gupnp/default.nix
+++ b/pkgs/development/libraries/gupnp/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://www.gupnp.org/;
-    description = "GUPnP is an implementation of the UPnP specification.";
+    description = "An implementation of the UPnP specification";
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix
index 3c5f198cea60..d4d9663441f7 100644
--- a/pkgs/development/libraries/hwloc/default.nix
+++ b/pkgs/development/libraries/hwloc/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
   doCheck = !stdenv.isCygwin;
 
   meta = {
-    description = "hwloc, a portable abstraction of hierarchical architectures for high-performance computing";
+    description = "Portable abstraction of hierarchical architectures for high-performance computing";
 
     longDescription = ''
        hwloc provides a portable abstraction (across OS,
diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix
index 4046c05f79e5..ed51a0a28206 100644
--- a/pkgs/development/libraries/jasper/default.nix
+++ b/pkgs/development/libraries/jasper/default.nix
@@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
   
   meta = {
     homepage = http://www.ece.uvic.ca/~mdadams/jasper/;
-    description = "JasPer JPEG2000 Library";
+    description = "JPEG2000 Library";
   };
 }
diff --git a/pkgs/development/libraries/java/classpath/default.nix b/pkgs/development/libraries/java/classpath/default.nix
index bbfc6ed38cc3..eff52cc177b6 100644
--- a/pkgs/development/libraries/java/classpath/default.nix
+++ b/pkgs/development/libraries/java/classpath/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   configureFlags = "--disable-Werror --disable-plugin --with-antlr-jar=${antlr}/lib/antlr.jar";
 
   meta = {
-    description = "GNU Classpath, essential libraries for Java";
+    description = "Essential libraries for Java";
 
     longDescription = ''
       GNU Classpath, Essential Libraries for Java, is a GNU project to create
diff --git a/pkgs/development/libraries/java/rhino/default.nix b/pkgs/development/libraries/java/rhino/default.nix
index 42bdba7567c5..34aaded7cb44 100644
--- a/pkgs/development/libraries/java/rhino/default.nix
+++ b/pkgs/development/libraries/java/rhino/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
     '';
 
   meta = {
-    description = "Mozilla Rhino: JavaScript for Java";
+    description = "An implementation of JavaScript written in Java";
 
     longDescription =
       '' Rhino is an open-source implementation of JavaScript written
diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix
index f5a3d92d3db1..90ce4f970e3d 100644
--- a/pkgs/development/libraries/libassuan/default.nix
+++ b/pkgs/development/libraries/libassuan/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = {
-    description = "Libassuan, the IPC library used by GnuPG and related software";
+    description = "IPC library used by GnuPG and related software";
 
     longDescription = ''
       Libassuan is a small library implementing the so-called Assuan
diff --git a/pkgs/development/libraries/libcddb/default.nix b/pkgs/development/libraries/libcddb/default.nix
index b9823cefd2d9..9a284d8988d2 100644
--- a/pkgs/development/libraries/libcddb/default.nix
+++ b/pkgs/development/libraries/libcddb/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = {
-    description = "Libcddb is a C library to access data on a CDDB server (freedb.org)";
+    description = "C library to access data on a CDDB server (freedb.org)";
     license = stdenv.lib.licenses.lgpl2Plus;
     homepage = http://libcddb.sourceforge.net/;
   };
diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix
index 51b7f7e181d0..9cdf9d411ccd 100644
--- a/pkgs/development/libraries/libchamplain/default.nix
+++ b/pkgs/development/libraries/libchamplain/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     homepage = http://projects.gnome.org/libchamplain/;
     license = stdenv.lib.licenses.lgpl2Plus;
 
-    description = "libchamplain, a C library providing a ClutterActor to display maps";
+    description = "C library providing a ClutterActor to display maps";
 
     longDescription =
       '' libchamplain is a C library providing a ClutterActor to display
diff --git a/pkgs/development/libraries/libchop/default.nix b/pkgs/development/libraries/libchop/default.nix
index f0d7fbfbeb69..37af9756724f 100644
--- a/pkgs/development/libraries/libchop/default.nix
+++ b/pkgs/development/libraries/libchop/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = {
-    description = "libchop, tools & library for data backup and distributed storage";
+    description = "Tools & library for data backup and distributed storage";
 
     longDescription =
       '' Libchop is a set of utilities and library for data backup and
diff --git a/pkgs/development/libraries/libdaemon/default.nix b/pkgs/development/libraries/libdaemon/default.nix
index ba7e3e47ff76..cb8d07fec902 100644
--- a/pkgs/development/libraries/libdaemon/default.nix
+++ b/pkgs/development/libraries/libdaemon/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   configureFlags = [ "--disable-lynx" ];
 
   meta = {
-    description = "libdaemon, a lightweight C library that eases the writing of UNIX daemons";
+    description = "Lightweight C library that eases the writing of UNIX daemons";
 
     homepage = http://0pointer.de/lennart/projects/libdaemon/;
 
diff --git a/pkgs/development/libraries/libdnet/default.nix b/pkgs/development/libraries/libdnet/default.nix
index 50bdaa1c4c08..acd930ddd015 100644
--- a/pkgs/development/libraries/libdnet/default.nix
+++ b/pkgs/development/libraries/libdnet/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    description = "libdnet provides a simplified, portable interface to several low-level networking routines";
+    description = "Provides a simplified, portable interface to several low-level networking routines";
     homepage = http://code.google.com/p/libdnet/;
     license = "BSD"; # New BSD license
     maintainers = [stdenv.lib.maintainers.marcweber];
diff --git a/pkgs/development/libraries/libelf/default.nix b/pkgs/development/libraries/libelf/default.nix
index d9436456d0d4..407b367d6b7f 100644
--- a/pkgs/development/libraries/libelf/default.nix
+++ b/pkgs/development/libraries/libelf/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation (rec {
   doCheck = true;
 
   meta = {
-    description = "Libelf, an ELF object file access library";
+    description = "ELF object file access library";
 
     homepage = http://www.mr511.de/software/english.html;
 
diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix
index bb854139b794..57cf17383420 100644
--- a/pkgs/development/libraries/libevent/default.nix
+++ b/pkgs/development/libraries/libevent/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    description = "libevent, an event notification library";
+    description = "Event notification library";
 
     longDescription =
       '' The libevent API provides a mechanism to execute a callback function
diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix
index 6df5ca683f1f..18387c904f83 100644
--- a/pkgs/development/libraries/libextractor/default.nix
+++ b/pkgs/development/libraries/libextractor/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   #postInstall = "make check";
 
   meta = {
-    description = "GNU libextractor, a simple library for keyword extraction";
+    description = "Simple library for keyword extraction";
 
     longDescription =
       '' GNU libextractor is a library used to extract meta-data from files
diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix
index ba3de49ede8a..f47d3a627295 100644
--- a/pkgs/development/libraries/libgcrypt/default.nix
+++ b/pkgs/development/libraries/libgcrypt/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (rec {
   '';
 
   meta = {
-    description = "GNU Libgcrypt, a general-pupose cryptographic library";
+    description = "General-pupose cryptographic library";
 
     longDescription = ''
       GNU Libgcrypt is a general purpose cryptographic library based on
diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix
index 7b669cd780ae..3bdb85a78ebd 100644
--- a/pkgs/development/libraries/libiconv/default.nix
+++ b/pkgs/development/libraries/libiconv/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = {
-    description = "GNU libiconv, an iconv(3) implementation";
+    description = "An iconv(3) implementation";
 
     longDescription = ''
       Some programs, like mailers and web browsers, must be able to convert
diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix
index 802ee9e3e88f..37d19d10f290 100644
--- a/pkgs/development/libraries/libidn/default.nix
+++ b/pkgs/development/libraries/libidn/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://www.gnu.org/software/libidn/;
-    description = "GNU Libidn library for internationalized domain names";
+    description = "Library for internationalized domain names";
 
     longDescription = ''
       GNU Libidn is a fully documented implementation of the
diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/development/libraries/libksba/default.nix
index 5e038ad85720..dbd2516c0595 100644
--- a/pkgs/development/libraries/libksba/default.nix
+++ b/pkgs/development/libraries/libksba/default.nix
@@ -12,6 +12,6 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://www.gnupg.org;
-    description = "Libksba is a CMS and X.509 access library under development";
+    description = "CMS and X.509 access library under development";
   };
 }
diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix
index 959dca475732..39795267a2c5 100644
--- a/pkgs/development/libraries/libmicrohttpd/default.nix
+++ b/pkgs/development/libraries/libmicrohttpd/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   doCheck = false;
 
   meta = {
-    description = "GNU libmicrohttpd, an embeddable HTTP server library";
+    description = "Embeddable HTTP server library";
 
     longDescription = ''
       GNU libmicrohttpd is a small C library that is supposed to make
diff --git a/pkgs/development/libraries/libofa/default.nix b/pkgs/development/libraries/libofa/default.nix
index 2e2640e86362..6ffef2140ec2 100644
--- a/pkgs/development/libraries/libofa/default.nix
+++ b/pkgs/development/libraries/libofa/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://code.google.com/musicip-libofa/;
-    description = "LibOFA - Library Open Fingerprint Architecture";
+    description = "Library Open Fingerprint Architecture";
     longDescription = ''
       LibOFA (Library Open Fingerprint Architecture) is an open-source audio
       fingerprint created and provided by MusicIP'';
diff --git a/pkgs/development/libraries/libsigsegv/default.nix b/pkgs/development/libraries/libsigsegv/default.nix
index ae6299286a17..b6be8d194c15 100644
--- a/pkgs/development/libraries/libsigsegv/default.nix
+++ b/pkgs/development/libraries/libsigsegv/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://www.gnu.org/software/libsigsegv/;
-    description = "GNU libsigsegv, a library to handle page faults in user mode";
+    description = "Library to handle page faults in user mode";
 
     longDescription = ''
       GNU libsigsegv is a library for handling page faults in user mode. A
diff --git a/pkgs/development/libraries/libspectre/default.nix b/pkgs/development/libraries/libspectre/default.nix
index 7d46f9e32cef..0e5f976c1224 100644
--- a/pkgs/development/libraries/libspectre/default.nix
+++ b/pkgs/development/libraries/libspectre/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://libspectre.freedesktop.org/;
-    description = "libspectre, a PostScript rendering library";
+    description = "PostScript rendering library";
 
     longDescription = ''
       libspectre is a small library for rendering Postscript
diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix
index bae22ef220fc..5a2508a45067 100644
--- a/pkgs/development/libraries/libtasn1/default.nix
+++ b/pkgs/development/libraries/libtasn1/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://www.gnu.org/software/libtasn1/;
-    description = "GNU Libtasn1, an ASN.1 library";
+    description = "An ASN.1 library";
 
     longDescription =
       '' Libtasn1 is the ASN.1 library used by GnuTLS, GNU Shishi and some
diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix
index b578d895c5f0..2a87d7a32490 100644
--- a/pkgs/development/libraries/libunistring/default.nix
+++ b/pkgs/development/libraries/libunistring/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation (rec {
   meta = {
     homepage = http://www.gnu.org/software/libunistring/;
 
-    description = "GNU Libunistring, a Unicode string library";
+    description = "Unicode string library";
 
     longDescription = ''
       This library provides functions for manipulating Unicode strings
diff --git a/pkgs/development/libraries/libxmi/default.nix b/pkgs/development/libraries/libxmi/default.nix
index 85f0dbddb0b8..42c427605c4a 100644
--- a/pkgs/development/libraries/libxmi/default.nix
+++ b/pkgs/development/libraries/libxmi/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   preConfigure = "cp ${libtool}/share/libtool/config/config.sub .";
 
   meta = {
-    description = "GNU libxmi, a library for rasterizing 2-D vector graphics";
+    description = "Library for rasterizing 2-D vector graphics";
     homepage = http://www.gnu.org/software/libxmi/;
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
diff --git a/pkgs/development/libraries/lightning/default.nix b/pkgs/development/libraries/lightning/default.nix
index 951627c81c2f..73d98023c845 100644
--- a/pkgs/development/libraries/lightning/default.nix
+++ b/pkgs/development/libraries/lightning/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://www.gnu.org/software/lightning/;
-    description = "GNU lightning, a run-time code generation library";
+    description = "Run-time code generation library";
 
     longDescription = ''
       GNU lightning is a library that generates assembly language code
diff --git a/pkgs/development/libraries/ming/default.nix b/pkgs/development/libraries/ming/default.nix
index f9632dca9d22..a470f7715611 100644
--- a/pkgs/development/libraries/ming/default.nix
+++ b/pkgs/development/libraries/ming/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = {
-    description = "Ming, a library for generating Flash `.swf' files";
+    description = "Library for generating Flash `.swf' files";
 
     longDescription = ''
       Ming is a library for generating Macromedia Flash files (.swf),
diff --git a/pkgs/development/libraries/mpc/default.nix b/pkgs/development/libraries/mpc/default.nix
index 652227d47e85..3d05fa2e0405 100644
--- a/pkgs/development/libraries/mpc/default.nix
+++ b/pkgs/development/libraries/mpc/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = {
-    description = "GNU MPC, a library for multiprecision complex arithmetic with exact rounding";
+    description = "Library for multiprecision complex arithmetic with exact rounding";
 
     longDescription =
       '' GNU MPC is a C library for the arithmetic of complex numbers with
diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix
index e3fbaececb9b..653481aeccd6 100644
--- a/pkgs/development/libraries/mpfr/default.nix
+++ b/pkgs/development/libraries/mpfr/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://www.mpfr.org/;
-    description = "GNU MPFR, a library for multiple-precision floating-point arithmetic";
+    description = "Library for multiple-precision floating-point arithmetic";
 
     longDescription = ''
       The GNU MPFR library is a C library for multiple-precision
diff --git a/pkgs/development/libraries/mpich2/default.nix b/pkgs/development/libraries/mpich2/default.nix
index 5fba9c564181..b80d549931c6 100644
--- a/pkgs/development/libraries/mpich2/default.nix
+++ b/pkgs/development/libraries/mpich2/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
     '';
 
   meta = {
-    description = "MPICH2, an implementation of the Message Passing Interface (MPI) standard";
+    description = "Implementation of the Message Passing Interface (MPI) standard";
 
     longDescription = ''
       MPICH2 is a free high-performance and portable implementation of
diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 87953c1158d5..631199bf87c3 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
   postFixup = lib.optionalString stdenv.isDarwin "rm $out/lib/*.so";
 
   meta = {
-    description = "GNU Ncurses, a free software emulation of curses in SVR4 and more";
+    description = "Free software emulation of curses in SVR4 and more";
 
     longDescription = ''
       The Ncurses (new curses) library is a free software emulation of
diff --git a/pkgs/development/libraries/nettle/default.nix b/pkgs/development/libraries/nettle/default.nix
index 57d3732fa6dc..38d197c69ab3 100644
--- a/pkgs/development/libraries/nettle/default.nix
+++ b/pkgs/development/libraries/nettle/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (rec {
               ./cygwin.patch;
 
   meta = {
-    description = "GNU Nettle, a cryptographic library";
+    description = "Cryptographic library";
 
     longDescription = ''
         Nettle is a cryptographic library that is designed to fit
diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/development/libraries/oniguruma/default.nix
index 47a51b68d030..08069533713d 100644
--- a/pkgs/development/libraries/oniguruma/default.nix
+++ b/pkgs/development/libraries/oniguruma/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   
   meta = {
     homepage = http://www.geocities.jp/kosako3/oniguruma/;
-    description = "Oniguruma regular expressions library";
+    description = "Regular expressions library";
     license = "BSD";
   };
 }
diff --git a/pkgs/development/libraries/opal/default.nix b/pkgs/development/libraries/opal/default.nix
index 1f59c0c24a02..c79c3cbe4d62 100644
--- a/pkgs/development/libraries/opal/default.nix
+++ b/pkgs/development/libraries/opal/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   patches = [ ./disable-samples-ftbfs.diff ./libav9.patch ./libav10.patch ];
       
   meta = with stdenv.lib; {
-    description = "OPAL VoIP library";
+    description = "VoIP library";
     maintainers = [ maintainers.raskin ];
     platforms = platforms.linux;
   };
diff --git a/pkgs/development/libraries/openal/default.nix b/pkgs/development/libraries/openal/default.nix
index b5e390eafa85..5a935691ca58 100644
--- a/pkgs/development/libraries/openal/default.nix
+++ b/pkgs/development/libraries/openal/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib;
 
   meta = {
-    description = "OpenAL, a cross-platform 3D audio API";
+    description = "Cross-platform 3D audio API";
 
     longDescription = ''
       OpenAL is a cross-platform 3D audio API appropriate for use with
diff --git a/pkgs/development/libraries/plib/default.nix b/pkgs/development/libraries/plib/default.nix
index 35262f797e97..4ab6fb3ad8b4 100644
--- a/pkgs/development/libraries/plib/default.nix
+++ b/pkgs/development/libraries/plib/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = {
-    description = "PLIB: A Suite of Portable Game Libraries";
+    description = "A suite of portable game libraries";
 
     longDescription = ''
       PLIB includes sound effects, music, a complete 3D engine, font
diff --git a/pkgs/development/libraries/ppl/default.nix b/pkgs/development/libraries/ppl/default.nix
index f93eee674ffc..9edef767481f 100644
--- a/pkgs/development/libraries/ppl/default.nix
+++ b/pkgs/development/libraries/ppl/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    description = "PPL: The Parma Polyhedra Library";
+    description = "The Parma Polyhedra Library";
 
     longDescription = ''
       The Parma Polyhedra Library (PPL) provides numerical abstractions
diff --git a/pkgs/development/libraries/readline/readline6.3.nix b/pkgs/development/libraries/readline/readline6.3.nix
index 9f5c9f7b5813..17299e5f10d8 100644
--- a/pkgs/development/libraries/readline/readline6.3.nix
+++ b/pkgs/development/libraries/readline/readline6.3.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation (rec {
     ];
 
   meta = {
-    description = "GNU Readline, a library for interactive line editing";
+    description = "Library for interactive line editing";
 
     longDescription = ''
       The GNU Readline library provides a set of functions for use by
diff --git a/pkgs/development/libraries/readline/readline6.nix b/pkgs/development/libraries/readline/readline6.nix
index 0559113285c4..d72d6566bbc9 100644
--- a/pkgs/development/libraries/readline/readline6.nix
+++ b/pkgs/development/libraries/readline/readline6.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation (rec {
        import ./readline-6.2-patches.nix patch);
 
   meta = {
-    description = "GNU Readline, a library for interactive line editing";
+    description = "Library for interactive line editing";
 
     longDescription = ''
       The GNU Readline library provides a set of functions for use by
diff --git a/pkgs/development/libraries/science/biology/biolib/default.nix b/pkgs/development/libraries/science/biology/biolib/default.nix
index 0461e5ebcf54..7418bdb6dfe0 100644
--- a/pkgs/development/libraries/science/biology/biolib/default.nix
+++ b/pkgs/development/libraries/science/biology/biolib/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://biolib.open-bio.org/";
-    description = "BioLib";
+    description = "Shared libraries for the major Bio* languages";
     license = stdenv.lib.licenses.gpl2;
     longDescription = ''
       BioLib brings together a set of opensource libraries written
diff --git a/pkgs/development/libraries/szip/default.nix b/pkgs/development/libraries/szip/default.nix
index 17f9c973fd0b..2ad2ed55d7c0 100644
--- a/pkgs/development/libraries/szip/default.nix
+++ b/pkgs/development/libraries/szip/default.nix
@@ -8,9 +8,7 @@ stdenv.mkDerivation {
   };
 
   meta = {
-    description = "
-      Szip is a compression library that can be used with the hdf5 library.
-    ";
+    description = "Compression library that can be used with the hdf5 library";
     homepage = http://www.hdfgroup.org/doc_resource/SZIP/;
     license = stdenv.lib.licenses.unfree;
   };
diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix
index e04363326d01..15e89d9210a1 100644
--- a/pkgs/development/libraries/talloc/default.nix
+++ b/pkgs/development/libraries/talloc/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   '' else "";
 
   meta = {
-    description = "talloc is a hierarchical pool based memory allocator with destructors";
+    description = "Hierarchical pool based memory allocator with destructors";
     homepage = http://tdb.samba.org/;
     license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix
index d0eb8987ea08..c53316564351 100644
--- a/pkgs/development/libraries/tdb/default.nix
+++ b/pkgs/development/libraries/tdb/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ libxslt libxml2 docbook_xsl ];
 
   meta = {
-    description = "TDB, the trivial database";
+    description = "The trivial database";
     longDescription =
       '' TDB is a Trivial Database. In concept, it is very much like GDBM,
          and BSD's DB except that it allows multiple simultaneous writers and
diff --git a/pkgs/development/libraries/tecla/default.nix b/pkgs/development/libraries/tecla/default.nix
index 6cb20f4e3563..f83b34e40d1a 100644
--- a/pkgs/development/libraries/tecla/default.nix
+++ b/pkgs/development/libraries/tecla/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://www.astro.caltech.edu/~mcs/tecla/";
-    description = "Tecla command-line editing library";
+    description = "Command-line editing library";
     license = "as-is";
 
     hydraPlatforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/libraries/ucommon/default.nix b/pkgs/development/libraries/ucommon/default.nix
index f3ac325b5a12..0e8a95d5ac16 100644
--- a/pkgs/development/libraries/ucommon/default.nix
+++ b/pkgs/development/libraries/ucommon/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = {
-    description = "GNU uCommon C++, C++ library to facilitate using C++ design patterns";
+    description = "C++ library to facilitate using C++ design patterns";
     homepage = http://www.gnu.org/software/commoncpp/;
     license = stdenv.lib.licenses.lgpl3Plus;
 
diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix
index d3a2511c90c2..4c86de7fb56b 100644
--- a/pkgs/development/libraries/v8/default.nix
+++ b/pkgs/development/libraries/v8/default.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
   '' else null;
 
   meta = with stdenv.lib; {
-    description = "V8 is Google's open source JavaScript engine";
+    description = "Google's open source JavaScript engine";
     platforms = platforms.linux ++ platforms.darwin;
     license = licenses.bsd3;
   };
diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix
index 99837974b1d9..d74a85a9162d 100644
--- a/pkgs/development/libraries/xapian/default.nix
+++ b/pkgs/development/libraries/xapian/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   buildInputs = [ libuuid zlib ];
 
   meta = { 
-    description = "Xapian Probabilistic Information Retrieval library";
+    description = "Search engine library";
     homepage = "http://xapian.org";
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = [ stdenv.lib.maintainers.chaoflow ];
diff --git a/pkgs/development/libraries/xbase/default.nix b/pkgs/development/libraries/xbase/default.nix
index 81447276db79..95ba2a05ad9b 100644
--- a/pkgs/development/libraries/xbase/default.nix
+++ b/pkgs/development/libraries/xbase/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = http://linux.techass.com/projects/xdb/;
-    description = "XBase compatible C++ class library formerly known as XDB";
+    description = "C++ class library formerly known as XDB";
     platforms = stdenv.lib.platforms.all;
     maintainers = [ stdenv.lib.maintainers.urkud ];
   };
diff --git a/pkgs/development/libraries/xylib/default.nix b/pkgs/development/libraries/xylib/default.nix
index 8fff5f393383..fe9b6c5c3ca4 100644
--- a/pkgs/development/libraries/xylib/default.nix
+++ b/pkgs/development/libraries/xylib/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   buildInputs = [boost zlib bzip2 ];
 
   meta = {
-    description = "xylib is a portable library for reading files that contain x-y data from powder diffraction, spectroscopy and other experimental methods.";
+    description = "Portable library for reading files that contain x-y data from powder diffraction, spectroscopy and other experimental methods";
     license = "LGPL";
     homepage = http://xylib.sourceforge.net/;
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/python-modules/ecdsa/default.nix b/pkgs/development/python-modules/ecdsa/default.nix
index f668f3c6ac3b..a07eceb45aad 100644
--- a/pkgs/development/python-modules/ecdsa/default.nix
+++ b/pkgs/development/python-modules/ecdsa/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   meta = {
     homepage = "http://github.com/warner/python-ecdsa";
-    description = "pure-python ECDSA signature/verification";
+    description = "Pure-python ECDSA signature/verification";
     license = stdenv.lib.licenses.mit;
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/python-modules/numeric/default.nix b/pkgs/development/python-modules/numeric/default.nix
index e97b2a5f1a40..0d6d5b0ffed6 100644
--- a/pkgs/development/python-modules/numeric/default.nix
+++ b/pkgs/development/python-modules/numeric/default.nix
@@ -23,7 +23,7 @@ let version = "24.2"; in
     # FIXME: Run the tests.
 
     meta = {
-      description = "Numeric, a Python module for high-performance, numeric computing";
+      description = "A Python module for high-performance, numeric computing";
 
       longDescription = ''
         Numeric is a Python module for high-performance, numeric
@@ -37,4 +37,4 @@ let version = "24.2"; in
 
       homepage = http://people.csail.mit.edu/jrennie/python/numeric/;
     };
-  }
\ No newline at end of file
+  }
diff --git a/pkgs/development/tools/analysis/lcov/default.nix b/pkgs/development/tools/analysis/lcov/default.nix
index 89a17d28a1b9..10cdf01103a6 100644
--- a/pkgs/development/tools/analysis/lcov/default.nix
+++ b/pkgs/development/tools/analysis/lcov/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "LCOV, a code coverage tool that enhances GNU gcov";
+    description = "Code coverage tool that enhances GNU gcov";
 
     longDescription =
       '' LCOV is an extension of GCOV, a GNU tool which provides information
diff --git a/pkgs/development/tools/analysis/sparse/default.nix b/pkgs/development/tools/analysis/sparse/default.nix
index 6d0e28f0ab20..6898b7eee54c 100644
--- a/pkgs/development/tools/analysis/sparse/default.nix
+++ b/pkgs/development/tools/analysis/sparse/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = {
-    description = "Sparse, a semantic parser for C";
+    description = "Semantic parser for C";
     homepage    = "https://git.kernel.org/cgit/devel/sparse/sparse.git/";
     license     = stdenv.lib.licenses.mit;
     platforms   = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix
index 5ffc287d114b..aaeee026d0a8 100644
--- a/pkgs/development/tools/analysis/valgrind/default.nix
+++ b/pkgs/development/tools/analysis/valgrind/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://www.valgrind.org/;
-    description = "Valgrind, a debugging and profiling tool suite";
+    description = "Debugging and profiling tool suite";
 
     longDescription = ''
       Valgrind is an award-winning instrumentation framework for
diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index b7316fc17c4a..a4863d12b5ca 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ unzip jdk makeWrapper ];
 
   meta = {
-    description = "Gradle is an enterprise-grade build system";
+    description = "Enterprise-grade build system";
     longDescription = ''
       Gradle is a build system which offers you ease, power and freedom.
       You can choose the balance for yourself. It has powerful multi-project
diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix
index 54509178b1a1..50f2037b271c 100644
--- a/pkgs/development/tools/documentation/doxygen/default.nix
+++ b/pkgs/development/tools/documentation/doxygen/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
   meta = {
     license = stdenv.lib.licenses.gpl2Plus;
     homepage = "http://doxygen.org/";
-    description = "Doxygen, a source code documentation generator tool";
+    description = "Source code documentation generator tool";
 
     longDescription = ''
       Doxygen is a documentation system for C++, C, Java, Objective-C,
diff --git a/pkgs/development/tools/java/fastjar/default.nix b/pkgs/development/tools/java/fastjar/default.nix
index c8bb94412cad..e5a9ca50ce92 100644
--- a/pkgs/development/tools/java/fastjar/default.nix
+++ b/pkgs/development/tools/java/fastjar/default.nix
@@ -14,7 +14,7 @@ let version = "0.94"; in
     doCheck = true;
 
     meta = {
-      description = "FastJar, a fast Java archiver written in C";
+      description = "Fast Java archiver written in C";
 
       longDescription = ''
         Fastjar is a version of Sun's `jar' utility, written entirely in C, and
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 8d8fc5d464e8..fc48a4aabada 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    description = "GNU Binutils, tools for manipulating binaries (linker, assembler, etc.)";
+    description = "Tools for manipulating binaries (linker, assembler, etc.)";
 
     longDescription = ''
       The GNU Binutils are a collection of binary tools.  The main
diff --git a/pkgs/development/tools/misc/cflow/default.nix b/pkgs/development/tools/misc/cflow/default.nix
index 53bc8ed78c8b..b1322d461ee7 100644
--- a/pkgs/development/tools/misc/cflow/default.nix
+++ b/pkgs/development/tools/misc/cflow/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = {
-    description = "GNU cflow, a tool to analyze the control flow of C programs";
+    description = "Tool to analyze the control flow of C programs";
 
     longDescription = ''
       GNU cflow analyzes a collection of C source files and prints a
diff --git a/pkgs/development/tools/misc/coccinelle/default.nix b/pkgs/development/tools/misc/coccinelle/default.nix
index 0bf5bbce692d..51f5ed6091fa 100644
--- a/pkgs/development/tools/misc/coccinelle/default.nix
+++ b/pkgs/development/tools/misc/coccinelle/default.nix
@@ -37,7 +37,7 @@ in stdenv.mkDerivation {
   configureFlags = "--enable-release";
 
   meta = {
-    description = "Coccinelle, a program to apply C code semantic patches";
+    description = "Program to apply semantic patches to C code";
 
     longDescription =
       '' Coccinelle is a program matching and transformation engine which
diff --git a/pkgs/development/tools/misc/complexity/default.nix b/pkgs/development/tools/misc/complexity/default.nix
index 9f1eca0fa13c..a7ae4d17ab10 100644
--- a/pkgs/development/tools/misc/complexity/default.nix
+++ b/pkgs/development/tools/misc/complexity/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "GNU Complexity, C code complexity measurement tool";
+    description = "C code complexity measurement tool";
 
     longDescription =
       '' GNU Complexity is a tool designed for analyzing the complexity of C
diff --git a/pkgs/development/tools/misc/cppi/default.nix b/pkgs/development/tools/misc/cppi/default.nix
index 500129c7c9de..2942408de806 100644
--- a/pkgs/development/tools/misc/cppi/default.nix
+++ b/pkgs/development/tools/misc/cppi/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://savannah.gnu.org/projects/cppi/;
 
-    description = "GNU cppi, a cpp directive indenter";
+    description = "A C preprocessor directive indenter";
 
     longDescription =
       '' GNU cppi indents C preprocessor directives to reflect their nesting
diff --git a/pkgs/development/tools/misc/cscope/default.nix b/pkgs/development/tools/misc/cscope/default.nix
index 3a83b1ba3251..223f19682746 100644
--- a/pkgs/development/tools/misc/cscope/default.nix
+++ b/pkgs/development/tools/misc/cscope/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = {
-    description = "Cscope, a developer's tool for browsing source code";
+    description = "A developer's tool for browsing source code";
 
     longDescription = ''
       Cscope is a developer's tool for browsing source code.  It has
diff --git a/pkgs/development/tools/misc/ctags/default.nix b/pkgs/development/tools/misc/ctags/default.nix
index 80def733cf8c..bf13a5daa666 100644
--- a/pkgs/development/tools/misc/ctags/default.nix
+++ b/pkgs/development/tools/misc/ctags/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://ctags.sourceforge.net/";
-    description = "Exuberant Ctags, a tool for fast source code browsing";
+    description = "A tool for fast source code browsing (exuberant ctags)";
     license = stdenv.lib.licenses.gpl2Plus;
 
     longDescription = ''
diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix
index 2b5ced780633..5ee0f64a4e41 100644
--- a/pkgs/development/tools/misc/gdb/default.nix
+++ b/pkgs/development/tools/misc/gdb/default.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
   doCheck = false;
 
   meta = with stdenv.lib; {
-    description = "GDB, the GNU Project debugger";
+    description = "The GNU Project debugger";
 
     longDescription = ''
       GDB, the GNU Project debugger, allows you to see what is going
diff --git a/pkgs/development/tools/misc/gengetopt/default.nix b/pkgs/development/tools/misc/gengetopt/default.nix
index 9926dd6cd334..19e934f884f7 100644
--- a/pkgs/development/tools/misc/gengetopt/default.nix
+++ b/pkgs/development/tools/misc/gengetopt/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = {
-    description = "GNU Gengetopt, a command-line option parser generator";
+    description = "Command-line option parser generator";
 
     longDescription =
       '' GNU Gengetopt program generates a C function that uses getopt_long
diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix
index d6abf8d10bdb..b366feb304a6 100644
--- a/pkgs/development/tools/misc/global/default.nix
+++ b/pkgs/development/tools/misc/global/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "GNU GLOBAL source code tag system";
+    description = "Source code tag system";
 
     longDescription = ''
       GNU GLOBAL is a source code tagging system that works the same way
diff --git a/pkgs/development/tools/misc/gperf/default.nix b/pkgs/development/tools/misc/gperf/default.nix
index e25998e54204..f0fd081ec5f1 100644
--- a/pkgs/development/tools/misc/gperf/default.nix
+++ b/pkgs/development/tools/misc/gperf/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = {
-    description = "GNU gperf, a perfect hash function generator";
+    description = "Perfect hash function generator";
 
     longDescription = ''
       GNU gperf is a perfect hash function generator.  For a given
diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix
index 23bd35c8739a..c4ba7073889d 100644
--- a/pkgs/development/tools/misc/help2man/default.nix
+++ b/pkgs/development/tools/misc/help2man/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
 
   meta = {
-    description = "GNU help2man generates man pages from `--help' output";
+    description = "Generate man pages from `--help' output";
 
     longDescription =
       '' help2man produces simple manual pages from the ‘--help’ and
diff --git a/pkgs/development/tools/misc/libtool/default.nix b/pkgs/development/tools/misc/libtool/default.nix
index 5eee9ead5d63..262d8aad23bb 100644
--- a/pkgs/development/tools/misc/libtool/default.nix
+++ b/pkgs/development/tools/misc/libtool/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   dontPatchShebangs = true;
 
   meta = {
-    description = "GNU Libtool, a generic library support script";
+    description = "Generic library support script";
 
     longDescription = ''
       GNU libtool is a generic library support script.  Libtool hides
diff --git a/pkgs/development/tools/misc/sloccount/default.nix b/pkgs/development/tools/misc/sloccount/default.nix
index 455305be7492..1aa9a2c058d6 100644
--- a/pkgs/development/tools/misc/sloccount/default.nix
+++ b/pkgs/development/tools/misc/sloccount/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "SLOCCount, a set of tools for counting physical Source Lines of Code (SLOC)";
+    description = "Set of tools for counting physical Source Lines of Code (SLOC)";
 
     longDescription = ''
       This is the home page of "SLOCCount", a set of tools for
diff --git a/pkgs/development/tools/misc/swig/default.nix b/pkgs/development/tools/misc/swig/default.nix
index 09978b5ad650..66d6b65453ea 100644
--- a/pkgs/development/tools/misc/swig/default.nix
+++ b/pkgs/development/tools/misc/swig/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   configureFlags = stdenv.lib.optionalString stdenv.isDarwin "--disable-ccache";
 
   meta = {
-    description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages";
+    description = "Interface compiler that connects C/C++ code to higher-level languages";
 
     longDescription = ''
        SWIG is an interface compiler that connects programs written in C and
diff --git a/pkgs/development/tools/misc/texinfo/4.13a.nix b/pkgs/development/tools/misc/texinfo/4.13a.nix
index 5131d3814123..a31552305147 100644
--- a/pkgs/development/tools/misc/texinfo/4.13a.nix
+++ b/pkgs/development/tools/misc/texinfo/4.13a.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   #doCheck = true;
 
   meta = {
-    description = "GNU Texinfo, the GNU documentation system";
+    description = "The GNU documentation system";
 
     longDescription = ''
       Texinfo is the official documentation format of the GNU project.
diff --git a/pkgs/development/tools/misc/texinfo/5.2.nix b/pkgs/development/tools/misc/texinfo/5.2.nix
index 804e7a2527fe..62e1ff62d1e3 100644
--- a/pkgs/development/tools/misc/texinfo/5.2.nix
+++ b/pkgs/development/tools/misc/texinfo/5.2.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://www.gnu.org/software/texinfo/";
-    description = "GNU Texinfo, the GNU documentation system";
+    description = "The GNU documentation system";
     license = stdenv.lib.licenses.gpl3Plus;
     platforms = stdenv.lib.platforms.all;
 
diff --git a/pkgs/development/tools/ocaml/omake/default.nix b/pkgs/development/tools/ocaml/omake/default.nix
index 22e0d71af4d1..300cbbc0a0c1 100644
--- a/pkgs/development/tools/ocaml/omake/default.nix
+++ b/pkgs/development/tools/ocaml/omake/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
 #  buildFlags = "world.opt";
 
   meta = {
-    description = "Omake build system";
+    description = "A build system designed for scalability and portability";
     homepage = "${webpage}";
     license = "GPL";
   };
diff --git a/pkgs/development/tools/parsing/bison/2.x.nix b/pkgs/development/tools/parsing/bison/2.x.nix
index 5bf5d7c2e8c6..f89e7bca5a76 100644
--- a/pkgs/development/tools/parsing/bison/2.x.nix
+++ b/pkgs/development/tools/parsing/bison/2.x.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://www.gnu.org/software/bison/";
-    description = "GNU Bison, a Yacc-compatible parser generator";
+    description = "Yacc-compatible parser generator";
     license = stdenv.lib.licenses.gpl3Plus;
 
     longDescription = ''
diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix
index 5947f85343c4..49602a232010 100644
--- a/pkgs/development/tools/parsing/bison/3.x.nix
+++ b/pkgs/development/tools/parsing/bison/3.x.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://www.gnu.org/software/bison/";
-    description = "GNU Bison, a Yacc-compatible parser generator";
+    description = "Yacc-compatible parser generator";
     license = stdenv.lib.licenses.gpl3Plus;
 
     longDescription = ''
diff --git a/pkgs/development/tools/profiling/oprofile/default.nix b/pkgs/development/tools/profiling/oprofile/default.nix
index e301fe8431af..6c7b2a4d9ae1 100644
--- a/pkgs/development/tools/profiling/oprofile/default.nix
+++ b/pkgs/development/tools/profiling/oprofile/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "OProfile, a system-wide profiler for Linux";
+    description = "System-wide profiler for Linux";
     longDescription = ''
       OProfile is a system-wide profiler for Linux systems, capable of
       profiling all running code at low overhead.  It consists of a
diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix
index 457a5d1dcaa5..826ca93aa7d4 100644
--- a/pkgs/development/tools/profiling/sysprof/default.nix
+++ b/pkgs/development/tools/profiling/sysprof/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://sysprof.com/;
-    description = "Sysprof, a system-wide profiler for Linux";
+    description = "System-wide profiler for Linux";
     license = stdenv.lib.licenses.gpl2Plus;
 
     longDescription = ''
diff --git a/pkgs/development/tools/sqsh/default.nix b/pkgs/development/tools/sqsh/default.nix
index a0f7922b1aa8..15a6985b8bf7 100644
--- a/pkgs/development/tools/sqsh/default.nix
+++ b/pkgs/development/tools/sqsh/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = {
-    description = "SQSH is command line tool for querying Sybase/MSSQL databases";
+    description = "Command line tool for querying Sybase/MSSQL databases";
     longDescription = 
       ''
       Sqsh (pronounced skwish) is short for SQshelL (pronounced s-q-shell),
diff --git a/pkgs/games/banner/default.nix b/pkgs/games/banner/default.nix
index b4e61b6d1d1f..b443a76b9a77 100644
--- a/pkgs/games/banner/default.nix
+++ b/pkgs/games/banner/default.nix
@@ -36,7 +36,7 @@ mkDerivation "banner-1.3.2" "0dc0ac0667b2e884a7f5ad3e467af68cd0fd5917f8c9aa19188
 
   meta = {
     homepage = "http://shh.thathost.com/pub-unix/";
-    description = "print large banners to ASCII terminals";
+    description = "Print large banners to ASCII terminals";
     license = stdenv.lib.licenses.gpl2;
 
     longDescription = ''
diff --git a/pkgs/games/chessdb/default.nix b/pkgs/games/chessdb/default.nix
index 381e35632a6e..224eb6f594a0 100644
--- a/pkgs/games/chessdb/default.nix
+++ b/pkgs/games/chessdb/default.nix
@@ -24,6 +24,6 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = http://chessdb.sourceforge.net/;
-    description = "ChessDB is a free chess database";
+    description = "A free chess database";
   };
 }
diff --git a/pkgs/games/construo/default.nix b/pkgs/games/construo/default.nix
index 57d055ed3d3d..f94b489908eb 100644
--- a/pkgs/games/construo/default.nix
+++ b/pkgs/games/construo/default.nix
@@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs ["preConfigure" "doConfigure" "doMakeInstall" "doForceShare" "doPropagate"]);
 	meta = {
-		description = "Construo masses and springs simulation";
+		description = "Masses and springs simulation game";
 	};
 }
diff --git a/pkgs/games/crafty/default.nix b/pkgs/games/crafty/default.nix
index 0e2796df22d8..351e25388e17 100644
--- a/pkgs/games/crafty/default.nix
+++ b/pkgs/games/crafty/default.nix
@@ -659,7 +659,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://www.craftychess.com/;
-    description = "Crafty is a free, open-source computer chess program developed by Dr. Robert M. Hyatt";
+    description = "Chess program developed by Dr. Robert M. Hyatt";
     license = stdenv.lib.licenses.unfree;
     platforms = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.jwiegley ];
diff --git a/pkgs/games/eboard/default.nix b/pkgs/games/eboard/default.nix
index 1decee4264a4..8dd06fa6a281 100644
--- a/pkgs/games/eboard/default.nix
+++ b/pkgs/games/eboard/default.nix
@@ -14,6 +14,6 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = http://www.bergo.eng.br/eboard/;
-    description = "eboard is a chess interface for Unix-like systems";
+    description = "Chess interface for Unix-like systems";
   };
 }
diff --git a/pkgs/games/openspades/default.nix b/pkgs/games/openspades/default.nix
index 7f11fc829032..c2218d033d79 100644
--- a/pkgs/games/openspades/default.nix
+++ b/pkgs/games/openspades/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     else null;
 
   meta = with stdenv.lib; {
-    description = "OpenSpades is a compatible client of Ace of Spades 0.75";
+    description = "A compatible client of Ace of Spades 0.75";
     homepage    = "https://github.com/yvt/openspades/";
     license     = licenses.gpl3;
     platforms   = platforms.linux;
diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix
index 1b6b7f26a41e..ff96622cb59c 100644
--- a/pkgs/games/openttd/default.nix
+++ b/pkgs/games/openttd/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = ''OpenTTD is an open source clone of the Microprose game "Transport Tycoon Deluxe"'';
+    description = ''Open source clone of the Microprose game "Transport Tycoon Deluxe"'';
     longDescription = ''
       OpenTTD is a transportation economics simulator. In single player mode,
       players control a transportation business, and use rail, road, sea, and air
diff --git a/pkgs/games/opentyrian/default.nix b/pkgs/games/opentyrian/default.nix
index cfae6a4bb3e8..c435bbe5887f 100644
--- a/pkgs/games/opentyrian/default.nix
+++ b/pkgs/games/opentyrian/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   ";
 
   meta = {
-    description = ''OpenTyrian is an open source port of the game "Tyrian".'';
+    description = ''Open source port of the game "Tyrian"'';
     homepage = https://opentyrian.googlecode.com/;
     # This does not account of Tyrian data.
     # license = stdenv.lib.licenses.gpl2;
diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix
index c685f11c4c16..5276ec4cc34f 100644
--- a/pkgs/games/teeworlds/default.nix
+++ b/pkgs/games/teeworlds/default.nix
@@ -51,7 +51,7 @@ EOF
   '';
 
   meta = {
-    description = "Teeworlds, a retro multiplayer shooter game";
+    description = "Retro multiplayer shooter game";
 
     longDescription = ''
       Teeworlds is a free online multiplayer game, available for all
diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix
index 275b93e01b8b..b8c879d598ba 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -12,7 +12,7 @@ assert cupsSupport -> cups != null;
 let
   meta_common = {
     homepage = "http://www.gnu.org/software/ghostscript/";
-    description = "GNU Ghostscript, a PostScript interpreter";
+    description = "PostScript interpreter (GNU version)";
 
     longDescription = ''
       Ghostscript is the name of a set of tools that provides (i) an
@@ -48,7 +48,7 @@ let
     };
     meta = meta_common // {
       homepage = "http://www.ghostscript.com/";
-      description = "GPL Ghostscript, a PostScript interpreter";
+      description = "PostScript interpreter (mainline version)";
     };
 
     preConfigure = ''
diff --git a/pkgs/misc/xosd/default.nix b/pkgs/misc/xosd/default.nix
index d6b73ed16fe0..54538be84b41 100644
--- a/pkgs/misc/xosd/default.nix
+++ b/pkgs/misc/xosd/default.nix
@@ -14,6 +14,6 @@ stdenv.mkDerivation rec {
   buildInputs = [ libX11 libXext libXt xextproto xproto ];
 
   meta = {
-    description = "XOSD displays text on your screen";
+    description = "Displays text on your screen";
   };
 }
diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix
index 92b97ffb592e..52e5d95346ed 100644
--- a/pkgs/os-specific/linux/conky/default.nix
+++ b/pkgs/os-specific/linux/conky/default.nix
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://conky.sourceforge.net/;
-    description = "Conky is an advanced, highly configurable system monitor based on torsmo";
+    description = "Advanced, highly configurable system monitor based on torsmo";
     maintainers = [ stdenv.lib.maintainers.guibert ];
     license = stdenv.lib.licenses.gpl3Plus;
   };
diff --git a/pkgs/servers/dico/default.nix b/pkgs/servers/dico/default.nix
index ca4980f5a6c4..f345fe71a34f 100644
--- a/pkgs/servers/dico/default.nix
+++ b/pkgs/servers/dico/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "GNU Dico, a flexible dictionary server and client implementing RFC 2229";
+    description = "Flexible dictionary server and client implementing RFC 2229";
     homepage    = http://www.gnu.org/software/dico/;
     license     = "GPLv3+";
     maintainers = with maintainers; [ lovek323 ];
diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index 921d8e907f19..50e71a745464 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://www.isc.org/software/bind";
-    description = "ISC BIND: a domain name server";
+    description = "Domain name server";
     license = stdenv.lib.licenses.isc;
 
     maintainers = with stdenv.lib.maintainers; [viric simons];
diff --git a/pkgs/servers/felix/default.nix b/pkgs/servers/felix/default.nix
index aa40365e8dea..c1114232ea8f 100644
--- a/pkgs/servers/felix/default.nix
+++ b/pkgs/servers/felix/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
     cp -av * $out
   '';
   meta = {
-    description = "Apache Felix OSGi gateway";
+    description = "An OSGi gateway";
     homepage = http://felix.apache.org;
     license = "ASF";
     maintainers = [ stdenv.lib.maintainers.sander ];
diff --git a/pkgs/servers/firebird/default.nix b/pkgs/servers/firebird/default.nix
index 365af29595c1..3e778317169c 100644
--- a/pkgs/servers/firebird/default.nix
+++ b/pkgs/servers/firebird/default.nix
@@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
   installPhase = ''cp -r gen/firebird $out'';
 
   meta = {
-    description = "firebird database engine";
+    description = "SQL relational database management system";
     homepage = http://www.firebirdnews.org;
     license = ["IDPL" "Interbase-1.0"];
     maintainers = [stdenv.lib.maintainers.marcweber];
diff --git a/pkgs/servers/http/couchdb/default.nix b/pkgs/servers/http/couchdb/default.nix
index 35d4ebbf89f3..0b5244a5974f 100644
--- a/pkgs/servers/http/couchdb/default.nix
+++ b/pkgs/servers/http/couchdb/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "Apache CouchDB is a database that uses JSON for documents, JavaScript for MapReduce queries, and regular HTTP for an API";
+    description = "A database that uses JSON for documents, JavaScript for MapReduce queries, and regular HTTP for an API";
     homepage = "http://couchdb.apache.org";
     license = stdenv.lib.licenses.asl20;
     maintainers = with stdenv.lib.maintainers; [ viric garbas ];
diff --git a/pkgs/servers/http/jboss/default.nix b/pkgs/servers/http/jboss/default.nix
index d5768da4c824..86d371898872 100644
--- a/pkgs/servers/http/jboss/default.nix
+++ b/pkgs/servers/http/jboss/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
   
   meta = {
     homepage = "http://www.jboss.org/";
-    description = "JBoss, Open Source J2EE application server";
+    description = "Open Source J2EE application server";
     license = "GPL/LGPL";
     maintainers = [ lib.maintainers.sander ];
   };
diff --git a/pkgs/servers/pies/default.nix b/pkgs/servers/pies/default.nix
index 958578138bc2..56c7da5caedf 100644
--- a/pkgs/servers/pies/default.nix
+++ b/pkgs/servers/pies/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = {
-    description = "GNU Pies, a program invocation and execution supervisor";
+    description = "A program invocation and execution supervisor";
 
     longDescription =
       '' The name Pies (pronounced "p-yes") stands for Program Invocation and
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index 2c6f6c104931..a918007b47c6 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
   installFlags = "sysconfdir=$(out)/etc pulseconfdir=$(out)/etc/pulse";
 
   meta = with stdenv.lib; {
-    description = "PulseAudio, a sound server for POSIX and Win32 systems";
+    description = "Sound server for POSIX and Win32 systems";
     homepage    = http://www.pulseaudio.org/;
     # Note: Practically, the server is under the GPL due to the
     # dependency on `libsamplerate'.  See `LICENSE' for details.
diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix
index 2e0a4e84f6c7..a41915e5be8a 100644
--- a/pkgs/servers/shishi/default.nix
+++ b/pkgs/servers/shishi/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = {
-    description = "GNU Shishi, free implementation of the Kerberos 5 network security system";
+    description = "An implementation of the Kerberos 5 network security system";
     homepage    = http://www.gnu.org/software/shishi/;
     license     = stdenv.lib.licenses.gpl3Plus;
     maintainers = with stdenv.lib.maintainers; [ bjg lovek323 ];
diff --git a/pkgs/shells/rush/default.nix b/pkgs/shells/rush/default.nix
index e9d0c61ee081..3232caf5848b 100644
--- a/pkgs/shells/rush/default.nix
+++ b/pkgs/shells/rush/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = {
-    description = "GNU Rush, Restricted User Shell";
+    description = "Restricted User Shell";
 
     longDescription =
       '' GNU Rush is a Restricted User Shell, designed for sites
diff --git a/pkgs/tools/X11/hsetroot/default.nix b/pkgs/tools/X11/hsetroot/default.nix
index d91f4bfdf652..e226f1f93c43 100644
--- a/pkgs/tools/X11/hsetroot/default.nix
+++ b/pkgs/tools/X11/hsetroot/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   buildInputs = [ imlib2 libX11 libXext ];
 
   meta = {
-    description = "hsetroot allows you to compose wallpapers ('root pixmaps') for X";
+    description = "Allows you to compose wallpapers ('root pixmaps') for X";
     homepage = http://thegraveyard.org/hsetroot.html;
     license = stdenv.lib.licenses.gpl2Plus;
   };
diff --git a/pkgs/tools/X11/wmctrl/default.nix b/pkgs/tools/X11/wmctrl/default.nix
index 3f691b8ecd45..2e23e7bd4de4 100644
--- a/pkgs/tools/X11/wmctrl/default.nix
+++ b/pkgs/tools/X11/wmctrl/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://tomas.styblo.name/wmctrl/;
-    description = "wmctrl is a UNIX/Linux command line tool to interact with an EWMH/NetWM compatible X Window Manager";
+    description = "Command line tool to interact with an EWMH/NetWM compatible X Window Manager";
     license = stdenv.lib.licenses.gpl2;
     platforms = with stdenv.lib.platforms; all;
   };
diff --git a/pkgs/tools/X11/xnee/default.nix b/pkgs/tools/X11/xnee/default.nix
index 0e92021b62c9..35c4ca06c6c5 100644
--- a/pkgs/tools/X11/xnee/default.nix
+++ b/pkgs/tools/X11/xnee/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = {
-    description = "GNU Xnee, an X11 event recording and replay tool";
+    description = "X11 event recording and replay tool";
 
     longDescription =
       '' Xnee is a suite of programs that can record, replay and distribute
diff --git a/pkgs/tools/X11/xtrace/default.nix b/pkgs/tools/X11/xtrace/default.nix
index efc0647f5dbd..c3c9c70fe927 100644
--- a/pkgs/tools/X11/xtrace/default.nix
+++ b/pkgs/tools/X11/xtrace/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = http://xtrace.alioth.debian.org/;
-    description = "xtrace, a tool to trace X11 protocol connections";
+    description = "Tool to trace X11 protocol connections";
     license = stdenv.lib.licenses.gpl2;
     maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/tools/admin/tightvnc/default.nix b/pkgs/tools/admin/tightvnc/default.nix
index acb8708ec14f..407242cf2d9b 100644
--- a/pkgs/tools/admin/tightvnc/default.nix
+++ b/pkgs/tools/admin/tightvnc/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
   meta = {
     license = stdenv.lib.licenses.gpl2Plus;
     homepage = "http://vnc-tight.sourceforge.net/";
-    description = "TightVNC is an improved version of VNC";
+    description = "Improved version of VNC";
 
     longDescription = ''
       TightVNC is an improved version of VNC, the great free
diff --git a/pkgs/tools/archivers/sharutils/default.nix b/pkgs/tools/archivers/sharutils/default.nix
index afd734fbae04..f19564e4ad91 100644
--- a/pkgs/tools/archivers/sharutils/default.nix
+++ b/pkgs/tools/archivers/sharutils/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = {
-    description = "GNU Sharutils, tools for remote synchronization and `shell archives'";
+    description = "Tools for remote synchronization and `shell archives'";
 
     longDescription =
       '' GNU shar makes so-called shell archives out of many files, preparing
diff --git a/pkgs/tools/backup/partclone/default.nix b/pkgs/tools/backup/partclone/default.nix
index b446b06f987c..fe2b9e00aaaf 100644
--- a/pkgs/tools/backup/partclone/default.nix
+++ b/pkgs/tools/backup/partclone/default.nix
@@ -17,7 +17,13 @@ stdenv.mkDerivation {
   installPhase = ''make INSTPREFIX=$out install'';
 
   meta = {
-    description = "Partclone provides utilities to save and restore used blocks on a partition and is designed for higher compatibility of the file system by using existing libraries, e.g. e2fslibs is used to read and write the ext2 partition";
+    description = "Utilities to save and restore used blocks on a partition";
+    longDescription = ''
+      Partclone provides utilities to save and restore used blocks on a
+      partition and is designed for higher compatibility of the file system by
+      using existing libraries, e.g. e2fslibs is used to read and write the
+      ext2 partition.
+    '';
     homepage = http://partclone.org;
     license = stdenv.lib.licenses.gpl2;
     maintainers = [stdenv.lib.maintainers.marcweber];
diff --git a/pkgs/tools/cd-dvd/xorriso/default.nix b/pkgs/tools/cd-dvd/xorriso/default.nix
index 88cca66efb13..218ea9a1e7ff 100644
--- a/pkgs/tools/cd-dvd/xorriso/default.nix
+++ b/pkgs/tools/cd-dvd/xorriso/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional stdenv.isLinux acl;
 
   meta = {
-    description = "GNU xorriso, an ISO 9660 Rock Ridge file system manipulator";
+    description = "ISO 9660 Rock Ridge file system manipulator";
 
     longDescription =
       '' GNU xorriso copies file objects from POSIX compliant filesystems
diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix
index b7bf9c59f494..cc304d9aa1e5 100644
--- a/pkgs/tools/compression/gzip/default.nix
+++ b/pkgs/tools/compression/gzip/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://www.gnu.org/software/gzip/;
-    description = "Gzip, the GNU zip compression program";
+    description = "GNU zip compression program";
 
     longDescription =
       ''gzip (GNU zip) is a popular data compression program written by
diff --git a/pkgs/tools/compression/rzip/default.nix b/pkgs/tools/compression/rzip/default.nix
index ca8d356abb3e..4460ae6edf3e 100644
--- a/pkgs/tools/compression/rzip/default.nix
+++ b/pkgs/tools/compression/rzip/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = http://rzip.samba.org/;
-    description = "The RZIP compression program";
+    description = "Compression program";
     license = stdenv.lib.licenses.gpl2Plus;
   };
 }
diff --git a/pkgs/tools/filesystems/chunkfs/default.nix b/pkgs/tools/filesystems/chunkfs/default.nix
index d91525e348f7..f8c6942bad0e 100644
--- a/pkgs/tools/filesystems/chunkfs/default.nix
+++ b/pkgs/tools/filesystems/chunkfs/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "(Un)ChunkFS is a pair of FUSE filesystems for viewing chunksync-style directory trees as a block device and vice versa.";
+    description = "FUSE filesystems for viewing chunksync-style directory trees as a block device and vice versa";
     homepage = "http://chunkfs.florz.de/";
     license = stdenv.lib.licenses.gpl2;
     platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix
index 9ebab38984bc..ea96001a421b 100644
--- a/pkgs/tools/filesystems/encfs/default.nix
+++ b/pkgs/tools/filesystems/encfs/default.nix
@@ -14,6 +14,6 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = http://www.arg0.net/encfs;
-    description = "EncFS provides an encrypted filesystem in user-space via FUSE";
+    description = "Provides an encrypted filesystem in user-space via FUSE";
   };
 }
diff --git a/pkgs/tools/filesystems/mtools/default.nix b/pkgs/tools/filesystems/mtools/default.nix
index 0b666f389420..6b9631bfccfe 100644
--- a/pkgs/tools/filesystems/mtools/default.nix
+++ b/pkgs/tools/filesystems/mtools/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://www.gnu.org/software/mtools/;
-    description = "GNU mtools, utilities to access MS-DOS disks";
+    description = "Utilities to access MS-DOS disks";
     platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
     maintainers = [ ];
   };
diff --git a/pkgs/tools/filesystems/svnfs/default.nix b/pkgs/tools/filesystems/svnfs/default.nix
index b6a296e6bc7b..fba066d0f4cb 100644
--- a/pkgs/tools/filesystems/svnfs/default.nix
+++ b/pkgs/tools/filesystems/svnfs/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
   NIX_LDFLAGS="-lsvn_client-1";
 
   meta = {
-    description = "SvnFs is a filesystem written using FUSE for accessing Subversion repositories";
+    description = "FUSE filesystem for accessing Subversion repositories";
     homepage = http://www.jmadden.eu/index.php/svnfs/;
     license = stdenv.lib.licenses.gpl2;
     maintainers = [stdenv.lib.maintainers.marcweber];
diff --git a/pkgs/tools/filesystems/wdfs/default.nix b/pkgs/tools/filesystems/wdfs/default.nix
index 68d978a2a554..a28d5394fc19 100644
--- a/pkgs/tools/filesystems/wdfs/default.nix
+++ b/pkgs/tools/filesystems/wdfs/default.nix
@@ -10,6 +10,6 @@ stdenv.mkDerivation rec
   buildInputs = [fuse glib neon pkgconfig];
   meta = {
     homepage = "http://noedler.de/projekte/wdfs/";
-    description = "wdfs a user-space filesystem that allows to mount a webdav share";
+    description = "User-space filesystem that allows to mount a webdav share";
   };
 }
diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix
index 2638594903ab..0e94571503c3 100644
--- a/pkgs/tools/graphics/cuneiform/default.nix
+++ b/pkgs/tools/graphics/cuneiform/default.nix
@@ -37,6 +37,6 @@ rec {
   name = "cuneiform-" + version;
   meta = {
     inherit version;
-    description = "Cuneiform OCR";
+    description = "Multi-language OCR system";
   };
 }
diff --git a/pkgs/tools/graphics/plotutils/default.nix b/pkgs/tools/graphics/plotutils/default.nix
index ae0c4d197315..0f67de3c3ea1 100644
--- a/pkgs/tools/graphics/plotutils/default.nix
+++ b/pkgs/tools/graphics/plotutils/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = {
-    description = "GNU Plotutils, a powerful C/C++ library for exporting 2D vector graphics";
+    description = "Powerful C/C++ library for exporting 2D vector graphics";
 
     longDescription =
       '' The GNU plotutils package contains software for both programmers and
diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix
index 56e18227d661..0f8f82acaed0 100644
--- a/pkgs/tools/misc/goaccess/default.nix
+++ b/pkgs/tools/misc/goaccess/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = {
-    description = "GoAccess is an open source real-time web log analyzer and interactive viewer that runs in a terminal in *nix systems.";
+    description = "Real-time web log analyzer and interactive viewer that runs in a terminal in *nix systems";
     homepage    = http://goaccess.prosoftcorp.com;
     license     = stdenv.lib.licenses.mit;
     platforms   = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
diff --git a/pkgs/tools/misc/idutils/default.nix b/pkgs/tools/misc/idutils/default.nix
index 2b2f3aeaca3c..503beefa15af 100644
--- a/pkgs/tools/misc/idutils/default.nix
+++ b/pkgs/tools/misc/idutils/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   patches = [ ./nix-mapping.patch ];
 
   meta = {
-    description = "GNU Idutils, a text searching utility";
+    description = "Text searching utility";
 
     longDescription = ''
       An "ID database" is a binary file containing a list of file
diff --git a/pkgs/tools/misc/lbdb/default.nix b/pkgs/tools/misc/lbdb/default.nix
index 20830bad6bfa..6d03b09c588f 100644
--- a/pkgs/tools/misc/lbdb/default.nix
+++ b/pkgs/tools/misc/lbdb/default.nix
@@ -17,6 +17,6 @@ stdenv.mkDerivation {
     homepage = "http://www.spinnaker.de/lbdb/";
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.all;
-    description = "The Little Brother's Database (lbdb)";
+    description = "The Little Brother's Database";
   };
 }
diff --git a/pkgs/tools/misc/ldapvi/default.nix b/pkgs/tools/misc/ldapvi/default.nix
index 28d9b4863d4b..6dba834e8be5 100644
--- a/pkgs/tools/misc/ldapvi/default.nix
+++ b/pkgs/tools/misc/ldapvi/default.nix
@@ -21,7 +21,11 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "ldapvi is an interactive LDAP client for Unix terminals. Using it, you can update LDAP entries with a text editor";
+    description = "Interactive LDAP client for Unix terminals";
+    longDescription = ''
+      ldapvi is an interactive LDAP client for Unix terminals. Using it, you
+      can update LDAP entries with a text editor.
+    '';
     homepage = http://www.lichteblau.com/ldapvi/;
     license = licenses.gpl2;
     maintainers = with maintainers; [ iElectric ];
diff --git a/pkgs/tools/misc/minicom/default.nix b/pkgs/tools/misc/minicom/default.nix
index 8ede3aa918b1..d731e856790d 100644
--- a/pkgs/tools/misc/minicom/default.nix
+++ b/pkgs/tools/misc/minicom/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     '';
 
   meta = {
-    description = "Minicom, a modem control and terminal emulation program";
+    description = "Modem control and terminal emulation program";
     homepage = http://alioth.debian.org/projects/minicom/;
 
     longDescription =
diff --git a/pkgs/tools/misc/most/default.nix b/pkgs/tools/misc/most/default.nix
index b7f7842680f6..b97d8f0b7199 100644
--- a/pkgs/tools/misc/most/default.nix
+++ b/pkgs/tools/misc/most/default.nix
@@ -20,7 +20,8 @@ stdenv.mkDerivation {
   buildInputs = [ slang ncurses ];
 
   meta = {
-    description = ''
+    description = "A terminal pager similar to 'more' and 'less'";
+    longDescription = ''
       MOST is a powerful paging program for Unix, VMS, MSDOS, and win32
       systems. Unlike other well-known paging programs most supports multiple
       windows and can scroll left and right. Why settle for less?
diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index df360bb9804d..4b0332c75060 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = {
-    description = "GNU Parallel, a shell tool for executing jobs in parallel";
+    description = "Shell tool for executing jobs in parallel";
 
     longDescription =
       '' GNU Parallel is a shell tool for executing jobs in parallel.  A job
diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix
index 108d4d5e0400..01b9f391a443 100644
--- a/pkgs/tools/misc/parted/default.nix
+++ b/pkgs/tools/misc/parted/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
       "export PATH=\"${utillinux}/sbin:$PATH\"";
 
   meta = {
-    description = "GNU Parted, a tool to create, destroy, resize, check, and copy partitions";
+    description = "Create, destroy, resize, check, and copy partitions";
 
     longDescription = ''
       GNU Parted is an industrial-strength package for creating, destroying,
diff --git a/pkgs/tools/misc/pg_top/default.nix b/pkgs/tools/misc/pg_top/default.nix
index 392fcbcc8ff9..0d379cd11d4a 100644
--- a/pkgs/tools/misc/pg_top/default.nix
+++ b/pkgs/tools/misc/pg_top/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   buildInputs = [ncurses postgresql]; 
 
   meta = {
-    description = "pg_top is 'top' for PostgreSQL";
+    description = "A 'top' like tool for PostgreSQL";
     longDescription = '' 
       pg_top allows you to: 
       <itemizedlist>
diff --git a/pkgs/tools/misc/recutils/default.nix b/pkgs/tools/misc/recutils/default.nix
index f2f5f37ebe44..4d6829e99a4c 100644
--- a/pkgs/tools/misc/recutils/default.nix
+++ b/pkgs/tools/misc/recutils/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ curl emacs ] ++ (stdenv.lib.optionals doCheck [ check bc ]);
 
   meta = {
-    description = "GNU Recutils, tools and libraries to access human-editable, text-based databases";
+    description = "Tools and libraries to access human-editable, text-based databases";
 
     longDescription =
       '' GNU Recutils is a set of tools and libraries to access
diff --git a/pkgs/tools/misc/time/default.nix b/pkgs/tools/misc/time/default.nix
index 3a35e9a9f1cc..737ba244fe8e 100644
--- a/pkgs/tools/misc/time/default.nix
+++ b/pkgs/tools/misc/time/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   patches = [ ./max-resident.patch ];
 
   meta = {
-    description = "GNU Time, a tool that runs programs and summarizes the system resources they use";
+    description = "Tool that runs programs and summarizes the system resources they use";
 
     longDescription = ''
       The `time' command runs another program, then displays
diff --git a/pkgs/tools/misc/tmpwatch/default.nix b/pkgs/tools/misc/tmpwatch/default.nix
index c19d58b98162..760f56726fab 100644
--- a/pkgs/tools/misc/tmpwatch/default.nix
+++ b/pkgs/tools/misc/tmpwatch/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = https://fedorahosted.org/tmpwatch/;
-    description = "The tmpwatch utility recursively searches through specified directories and removes files which have not been accessed in a specified period of time.";
+    description = "Recursively searches through specified directories and removes files which have not been accessed in a specified period of time";
     license = licenses.gpl2;
     maintainers = with maintainers; [ vlstill ];
     platforms = platforms.unix;
diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix
index 4acbabb50f98..32f681dabebb 100644
--- a/pkgs/tools/misc/tmux/default.nix
+++ b/pkgs/tools/misc/tmux/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://tmux.sourceforge.net/;
-    description = "tmux is a terminal multiplexer";
+    description = "Terminal multiplexer";
 
     longDescription =
       '' tmux is intended to be a modern, BSD-licensed alternative to programs such as GNU screen. Major features include:
diff --git a/pkgs/tools/misc/yad/default.nix b/pkgs/tools/misc/yad/default.nix
index fcdf5095d70f..d884d48f5214 100644
--- a/pkgs/tools/misc/yad/default.nix
+++ b/pkgs/tools/misc/yad/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://code.google.com/p/yad/";
-    description = "Yad (yet another dialog) is a GUI dialog tool for shell scripts";
+    description = "GUI dialog tool for shell scripts";
     longDescription = ''
       Yad (yet another dialog) is a GUI dialog tool for shell scripts. It is a
       fork of Zenity with many improvements, such as custom buttons, additional
diff --git a/pkgs/tools/networking/cntlm/default.nix b/pkgs/tools/networking/cntlm/default.nix
index cd3ae12a11b8..f890bdddb693 100644
--- a/pkgs/tools/networking/cntlm/default.nix
+++ b/pkgs/tools/networking/cntlm/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    description = "Cntlm is an NTLM/NTLMv2 authenticating HTTP proxy";
+    description = "NTLM/NTLMv2 authenticating HTTP proxy";
     homepage = http://cntlm.sourceforge.net/;
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.qknight ];
diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix
index c99af220a56c..7d955b449506 100644
--- a/pkgs/tools/networking/connman/default.nix
+++ b/pkgs/tools/networking/connman/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    description = "The ConnMan project provides a daemon for managing internet connections";
+    description = "Provides a daemon for managing internet connections";
     homepage = "https://connman.net/";
     maintainers = [ stdenv.lib.maintainers.matejc ];
     # tested only on linux, might work on others also
diff --git a/pkgs/tools/networking/flvstreamer/default.nix b/pkgs/tools/networking/flvstreamer/default.nix
index f93221296125..ab8e14fddd0b 100644
--- a/pkgs/tools/networking/flvstreamer/default.nix
+++ b/pkgs/tools/networking/flvstreamer/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "flvstreamer is an command-line RTMP client";
+    description = "Command-line RTMP client";
 
     longDescription =
       '' flvstreamer is an open source command-line RTMP client intended to 
diff --git a/pkgs/tools/networking/host/default.nix b/pkgs/tools/networking/host/default.nix
index c74dbe528290..54cb8b21aafa 100644
--- a/pkgs/tools/networking/host/default.nix
+++ b/pkgs/tools/networking/host/default.nix
@@ -18,7 +18,7 @@ let version = "20000331"; in
     installTargets = "install man";
 
     meta = {
-      description = "`host', a DNS resolution utility";
+      description = "DNS resolution utility";
       license = "BSD-style";
     };
   }
diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix
index 20ee6da8a30c..a6a921f6f588 100644
--- a/pkgs/tools/networking/inetutils/default.nix
+++ b/pkgs/tools/networking/inetutils/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "GNU Inetutils, a collection of common network programs";
+    description = "Collection of common network programs";
 
     longDescription =
       '' The GNU network utilities suite provides the
diff --git a/pkgs/tools/networking/jnettop/default.nix b/pkgs/tools/networking/jnettop/default.nix
index 49753d189d63..cfeaf47fdf23 100644
--- a/pkgs/tools/networking/jnettop/default.nix
+++ b/pkgs/tools/networking/jnettop/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   preConfigure = '' autoconf '';
 
   meta = {
-    description = "Jnettop, a network traffic visualizer";
+    description = "Network traffic visualizer";
 
     longDescription = ''
       Jnettop is a traffic visualiser, which captures traffic going
diff --git a/pkgs/tools/networking/lsh/default.nix b/pkgs/tools/networking/lsh/default.nix
index 6be4119469ea..c86dba91f5e6 100644
--- a/pkgs/tools/networking/lsh/default.nix
+++ b/pkgs/tools/networking/lsh/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ gperf guile gmp zlib liboop readline gnum4 pam ];
 
   meta = {
-    description = "GNU lsh, a GPL'd implementation of the SSH protocol";
+    description = "GPL'd implementation of the SSH protocol";
 
     longDescription = ''
       lsh is a free implementation (in the GNU sense) of the ssh
diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix
index 4c1001310ae1..0ee490327042 100755
--- a/pkgs/tools/networking/mailutils/default.nix
+++ b/pkgs/tools/networking/mailutils/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   doCheck = false;
 
   meta = {
-    description = "GNU Mailutils is a rich and powerful protocol-independent mail framework";
+    description = "Rich and powerful protocol-independent mail framework";
 
     longDescription = ''
       GNU Mailutils is a rich and powerful protocol-independent mail
diff --git a/pkgs/tools/networking/minidlna/default.nix b/pkgs/tools/networking/minidlna/default.nix
index 02013d8ede6d..9db42f09d81a 100644
--- a/pkgs/tools/networking/minidlna/default.nix
+++ b/pkgs/tools/networking/minidlna/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ ffmpeg flac libvorbis libogg libid3tag libexif libjpeg sqlite ];
 
   meta = {
-    description = "MiniDLNA Media Server";
+    description = "Media server software";
     longDescription = ''
       MiniDLNA (aka ReadyDLNA) is server software with the aim of being fully
       compliant with DLNA/UPnP-AV clients.
diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix
index 2e27c2b2dc33..ed295e95a38b 100644
--- a/pkgs/tools/networking/tcpdump/default.nix
+++ b/pkgs/tools/networking/tcpdump/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = {
-    description = "tcpdump, a famous network sniffer";
+    description = "Network sniffer";
     homepage = http://www.tcpdump.org/;
     license = "BSD-style";
     maintainers = stdenv.lib.maintainers.mornfall;
diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix
index 6ff5439c4bc6..27d7fe2572a0 100644
--- a/pkgs/tools/networking/wget/default.nix
+++ b/pkgs/tools/networking/wget/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   doCheck = (perl != null);
 
   meta = {
-    description = "GNU Wget, a tool for retrieving files using HTTP, HTTPS, and FTP";
+    description = "Tool for retrieving files using HTTP, HTTPS, and FTP";
 
     longDescription =
       '' GNU Wget is a free software package for retrieving files using HTTP,
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index b2e86935b50d..6631214f39ab 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -66,7 +66,14 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    description = "The Nix Deployment System";
+    description = "Powerful package manager that makes package management reliable and reproducible";
+    longDescription = ''
+      Nix is a powerful package manager for Linux and other Unix systems that
+      makes package management reliable and reproducible. It provides atomic
+      upgrades and rollbacks, side-by-side installation of multiple versions of
+      a package, multi-user package management and easy setup of build
+      environments.
+    '';
     homepage = http://nixos.org/;
     license = stdenv.lib.licenses.lgpl2Plus;
     maintainers = [ stdenv.lib.maintainers.eelco ];
diff --git a/pkgs/tools/security/scrypt/default.nix b/pkgs/tools/security/scrypt/default.nix
index fe2a19491d99..668a76051153 100644
--- a/pkgs/tools/security/scrypt/default.nix
+++ b/pkgs/tools/security/scrypt/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ openssl ];
 
   meta = {
-    description = "The scrypt encryption utility";
+    description = "Encryption utility";
     homepage    = https://www.tarsnap.com/scrypt.html;
     license     = stdenv.lib.licenses.bsd2;
     platforms   = stdenv.lib.platforms.all;
diff --git a/pkgs/tools/security/steghide/default.nix b/pkgs/tools/security/steghide/default.nix
index bc87c091a58f..03e8c727022d 100644
--- a/pkgs/tools/security/steghide/default.nix
+++ b/pkgs/tools/security/steghide/default.nix
@@ -7,7 +7,7 @@
 
     meta = with stdenv.lib; {
         homepage = http://steghide.sourceforge.net/;
-        description = "Steghide is a steganography program that is able to hide data in various kinds of image- and audio-files.";
+        description = "Steganography program that is able to hide data in various kinds of image- and audio-files";
         license = licenses.gpl2;
     };
 
diff --git a/pkgs/tools/security/tboot/default.nix b/pkgs/tools/security/tboot/default.nix
index 1c9967edc477..854f67f2aeec 100644
--- a/pkgs/tools/security/tboot/default.nix
+++ b/pkgs/tools/security/tboot/default.nix
@@ -21,9 +21,7 @@ stdenv.mkDerivation rec {
   installFlags = "DESTDIR=$(out)";
 
   meta = with stdenv.lib; {
-    description = ''Trusted Boot (tboot) is an open source, pre-kernel/VMM module that uses
-                    Intel(R) Trusted Execution Technology (Intel(R) TXT) to perform a measured
-                    and verified launch of an OS kernel/VMM.'';
+    description = "A pre-kernel/VMM module that uses Intel(R) TXT to perform a measured and verified launch of an OS kernel/VMM";
     homepage    = http://sourceforge.net/projects/tboot/;
     license     = licenses.bsd3;
     maintainers = [ maintainers.ak ];
diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix
index d71bbd891f91..3318d0c1102d 100644
--- a/pkgs/tools/security/tor/default.nix
+++ b/pkgs/tools/security/tor/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.torproject.org/;
     repositories.git = https://git.torproject.org/git/tor;
-    description = "Tor, an anonymous network router to improve privacy on the Internet";
+    description = "Anonymous network router to improve privacy on the Internet";
 
     longDescription=''
       Tor protects you by bouncing your communications around a distributed
diff --git a/pkgs/tools/security/tpm-tools/default.nix b/pkgs/tools/security/tpm-tools/default.nix
index 95b3b6b51f77..6e7ff75a6a48 100644
--- a/pkgs/tools/security/tpm-tools/default.nix
+++ b/pkgs/tools/security/tpm-tools/default.nix
@@ -14,9 +14,12 @@ stdenv.mkDerivation rec {
   buildInputs = [ trousers openssl ];
 
   meta = with stdenv.lib; {
-    description = ''tpm-tools is an open-source package designed to enable user and application
-                    enablement of Trusted Computing using a Trusted Platform Module (TPM),
-                    similar to a smart card environment.'';
+    description = "Management tools for TPM hardware";
+    longDescription = ''
+      tpm-tools is an open-source package designed to enable user and
+      application enablement of Trusted Computing using a Trusted Platform
+      Module (TPM), similar to a smart card environment.
+    '';
     homepage    = http://sourceforge.net/projects/trousers/files/tpm-tools/;
     license     = licenses.cpl10;
     maintainers = [ maintainers.ak ];
diff --git a/pkgs/tools/security/trousers/default.nix b/pkgs/tools/security/trousers/default.nix
index 4c2af359b964..fe797291f9ea 100644
--- a/pkgs/tools/security/trousers/default.nix
+++ b/pkgs/tools/security/trousers/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   NIX_LDFLAGS = "-lgcc_s";
 
   meta = with stdenv.lib; {
-    description = "TrouSerS is an CPL (Common Public License) licensed Trusted Computing Software Stack.";
+    description = "Trusted computing software stack";
     homepage    = http://trousers.sourceforge.net/;
     license     = licenses.cpl10;
     maintainers = [ maintainers.ak ];
diff --git a/pkgs/tools/system/cron/default.nix b/pkgs/tools/system/cron/default.nix
index 6132abc08790..0cf29a67b9da 100644
--- a/pkgs/tools/system/cron/default.nix
+++ b/pkgs/tools/system/cron/default.nix
@@ -22,6 +22,6 @@ stdenv.mkDerivation {
   preInstall = "mkdir -p $out/bin $out/sbin $out/share/man/man1 $out/share/man/man5 $out/share/man/man8";
   
   meta = {
-    description = "Vixie Cron, a daemon for running commands at specific times";
+    description = "Daemon for running commands at specific times (Vixie Cron)";
   };
 }
diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix
index 21a67dba305c..48562adffebe 100644
--- a/pkgs/tools/system/freeipmi/default.nix
+++ b/pkgs/tools/system/freeipmi/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = {
-    description = "GNU FreeIPMI, an implementation of the Intelligent Platform Management Interface";
+    description = "Implementation of the Intelligent Platform Management Interface";
 
     longDescription =
       '' GNU FreeIPMI provides in-band and out-of-band IPMI software based on
diff --git a/pkgs/tools/system/hardlink/default.nix b/pkgs/tools/system/hardlink/default.nix
index 982aac3c9900..6ae92b685cc9 100644
--- a/pkgs/tools/system/hardlink/default.nix
+++ b/pkgs/tools/system/hardlink/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = "http://pkgs.fedoraproject.org/cgit/hardlink.git/";
-    description = "consolidate duplicate files via hardlinks";
+    description = "Consolidate duplicate files via hardlinks";
     license = stdenv.lib.licenses.gpl2Plus;
 
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/tools/system/mcron/default.nix b/pkgs/tools/system/mcron/default.nix
index 4bf958959961..842529c573f1 100644
--- a/pkgs/tools/system/mcron/default.nix
+++ b/pkgs/tools/system/mcron/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = {
-    description = "GNU mcron, a flexible implementation of `cron' in Guile";
+    description = "Flexible implementation of `cron' in Guile";
 
     longDescription = ''
       The GNU package mcron (Mellor's cron) is a 100% compatible
diff --git a/pkgs/tools/text/enscript/default.nix b/pkgs/tools/text/enscript/default.nix
index fe11ec592463..797f5b8b6922 100644
--- a/pkgs/tools/text/enscript/default.nix
+++ b/pkgs/tools/text/enscript/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = {
-    description = "GNU Enscript, a converter from ASCII to PostScript, HTML, or RTF";
+    description = "Converter from ASCII to PostScript, HTML, or RTF";
 
     longDescription =
       '' GNU Enscript converts ASCII files to PostScript, HTML, or RTF and
diff --git a/pkgs/tools/text/mpage/default.nix b/pkgs/tools/text/mpage/default.nix
index 5b95c37c732d..c147b3ea301f 100644
--- a/pkgs/tools/text/mpage/default.nix
+++ b/pkgs/tools/text/mpage/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "Mpage, many-to-one page printing utility";
+    description = "Many-to-one page printing utility";
 
     longDescription = ''
       Mpage reads plain text files or PostScript documents and prints
diff --git a/pkgs/tools/text/namazu/default.nix b/pkgs/tools/text/namazu/default.nix
index fba52b69fbaf..72caa7ba5cb4 100644
--- a/pkgs/tools/text/namazu/default.nix
+++ b/pkgs/tools/text/namazu/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   doCheck = !stdenv.isLinux;
 
   meta = {
-    description = "Namazu, a full-text search engine";
+    description = "Full-text search engine";
 
     longDescription = ''
       Namazu is a full-text search engine intended for easy use.  Not
diff --git a/pkgs/tools/text/wdiff/default.nix b/pkgs/tools/text/wdiff/default.nix
index e6fc3510cd40..c07caad15a35 100644
--- a/pkgs/tools/text/wdiff/default.nix
+++ b/pkgs/tools/text/wdiff/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://www.gnu.org/software/wdiff/;
-    description = "GNU wdiff, comparing files on a word by word basis";
+    description = "Comparing files on a word by word basis";
     license = stdenv.lib.licenses.gpl3Plus;
     maintainers = [ stdenv.lib.maintainers.eelco ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/tools/typesetting/lout/default.nix b/pkgs/tools/typesetting/lout/default.nix
index c0fc43362971..a2ebfa0a9fd4 100644
--- a/pkgs/tools/typesetting/lout/default.nix
+++ b/pkgs/tools/typesetting/lout/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   builder = ./builder.sh;
 
   meta = {
-    description = "Lout, a document layout system similar in style to LaTeX";
+    description = "Document layout system similar in style to LaTeX";
 
     longDescription = ''
       The Lout document formatting system is now reads a high-level
diff --git a/pkgs/tools/typesetting/rubber/default.nix b/pkgs/tools/typesetting/rubber/default.nix
index 8344735606ca..32545abaff2d 100644
--- a/pkgs/tools/typesetting/rubber/default.nix
+++ b/pkgs/tools/typesetting/rubber/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   patchPhase = "substituteInPlace configure --replace which \"type -P\"";
 
   meta = {
-    description = "Rubber, a wrapper for LaTeX and friends";
+    description = "Wrapper for LaTeX and friends";
 
     longDescription = ''
       Rubber is a program whose purpose is to handle all tasks related
diff --git a/pkgs/tools/typesetting/xmlto/default.nix b/pkgs/tools/typesetting/xmlto/default.nix
index 1b0602063e9e..a1eee51b34d5 100644
--- a/pkgs/tools/typesetting/xmlto/default.nix
+++ b/pkgs/tools/typesetting/xmlto/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "xmlto, a front-end to an XSL toolchain";
+    description = "Front-end to an XSL toolchain";
 
     longDescription = ''
       xmlto is a front-end to an XSL toolchain.  It chooses an
diff --git a/pkgs/tools/video/dvgrab/default.nix b/pkgs/tools/video/dvgrab/default.nix
index faaea6aaffc4..73986b5be05d 100644
--- a/pkgs/tools/video/dvgrab/default.nix
+++ b/pkgs/tools/video/dvgrab/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     ];
 
   meta = {
-    description = "dvgrab, receive and store audio & video over IEEE1394";
+    description = "Receive and store audio & video over IEEE1394";
 
     longDescription =
       '' dvgrab receives audio and video data from a digital camcorder via an

From 873ab39401476802192d46f96678d5e2c410b6df Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Mon, 25 Aug 2014 00:46:23 +0200
Subject: [PATCH 0497/1453] NixOS: Add meta.maintainer option to modules.

---
 nixos/modules/misc/meta.nix   | 63 +++++++++++++++++++++++++++++++++++
 nixos/modules/module-list.nix |  1 +
 2 files changed, 64 insertions(+)
 create mode 100644 nixos/modules/misc/meta.nix

diff --git a/nixos/modules/misc/meta.nix b/nixos/modules/misc/meta.nix
new file mode 100644
index 000000000000..22622706f2c8
--- /dev/null
+++ b/nixos/modules/misc/meta.nix
@@ -0,0 +1,63 @@
+{ config, lib, ... }:
+
+with lib;
+
+let
+  maintainer = mkOptionType {
+    name = "maintainer";
+    check = email: elem email (attrValues lib.maintainers);
+    merge = loc: defs: listToAttrs (singleton (nameValuePair (last defs).file (last defs).value));
+  };
+
+  listOfMaintainers = types.listOf maintainer // {
+    # Returns list of
+    #   { "module-file" = [
+    #        "maintainer1 <first@nixos.org>"
+    #        "maintainer2 <second@nixos.org>" ];
+    #   }
+    merge = loc: defs:
+      zipAttrs
+        (flatten (imap (n: def: imap (m: def':
+          maintainer.merge (loc ++ ["[${toString n}-${toString m}]"])
+            [{ inherit (def) file; value = def'; }]) def.value) defs));
+  };
+
+  docFile = types.path // {
+    # Returns tuples of
+    #   { file = "module location"; value = <path/to/doc.xml>; }
+    merge = loc: defs: defs;
+  };
+in
+
+{
+  options = {
+    meta = {
+
+      maintainers = mkOption {
+        type = listOfMaintainers;
+        internal = true;
+        default = [];
+        example = [ lib.maintainers.all ];
+        description = ''
+	  List of maintainers of each module.  This option should be defined at
+          most once per module.
+        '';
+      };
+
+      doc = mkOption {
+        type = docFile;
+        internal = true;
+        example = "./meta.xml";
+        description = ''
+	  Documentation prologe for the set of options of each module.  This
+          option should be defined at most once per module.
+        '';
+      };
+
+    };
+  };
+
+  config = {
+    meta.maintainers = singleton lib.maintainers.pierron;
+  };
+}
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 453899175e01..095dbf424801 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -43,6 +43,7 @@
   ./misc/ids.nix
   ./misc/lib.nix
   ./misc/locate.nix
+  ./misc/meta.nix
   ./misc/nixpkgs.nix
   ./misc/passthru.nix
   ./misc/version.nix

From a4ac9eb22e5559e7def4f58ea96837023aeae8bd Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Mon, 25 Aug 2014 02:45:11 +0200
Subject: [PATCH 0498/1453] nixos: add systemd service for getty on
 /dev/console

---
 nixos/modules/services/ttys/agetty.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nixos/modules/services/ttys/agetty.nix b/nixos/modules/services/ttys/agetty.nix
index df21ebbd9743..3878b02b1a84 100644
--- a/nixos/modules/services/ttys/agetty.nix
+++ b/nixos/modules/services/ttys/agetty.nix
@@ -66,6 +66,12 @@ with lib;
         restartIfChanged = false;
       };
 
+    systemd.services."console-getty" =
+      { serviceConfig.ExecStart = "@${pkgs.utillinux}/sbin/agetty agetty --noclear --login-program ${pkgs.shadow}/bin/login --keep-baud console 115200,38400,9600 $TERM";
+        serviceConfig.Restart = "always";
+        restartIfChanged = false;
+      };
+
     environment.etc = singleton
       { # Friendly greeting on the virtual consoles.
         source = pkgs.writeText "issue" ''

From d77150df30c46b5cdf70aae79893bfb2fbc621a8 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Mon, 25 Aug 2014 02:45:33 +0200
Subject: [PATCH 0499/1453] nixos: make-system-tarball, add option for extra
 arguments for tar

Sometimes extra arguments when making tarball are required,
for example if making a container owner of files has to be changed
to root.
---
 nixos/lib/make-system-tarball.nix | 5 ++++-
 nixos/lib/make-system-tarball.sh  | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/nixos/lib/make-system-tarball.nix b/nixos/lib/make-system-tarball.nix
index 8fed9a348827..3bd891fdbc2b 100644
--- a/nixos/lib/make-system-tarball.nix
+++ b/nixos/lib/make-system-tarball.nix
@@ -15,6 +15,9 @@
   # store path whose closure will be copied, and `symlink' is a
   # symlink to `object' that will be added to the tarball.
   storeContents ? []
+
+  # Extra tar arguments
+, extraArgs ? ""
 }:
 
 stdenv.mkDerivation {
@@ -22,7 +25,7 @@ stdenv.mkDerivation {
   builder = ./make-system-tarball.sh;
   buildInputs = [perl xz];
 
-  inherit fileName pathsFromGraph;
+  inherit fileName pathsFromGraph extraArgs;
 
   # !!! should use XML.
   sources = map (x: x.source) contents;
diff --git a/nixos/lib/make-system-tarball.sh b/nixos/lib/make-system-tarball.sh
index 096d96ac1c81..2eb668115a6f 100644
--- a/nixos/lib/make-system-tarball.sh
+++ b/nixos/lib/make-system-tarball.sh
@@ -50,7 +50,7 @@ done
 
 mkdir -p $out/tarball
 
-tar cvJf $out/tarball/$fileName.tar.xz *
+tar cvJf $out/tarball/$fileName.tar.xz * $extraArgs
 
 mkdir -p $out/nix-support
 echo $system > $out/nix-support/system

From f5d648e27d1b31c91740d536a88e7d2c251aaf79 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 25 Aug 2014 09:35:06 +0200
Subject: [PATCH 0500/1453] Fix evaluation

---
 pkgs/stdenv/linux/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 80bc982267b5..1daebd9dd361 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -261,7 +261,7 @@ rec {
       name = "";
     }).override { inherit shell; };
 
-    fetchurlBoot = stage4.stdenv.fetchurl;
+    inherit (stage4.stdenv) fetchurlBoot;
 
     extraAttrs = {
       inherit (stage4.pkgs) glibc;

From ffe984b9c19e2dcde4810fea8d36a0619483371b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 24 Aug 2014 19:54:39 +0200
Subject: [PATCH 0501/1453] pythonPackages.python_magic: 0.4.3 -> 0.4.6

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6295ae90ed25..16be6f6203be 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4157,11 +4157,11 @@ rec {
 
 
   python_magic = buildPythonPackage rec {
-    name = "python-magic-0.4.3";
+    name = "python-magic-0.4.6";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/p/python-magic/${name}.tar.gz";
-      md5 = "eec9e2b1bcaf43308b7dacb3f2ecd8c1";
+      md5 = "07e7a0fea78dd81ed609414c3484df58";
     };
 
     propagatedBuildInputs = [ pkgs.file ];
@@ -4169,6 +4169,8 @@ rec {
     patchPhase = ''
       substituteInPlace magic.py --replace "ctypes.CDLL(dll)" "ctypes.CDLL('${pkgs.file}/lib/libmagic.so')"
     '';
+    
+    doCheck = false;
 
     # TODO: tests are failing
     #checkPhase = ''

From 84b87af15a00be0c9094038ac63fdc631211593a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 25 Aug 2014 09:48:01 +0200
Subject: [PATCH 0502/1453] polkit: Add docbook DTD

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

diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix
index 6da928a6a23e..7fe16cec56b9 100644
--- a/pkgs/development/libraries/polkit/default.nix
+++ b/pkgs/development/libraries/polkit/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, glib, expat, pam, intltool, spidermonkey
-, gobjectIntrospection, libxslt, docbook_xsl
+, gobjectIntrospection, libxslt, docbook_xsl, docbook_xml_dtd_412
 , useSystemd ? stdenv.isLinux, systemd }:
 
 let
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ pkgconfig glib expat pam intltool spidermonkey gobjectIntrospection ]
-    ++ [ libxslt docbook_xsl ] # man pages
+    ++ [ libxslt docbook_xsl docbook_xml_dtd_412 ] # man pages
     ++ stdenv.lib.optional useSystemd systemd;
 
   # Ugly hack to overwrite hardcoded directories

From 11345b784438220ab67d97bd375e20af933ad20a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 25 Aug 2014 09:52:38 +0200
Subject: [PATCH 0503/1453] remove icecat3

---
 .../networking/browsers/icecat-3/default.nix  | 118 ------------------
 .../browsers/icecat-3/rpath-link.patch        |  14 ---
 .../icecat-3/skip-gre-registration.patch      |  12 --
 .../mplayerplug-in/default.nix                |   3 -
 pkgs/top-level/all-packages.nix               |  20 ---
 pkgs/top-level/release-small.nix              |   1 -
 pkgs/top-level/release.nix                    |   1 -
 7 files changed, 169 deletions(-)
 delete mode 100644 pkgs/applications/networking/browsers/icecat-3/default.nix
 delete mode 100644 pkgs/applications/networking/browsers/icecat-3/rpath-link.patch
 delete mode 100644 pkgs/applications/networking/browsers/icecat-3/skip-gre-registration.patch

diff --git a/pkgs/applications/networking/browsers/icecat-3/default.nix b/pkgs/applications/networking/browsers/icecat-3/default.nix
deleted file mode 100644
index 91a71a4b4c40..000000000000
--- a/pkgs/applications/networking/browsers/icecat-3/default.nix
+++ /dev/null
@@ -1,118 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gtk, pango, perl, python, ply, zip, libIDL
-, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs, alsaLib
-, libnotify, gnome_vfs, libgnomeui
-, freetype, fontconfig, wirelesstools ? null, pixman
-, application ? "browser" }:
-
-# Build the WiFi stuff on Linux-based systems.
-# FIXME: Disable for now until it can actually be built:
-# http://thread.gmane.org/gmane.comp.gnu.gnuzilla/1376 .
-#assert stdenv.isLinux -> (wirelesstools != null);
-
-let version = "3.6.15"; in
-stdenv.mkDerivation {
-  name = "icecat-${version}";
-
-  src = fetchurl {
-    url = "mirror://gnu/gnuzilla/${version}/icecat-${version}.tar.xz";
-    sha256 = "1px018bd81c81a4hbz0qgf89pkshkbhg4abwq1d26dwy8128cxwg";
-  };
-
-  buildInputs =
-    [ libgnomeui libnotify gnome_vfs alsaLib
-      pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 pixman
-      python ply dbus dbus_glib pango freetype fontconfig
-      xlibs.libXi xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt
-    ]
-    ++ (stdenv.lib.optional false /* stdenv.isLinux */ wirelesstools);
-
-  patches = [
-    ./skip-gre-registration.patch ./rpath-link.patch
-  ];
-
-  configureFlags =
-    [ "--enable-application=${application}"
-      "--enable-libxul"
-      "--disable-javaxpcom"
-
-      "--enable-optimize"
-      "--disable-debug"
-      "--enable-strip"
-      "--with-system-jpeg"
-      "--with-system-zlib"
-      "--with-system-bz2"
-      # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
-      "--enable-system-cairo"
-      #"--enable-system-sqlite" # <-- this seems to be discouraged
-      "--disable-crashreporter"
-    ]
-    ++ (stdenv.lib.optional true /* (!stdenv.isLinux) */ "--disable-necko-wifi");
-
-  postInstall = ''
-    export dontPatchELF=1;
-
-    # Strip some more stuff
-    strip -S "$out/lib/"*"/"* || true
-
-    # This fixes starting IceCat when there already is a running
-    # instance.  The `icecat' wrapper script actually expects to be
-    # in the same directory as `run-mozilla.sh', apparently.
-    libDir=$(cd $out/lib && ls -d icecat-[0-9]*)
-    test -n "$libDir"
-
-    if [ -f "$out/bin/icecat" ]
-    then
-        # Fix references to /bin paths in the IceCat shell script.
-        substituteInPlace $out/bin/icecat		\
-            --replace /bin/pwd "$(type -tP pwd)"	\
-            --replace /bin/ls "$(type -tP ls)"
-
-        cd $out/bin
-        mv icecat ../lib/$libDir/
-        ln -s ../lib/$libDir/icecat .
-
-        # Register extensions etc.
-        echo "running \`icecat -register'..."
-        (cd $out/lib/$libDir && LD_LIBRARY_PATH=. ./icecat-bin -register) || false
-    fi
-
-    if [ -f "$out/lib/$libDir/xpidl" ]
-    then
-        # XulRunner's IDL compiler.
-        echo "linking \`xpidl'..."
-        ln -s "$out/lib/$libDir/xpidl" "$out/bin"
-    fi
-
-    # Put the GNU IceCat icon in the right place.
-    mkdir -p "$out/lib/$libDir/chrome/icons/default"
-    ln -s ../../../icons/default.xpm  "$out/lib/$libDir/chrome/icons/default/"
-  '';
-
-  enableParallelBuilding = true;
-
-  meta = {
-    description = "GNU IceCat, a free web browser based on Mozilla Firefox";
-
-    longDescription = ''
-      Gnuzilla is the GNU version of the Mozilla suite, and GNU IceCat
-      is the GNU version of the Firefox browser.  Its main advantage
-      is an ethical one: it is entirely free software.  While the
-      source code from the Mozilla project is free software, the
-      binaries that they release include additional non-free software.
-      Also, they distribute and recommend non-free software as
-      plug-ins.  In addition, GNU IceCat includes some privacy
-      protection features.
-    '';
-
-    homepage = http://www.gnu.org/software/gnuzilla/;
-    license = [ "GPLv2+" "LGPLv2+" "MPLv1+" ];
-    broken = true;
-    maintainers = [ ];
-    platforms = stdenv.lib.platforms.gnu;
-  };
-
-  passthru = {
-    inherit gtk version;
-    isFirefox3Like = true;
-  };
-}
diff --git a/pkgs/applications/networking/browsers/icecat-3/rpath-link.patch b/pkgs/applications/networking/browsers/icecat-3/rpath-link.patch
deleted file mode 100644
index d50784f13eea..000000000000
--- a/pkgs/applications/networking/browsers/icecat-3/rpath-link.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Without this patch, IceCat ends up linking with
-`-Wl,-rpath-link=/bin -Wl-,-rpath-link=/lib'.
-
---- icecat-3.5/js/src/configure	2009-07-04 18:03:01.000000000 +0200
-+++ icecat-3.5/js/src/configure	2009-07-13 18:34:30.000000000 +0200
-@@ -4775,7 +4775,6 @@ HOST_AR='$(AR)'
- HOST_AR_FLAGS='$(AR_FLAGS)'
- 
- MOZ_JS_LIBS='-L$(libdir) -lmozjs'
--MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(PREFIX)/lib'
- 
- MOZ_COMPONENT_NSPR_LIBS='-L$(LIBXUL_DIST)/bin $(NSPR_LIBS)'
- MOZ_XPCOM_OBSOLETE_LIBS='-L$(LIBXUL_DIST)/lib -lxpcom_compat'
-
diff --git a/pkgs/applications/networking/browsers/icecat-3/skip-gre-registration.patch b/pkgs/applications/networking/browsers/icecat-3/skip-gre-registration.patch
deleted file mode 100644
index d1fb4e3f30ab..000000000000
--- a/pkgs/applications/networking/browsers/icecat-3/skip-gre-registration.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Skip "GRE" registration since that assumes write access to `/etc'.
-
---- icecat-3.0.1-g1/xulrunner/installer/Makefile.in	2008-07-27 12:52:16.000000000 +0200
-+++ icecat-3.0.1-g1/xulrunner/installer/Makefile.in	2008-09-08 17:19:17.000000000 +0200
-@@ -71,6 +71,7 @@ $(MOZILLA_VERSION).system.conf: $(topsrc
- 	printf "[%s]\nGRE_PATH=%s\nxulrunner=true\nabi=%s" \
- 	  $(MOZILLA_VERSION) $(installdir) $(TARGET_XPCOM_ABI)> $@
- 
-+SKIP_GRE_REGISTRATION = yes
- ifndef SKIP_GRE_REGISTRATION
- # to register xulrunner per-user, override this with $HOME/.gre.d
- regdir = /etc/gre.d
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix
index 5b6b2176d47e..105e5904715c 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix
@@ -8,9 +8,6 @@ stdenv.mkDerivation rec {
     sha256 = "0zkvqrzibrbljiccvz3rhbmgifxadlrfjylqpz48jnjx9kggynms";
   };
 
-  patches =
-    stdenv.lib.optional (browser ? isFirefox3Like) ./icecat3-idldir.patch;
-
   postConfigure =
     (if browser ? isFirefox3Like then ''
        # Cause a rebuild of these file from the IDL file, needed for GNU IceCat 3
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ebfd4715d4b3..8f7723fde9f7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8995,26 +8995,6 @@ let
 
   i810switch = callPackage ../os-specific/linux/i810switch { };
 
-  icecat3 = lowPrio (callPackage ../applications/networking/browsers/icecat-3 {
-    inherit (gnome) libIDL libgnomeui gnome_vfs;
-    inherit (xlibs) pixman;
-    inherit (pythonPackages) ply;
-  });
-
-  icecatXulrunner3 = lowPrio (callPackage ../applications/networking/browsers/icecat-3 {
-    application = "xulrunner";
-    inherit (gnome) libIDL libgnomeui gnome_vfs;
-    inherit (xlibs) pixman;
-    inherit (pythonPackages) ply;
-  });
-
-  icecat3Xul =
-    (symlinkJoin "icecat-with-xulrunner-${icecat3.version}"
-       [ icecat3 icecatXulrunner3 ])
-    // { inherit (icecat3) gtk isFirefox3Like meta; };
-
-  icecat3Wrapper = wrapFirefox { browser = icecat3Xul; browserName = "icecat"; desktopName = "IceCat"; };
-
   icewm = callPackage ../applications/window-managers/icewm { };
 
   id3v2 = callPackage ../applications/audio/id3v2 { };
diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix
index c447587e36e8..cfb14429a764 100644
--- a/pkgs/top-level/release-small.nix
+++ b/pkgs/top-level/release-small.nix
@@ -74,7 +74,6 @@ with import ./release-lib.nix { inherit supportedSystems; };
   hello = all;
   host = linux;
   iana_etc = linux;
-  icecat3Xul = linux;
   icewm = linux;
   idutils = all;
   ifplugd = linux;
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 246adb4e1c10..9970c2789ac1 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -160,7 +160,6 @@ let
       htmlTidy = all;
       hugin = linux;
       iana_etc = linux;
-      icecat3Xul = linux;
       icewm = linux;
       idutils = all;
       ifplugd = linux;

From 2053c7d8bea4a5acce6699ff56508889c10174df Mon Sep 17 00:00:00 2001
From: Markus Kohlhase <mail@markus-kohlhase.de>
Date: Sun, 24 Aug 2014 22:16:24 +0200
Subject: [PATCH 0504/1453] added xinput_calibrator v0.7.5

---
 pkgs/tools/X11/xinput_calibrator/default.nix | 21 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  4 ++++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/tools/X11/xinput_calibrator/default.nix

diff --git a/pkgs/tools/X11/xinput_calibrator/default.nix b/pkgs/tools/X11/xinput_calibrator/default.nix
new file mode 100644
index 000000000000..8f21f6558ffc
--- /dev/null
+++ b/pkgs/tools/X11/xinput_calibrator/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, libXi, inputproto, autoconf, automake, libtool, m4, x11, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  version = "0.7.5";
+  name = "xinput_calibrator";
+  src = fetchurl {
+    url = "https://github.com/tias/${name}/archive/v${version}.tar.gz";
+    sha256 = "d8edbf84523d60f52311d086a1e3ad0f3536f448360063dd8029bf6290aa65e9";
+  };
+
+  preConfigure = "./autogen.sh --with-gui=X11";
+
+  buildInputs = [ inputproto libXi autoconf automake libtool m4 x11 pkgconfig ];
+
+  meta = {
+    homepage = https://github.com/tias/xinput_calibrator;
+    description = "A generic touchscreen calibration program for X.Org";
+    license = stdenv.lib.licenses.mit;
+    maintainers = [ stdenv.lib.maintainers.flosse ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8f7723fde9f7..668bd590c270 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11474,6 +11474,10 @@ let
 
   xboxdrv = callPackage ../misc/drivers/xboxdrv { };
 
+  xinput_calibrator = callPackage ../tools/X11/xinput_calibrator {
+    inherit (xlibs) libXi inputproto;
+  };
+
   xosd = callPackage ../misc/xosd { };
 
   xsane = callPackage ../applications/graphics/sane/xsane.nix {

From 21a4539698909165b10d54d09dcff09d1a286037 Mon Sep 17 00:00:00 2001
From: Philip Horger <campadrenalin@gmail.com>
Date: Sun, 24 Aug 2014 03:47:29 +0200
Subject: [PATCH 0505/1453] Initial packaging for pnmixer

---
 pkgs/tools/audio/pnmixer/default.nix | 32 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/tools/audio/pnmixer/default.nix

diff --git a/pkgs/tools/audio/pnmixer/default.nix b/pkgs/tools/audio/pnmixer/default.nix
new file mode 100644
index 000000000000..e12a0dfc8916
--- /dev/null
+++ b/pkgs/tools/audio/pnmixer/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchgit, alsaLib, pkgconfig, gtk3, glibc, autoconf, automake, libnotify, libX11, gettext }:
+
+stdenv.mkDerivation rec {
+  name = "pa-applet";
+
+  src = fetchgit {
+    url = "git://github.com/nicklan/pnmixer.git";
+    rev = "1e09a075c0c63d8b161b13ea92528a798bdb464a";
+    sha256 = "15k689xycpc6pvq9vgg9ak92b9sg09dh4yrh83kjcaws63alrzl5";
+  };
+
+  buildInputs = [
+    alsaLib pkgconfig gtk3 glibc autoconf automake libnotify libX11 gettext
+  ];
+
+  preConfigure = ''
+    ./autogen.sh
+  '';
+
+  # work around a problem related to gtk3 updates
+  NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
+
+  postInstall = ''
+  '';
+
+  meta = with stdenv.lib; {
+    description = "";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ iElectric ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 668bd590c270..a66d8a4618a0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1643,6 +1643,8 @@ let
 
   pa_applet = callPackage ../tools/audio/pa-applet { };
 
+  pnmixer = callPackage ../tools/audio/pnmixer { };
+
   nifskope = callPackage ../tools/graphics/nifskope { };
 
   nilfs_utils = callPackage ../tools/filesystems/nilfs-utils {};

From 83c5a3d22d3a4cb4e99f5efcbeb20010a635c7b0 Mon Sep 17 00:00:00 2001
From: Philip Horger <campadrenalin@gmail.com>
Date: Sun, 24 Aug 2014 03:57:00 +0200
Subject: [PATCH 0506/1453] pnmixer: Add maintainer and fix name

---
 lib/maintainers.nix                  | 1 +
 pkgs/tools/audio/pnmixer/default.nix | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 6fadaa10952b..67936416ae8f 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -30,6 +30,7 @@
   bodil = "Bodil Stokke <nix@bodil.org>";
   bosu = "Boris Sukholitko <boriss@gmail.com>";
   calrama = "Moritz Maxeiner <moritz@ucworks.org>";
+  campadrenalin = "Philip Horger <campadrenalin@gmail.com>";
   cfouche = "Chaddaï Fouché <chaddai.fouche@gmail.com>";
   chaoflow = "Florian Friesdorf <flo@chaoflow.net>";
   coconnor = "Corey O'Connor <coreyoconnor@gmail.com>";
diff --git a/pkgs/tools/audio/pnmixer/default.nix b/pkgs/tools/audio/pnmixer/default.nix
index e12a0dfc8916..c32f39eec086 100644
--- a/pkgs/tools/audio/pnmixer/default.nix
+++ b/pkgs/tools/audio/pnmixer/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, alsaLib, pkgconfig, gtk3, glibc, autoconf, automake, libnotify, libX11, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "pa-applet";
+  name = "pnmixer";
 
   src = fetchgit {
     url = "git://github.com/nicklan/pnmixer.git";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ iElectric ];
+    maintainers = with maintainers; [ campadrenalin ];
     platforms = platforms.linux;
   };
 }

From e29311297609caf2d37327df699fd07f7992f1ae Mon Sep 17 00:00:00 2001
From: Philip Horger <campadrenalin@gmail.com>
Date: Sun, 24 Aug 2014 18:56:29 -0700
Subject: [PATCH 0507/1453] pnmixer: Add description field

---
 pkgs/tools/audio/pnmixer/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/audio/pnmixer/default.nix b/pkgs/tools/audio/pnmixer/default.nix
index c32f39eec086..4d966eb5e971 100644
--- a/pkgs/tools/audio/pnmixer/default.nix
+++ b/pkgs/tools/audio/pnmixer/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "";
+    description = "ALSA mixer for the system tray.";
     license = licenses.gpl3;
     maintainers = with maintainers; [ campadrenalin ];
     platforms = platforms.linux;

From e3fe98044c2f9359ff9af2fa265751ec9118d10a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 25 Aug 2014 10:04:49 +0200
Subject: [PATCH 0508/1453] pnmixer: cleanup

---
 pkgs/tools/audio/pnmixer/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/audio/pnmixer/default.nix b/pkgs/tools/audio/pnmixer/default.nix
index 4d966eb5e971..d7964c0961c6 100644
--- a/pkgs/tools/audio/pnmixer/default.nix
+++ b/pkgs/tools/audio/pnmixer/default.nix
@@ -20,11 +20,8 @@ stdenv.mkDerivation rec {
   # work around a problem related to gtk3 updates
   NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
 
-  postInstall = ''
-  '';
-
   meta = with stdenv.lib; {
-    description = "ALSA mixer for the system tray.";
+    description = "ALSA mixer for the system tray";
     license = licenses.gpl3;
     maintainers = with maintainers; [ campadrenalin ];
     platforms = platforms.linux;

From ed4b85abfc29a22fc6ff7712172c224ab82c4112 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 25 Aug 2014 10:10:22 +0200
Subject: [PATCH 0509/1453] remove pythonPackages.nose2Cov cc @chaoflow

---
 pkgs/top-level/python-packages.nix | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 16be6f6203be..164d3159f2b1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4877,18 +4877,6 @@ rec {
     doCheck = false;
   });
 
-  nose2Cov = if isPy26 then null else (buildPythonPackage rec {
-    name = "nose2-cov-1.0a4";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/n/nose2-cov/nose2-cov-1.0a4.tar.gz";
-      md5 = "6442f03e2ea732b0e38eb5b00fbe0b31";
-    };
-    meta = {
-      description = "nose2 plugin for coverage reporting, including subprocesses and multiprocessing";
-    };
-    propagatedBuildInputs = [ covCore nose2 ];
-  });
-
   nosejs = buildPythonPackage {
     name = "nosejs-0.9.4";
     src = fetchurl {

From 10e3cf6f5aa8e9bf5b969a02cc59256eff272279 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Sun, 24 Aug 2014 02:59:14 +0100
Subject: [PATCH 0510/1453] ppsspp: update to 0.9.9.1

---
 pkgs/misc/emulators/ppsspp/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/misc/emulators/ppsspp/default.nix
index ced8e1344dad..4c49e1e3af2d 100644
--- a/pkgs/misc/emulators/ppsspp/default.nix
+++ b/pkgs/misc/emulators/ppsspp/default.nix
@@ -3,15 +3,15 @@
 }:
 
 let
-  version = "0.9.9";
+  version = "0.9.9.1";
   fstat = x: fn: "-D" + fn + "=" + (if x then "ON" else "OFF");
 in stdenv.mkDerivation {
   name = "PPSSPP-${version}";
 
   src = fetchgit {
     url = "https://github.com/hrydgard/ppsspp.git";
-    sha256 = "1m7awac87wrwys22qwbr0589im1ilm0dv30wp945xg30793rivvj";
-    rev = "b421e29391b34d997b2c99ce2bdc74a0df5bb472";
+    sha256 = "0fdbda0b4dfbecacd01850f1767e980281fed4cc34a21df26ab3259242d8c352";
+    rev = "bf709790c4fed9cd211f755acaa650ace0f7555a";
     fetchSubmodules = true;
   };
 
@@ -19,7 +19,7 @@ in stdenv.mkDerivation {
                 ++ (if withGamepads then [ SDL ] else [ ]);
 
   configurePhase = "cd Qt && qmake PPSSPPQt.pro";
-  installPhase = "mkdir -p $out/bin && cp PPSSPPQt $out/bin";
+  installPhase = "mkdir -p $out/bin && cp ppsspp $out/bin";
 
   meta = with stdenv.lib; {
     homepage = "http://www.ppsspp.org/";

From 0383b57b3c8103f49002806e20ae3c67a83685db Mon Sep 17 00:00:00 2001
From: Igor Pashev <pashev.igor@gmail.com>
Date: Mon, 25 Aug 2014 10:23:10 +0200
Subject: [PATCH 0511/1453] Added concatMapStringsSep and concatImapStringsSep

Example: configure rewrite rules for Mediawiki

    RewriteEngine On
    RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-f
    RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-d
    ${concatMapStringsSep "\n" (u: "RewriteCond %{REQUEST_URI} !^${u.urlPath}") serverInfo.serverConfig.servedDirs}
    RewriteRule ${if config.enableUploads
---
 lib/strings.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/strings.nix b/lib/strings.nix
index efdc265465f3..31b0f56e09b0 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -34,6 +34,9 @@ rec {
   concatStringsSep = separator: list:
     concatStrings (intersperse separator list);
 
+  concatMapStringsSep = sep: f: list: concatStringsSep sep (map f list);
+  concatImapStringsSep = sep: f: list: concatStringsSep sep (lib.imap f list);
+
 
   # Construct a Unix-style search path consisting of each `subDir"
   # directory of the given list of packages.  For example,

From c93e48a2bb643fd2eb423bbe1855657699a9ec43 Mon Sep 17 00:00:00 2001
From: Tobias Blaschke <code@tobiasblaschke.de>
Date: Sat, 23 Aug 2014 17:09:11 +0200
Subject: [PATCH 0512/1453] xskat: new package

Play the german card game Skat against the AI or over IRC.
---
 pkgs/games/xskat/default.nix    | 38 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/games/xskat/default.nix

diff --git a/pkgs/games/xskat/default.nix b/pkgs/games/xskat/default.nix
new file mode 100644
index 000000000000..bd41531d9236
--- /dev/null
+++ b/pkgs/games/xskat/default.nix
@@ -0,0 +1,38 @@
+{stdenv, fetchurl, libX11, imake, gccmakedep}:
+
+
+let
+  s = # Generated upstream information
+  rec {
+    baseName="xskat";
+    version="4.0";
+    name="${baseName}-${version}";
+
+    url="http://www.xskat.de/xskat-4.0.tar.gz";
+    hash="8ba52797ccbd131dce69b96288f525b0d55dee5de4008733f7a5a51deb831c10";
+    sha256="8ba52797ccbd131dce69b96288f525b0d55dee5de4008733f7a5a51deb831c10";
+  };
+   buildInputs = [ libX11 imake gccmakedep ];
+in
+
+stdenv.mkDerivation {
+  inherit (s) name version;
+  inherit buildInputs;
+  src = fetchurl {
+    inherit (s) url sha256;
+  };
+  preInstall = ''
+    sed -i Makefile \
+      -e "s|.* BINDIR .*|   BINDIR = $out/bin|" \
+      -e "s|.* MANPATH .*|  MANPATH = $out/man|"
+  '';
+  installTargets = "install install.man";
+  meta = {
+    inherit (s) version;
+    description = ''Famous german card game'';
+    platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.free;
+    longDescription = ''Play the german card game Skat against the AI or over IRC.'';
+    homepage = http://www.xskat.de/;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a66d8a4618a0..3bf99d48c3e7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10558,6 +10558,8 @@ let
 
   xonotic = callPackage ../games/xonotic { };
 
+  xskat = callPackage ../games/xskat { };
+
   xsokoban = builderDefsPackage (import ../games/xsokoban) {
     inherit (xlibs) libX11 xproto libXpm libXt;
   };

From d14ed33c50ffee5ba5c2d7139cfe073888d984e9 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Thu, 21 Aug 2014 04:57:04 -0700
Subject: [PATCH 0513/1453] Update jigdo

---
 pkgs/applications/misc/jigdo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/jigdo/default.nix b/pkgs/applications/misc/jigdo/default.nix
index d722367d1b49..1f2ecf911416 100644
--- a/pkgs/applications/misc/jigdo/default.nix
+++ b/pkgs/applications/misc/jigdo/default.nix
@@ -10,8 +10,8 @@ stdenv.mkDerivation {
   };
 
   patches = fetchurl {
-    url = http://ftp.de.debian.org/debian/pool/main/j/jigdo/jigdo_0.7.3-2.diff.gz;
-    sha256 = "0jnlzm9m2hjlnw0zs2fv456ml5r2jj2q1lncqbrgg52lq18f6fa3";
+    url = http://ftp.de.debian.org/debian/pool/main/j/jigdo/jigdo_0.7.3-3.diff.gz;
+    sha256 = "0cp4jz3sg9g86vprh90pmwpcfla79f0dr50w14yh01k0yaq70fs8";
   };
 
   buildInputs = [ db gtk bzip2 ];

From f533756bd566cebd8c8bed1dd971e1c6b1a79fd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 25 Aug 2014 10:47:22 +0200
Subject: [PATCH 0514/1453] pythonPackages.polib: 1.0.1 -> 1.0.4

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 164d3159f2b1..31369f014de7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5541,11 +5541,11 @@ rec {
 
   polib = buildPythonPackage rec {
     name = "polib-${version}";
-    version = "1.0.1";
+    version = "1.0.4";
 
     src = fetchurl {
       url = "http://bitbucket.org/izi/polib/downloads/${name}.tar.gz";
-      sha256 = "1sr2bb3g7rl7gr6156j5qv71kg06q1x01r1lbps9ksnyz37djn2q";
+      sha256 = "16klwlswfbgmkzrra80fgzhic9447pk3mnr75r2fkz72bkvpcclb";
     };
 
     # error: invalid command 'test'

From 328306066265f2fc559fd2f8b00b277e1c5ea66a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 25 Aug 2014 10:49:29 +0200
Subject: [PATCH 0515/1453] pythonPackages.supervisor: 3.0 -> 3.1.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 31369f014de7..c2cedce16083 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7591,11 +7591,13 @@ rec {
   };
 
   supervisor = buildPythonPackage rec {
-    name = "supervisor-3.0";
+    name = "supervisor-3.1.1";
+    
+    disabled = isPy3k;
 
     src = fetchurl {
       url = "https://pypi.python.org/packages/source/s/supervisor/${name}.tar.gz";
-      md5 = "94ff3cf09618c36889425a8e002cd51a";
+      md5 = "8c9714feaa63902f03871317e3ebf62e";
     };
 
     buildInputs = [ mock ];

From 619f18956da87517131ad4429b2c24e16796411d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 25 Aug 2014 10:53:09 +0200
Subject: [PATCH 0516/1453] Bump the amount of memory for the installer test

It randomly OOMs.

http://hydra.nixos.org/build/13587153
---
 nixos/tests/installer.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index d3bbe7a8bd55..621afffbfc1f 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -98,7 +98,7 @@ let
       # FIXME: OVMF doesn't boot from virtio http://www.mail-archive.com/edk2-devel@lists.sourceforge.net/msg01501.html
       iface = if useEFI || grubVersion == 1 then "scsi" else "virtio";
       qemuFlags =
-        (if iso.system == "x86_64-linux" then "-m 512 " else "-m 384 ") +
+        (if iso.system == "x86_64-linux" then "-m 768 " else "-m 512 ") +
         (optionalString (iso.system == "x86_64-linux") "-cpu kvm64 ") +
         (optionalString useEFI ''-L ${efiBios} -hda ''${\(Cwd::abs_path('harddisk'))} '');
       hdFlags = optionalString (!useEFI)

From cb3cf6d3d7bd80f666568b8d687f6530e8504aee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 25 Aug 2014 11:01:08 +0200
Subject: [PATCH 0517/1453] pythonPackges.ipython: 2.0.0 -> 2.2.0

---
 pkgs/shells/ipython/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/ipython/default.nix b/pkgs/shells/ipython/default.nix
index cb0cc95c4ced..990eb174bafc 100644
--- a/pkgs/shells/ipython/default.nix
+++ b/pkgs/shells/ipython/default.nix
@@ -13,12 +13,12 @@ assert qtconsoleSupport == true -> pyqt4 != null;
 assert pylabQtSupport == true -> pyqt4 != null && sip != null;
 
 buildPythonPackage rec {
-  name = "ipython-2.0.0";
+  name = "ipython-2.2.0";
   namePrefix = "";
 
   src = fetchurl {
     url = "http://pypi.python.org/packages/source/i/ipython/${name}.tar.gz";
-    sha256 = "0fl9sznx83y2ck8wh5zr8avzjm5hz6r0xz38ij2fil3gin7w10sf";
+    sha256 = "1qk44lmir24gnwb3gxh0mqcghc8ln1i5ygxpalh06bx0ajx7gjmp";
   };
 
   propagatedBuildInputs = [

From c2d0028560f536bbd11a3d40f99ec26c2af00228 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 25 Aug 2014 11:01:20 +0200
Subject: [PATCH 0518/1453] pythonPackages.matplotlib: don't depend on pygtk

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c2cedce16083..e844b2999a78 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4307,7 +4307,7 @@ rec {
 
     propagatedBuildInputs =
       [ dateutil nose numpy pyparsing tornado pkgs.freetype pkgs.libpng pkgs.pkgconfig
-        pygtk ];
+      ];
 
     meta = with stdenv.lib; {
       description = "python plotting library, making publication quality plots";

From 8bd3c675520adc755ce97ff3ff35175a67448208 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Mon, 25 Aug 2014 10:48:26 +0200
Subject: [PATCH 0519/1453] IDEA: 13.1.3 -> 13.1.4

Changed, attribute name separator changed to dashes and decription.
Added longDescription.
---
 pkgs/applications/editors/idea/default.nix | 35 +++++++++++++++-------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index 7cb99ae80ccc..caa9523af6f6 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -7,7 +7,7 @@ assert stdenv.isLinux;
 let
 
   buildIdea =
-  { name, version, build, src, description, license }:
+  { name, version, build, src, description, longDescription, license }:
 
   stdenv.mkDerivation rec {
     inherit name build src;
@@ -58,6 +58,7 @@ let
     meta = {
       homepage = http://www.jetbrains.com/idea/;
       inherit description;
+      inherit longDescription;
       inherit license;
       maintainers = [ stdenv.lib.maintainers.edwtjo ];
       platforms = stdenv.lib.platforms.linux;
@@ -66,27 +67,39 @@ let
 
 in {
 
-  idea_community = buildIdea rec {
+  idea-community = buildIdea rec {
     name = "idea-community-${version}";
-    version = "13.1.3";
-    build = "IC-135.909";
-    description = "IntelliJ IDEA 13 Community Edition";
+    version = "13.1.4b";
+    build = "IC-135.1230";
+    description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
+    longDescription = ''
+      Lightweight IDE for Java SE, Groovy & Scala development
+      Powerful environment for building Google Android apps
+      Integration with JUnit, TestNG, popular SCMs, Ant & Maven
+      Free, open-source, Apache 2 licensed.
+    '';
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "http://download-ln.jetbrains.com/idea/ideaIC-${version}.tar.gz";
-      sha256 = "62ed937ef68df16eef4d32772b6510835527f95020db1c76643f17ed2c067b51";
+      sha256 = "8b4ee25fd2934e06b87230b50e1474183ed4b331c1626a7fee69b96294d9616d";
     };
   };
 
-  idea_ultimate = buildIdea rec {
+  idea-ultimate = buildIdea rec {
     name = "idea-ultimate-${version}";
-    version = "13.1.3";
-    build = "IU-135.909";
-    description = "IntelliJ IDEA 13 Ultimate Edition";
+    version = "13.1.4b";
+    build = "IU-135.1230";
+    description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
+    longDescription = ''
+      Full-featured IDE for JVM-based and polyglot development
+      Java EE, Spring/Hibernate and other technologies support
+      Deployment and debugging with most application servers
+      Duplicate code search, dependency structure matrix, etc.
+    '';
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "http://download-ln.jetbrains.com/idea/ideaIU-${version}.tar.gz";
-      sha256 = "6d99e49a63a197e19381a85535ab424a7832653db8cceb3bca7d53615ec7a53d";
+      sha256 = "84660d97c9c3e4e7cfd6c2708f4685dc7322157f1e1c2888feac64df119f0606";
     };
   };
 

From 2172031655c92b8b69c4aa90a259192785d61e66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 25 Aug 2014 11:05:11 +0200
Subject: [PATCH 0520/1453] pythonPackages.jsonschema: 2.0.0 -> 2.4.0

---
 pkgs/top-level/python-packages.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e844b2999a78..0b89a3768a23 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3308,15 +3308,19 @@ rec {
   });
 
   jsonschema = buildPythonPackage (rec {
-    version = "2.0.0";
+    version = "2.4.0";
     name = "jsonschema-${version}";
 
     src = fetchurl {
       url = "https://pypi.python.org/packages/source/j/jsonschema/jsonschema-${version}.tar.gz";
-      md5 = "1793d97a668760ef540fadd342aa08e5";
+      md5 = "661f85c3d23094afbb9ac3c0673840bf";
     };
 
     buildInputs = [ nose mock ];
+    
+    patchPhase = ''
+      substituteInPlace jsonschema/tests/test_jsonschema_test_suite.py --replace "python" "${python}/bin/${python.executable}"
+    '';
 
     checkPhase = ''
       nosetests

From 870d8f63ec11edfa019d8c3d5f829eb360a8a550 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 25 Aug 2014 11:10:51 +0200
Subject: [PATCH 0521/1453] pythonPackages.memcached: 1.48 -> 1.51

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0b89a3768a23..5edd37858727 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4380,11 +4380,14 @@ rec {
 
 
   memcached = buildPythonPackage rec {
-    name = "memcached-1.48";
+    name = "memcached-1.51";
 
-    src = fetchurl {
-      url = "ftp://ftp.tummy.com/pub/python-memcached/old-releases/python-memcached-1.48.tar.gz";
-      sha256 = "1i0h05z9j0zl65rgvw86p4f54pigkxynhzppn4qxby8rjlnwdfv6";
+    src = if isPy3k then fetchurl {
+      url = "https://pypi.python.org/packages/source/p/python3-memcached/python3-${name}.tar.gz";
+      sha256 = "0na8b369q8fivh3y0nvzbvhh3lgvxiyyv9xp93cnkvwfsr8mkgkw";
+    } else fetchurl {
+      url = "http://ftp.tummy.com/pub/python-memcached/old-releases/python-${name}.tar.gz";
+      sha256 = "124s98m6hvxj6x90d7aynsjfz878zli771q96ns767r2mbqn7192";
     };
 
     meta = {

From b4fe8535d807a81e8e5d389bf8c3216641d2f72e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 25 Aug 2014 11:22:34 +0200
Subject: [PATCH 0522/1453] pythonPackages.sqlalchemy{8,9}: bump

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5edd37858727..ee68aec65af9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7709,19 +7709,19 @@ rec {
 
 
   sqlalchemy8 = pkgs.lib.overrideDerivation sqlalchemy9 (args: rec {
-    name = "SQLAlchemy-0.8.5";
+    name = "SQLAlchemy-0.8.7";
     src = fetchurl {
       url = "https://pypi.python.org/packages/source/S/SQLAlchemy/${name}.tar.gz";
-      md5 = "ecf0738eaf1229bae27ad2be0f9978a8";
+      md5 = "4f3377306309e46739696721b1785335";
     };
   });
 
   sqlalchemy9 = buildPythonPackage rec {
-    name = "SQLAlchemy-0.9.3";
+    name = "SQLAlchemy-0.9.4";
 
     src = fetchurl {
       url = "https://pypi.python.org/packages/source/S/SQLAlchemy/${name}.tar.gz";
-      md5 = "a27989b9d4b3f14ea0b1600aa45559c4";
+      md5 = "c008ea5e2565ec1418ee8461393a99b1";
     };
 
     buildInputs = [ nose mock ];

From 8cb6d1ebb321a473b0fdb1888e285b292257abd1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 25 Aug 2014 11:49:56 +0200
Subject: [PATCH 0523/1453] Moo: Fix build

http://hydra.nixos.org/build/13626782
---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 8895d4d093b2..a74cd8f2d8f4 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5698,8 +5698,8 @@ let self = _self // overrides; _self = with self; {
       url = mirror://cpan/authors/id/H/HA/HAARG/Moo-1.006000.tar.gz;
       sha256 = "0gjh6dyz825cwjibq2wlpx14drjqx4pxxh931p4x3jd2617hax17";
     };
-    buildInputs = [ TestFatal ImportInto ];
-    propagatedBuildInputs = [ ClassMethodModifiers DevelGlobalDestruction ModuleRuntime RoleTiny strictures ];
+    buildInputs = [ TestFatal ];
+    propagatedBuildInputs = [ ClassMethodModifiers DevelGlobalDestruction ImportInto ModuleRuntime RoleTiny strictures ];
     meta = {
       description = "Minimalist Object Orientation (with Moose compatiblity)";
       license = "perl5";

From cdd1785cd6380e971ad0413e7ecfd3af7ab38625 Mon Sep 17 00:00:00 2001
From: Igor Pashev <pashev.igor@gmail.com>
Date: Mon, 25 Aug 2014 11:55:57 +0200
Subject: [PATCH 0524/1453] Fixed rewrite rules for Mediawiki

If Mediawiki was served from the root directory of the server
it was impossible to serve other directories.

Make sure that URLs defined in servedDirs are not rewritten.
Use case: serving local copy of MathJax
---
 nixos/modules/services/web-servers/apache-httpd/mediawiki.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
index aa9aec87f0c4..76c64f8cb29b 100644
--- a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
@@ -133,6 +133,7 @@ in
         RewriteEngine On
         RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-f
         RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-d
+        ${concatMapStringsSep "\n" (u: "RewriteCond %{REQUEST_URI} !^${u.urlPath}") serverInfo.serverConfig.servedDirs}
         RewriteRule ${if config.enableUploads
           then "!^/images"
           else "^.*\$"

From 296888b1bcb0b3eb641167973c87686a9103b0dd Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Mon, 25 Aug 2014 02:48:02 +0200
Subject: [PATCH 0525/1453] nixos: virtualisation, add basic docker nixos image

---
 nixos/modules/virtualisation/docker-image.nix | 67 +++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 nixos/modules/virtualisation/docker-image.nix

diff --git a/nixos/modules/virtualisation/docker-image.nix b/nixos/modules/virtualisation/docker-image.nix
new file mode 100644
index 000000000000..13b861dc9884
--- /dev/null
+++ b/nixos/modules/virtualisation/docker-image.nix
@@ -0,0 +1,67 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ pkgs2storeContents = l : map (x: { object = x; symlink = "none"; }) l;
+
+in {
+  # Create the tarball
+  system.build.dockerImage = import ../../lib/make-system-tarball.nix {
+    inherit (pkgs) stdenv perl xz pathsFromGraph;
+
+    contents = [];
+    extraArgs = "--owner=0";
+    storeContents = [
+      { object = config.system.build.toplevel + "/init";
+        symlink = "/bin/init";
+      }
+    ] ++ (pkgs2storeContents [ pkgs.stdenv ]);
+  };
+
+  boot.postBootCommands =
+    ''
+      # After booting, register the contents of the Nix store in the Nix
+      # database.
+      if [ -f /nix-path-registration ]; then
+        ${config.nix.package}/bin/nix-store --load-db < /nix-path-registration &&
+        rm /nix-path-registration
+      fi
+
+      # nixos-rebuild also requires a "system" profile and an
+      # /etc/NIXOS tag.
+      touch /etc/NIXOS
+      ${config.nix.package}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system
+
+      # Set virtualisation to docker
+      echo "docker" > /run/systemd/container 
+    '';
+
+
+  # docker image config
+  require = [
+    ../installer/cd-dvd/channel.nix
+    ../profiles/minimal.nix
+    ../profiles/clone-config.nix
+  ];
+
+  boot.isContainer = true;
+
+  # Iptables do not work in docker
+  networking.firewall.enable = false;
+
+  services.openssh.enable = true;
+
+  # Socket activated ssh presents problem in docker
+  services.openssh.startWhenNeeded = false;
+
+  # Allow the user to login as root without password
+  security.initialRootPassword = "";
+
+  # Some more help text.
+  services.mingetty.helpLine =
+    ''
+
+      Log in as "root" with an empty password.
+    '';
+}

From 57c8030b56a6239b4bc5109b23eacdc98b02ad92 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 25 Aug 2014 11:24:45 +0200
Subject: [PATCH 0526/1453] haskell-MonadRandom: update to version 0.2.0.1

---
 .../libraries/haskell/MonadRandom/{0.2.nix => 0.2.0.1.nix}   | 5 ++---
 pkgs/top-level/haskell-packages.nix                          | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)
 rename pkgs/development/libraries/haskell/MonadRandom/{0.2.nix => 0.2.0.1.nix} (72%)

diff --git a/pkgs/development/libraries/haskell/MonadRandom/0.2.nix b/pkgs/development/libraries/haskell/MonadRandom/0.2.0.1.nix
similarity index 72%
rename from pkgs/development/libraries/haskell/MonadRandom/0.2.nix
rename to pkgs/development/libraries/haskell/MonadRandom/0.2.0.1.nix
index a0f9a2f641fb..cc430e22090f 100644
--- a/pkgs/development/libraries/haskell/MonadRandom/0.2.nix
+++ b/pkgs/development/libraries/haskell/MonadRandom/0.2.0.1.nix
@@ -4,13 +4,12 @@
 
 cabal.mkDerivation (self: {
   pname = "MonadRandom";
-  version = "0.2";
-  sha256 = "0wxn1n47mx7npxzc6iv2hj3ikj3d0s11xsndz2gfm9y5pwm3h44c";
+  version = "0.2.0.1";
+  sha256 = "1689302z053zhcr46w5q3a57kd6z365kkgzxh638gcakzzk3pmwm";
   buildDepends = [ mtl random transformers ];
   meta = {
     description = "Random-number generation monad";
     license = "unknown";
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
   };
 })
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index d5a94dcabeb2..db65c71eb41f 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1618,8 +1618,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   MonadPrompt = callPackage ../development/libraries/haskell/MonadPrompt {};
 
   MonadRandom_0_1_13 = callPackage ../development/libraries/haskell/MonadRandom/0.1.13.nix {};
-  MonadRandom_0_2 = callPackage ../development/libraries/haskell/MonadRandom/0.2.nix {};
-  MonadRandom = self.MonadRandom_0_2;
+  MonadRandom_0_2_0_1 = callPackage ../development/libraries/haskell/MonadRandom/0.2.0.1.nix {};
+  MonadRandom = self.MonadRandom_0_2_0_1;
 
   monadStm = callPackage ../development/libraries/haskell/monad-stm {};
 

From c2ad6595d2f41611745eb247c5aa12a3efa5fcbb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 25 Aug 2014 11:27:01 +0200
Subject: [PATCH 0527/1453] haskell-HTTP: update to version 4000.2.18

---
 .../haskell/HTTP/{4000.2.17.nix => 4000.2.18.nix}  | 14 +++++++-------
 pkgs/top-level/haskell-packages.nix                |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)
 rename pkgs/development/libraries/haskell/HTTP/{4000.2.17.nix => 4000.2.18.nix} (62%)

diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.17.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.18.nix
similarity index 62%
rename from pkgs/development/libraries/haskell/HTTP/4000.2.17.nix
rename to pkgs/development/libraries/haskell/HTTP/4000.2.18.nix
index ce90b9a9426a..0a5a16dfadc3 100644
--- a/pkgs/development/libraries/haskell/HTTP/4000.2.17.nix
+++ b/pkgs/development/libraries/haskell/HTTP/4000.2.18.nix
@@ -1,19 +1,19 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, caseInsensitive, conduit, conduitExtra, deepseq, httpdShed
-, httpTypes, HUnit, mtl, network, parsec, pureMD5, split
-, testFramework, testFrameworkHunit, wai, warp
+, httpTypes, HUnit, mtl, network, networkUri, parsec, pureMD5
+, split, testFramework, testFrameworkHunit, wai, warp
 }:
 
 cabal.mkDerivation (self: {
   pname = "HTTP";
-  version = "4000.2.17";
-  sha256 = "1701mgf1gw00nxd70kkr86yl80qxy63rpqky2g9m2nfr6y4y5b59";
-  buildDepends = [ mtl network parsec ];
+  version = "4000.2.18";
+  sha256 = "1jn0ikbdwhd32qjwpnsmpnmy0dxhmwfhf8851ifxik91fn7j5j4k";
+  buildDepends = [ mtl network networkUri parsec ];
   testDepends = [
     caseInsensitive conduit conduitExtra deepseq httpdShed httpTypes
-    HUnit mtl network pureMD5 split testFramework testFrameworkHunit
-    wai warp
+    HUnit mtl network networkUri pureMD5 split testFramework
+    testFrameworkHunit wai warp
   ];
   doCheck = false;
   noHaddock = self.stdenv.lib.versionOlder self.ghc.version "6.11";
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index db65c71eb41f..6954fabee6d0 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1123,8 +1123,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   HTTP_4000_2_3 = callPackage ../development/libraries/haskell/HTTP/4000.2.3.nix {};
   HTTP_4000_2_5 = callPackage ../development/libraries/haskell/HTTP/4000.2.5.nix {};
   HTTP_4000_2_8 = callPackage ../development/libraries/haskell/HTTP/4000.2.8.nix {};
-  HTTP_4000_2_17 = callPackage ../development/libraries/haskell/HTTP/4000.2.17.nix {};
-  HTTP = self.HTTP_4000_2_17;
+  HTTP_4000_2_18 = callPackage ../development/libraries/haskell/HTTP/4000.2.18.nix {};
+  HTTP = self.HTTP_4000_2_18;
 
   httpAttoparsec = callPackage ../development/libraries/haskell/http-attoparsec {};
 

From 3ba066cd842c425b15532c1335d93f97ccfee5e6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 25 Aug 2014 11:27:13 +0200
Subject: [PATCH 0528/1453] haskell-arbtt: update to version 0.8.1.2

---
 pkgs/applications/misc/arbtt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/arbtt/default.nix b/pkgs/applications/misc/arbtt/default.nix
index 239305c546e7..27f6c1223741 100644
--- a/pkgs/applications/misc/arbtt/default.nix
+++ b/pkgs/applications/misc/arbtt/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "arbtt";
-  version = "0.8.1.1";
-  sha256 = "1qid9qs0sjyqpbnv20rmwjkibjsic9p4kil7gjhwi6panfan9x10";
+  version = "0.8.1.2";
+  sha256 = "074vb84vkygxamvq7xnwlpgbch6qkbhyzbakc343230p1ryxf62q";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [

From 3120bbde2ea2fda4dc9b02f1be259c9f2fd2dfdc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 25 Aug 2014 11:27:16 +0200
Subject: [PATCH 0529/1453] haskell-http-client: update to version 0.3.7.2

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

diff --git a/pkgs/development/libraries/haskell/http-client/default.nix b/pkgs/development/libraries/haskell/http-client/default.nix
index 2c3ad6d1141b..7f032c3f675a 100644
--- a/pkgs/development/libraries/haskell/http-client/default.nix
+++ b/pkgs/development/libraries/haskell/http-client/default.nix
@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-client";
-  version = "0.3.7.1";
-  sha256 = "0wfmzpjzazk5jr1pbkhkxxa32pd40mgm1p426k5bxjn3gw48r30c";
+  version = "0.3.7.2";
+  sha256 = "1llrf2bfbh5z01pwg40zdgmz93h45h60mg2pv1k6b8pmzlwr6aaz";
   buildDepends = [
     base64Bytestring blazeBuilder caseInsensitive cookie
     dataDefaultClass deepseq exceptions filepath httpTypes mimeTypes

From de43fed57e530dcdcf59d556d3605ffbfb370d30 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 25 Aug 2014 11:27:19 +0200
Subject: [PATCH 0530/1453] haskell-language-c: update to version 0.4.6

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

diff --git a/pkgs/development/libraries/haskell/language-c/default.nix b/pkgs/development/libraries/haskell/language-c/default.nix
index 6562d3fdf260..2fe11c4f071e 100644
--- a/pkgs/development/libraries/haskell/language-c/default.nix
+++ b/pkgs/development/libraries/haskell/language-c/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "language-c";
-  version = "0.4.5";
-  sha256 = "0q0x1rm74g27ry4jja44hk8z0lqkwnimnxbcy54m2cphaxk7yjk4";
+  version = "0.4.6";
+  sha256 = "0pzd3g5q3sjfngs29biannza6l9am75kcjy5q0xcjv7xhz0z1m31";
   buildDepends = [ filepath syb ];
   buildTools = [ alex happy ];
   meta = {

From daf9ad906ad1525ee9a3190e777c603dea1691c1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 25 Aug 2014 11:27:21 +0200
Subject: [PATCH 0531/1453] haskell-stylish-haskell: update to version 0.5.10.2

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

diff --git a/pkgs/development/libraries/haskell/stylish-haskell/default.nix b/pkgs/development/libraries/haskell/stylish-haskell/default.nix
index afa664a68f90..9cc43e142a7e 100644
--- a/pkgs/development/libraries/haskell/stylish-haskell/default.nix
+++ b/pkgs/development/libraries/haskell/stylish-haskell/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "stylish-haskell";
-  version = "0.5.10.1";
-  sha256 = "1jd2dbi844cjs012gwr5idk1jmn860ff8hy1r1s6jndsm69awbba";
+  version = "0.5.10.2";
+  sha256 = "1r1vwn334jdsk6szynzz7w9jpbfqs3zs7wzlpwfigsyyrjy3bn3q";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 3d42da9e0b229f32d7a8537d55a321beddd37be5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 25 Aug 2014 11:27:24 +0200
Subject: [PATCH 0532/1453] haskell-yesod-core: update to version 1.2.19.1

---
 pkgs/development/libraries/haskell/yesod-core/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix
index 8f3b90db6c7a..857b237ba428 100644
--- a/pkgs/development/libraries/haskell/yesod-core/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-core/default.nix
@@ -13,8 +13,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-core";
-  version = "1.2.19";
-  sha256 = "0dlvg8zpr1qyav3svqybsqsrmrl9n8s1kdzxf6zxa3pn582d48il";
+  version = "1.2.19.1";
+  sha256 = "1021z0jrfbafbdybpj0jkacr9ljyap5cpmfk2911dsz3nz7sy6zg";
   buildDepends = [
     aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup
     caseInsensitive cereal clientsession conduit conduitExtra cookie
@@ -31,7 +31,6 @@ cabal.mkDerivation (self: {
     transformers wai waiExtra waiTest
   ];
   jailbreak = true;
-  doCheck = false;
   meta = {
     homepage = "http://www.yesodweb.com/";
     description = "Creation of type-safe, RESTful web applications";

From 3d3e78c673db7514143434661da6cbe1535d456b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 25 Aug 2014 11:41:12 +0200
Subject: [PATCH 0533/1453] network-uri: build with a recent version of Cabal
 on GHC 6.x

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

diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index bcdcddbc8524..c8389f259c57 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -97,6 +97,7 @@
     logict = super.logict.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
     monadPar = self.monadPar_0_1_0_3;
     nats = null;                        # none of our versions compile
+    networkUri = super.networkUri.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
     parallel = self.parallel_3_2_0_3;
     primitive = self.primitive_0_5_0_1;
     reflection = super.reflection.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };

From 0c3cddfc5277f26a4ebda0fff3fc796fb07804cd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 25 Aug 2014 11:46:45 +0200
Subject: [PATCH 0534/1453] Build cabal-install-0.14.0 with network 2.3.x on
 GHC 7.4.2 and below.

Fixes <https://github.com/NixOS/nixpkgs/pull/3770>.
---
 pkgs/top-level/haskell-defaults.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index c8389f259c57..9a064212a40e 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -59,6 +59,10 @@
 
   ghc742Prefs = self : super : ghc763Prefs self super // {
     aeson = self.aeson_0_7_0_4.override { blazeBuilder = self.blazeBuilder; };
+    cabalInstall_0_14_0 = super.cabalInstall_0_14_0.override {
+      HTTP = self.HTTP.override { network = self.network_2_3_0_13; };
+      network = self.network_2_3_0_13;
+    };
     extensibleExceptions = null;        # core package in ghc <= 7.4.x
     hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_16_0_3; };
     haddock = self.haddock_2_11_0;

From 7cd9bebb263df517e67a5f2720196fcad24e7d75 Mon Sep 17 00:00:00 2001
From: Georges Dubus <georges.dubus@compiletoi.net>
Date: Mon, 25 Aug 2014 12:16:18 +0200
Subject: [PATCH 0535/1453] posterazor: update from 1.5 to 1.5.1

---
 pkgs/applications/misc/posterazor/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/posterazor/default.nix b/pkgs/applications/misc/posterazor/default.nix
index 38fac21322cc..f55af543f18d 100644
--- a/pkgs/applications/misc/posterazor/default.nix
+++ b/pkgs/applications/misc/posterazor/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, unzip, pkgconfig, libXpm, fltk13, freeimage }:
 
 stdenv.mkDerivation rec {
-  name = "posterazor-1.5";
+  name = "posterazor-1.5.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/posterazor/1.5/PosteRazor-1.5-Source.zip";
-    sha256 = "0xy313d2j57s4wy2y3hjapbjr5zfaki0lhkfz6nw2p9gylcmwmjy";
+    url = "mirror://sourceforge/posterazor/1.5.1/PosteRazor-1.5.1-Source.zip";
+    sha256 = "1dqpdk8zl0smdg4fganp3hxb943q40619qmxjlga9jhjc01s7fq5";
   };
 
   buildInputs = [ cmake unzip pkgconfig libXpm fltk13 freeimage ];

From fbecc676e595e31c41c4ecf0347104d2378b7989 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 25 Aug 2014 11:38:48 +0200
Subject: [PATCH 0536/1453] wgetpaste: 2.23 -> 2.25

---
 pkgs/tools/text/wgetpaste/default.nix | 51 ++++++++++++++-------------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/pkgs/tools/text/wgetpaste/default.nix b/pkgs/tools/text/wgetpaste/default.nix
index 7635e0424993..3c0af0157a52 100644
--- a/pkgs/tools/text/wgetpaste/default.nix
+++ b/pkgs/tools/text/wgetpaste/default.nix
@@ -1,28 +1,29 @@
-{stdenv, fetchurl, wget, bash, coreutils}:
-  stdenv.mkDerivation rec {
-    version = "2.23";
-    name = "wgetpaste-${version}";
-      src = fetchurl {
-        url = "http://wgetpaste.zlin.dk/${name}.tar.bz2";
-        sha256 = "1xam745f5pmqi16br72a866117hnmcfwjyvsw1jhg3npbdnm9x6n";
-    };
-    # currently zsh-autocompletion support is not installed
+{ stdenv, fetchurl, wget, bash, coreutils }:
 
-    prePatch = ''
-      substituteInPlace wgetpaste --replace "/usr/bin/env bash" "${bash}/bin/bash"
-      substituteInPlace wgetpaste --replace "LC_ALL=C wget" "LC_ALL=C ${wget}/bin/wget"
-    '';
+stdenv.mkDerivation rec {
+  version = "2.25";
+  name = "wgetpaste-${version}";
+  src = fetchurl {
+    url = "http://wgetpaste.zlin.dk/${name}.tar.bz2";
+    sha256 = "1x209j85mryp3hxmv1gfsbvw03k306k5fa65ky0zxx07cs70fzka";
+  };
+  # currently zsh-autocompletion support is not installed
 
-    installPhase = ''
-      mkdir -p $out/bin;
-      cp wgetpaste $out/bin;
-    '';
+  prePatch = ''
+    substituteInPlace wgetpaste --replace "/usr/bin/env bash" "${bash}/bin/bash"
+    substituteInPlace wgetpaste --replace "LC_ALL=C wget" "LC_ALL=C ${wget}/bin/wget"
+  '';
 
-    meta = {
-      description = "Command-line interface to various pastebins";
-      homepage = http://wgetpaste.zlin.dk/;
-      license = "publicDomain";
-      maintainers = with stdenv.lib.maintainers; [qknight];
-      platforms = stdenv.lib.platforms.all;
-    };
-  }
+  installPhase = ''
+    mkdir -p $out/bin;
+    cp wgetpaste $out/bin;
+  '';
+
+  meta = {
+    description = "Command-line interface to various pastebins";
+    homepage = http://wgetpaste.zlin.dk/;
+    license = "publicDomain";
+    maintainers = with stdenv.lib.maintainers; [ qknight iElectric ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}

From 028216edce2bf38ba27ffacbd66f88851a774a7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 25 Aug 2014 13:03:03 +0200
Subject: [PATCH 0537/1453] python.substanced: upgrade to latest git, fix py3k

---
 pkgs/top-level/python-packages.nix | 186 +++++++++++++++++++++++++----
 1 file changed, 163 insertions(+), 23 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ee68aec65af9..352d58f459aa 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1730,6 +1730,36 @@ rec {
       platforms = stdenv.lib.platforms.all;
     };
   };
+  
+  deform2 = buildPythonPackage rec {
+    name = "deform-2.0a2";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/d/deform/${name}.tar.gz";
+      sha256 = "1gfaf1d8zp0mp4h229srlffxdp86w1nni9g4aqsshxysr23x591z";
+    };
+
+    buildInputs = [] ++ optional isPy26 unittest2;
+
+    propagatedBuildInputs =
+      [ pythonPackages.beautifulsoup4
+        pythonPackages.peppercorn
+        pythonPackages.colander
+        pythonPackages.translationstring
+        pythonPackages.chameleon
+        pythonPackages.zope_deprecation
+        pythonPackages.coverage
+        pythonPackages.nose
+      ];
+
+    meta = {
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
 
 
   deform_bootstrap = buildPythonPackage rec {
@@ -2276,12 +2306,17 @@ rec {
 
 
   pyramid = buildPythonPackage rec {
-    name = "pyramid-1.5";
+    name = "pyramid-1.5.1";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/p/pyramid/${name}.tar.gz";
-      md5 = "8747658dcbab709a9c491e43d3b0d58b";
+      md5 = "8a1ab3b773d8e22437828f7df22852c1";
     };
+    
+    preCheck = ''
+      # test is failing, see https://github.com/Pylons/pyramid/issues/1405
+      rm pyramid/tests/test_response.py
+    '';
 
     buildInputs = [
       docutils
@@ -2330,11 +2365,11 @@ rec {
 
 
   pyramid_chameleon = buildPythonPackage rec {
-    name = "pyramid_chameleon-0.1";
+    name = "pyramid_chameleon-0.3";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/p/pyramid_chameleon/${name}.tar.gz";
-      md5 = "39b1327a9890f382200bbfde943833d7";
+      md5 = "5bb5938356dfd13fce06e095f132e137";
     };
 
     propagatedBuildInputs = [
@@ -2505,14 +2540,14 @@ rec {
 
 
   hypatia = buildPythonPackage rec {
-    name = "hypatia-0.1a6";
+    name = "hypatia-0.3";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/h/hypatia/${name}.tar.gz";
-      md5 = "3a67683c578754cd8f23317db6d28ffd";
+      md5 = "d74c6dda31ff459a39fa5da9e98f2425";
     };
 
-    buildInputs = [ zope_interface zodb3 ];
+    buildInputs = [ zope_interface zodb ];
 
     meta = {
       maintainers = [ stdenv.lib.maintainers.iElectric ];
@@ -2553,15 +2588,18 @@ rec {
 
 
   pyramid_zodbconn = buildPythonPackage rec {
-    name = "pyramid_zodbconn-0.4";
+    name = "pyramid_zodbconn-0.7";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/p/pyramid_zodbconn/${name}.tar.gz";
-      md5 = "22e88cc82cafbbe00274e7378434e5fe";
+      md5 = "3c7746a227fbcda3e138ab8bfab7700b";
     };
+    
+    # should be fixed in next release
+    doCheck = false;
 
     buildInputs = [ pyramid mock ];
-    propagatedBuildInputs = [ zodb3 zodburi ];
+    propagatedBuildInputs = [ zodb zodburi ];
 
     meta = {
       maintainers = [ stdenv.lib.maintainers.iElectric ];
@@ -2624,30 +2662,54 @@ rec {
 
 
   zodburi = buildPythonPackage rec {
-    name = "zodburi-2.0b1";
+    name = "zodburi-2.0";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/z/zodburi/${name}.tar.gz";
-      md5 = "52cc13c32ffe4ee7b5f5abc79f70f3c2";
+      md5 = "7876893829c2f784506c80d49f861b67";
     };
 
-    buildInputs = [ zodb3 mock ];
+    buildInputs = [ zodb mock ZEO ];
 
     meta = {
       maintainers = [ stdenv.lib.maintainers.iElectric ];
     };
   };
+  
+  ZEO = pythonPackages.buildPythonPackage rec {
+    name = "ZEO-4.0.0";
+
+    propagatedBuildInputs = [ random2 zodb six transaction persistent zc_lockfile zconfig zdaemon zope_interface ];
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/Z/ZEO/${name}.tar.gz";
+      md5 = "494d8320549185097ba4a6b6b76017d6";
+    };
+
+    meta = with stdenv.lib; {
+      homepage = https://pypi.python.org/pypi/ZEO;
+    };
+  };
+  
+  random2 = pythonPackages.buildPythonPackage rec {
+    name = "random2-1.0.1";
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/r/random2/${name}.zip";
+      md5 = "48a0a86fe00e447212d0095de8cf3e21";
+    };
+  };
 
 
   substanced = buildPythonPackage rec {
     # no release yet
-    rev = "bd8822be62f0f356e4e44d5c614fe14d3fa08f45";
+    rev = "089818bc61c3dc5eca023254e37a280b041ea8cc";
     name = "substanced-${rev}";
 
     src = fetchgit {
       inherit rev;
       url = "https://github.com/Pylons/substanced.git";
-      sha256 = "eded6468563328af37a07aeb88ef81ed78ccaff2ab687cac34ad2b36e19abcb4";
+      sha256 = "17s7sdvydw9a9d2d36c70lq962ryny3dv9nzdxqpfvwiry9iy3jx";
     };
 
     buildInputs = [ mock ];
@@ -2655,11 +2717,10 @@ rec {
     propagatedBuildInputs = [
       pyramid
       pytz
-      zodb3
+      zodb
       venusian
       colander
-      deform
-      deform_bootstrap
+      deform2
       python_magic
       pyyaml
       cryptacular
@@ -2670,6 +2731,8 @@ rec {
       statsd
       pyramid_zodbconn
       pyramid_mailer
+      pyramid_chameleon
+      ZEO
     ];
 
     meta = with stdenv.lib; {
@@ -8107,11 +8170,11 @@ rec {
 
   transaction = buildPythonPackage rec {
     name = "transaction-${version}";
-    version = "1.4.0";
+    version = "1.4.3";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/t/transaction/${name}.tar.gz";
-      md5 = "b7c2ff135939f605a8c54e1c13cd5d66";
+      md5 = "b4ca5983c9e3a0808ff5ff7648092c76";
     };
 
     propagatedBuildInputs = [ zope_interface ];
@@ -8727,14 +8790,17 @@ rec {
 
   zdaemon = buildPythonPackage rec {
     name = "zdaemon-${version}";
-    version = "3.0.5";
+    version = "4.0.0";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/z/zdaemon/${name}.tar.gz";
-      md5 = "975f770544bb4352c5cf32fec22e63c9";
+      md5 = "4056e2ea35855695ed15389d9c168b92";
     };
 
     propagatedBuildInputs  = [ zconfig ];
+    
+    # too many deps..
+    doCheck = false;
 
     meta = {
       description = "A daemon process control library and tools for Unix-based systems";
@@ -8774,7 +8840,6 @@ rec {
     };
   });
 
-
   zodb3 = buildPythonPackage rec {
     name = "zodb3-${version}";
     version = "3.10.5";
@@ -8793,6 +8858,81 @@ rec {
       maintainers = [ stdenv.lib.maintainers.goibhniu ];
     };
   };
+  
+  zodb = buildPythonPackage rec {
+    name = "zodb-${version}";
+    version = "4.0.1";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/Z/ZODB/ZODB-${version}.tar.gz";
+      md5 = "092d787524b095164231742c96b32f50";
+    };
+
+    propagatedBuildInputs = [ manuel transaction zc_lockfile zconfig zdaemon zope_interface persistent BTrees ]
+      ++ optionals isPy3k [ zodbpickle ];
+
+    preCheck = if isPy3k then ''
+      # test failure on py3.4
+      rm src/ZODB/tests/testDB.py
+    '' else "";
+    
+    meta = {
+      description = "An object-oriented database for Python";
+      homepage = http://pypi.python.org/pypi/ZODB;
+      license = "ZPL";
+      maintainers = [ stdenv.lib.maintainers.goibhniu ];
+    };
+  };
+  
+  zodbpickle = pythonPackages.buildPythonPackage rec {
+    name = "zodbpickle-0.5.2";
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/z/zodbpickle/${name}.tar.gz";
+      md5 = "d401bd89f99ec8d56c22493e6f8c0443";
+    };
+    
+    # fails..
+    doCheck = false;
+
+    meta = with stdenv.lib; {
+      homepage = http://pypi.python.org/pypi/zodbpickle;
+    };
+  };
+
+  
+  BTrees = pythonPackages.buildPythonPackage rec {
+    name = "BTrees-4.0.8";
+
+    propagatedBuildInputs = [ persistent zope_interface transaction ];
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/B/BTrees/${name}.tar.gz";
+      md5 = "7f5df4cf8dd50fb0c584c0929a406c92";
+    };
+
+    meta = with stdenv.lib; {
+      description = "scalable persistent components";
+      homepage = http://packages.python.org/BTrees;
+    };
+  };
+
+  
+  persistent = pythonPackages.buildPythonPackage rec {
+    name = "persistent-4.0.8";
+
+    propagatedBuildInputs = [ zope_interface ];
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/p/persistent/${name}.tar.gz";
+      md5 = "2942f1ca7764b1bef8d48fa0d9a236b7";
+    };
+
+    meta = with stdenv.lib; {
+      description = "automatic persistence for Python objects";
+      homepage = http://www.zope.org/Products/ZODB;
+    };
+  };
 
 
   zope_broken = buildPythonPackage rec {

From 41b75fc4d457f833bbf7261c0c2aff0db0d94738 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Mon, 25 Aug 2014 12:05:23 +0100
Subject: [PATCH 0538/1453] haskellPackages.websockets: Don't jailbreak

The maintainer is active on Hackage, and will benefit from bug reports
on build failure. It currently builds without needing to jailbreak.
---
 pkgs/development/libraries/haskell/websockets/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/websockets/default.nix b/pkgs/development/libraries/haskell/websockets/default.nix
index c74fad5f1a82..5db1ec416139 100644
--- a/pkgs/development/libraries/haskell/websockets/default.nix
+++ b/pkgs/development/libraries/haskell/websockets/default.nix
@@ -19,7 +19,6 @@ cabal.mkDerivation (self: {
     entropy HUnit ioStreams mtl network QuickCheck random SHA
     testFramework testFrameworkHunit testFrameworkQuickcheck2 text
   ];
-  jailbreak = true;
   meta = {
     homepage = "http://jaspervdj.be/websockets";
     description = "A sensible and clean way to write WebSocket-capable servers in Haskell";

From e7b2e13ff4205ece1a4c5655c8bb101b694cb63b Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Mon, 25 Aug 2014 12:47:57 +0100
Subject: [PATCH 0539/1453] haskellPackages.wreq: Patch to work with lens >=
 4.4

---
 pkgs/development/libraries/haskell/wreq/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/wreq/default.nix b/pkgs/development/libraries/haskell/wreq/default.nix
index 62fa1d2abf81..5547140189d3 100644
--- a/pkgs/development/libraries/haskell/wreq/default.nix
+++ b/pkgs/development/libraries/haskell/wreq/default.nix
@@ -3,6 +3,7 @@
 { cabal, aeson, attoparsec, doctest, exceptions, filepath
 , httpClient, httpClientTls, httpTypes, HUnit, lens, mimeTypes
 , temporary, testFramework, testFrameworkHunit, text, time
+, fetchpatch
 }:
 
 cabal.mkDerivation (self: {
@@ -24,9 +25,11 @@ cabal.mkDerivation (self: {
     homepage = "http://www.serpentine.com/wreq";
     description = "An easy-to-use HTTP client library";
     license = self.stdenv.lib.licenses.bsd3;
-    broken = true;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
     platforms = self.ghc.meta.platforms;
     maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
   };
+  patches = [
+    (fetchpatch { url = https://github.com/bos/wreq/commit/e8e29b62006e39ab36ffbb1d18c3e9d5923158ac.patch; sha256 = "19kqy512sa4dbzqp7kmjpsnsmc63wqh5pkh6hcvkzsji15dmlqrg"; })
+    (fetchpatch { url = https://github.com/bos/wreq/pull/20.patch; sha256 = "1qfjwz5wlmmfcg8jy0yg7ixacq5fai3yscm552fba1ph66acyvg4"; })
+  ];
 })

From 3be7d4b4782430c4f9d7299944b39c6eb6881042 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Mon, 21 Jul 2014 11:24:40 +0200
Subject: [PATCH 0540/1453] idris-mode: upgrade to 0.9.14

---
 pkgs/applications/editors/emacs-modes/idris/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/idris/default.nix b/pkgs/applications/editors/emacs-modes/idris/default.nix
index 28375dcb68df..4e9d1cfd77cd 100644
--- a/pkgs/applications/editors/emacs-modes/idris/default.nix
+++ b/pkgs/applications/editors/emacs-modes/idris/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "idris-mode";
-  version = "0.9.13.1";
+  version = "0.9.14";
 
   src = fetchurl {
     url = "https://github.com/idris-hackers/${pname}/archive/${version}.tar.gz";
-    sha256 = "0ymjbkwsq7qra691wyldw91xcdgrbx3468vvrha5jj92v7nwb8wx";
+    sha256 = "1qlkbf14mcibp6h5r84fp5xdjspyaw1xdmnkmaxbypwjhhjg4s83";
   };
 
   buildInputs = [ emacs ];

From fb2449c0269ba168728e77879c08f073a255a41e Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Mon, 28 Jul 2014 11:07:38 +0200
Subject: [PATCH 0541/1453] add emacs color-theme solarized

---
 .../color-theme-solarized/default.nix         | 32 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix b/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix
new file mode 100644
index 000000000000..35f9bd3ceb2a
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix
@@ -0,0 +1,32 @@
+{stdenv, fetchgit, emacs, colorTheme}:
+
+stdenv.mkDerivation rec {
+  name = "color-theme-6.5.5";
+
+  src = fetchgit {
+    url = https://github.com/sellout/emacs-color-theme-solarized.git;
+    rev = "6a2c7ca0181585858e6e8054cb99db837e2ef72f";
+    sha256 = "3c46a3d66c75ec4456209eeafdb03282148b289b12e8474f6a8962f3894796e8";
+  };
+
+  buildInputs = [ emacs ];
+  propagatedUserEnvPkgs = [ colorTheme ];
+
+
+  buildPhase = ''
+    emacs -L . -L ${colorTheme}/share/emacs/site-lisp --batch -f batch-byte-compile *.el
+  '';
+
+  installPhase = ''
+    mkdir -p $out/share/emacs/site-lisp
+    install *.el* $out/share/emacs/site-lisp
+  '';
+
+  meta = {
+    description = "Precision colors for machines and people";
+    homepage = http://ethanschoonover.com/solarized;
+    license = stdenv.lib.licenses.mit;
+
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3bf99d48c3e7..23ffba7bdcf0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8508,6 +8508,8 @@ let
 
     colorTheme = callPackage ../applications/editors/emacs-modes/color-theme { };
 
+    colorThemeSolarized = callPackage ../applications/editors/emacs-modes/color-theme-solarized { };
+
     cryptol = callPackage ../applications/editors/emacs-modes/cryptol { };
 
     cua = callPackage ../applications/editors/emacs-modes/cua { };

From feeca09ecfb89acf6eaae99f7de6b5cd6daa7c28 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Tue, 19 Aug 2014 18:43:37 +0200
Subject: [PATCH 0542/1453] eaglemode: upgrade to 0.85.0

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

diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix
index b9c8acb0d070..ea9383a6e10f 100644
--- a/pkgs/applications/misc/eaglemode/default.nix
+++ b/pkgs/applications/misc/eaglemode/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, libX11, libjpeg, libpng, libtiff, pkgconfig,
 librsvg, glib, gtk, libXext, libXxf86vm, poppler }:
 
-stdenv.mkDerivation {
-  name = "eaglemode-0.84.0";
+stdenv.mkDerivation rec {
+  name = "eaglemode-0.85.0";
 
   src = fetchurl {
-    url = mirror://sourceforge/eaglemode/eaglemode-0.84.0.tar.bz2;
-    sha256 = "0n20b419j0l7h7jr4s3f3n09ka0ysg9nqs8mcwsrx24rcq7nv0cs";
+    url = "mirror://sourceforge/eaglemode/${name}.tar.bz2";
+    sha256 = "0mz4rg2k36wvcv55dg0a5znaczpl5h4gwkkb34syj89xk8jlbwsc";
   };
 
   buildInputs = [ perl libX11 libjpeg libpng libtiff pkgconfig

From 0e1ed7bbc94b2af0a4d9cb3e39180c0bb9caec2c Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Mon, 25 Aug 2014 08:11:13 +0200
Subject: [PATCH 0543/1453] fix js2-mode revision

---
 pkgs/applications/editors/emacs-modes/js2/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/emacs-modes/js2/default.nix b/pkgs/applications/editors/emacs-modes/js2/default.nix
index 47e62a281fb0..00123bfc8c75 100644
--- a/pkgs/applications/editors/emacs-modes/js2/default.nix
+++ b/pkgs/applications/editors/emacs-modes/js2/default.nix
@@ -5,7 +5,8 @@ stdenv.mkDerivation {
 
   src = fetchgit {
     url = "git://github.com/mooz/js2-mode.git";
-    sha256 = "dbdc07b864a9506a21af445c7fb1c75fbffadaac980ee7bbf752470d8054bd65";
+    rev = "b250efaad886dd07b8c69d4573425d095c6652e2";
+    sha256 = "30e61e7d364e9175d408bdaf57fda886a4eea22cf5cbd97abb5c307c52b05918";
   };
 
   buildInputs = [ emacs ];

From 4b058a204d7466faf2aae5606753ce33416a3cac Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Mon, 25 Aug 2014 13:53:53 +0200
Subject: [PATCH 0544/1453] remove obsolete haskell-parsers-0.10

---
 .../libraries/haskell/parsers/0.10.3.nix      | 22 -------------------
 .../parsers/{0.12.1.nix => default.nix}       |  0
 pkgs/top-level/haskell-packages.nix           |  4 +---
 3 files changed, 1 insertion(+), 25 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/parsers/0.10.3.nix
 rename pkgs/development/libraries/haskell/parsers/{0.12.1.nix => default.nix} (100%)

diff --git a/pkgs/development/libraries/haskell/parsers/0.10.3.nix b/pkgs/development/libraries/haskell/parsers/0.10.3.nix
deleted file mode 100644
index 1da7380f252c..000000000000
--- a/pkgs/development/libraries/haskell/parsers/0.10.3.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, charset, doctest, filepath, parsec, text, transformers
-, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "parsers";
-  version = "0.10.3";
-  sha256 = "1s9n59q77h0w1csq7yh945b53847a9hnpvviashgxyi7ahvw7jli";
-  buildDepends = [
-    charset parsec text transformers unorderedContainers
-  ];
-  testDepends = [ doctest filepath ];
-  meta = {
-    homepage = "http://github.com/ekmett/parsers/";
-    description = "Parsing combinators";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/parsers/0.12.1.nix b/pkgs/development/libraries/haskell/parsers/default.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/parsers/0.12.1.nix
rename to pkgs/development/libraries/haskell/parsers/default.nix
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 6954fabee6d0..a2340779a9bd 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1817,9 +1817,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   parsec_3_1_5   = callPackage ../development/libraries/haskell/parsec/3.1.5.nix {};
   parsec = self.parsec_3_1_5;
 
-  parsers_0_10_3 = callPackage ../development/libraries/haskell/parsers/0.10.3.nix {};
-  parsers_0_12_1 = callPackage ../development/libraries/haskell/parsers/0.12.1.nix {};
-  parsers = self.parsers_0_12_1;
+  parsers = callPackage ../development/libraries/haskell/parsers {};
 
   parsimony = callPackage ../development/libraries/haskell/parsimony {};
 

From fb60478492de8fbf1a05701e96cc5578e37ccbab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 25 Aug 2014 14:00:31 +0200
Subject: [PATCH 0545/1453] pythonPackages.zodb3: 3.10.5 -> 3.11.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 352d58f459aa..eceacacbd528 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8842,14 +8842,14 @@ rec {
 
   zodb3 = buildPythonPackage rec {
     name = "zodb3-${version}";
-    version = "3.10.5";
+    version = "3.11.0";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/Z/ZODB3/ZODB3-${version}.tar.gz";
-      md5 = "6f180c6897a1820948fee2a6290503cd";
+      md5 = "21975c1609296e7834e8cf4025af3039";
     };
 
-    propagatedBuildInputs = [ manuel transaction zc_lockfile zconfig zdaemon zope_interface zope_event ];
+    propagatedBuildInputs = [ manuel transaction zc_lockfile zconfig zdaemon zope_interface zope_event BTrees persistent ZEO ];
 
     meta = {
       description = "An object-oriented database for Python";

From 6bda0b00e0bfc971162ffdc1900d64eddcdd425c Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Aug 2014 07:19:55 -0500
Subject: [PATCH 0546/1453] atftp: new expression for version 0.7.1

---
 pkgs/tools/networking/atftp/default.nix | 76 +++++++------------------
 1 file changed, 22 insertions(+), 54 deletions(-)

diff --git a/pkgs/tools/networking/atftp/default.nix b/pkgs/tools/networking/atftp/default.nix
index 225c3c04f7a4..acd71ea893df 100644
--- a/pkgs/tools/networking/atftp/default.nix
+++ b/pkgs/tools/networking/atftp/default.nix
@@ -1,59 +1,27 @@
-x@{builderDefsPackage
-  , readline, tcp_wrappers, pcre, runCommand
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
+{ stdenv, fetchurl, pcre, readline }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="atftp";
-    version="0.7";
-    name="${baseName}-${version}";
-    url="mirror://debian/pool/main/a/atftp/atftp_${version}.dfsg.orig.tar.gz";
-    hash="0nd5dl14d6z5abgcbxcn41rfn3syza6s57bbgh4aq3r9cxdmz08q";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+stdenv.mkDerivation {
+  name = "atftp-0.7.1";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/atftp/atftp-0.7.1.tar.gz";
+    sha256 = "0bgr31gbnr3qx4ixf8hz47l58sh3367xhcnfqd8233fvr84nyk5f";
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
+  buildInputs = [ pcre readline ];
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doPatch" "doConfigure" "doMakeInstall"];
-      
-  debianPatchGz = a.fetchurl {
-    url = ftp://ftp.ru.debian.org/pub/debian/pool/main/a/atftp/atftp_0.7.dfsg-11.diff.gz;
-    sha256 = "07g4qbmp0lnscg2dkj6nsj657jaghibvfysdm1cdxcn215n3zwqd";
+  NIX_LDFLAGS = "-lgcc_s"; # for pthread_cancel
+
+  configureFlags = [
+    "--enable-libreadline"
+    "--enable-libpcre"
+    "--enable-mtftp"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Advanced TFTP server and client";
+    homepage = http://sourceforge.net/projects/atftp/;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
   };
-
-  debianPatch = a.runCommand "atftp-0.7.dfsg-11" {} ''
-    gunzip < "${debianPatchGz}" > "$out"
-  '';
-
-  patches = [debianPatch];
-
-  meta = {
-    description = "Advanced tftp tools";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    license = a.lib.licenses.gpl2Plus;
-  };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://packages.debian.org/source/sid/atftp";
-    };
-  };
-}) x
-
+}

From e9f605d7e60d27b8fcd773ef8d2a6d35be6c9d25 Mon Sep 17 00:00:00 2001
From: Andraz Brodnik <brodul@brodul.org>
Date: Mon, 25 Aug 2014 12:17:56 +0200
Subject: [PATCH 0547/1453] Add apscheduler python package.

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index eceacacbd528..6141f83978ca 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -438,6 +438,24 @@ rec {
   };
 
 
+  apscheduler = buildPythonPackage rec {
+    name = "APScheduler-2.1.2";
+
+    propagatedBuildInputs = with pythonPackages; [ futures tzlocal six pytest mock];
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/A/APScheduler/APScheduler-2.1.2.tar.gz";
+      md5 = "6862959d460c16ef325d63e1fc3a6684";
+    };
+
+    meta = with pkgs.stdenv.lib; {
+      description = "Advanced Python Scheduler (APScheduler) is a Python library that lets you schedule your Python code to be executed";
+      homepage = http://pypi.python.org/pypi/APScheduler/;
+      license = licenses.mit;
+    };
+  };
+
+
   area53 = buildPythonPackage (rec {
     name = "area53-b2c9cdcabd";
 

From e511e05960993138f145f5ffa37da666ddbf5749 Mon Sep 17 00:00:00 2001
From: Andraz Brodnik <brodul@brodul.org>
Date: Mon, 25 Aug 2014 12:21:33 +0200
Subject: [PATCH 0548/1453] Add facebook-sdk python package.

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6141f83978ca..11ff371cc3f4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2011,6 +2011,21 @@ rec {
     };
   };
 
+  facebook-sdk = buildPythonPackage rec {
+    name = "facebook-sdk-0.4.0";
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/f/facebook-sdk/facebook-sdk-0.4.0.tar.gz";
+      md5 = "ac9f38e197e54b8ba9f3a61988cc33b7";
+    };
+
+    meta = with pkgs.stdenv.lib; {
+      description = "Client library that supports the Facebook Graph API and the official Facebook JavaScript SDK.";
+      homepage = https://github.com/pythonforfacebook/facebook-sdk;
+      license = licenses.asl20 ;
+    };
+  };
+
   faker = buildPythonPackage rec {
     name = "faker-0.0.4";
     src = fetchurl {

From a5396d58bb602f911975a8846b5a85b56caca11b Mon Sep 17 00:00:00 2001
From: Andraz Brodnik <brodul@brodul.org>
Date: Mon, 25 Aug 2014 12:21:48 +0200
Subject: [PATCH 0549/1453] Add futures python package.

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 11ff371cc3f4..e3403d97d63c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3512,6 +3512,23 @@ rec {
     };
   });
 
+  futures = buildPythonPackage rec {
+    name = "futures-2.1.6";
+
+    propagatedBuildInputs = with pythonPackages; [  ];
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/f/futures/futures-2.1.6.tar.gz";
+      md5 = "cfab9ac3cd55d6c7ddd0546a9f22f453";
+    };
+
+    meta = with pkgs.stdenv.lib; {
+      description = "Backport of the concurrent.futures package from Python 3.2";
+      homepage = http://code.google.com/p/pythonfutures;
+      license = licenses.bsd2;
+    };
+  };
+
   gcovr = buildPythonPackage rec {
     name = "gcovr-2.4";
 

From ce68f5d3096b925ad27730fdd1c057f3a3f1e2cd Mon Sep 17 00:00:00 2001
From: Andraz Brodnik <brodul@brodul.org>
Date: Mon, 25 Aug 2014 12:22:03 +0200
Subject: [PATCH 0550/1453] Add mpd python package.

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e3403d97d63c..dea4d7370f87 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4652,6 +4652,21 @@ rec {
   };
 
 
+  mpd = buildPythonPackage rec {
+    name = "python-mpd-0.3.0";
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/p/python-mpd/python-mpd-0.3.0.tar.gz";
+      md5 = "5b3849b131e2fb12f251434597d65635";
+    };
+
+    meta = with pkgs.stdenv.lib; {
+      description = "An MPD (Music Player Daemon) client library written in pure Python.";
+      homepage = http://jatreuman.indefero.net/p/python-mpd/;
+      license = licenses.gpl3;
+    };
+  };
+
   mrbob = buildPythonPackage rec {
     name = "mrbob-${version}";
     version = "0.1.1";

From 4d472145d15c26840e9203eee6a29e531d89eaa7 Mon Sep 17 00:00:00 2001
From: Andraz Brodnik <brodul@brodul.org>
Date: Mon, 25 Aug 2014 12:22:34 +0200
Subject: [PATCH 0551/1453] Add quantities python package.

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index dea4d7370f87..9c392bc1edf8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6891,6 +6891,21 @@ rec {
   };
 
 
+  quantities = buildPythonPackage rec {
+    name = "quantities-0.10.1";
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/q/quantities/quantities-0.10.1.tar.gz";
+      md5 = "e924e21c0a5ddc9ebcdacbbe511b8ec7";
+    };
+
+    meta = with pkgs.stdenv.lib; {
+      description = "Quantities is designed to handle arithmetic and";
+      homepage = http://packages.python.org/quantities;
+      license = licenses.bsd2;
+    };
+  };
+
   qutip = buildPythonPackage rec {
     name = "qutip-2.2.0";
 

From aa68c94d4da2d0bbcd6ccd647aa91e8f31f0a041 Mon Sep 17 00:00:00 2001
From: Andraz Brodnik <brodul@brodul.org>
Date: Mon, 25 Aug 2014 12:22:57 +0200
Subject: [PATCH 0552/1453] Add semantic python package.

---
 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 9c392bc1edf8..f866c529d723 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7623,6 +7623,26 @@ rec {
     };
   };
 
+  semantic = buildPythonPackage rec {
+    name = "semantic-1.0.3";
+
+    propagatedBuildInputs = with pythonPackages; [ quantities numpy ];
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/s/semantic/semantic-1.0.3.tar.gz";
+      md5 = "78a150190e3e7d0f6f357b4c828e5f0d";
+    };
+
+    # strange setuptools error (can not import semantic.test)
+    doCheck = false;
+
+    meta = with pkgs.stdenv.lib; {
+      description = "Common Natural Language Processing Tasks for Python";
+      homepage = https://github.com/crm416/semantic;
+      license = licenses.mit;
+    };
+  };
+
   sexpdata = buildPythonPackage rec {
     name = "sexpdata-0.0.2";
     src = fetchurl {

From 56edab99097cfe1904a92acc5ec2ded7ba26f834 Mon Sep 17 00:00:00 2001
From: Andraz Brodnik <brodul@brodul.org>
Date: Mon, 25 Aug 2014 12:23:15 +0200
Subject: [PATCH 0553/1453] Add tzlocal python package.

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f866c529d723..26de0d5f46ef 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8399,6 +8399,25 @@ rec {
     };
   };
 
+  tzlocal = buildPythonPackage rec {
+    name = "tzlocal-1.1.1";
+
+    propagatedBuildInputs = with pythonPackages; [ pytz ];
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/t/tzlocal/tzlocal-1.1.1.zip";
+      md5 = "56c2a04501b98f2a1188d003fd6d3dba";
+    };
+
+     # test fail (timezone test fail)
+     doCheck = true;
+
+    meta = with pkgs.stdenv.lib; {
+      description = "Tzinfo object for the local timezone.";
+      homepage = https://github.com/regebro/tzlocal;
+      license = licenses.cddl;
+    };
+  };
 
   unittest2 = buildPythonPackage rec {
     version = "0.5.1";

From 9149d450cfc3adb213eefc125d2acda164126d2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 25 Aug 2014 14:07:08 +0200
Subject: [PATCH 0554/1453] pythonPackages: disable some py3k builds

---
 pkgs/top-level/python-packages.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 26de0d5f46ef..4758deed72bf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2013,6 +2013,8 @@ rec {
 
   facebook-sdk = buildPythonPackage rec {
     name = "facebook-sdk-0.4.0";
+    
+    disabled = isPy3k;
 
     src = fetchurl {
       url = "https://pypi.python.org/packages/source/f/facebook-sdk/facebook-sdk-0.4.0.tar.gz";
@@ -4655,6 +4657,8 @@ rec {
   mpd = buildPythonPackage rec {
     name = "python-mpd-0.3.0";
 
+    disabled = isPy3k;
+    
     src = fetchurl {
       url = "https://pypi.python.org/packages/source/p/python-mpd/python-mpd-0.3.0.tar.gz";
       md5 = "5b3849b131e2fb12f251434597d65635";
@@ -7625,8 +7629,10 @@ rec {
 
   semantic = buildPythonPackage rec {
     name = "semantic-1.0.3";
+    
+    disabled = isPy3k;
 
-    propagatedBuildInputs = with pythonPackages; [ quantities numpy ];
+    propagatedBuildInputs = [ quantities numpy ];
 
     src = fetchurl {
       url = "https://pypi.python.org/packages/source/s/semantic/semantic-1.0.3.tar.gz";
@@ -8410,7 +8416,7 @@ rec {
     };
 
      # test fail (timezone test fail)
-     doCheck = true;
+     doCheck = false;
 
     meta = with pkgs.stdenv.lib; {
       description = "Tzinfo object for the local timezone.";

From 3f971fe45ff0cb677c5375833afc7eebb43ac60b Mon Sep 17 00:00:00 2001
From: Jaka Kranjc <smgl+nix@lynxlynx.info>
Date: Sun, 24 Aug 2014 16:50:59 +0200
Subject: [PATCH 0555/1453] gemrb: added more meta tags + general maintenance

---
 pkgs/games/gemrb/default.nix | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/gemrb/default.nix b/pkgs/games/gemrb/default.nix
index 31e8ae05d006..31fdb881d0e2 100644
--- a/pkgs/games/gemrb/default.nix
+++ b/pkgs/games/gemrb/default.nix
@@ -11,6 +11,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ cmake python openal SDL zlib libpng libvorbis ];
+  # TODO: make libpng, libvorbis, sdl_mixer, freetype, vlc, glew (and other gl reqs) optional
 
   # Necessary to find libdl.
   CMAKE_LIBRARY_PATH = "${stdenv.gcc.libc}/lib";
@@ -18,8 +19,19 @@ stdenv.mkDerivation rec {
   # Can't have -werror because of the Vorbis header files.
   cmakeFlags = "-DDISABLE_WERROR=ON -DCMAKE_VERBOSE_MAKEFILE=ON";
 
-  meta = {
+  # upstream prefers some symbols to remain
+  dontStrip = true;
+
+  meta = with stdenv.lib; {
     description = "A reimplementation of the Infinity Engine, used by games such as Baldur's Gate";
-    homepage = http://gemrb.sourceforge.net/;
+    longDescription = ''
+      GemRB (Game engine made with pre-Rendered Background) is a portable open-source implementation of
+      Bioware's Infinity Engine. It was written to support pseudo-3D role playing games based on the
+      Dungeons & Dragons ruleset (Baldur's Gate and Icewind Dale series, Planescape: Torment).
+    '';
+    homepage = http://gemrb.org/;
+    license = licenses.gpl2;
+    platforms = stdenv.lib.platforms.all;
+    hydraPlatforms = [];
   };
 }

From 310a5d09a464ad1a5a23499ef4050800e919a624 Mon Sep 17 00:00:00 2001
From: Jaka Kranjc <smgl+nix@lynxlynx.info>
Date: Sun, 24 Aug 2014 17:05:02 +0200
Subject: [PATCH 0556/1453] gemrb: bumped to 0.8.1

---
 pkgs/games/gemrb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/gemrb/default.nix b/pkgs/games/gemrb/default.nix
index 31fdb881d0e2..dc89e405e24e 100644
--- a/pkgs/games/gemrb/default.nix
+++ b/pkgs/games/gemrb/default.nix
@@ -3,11 +3,11 @@
 assert stdenv.gcc.libc != null;
 
 stdenv.mkDerivation rec {
-  name = "gemrb-0.8.0.1";
+  name = "gemrb-0.8.1";
   
   src = fetchurl {
     url = "mirror://sourceforge/gemrb/${name}.tar.gz";
-    sha256 = "0v9iypls4iawnfkc91hcdnmc4vyg3ix7v7lmw3knv73q145v0ksd";
+    sha256 = "1g68pc0x4azy6zm5y7813g0qky96q796si9v3vafiy7sa8ph49kl";
   };
 
   buildInputs = [ cmake python openal SDL zlib libpng libvorbis ];

From e13002194014d5f9d8f6b02b337b4f612248e42b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 25 Aug 2014 14:16:35 +0200
Subject: [PATCH 0557/1453] python3Packages.fabric: 1.6.1 -> 1.9.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4758deed72bf..67edc8f8d2b1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2060,11 +2060,13 @@ rec {
   };
 
   fabric = buildPythonPackage rec {
-    name = "fabric-1.6.1";
+    name = "fabric-${version}";
+    version = "1.9.1";
     src = fetchurl {
-      url = https://pypi.python.org/packages/source/F/Fabric/Fabric-1.6.1.tar.gz;
-      sha256 = "058psbhqbfm3n214wkyfpgm069yqmdqw1hql9bac1yv9pza3bzx1";
+      url = "https://pypi.python.org/packages/source/F/Fabric/Fabric-${version}.tar.gz";
+      sha256 = "103mzf0l15kyvw5nmf7bsdrqg6y3wpyxmkyl2h9lk7jxb5gdc9s1";
     };
+    disabled = isPy3k;
     propagatedBuildInputs = [ paramiko pycrypto ];
     buildInputs = [ fudge nose ];
   };

From 8cfd9b1acd774276f012d72fc1c3b30b09cf0285 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 25 Aug 2014 14:22:54 +0200
Subject: [PATCH 0558/1453] pythonPackages.gevent: 0.13.8 -> 1.0.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 67edc8f8d2b1..23b5e9522e51 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3575,14 +3575,15 @@ rec {
   };
 
   gevent = buildPythonPackage rec {
-    name = "gevent-0.13.8";
-
+    name = "gevent-1.0.1";
+    disabled = isPy3k;
+    
     src = fetchurl {
       url = "https://pypi.python.org/packages/source/g/gevent/${name}.tar.gz";
-      sha256 = "0plmxnb53qbxxf6macq84dvclsiyrpv3xrm32q4qqh6f01ix5f2l";
+      sha256 = "0hyzfb0gcx9pm5c2igan8y57hqy2wixrwvdjwsaivxsqs0ay49s6";
     };
 
-    buildInputs = [ pkgs.libevent ];
+    buildInputs = [ pkgs.libev ];
     propagatedBuildInputs = [ greenlet ];
 
     meta = with stdenv.lib; {

From b1ce3cc1729fad3cc41066547d7fd502770623b2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 25 Aug 2014 14:33:17 +0200
Subject: [PATCH 0559/1453] Manual: Handle XML files in subdirectories

---
 lib/sources.nix              |  6 +++---
 nixos/doc/manual/default.nix | 26 +++++++++++++++-----------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/lib/sources.nix b/lib/sources.nix
index a80e4397d6a4..4ed16d65d2b7 100644
--- a/lib/sources.nix
+++ b/lib/sources.nix
@@ -21,12 +21,12 @@ rec {
 
 
   # Get all files ending with the specified suffices from the given
-  # directory.  E.g. `sourceFilesBySuffices ./dir [".xml" ".c"]'.
+  # directory or its descendants.  E.g. `sourceFilesBySuffices ./dir
+  # [".xml" ".c"]'.
   sourceFilesBySuffices = path: exts:
     let filter = name: type:
       let base = baseNameOf (toString name);
-      in type != "directory" && lib.any (ext: lib.hasSuffix ext base) exts;
+      in type == "directory" || lib.any (ext: lib.hasSuffix ext base) exts;
     in builtins.filterSource filter path;
 
-
 }
diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix
index 55533a05b066..df524c3faaca 100644
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@@ -36,13 +36,22 @@ let
       -o $out ${./options-to-docbook.xsl} ${optionsXML}
   '';
 
+  sources = sourceFilesBySuffices ./. [".xml"];
+
+  copySources =
+    ''
+      cp -prd $sources/* . # */
+      ln -s ${optionsDocBook} options-db.xml
+      echo "${version}" > version
+    '';
+
 in rec {
 
   # Generate the NixOS manual.
   manual = stdenv.mkDerivation {
     name = "nixos-manual";
 
-    sources = sourceFilesBySuffices ./. [".xml"];
+    inherit sources;
 
     buildInputs = [ libxml2 libxslt ];
 
@@ -57,9 +66,7 @@ in rec {
     '';
 
     buildCommand = ''
-      ln -s $sources/*.xml . # */
-      ln -s ${optionsDocBook} options-db.xml
-      echo "${version}" > version
+      ${copySources}
 
       # Check the validity of the manual sources.
       xmllint --noout --nonet --xinclude --noxincludenode \
@@ -90,7 +97,7 @@ in rec {
   manualPDF = stdenv.mkDerivation {
     name = "nixos-manual-pdf";
 
-    sources = sourceFilesBySuffices ./. [".xml"];
+    inherit sources;
 
     buildInputs = [ libxml2 libxslt dblatex tetex ];
 
@@ -98,9 +105,7 @@ in rec {
       # TeX needs a writable font cache.
       export VARTEXFONTS=$TMPDIR/texfonts
 
-      ln -s $sources/*.xml . # */
-      ln -s ${optionsDocBook} options-db.xml
-      echo "${version}" > version
+      ${copySources}
 
       dst=$out/share/doc/nixos
       mkdir -p $dst
@@ -117,13 +122,12 @@ in rec {
   manpages = stdenv.mkDerivation {
     name = "nixos-manpages";
 
-    sources = sourceFilesBySuffices ./. [".xml"];
+    inherit sources;
 
     buildInputs = [ libxml2 libxslt ];
 
     buildCommand = ''
-      ln -s $sources/*.xml . # */
-      ln -s ${optionsDocBook} options-db.xml
+      ${copySources}
 
       # Check the validity of the manual sources.
       xmllint --noout --nonet --xinclude --noxincludenode \

From d2539605e1545428c404ddaa73265b30988c044b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 25 Aug 2014 14:35:08 +0200
Subject: [PATCH 0560/1453] Remove reference to icecat

---
 nixos/modules/config/system-path.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix
index 6b4c38172e95..83c14e45685b 100644
--- a/nixos/modules/config/system-path.nix
+++ b/nixos/modules/config/system-path.nix
@@ -63,7 +63,7 @@ in
       systemPackages = mkOption {
         type = types.listOf types.path;
         default = [];
-        example = "[ pkgs.icecat3 pkgs.thunderbird ]";
+        example = "[ pkgs.firefox pkgs.thunderbird ]";
         description = ''
           The set of packages that appear in
           /run/current-system/sw.  These packages are

From 8c7898655361b5b5fd0a78f6d8f3407157195078 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Mon, 25 Aug 2014 14:40:40 +0200
Subject: [PATCH 0561/1453] Some pkgs.lib -> lib fixes

---
 nixos/modules/services/hardware/tcsd.nix           | 4 ++--
 nixos/modules/services/monitoring/riemann-dash.nix | 4 ++--
 nixos/modules/services/monitoring/riemann.nix      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/hardware/tcsd.nix b/nixos/modules/services/hardware/tcsd.nix
index 26b2c884b8f1..d7f6c188feb8 100644
--- a/nixos/modules/services/hardware/tcsd.nix
+++ b/nixos/modules/services/hardware/tcsd.nix
@@ -1,8 +1,8 @@
 # tcsd daemon.
 
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
-with pkgs.lib;
+with lib;
 let
 
   cfg = config.services.tcsd;
diff --git a/nixos/modules/services/monitoring/riemann-dash.nix b/nixos/modules/services/monitoring/riemann-dash.nix
index f647b92f9149..148dc0468059 100644
--- a/nixos/modules/services/monitoring/riemann-dash.nix
+++ b/nixos/modules/services/monitoring/riemann-dash.nix
@@ -1,7 +1,7 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
 with pkgs;
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/monitoring/riemann.nix b/nixos/modules/services/monitoring/riemann.nix
index e8d32af1b830..a1935c29a043 100644
--- a/nixos/modules/services/monitoring/riemann.nix
+++ b/nixos/modules/services/monitoring/riemann.nix
@@ -1,7 +1,7 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
 with pkgs;
-with pkgs.lib;
+with lib;
 
 let
 

From 963b97088fb8451c53485577873c40e067a0554d Mon Sep 17 00:00:00 2001
From: William Roe <willroe@gmail.com>
Date: Tue, 29 Jul 2014 14:10:25 +0100
Subject: [PATCH 0562/1453] Logstash-forwarder requires Go-1.1/1.2

The SSL stuff in it doesn't work right with Go 1.3 yet.
1.2 doesn't have a derivation for darwin, so go 1.1 should work for
everyone
---
 pkgs/tools/misc/logstash-forwarder/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/logstash-forwarder/default.nix b/pkgs/tools/misc/logstash-forwarder/default.nix
index 52180c75c981..4edaed35f649 100644
--- a/pkgs/tools/misc/logstash-forwarder/default.nix
+++ b/pkgs/tools/misc/logstash-forwarder/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, go }:
+{ stdenv, fetchgit, go_1_1 }:
 stdenv.mkDerivation {
   name = "logstash-forwarder-20140410";
   src = fetchgit {
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
     rev = "ec504792108ab6536b45bcf6dff6d26a6b56fef3";
     sha256 = "309545ceaec171bee997cad260bef1433e041b9f3bfe617d475bcf79924f943d";
   };
-  buildInputs = [ go ];
+  buildInputs = [ go_1_1 ];
   installPhase = ''
     mkdir -p $out/bin
     cp build/bin/logstash-forwarder $out/bin

From 8b98d7dc08d37a6a64d67bd3378f755d8289cb21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 25 Aug 2014 14:50:25 +0200
Subject: [PATCH 0563/1453] logstash_forwarder: specify platforms

---
 pkgs/tools/misc/logstash-forwarder/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/misc/logstash-forwarder/default.nix b/pkgs/tools/misc/logstash-forwarder/default.nix
index 4edaed35f649..961dbc083352 100644
--- a/pkgs/tools/misc/logstash-forwarder/default.nix
+++ b/pkgs/tools/misc/logstash-forwarder/default.nix
@@ -15,5 +15,6 @@ stdenv.mkDerivation {
   meta = {
     license = stdenv.lib.licenses.asl20;
     homepage = https://github.com/elasticsearch/logstash-forwarder;
+    platforms = stdenv.lib.platforms.linux;
   };
 }

From c3f730d185c59325f2da9191f53254a28a18d1df Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 23 Aug 2014 15:11:37 -0700
Subject: [PATCH 0564/1453] libnftnl: Add derivation

---
 .../libraries/libnftnl/default.nix            | 20 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/libraries/libnftnl/default.nix

diff --git a/pkgs/development/libraries/libnftnl/default.nix b/pkgs/development/libraries/libnftnl/default.nix
new file mode 100644
index 000000000000..cb1e83467424
--- /dev/null
+++ b/pkgs/development/libraries/libnftnl/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pkgconfig, libmnl }:
+
+stdenv.mkDerivation rec {
+  name = "libnftnl-1.0.2";
+
+  src = fetchurl {
+    url = "netfilter.org/projects/libnftnl/files/${name}.tar.bz2";
+    sha256 = "1p268cv85l4ipd1p9ipjdrfgba14cblp01apv7wc44zmwfr2gkkq";
+  };
+
+  buildInputs = [ pkgconfig libmnl ];
+
+  meta = with stdenv.lib; {
+    description = "a userspace library providing a low-level netlink API to the in-kernel nf_tables subsystem";
+    homepage = http://netfilter.org/projects/libnftnl;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ wkennington ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 23ffba7bdcf0..11658e22d907 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5448,6 +5448,8 @@ let
 
   libnfnetlink = callPackage ../development/libraries/libnfnetlink { };
 
+  libnftnl = callPackage ../development/libraries/libnftnl { };
+
   libnih = callPackage ../development/libraries/libnih { };
 
   libnova = callPackage ../development/libraries/libnova { };

From c063a8d9a52d6dc7001db71fead698f88b29f4ca Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 23 Aug 2014 16:15:51 -0700
Subject: [PATCH 0565/1453] docbook2x: Add platforms so that it builds on hydra

---
 pkgs/tools/typesetting/docbook2x/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/typesetting/docbook2x/default.nix b/pkgs/tools/typesetting/docbook2x/default.nix
index 78dac0c6aa4e..b31c64e6936a 100644
--- a/pkgs/tools/typesetting/docbook2x/default.nix
+++ b/pkgs/tools/typesetting/docbook2x/default.nix
@@ -46,13 +46,14 @@ stdenv.mkDerivation rec {
       "${gnused}/bin"
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     longDescription = ''
       docbook2X is a software package that converts DocBook documents
       into the traditional Unix man page format and the GNU Texinfo
       format.
     '';
-    license = stdenv.lib.licenses.mit;
+    license = licenses.mit;
     homepage = http://docbook2x.sourceforge.net/;
+    platforms = platforms.all;
   };
 }

From 39b1e2fffc60f6603d8b0daa9f1dd55960311c49 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 23 Aug 2014 16:16:06 -0700
Subject: [PATCH 0566/1453] nftables: Add derivation

---
 pkgs/os-specific/linux/nftables/default.nix | 28 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/os-specific/linux/nftables/default.nix

diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix
new file mode 100644
index 000000000000..e8dd56ab9e26
--- /dev/null
+++ b/pkgs/os-specific/linux/nftables/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, docbook2x, docbook_xml_dtd_45
+, flex, bison, libmnl, libnftnl, gmp, readline }:
+
+stdenv.mkDerivation rec {
+  name = "nftables-0.3";
+
+  src = fetchurl {
+    url = "http://netfilter.org/projects/nftables/files/${name}.tar.bz2";
+    sha256 = "0bww48hc424svxfx3fpqxmbmp0n42ahs1f28f5f6g29d8i2jcdsd";
+  };
+
+  configureFlags = [
+    "CONFIG_MAN=y"
+    "DB2MAN=docbook2man"
+  ];
+
+  XML_CATALOG_FILES = "${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml";
+
+  buildInputs = [ docbook2x flex bison libmnl libnftnl gmp readline ];
+
+  meta = with stdenv.lib; {
+    description = "the project that aims to replace the existing {ip,ip6,arp,eb}tables framework";
+    homepage = http://netfilter.org/projects/nftables;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ wkennington ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 11658e22d907..a671f50dc600 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7683,6 +7683,8 @@ let
     libpng = libpng15;
   };
 
+  nftables = callPackage ../os-specific/linux/nftables { };
+
   numactl = callPackage ../os-specific/linux/numactl { };
 
   gocode = callPackage ../development/tools/gocode { };

From f83af95f8a54d0375ac6e159b663de887ba5b6a6 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 25 Aug 2014 15:00:55 +0200
Subject: [PATCH 0567/1453] build-support: Use mktemp -d in nix-prefetch-*.

Instead of relying on $$ to not collide with an existing path.

Quoting the Bash manual about $$:

> Expands to the process ID of the shell. In a () subshell, it expands
> to the process ID of the current shell, not the subshell.

So, this is different from $BASHPID:

> Expands to the process ID of the current bash process. This differs
> from $$ under certain circumstances, such as subshells that do not
> require bash to be re-initialized.

But even $BASHPID is prone to race conditions if the process IDs wrap
around, so to be on the safe side, we're using mktemp here.

Closes #3784.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/build-support/fetchbzr/nix-prefetch-bzr | 7 +++----
 pkgs/build-support/fetchgit/nix-prefetch-git | 8 ++++----
 pkgs/build-support/fetchhg/nix-prefetch-hg   | 7 +++----
 pkgs/build-support/fetchsvn/nix-prefetch-svn | 7 +++----
 4 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/pkgs/build-support/fetchbzr/nix-prefetch-bzr b/pkgs/build-support/fetchbzr/nix-prefetch-bzr
index 2f46819323f2..346c2b05cbdd 100755
--- a/pkgs/build-support/fetchbzr/nix-prefetch-bzr
+++ b/pkgs/build-support/fetchbzr/nix-prefetch-bzr
@@ -43,11 +43,10 @@ fi
 # If we don't know the hash or a path with that hash doesn't exist,
 # download the file and add it to the store.
 if test -z "$finalPath"; then
-    tmpPath=/tmp/bzr-checkout-tmp-$$
-    tmpFile=$tmpPath/$dstFile
-    mkdir $tmpPath
+    tmpPath="$(mktemp --tmpdir -d bzr-checkout-tmp-XXXXXXXX)"
+    trap "rm -rf \"$tmpPath\"" EXIT
 
-    trap "rm -rf $tmpPath" EXIT
+    tmpFile="$tmpPath/$dstFile"
 
     # Perform the checkout.
     bzr -Ossl.cert_reqs=none export $revarg --format=dir "$tmpFile" "$url"
diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git
index b3cd3488735c..0d2536e225c3 100755
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@@ -256,11 +256,11 @@ else
   # download the file and add it to the store.
   if test -z "$finalPath"; then
 
-      tmpPath=/tmp/git-checkout-tmp-$$
-      tmpFile=$tmpPath/git-export
-      mkdir $tmpPath $tmpFile
+      tmpPath="$(mktemp --tmpdir -d git-checkout-tmp-XXXXXXXX)"
+      trap "rm -rf \"$tmpPath\"" EXIT
 
-      trap "rm -rf $tmpPath" EXIT
+      tmpFile="$tmpPath/git-export"
+      mkdir "$tmpFile"
 
       # Perform the checkout.
       clone_user_rev "$tmpFile" "$url" "$rev"
diff --git a/pkgs/build-support/fetchhg/nix-prefetch-hg b/pkgs/build-support/fetchhg/nix-prefetch-hg
index 075dbc9c367b..7d4c0c8d7413 100755
--- a/pkgs/build-support/fetchhg/nix-prefetch-hg
+++ b/pkgs/build-support/fetchhg/nix-prefetch-hg
@@ -35,11 +35,10 @@ fi
 # download the file and add it to the store.
 if test -z "$finalPath"; then
 
-    tmpPath=/tmp/hg-checkout-tmp-$$
-    tmpArchive=$tmpPath/hg-archive
-    mkdir $tmpPath
+    tmpPath="$(mktemp --tmpdir -d hg-checkout-tmp-XXXXXXXX)"
+    trap "rm -rf \"$tmpPath\"" EXIT
 
-    trap "rm -rf $tmpPath" EXIT
+    tmpArchive="$tmpPath/hg-archive"
 
     # Perform the checkout.
     if [[ $url != /* ]]; then
diff --git a/pkgs/build-support/fetchsvn/nix-prefetch-svn b/pkgs/build-support/fetchsvn/nix-prefetch-svn
index a2ee3ac6052f..74de0a14c801 100755
--- a/pkgs/build-support/fetchsvn/nix-prefetch-svn
+++ b/pkgs/build-support/fetchsvn/nix-prefetch-svn
@@ -41,11 +41,10 @@ fi
 # If we don't know the hash or a path with that hash doesn't exist,
 # download the file and add it to the store.
 if test -z "$finalPath"; then
-    tmpPath=/tmp/svn-checkout-tmp-$$
-    tmpFile=$tmpPath/$dstFile
-    mkdir $tmpPath
+    tmpPath="$(mktemp --tmpdir -d svn-checkout-tmp-XXXXXXXX)"
+    trap "rm -rf \"$tmpPath\"" EXIT
 
-    trap "rm -rf $tmpPath" EXIT
+    tmpFile="$tmpPath/$dstFile"
 
     # Perform the checkout.
     if test "$NIX_PREFETCH_SVN_LEAVE_DOT_SVN" != 1

From 35d7d01d065dd218575080f13677cd0ab833e9e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Mon, 25 Aug 2014 16:58:41 +0200
Subject: [PATCH 0568/1453] FriBID: 1.0.2 -> 1.0.4

Changed from let to rec version.
Added longDescription.
---
 .../browsers/mozilla-plugins/fribid/default.nix      | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix
index 8cda5ad5762f..229aa4f23ba1 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix
@@ -1,20 +1,19 @@
 { stdenv, fetchurl, pkgconfig, openssl, glib, libX11, gtk2, gettext, intltool }:
 
-let version = "1.0.2"; in
 stdenv.mkDerivation rec {
   name = "fribid-${version}";
+  version = "1.0.4";
   builder = ./builder.sh;
 
   src = fetchurl {
     url = "https://fribid.se/releases/source/${name}.tar.bz2";
-    sha256 = "d7cd9adf04fedf50b266a5c14ddb427cbb263d3bc160ee0ade03aca9d5356e5c";
+    sha256 = "a679f3a0534d5f05fac10b16b49630a898c0b721cfa24d2c827fa45485476649";
   };
 
   buildInputs = [ pkgconfig openssl libX11 gtk2 glib gettext intltool ];
   patches = [
     ./translation-xgettext-to-intltool.patch
     ./plugin-linkfix.patch
-    ./emulated-version.patch
     ./ipc-lazytrace.patch
     ];
 
@@ -22,10 +21,15 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A browser plugin to manage Swedish BankID:s";
+    longDescription = ''
+      FriBID is an open source software for the Swedish e-id system
+      called BankID. FriBID also supports processor architectures and
+      Linux/BSD distributions that the official software doesn't
+      support.
+    '';
     homepage = http://fribid.se;
     license = [ "GPLv2" "MPLv1" ];
     maintainers = [ stdenv.lib.maintainers.edwtjo ];
     platforms = with stdenv.lib.platforms; linux;
   };
 }
-

From 2099db4d0094b77cc6856b455c153527e7c0d919 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 25 Aug 2014 17:09:35 +0200
Subject: [PATCH 0569/1453] uTox: downgrade to work with current libtoxcore

---
 .../networking/instant-messengers/utox/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix
index 823df5c27a28..b49d5f40a86b 100644
--- a/pkgs/applications/networking/instant-messengers/utox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/utox/default.nix
@@ -8,8 +8,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "notsecure";
     repo = "uTox";
-    rev = "d70f9bfb4ff8a156ec35803da6226b0ac8c47961";
-    sha256 = "10cvsg0phv0jsrdl3zkk339c4bzn3xc82q1x90h6gcnrbg4vzmp0";
+    rev = "a840b459210694fdf02671567bf33845a11d4c83";
+    sha256 = "0jr0xajkv5vkq8gxspnq09k4bzc98fr3hflnz8a3lrwajyhrnpvp";
   };
 
   buildInputs = [ pkgconfig libtoxcore dbus libvpx libX11 openal freetype

From 13ca3624a7dc81d6a42132e820fb71a87f7b8ba8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 25 Aug 2014 17:13:50 +0200
Subject: [PATCH 0570/1453] toxic: git -> 0.4.7

---
 .../networking/instant-messengers/toxic/default.nix | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix
index b3e1ff74cfa5..f7d1a010ed8f 100644
--- a/pkgs/applications/networking/instant-messengers/toxic/default.nix
+++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix
@@ -2,16 +2,13 @@
 , libtoxcore, openal, libvpx, freealut, libconfig, pkgconfig }:
 
 let
-  version = "7566aa9d26";
-  date = "20140728";
-in
-stdenv.mkDerivation rec {
-  name = "toxic-${date}-${version}";
+  version = "0.4.7";
+in stdenv.mkDerivation rec {
+  name = "toxic-${version}";
 
   src = fetchurl {
-    url = "https://github.com/Tox/toxic/tarball/${version}";
-    name = "${name}.tar.gz";
-    sha256 = "13vns0qc0hxhab6rpz0irnzgv42mp3v1nrbwm90iymhf4xkc9nwa";
+    url = "https://github.com/Tox/toxic/archive/v${version}.tar.gz";
+    sha256 = "0rcrcqzvicz7787fa4b7f68qnwq6wqbyrm8ii850f1w7vnxq9dkq";
   };
 
   makeFlags = [ "-Cbuild" "VERSION=${version}" ];

From 12776c37482c5c48d8558b99178e799826a2390d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 25 Aug 2014 18:15:57 +0200
Subject: [PATCH 0571/1453] python3Packages: disable few packages

---
 pkgs/top-level/python-packages.nix | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 23b5e9522e51..55823eea2b64 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -384,11 +384,12 @@ rec {
 
 
   anyjson = buildPythonPackage rec {
-    name = "anyjson-0.3.1";
+    name = "anyjson-0.3.3";
+    disabled = isPy3k;
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/a/anyjson/${name}.tar.gz";
-      md5 = "2b53b5d53fc40af4da7268d3c3e35a50";
+      md5 = "2ea28d6ec311aeeebaf993cb3008b27c";
     };
 
     buildInputs = [ pythonPackages.nose ];
@@ -1127,6 +1128,7 @@ rec {
   cheetah = buildPythonPackage rec {
     version = "2.4.4";
     name = "cheetah-${version}";
+    disabled = isPy3k;
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/C/Cheetah/Cheetah-${version}.tar.gz";
@@ -4902,6 +4904,7 @@ rec {
   netlib = buildPythonPackage rec {
     baseName = "netlib";
     name = "${baseName}-${meta.version}";
+    disabled = (!isPy27);
 
     src = fetchurl {
       url = "https://github.com/cortesi/netlib/archive/v${meta.version}.tar.gz";
@@ -6002,11 +6005,11 @@ rec {
 
 
   pycurl = buildPythonPackage (rec {
-    name = "pycurl-7.19.0";
+    name = "pycurl-7.19.5";
 
     src = fetchurl {
       url = "http://pycurl.sourceforge.net/download/${name}.tar.gz";
-      sha256 = "0hh6icdbp7svcq0p57zf520ifzhn7jw64x07k99j7h57qpy2sy7b";
+      sha256 = "0hqsap82zklhi5fxhc69kxrwzb0g9566f7sdpz7f9gyxkmyam839";
     };
 
     buildInputs = [ pkgs.curl ];
@@ -7113,6 +7116,8 @@ rec {
   rope = buildPythonPackage rec {
     version = "0.9.4";
     name = "rope-${version}";
+    
+    disabled = isPy3k;
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/r/rope/${name}.tar.gz";
@@ -7506,6 +7511,7 @@ rec {
 
   pydns = buildPythonPackage rec {
     name = "pydns-2.3.6";
+    disabled = isPy3k;
 
     src = fetchurl {
       url = "https://pypi.python.org/packages/source/p/pydns/${name}.tar.gz";
@@ -8377,7 +8383,8 @@ rec {
   twisted = buildPythonPackage rec {
     # NOTE: When updating please check if new versions still cause issues
     # to packages like carbon (http://stackoverflow.com/questions/19894708/cant-start-carbon-12-04-python-error-importerror-cannot-import-name-daem)
-
+    disabled = isPy3k;
+ 
     name = "Twisted-11.1.0";
     src = fetchurl {
       url = "https://pypi.python.org/packages/source/T/Twisted/${name}.tar.bz2";
@@ -8455,6 +8462,7 @@ rec {
 
   urlgrabber =  buildPythonPackage rec {
     name = "urlgrabber-3.9.1";
+    disabled = isPy3k;
 
     src = fetchurl {
       url = "http://urlgrabber.baseurl.org/download/${name}.tar.gz";

From db47d5159289ca9a7534a573a0967ee137f13229 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 25 Aug 2014 19:00:37 +0200
Subject: [PATCH 0572/1453] pypy: add X libs to build tkinter

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

diff --git a/pkgs/development/interpreters/pypy/2.3/default.nix b/pkgs/development/interpreters/pypy/2.3/default.nix
index 626f56ccc466..74f01c0fc0f5 100644
--- a/pkgs/development/interpreters/pypy/2.3/default.nix
+++ b/pkgs/development/interpreters/pypy/2.3/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi
-, sqlite, openssl, ncurses, pythonFull, expat, tcl, tk }:
+, sqlite, openssl, ncurses, pythonFull, expat, tcl, tk, x11, libX11 }:
 
 assert zlibSupport -> zlib != null;
 
@@ -20,7 +20,7 @@ let
       sha256 = "0fg4l48c7n59n5j3b1dgcsr927xzylkfny4a6pnk6z0pq2bhvl9z";
     };
 
-    buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite tk tcl ]
+    buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite tk tcl x11 libX11 ]
       ++ stdenv.lib.optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc
       ++ stdenv.lib.optional zlibSupport zlib;
 

From 68c131c2cc0ba24df2479e1f1fe2154772e07ce5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 25 Aug 2014 19:00:51 +0200
Subject: [PATCH 0573/1453] quake3demo: mark as broken

---
 pkgs/games/quake3/game/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/games/quake3/game/default.nix b/pkgs/games/quake3/game/default.nix
index 6a05ab7f2bd7..596ba595d813 100644
--- a/pkgs/games/quake3/game/default.nix
+++ b/pkgs/games/quake3/game/default.nix
@@ -32,5 +32,7 @@ stdenv.mkDerivation {
     installTargets=copyfiles
     installFlags="COPYDIR=$out"
   '';
+
+  meta.broken = true;
   
 }

From d7bcb19d6404a7645bd1796537569ab9db49f334 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 25 Aug 2014 19:01:17 +0200
Subject: [PATCH 0574/1453] python-packages-generated: temporarily hardcode fix
 for psycopg2

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

diff --git a/pkgs/top-level/python-packages-generated.nix b/pkgs/top-level/python-packages-generated.nix
index e76cf4988d02..2cf742156a3a 100644
--- a/pkgs/top-level/python-packages-generated.nix
+++ b/pkgs/top-level/python-packages-generated.nix
@@ -2666,7 +2666,7 @@ in
         md5 = "09dcec70f623a9ef774f1aef75690995";
     };
     doCheck = false;
-    buildInputs = [  ];
+    buildInputs = [ pkgs.postgresql ];
     propagatedBuildInputs = [  ];
     installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {

From 6fab53b4c203d3e0c426e4eb04e15c88fa5ca84b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 25 Aug 2014 19:01:34 +0200
Subject: [PATCH 0575/1453] pythonPackages.robotframework: disable on py3k

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 55823eea2b64..59df60bb55e2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7018,6 +7018,7 @@ rec {
   robotframework = buildPythonPackage rec {
     version = "2.8.5";
     name = "robotframework-${version}";
+    disabled = isPy3k;
 
     src = fetchurl {
       url = "https://pypi.python.org/packages/source/r/robotframework/${name}.tar.gz";

From 81f274901261620336aa9b4d986f436eb820fb56 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 25 Aug 2014 19:08:12 +0200
Subject: [PATCH 0576/1453] Manual: Chunk into separate pages

---
 nixos/doc/manual/default.nix | 28 ++++++++++++++--------------
 nixos/doc/manual/style.css   |  7 +++----
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix
index df524c3faaca..e9f26ea9dd1b 100644
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@@ -55,16 +55,6 @@ in rec {
 
     buildInputs = [ libxml2 libxslt ];
 
-    xsltFlags = ''
-      --param section.autolabel 1
-      --param section.label.includes.component.label 1
-      --param html.stylesheet 'style.css'
-      --param xref.with.number.and.title 1
-      --param toc.section.depth 3
-      --param admon.style '''
-      --param callout.graphics.extension '.gif'
-    '';
-
     buildCommand = ''
       ${copySources}
 
@@ -76,10 +66,20 @@ in rec {
       # Generate the HTML manual.
       dst=$out/share/doc/nixos
       mkdir -p $dst
-      xsltproc $xsltFlags --nonet --xinclude \
-        --output $dst/manual.html \
-        ${docbook5_xsl}/xml/xsl/docbook/xhtml/docbook.xsl \
-        ./manual.xml
+      xsltproc \
+        --param section.autolabel 1 \
+        --param section.label.includes.component.label 1 \
+        --stringparam html.stylesheet style.css \
+        --param xref.with.number.and.title 1 \
+        --param toc.section.depth 3 \
+        --stringparam admon.style "" \
+        --stringparam callout.graphics.extension .gif \
+        --param chunk.section.depth 1 \
+        --param chunk.first.sections 1 \
+        --param use.id.as.filename 1 \
+        --stringparam generate.toc "book toc chapter toc" \
+        --nonet --xinclude --output $dst/ \
+        ${docbook5_xsl}/xml/xsl/docbook/xhtml/chunkfast.xsl ./manual.xml
 
       mkdir -p $dst/images/callouts
       cp ${docbook5_xsl}/xml/xsl/docbook/images/callouts/*.gif $dst/images/callouts/
diff --git a/nixos/doc/manual/style.css b/nixos/doc/manual/style.css
index e2204c159e22..3118b37ead1f 100644
--- a/nixos/doc/manual/style.css
+++ b/nixos/doc/manual/style.css
@@ -262,7 +262,6 @@ table.simplelist
     margin-bottom: 1em;
 }
 
-div.affiliation
-{
-    font-style: italic;
-}
\ No newline at end of file
+div.navheader table, div.navfooter table {
+    box-shadow: none;
+}

From 08f24b85c2526ccc4312db9831213f9c928353d7 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Mon, 25 Aug 2014 19:45:55 +0200
Subject: [PATCH 0577/1453] GnuPG: Bump to 2.0.26

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

diff --git a/pkgs/tools/security/gnupg/default.nix b/pkgs/tools/security/gnupg/default.nix
index 9b8d33b6b696..64e2be90d30d 100644
--- a/pkgs/tools/security/gnupg/default.nix
+++ b/pkgs/tools/security/gnupg/default.nix
@@ -13,11 +13,11 @@ assert useUsb -> (libusb != null);
 assert useCurl -> (curl != null);
 
 stdenv.mkDerivation rec {
-  name = "gnupg-2.0.24";
+  name = "gnupg-2.0.26";
 
   src = fetchurl {
     url = "mirror://gnupg/gnupg/${name}.tar.bz2";
-    sha256 = "0ch2hbindk832cy7ca00a7whw84ndm0nhqrl24a5fw4ldkca2x6r";
+    sha256 = "1q5qcl5panrvcvpwvz6nl9gayl5a6vwvfhgdcxqpmbl2qc6y6n3p";
   };
 
   buildInputs

From 307924bbcc5b4f96a891f3eec776331c1b732d77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Mon, 25 Aug 2014 22:58:22 +0200
Subject: [PATCH 0578/1453] synfigstudio: fix chroot build / hydra

The error message was:
Fontconfig error: Cannot load default config file
make[2]: *** [128x128/synfig_icon.png] Segmentation fault

(cherry picked from commit 759980c4fe9b07932f671d2e657189068d117405)

Conflicts:
	pkgs/top-level/all-packages.nix
---
 pkgs/applications/graphics/synfigstudio/default.nix | 8 ++++++--
 pkgs/top-level/all-packages.nix                     | 4 +++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix
index 034a147b7874..ba7a916e3fe4 100644
--- a/pkgs/applications/graphics/synfigstudio/default.nix
+++ b/pkgs/applications/graphics/synfigstudio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, boost, cairo, gettext, glibmm, gtk, gtkmm
+{ stdenv, fetchurl, boost, cairo, fontsConf, gettext, glibmm, gtk, gtkmm
 , libsigcxx, libtool, libxmlxx, pango, pkgconfig, imagemagick
 , intltool
 }:
@@ -42,10 +42,14 @@ stdenv.mkDerivation rec {
     };
 
   buildInputs = [
-    ETL boost cairo gettext glibmm gtk gtkmm imagemagick intltool
+    ETL boost cairo fontsConf gettext glibmm gtk gtkmm imagemagick intltool
     intltool libsigcxx libtool libxmlxx pkgconfig synfig
   ];
 
+  preBuild = ''
+    export FONTCONFIG_FILE=${fontsConf}
+  '';
+
   meta = with stdenv.lib; {
     description = "A 2D animation program";
     homepage = http://www.synfig.org;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a671f50dc600..aa62043da2b1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9388,7 +9388,9 @@ let
     rake         = rake;
   };
 
-  synfigstudio = callPackage ../applications/graphics/synfigstudio { };
+  synfigstudio = callPackage ../applications/graphics/synfigstudio {
+    fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf ]; };
+  };
 
   sxhkd = callPackage ../applications/window-managers/sxhkd { };
 

From f237f31b93dd21649657b58532d5130b4886b5d8 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Mon, 25 Aug 2014 15:51:10 -0700
Subject: [PATCH 0579/1453] darcs updated to 2.8.5

tested to work with ghc 7.8.3
---
 .../version-management/darcs/default.nix         | 16 ++++++++--------
 pkgs/top-level/all-packages.nix                  |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/version-management/darcs/default.nix b/pkgs/applications/version-management/darcs/default.nix
index d53b38c28c32..ff5c3456e227 100644
--- a/pkgs/applications/version-management/darcs/default.nix
+++ b/pkgs/applications/version-management/darcs/default.nix
@@ -1,24 +1,24 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, curl, extensibleExceptions, filepath, hashedStorage
-, haskeline, html, HTTP, mmap, mtl, network, parsec, random
-, regexCompat, tar, terminfo, text, utf8String, vector, zlib
+, haskeline, html, HTTP, mmap, mtl, network, networkUri, parsec
+, random, regexCompat, tar, terminfo, text, utf8String, vector
+, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "darcs";
-  version = "2.8.4";
-  sha256 = "164zclgib9ql4rqykpdhhk2bad0m5v0k0iwzsj0z7nax5nxlvarz";
+  version = "2.8.5";
+  sha256 = "16g3ayw0wwhkjpprlkzi971ibs4dp152bmaa487512cwb3ni0hq6";
   isLibrary = true;
   isExecutable = true;
+  doCheck = false;
   buildDepends = [
     extensibleExceptions filepath hashedStorage haskeline html HTTP
-    mmap mtl network parsec random regexCompat tar terminfo text
-    utf8String vector zlib
+    mmap mtl network networkUri parsec random regexCompat tar terminfo
+    text utf8String vector zlib
   ];
   extraLibraries = [ curl ];
-  jailbreak = true;
-  doCheck = false;
   postInstall = ''
     mkdir -p $out/etc/bash_completion.d
     mv contrib/darcs_completion $out/etc/bash_completion.d/darcs
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aa62043da2b1..5aa5d612bc9a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8398,7 +8398,7 @@ let
 
   d4x = callPackage ../applications/misc/d4x { };
 
-  darcs = with haskellPackages_ghc763; callPackage ../applications/version-management/darcs {
+  darcs = with haskellPackages_ghc783; callPackage ../applications/version-management/darcs {
     cabal = cabal.override {
       extension = self : super : {
         isLibrary = false;

From 74625641f84d481e30cdfd11ee9904dbcb41222d Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Tue, 26 Aug 2014 01:21:27 +0200
Subject: [PATCH 0580/1453] Add libnfc 1.7.1

---
 pkgs/development/libraries/libnfc/default.nix | 21 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/development/libraries/libnfc/default.nix

diff --git a/pkgs/development/libraries/libnfc/default.nix b/pkgs/development/libraries/libnfc/default.nix
new file mode 100644
index 000000000000..a018ce1f0fa0
--- /dev/null
+++ b/pkgs/development/libraries/libnfc/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, libusb }:
+
+stdenv.mkDerivation rec {
+  name = "libnfc-${version}";
+  version = "1.7.1";
+
+  src = fetchurl {
+    url = "http://dl.bintray.com/nfc-tools/sources/libnfc-1.7.1.tar.bz2";
+    sha256 = "0wj0iwwcpmpalyk61aa7yc6i4p9hgdajkrgnlswgk0vnwbc78pll";
+  };
+
+  buildInputs = [ libusb ];
+
+  meta = with stdenv.lib; {
+    description = "Open source library libnfc for Near Field Communication";
+    license = licenses.gpl3;
+    homepage = http://code.google.com/p/libnfc/;
+    maintainers = with maintainers; [offline];
+    platforms = with platforms; unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 312959fdb247..e0430579d727 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5268,6 +5268,8 @@ let
 
   libnatspec = callPackage ../development/libraries/libnatspec { };
 
+  libnfc = callPackage ../development/libraries/libnfc { };
+
   libnfsidmap = callPackage ../development/libraries/libnfsidmap { };
 
   libnice = callPackage ../development/libraries/libnice { };

From 12c3f65173258d4cbe5a42a0585923c6eed32869 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Tue, 26 Aug 2014 01:22:08 +0200
Subject: [PATCH 0581/1453] Add mfcuk, tool for hacking mifare classic cards

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

diff --git a/pkgs/tools/security/mfcuk/default.nix b/pkgs/tools/security/mfcuk/default.nix
new file mode 100644
index 000000000000..9d92482f68f1
--- /dev/null
+++ b/pkgs/tools/security/mfcuk/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, pkgconfig, libnfc }:
+
+stdenv.mkDerivation rec {
+  name = "mfcuk-${version}";
+  version = "0.3.8";
+
+  src = fetchurl {
+    url = "http://mfcuk.googlecode.com/files/mfcuk-0.3.8.tar.gz";
+    sha256 = "0m9sy61rsbw63xk05jrrmnyc3xda0c3m1s8pg3sf8ijbbdv9axcp";
+  };
+
+  buildInputs = [ pkgconfig libnfc ];
+
+  meta = with stdenv.lib; {
+    description = "MiFare Classic Universal toolKit";
+    license = licenses.gpl2;
+    homepage = http://code.google.com/p/mfcuk/;
+    maintainers = with maintainers; [ offline ];
+    platforms = with platforms; unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e0430579d727..bb109e380d9b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1500,6 +1500,8 @@ let
 
   megatools = callPackage ../tools/networking/megatools { };
 
+  mfcuk = callPackage ../tools/security/mfcuk { };
+
   minecraft = callPackage ../games/minecraft { };
 
   minecraft-server = callPackage ../games/minecraft-server { };

From 93697e85cabbf54a6e040521d8dc55f757b2a468 Mon Sep 17 00:00:00 2001
From: Dmitry Belyaev <be.dmitry@gmail.com>
Date: Fri, 15 Aug 2014 11:14:54 +1000
Subject: [PATCH 0582/1453] Support odbc in erlang R16 and R17

---
 pkgs/development/interpreters/erlang/R16.nix | 9 ++++++---
 pkgs/development/interpreters/erlang/R17.nix | 9 ++++++---
 pkgs/top-level/all-packages.nix              | 3 +++
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/interpreters/erlang/R16.nix b/pkgs/development/interpreters/erlang/R16.nix
index 5945cdd8299d..23243803e8dc 100644
--- a/pkgs/development/interpreters/erlang/R16.nix
+++ b/pkgs/development/interpreters/erlang/R16.nix
@@ -1,13 +1,15 @@
 { stdenv, fetchurl, perl, gnum4, ncurses, openssl
 , gnused, gawk, makeWrapper
+, odbcSupport ? false, unixODBC ? null
 , wxSupport ? false, mesa ? null, wxGTK ? null, xlibs ? null }:
 
 assert wxSupport -> mesa != null && wxGTK != null && xlibs != null;
+assert odbcSupport -> unixODBC != null;
 
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "erlang-" + version;
+  name = "erlang-" + version + "${optionalString odbcSupport "-odbc"}";
   version = "16B03-1";
 
   src = fetchurl {
@@ -17,7 +19,8 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ perl gnum4 ncurses openssl makeWrapper
-    ] ++ optional wxSupport [ mesa wxGTK xlibs.libX11 ];
+    ] ++ optional wxSupport [ mesa wxGTK xlibs.libX11 ]
+      ++ optional odbcSupport [ unixODBC ];
 
   patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure '';
 
@@ -26,7 +29,7 @@ stdenv.mkDerivation rec {
     sed -e s@/bin/pwd@pwd@g -i otp_build
   '';
 
-  configureFlags= "--with-ssl=${openssl} ${optionalString stdenv.isDarwin "--enable-darwin-64bit"}";
+  configureFlags= "--with-ssl=${openssl} ${optionalString odbcSupport "--with-odbc=${unixODBC}"} ${optionalString stdenv.isDarwin "--enable-darwin-64bit"}";
 
   postInstall = let
     manpages = fetchurl {
diff --git a/pkgs/development/interpreters/erlang/R17.nix b/pkgs/development/interpreters/erlang/R17.nix
index 2aba55d36792..83ea79d67f39 100644
--- a/pkgs/development/interpreters/erlang/R17.nix
+++ b/pkgs/development/interpreters/erlang/R17.nix
@@ -1,13 +1,15 @@
 { stdenv, fetchurl, perl, gnum4, ncurses, openssl
 , gnused, gawk, makeWrapper
+, odbcSupport ? false, unixODBC ? null
 , wxSupport ? false, mesa ? null, wxGTK ? null, xlibs ? null }:
 
 assert wxSupport -> mesa != null && wxGTK != null && xlibs != null;
+assert odbcSupport -> unixODBC != null;
 
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "erlang-" + version;
+  name = "erlang-" + version + "${optionalString odbcSupport "-odbc"}";
   version = "17.1";
 
   src = fetchurl {
@@ -17,7 +19,8 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ perl gnum4 ncurses openssl makeWrapper
-    ] ++ optional wxSupport [ mesa wxGTK xlibs.libX11 ];
+    ] ++ optional wxSupport [ mesa wxGTK xlibs.libX11 ]
+      ++ optional odbcSupport [ unixODBC ];
 
   patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure '';
 
@@ -26,7 +29,7 @@ stdenv.mkDerivation rec {
     sed -e s@/bin/pwd@pwd@g -i otp_build
   '';
 
-  configureFlags= "--with-ssl=${openssl} ${optionalString stdenv.isDarwin "--enable-darwin-64bit"}";
+  configureFlags= "--with-ssl=${openssl} ${optionalString odbcSupport "--with-odbc=${unixODBC}"} ${optionalString stdenv.isDarwin "--enable-darwin-64bit"}";
 
   postInstall = let
     manpages = fetchurl {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ebfd4715d4b3..201120baecf3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3482,8 +3482,11 @@ let
   erlangR14 = callPackage ../development/interpreters/erlang/R14.nix { };
   erlangR15 = callPackage ../development/interpreters/erlang/R15.nix { };
   erlangR16 = callPackage ../development/interpreters/erlang/R16.nix { };
+  erlangR16_odbc = callPackage ../development/interpreters/erlang/R16.nix { odbcSupport = true; };
   erlangR17 = callPackage ../development/interpreters/erlang/R17.nix { };
+  erlangR17_odbc = callPackage ../development/interpreters/erlang/R17.nix { odbcSupport = true; };
   erlang = erlangR17;
+  erlang_odbc = erlangR17_odbc;
 
   rebar = callPackage ../development/tools/build-managers/rebar { };
 

From 8dc11b46a695c338d272325eef4cebe7f60cb710 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Mon, 25 Aug 2014 21:15:30 -0700
Subject: [PATCH 0583/1453] Update hi to 0.8.2, doCheck set to false

---
 pkgs/development/libraries/haskell/hi/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hi/default.nix b/pkgs/development/libraries/haskell/hi/default.nix
index ba1614931095..3f9db969c220 100644
--- a/pkgs/development/libraries/haskell/hi/default.nix
+++ b/pkgs/development/libraries/haskell/hi/default.nix
@@ -1,20 +1,22 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, filepath, hspec, HUnit, parsec, split, template
+{ cabal, doctest, filepath, hspec, HUnit, parsec, split, template
 , temporaryRc, text, time
 }:
 
 cabal.mkDerivation (self: {
   pname = "hi";
-  version = "0.0.8.1";
-  sha256 = "14g1yfc6cv89whx6w0di5nayifc0xfvll9h07kkqxaajyfw6s32y";
+  version = "0.0.8.2";
+  sha256 = "0h94wjxdr6g6n3rvkn1xsjqr49p9fgidmraifvz5mzryn6rmd18r";
   isLibrary = true;
   isExecutable = true;
+  doCheck = false;
   buildDepends = [
     filepath parsec split template temporaryRc text time
   ];
   testDepends = [
-    filepath hspec HUnit parsec split template temporaryRc text time
+    doctest filepath hspec HUnit parsec split template temporaryRc text
+    time
   ];
   meta = {
     homepage = "https://github.com/fujimura/hi";

From 72954393f8306206c7ace1c19e6097982d0dd769 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Tue, 26 Aug 2014 01:21:09 -0500
Subject: [PATCH 0584/1453] haskell-ivory: 0.1.0.0 new expression

---
 .../libraries/haskell/ivory/default.nix         | 17 +++++++++++++++++
 pkgs/top-level/haskell-packages.nix             |  2 ++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/ivory/default.nix

diff --git a/pkgs/development/libraries/haskell/ivory/default.nix b/pkgs/development/libraries/haskell/ivory/default.nix
new file mode 100644
index 000000000000..3e3c6c78ae1d
--- /dev/null
+++ b/pkgs/development/libraries/haskell/ivory/default.nix
@@ -0,0 +1,17 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, monadLib, parsec, thLift }:
+
+cabal.mkDerivation (self: {
+  pname = "ivory";
+  version = "0.1.0.0";
+  sha256 = "1rn1akrsci0k5nbk4zipxznkdm0y3rvv9la5mnrr9mkj5zikj5sc";
+  buildDepends = [ monadLib parsec thLift ];
+  meta = {
+    homepage = "http://smaccmpilot.org/languages/ivory-introduction.html";
+    description = "Safe embedded C programming";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    broken = self.stdenv.lib.versionOlder "7.7" self.ghc.version;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index a2340779a9bd..3427d8109fb4 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1382,6 +1382,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   ivor = callPackage ../development/libraries/haskell/ivor {};
 
+  ivory = callPackage ../development/libraries/haskell/ivory {};
+
   ixdopp = callPackage ../development/libraries/haskell/ixdopp {
     preprocessorTools = self.preprocessorTools_0_1_3;
   };

From 5a717eef8b4a74a5ab707b5ea8e937743218259d Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Mon, 25 Aug 2014 23:49:38 -0700
Subject: [PATCH 0585/1453] wreq updated to 0.2

---
 .../libraries/haskell/wreq/default.nix        | 21 +++++++------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/haskell/wreq/default.nix b/pkgs/development/libraries/haskell/wreq/default.nix
index 5547140189d3..5a93d023d1b6 100644
--- a/pkgs/development/libraries/haskell/wreq/default.nix
+++ b/pkgs/development/libraries/haskell/wreq/default.nix
@@ -1,26 +1,25 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, aeson, attoparsec, doctest, exceptions, filepath
-, httpClient, httpClientTls, httpTypes, HUnit, lens, mimeTypes
-, temporary, testFramework, testFrameworkHunit, text, time
-, fetchpatch
+, httpClient, httpClientTls, httpTypes, HUnit, lens, lensAeson
+, mimeTypes, temporary, testFramework, testFrameworkHunit, text
+, time
 }:
 
 cabal.mkDerivation (self: {
   pname = "wreq";
-  version = "0.1.0.1";
-  sha256 = "05w3b555arsab8a5w73nm9pk3p9r6jipi6cd3ngxv48gdn9wzhvz";
+  version = "0.2.0.0";
+  sha256 = "0ajrwn4yn6h65v97jfhbb4x3j307gdf34dyjnnhsrmsf7911l44d";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     aeson attoparsec exceptions httpClient httpClientTls httpTypes lens
-    mimeTypes text time
+    lensAeson mimeTypes text time
   ];
   testDepends = [
-    aeson doctest filepath httpClient httpTypes HUnit lens temporary
-    testFramework testFrameworkHunit text
+    aeson doctest filepath httpClient httpTypes HUnit lens lensAeson
+    temporary testFramework testFrameworkHunit text
   ];
-  doCheck = false;
   meta = {
     homepage = "http://www.serpentine.com/wreq";
     description = "An easy-to-use HTTP client library";
@@ -28,8 +27,4 @@ cabal.mkDerivation (self: {
     platforms = self.ghc.meta.platforms;
     maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
   };
-  patches = [
-    (fetchpatch { url = https://github.com/bos/wreq/commit/e8e29b62006e39ab36ffbb1d18c3e9d5923158ac.patch; sha256 = "19kqy512sa4dbzqp7kmjpsnsmc63wqh5pkh6hcvkzsji15dmlqrg"; })
-    (fetchpatch { url = https://github.com/bos/wreq/pull/20.patch; sha256 = "1qfjwz5wlmmfcg8jy0yg7ixacq5fai3yscm552fba1ph66acyvg4"; })
-  ];
 })

From abe7730f23eb2b0b55308639dba1fbdff2f0c652 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 25 Aug 2014 19:12:40 +0200
Subject: [PATCH 0586/1453] remove pdf2htmlex: too much hassle to fix it

---
 .../libraries/pdf2htmlex/default.nix          | 27 -------------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 29 deletions(-)
 delete mode 100644 pkgs/development/libraries/pdf2htmlex/default.nix

diff --git a/pkgs/development/libraries/pdf2htmlex/default.nix b/pkgs/development/libraries/pdf2htmlex/default.nix
deleted file mode 100644
index 597385aa9fa3..000000000000
--- a/pkgs/development/libraries/pdf2htmlex/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{stdenv, fetchurl, cmake, poppler, fontforge, unzip, pkgconfig, python}:
-
-stdenv.mkDerivation rec {
-  version = "0.8.1";
-  name = "pdf2htmlex-${version}";
-  
-  src = fetchurl {
-      url = "https://github.com/coolwanglu/pdf2htmlEX/archive/v${version}.zip";
-      sha256 = "0v8x03vq46ng9s27ryn76lcsjgpxgak6062jnx59lnyz856wvp8a";
-  };
-
-  buildInputs = [
-    cmake
-    unzip
-    poppler
-    fontforge
-    pkgconfig
-    python
-  ];
-
-  meta = with stdenv.lib; {
-    description = "Convert PDF to HTML without losing text or format. ";
-    license = licenses.gpl3;
-    maintainers = [ maintainers.iElectric ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fa205e71133a..a5fa04d8936e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5950,8 +5950,6 @@ let
 
   pdf2xml = callPackage ../development/libraries/pdf2xml {} ;
 
-  pdf2htmlex = callPackage ../development/libraries/pdf2htmlex {} ;
-
   phonon = callPackage ../development/libraries/phonon { };
 
   phonon_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer { };

From 276220262ec25a194247d736c54123dc6e1b0096 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 26 Aug 2014 09:57:29 +0200
Subject: [PATCH 0587/1453] pypy: hint about tcl/tk headers/libs paths

---
 pkgs/development/interpreters/pypy/2.3/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/pypy/2.3/default.nix b/pkgs/development/interpreters/pypy/2.3/default.nix
index 74f01c0fc0f5..8fef46b58772 100644
--- a/pkgs/development/interpreters/pypy/2.3/default.nix
+++ b/pkgs/development/interpreters/pypy/2.3/default.nix
@@ -40,12 +40,18 @@ let
       substituteInPlace pypy/goal/targetpypystandalone.py \
         --replace "/usr/bin/env pypy" "${pythonFull}/bin/python"
 
-      # convince pypy to find nix ncurses
+      # hint pypy to find nix ncurses
       substituteInPlace pypy/module/_minimal_curses/fficurses.py \
         --replace "/usr/include/ncurses/curses.h" "${ncurses}/include/curses.h" \
         --replace "ncurses/curses.h" "${ncurses}/include/curses.h" \
         --replace "ncurses/term.h" "${ncurses}/include/term.h" \
         --replace "libraries=['curses']" "libraries=['ncurses']"
+
+      # tkinter hints
+      substituteInPlace lib_pypy/_tkinter/tklib.py \
+        --replace "'/usr/include/tcl'" "'${tk}/include', '${tcl}/include'" \
+        --replace "linklibs=['tcl', 'tk']" "linklibs=['tcl8.5', 'tk8.5']" \
+        --replace "libdirs = []" "libdirs = ['${tk}/lib', '${tcl}/lib']"
     '';
 
     setupHook = ./setup-hook.sh;

From 5f8a9f81d199bc07714807db4a90c9997e1669db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 26 Aug 2014 10:04:14 +0200
Subject: [PATCH 0588/1453] pycurl: fix runtime dependency on openssl

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 59df60bb55e2..47bea95ef019 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6012,13 +6012,14 @@ rec {
       sha256 = "0hqsap82zklhi5fxhc69kxrwzb0g9566f7sdpz7f9gyxkmyam839";
     };
 
-    buildInputs = [ pkgs.curl ];
+    propagatedBuildInputs = [ pkgs.curl pkgs.openssl ];
 
     # error: invalid command 'test'
     doCheck = false;
 
     preConfigure = ''
       substituteInPlace setup.py --replace '--static-libs' '--libs'
+      export PYCURL_SSL_LIBRARY=openssl
     '';
 
     meta = {
@@ -7521,8 +7522,6 @@ rec {
 
     doCheck = false;
 
-    meta = with stdenv.lib; {
-    };
   };
 
   sympy = buildPythonPackage rec {

From 6417cf14b19ba9692e283a2ed8cb6b00043d7f5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 26 Aug 2014 10:47:22 +0200
Subject: [PATCH 0589/1453] python3Packages.BTrees: fix build on i686-linux

---
 .../btrees_interger_overflow.patch            | 146 ++++++++++++++++++
 pkgs/top-level/python-packages.nix            |   2 +
 2 files changed, 148 insertions(+)
 create mode 100644 pkgs/development/python-modules/btrees_interger_overflow.patch

diff --git a/pkgs/development/python-modules/btrees_interger_overflow.patch b/pkgs/development/python-modules/btrees_interger_overflow.patch
new file mode 100644
index 000000000000..a05c7bd6b3cb
--- /dev/null
+++ b/pkgs/development/python-modules/btrees_interger_overflow.patch
@@ -0,0 +1,146 @@
+From be19c1f32e4d430092c029f17984f0087a2b2087 Mon Sep 17 00:00:00 2001
+From: Jim Fulton <jim@zope.com>
+Date: Mon, 19 May 2014 19:52:43 -0400
+Subject: [PATCH 1/2] Fixed: integer overflow on 32-bit machines wasn't
+ detected correctly   under Python 3.
+
+---
+ BTrees/intkeymacros.h        |  7 ++++---
+ BTrees/intvaluemacros.h      |  3 ++-
+ BTrees/tests/testBTrees.py   | 11 +++++++++--
+ BTrees/tests/test_IIBTree.py |  2 ++
+ CHANGES.rst                  |  2 ++
+ 5 files changed, 19 insertions(+), 6 deletions(-)
+
+diff --git a/BTrees/intkeymacros.h b/BTrees/intkeymacros.h
+index d439aa0..f9244b5 100644
+--- a/BTrees/intkeymacros.h
++++ b/BTrees/intkeymacros.h
+@@ -19,9 +19,10 @@
+ #define KEY_CHECK INT_CHECK
+ #define COPY_KEY_TO_OBJECT(O, K) O=INT_FROM_LONG(K)
+ #define COPY_KEY_FROM_ARG(TARGET, ARG, STATUS)                    \
+-  if (INT_CHECK(ARG)) {                                         \
+-      long vcopy = INT_AS_LONG(ARG);                            \
+-      if ((int)vcopy != vcopy) {                                  \
++  if (INT_CHECK(ARG)) {                                           \
++      long vcopy = INT_AS_LONG(ARG);                              \
++      if (PyErr_Occurred()) { (STATUS)=0; (TARGET)=0; }           \
++      else if ((int)vcopy != vcopy) {                             \
+         PyErr_SetString(PyExc_TypeError, "integer out of range"); \
+         (STATUS)=0; (TARGET)=0;                                   \
+       }                                                           \
+diff --git a/BTrees/intvaluemacros.h b/BTrees/intvaluemacros.h
+index b77a5c9..3072eea 100644
+--- a/BTrees/intvaluemacros.h
++++ b/BTrees/intvaluemacros.h
+@@ -23,7 +23,8 @@
+ #define COPY_VALUE_FROM_ARG(TARGET, ARG, STATUS)                  \
+   if (INT_CHECK(ARG)) {                                         \
+       long vcopy = INT_AS_LONG(ARG);                            \
+-      if ((int)vcopy != vcopy) {                                  \
++      if (PyErr_Occurred()) { (STATUS)=0; (TARGET)=0; }           \
++      else if ((int)vcopy != vcopy) {                                  \
+         PyErr_SetString(PyExc_TypeError, "integer out of range"); \
+         (STATUS)=0; (TARGET)=0;                                   \
+       }                                                           \
+diff --git a/BTrees/tests/testBTrees.py b/BTrees/tests/testBTrees.py
+index 50f5b43..31d641d 100644
+--- a/BTrees/tests/testBTrees.py
++++ b/BTrees/tests/testBTrees.py
+@@ -11,8 +11,11 @@
+ # FOR A PARTICULAR PURPOSE
+ #
+ ##############################################################################
++import sys
+ import unittest
+ 
++python3 = sys.version_info >= (3, )
++
+ from BTrees.tests.common import permutations
+ 
+ 
+@@ -451,8 +454,12 @@ def test32(self):
+         # the characteristics change to match the 64 bit version, please
+         # feel free to change.
+         big = BTrees.family32.maxint + 1
+-        self.assertRaises(TypeError, s.insert, big)
+-        self.assertRaises(TypeError, s.insert, BTrees.family32.minint - 1)
++        if python3:
++            expected_exception = OverflowError
++        else:
++            expected_exception = TypeError
++        self.assertRaises(expected_exception, s.insert,
++                          BTrees.family32.minint - 1)
+         self.check_pickling(BTrees.family32)
+ 
+     def test64(self):
+diff --git a/BTrees/tests/test_IIBTree.py b/BTrees/tests/test_IIBTree.py
+index 72e95b2..fe776b8 100644
+--- a/BTrees/tests/test_IIBTree.py
++++ b/BTrees/tests/test_IIBTree.py
+@@ -113,6 +113,8 @@ def trial(i):
+             i = int(i)
+             try:
+                 b[i] = 0
++            except OverflowError:
++                self.assertRaises(OverflowError, b.__setitem__, 0, i)
+             except TypeError:
+                 self.assertRaises(TypeError, b.__setitem__, 0, i)
+             else:
+diff --git a/CHANGES.rst b/CHANGES.rst
+index 4696be3..e3869ff 100644
+--- a/CHANGES.rst
++++ b/CHANGES.rst
+@@ -1,6 +1,8 @@
+ ``BTrees`` Changelog
+ ====================
+ 
++- Fixed: integer overflow on 32-bit machines wasn't detected correctly
++  under Python 3.
+ 
+ 4.0.9 (unreleased)
+ ------------------
+-- 
+2.0.4
+
+
+From 11a51d2a12bb9904e96349ff86e78e24a0ebe51a Mon Sep 17 00:00:00 2001
+From: Jim Fulton <jim@zope.com>
+Date: Wed, 21 May 2014 07:33:06 -0400
+Subject: [PATCH 2/2] added back test mistakedly removed.
+
+We have to check both TypeError and OverflowError. On Python3 32-bit,
+we'll get an OverflowError, otherwise, we get type error.
+---
+ BTrees/tests/testBTrees.py | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/BTrees/tests/testBTrees.py b/BTrees/tests/testBTrees.py
+index 31d641d..d9be43a 100644
+--- a/BTrees/tests/testBTrees.py
++++ b/BTrees/tests/testBTrees.py
+@@ -453,13 +453,13 @@ def test32(self):
+         # this next bit illustrates an, um, "interesting feature".  If
+         # the characteristics change to match the 64 bit version, please
+         # feel free to change.
+-        big = BTrees.family32.maxint + 1
+-        if python3:
+-            expected_exception = OverflowError
+-        else:
+-            expected_exception = TypeError
+-        self.assertRaises(expected_exception, s.insert,
+-                          BTrees.family32.minint - 1)
++        try: s.insert(BTrees.family32.maxint + 1)
++        except (TypeError, OverflowError): pass
++        else: self.assert_(False)
++
++        try: s.insert(BTrees.family32.minint - 1)
++        except (TypeError, OverflowError): pass
++        else: self.assert_(False)
+         self.check_pickling(BTrees.family32)
+ 
+     def test64(self):
+-- 
+2.0.4
+
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 47bea95ef019..e41a9cf210f7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9039,6 +9039,8 @@ rec {
   
   BTrees = pythonPackages.buildPythonPackage rec {
     name = "BTrees-4.0.8";
+    
+    patches = [ ./../development/python-modules/btrees_interger_overflow.patch ];
 
     propagatedBuildInputs = [ persistent zope_interface transaction ];
 

From 8fc3bedb5a9b1d17afce4d43e00695bfcaae54d0 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 26 Aug 2014 11:22:05 +0200
Subject: [PATCH 0590/1453] Fix ntopng build

---
 pkgs/tools/networking/ntopng/default.nix | 47 +++++++++++++++++-------
 1 file changed, 33 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/networking/ntopng/default.nix b/pkgs/tools/networking/ntopng/default.nix
index 3c33da1b6619..52554209d595 100644
--- a/pkgs/tools/networking/ntopng/default.nix
+++ b/pkgs/tools/networking/ntopng/default.nix
@@ -1,16 +1,36 @@
 { stdenv, fetchurl, libpcap, gnutls, libgcrypt, libxml2, glib, geoip, sqlite
-, which
+, which, autoreconfHook, subversion, pkgconfig, groff
 }:
 
 # ntopng includes LuaJIT, mongoose, rrdtool and zeromq in its third-party/
 # directory.
 
 stdenv.mkDerivation rec {
-  name = "ntopng-1.1_6932";
+  name = "ntopng-1.2.0_r8116";
+
+  geoLiteCity = fetchurl {
+    url = "http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz";
+    sha256 = "1rv5yx5xgz04ymicx9pilidm19wh01ql2klwjcdakv558ndxdzd5";
+  };
+
+  geoLiteCityV6 = fetchurl {
+    url = "http://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz";
+    sha256 = "0j974qpi92wwnibq46h16vxpcz7yy8bbqc4k8kmby1yx994k33v4";
+  };
+
+  geoIPASNum = fetchurl {
+    url = "http://geolite.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz";
+    sha256 = "1msnbls66npq001nmf1wmkrh6vyacgi8g5phfm1c34cz7vqnh683";
+  };
+
+  geoIPASNumV6 = fetchurl {
+    url = "http://geolite.maxmind.com/download/geoip/database/asnum/GeoIPASNumv6.dat.gz";
+    sha256 = "126syia75mkxs6xfinfp70xcfq6a3rgfmh673pzzkwxya393lbdn";
+  };
 
   src = fetchurl {
     url = "mirror://sourceforge/project/ntop/ntopng/${name}.tgz";
-    sha256 = "0cdbmrsjp3bb7xzci0vfnnkmbyxwxbf47l4kbnk4ydd7xwhwdnzr";
+    sha256 = "0y7xc0l77k2qi2qalwfqiw2z361hdypirfv4k5gi652pb20jc9j6";
   };
 
   patches = [
@@ -18,19 +38,13 @@ stdenv.mkDerivation rec {
     ./0002-Remove-requirement-to-have-writeable-callback-dir.patch
   ];
 
-  buildInputs = [ libpcap gnutls libgcrypt libxml2 glib geoip sqlite which ];
+  buildInputs = [ libpcap gnutls libgcrypt libxml2 glib geoip sqlite which autoreconfHook subversion pkgconfig groff ];
+
+  preConfigure = ''
+    find . -name Makefile.in | xargs sed -i "s|/bin/rm|rm|"
+  '';
 
   preBuild = ''
-    sed -e "s|^SHELL=.*|SHELL=${stdenv.shell}|" \
-        -e "s|/usr/local|$out|g" \
-        -e "s|/bin/rm|rm|g" \
-        -i Makefile
-
-    sed -e "s|^SHELL=.*|SHELL=${stdenv.shell}|" \
-        -e "s|/usr/local|$out|g" \
-        -e "s|/opt/local|/non-existing-dir|g" \
-        -i configure
-
     sed -e "s|/usr/local|$out|g" \
         -i Ntop.cpp
 
@@ -40,6 +54,11 @@ stdenv.mkDerivation rec {
         -e "s|\(#define CONST_DEFAULT_CALLBACKS_DIR\).*|\1 \"$out/share/ntopng/scripts/callbacks\"|g" \
         -e "s|\(#define CONST_DEFAULT_INSTALL_DIR\).*|\1 \"$out/share/ntopng\"|g" \
         -i ntop_defines.h
+
+    gunzip -c $geoLiteCity > httpdocs/geoip/GeoLiteCity.dat
+    gunzip -c $geoLiteCityV6 > httpdocs/geoip/GeoLiteCityv6.dat
+    gunzip -c $geoIPASNum > httpdocs/geoip/GeoIPASNum.dat
+    gunzip -c $geoIPASNumV6 > httpdocs/geoip/GeoIPASNumv6.dat
   '';
 
   meta = with stdenv.lib; {

From 92ec3562c3b0e779be556f106cd8f21e4f6265bc Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 26 Aug 2014 11:33:58 +0200
Subject: [PATCH 0591/1453] Mark nix-plugins as broken.

---
 pkgs/development/libraries/nix-plugins/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix
index 3b4f7da94f3d..2c208ce86bbc 100644
--- a/pkgs/development/libraries/nix-plugins/default.nix
+++ b/pkgs/development/libraries/nix-plugins/default.nix
@@ -21,5 +21,6 @@ stdenv.mkDerivation {
     license = stdenv.lib.licenses.mit;
     maintaners = [ stdenv.lib.maintainers.shlevy ];
     platforms = stdenv.lib.platforms.all;
+    broken = true;
   };
 }

From 6c6dbc41fbdf0c189ec6c73d5e208ce7203ace6f Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 26 Aug 2014 11:48:02 +0200
Subject: [PATCH 0592/1453] openspades: fix build by using fetchurl to download
 DevPaks27.zip.

---
 pkgs/games/openspades/default.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/games/openspades/default.nix b/pkgs/games/openspades/default.nix
index c2218d033d79..df987b3f856c 100644
--- a/pkgs/games/openspades/default.nix
+++ b/pkgs/games/openspades/default.nix
@@ -19,6 +19,18 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DOPENSPADES_INSTALL_BINARY=bin" ];
 
+  enableParallelBuilding = true;
+
+  devPack = fetchurl {
+    url = "http://yvt.jp/files/programs/osppaks/DevPaks27.zip";
+    sha256 = "05y7wldg70v5ys41fm0c8kipyspn524z4pglwr3p8h0gfz9n52v6";
+  };
+
+  preBuild = ''
+    cp $devPack Resources/DevPaks27.zip
+    unzip -u -o Resources/DevPaks27.zip -d Resources/DevPak
+  '';
+
   # OpenAL is loaded dynamicly
   postInstall = 
     if withOpenal then ''

From f84c121e5e8c049dc06ff4327305cbfddcf6810d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Tue, 26 Aug 2014 12:06:10 +0200
Subject: [PATCH 0593/1453] Updating opencascade oce to 0.16 fix the build.

At some point the build stopped because of X/mesa updates.
---
 pkgs/development/libraries/opencascade/oce.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/opencascade/oce.nix b/pkgs/development/libraries/opencascade/oce.nix
index 0da8d2a74040..480664a0d4d3 100644
--- a/pkgs/development/libraries/opencascade/oce.nix
+++ b/pkgs/development/libraries/opencascade/oce.nix
@@ -2,10 +2,10 @@
 ftgl, freetype}:
 
 stdenv.mkDerivation rec {
-  name = "opencascade-oce-0.14.1";
+  name = "opencascade-oce-0.16";
   src = fetchurl {
-    url = https://github.com/tpaviot/oce/archive/OCE-0.14.1.tar.gz;
-    sha256 = "0pfc94nmzipm6zmxywxbly1cpfr6wadxasqqkkbdvzg937mrwl5d";
+    url = https://github.com/tpaviot/oce/archive/OCE-0.16.tar.gz;
+    sha256 = "05bmg1cjz827bpq8s0hp96byirm4c3zc9vx26qz76kjsg8ry87w4";
   };
 
   buildInputs = [ mesa tcl tk file libXmu libtool qt4 ftgl freetype cmake ];

From 7573763e8972040ea68370bc6e992b1f3f184c2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 26 Aug 2014 12:11:22 +0200
Subject: [PATCH 0594/1453] netboot: simplify, build only on 64bit

---
 pkgs/tools/networking/netboot/default.nix | 53 +++++------------------
 1 file changed, 12 insertions(+), 41 deletions(-)

diff --git a/pkgs/tools/networking/netboot/default.nix b/pkgs/tools/networking/netboot/default.nix
index ec49770d269b..dbf393094c8e 100644
--- a/pkgs/tools/networking/netboot/default.nix
+++ b/pkgs/tools/networking/netboot/default.nix
@@ -1,47 +1,18 @@
-x@{builderDefsPackage
-  , fetchurl, yacc, bison, ...}:
-builderDefsPackage
-(a :
-let
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
-    [];
+{ stdenv, fetchurl, yacc, lzo, db4 }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    version="0.10.2";
-    baseName="netboot";
-    name="${baseName}-${version}";
-    url="mirror://sourceforge/netboot/${name}.tar.gz";
-    hash="09w09bvwgb0xzn8hjz5rhi3aibysdadbg693ahn8rylnqfq4hwg0";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+stdenv.mkDerivation rec {
+  name = "netboot-0.10.2";
+  src = fetchurl {
+    url = "mirror://sourceforge/netboot/${name}.tar.gz";
+    sha256 = "09w09bvwgb0xzn8hjz5rhi3aibysdadbg693ahn8rylnqfq4hwg0";
   };
+  
+  buildInputs = [ yacc lzo db4 ];
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doUnpack" "doConfigure" "doMakeInstall"];
-
-  meta = {
+  meta = with stdenv.lib; {
     description = "Mini PXE server";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
+    maintainers = [ maintainers.raskin ];
+    platforms = ["x86_64-linux"];
     license = "free-noncopyleft";
   };
-  passthru = {
-    updateInfo = {
-      downloadPage = "https://github.com/ITikhonov/netboot";
-    };
-  };
-}) x
-
+}
\ No newline at end of file

From 2bc3a54bfc004a83516f14c59898b7aae16f756a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 26 Aug 2014 12:16:08 +0200
Subject: [PATCH 0595/1453] Revert "New package ghcParser"

---
 .../libraries/haskell/ghc-parser/default.nix     | 16 ----------------
 pkgs/top-level/haskell-packages.nix              |  2 --
 2 files changed, 18 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/ghc-parser/default.nix

diff --git a/pkgs/development/libraries/haskell/ghc-parser/default.nix b/pkgs/development/libraries/haskell/ghc-parser/default.nix
deleted file mode 100644
index a6fd1032dd50..000000000000
--- a/pkgs/development/libraries/haskell/ghc-parser/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, happy, cpphs }:
-
-cabal.mkDerivation (self: {
-  pname = "ghc-parser";
-  version = "0.1.3.0";
-  sha256 = "13p09mj92jh4y0v2r672d49fmlz3l5r2r1lqg0jjy6kj045wcfdn";
-  buildTools = [ happy cpphs ];
-  meta = {
-    homepage = "https://github.com/gibiansky/IHaskell";
-    description = "Haskell source parser from GHC";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 15e44c238924..3427d8109fb4 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -907,8 +907,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   ghcPaths = callPackage ../development/libraries/haskell/ghc-paths {};
 
-  ghcParser = callPackage ../development/libraries/haskell/ghc-parser {};
-
   ghcSyb = callPackage ../development/libraries/haskell/ghc-syb {};
 
   ghcSybUtils = callPackage ../development/libraries/haskell/ghc-syb-utils {};

From 0ba31c1e6d27cdf5ca1e11f07fb02ffd24ff7736 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 26 Aug 2014 12:25:51 +0200
Subject: [PATCH 0596/1453] pypy: give hints about sqlite3

---
 pkgs/development/interpreters/pypy/2.3/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/interpreters/pypy/2.3/default.nix b/pkgs/development/interpreters/pypy/2.3/default.nix
index 8fef46b58772..ba0fb6f111a8 100644
--- a/pkgs/development/interpreters/pypy/2.3/default.nix
+++ b/pkgs/development/interpreters/pypy/2.3/default.nix
@@ -52,6 +52,9 @@ let
         --replace "'/usr/include/tcl'" "'${tk}/include', '${tcl}/include'" \
         --replace "linklibs=['tcl', 'tk']" "linklibs=['tcl8.5', 'tk8.5']" \
         --replace "libdirs = []" "libdirs = ['${tk}/lib', '${tcl}/lib']"
+
+      substituteInPlace lib_pypy/_sqlite3.py \
+        --replace "libraries=['sqlite3']" "libraries=['sqlite3'], include_dirs=['${sqlite}/include'], library_dirs=['${sqlite}/lib']"
     '';
 
     setupHook = ./setup-hook.sh;

From c1607dcd5a765d131135413f990f920d763d7306 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 26 Aug 2014 12:24:52 +0200
Subject: [PATCH 0597/1453] haskell-wreq: disable the test suite to fix the
 build

https://github.com/NixOS/nixpkgs/pull/3795
---
 pkgs/development/libraries/haskell/wreq/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/wreq/default.nix b/pkgs/development/libraries/haskell/wreq/default.nix
index 5a93d023d1b6..d0a3e94fcd26 100644
--- a/pkgs/development/libraries/haskell/wreq/default.nix
+++ b/pkgs/development/libraries/haskell/wreq/default.nix
@@ -20,6 +20,7 @@ cabal.mkDerivation (self: {
     aeson doctest filepath httpClient httpTypes HUnit lens lensAeson
     temporary testFramework testFrameworkHunit text
   ];
+  doCheck = false;
   meta = {
     homepage = "http://www.serpentine.com/wreq";
     description = "An easy-to-use HTTP client library";

From 2aac8ffcd8d1253a0e562a3d92226f95bf0756fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 26 Aug 2014 12:49:33 +0200
Subject: [PATCH 0598/1453] python3Packages: fix some builds

---
 pkgs/top-level/python-packages.nix | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e41a9cf210f7..90bd842ae042 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -278,15 +278,15 @@ rec {
 
 
   alembic = buildPythonPackage rec {
-    name = "alembic-0.6.0";
+    name = "alembic-0.6.6";
 
     src = fetchurl {
       url = "https://pypi.python.org/packages/source/a/alembic/${name}.tar.gz";
-      md5 = "084fe81b48ebae43b0f6031af68a03d6";
+      md5 = "71e4a8f6849e1527abfc4ea33d51f37c";
     };
 
-    buildInputs = [ nose ];
-    propagatedBuildInputs = [ Mako sqlalchemy ];
+    buildInputs = [ nose mock ];
+    propagatedBuildInputs = [ Mako sqlalchemy9 ];
 
     meta = {
       homepage = http://bitbucket.org/zzzeek/alembic;
@@ -3481,11 +3481,11 @@ rec {
   });
 
   fs = buildPythonPackage rec {
-    name = "fs-0.4.0";
+    name = "fs-0.5.0";
 
     src = fetchurl {
-      url    = "https://pyfilesystem.googlecode.com/files/fs-0.4.0.tar.gz";
-      sha256 = "1fk7ilwd01qgj4anw9k1vjp0amxswzzxbp6bk4nncp7210cxp3vz";
+      url    = "https://pypi.python.org/packages/source/f/fs/${name}.tar.gz";
+      sha256 = "144f4yn2nvnxh2vrnmiabpwx3s637np0d1j1w95zym790d66shir";
     };
 
     meta = with stdenv.lib; {
@@ -4702,11 +4702,11 @@ rec {
 
 
   munkres = buildPythonPackage rec {
-    name = "munkres-1.0.5.4";
+    name = "munkres-1.0.6";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/m/munkres/${name}.tar.gz";
-      md5 = "cb9d114fb523428bab4742e88bc83696";
+      md5 = "d7ba3b8c5001578ae229a2d5a655872f";
     };
 
     # error: invalid command 'test'
@@ -4728,6 +4728,11 @@ rec {
       url = "http://pypi.python.org/packages/source/m/musicbrainzngs/${name}.tar.gz";
       md5 = "9e17a181af72d04a291c9a960bc73d44";
     };
+    
+    preCheck = ''
+      export LOCALE_ARCHIVE=${pkgs.glibcLocales}/lib/locale/locale-archive
+      export LC_ALL="en_US.UTF-8"
+    '';
 
     meta = {
       homepage = http://alastair/python-musicbrainz-ngs;

From 9c1ed91d60ccf17005a397b1b14a1326b106457a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 26 Aug 2014 12:35:51 +0200
Subject: [PATCH 0599/1453] haskell-hi: re-generate with cabal2nix

---
 pkgs/development/libraries/haskell/hi/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/hi/default.nix b/pkgs/development/libraries/haskell/hi/default.nix
index 3f9db969c220..0384325c2d70 100644
--- a/pkgs/development/libraries/haskell/hi/default.nix
+++ b/pkgs/development/libraries/haskell/hi/default.nix
@@ -10,7 +10,6 @@ cabal.mkDerivation (self: {
   sha256 = "0h94wjxdr6g6n3rvkn1xsjqr49p9fgidmraifvz5mzryn6rmd18r";
   isLibrary = true;
   isExecutable = true;
-  doCheck = false;
   buildDepends = [
     filepath parsec split template temporaryRc text time
   ];
@@ -18,6 +17,7 @@ cabal.mkDerivation (self: {
     doctest filepath hspec HUnit parsec split template temporaryRc text
     time
   ];
+  doCheck = false;
   meta = {
     homepage = "https://github.com/fujimura/hi";
     description = "Generate scaffold for cabal project";

From 6c3990bfae311238f925002e665e4098b8945c23 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 26 Aug 2014 12:36:54 +0200
Subject: [PATCH 0600/1453] haskell-vty: update to version 5.2.1

---
 .../libraries/haskell/vty/{5.2.0.nix => 5.2.1.nix}            | 4 ++--
 pkgs/top-level/haskell-packages.nix                           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename pkgs/development/libraries/haskell/vty/{5.2.0.nix => 5.2.1.nix} (92%)

diff --git a/pkgs/development/libraries/haskell/vty/5.2.0.nix b/pkgs/development/libraries/haskell/vty/5.2.1.nix
similarity index 92%
rename from pkgs/development/libraries/haskell/vty/5.2.0.nix
rename to pkgs/development/libraries/haskell/vty/5.2.1.nix
index 80ccaf6db8ed..6034807929e3 100644
--- a/pkgs/development/libraries/haskell/vty/5.2.0.nix
+++ b/pkgs/development/libraries/haskell/vty/5.2.1.nix
@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "vty";
-  version = "5.2.0";
-  sha256 = "0mlh90i44fb6hlifb2gwb9ny68zgg7m6xq3v6bz3dmqfz6dnlf8v";
+  version = "5.2.1";
+  sha256 = "15xg7yznizscvyjlnivakrzk60l0a0pigax7sgnn2ab79rfzcxww";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 3427d8109fb4..3ddf87db53de 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2663,8 +2663,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   void = callPackage ../development/libraries/haskell/void {};
 
   vty_4_7_5 = callPackage ../development/libraries/haskell/vty/4.7.5.nix {};
-  vty_5_2_0 = callPackage ../development/libraries/haskell/vty/5.2.0.nix {};
-  vty = self.vty_5_2_0;
+  vty_5_2_1 = callPackage ../development/libraries/haskell/vty/5.2.1.nix {};
+  vty = self.vty_5_2_1;
 
   vtyUi = callPackage ../development/libraries/haskell/vty-ui {
     vty = self.vty_4_7_5;

From 0ac307bd8ac5840b6090f8752e011e5a317b1bf4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 26 Aug 2014 12:38:02 +0200
Subject: [PATCH 0601/1453] haskell-http-conduit: update to version 2.1.4.1

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

diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix
index 132b9722f74b..fd7eb7dd64ae 100644
--- a/pkgs/development/libraries/haskell/http-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/http-conduit/default.nix
@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-conduit";
-  version = "2.1.4";
-  sha256 = "14xfd25y7r2lhg7dx9hfniihgyzhkz4c6642k5pr27fqjjlr6ijb";
+  version = "2.1.4.1";
+  sha256 = "1v65v2dky7vgyh5hfvih208zhbd2czxdrshw9zw0af1naq2m5hk2";
   buildDepends = [
     conduit httpClient httpClientTls httpTypes liftedBase monadControl
     mtl resourcet transformers

From a9c6e7da40d7fa6467d94ac79263b63d436da41e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 26 Aug 2014 12:38:05 +0200
Subject: [PATCH 0602/1453] haskell-json-assertions: update to version 1.0.5

---
 .../libraries/haskell/json-assertions/default.nix      | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/json-assertions/default.nix b/pkgs/development/libraries/haskell/json-assertions/default.nix
index 4ee1f4b57799..9adcaf175726 100644
--- a/pkgs/development/libraries/haskell/json-assertions/default.nix
+++ b/pkgs/development/libraries/haskell/json-assertions/default.nix
@@ -1,17 +1,15 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, aeson, indexed, indexedFree, lens, text }:
+{ cabal, aeson, indexed, indexedFree, lens, lensAeson, text }:
 
 cabal.mkDerivation (self: {
   pname = "json-assertions";
-  version = "1.0.4";
-  sha256 = "07qjbbwmph75s8ds1yfy17ww7x2wcc9bpjpv2bq9ggmzllf6g8l5";
-  buildDepends = [ aeson indexed indexedFree lens text ];
+  version = "1.0.5";
+  sha256 = "1vf6y8xbl48giq1p6d62294rfvfdw62l1q4dspy990ii0v5gkyck";
+  buildDepends = [ aeson indexed indexedFree lens lensAeson text ];
   meta = {
     homepage = "http://github.com/ocharles/json-assertions.git";
     description = "Test that your (Aeson) JSON encoding matches your expectations";
-    broken = true;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = with self.stdenv.lib.maintainers; [ ocharles ];

From f38fabb65d5e30bfb99bba170f99ee4e8a3c40b8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 26 Aug 2014 12:38:07 +0200
Subject: [PATCH 0603/1453] haskell-postgresql-simple: update to version
 0.4.4.0

---
 .../libraries/haskell/postgresql-simple/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/postgresql-simple/default.nix b/pkgs/development/libraries/haskell/postgresql-simple/default.nix
index a3f471fcb4de..0c4fea2da65f 100644
--- a/pkgs/development/libraries/haskell/postgresql-simple/default.nix
+++ b/pkgs/development/libraries/haskell/postgresql-simple/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "postgresql-simple";
-  version = "0.4.3.0";
-  sha256 = "16i1qzshbscnbjb4rxz5hl1iaxjmsc21878prj5pp33zbm53dlcm";
+  version = "0.4.4.0";
+  sha256 = "1rx0rcafiicdv4qbf68dbsfqwiayrl7205dm0c5bdjlvszv576r7";
   buildDepends = [
     aeson attoparsec blazeBuilder blazeTextual hashable postgresqlLibpq
     scientific text time transformers uuid vector

From c4ef244fbe8509d16632ee0d04bdc42e46af60b6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 26 Aug 2014 12:38:31 +0200
Subject: [PATCH 0604/1453] haskell-ghc-syb-utils: update to version 0.2.2

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

diff --git a/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix b/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix
index 7778d3f8e5a0..0c7d5c82f112 100644
--- a/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "ghc-syb-utils";
-  version = "0.2.1.2";
-  sha256 = "12k6a782gv06gmi6dvskzv4ihz54izhqslwa9cgilhsihw557i9p";
+  version = "0.2.2";
+  sha256 = "03r4x3a4hjivxladlw23jk8s2pgfh85lqf196ks1ngyg6ih1g6lk";
   buildDepends = [ syb ];
   meta = {
     homepage = "http://github.com/nominolo/ghc-syb";

From cfdaf6ba7820139e568b08421a40989d51c47789 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 26 Aug 2014 12:38:34 +0200
Subject: [PATCH 0605/1453] haskell-monad-logger: update to version 0.3.7.2

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

diff --git a/pkgs/development/libraries/haskell/monad-logger/default.nix b/pkgs/development/libraries/haskell/monad-logger/default.nix
index cb3a13f8c6ed..d8e724259a0f 100644
--- a/pkgs/development/libraries/haskell/monad-logger/default.nix
+++ b/pkgs/development/libraries/haskell/monad-logger/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "monad-logger";
-  version = "0.3.7.1";
-  sha256 = "0imr1bgcpfm19a91r4i6lii7gycx77ysfrdri030zr2jjrvggh9i";
+  version = "0.3.7.2";
+  sha256 = "03q8l28rwrg00c2zcv0gr5fpis5xz8c5zspziay6p2grbwfxmwda";
   buildDepends = [
     blazeBuilder conduit conduitExtra exceptions fastLogger liftedBase
     monadControl monadLoops mtl resourcet stm stmChans text

From 0a1d52711b3b5b501f358245d28900dfb66891fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 26 Aug 2014 14:41:10 +0200
Subject: [PATCH 0606/1453] pygtk: disable on py3k

---
 pkgs/development/python-modules/pygtk/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pygtk/default.nix b/pkgs/development/python-modules/pygtk/default.nix
index 7d3804d264a6..60aa65323d74 100644
--- a/pkgs/development/python-modules/pygtk/default.nix
+++ b/pkgs/development/python-modules/pygtk/default.nix
@@ -1,8 +1,10 @@
 { stdenv, fetchurl, python, pkgconfig, gtk, pygobject, pycairo
-, buildPythonPackage, libglade ? null }:
+, buildPythonPackage, libglade ? null, isPy3k }:
 
 buildPythonPackage rec {
   name = "pygtk-2.24.0";
+  
+  disabled = isPy3k;
 
   src = fetchurl {
     url = "mirror://gnome/sources/pygtk/2.24/${name}.tar.bz2";

From 3bf6383d6b6897d09696afb6e57876d5a863f0b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 26 Aug 2014 14:41:32 +0200
Subject: [PATCH 0607/1453] gtimelog: 0.8.1 -> 0.9.1, switch to gi

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 90bd842ae042..e6394fa03888 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2189,19 +2189,34 @@ rec {
 
   gtimelog = buildPythonPackage rec {
     name = "gtimelog-${version}";
-    version = "0.8.1";
+    version = "0.9.1";
+    
+    disabled = isPy26;
 
     src = fetchurl {
       url = "https://github.com/gtimelog/gtimelog/archive/${version}.tar.gz";
-      sha256 = "0nwpfv284b26q97mfpagqkqb4n2ilw46cx777qsyi3plnywk1xa0";
+      sha256 = "0qk8fv8cszzqpdi3wl9vvkym1jil502ycn6sic4jrxckw5s9jsfj";
     };
+    
+    preBuild = ''
+      export LOCALE_ARCHIVE=${pkgs.glibcLocales}/lib/locale/locale-archive
+      export LC_ALL="en_US.UTF-8"
+    '';
 
-    propagatedBuildInputs = [ pygtk ];
+    # TODO: AppIndicator
+    propagatedBuildInputs = [ pkgs.gobjectIntrospection pygobject3 pkgs.makeWrapper pkgs.gtk3 ];
 
     checkPhase = ''
-      patchShebangs ./runtests
+      substituteInPlace runtests --replace "/usr/bin/env python" "${python}/bin/${python.executable}"
       ./runtests
     '';
+    
+    preFixup = ''
+        wrapProgram $out/bin/gtimelog \
+          --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+          --prefix LD_LIBRARY_PATH ":" "${pkgs.gtk3}/lib" \
+     
+    '';
 
     meta = with stdenv.lib; {
       description = "A small Gtk+ app for keeping track of your time. It's main goal is to be as unintrusive as possible";

From ce3d23a24dc51440211d5bfe31abc00ec39c1c87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 26 Aug 2014 14:53:45 +0200
Subject: [PATCH 0608/1453] pythonPackages.{beautifulsoup,django_evolution}:
 disable on py3k

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e6394fa03888..b01812de8a9f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -615,6 +615,7 @@ rec {
 
   beautifulsoup = buildPythonPackage (rec {
     name = "beautifulsoup-3.2.1";
+    disabled = isPy3k;
 
     src = fetchurl {
       url = "http://www.crummy.com/software/BeautifulSoup/download/3.x/BeautifulSoup-3.2.1.tar.gz";
@@ -3071,14 +3072,15 @@ rec {
 
 
   django_evolution = buildPythonPackage rec {
-    name = "django_evolution-0.6.9";
+    name = "django_evolution-0.7.3";
+    disabled = isPy3k;
 
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/d/django_evolution/${name}.tar.gz";
-      md5 = "c0d7d10bc41898c88b14d434c48766ff";
+      url = "http://downloads.reviewboard.org/releases/django-evolution/0.7/${name}.tar.gz";
+      md5 = "c51895b6501dd58b0e5dc8f5a5fb6f68";
     };
 
-    propagatedBuildInputs = [ django_1_3 ];
+    propagatedBuildInputs = [ django_1_5 ];
 
     meta = {
       description = "A database schema evolution tool for the Django web framework";

From 4fbeca8823949c388ab2d7c66927374be602b632 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 26 Aug 2014 14:54:05 +0200
Subject: [PATCH 0609/1453] pythonPackages.gtimelog: 0.8.1 -> 0.9.1, use gi
 stack

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b01812de8a9f..112f655f5fa8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2190,34 +2190,19 @@ rec {
 
   gtimelog = buildPythonPackage rec {
     name = "gtimelog-${version}";
-    version = "0.9.1";
-    
-    disabled = isPy26;
+    version = "0.8.1";
 
     src = fetchurl {
       url = "https://github.com/gtimelog/gtimelog/archive/${version}.tar.gz";
-      sha256 = "0qk8fv8cszzqpdi3wl9vvkym1jil502ycn6sic4jrxckw5s9jsfj";
+      sha256 = "0nwpfv284b26q97mfpagqkqb4n2ilw46cx777qsyi3plnywk1xa0";
     };
-    
-    preBuild = ''
-      export LOCALE_ARCHIVE=${pkgs.glibcLocales}/lib/locale/locale-archive
-      export LC_ALL="en_US.UTF-8"
-    '';
 
-    # TODO: AppIndicator
-    propagatedBuildInputs = [ pkgs.gobjectIntrospection pygobject3 pkgs.makeWrapper pkgs.gtk3 ];
+    propagatedBuildInputs = [ pygtk ];
 
     checkPhase = ''
-      substituteInPlace runtests --replace "/usr/bin/env python" "${python}/bin/${python.executable}"
+      patchShebangs ./runtests
       ./runtests
     '';
-    
-    preFixup = ''
-        wrapProgram $out/bin/gtimelog \
-          --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-          --prefix LD_LIBRARY_PATH ":" "${pkgs.gtk3}/lib" \
-     
-    '';
 
     meta = with stdenv.lib; {
       description = "A small Gtk+ app for keeping track of your time. It's main goal is to be as unintrusive as possible";

From 6a12b9ab536de95e0755d11dd6948944be0ebda9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Tue, 26 Aug 2014 14:54:11 +0200
Subject: [PATCH 0610/1453] yoshimi: update from 1.2.2 to 1.2.3

---
 pkgs/applications/audio/yoshimi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix
index 91142691055b..67edc7f521da 100644
--- a/pkgs/applications/audio/yoshimi/default.nix
+++ b/pkgs/applications/audio/yoshimi/default.nix
@@ -6,11 +6,11 @@ assert stdenv ? glibc;
 
 stdenv.mkDerivation  rec {
   name = "yoshimi-${version}";
-  version = "1.2.2";
+  version = "1.2.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/yoshimi/${name}.tar.bz2";
-    sha256 = "1w23ral1qrbg9gqx833giqmchx7952f18yaa52aya9shsdlla83c";
+    sha256 = "00bp699k8gnilin2rvgj35334s9jrizp82qwlmzzvvfliwcgqlqw";
   };
 
   buildInputs = [

From c72fdf4f4899b46c678345f4541ba30fe3639daa Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 26 Aug 2014 15:13:17 +0200
Subject: [PATCH 0611/1453] Manual: Tweak

---
 nixos/doc/manual/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix
index e9f26ea9dd1b..f5cc33919b8f 100644
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@@ -77,7 +77,7 @@ in rec {
         --param chunk.section.depth 1 \
         --param chunk.first.sections 1 \
         --param use.id.as.filename 1 \
-        --stringparam generate.toc "book toc chapter toc" \
+        --stringparam generate.toc "book toc chapter toc appendix toc" \
         --nonet --xinclude --output $dst/ \
         ${docbook5_xsl}/xml/xsl/docbook/xhtml/chunkfast.xsl ./manual.xml
 

From 7f78c366f179fdf2c7ff262e91431286d5163b38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 26 Aug 2014 16:38:15 +0200
Subject: [PATCH 0612/1453] pythonPackages.ipaddr: 2.1.10 -> 2.1.11

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 112f655f5fa8..9382867a07ef 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4021,11 +4021,13 @@ rec {
   };
 
 
-  ipaddr = buildPythonPackage {
-    name = "ipaddr-2.1.10";
+  ipaddr = buildPythonPackage rec {
+    name = "ipaddr-2.1.11";
+    disabled = isPy3k;
+
     src = fetchurl {
-      url = "http://ipaddr-py.googlecode.com/files/ipaddr-2.1.10.tar.gz";
-      sha256 = "18ycwkfk3ypb1yd09wg20r7j7zq2a73d7j6j10qpgra7a7abzhyj";
+      url = "http://pypi.python.org/packages/source/i/ipaddr/${name}.tar.gz";
+      sha256 = "1dwq3ngsapjc93fw61rp17fvzggmab5x1drjzvd4y4q0i255nm8v";
     };
 
     meta = {

From d9772ecc666a0d28a30b41007ba2e90f5c227b7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 26 Aug 2014 16:46:48 +0200
Subject: [PATCH 0613/1453] python3Packages: disable/upgrade bunch of packages

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9382867a07ef..9b958cbd7d28 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3364,6 +3364,7 @@ rec {
 
   flexget = buildPythonPackage rec {
     name = "FlexGet-1.2.161";
+    disabled = isPy3k;
 
     src = fetchurl {
       url = "https://pypi.python.org/packages/source/F/FlexGet/${name}.tar.gz";
@@ -4467,6 +4468,7 @@ rec {
 
   mechanize = buildPythonPackage (rec {
     name = "mechanize-0.1.11";
+    disabled = isPy3k;
 
     src = fetchurl {
       url = "http://wwwsearch.sourceforge.net/mechanize/src/${name}.tar.gz";
@@ -5429,6 +5431,7 @@ rec {
 
   paste = buildPythonPackage rec {
     name = "paste-1.7.5.1";
+    disabled = isPy3k;
 
     src = fetchurl {
       url = http://pypi.python.org/packages/source/P/Paste/Paste-1.7.5.1.tar.gz;
@@ -5447,12 +5450,12 @@ rec {
 
 
   paste_deploy = buildPythonPackage rec {
-    version = "1.5.0";
+    version = "1.5.2";
     name = "paste-deploy-${version}";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/P/PasteDeploy/PasteDeploy-${version}.tar.gz";
-      md5 = "f1a068a0b680493b6eaff3dd7690690f";
+      md5 = "352b7205c78c8de4987578d19431af3b";
     };
 
     buildInputs = [ nose ];
@@ -5588,6 +5591,7 @@ rec {
 
   pika = buildPythonPackage {
     name = "pika-0.9.12";
+    diabled = isPy3k;
     src = fetchurl {
       url = https://pypi.python.org/packages/source/p/pika/pika-0.9.12.tar.gz;
       md5 = "7174fc7cc5570314fa3cfaa729106482";
@@ -6446,6 +6450,7 @@ rec {
 
   ldap = buildPythonPackage rec {
     name = "ldap-2.4.15";
+    disabled = isPy3k;
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/p/python-ldap/python-${name}.tar.gz";
@@ -6845,11 +6850,11 @@ rec {
   reportlab =
    let freetype = overrideDerivation pkgs.freetype (args: { configureFlags = "--enable-static --enable-shared"; });
    in buildPythonPackage rec {
-    name = "reportlab-2.5";
+    name = "reportlab-3.1.8";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/r/reportlab/${name}.tar.gz";
-      md5 = "cdf8b87a6cf1501de1b0a8d341a217d3";
+      md5 = "820a9fda647078503597b85cdba7ed7f";
     };
 
     buildInputs = [freetype];

From 6b404aa265ec6c522e73074c9eb91b692ec68528 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 26 Aug 2014 16:52:28 +0200
Subject: [PATCH 0614/1453] python34Packages.ColanderAlchemy: fix build

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9b958cbd7d28..acd81c84d8d6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1312,7 +1312,7 @@ rec {
     };
 
     buildInputs = [ unittest2 ];
-    propagatedBuildInputs = [ colander sqlalchemy8 ];
+    propagatedBuildInputs = [ colander sqlalchemy9 ];
 
     # string: argument name cannot be overridden via info kwarg.
     doCheck = false;

From a024d92193ad508e0ee9692761f10d6bffce51c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 26 Aug 2014 17:02:00 +0200
Subject: [PATCH 0615/1453] fix eval job

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index acd81c84d8d6..41dbf14a816f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -139,8 +139,8 @@ rec {
 
   pygtk = import ../development/python-modules/pygtk {
     inherit (pkgs) fetchurl stdenv pkgconfig gtk;
-    inherit python buildPythonPackage pygobject pycairo;
-  };
+    inherit python buildPythonPackage pygobject pycairo isPy3k;
+  }; 
 
   # XXX: how can we get an override here?
   #pyGtkGlade = pygtk.override {
@@ -149,7 +149,7 @@ rec {
   pyGtkGlade = import ../development/python-modules/pygtk {
     inherit (pkgs) fetchurl stdenv pkgconfig gtk;
     inherit (pkgs.gnome) libglade;
-    inherit python buildPythonPackage pygobject pycairo;
+    inherit python buildPythonPackage pygobject pycairo isPy3k;
   };
 
   pyqt4 = import ../development/python-modules/pyqt/4.x.nix {
@@ -5225,6 +5225,7 @@ rec {
 
   oauth2 = buildPythonPackage (rec {
     name = "oauth2-1.5.211";
+    disabled = isPy3k;
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/o/oauth2/oauth2-1.5.211.tar.gz";
@@ -9607,6 +9608,7 @@ rec {
   libarchive = buildPythonPackage rec {
     version = "3.1.2-1";
     name = "libarchive-${version}";
+    disabled = isPy3k;
 
     src = fetchurl {
       url = "http://python-libarchive.googlecode.com/files/python-libarchive-${version}.tar.gz";

From 1f2b636ff62ed6df735c6ee187f495c6371d9283 Mon Sep 17 00:00:00 2001
From: Gergely Risko <errge@nilcons.com>
Date: Mon, 25 Aug 2014 21:16:38 +0200
Subject: [PATCH 0616/1453] Fix zlib handling in stdenvLinux

Previously stdenv depended on two different zlibs and there was a third
one in the top-level package set for other purposes.  This commit merges
all this zlibs to one.
---
 pkgs/stdenv/linux/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 1daebd9dd361..6f8b42c2266a 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -225,7 +225,11 @@ rec {
     };
     extraPath = [ stage3.pkgs.xz ];
     overrides = pkgs: {
-      inherit (stage3.pkgs) gettext gnum4 gmp perl glibc;
+      # Zlib has to be inherited and not rebuilt in this stage,
+      # because gcc (since JAR support) already depends on zlib, and
+      # then if we already have a zlib we want to use that for the
+      # other purposes (binutils and top-level pkgs) too.
+      inherit (stage3.pkgs) gettext gnum4 gmp perl glibc zlib;
     };
   };
 
@@ -274,7 +278,7 @@ rec {
       inherit (stage4.pkgs)
         gzip bzip2 xz bash binutils coreutils diffutils findutils gawk
         glibc gnumake gnused gnutar gnugrep gnupatch patchelf
-        attr acl paxctl;
+        attr acl paxctl zlib;
     };
   };
 

From 981d0607f9c8de1502f57526dc7ecbabab54fe8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 26 Aug 2014 17:50:47 +0200
Subject: [PATCH 0617/1453] Revert "pythonPackages.gtimelog: 0.8.1 -> 0.9.1,
 use gi stack"

This reverts commit 4fbeca8823949c388ab2d7c66927374be602b632.

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 41dbf14a816f..eb4f4959a4b6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2190,19 +2190,34 @@ rec {
 
   gtimelog = buildPythonPackage rec {
     name = "gtimelog-${version}";
-    version = "0.8.1";
+    version = "0.9.1";
+    
+    disabled = isPy26;
 
     src = fetchurl {
       url = "https://github.com/gtimelog/gtimelog/archive/${version}.tar.gz";
-      sha256 = "0nwpfv284b26q97mfpagqkqb4n2ilw46cx777qsyi3plnywk1xa0";
+      sha256 = "0qk8fv8cszzqpdi3wl9vvkym1jil502ycn6sic4jrxckw5s9jsfj";
     };
+    
+    preBuild = ''
+      export LOCALE_ARCHIVE=${pkgs.glibcLocales}/lib/locale/locale-archive
+      export LC_ALL="en_US.UTF-8"
+    '';
 
-    propagatedBuildInputs = [ pygtk ];
+    # TODO: AppIndicator
+    propagatedBuildInputs = [ pkgs.gobjectIntrospection pygobject3 pkgs.makeWrapper pkgs.gtk3 ];
 
     checkPhase = ''
-      patchShebangs ./runtests
+      substituteInPlace runtests --replace "/usr/bin/env python" "${python}/bin/${python.executable}"
       ./runtests
     '';
+    
+    preFixup = ''
+        wrapProgram $out/bin/gtimelog \
+          --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+          --prefix LD_LIBRARY_PATH ":" "${pkgs.gtk3}/lib" \
+     
+    '';
 
     meta = with stdenv.lib; {
       description = "A small Gtk+ app for keeping track of your time. It's main goal is to be as unintrusive as possible";

From e81f830114cdeec718a34ab88cceed976043283e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 26 Aug 2014 17:59:35 +0200
Subject: [PATCH 0618/1453] pythonPackages.gcutil: fix build

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index eb4f4959a4b6..071730688103 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3944,11 +3944,11 @@ rec {
   };
 
   httplib2 = buildPythonPackage rec {
-    name = "httplib2-0.9";
+    name = "httplib2-0.8";
 
     src = fetchurl {
       url = "https://pypi.python.org/packages/source/h/httplib2/${name}.tar.gz";
-      sha256 = "1asi5wpncnc6ki3bz33mhb9xh2lrkb24y4qng8bmqnczdmm8rsir";
+      sha256 = "174w6rz4na1sdlfz37h95l0pkfm9igf9nqmhbd8aqh3sm7d9zrff";
     };
 
     meta = {
@@ -4038,12 +4038,12 @@ rec {
 
 
   ipaddr = buildPythonPackage rec {
-    name = "ipaddr-2.1.11";
+    name = "ipaddr-2.1.10";
     disabled = isPy3k;
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/i/ipaddr/${name}.tar.gz";
-      sha256 = "1dwq3ngsapjc93fw61rp17fvzggmab5x1drjzvd4y4q0i255nm8v";
+      sha256 = "18ycwkfk3ypb1yd09wg20r7j7zq2a73d7j6j10qpgra7a7abzhyj";
     };
 
     meta = {

From 8707a070baca84d881a7e03e04a44374d8cc05e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 26 Aug 2014 18:11:26 +0200
Subject: [PATCH 0619/1453] python-packages-generated: fix WebTest

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

diff --git a/pkgs/top-level/python-packages-generated.nix b/pkgs/top-level/python-packages-generated.nix
index 2cf742156a3a..247d18680d96 100644
--- a/pkgs/top-level/python-packages-generated.nix
+++ b/pkgs/top-level/python-packages-generated.nix
@@ -5242,6 +5242,7 @@ in
     doCheck = true;
     buildInputs = [ self."nose-1.3.3" self."unittest2-0.5.1" self."pyquery-1.2.8" self."WSGIProxy2-0.4.1" self."PasteDeploy-1.5.2" self."mock-1.0.1" self."coverage-3.7.1" pkgs.unzip ];
     propagatedBuildInputs = [ self."beautifulsoup4-4.3.2" self."six-1.6.1" self."waitress-0.8.9" self."WebOb-1.4" ];
+    preConfigure = ''substituteInPlace setup.py --replace "nose<1.3.0" "nose"'';
     installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''

From a099ca45054940b63b1615920de158ebafb25ea8 Mon Sep 17 00:00:00 2001
From: Mikey Ariel <mariel@redhat.com>
Date: Sun, 24 Aug 2014 19:18:18 +0200
Subject: [PATCH 0620/1453] Chunk NixOS manual

[Squashed commits to make git blame etc. more likely to work. -ED]
---
 .../manual/administration/boot-problems.xml   |   65 +
 .../manual/administration/cleaning-store.xml  |   62 +
 .../administration/container-networking.xml   |   50 +
 .../doc/manual/administration/containers.xml  |   34 +
 .../manual/administration/control-groups.xml  |   75 +
 .../administration/declarative-containers.xml |   52 +
 .../administration/imperative-containers.xml  |  124 ++
 nixos/doc/manual/administration/logging.xml   |   52 +
 .../administration/maintenance-mode.xml       |   18 +
 .../administration/network-problems.xml       |   33 +
 nixos/doc/manual/administration/rebooting.xml |   44 +
 nixos/doc/manual/administration/rollback.xml  |   48 +
 nixos/doc/manual/administration/running.xml   |   24 +
 .../manual/administration/service-mgmt.xml    |   83 +
 .../administration/store-corruption.xml       |   37 +
 .../manual/administration/troubleshooting.xml |   18 +
 .../manual/administration/user-sessions.xml   |   53 +
 nixos/doc/manual/configuration.xml            | 1563 -----------------
 .../configuration/LUKS-file-systems.xml       |   42 +
 .../doc/manual/configuration/abstractions.xml |  166 ++
 .../configuration/ad-hoc-network-config.xml   |   24 +
 .../manual/configuration/ad-hoc-packages.xml  |   63 +
 .../configuration/adding-custom-packages.xml  |   84 +
 .../doc/manual/configuration/config-file.xml  |  213 +++
 .../manual/configuration/config-syntax.xml    |   27 +
 .../manual/configuration/configuration.xml    |   29 +
 .../configuration/customizing-packages.xml    |   92 +
 .../configuration/declarative-packages.xml    |   43 +
 .../doc/manual/configuration/file-systems.xml |   40 +
 nixos/doc/manual/configuration/firewall.xml   |   38 +
 .../doc/manual/configuration/ipv4-config.xml  |   47 +
 .../doc/manual/configuration/ipv6-config.xml  |   19 +
 .../doc/manual/configuration/linux-kernel.xml |   69 +
 nixos/doc/manual/configuration/modularity.xml |  143 ++
 .../manual/configuration/network-manager.xml  |   27 +
 nixos/doc/manual/configuration/networking.xml |   22 +
 .../doc/manual/configuration/package-mgmt.xml |   34 +
 nixos/doc/manual/configuration/ssh.xml        |   32 +
 nixos/doc/manual/configuration/summary.xml    |  191 ++
 nixos/doc/manual/configuration/user-mgmt.xml  |   95 +
 nixos/doc/manual/configuration/wireless.xml   |   41 +
 nixos/doc/manual/configuration/x-windows.xml  |   94 +
 nixos/doc/manual/containers.xml               |  242 ---
 nixos/doc/manual/development.xml              | 1119 ------------
 .../doc/manual/development/building-nixos.xml |   32 +
 .../doc/manual/development/building-parts.xml |  113 ++
 nixos/doc/manual/development/development.xml  |   20 +
 nixos/doc/manual/development/nixos-tests.xml  |   19 +
 .../development/option-declarations.xml       |  141 ++
 nixos/doc/manual/development/option-def.xml   |  112 ++
 .../development/running-nixos-tests.xml       |   77 +
 nixos/doc/manual/development/sources.xml      |   95 +
 .../manual/development/testing-installer.xml  |   27 +
 .../manual/development/writing-modules.xml    |  175 ++
 .../development/writing-nixos-tests.xml       |  251 +++
 nixos/doc/manual/installation.xml             |  570 ------
 .../manual/installation/changing-config.xml   |   90 +
 .../doc/manual/installation/installation.xml  |   21 +
 .../manual/installation/installing-UEFI.xml   |   51 +
 .../manual/installation/installing-USB.xml    |   30 +
 nixos/doc/manual/installation/installing.xml  |  264 +++
 nixos/doc/manual/installation/obtaining.xml   |   44 +
 nixos/doc/manual/installation/upgrading.xml   |   90 +
 nixos/doc/manual/manual.xml                   |   24 +-
 .../manual/release-notes/release-notes.xml    |   17 +
 nixos/doc/manual/release-notes/rl-1310.xml    |   11 +
 .../rl-1404.xml}                              |   50 +-
 nixos/doc/manual/release-notes/rl-1410.xml    |   22 +
 nixos/doc/manual/running.xml                  |  369 ----
 nixos/doc/manual/troubleshooting.xml          |  199 ---
 70 files changed, 4264 insertions(+), 4121 deletions(-)
 create mode 100644 nixos/doc/manual/administration/boot-problems.xml
 create mode 100644 nixos/doc/manual/administration/cleaning-store.xml
 create mode 100644 nixos/doc/manual/administration/container-networking.xml
 create mode 100644 nixos/doc/manual/administration/containers.xml
 create mode 100644 nixos/doc/manual/administration/control-groups.xml
 create mode 100644 nixos/doc/manual/administration/declarative-containers.xml
 create mode 100644 nixos/doc/manual/administration/imperative-containers.xml
 create mode 100644 nixos/doc/manual/administration/logging.xml
 create mode 100644 nixos/doc/manual/administration/maintenance-mode.xml
 create mode 100644 nixos/doc/manual/administration/network-problems.xml
 create mode 100644 nixos/doc/manual/administration/rebooting.xml
 create mode 100644 nixos/doc/manual/administration/rollback.xml
 create mode 100644 nixos/doc/manual/administration/running.xml
 create mode 100644 nixos/doc/manual/administration/service-mgmt.xml
 create mode 100644 nixos/doc/manual/administration/store-corruption.xml
 create mode 100644 nixos/doc/manual/administration/troubleshooting.xml
 create mode 100644 nixos/doc/manual/administration/user-sessions.xml
 delete mode 100644 nixos/doc/manual/configuration.xml
 create mode 100644 nixos/doc/manual/configuration/LUKS-file-systems.xml
 create mode 100644 nixos/doc/manual/configuration/abstractions.xml
 create mode 100644 nixos/doc/manual/configuration/ad-hoc-network-config.xml
 create mode 100644 nixos/doc/manual/configuration/ad-hoc-packages.xml
 create mode 100644 nixos/doc/manual/configuration/adding-custom-packages.xml
 create mode 100644 nixos/doc/manual/configuration/config-file.xml
 create mode 100644 nixos/doc/manual/configuration/config-syntax.xml
 create mode 100644 nixos/doc/manual/configuration/configuration.xml
 create mode 100644 nixos/doc/manual/configuration/customizing-packages.xml
 create mode 100644 nixos/doc/manual/configuration/declarative-packages.xml
 create mode 100644 nixos/doc/manual/configuration/file-systems.xml
 create mode 100644 nixos/doc/manual/configuration/firewall.xml
 create mode 100644 nixos/doc/manual/configuration/ipv4-config.xml
 create mode 100644 nixos/doc/manual/configuration/ipv6-config.xml
 create mode 100644 nixos/doc/manual/configuration/linux-kernel.xml
 create mode 100644 nixos/doc/manual/configuration/modularity.xml
 create mode 100644 nixos/doc/manual/configuration/network-manager.xml
 create mode 100644 nixos/doc/manual/configuration/networking.xml
 create mode 100644 nixos/doc/manual/configuration/package-mgmt.xml
 create mode 100644 nixos/doc/manual/configuration/ssh.xml
 create mode 100644 nixos/doc/manual/configuration/summary.xml
 create mode 100644 nixos/doc/manual/configuration/user-mgmt.xml
 create mode 100644 nixos/doc/manual/configuration/wireless.xml
 create mode 100644 nixos/doc/manual/configuration/x-windows.xml
 delete mode 100644 nixos/doc/manual/containers.xml
 delete mode 100644 nixos/doc/manual/development.xml
 create mode 100644 nixos/doc/manual/development/building-nixos.xml
 create mode 100644 nixos/doc/manual/development/building-parts.xml
 create mode 100644 nixos/doc/manual/development/development.xml
 create mode 100644 nixos/doc/manual/development/nixos-tests.xml
 create mode 100644 nixos/doc/manual/development/option-declarations.xml
 create mode 100644 nixos/doc/manual/development/option-def.xml
 create mode 100644 nixos/doc/manual/development/running-nixos-tests.xml
 create mode 100644 nixos/doc/manual/development/sources.xml
 create mode 100644 nixos/doc/manual/development/testing-installer.xml
 create mode 100644 nixos/doc/manual/development/writing-modules.xml
 create mode 100644 nixos/doc/manual/development/writing-nixos-tests.xml
 delete mode 100644 nixos/doc/manual/installation.xml
 create mode 100644 nixos/doc/manual/installation/changing-config.xml
 create mode 100644 nixos/doc/manual/installation/installation.xml
 create mode 100644 nixos/doc/manual/installation/installing-UEFI.xml
 create mode 100644 nixos/doc/manual/installation/installing-USB.xml
 create mode 100644 nixos/doc/manual/installation/installing.xml
 create mode 100644 nixos/doc/manual/installation/obtaining.xml
 create mode 100644 nixos/doc/manual/installation/upgrading.xml
 create mode 100644 nixos/doc/manual/release-notes/release-notes.xml
 create mode 100644 nixos/doc/manual/release-notes/rl-1310.xml
 rename nixos/doc/manual/{release-notes.xml => release-notes/rl-1404.xml} (83%)
 create mode 100644 nixos/doc/manual/release-notes/rl-1410.xml
 delete mode 100644 nixos/doc/manual/running.xml
 delete mode 100644 nixos/doc/manual/troubleshooting.xml

diff --git a/nixos/doc/manual/administration/boot-problems.xml b/nixos/doc/manual/administration/boot-problems.xml
new file mode 100644
index 000000000000..be6ff3aac0fe
--- /dev/null
+++ b/nixos/doc/manual/administration/boot-problems.xml
@@ -0,0 +1,65 @@
+<section xmlns="http://docbook.org/ns/docbook"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        version="5.0"
+        xml:id="sec-boot-problems">
+
+<title>Boot Problems</title>
+
+<para>If NixOS fails to boot, there are a number of kernel command
+line parameters that may help you to identify or fix the issue.  You
+can add these parameters in the GRUB boot menu by pressing “e” to
+modify the selected boot entry and editing the line starting with
+<literal>linux</literal>.  The following are some useful kernel command
+line parameters that are recognised by the NixOS boot scripts or by
+systemd:
+
+<variablelist>
+
+  <varlistentry><term><literal>boot.shell_on_fail</literal></term>
+    <listitem><para>Start a root shell if something goes wrong in
+    stage 1 of the boot process (the initial ramdisk).  This is
+    disabled by default because there is no authentication for the
+    root shell.</para></listitem>
+  </varlistentry>
+
+  <varlistentry><term><literal>boot.debug1</literal></term>
+    <listitem><para>Start an interactive shell in stage 1 before
+    anything useful has been done.  That is, no modules have been
+    loaded and no file systems have been mounted, except for
+    <filename>/proc</filename> and
+    <filename>/sys</filename>.</para></listitem>
+  </varlistentry>
+
+  <varlistentry><term><literal>boot.trace</literal></term>
+    <listitem><para>Print every shell command executed by the stage 1
+    and 2 boot scripts.</para></listitem>
+  </varlistentry>
+
+  <varlistentry><term><literal>single</literal></term>
+    <listitem><para>Boot into rescue mode (a.k.a. single user mode).
+    This will cause systemd to start nothing but the unit
+    <literal>rescue.target</literal>, which runs
+    <command>sulogin</command> to prompt for the root password and
+    start a root login shell.  Exiting the shell causes the system to
+    continue with the normal boot process.</para></listitem>
+  </varlistentry>
+
+  <varlistentry><term><literal>systemd.log_level=debug systemd.log_target=console</literal></term>
+    <listitem><para>Make systemd very verbose and send log messages to
+    the console instead of the journal.</para></listitem>
+  </varlistentry>
+
+</variablelist>
+
+For more parameters recognised by systemd, see
+<citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>.</para>
+
+<para>If no login prompts or X11 login screens appear (e.g. due to
+hanging dependencies), you can press Alt+ArrowUp.  If you’re lucky,
+this will start rescue mode (described above).  (Also note that since
+most units have a 90-second timeout before systemd gives up on them,
+the <command>agetty</command> login prompts should appear eventually
+unless something is very wrong.)</para>
+
+</section>
\ No newline at end of file
diff --git a/nixos/doc/manual/administration/cleaning-store.xml b/nixos/doc/manual/administration/cleaning-store.xml
new file mode 100644
index 000000000000..41dc65795b68
--- /dev/null
+++ b/nixos/doc/manual/administration/cleaning-store.xml
@@ -0,0 +1,62 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        version="5.0"
+        xml:id="sec-nix-gc">
+
+<title>Cleaning the Nix Store</title>
+
+<para>Nix has a purely functional model, meaning that packages are
+never upgraded in place.  Instead new versions of packages end up in a
+different location in the Nix store (<filename>/nix/store</filename>).
+You should periodically run Nix’s <emphasis>garbage
+collector</emphasis> to remove old, unreferenced packages.  This is
+easy:
+
+<screen>
+$ nix-collect-garbage
+</screen>
+
+Alternatively, you can use a systemd unit that does the same in the
+background:
+
+<screen>
+$ systemctl start nix-gc.service
+</screen>
+
+You can tell NixOS in <filename>configuration.nix</filename> to run
+this unit automatically at certain points in time, for instance, every
+night at 03:15:
+
+<programlisting>
+nix.gc.automatic = true;
+nix.gc.dates = "03:15";
+</programlisting>
+
+</para>
+
+<para>The commands above do not remove garbage collector roots, such
+as old system configurations.  Thus they do not remove the ability to
+roll back to previous configurations.  The following command deletes
+old roots, removing the ability to roll back to them:
+<screen>
+$ nix-collect-garbage -d
+</screen>
+You can also do this for specific profiles, e.g.
+<screen>
+$ nix-env -p /nix/var/nix/profiles/per-user/eelco/profile --delete-generations old
+</screen>
+Note that NixOS system configurations are stored in the profile
+<filename>/nix/var/nix/profiles/system</filename>.</para>
+
+<para>Another way to reclaim disk space (often as much as 40% of the
+size of the Nix store) is to run Nix’s store optimiser, which seeks
+out identical files in the store and replaces them with hard links to
+a single copy.
+<screen>
+$ nix-store --optimise
+</screen>
+Since this command needs to read the entire Nix store, it can take
+quite a while to finish.</para>
+
+</chapter>
\ No newline at end of file
diff --git a/nixos/doc/manual/administration/container-networking.xml b/nixos/doc/manual/administration/container-networking.xml
new file mode 100644
index 000000000000..adea3e69840d
--- /dev/null
+++ b/nixos/doc/manual/administration/container-networking.xml
@@ -0,0 +1,50 @@
+<section  xmlns="http://docbook.org/ns/docbook"
+          xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xi="http://www.w3.org/2001/XInclude"
+          version="5.0"
+          xml:id="sec-container-networking">
+
+
+<title>Container Networking</title>
+
+<para>When you create a container using <literal>nixos-container
+create</literal>, it gets it own private IPv4 address in the range
+<literal>10.233.0.0/16</literal>. You can get the container’s IPv4
+address as follows:
+
+<screen>
+$ nixos-container show-ip foo
+10.233.4.2
+
+$ ping -c1 10.233.4.2
+64 bytes from 10.233.4.2: icmp_seq=1 ttl=64 time=0.106 ms
+</screen>
+
+</para>
+
+<para>Networking is implemented using a pair of virtual Ethernet
+devices. The network interface in the container is called
+<literal>eth0</literal>, while the matching interface in the host is
+called <literal>ve-<replaceable>container-name</replaceable></literal>
+(e.g., <literal>ve-foo</literal>).  The container has its own network
+namespace and the <literal>CAP_NET_ADMIN</literal> capability, so it
+can perform arbitrary network configuration such as setting up
+firewall rules, without affecting or having access to the host’s
+network.</para>
+
+<para>By default, containers cannot talk to the outside network. If
+you want that, you should set up Network Address Translation (NAT)
+rules on the host to rewrite container traffic to use your external
+IP address. This can be accomplished using the following configuration
+on the host:
+
+<programlisting>
+networking.nat.enable = true;
+networking.nat.internalInterfaces = ["ve-+"];
+networking.nat.externalInterface = "eth0";
+</programlisting>
+where <literal>eth0</literal> should be replaced with the desired
+external interface. Note that <literal>ve-+</literal> is a wildcard
+that matches all container interfaces.</para>
+
+</section>
\ No newline at end of file
diff --git a/nixos/doc/manual/administration/containers.xml b/nixos/doc/manual/administration/containers.xml
new file mode 100644
index 000000000000..4cd2c8ae5563
--- /dev/null
+++ b/nixos/doc/manual/administration/containers.xml
@@ -0,0 +1,34 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        version="5.0"
+        xml:id="ch-containers">
+
+<title>Container Management</title>
+
+<para>NixOS allows you to easily run other NixOS instances as
+<emphasis>containers</emphasis>. Containers are a light-weight
+approach to virtualisation that runs software in the container at the
+same speed as in the host system. NixOS containers share the Nix store
+of the host, making container creation very efficient.</para>
+
+<warning><para>Currently, NixOS containers are not perfectly isolated
+from the host system. This means that a user with root access to the
+container can do things that affect the host. So you should not give
+container root access to untrusted users.</para></warning>
+
+<para>NixOS containers can be created in two ways: imperatively, using
+the command <command>nixos-container</command>, and declaratively, by
+specifying them in your <filename>configuration.nix</filename>. The
+declarative approach implies that containers get upgraded along with
+your host system when you run <command>nixos-rebuild</command>, which
+is often not what you want. By contrast, in the imperative approach,
+containers are configured and updated independently from the host
+system.</para>
+
+<xi:include href="imperative-containers.xml" />
+<xi:include href="declarative-containers.xml" />
+<xi:include href="container-networking.xml" />
+
+</chapter>
+
diff --git a/nixos/doc/manual/administration/control-groups.xml b/nixos/doc/manual/administration/control-groups.xml
new file mode 100644
index 000000000000..86c684cdfe5d
--- /dev/null
+++ b/nixos/doc/manual/administration/control-groups.xml
@@ -0,0 +1,75 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        version="5.0"
+        xml:id="sec-cgroups">
+
+<title>Control Groups</title>
+
+<para>To keep track of the processes in a running system, systemd uses
+<emphasis>control groups</emphasis> (cgroups).  A control group is a
+set of processes used to allocate resources such as CPU, memory or I/O
+bandwidth.  There can be multiple control group hierarchies, allowing
+each kind of resource to be managed independently.</para>
+
+<para>The command <command>systemd-cgls</command> lists all control
+groups in the <literal>systemd</literal> hierarchy, which is what
+systemd uses to keep track of the processes belonging to each service
+or user session:
+
+<screen>
+$ systemd-cgls
+├─user
+│ └─eelco
+│   └─c1
+│     ├─ 2567 -:0
+│     ├─ 2682 kdeinit4: kdeinit4 Running...
+│     ├─ <replaceable>...</replaceable>
+│     └─10851 sh -c less -R
+└─system
+  ├─httpd.service
+  │ ├─2444 httpd -f /nix/store/3pyacby5cpr55a03qwbnndizpciwq161-httpd.conf -DNO_DETACH
+  │ └─<replaceable>...</replaceable>
+  ├─dhcpcd.service
+  │ └─2376 dhcpcd --config /nix/store/f8dif8dsi2yaa70n03xir8r653776ka6-dhcpcd.conf
+  └─ <replaceable>...</replaceable>
+</screen>
+
+Similarly, <command>systemd-cgls cpu</command> shows the cgroups in
+the CPU hierarchy, which allows per-cgroup CPU scheduling priorities.
+By default, every systemd service gets its own CPU cgroup, while all
+user sessions are in the top-level CPU cgroup.  This ensures, for
+instance, that a thousand run-away processes in the
+<literal>httpd.service</literal> cgroup cannot starve the CPU for one
+process in the <literal>postgresql.service</literal> cgroup.  (By
+contrast, it they were in the same cgroup, then the PostgreSQL process
+would get 1/1001 of the cgroup’s CPU time.)  You can limit a service’s
+CPU share in <filename>configuration.nix</filename>:
+
+<programlisting>
+systemd.services.httpd.serviceConfig.CPUShares = 512;
+</programlisting>
+
+By default, every cgroup has 1024 CPU shares, so this will halve the
+CPU allocation of the <literal>httpd.service</literal> cgroup.</para>
+
+<para>There also is a <literal>memory</literal> hierarchy that
+controls memory allocation limits; by default, all processes are in
+the top-level cgroup, so any service or session can exhaust all
+available memory.  Per-cgroup memory limits can be specified in
+<filename>configuration.nix</filename>; for instance, to limit
+<literal>httpd.service</literal> to 512 MiB of RAM (excluding swap)
+and 640 MiB of RAM (including swap):
+
+<programlisting>
+systemd.services.httpd.serviceConfig.MemoryLimit = "512M";
+systemd.services.httpd.serviceConfig.ControlGroupAttribute = [ "memory.memsw.limit_in_bytes 640M" ];
+</programlisting>
+
+</para>
+
+<para>The command <command>systemd-cgtop</command> shows a
+continuously updated list of all cgroups with their CPU and memory
+usage.</para>
+
+</chapter>
\ No newline at end of file
diff --git a/nixos/doc/manual/administration/declarative-containers.xml b/nixos/doc/manual/administration/declarative-containers.xml
new file mode 100644
index 000000000000..177ebdd8db17
--- /dev/null
+++ b/nixos/doc/manual/administration/declarative-containers.xml
@@ -0,0 +1,52 @@
+<section  xmlns="http://docbook.org/ns/docbook"
+          xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xi="http://www.w3.org/2001/XInclude"
+          version="5.0"
+          xml:id="sec-declarative-containers">
+
+<title>Declarative Container Specification</title>
+
+<para>You can also specify containers and their configuration in the
+host’s <filename>configuration.nix</filename>.  For example, the
+following specifies that there shall be a container named
+<literal>database</literal> running PostgreSQL:
+
+<programlisting>
+containers.database =
+  { config =
+      { config, pkgs, ... }:
+      { services.postgresql.enable = true;
+        services.postgresql.package = pkgs.postgresql92;
+      };
+  };
+</programlisting>
+
+If you run <literal>nixos-rebuild switch</literal>, the container will
+be built and started. If the container was already running, it will be
+updated in place, without rebooting.</para>
+
+<para>By default, declarative containers share the network namespace
+of the host, meaning that they can listen on (privileged)
+ports. However, they cannot change the network configuration. You can
+give a container its own network as follows:
+
+<programlisting>
+containers.database =
+  { privateNetwork = true;
+    hostAddress = "192.168.100.10";
+    localAddress = "192.168.100.11";
+  };
+</programlisting>
+
+This gives the container a private virtual Ethernet interface with IP
+address <literal>192.168.100.11</literal>, which is hooked up to a
+virtual Ethernet interface on the host with IP address
+<literal>192.168.100.10</literal>.  (See the next section for details
+on container networking.)</para>
+
+<para>To disable the container, just remove it from
+<filename>configuration.nix</filename> and run <literal>nixos-rebuild
+switch</literal>. Note that this will not delete the root directory of
+the container in <literal>/var/lib/containers</literal>.</para>
+
+</section>
\ No newline at end of file
diff --git a/nixos/doc/manual/administration/imperative-containers.xml b/nixos/doc/manual/administration/imperative-containers.xml
new file mode 100644
index 000000000000..6131d4e04ea8
--- /dev/null
+++ b/nixos/doc/manual/administration/imperative-containers.xml
@@ -0,0 +1,124 @@
+<section  xmlns="http://docbook.org/ns/docbook"
+          xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xi="http://www.w3.org/2001/XInclude"
+          version="5.0"
+          xml:id="sec-imperative-containers">
+
+<title>Imperative Container Management</title>
+
+<para>We’ll cover imperative container management using
+<command>nixos-container</command> first. You create a container with
+identifier <literal>foo</literal> as follows:
+
+<screen>
+$ nixos-container create foo
+</screen>
+
+This creates the container’s root directory in
+<filename>/var/lib/containers/foo</filename> and a small configuration
+file in <filename>/etc/containers/foo.conf</filename>. It also builds
+the container’s initial system configuration and stores it in
+<filename>/nix/var/nix/profiles/per-container/foo/system</filename>. You
+can modify the initial configuration of the container on the command
+line. For instance, to create a container that has
+<command>sshd</command> running, with the given public key for
+<literal>root</literal>:
+
+<screen>
+$ nixos-container create foo --config 'services.openssh.enable = true; \
+  users.extraUsers.root.openssh.authorizedKeys.keys = ["ssh-dss AAAAB3N…"];'
+</screen>
+
+</para>
+
+<para>Creating a container does not start it. To start the container,
+run:
+
+<screen>
+$ nixos-container start foo
+</screen>
+
+This command will return as soon as the container has booted and has
+reached <literal>multi-user.target</literal>. On the host, the
+container runs within a systemd unit called
+<literal>container@<replaceable>container-name</replaceable>.service</literal>.
+Thus, if something went wrong, you can get status info using
+<command>systemctl</command>:
+
+<screen>
+$ systemctl status container@foo
+</screen>
+
+</para>
+
+<para>If the container has started succesfully, you can log in as
+root using the <command>root-login</command> operation:
+
+<screen>
+$ nixos-container root-login foo
+[root@foo:~]#
+</screen>
+
+Note that only root on the host can do this (since there is no
+authentication).  You can also get a regular login prompt using the
+<command>login</command> operation, which is available to all users on
+the host:
+
+<screen>
+$ nixos-container login foo
+foo login: alice
+Password: ***
+</screen>
+
+With <command>nixos-container run</command>, you can execute arbitrary
+commands in the container:
+
+<screen>
+$ nixos-container run foo -- uname -a
+Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux
+</screen>
+
+</para>
+
+<para>There are several ways to change the configuration of the
+container. First, on the host, you can edit
+<literal>/var/lib/container/<replaceable>name</replaceable>/etc/nixos/configuration.nix</literal>,
+and run
+
+<screen>
+$ nixos-container update foo
+</screen>
+
+This will build and activate the new configuration. You can also
+specify a new configuration on the command line:
+
+<screen>
+$ nixos-container update foo --config 'services.httpd.enable = true; \
+  services.httpd.adminAddr = "foo@example.org";'
+
+$ curl http://$(nixos-container show-ip foo)/
+&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">…
+</screen>
+
+However, note that this will overwrite the container’s
+<filename>/etc/nixos/configuration.nix</filename>.</para>
+
+<para>Alternatively, you can change the configuration from within the
+container itself by running <command>nixos-rebuild switch</command>
+inside the container. Note that the container by default does not have
+a copy of the NixOS channel, so you should run <command>nix-channel
+--update</command> first.</para>
+
+<para>Containers can be stopped and started using
+<literal>nixos-container stop</literal> and <literal>nixos-container
+start</literal>, respectively, or by using
+<command>systemctl</command> on the container’s service unit. To
+destroy a container, including its file system, do
+
+<screen>
+$ nixos-container destroy foo
+</screen>
+
+</para>
+
+</section>
\ No newline at end of file
diff --git a/nixos/doc/manual/administration/logging.xml b/nixos/doc/manual/administration/logging.xml
new file mode 100644
index 000000000000..1d5df7770e29
--- /dev/null
+++ b/nixos/doc/manual/administration/logging.xml
@@ -0,0 +1,52 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        version="5.0"
+        xml:id="sec-logging">
+
+<title>Logging</title>
+
+<para>System-wide logging is provided by systemd’s
+<emphasis>journal</emphasis>, which subsumes traditional logging
+daemons such as syslogd and klogd.  Log entries are kept in binary
+files in <filename>/var/log/journal/</filename>.  The command
+<literal>journalctl</literal> allows you to see the contents of the
+journal.  For example,
+
+<screen>
+$ journalctl -b
+</screen>
+
+shows all journal entries since the last reboot.  (The output of
+<command>journalctl</command> is piped into <command>less</command> by
+default.)  You can use various options and match operators to restrict
+output to messages of interest.  For instance, to get all messages
+from PostgreSQL:
+
+<screen>
+$ journalctl -u postgresql.service
+-- Logs begin at Mon, 2013-01-07 13:28:01 CET, end at Tue, 2013-01-08 01:09:57 CET. --
+...
+Jan 07 15:44:14 hagbard postgres[2681]: [2-1] LOG:  database system is shut down
+-- Reboot --
+Jan 07 15:45:10 hagbard postgres[2532]: [1-1] LOG:  database system was shut down at 2013-01-07 15:44:14 CET
+Jan 07 15:45:13 hagbard postgres[2500]: [1-1] LOG:  database system is ready to accept connections
+</screen>
+
+Or to get all messages since the last reboot that have at least a
+“critical” severity level:
+
+<screen>
+$ journalctl -b -p crit
+Dec 17 21:08:06 mandark sudo[3673]: pam_unix(sudo:auth): auth could not identify password for [alice]
+Dec 29 01:30:22 mandark kernel[6131]: [1053513.909444] CPU6: Core temperature above threshold, cpu clock throttled (total events = 1)
+</screen>
+
+</para>
+
+<para>The system journal is readable by root and by users in the
+<literal>wheel</literal> and <literal>systemd-journal</literal>
+groups.  All users have a private journal that can be read using
+<command>journalctl</command>.</para>
+
+</chapter>
\ No newline at end of file
diff --git a/nixos/doc/manual/administration/maintenance-mode.xml b/nixos/doc/manual/administration/maintenance-mode.xml
new file mode 100644
index 000000000000..15c1f902da79
--- /dev/null
+++ b/nixos/doc/manual/administration/maintenance-mode.xml
@@ -0,0 +1,18 @@
+<section xmlns="http://docbook.org/ns/docbook"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        version="5.0"
+        xml:id="sec-maintenance-mode">
+
+<title>Maintenance Mode</title>
+
+<para>You can enter rescue mode by running:
+
+<screen>
+$ systemctl rescue</screen>
+
+This will eventually give you a single-user root shell.  Systemd will
+stop (almost) all system services.  To get out of maintenance mode,
+just exit from the rescue shell.</para>
+
+</section>
\ No newline at end of file
diff --git a/nixos/doc/manual/administration/network-problems.xml b/nixos/doc/manual/administration/network-problems.xml
new file mode 100644
index 000000000000..5ba1bfd5ac9a
--- /dev/null
+++ b/nixos/doc/manual/administration/network-problems.xml
@@ -0,0 +1,33 @@
+<section xmlns="http://docbook.org/ns/docbook"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        version="5.0"
+        xml:id="sec-nix-network-issues">
+
+<title>Network Problems</title>
+
+<para>Nix uses a so-called <emphasis>binary cache</emphasis> to
+optimise building a package from source into downloading it as a
+pre-built binary.  That is, whenever a command like
+<command>nixos-rebuild</command> needs a path in the Nix store, Nix
+will try to download that path from the Internet rather than build it
+from source.  The default binary cache is
+<uri>http://cache.nixos.org/</uri>.  If this cache is unreachable, Nix
+operations may take a long time due to HTTP connection timeouts.  You
+can disable the use of the binary cache by adding <option>--option
+use-binary-caches false</option>, e.g.
+
+<screen>
+$ nixos-rebuild switch --option use-binary-caches false
+</screen>
+
+If you have an alternative binary cache at your disposal, you can use
+it instead:
+
+<screen>
+$ nixos-rebuild switch --option binary-caches http://my-cache.example.org/
+</screen>
+
+</para>
+
+</section>
\ No newline at end of file
diff --git a/nixos/doc/manual/administration/rebooting.xml b/nixos/doc/manual/administration/rebooting.xml
new file mode 100644
index 000000000000..d1db7b141cf2
--- /dev/null
+++ b/nixos/doc/manual/administration/rebooting.xml
@@ -0,0 +1,44 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        version="5.0"
+        xml:id="sec-rebooting">
+
+<title>Rebooting and Shutting Down</title>
+
+<para>The system can be shut down (and automatically powered off) by
+doing:
+
+<screen>
+$ shutdown
+</screen>
+
+This is equivalent to running <command>systemctl
+poweroff</command>.</para>
+
+<para>To reboot the system, run
+
+<screen>
+$ reboot
+</screen>
+
+which is equivalent to <command>systemctl reboot</command>.
+Alternatively, you can quickly reboot the system using
+<literal>kexec</literal>, which bypasses the BIOS by directly loading
+the new kernel into memory:
+
+<screen>
+$ systemctl kexec
+</screen>
+
+</para>
+
+<para>The machine can be suspended to RAM (if supported) using
+<command>systemctl suspend</command>, and suspended to disk using
+<command>systemctl hibernate</command>.</para>
+
+<para>These commands can be run by any user who is logged in locally,
+i.e. on a virtual console or in X11; otherwise, the user is asked for
+authentication.</para>
+
+</chapter>
\ No newline at end of file
diff --git a/nixos/doc/manual/administration/rollback.xml b/nixos/doc/manual/administration/rollback.xml
new file mode 100644
index 000000000000..23a3ece7c070
--- /dev/null
+++ b/nixos/doc/manual/administration/rollback.xml
@@ -0,0 +1,48 @@
+<section xmlns="http://docbook.org/ns/docbook"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        version="5.0"
+        xml:id="sec-rollback">
+
+<title>Rolling Back Configuration Changes</title>
+
+<para>After running <command>nixos-rebuild</command> to switch to a
+new configuration, you may find that the new configuration doesn’t
+work very well.  In that case, there are several ways to return to a
+previous configuration.</para>
+
+<para>First, the GRUB boot manager allows you to boot into any
+previous configuration that hasn’t been garbage-collected.  These
+configurations can be found under the GRUB submenu “NixOS - All
+configurations”.  This is especially useful if the new configuration
+fails to boot.  After the system has booted, you can make the selected
+configuration the default for subsequent boots:
+
+<screen>
+$ /run/current-system/bin/switch-to-configuration boot</screen>
+
+</para>
+
+<para>Second, you can switch to the previous configuration in a running
+system:
+
+<screen>
+$ nixos-rebuild switch --rollback</screen>
+
+This is equivalent to running:
+
+<screen>
+$ /nix/var/nix/profiles/system-<replaceable>N</replaceable>-link/bin/switch-to-configuration switch</screen>
+
+where <replaceable>N</replaceable> is the number of the NixOS system
+configuration.  To get a list of the available configurations, do:
+
+<screen>
+$ ls -l /nix/var/nix/profiles/system-*-link
+<replaceable>...</replaceable>
+lrwxrwxrwx 1 root root 78 Aug 12 13:54 /nix/var/nix/profiles/system-268-link -> /nix/store/202b...-nixos-13.07pre4932_5a676e4-4be1055
+</screen>
+
+</para>
+
+</section>
\ No newline at end of file
diff --git a/nixos/doc/manual/administration/running.xml b/nixos/doc/manual/administration/running.xml
new file mode 100644
index 000000000000..9091511ed527
--- /dev/null
+++ b/nixos/doc/manual/administration/running.xml
@@ -0,0 +1,24 @@
+<part xmlns="http://docbook.org/ns/docbook"
+      xmlns:xlink="http://www.w3.org/1999/xlink"
+      xmlns:xi="http://www.w3.org/2001/XInclude"
+      version="5.0"
+      xml:id="ch-running">
+
+<title>Administration</title>
+
+<partintro>
+<para>This chapter describes various aspects of managing a running
+NixOS system, such as how to use the <command>systemd</command>
+service manager.</para>
+</partintro>
+
+<xi:include href="service-mgmt.xml" />
+<xi:include href="rebooting.xml" />
+<xi:include href="user-sessions.xml" />
+<xi:include href="control-groups.xml" />
+<xi:include href="logging.xml" />
+<xi:include href="cleaning-store.xml" />
+<xi:include href="containers.xml" />
+<xi:include href="troubleshooting.xml" />
+
+</part>
diff --git a/nixos/doc/manual/administration/service-mgmt.xml b/nixos/doc/manual/administration/service-mgmt.xml
new file mode 100644
index 000000000000..c0940a42f307
--- /dev/null
+++ b/nixos/doc/manual/administration/service-mgmt.xml
@@ -0,0 +1,83 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="sec-systemctl">
+
+<title>Service Management</title>
+
+<para>In NixOS, all system services are started and monitored using
+the systemd program.  Systemd is the “init” process of the system
+(i.e. PID 1), the parent of all other processes.  It manages a set of
+so-called “units”, which can be things like system services
+(programs), but also mount points, swap files, devices, targets
+(groups of units) and more.  Units can have complex dependencies; for
+instance, one unit can require that another unit must be successfully
+started before the first unit can be started.  When the system boots,
+it starts a unit named <literal>default.target</literal>; the
+dependencies of this unit cause all system services to be started,
+file systems to be mounted, swap files to be activated, and so
+on.</para>
+
+<para>The command <command>systemctl</command> is the main way to
+interact with <command>systemd</command>.  Without any arguments, it
+shows the status of active units:
+
+<screen>
+$ systemctl
+-.mount          loaded active mounted   /
+swapfile.swap    loaded active active    /swapfile
+sshd.service     loaded active running   SSH Daemon
+graphical.target loaded active active    Graphical Interface
+<replaceable>...</replaceable>
+</screen>
+
+</para>
+
+<para>You can ask for detailed status information about a unit, for
+instance, the PostgreSQL database service:
+
+<screen>
+$ systemctl status postgresql.service
+postgresql.service - PostgreSQL Server
+          Loaded: loaded (/nix/store/pn3q73mvh75gsrl8w7fdlfk3fq5qm5mw-unit/postgresql.service)
+          Active: active (running) since Mon, 2013-01-07 15:55:57 CET; 9h ago
+        Main PID: 2390 (postgres)
+          CGroup: name=systemd:/system/postgresql.service
+                  ├─2390 postgres
+                  ├─2418 postgres: writer process
+                  ├─2419 postgres: wal writer process
+                  ├─2420 postgres: autovacuum launcher process
+                  ├─2421 postgres: stats collector process
+                  └─2498 postgres: zabbix zabbix [local] idle
+
+Jan 07 15:55:55 hagbard postgres[2394]: [1-1] LOG:  database system was shut down at 2013-01-07 15:55:05 CET
+Jan 07 15:55:57 hagbard postgres[2390]: [1-1] LOG:  database system is ready to accept connections
+Jan 07 15:55:57 hagbard postgres[2420]: [1-1] LOG:  autovacuum launcher started
+Jan 07 15:55:57 hagbard systemd[1]: Started PostgreSQL Server.
+</screen>
+
+Note that this shows the status of the unit (active and running), all
+the processes belonging to the service, as well as the most recent log
+messages from the service.
+
+</para>
+
+<para>Units can be stopped, started or restarted:
+
+<screen>
+$ systemctl stop postgresql.service
+$ systemctl start postgresql.service
+$ systemctl restart postgresql.service
+</screen>
+
+These operations are synchronous: they wait until the service has
+finished starting or stopping (or has failed).  Starting a unit will
+cause the dependencies of that unit to be started as well (if
+necessary).</para>
+
+<!-- - cgroups: each service and user session is a cgroup
+
+- cgroup resource management -->
+
+</chapter>
diff --git a/nixos/doc/manual/administration/store-corruption.xml b/nixos/doc/manual/administration/store-corruption.xml
new file mode 100644
index 000000000000..0160cb45358b
--- /dev/null
+++ b/nixos/doc/manual/administration/store-corruption.xml
@@ -0,0 +1,37 @@
+<section xmlns="http://docbook.org/ns/docbook"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        version="5.0"
+        xml:id="sec-nix-store-corruption">
+
+<title>Nix Store Corruption</title>
+
+<para>After a system crash, it’s possible for files in the Nix store
+to become corrupted.  (For instance, the Ext4 file system has the
+tendency to replace un-synced files with zero bytes.)  NixOS tries
+hard to prevent this from happening: it performs a
+<command>sync</command> before switching to a new configuration, and
+Nix’s database is fully transactional.  If corruption still occurs,
+you may be able to fix it automatically.</para>
+
+<para>If the corruption is in a path in the closure of the NixOS
+system configuration, you can fix it by doing
+
+<screen>
+$ nixos-rebuild switch --repair
+</screen>
+
+This will cause Nix to check every path in the closure, and if its
+cryptographic hash differs from the hash recorded in Nix’s database,
+the path is rebuilt or redownloaded.</para>
+
+<para>You can also scan the entire Nix store for corrupt paths:
+
+<screen>
+$ nix-store --verify --check-contents --repair
+</screen>
+
+Any corrupt paths will be redownloaded if they’re available in a
+binary cache; otherwise, they cannot be repaired.</para>
+
+</section>
\ No newline at end of file
diff --git a/nixos/doc/manual/administration/troubleshooting.xml b/nixos/doc/manual/administration/troubleshooting.xml
new file mode 100644
index 000000000000..351fb1883310
--- /dev/null
+++ b/nixos/doc/manual/administration/troubleshooting.xml
@@ -0,0 +1,18 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        version="5.0"
+        xml:id="ch-troubleshooting">
+
+<title>Troubleshooting</title>
+
+<para>This chapter describes solutions to common problems you might
+encounter when you manage your NixOS system.</para>
+
+<xi:include href="boot-problems.xml" />
+<xi:include href="maintenance-mode.xml" />
+<xi:include href="rollback.xml" />
+<xi:include href="store-corruption.xml" />
+<xi:include href="network-problems.xml" />
+
+</chapter>
diff --git a/nixos/doc/manual/administration/user-sessions.xml b/nixos/doc/manual/administration/user-sessions.xml
new file mode 100644
index 000000000000..05e2c1a9b29f
--- /dev/null
+++ b/nixos/doc/manual/administration/user-sessions.xml
@@ -0,0 +1,53 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        version="5.0"
+        xml:id="sec-user-sessions">
+
+<title>User Sessions</title>
+
+<para>Systemd keeps track of all users who are logged into the system
+(e.g. on a virtual console or remotely via SSH).  The command
+<command>loginctl</command> allows querying and manipulating user
+sessions.  For instance, to list all user sessions:
+
+<screen>
+$ loginctl
+   SESSION        UID USER             SEAT
+        c1        500 eelco            seat0
+        c3          0 root             seat0
+        c4        500 alice
+</screen>
+
+This shows that two users are logged in locally, while another is
+logged in remotely.  (“Seats” are essentially the combinations of
+displays and input devices attached to the system; usually, there is
+only one seat.)  To get information about a session:
+
+<screen>
+$ loginctl session-status c3
+c3 - root (0)
+           Since: Tue, 2013-01-08 01:17:56 CET; 4min 42s ago
+          Leader: 2536 (login)
+            Seat: seat0; vc3
+             TTY: /dev/tty3
+         Service: login; type tty; class user
+           State: online
+          CGroup: name=systemd:/user/root/c3
+                  ├─ 2536 /nix/store/10mn4xip9n7y9bxqwnsx7xwx2v2g34xn-shadow-4.1.5.1/bin/login --
+                  ├─10339 -bash
+                  └─10355 w3m nixos.org
+</screen>
+
+This shows that the user is logged in on virtual console 3.  It also
+lists the processes belonging to this session.  Since systemd keeps
+track of this, you can terminate a session in a way that ensures that
+all the session’s processes are gone:
+
+<screen>
+$ loginctl terminate-session c3
+</screen>
+
+</para>
+
+</chapter>
\ No newline at end of file
diff --git a/nixos/doc/manual/configuration.xml b/nixos/doc/manual/configuration.xml
deleted file mode 100644
index 64372f3bbf14..000000000000
--- a/nixos/doc/manual/configuration.xml
+++ /dev/null
@@ -1,1563 +0,0 @@
-<chapter xmlns="http://docbook.org/ns/docbook"
-         xmlns:xlink="http://www.w3.org/1999/xlink"
-         xml:id="ch-configuration">
-
-<title>Configuring NixOS</title>
-
-<para>This chapter describes how to configure various aspects of a
-NixOS machine through the configuration file
-<filename>/etc/nixos/configuration.nix</filename>.  As described in
-<xref linkend="sec-changing-config" />, changes to this file only take
-effect after you run <command>nixos-rebuild</command>.</para>
-
-
-<!--===============================================================-->
-
-<section xml:id="sec-configuration-syntax"><title>Configuration syntax</title>
-
-<section><title>The basics</title>
-
-<para>The NixOS configuration file
-<filename>/etc/nixos/configuration.nix</filename> is actually a
-<emphasis>Nix expression</emphasis>, which is the Nix package
-manager’s purely functional language for describing how to build
-packages and configurations.  This means you have all the expressive
-power of that language at your disposal, including the ability to
-abstract over common patterns, which is very useful when managing
-complex systems.  The syntax and semantics of the Nix language are
-fully described in the <link
-xlink:href="http://nixos.org/nix/manual/#chap-writing-nix-expressions">Nix
-manual</link>, but here we give a short overview of the most important
-constructs useful in NixOS configuration files.</para>
-
-<para>The NixOS configuration file generally looks like this:
-
-<programlisting>
-{ config, pkgs, ... }:
-
-{ <replaceable>option definitions</replaceable>
-}
-</programlisting>
-
-The first line (<literal>{ config, pkgs, ... }:</literal>) denotes
-that this is actually a function that takes at least the two arguments
- <varname>config</varname> and <varname>pkgs</varname>.  (These are
-explained later.)  The function returns a <emphasis>set</emphasis> of
-option definitions (<literal>{ <replaceable>...</replaceable> }</literal>).  These definitions have the
-form <literal><replaceable>name</replaceable> =
-<replaceable>value</replaceable></literal>, where
-<replaceable>name</replaceable> is the name of an option and
-<replaceable>value</replaceable> is its value.  For example,
-
-<programlisting>
-{ config, pkgs, ... }:
-
-{ services.httpd.enable = true;
-  services.httpd.adminAddr = "alice@example.org";
-  services.httpd.documentRoot = "/webroot";
-}
-</programlisting>
-
-defines a configuration with three option definitions that together
-enable the Apache HTTP Server with <filename>/webroot</filename> as
-the document root.</para>
-
-<para>Sets can be nested, and in fact dots in option names are
-shorthand for defining a set containing another set.  For instance,
-<option>services.httpd.enable</option> defines a set named
-<varname>services</varname> that contains a set named
-<varname>httpd</varname>, which in turn contains an option definition
-named <varname>enable</varname> with value <literal>true</literal>.
-This means that the example above can also be written as:
-
-<programlisting>
-{ config, pkgs, ... }:
-
-{ services = {
-    httpd = {
-      enable = true;
-      adminAddr = "alice@example.org";
-      documentRoot = "/webroot";
-    };
-  };
-}
-</programlisting>
-
-which may be more convenient if you have lots of option definitions
-that share the same prefix (such as
-<literal>services.httpd</literal>).</para>
-
-<para>NixOS checks your option definitions for correctness.  For
-instance, if you try to define an option that doesn’t exist (that is,
-doesn’t have a corresponding <emphasis>option declaration</emphasis>),
-<command>nixos-rebuild</command> will give an error like:
-<screen>
-The option `services.httpd.enabl' defined in `/etc/nixos/configuration.nix' does not exist.
-</screen>
-Likewise, values in option definitions must have a correct type.  For
-instance, <option>services.httpd.enable</option> must be a Boolean
-(<literal>true</literal> or <literal>false</literal>).  Trying to give
-it a value of another type, such as a string, will cause an error:
-<screen>
-The option value `services.httpd.enable' in `/etc/nixos/configuration.nix' is not a boolean.
-</screen>
-
-</para>
-
-<para>Options have various types of values.  The most important are:
-
-<variablelist>
-  <varlistentry>
-    <term>Strings</term>
-    <listitem>
-      <para>Strings are enclosed in double quotes, e.g.
-
-<programlisting>
-networking.hostName = "dexter";
-</programlisting>
-
-      Special characters can be escaped by prefixing them with a
-      backslash (e.g. <literal>\"</literal>).</para>
-
-      <para>Multi-line strings can be enclosed in <emphasis>double
-      single quotes</emphasis>, e.g.
-
-<programlisting>
-networking.extraHosts =
-  ''
-    127.0.0.2 other-localhost
-    10.0.0.1 server
-  '';
-</programlisting>
-
-      The main difference is that preceding whitespace is
-      automatically stripped from each line, and that characters like
-      <literal>"</literal> and <literal>\</literal> are not special
-      (making it more convenient for including things like shell
-      code).</para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>Booleans</term>
-    <listitem>
-      <para>These can be <literal>true</literal> or
-      <literal>false</literal>, e.g.
-
-<programlisting>
-networking.firewall.enable = true;
-networking.firewall.allowPing = false;
-</programlisting>
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>Integers</term>
-    <listitem>
-      <para>For example,
-
-<programlisting>
-boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 60;
-</programlisting>
-
-      (Note that here the attribute name
-      <literal>net.ipv4.tcp_keepalive_time</literal> is enclosed in
-      quotes to prevent it from being interpreted as a set named
-      <literal>net</literal> containing a set named
-      <literal>ipv4</literal>, and so on.  This is because it’s not a
-      NixOS option but the literal name of a Linux kernel
-      setting.)</para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>Sets</term>
-    <listitem>
-      <para>Sets were introduced above.  They are name/value pairs
-      enclosed in braces, as in the option definition
-
-<programlisting>
-fileSystems."/boot" =
-  { device = "/dev/sda1";
-    fsType = "ext4";
-    options = "rw,data=ordered,relatime";
-  };
-</programlisting>
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>Lists</term>
-    <listitem>
-      <para>The important thing to note about lists is that list
-      elements are separated by whitespace, like this:
-
-<programlisting>
-boot.kernelModules = [ "fuse" "kvm-intel" "coretemp" ];
-</programlisting>
-
-      List elements can be any other type, e.g. sets:
-
-<programlisting>
-swapDevices = [ { device = "/dev/disk/by-label/swap"; } ];
-</programlisting>
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>Packages</term>
-    <listitem>
-      <para>Usually, the packages you need are already part of the Nix
-      Packages collection, which is a set that can be accessed through
-      the function argument <varname>pkgs</varname>.  Typical uses:
-
-<programlisting>
-environment.systemPackages =
-  [ pkgs.thunderbird
-    pkgs.emacs
-  ];
-
-postgresql.package = pkgs.postgresql90;
-</programlisting>
-
-      The latter option definition changes the default PostgreSQL
-      package used by NixOS’s PostgreSQL service to 9.0.  For more
-      information on packages, including how to add new ones, see
-      <xref linkend="sec-custom-packages"/>.</para>
-    </listitem>
-  </varlistentry>
-
-</variablelist>
-
-</para>
-
-</section>
-
-
-<section xml:id="sec-module-abstractions"><title>Abstractions</title>
-
-<para>If you find yourself repeating yourself over and over, it’s time
-to abstract.  Take, for instance, this Apache HTTP Server configuration:
-
-<programlisting>
-{
-  services.httpd.virtualHosts =
-    [ { hostName = "example.org";
-        documentRoot = "/webroot";
-        adminAddr = "alice@example.org";
-        enableUserDir = true;
-      }
-      { hostName = "example.org";
-        documentRoot = "/webroot";
-        adminAddr = "alice@example.org";
-        enableUserDir = true;
-        enableSSL = true;
-        sslServerCert = "/root/ssl-example-org.crt";
-        sslServerKey = "/root/ssl-example-org.key";
-      }
-    ];
-}
-</programlisting>
-
-It defines two virtual hosts with nearly identical configuration; the
-only difference is that the second one has SSL enabled.  To prevent
-this duplication, we can use a <literal>let</literal>:
-
-<programlisting>
-let
-  exampleOrgCommon =
-    { hostName = "example.org";
-      documentRoot = "/webroot";
-      adminAddr = "alice@example.org";
-      enableUserDir = true;
-    };
-in
-{
-  services.httpd.virtualHosts =
-    [ exampleOrgCommon
-      (exampleOrgCommon // {
-        enableSSL = true;
-        sslServerCert = "/root/ssl-example-org.crt";
-        sslServerKey = "/root/ssl-example-org.key";
-      })
-    ];
-}
-</programlisting>
-
-The <literal>let exampleOrgCommon =
-<replaceable>...</replaceable></literal> defines a variable named
-<literal>exampleOrgCommon</literal>.  The <literal>//</literal>
-operator merges two attribute sets, so the configuration of the second
-virtual host is the set <literal>exampleOrgCommon</literal> extended
-with the SSL options.</para>
-
-<para>You can write a <literal>let</literal> wherever an expression is
-allowed.  Thus, you also could have written:
-
-<programlisting>
-{
-  services.httpd.virtualHosts =
-    let exampleOrgCommon = <replaceable>...</replaceable>; in
-    [ exampleOrgCommon
-      (exampleOrgCommon // { <replaceable>...</replaceable> })
-    ];
-}
-</programlisting>
-
-but not <literal>{ let exampleOrgCommon =
-<replaceable>...</replaceable>; in <replaceable>...</replaceable>;
-}</literal> since attributes (as opposed to attribute values) are not
-expressions.</para>
-
-<para><emphasis>Functions</emphasis> provide another method of
-abstraction.  For instance, suppose that we want to generate lots of
-different virtual hosts, all with identical configuration except for
-the host name.  This can be done as follows:
-
-<programlisting>
-{
-  services.httpd.virtualHosts =
-    let
-      makeVirtualHost = name:
-        { hostName = name;
-          documentRoot = "/webroot";
-          adminAddr = "alice@example.org";
-        };
-    in
-      [ (makeVirtualHost "example.org")
-        (makeVirtualHost "example.com")
-        (makeVirtualHost "example.gov")
-        (makeVirtualHost "example.nl")
-      ];
-}
-</programlisting>
-
-Here, <varname>makeVirtualHost</varname> is a function that takes a
-single argument <literal>name</literal> and returns the configuration
-for a virtual host.  That function is then called for several names to
-produce the list of virtual host configurations.</para>
-
-<para>We can further improve on this by using the function
-<varname>map</varname>, which applies another function to every
-element in a list:
-
-<programlisting>
-{
-  services.httpd.virtualHosts =
-    let
-      makeVirtualHost = <replaceable>...</replaceable>;
-    in map makeVirtualHost
-      [ "example.org" "example.com" "example.gov" "example.nl" ];
-}
-</programlisting>
-
-(The function <literal>map</literal> is called a
-<emphasis>higher-order function</emphasis> because it takes another
-function as an argument.)</para>
-
-<para>What if you need more than one argument, for instance, if we
-want to use a different <literal>documentRoot</literal> for each
-virtual host?  Then we can make <varname>makeVirtualHost</varname> a
-function that takes a <emphasis>set</emphasis> as its argument, like this:
-
-<programlisting>
-{
-  services.httpd.virtualHosts =
-    let
-      makeVirtualHost = { name, root }:
-        { hostName = name;
-          documentRoot = root;
-          adminAddr = "alice@example.org";
-        };
-    in map makeVirtualHost
-      [ { name = "example.org"; root = "/sites/example.org"; }
-        { name = "example.com"; root = "/sites/example.com"; }
-        { name = "example.gov"; root = "/sites/example.gov"; }
-        { name = "example.nl"; root = "/sites/example.nl"; }
-      ];
-}
-</programlisting>
-
-But in this case (where every root is a subdirectory of
-<filename>/sites</filename> named after the virtual host), it would
-have been shorter to define <varname>makeVirtualHost</varname> as
-<programlisting>
-makeVirtualHost = name:
-  { hostName = name;
-    documentRoot = "/sites/${name}";
-    adminAddr = "alice@example.org";
-  };
-</programlisting>
-
-Here, the construct
-<literal>${<replaceable>...</replaceable>}</literal> allows the result
-of an expression to be spliced into a string.</para>
-
-</section>
-
-
-<section xml:id="sec-modularity"><title>Modularity</title>
-
-<para>The NixOS configuration mechanism is modular.  If your
-<filename>configuration.nix</filename> becomes too big, you can split
-it into multiple files.  Likewise, if you have multiple NixOS
-configurations (e.g. for different computers) with some commonality,
-you can move the common configuration into a shared file.</para>
-
-<para>Modules have exactly the same syntax as
-<filename>configuration.nix</filename>.  In fact,
-<filename>configuration.nix</filename> is itself a module.  You can
-use other modules by including them from
-<filename>configuration.nix</filename>, e.g.:
-
-<programlisting>
-{ config, pkgs, ... }:
-
-{ imports = [ ./vpn.nix ./kde.nix ];
-  services.httpd.enable = true;
-  environment.systemPackages = [ pkgs.emacs ];
-  <replaceable>...</replaceable>
-}
-</programlisting>
-
-Here, we include two modules from the same directory,
-<filename>vpn.nix</filename> and <filename>kde.nix</filename>.  The
-latter might look like this:
-
-<programlisting>
-{ config, pkgs, ... }:
-
-{ services.xserver.enable = true;
-  services.xserver.displayManager.kdm.enable = true;
-  services.xserver.desktopManager.kde4.enable = true;
-  environment.systemPackages = [ pkgs.kde4.kscreensaver ];
-}
-</programlisting>
-
-Note that both <filename>configuration.nix</filename> and
-<filename>kde.nix</filename> define the option
-<option>environment.systemPackages</option>.  When multiple modules
-define an option, NixOS will try to <emphasis>merge</emphasis> the
-definitions.  In the case of
-<option>environment.systemPackages</option>, that’s easy: the lists of
-packages can simply be concatenated.  The value in
-<filename>configuration.nix</filename> is merged last, so for
-list-type options, it will appear at the end of the merged list. If
-you want it to appear first, you can use <varname>mkBefore</varname>:
-
-<programlisting>
-boot.kernelModules = mkBefore [ "kvm-intel" ];
-</programlisting>
-
-This causes the <literal>kvm-intel</literal> kernel module to be
-loaded before any other kernel modules.</para>
-
-<para>For other types of options, a merge may not be possible. For
-instance, if two modules define
-<option>services.httpd.adminAddr</option>,
-<command>nixos-rebuild</command> will give an error:
-
-<screen>
-The unique option `services.httpd.adminAddr' is defined multiple times, in `/etc/nixos/httpd.nix' and `/etc/nixos/configuration.nix'.
-</screen>
-
-When that happens, it’s possible to force one definition take
-precedence over the others:
-
-<programlisting>
-services.httpd.adminAddr = pkgs.lib.mkForce "bob@example.org";
-</programlisting>
-
-</para>
-
-<para>When using multiple modules, you may need to access
-configuration values defined in other modules.  This is what the
-<varname>config</varname> function argument is for: it contains the
-complete, merged system configuration.  That is,
-<varname>config</varname> is the result of combining the
-configurations returned by every module<footnote><para>If you’re
-wondering how it’s possible that the (indirect)
-<emphasis>result</emphasis> of a function is passed as an
-<emphasis>input</emphasis> to that same function: that’s because Nix
-is a “lazy” language — it only computes values when they are needed.
-This works as long as no individual configuration value depends on
-itself.</para></footnote>.  For example, here is a module that adds
-some packages to <option>environment.systemPackages</option> only if
-<option>services.xserver.enable</option> is set to
-<literal>true</literal> somewhere else:
-
-<programlisting>
-{ config, pkgs, ... }:
-
-{ environment.systemPackages =
-    if config.services.xserver.enable then
-      [ pkgs.firefox
-        pkgs.thunderbird
-      ]
-    else
-      [ ];
-}
-</programlisting>
-
-</para>
-
-<para>With multiple modules, it may not be obvious what the final
-value of a configuration option is.  The command
-<option>nixos-option</option> allows you to find out:
-
-<screen>
-$ nixos-option services.xserver.enable
-true
-
-$ nixos-option boot.kernelModules
-[ "tun" "ipv6" "loop" <replaceable>...</replaceable> ]
-</screen>
-
-Interactive exploration of the configuration is possible using
-<command
-xlink:href="https://github.com/edolstra/nix-repl">nix-repl</command>,
-a read-eval-print loop for Nix expressions.  It’s not installed by
-default; run <literal>nix-env -i nix-repl</literal> to get it.  A
-typical use:
-
-<screen>
-$ nix-repl '&lt;nixos>'
-
-nix-repl> config.networking.hostName
-"mandark"
-
-nix-repl> map (x: x.hostName) config.services.httpd.virtualHosts
-[ "example.org" "example.gov" ]
-</screen>
-
-</para>
-
-</section>
-
-
-<section xml:id="sec-nix-syntax-summary"><title>Syntax summary</title>
-
-<para>Below is a summary of the most important syntactic constructs in
-the Nix expression language.  It’s not complete.  In particular, there
-are many other built-in functions.  See the <link
-xlink:href="http://nixos.org/nix/manual/#chap-writing-nix-expressions">Nix
-manual</link> for the rest.</para>
-
-<informaltable frame='none'>
-  <tgroup cols='2'>
-    <colspec colname='c1' rowsep='1' colsep='1' />
-    <colspec colname='c2' rowsep='1' />
-    <thead>
-      <row>
-        <entry>Example</entry>
-        <entry>Description</entry>
-      </row>
-    </thead>
-    <tbody>
-
-      <row>
-        <entry namest="c1" nameend="c2"><emphasis>Basic values</emphasis></entry>
-      </row>
-      <row>
-        <entry><literal>"Hello world"</literal></entry>
-        <entry>A string</entry>
-      </row>
-      <row>
-        <entry><literal>"${pkgs.bash}/bin/sh"</literal></entry>
-        <entry>A string containing an expression (expands to <literal>"/nix/store/<replaceable>hash</replaceable>-bash-<replaceable>version</replaceable>/bin/sh"</literal>)</entry>
-      </row>
-      <row>
-        <entry><literal>true</literal>, <literal>false</literal></entry>
-        <entry>Booleans</entry>
-      </row>
-      <row>
-        <entry><literal>123</literal></entry>
-        <entry>An integer</entry>
-      </row>
-      <row>
-        <entry><literal>./foo.png</literal></entry>
-        <entry>A path (relative to the containing Nix expression)</entry>
-      </row>
-
-      <row>
-        <entry namest="c1" nameend="c2"><emphasis>Compound values</emphasis></entry>
-      </row>
-      <row>
-        <entry><literal>{ x = 1; y = 2; }</literal></entry>
-        <entry>An set with attributes names <literal>x</literal> and <literal>y</literal></entry>
-      </row>
-      <row>
-        <entry><literal>{ foo.bar = 1; }</literal></entry>
-        <entry>A nested set, equivalent to <literal>{ foo = { bar = 1; }; }</literal></entry>
-      </row>
-      <row>
-        <entry><literal>rec { x = "bla"; y = x + "bar"; }</literal></entry>
-        <entry>A recursive set, equivalent to <literal>{ x = "foo"; y = "foobar"; }</literal></entry>
-      </row>
-      <row>
-        <entry><literal>[ "foo" "bar" ]</literal></entry>
-        <entry>A list with two elements</entry>
-      </row>
-
-      <row>
-        <entry namest="c1" nameend="c2"><emphasis>Operators</emphasis></entry>
-      </row>
-      <row>
-        <entry><literal>"foo" + "bar"</literal></entry>
-        <entry>String concatenation</entry>
-      </row>
-      <row>
-        <entry><literal>1 + 2</literal></entry>
-        <entry>Integer addition</entry>
-      </row>
-      <row>
-        <entry><literal>"foo" == "f" + "oo"</literal></entry>
-        <entry>Equality test (evaluates to <literal>true</literal>)</entry>
-      </row>
-      <row>
-        <entry><literal>"foo" != "bar"</literal></entry>
-        <entry>Inequality test (evaluates to <literal>true</literal>)</entry>
-      </row>
-      <row>
-        <entry><literal>!true</literal></entry>
-        <entry>Boolean negation</entry>
-      </row>
-      <row>
-        <entry><literal>{ x = 1; y = 2; }.x</literal></entry>
-        <entry>Attribute selection (evaluates to <literal>1</literal>)</entry>
-      </row>
-      <row>
-        <entry><literal>{ x = 1; y = 2; }.z or 3</literal></entry>
-        <entry>Attribute selection with default (evaluates to <literal>3</literal>)</entry>
-      </row>
-      <row>
-        <entry><literal>{ x = 1; y = 2; } // { z = 3; }</literal></entry>
-        <entry>Merge two sets (attributes in the right-hand set taking precedence)</entry>
-      </row>
-
-      <row>
-        <entry namest="c1" nameend="c2"><emphasis>Control structures</emphasis></entry>
-      </row>
-      <row>
-        <entry><literal>if 1 + 1 == 2 then "yes!" else "no!"</literal></entry>
-        <entry>Conditional expression</entry>
-      </row>
-      <row>
-        <entry><literal>assert 1 + 1 == 2; "yes!"</literal></entry>
-        <entry>Assertion check (evaluates to <literal>"yes!"</literal>)</entry>
-      </row>
-      <row>
-        <entry><literal>let x = "foo"; y = "bar"; in x + y</literal></entry>
-        <entry>Variable definition</entry>
-      </row>
-      <row>
-        <entry><literal>with pkgs.lib; head [ 1 2 3 ]</literal></entry>
-        <entry>Add all attributes from the given set to the scope
-        (evaluates to <literal>1</literal>)</entry>
-      </row>
-
-      <row>
-        <entry namest="c1" nameend="c2"><emphasis>Functions (lambdas)</emphasis></entry>
-      </row>
-      <row>
-        <entry><literal>x: x + 1</literal></entry>
-        <entry>A function that expects an integer and returns it increased by 1</entry>
-      </row>
-      <row>
-        <entry><literal>(x: x + 1) 100</literal></entry>
-        <entry>A function call (evaluates to 101)</entry>
-      </row>
-      <row>
-        <entry><literal>let inc = x: x + 1; in inc (inc (inc 100))</literal></entry>
-        <entry>A function bound to a variable and subsequently called by name (evaluates to 103)</entry>
-      </row>
-      <row>
-        <entry><literal>{ x, y }: x + y</literal></entry>
-        <entry>A function that expects a set with required attributes
-        <literal>x</literal> and <literal>y</literal> and concatenates
-        them</entry>
-      </row>
-      <row>
-        <entry><literal>{ x, y ? "bar" }: x + y</literal></entry>
-        <entry>A function that expects a set with required attribute
-        <literal>x</literal> and optional <literal>y</literal>, using
-        <literal>"bar"</literal> as default value for
-        <literal>y</literal></entry>
-      </row>
-      <row>
-        <entry><literal>{ x, y, ... }: x + y</literal></entry>
-        <entry>A function that expects a set with required attributes
-        <literal>x</literal> and <literal>y</literal> and ignores any
-        other attributes</entry>
-      </row>
-      <row>
-        <entry><literal>{ x, y } @ args: x + y</literal></entry>
-        <entry>A function that expects a set with required attributes
-        <literal>x</literal> and <literal>y</literal>, and binds the
-        whole set to <literal>args</literal></entry>
-      </row>
-
-      <row>
-        <entry namest="c1" nameend="c2"><emphasis>Built-in functions</emphasis></entry>
-      </row>
-      <row>
-        <entry><literal>import ./foo.nix</literal></entry>
-        <entry>Load and return Nix expression in given file</entry>
-      </row>
-      <row>
-        <entry><literal>map (x: x + x) [ 1 2 3 ]</literal></entry>
-        <entry>Apply a function to every element of a list (evaluates to <literal>[ 2 4 6 ]</literal>)</entry>
-      </row>
-      <!--
-      <row>
-        <entry><literal>throw "Urgh"</literal></entry>
-        <entry>Raise an error condition</entry>
-      </row>
-      -->
-
-    </tbody>
-  </tgroup>
-</informaltable>
-
-</section>
-
-
-</section>
-
-
-<!--===============================================================-->
-
-<section xml:id="sec-package-management"><title>Package management</title>
-
-<para>This section describes how to add additional packages to your
-system.  NixOS has two distinct styles of package management:
-
-<itemizedlist>
-
-  <listitem><para><emphasis>Declarative</emphasis>, where you declare
-  what packages you want in your
-  <filename>configuration.nix</filename>.  Every time you run
-  <command>nixos-rebuild</command>, NixOS will ensure that you get a
-  consistent set of binaries corresponding to your
-  specification.</para></listitem>
-
-  <listitem><para><emphasis>Ad hoc</emphasis>, where you install,
-  upgrade and uninstall packages via the <command>nix-env</command>
-  command.  This style allows mixing packages from different Nixpkgs
-  versions.  It’s the only choice for non-root
-  users.</para></listitem>
-
-</itemizedlist>
-
-</para>
-
-<para>The next two sections describe these two styles.</para>
-
-
-<section><title>Declarative package management</title>
-
-<para>With declarative package management, you specify which packages
-you want on your system by setting the option
-<option>environment.systemPackages</option>.  For instance, adding the
-following line to <filename>configuration.nix</filename> enables the
-Mozilla Thunderbird email application:
-
-<programlisting>
-environment.systemPackages = [ pkgs.thunderbird ];
-</programlisting>
-
-The effect of this specification is that the Thunderbird package from
-Nixpkgs will be built or downloaded as part of the system when you run
-<command>nixos-rebuild switch</command>.</para>
-
-<para>You can get a list of the available packages as follows:
-<screen>
-$ nix-env -qaP '*' --description
-nixos.pkgs.firefox   firefox-23.0   Mozilla Firefox - the browser, reloaded
-<replaceable>...</replaceable>
-</screen>
-
-The first column in the output is the <emphasis>attribute
-name</emphasis>, such as
-<literal>nixos.pkgs.thunderbird</literal>. (The
-<literal>nixos</literal> prefix allows distinguishing between
-different channels that you might have.)</para>
-
-<para>To “uninstall” a package, simply remove it from
-<option>environment.systemPackages</option> and run
-<command>nixos-rebuild switch</command>.</para>
-
-
-<section xml:id="sec-customising-packages"><title>Customising packages</title>
-
-<para>Some packages in Nixpkgs have options to enable or disable
-optional functionality or change other aspects of the package.  For
-instance, the Firefox wrapper package (which provides Firefox with a
-set of plugins such as the Adobe Flash player) has an option to enable
-the Google Talk plugin.  It can be set in
-<filename>configuration.nix</filename> as follows:
-
-<filename>
-nixpkgs.config.firefox.enableGoogleTalkPlugin = true;
-</filename>
-</para>
-
-<warning><para>Unfortunately, Nixpkgs currently lacks a way to query
-available configuration options.</para></warning>
-
-<para>Apart from high-level options, it’s possible to tweak a package
-in almost arbitrary ways, such as changing or disabling dependencies
-of a package.  For instance, the Emacs package in Nixpkgs by default
-has a dependency on GTK+ 2.  If you want to build it against GTK+ 3,
-you can specify that as follows:
-
-<programlisting>
-environment.systemPackages = [ (pkgs.emacs.override { gtk = pkgs.gtk3; }) ];
-</programlisting>
-
-The function <varname>override</varname> performs the call to the Nix
-function that produces Emacs, with the original arguments amended by
-the set of arguments specified by you.  So here the function argument
-<varname>gtk</varname> gets the value <literal>pkgs.gtk3</literal>,
-causing Emacs to depend on GTK+ 3.  (The parentheses are necessary
-because in Nix, function application binds more weakly than list
-construction, so without them,
-<literal>environment.systemPackages</literal> would be a list with two
-elements.)</para>
-
-<para>Even greater customisation is possible using the function
-<varname>overrideDerivation</varname>.  While the
-<varname>override</varname> mechanism above overrides the arguments of
-a package function, <varname>overrideDerivation</varname> allows
-changing the <emphasis>result</emphasis> of the function.  This
-permits changing any aspect of the package, such as the source code.
-For instance, if you want to override the source code of Emacs, you
-can say:
-
-<programlisting>
-environment.systemPackages =
-  [ (pkgs.lib.overrideDerivation pkgs.emacs (attrs: {
-      name = "emacs-25.0-pre";
-      src = /path/to/my/emacs/tree;
-    }))
-  ];
-</programlisting>
-
-Here, <varname>overrideDerivation</varname> takes the Nix derivation
-specified by <varname>pkgs.emacs</varname> and produces a new
-derivation in which the original’s <literal>name</literal> and
-<literal>src</literal> attribute have been replaced by the given
-values.  The original attributes are accessible via
-<varname>attrs</varname>.</para>
-
-<para>The overrides shown above are not global.  They do not affect
-the original package; other packages in Nixpkgs continue to depend on
-the original rather than the customised package.  This means that if
-another package in your system depends on the original package, you
-end up with two instances of the package.  If you want to have
-everything depend on your customised instance, you can apply a
-<emphasis>global</emphasis> override as follows:
-
-<screen>
-nixpkgs.config.packageOverrides = pkgs:
-  { emacs = pkgs.emacs.override { gtk = pkgs.gtk3; };
-  };
-</screen>
-
-The effect of this definition is essentially equivalent to modifying
-the <literal>emacs</literal> attribute in the Nixpkgs source tree.
-Any package in Nixpkgs that depends on <literal>emacs</literal> will
-be passed your customised instance.  (However, the value
-<literal>pkgs.emacs</literal> in
-<varname>nixpkgs.config.packageOverrides</varname> refers to the
-original rather than overridden instance, to prevent an infinite
-recursion.)</para>
-
-</section>
-
-<section xml:id="sec-custom-packages"><title>Adding custom packages</title>
-
-<para>It’s possible that a package you need is not available in NixOS.
-In that case, you can do two things.  First, you can clone the Nixpkgs
-repository, add the package to your clone, and (optionally) submit a
-patch or pull request to have it accepted into the main Nixpkgs
-repository.  This is described in detail in the <link
-xlink:href="http://nixos.org/nixpkgs/manual">Nixpkgs manual</link>.
-In short, you clone Nixpkgs:
-
-<screen>
-$ git clone git://github.com/NixOS/nixpkgs.git
-$ cd nixpkgs
-</screen>
-
-Then you write and test the package as described in the Nixpkgs
-manual.  Finally, you add it to
-<literal>environment.systemPackages</literal>, e.g.
-
-<programlisting>
-environment.systemPackages = [ pkgs.my-package ];
-</programlisting>
-
-and you run <command>nixos-rebuild</command>, specifying your own
-Nixpkgs tree:
-
-<screen>
-$ nixos-rebuild switch -I nixpkgs=/path/to/my/nixpkgs</screen>
-
-</para>
-
-<para>The second possibility is to add the package outside of the
-Nixpkgs tree.  For instance, here is how you specify a build of the
-<link xlink:href="http://www.gnu.org/software/hello/">GNU Hello</link>
-package directly in <filename>configuration.nix</filename>:
-
-<programlisting>
-environment.systemPackages =
-  let
-    my-hello = with pkgs; stdenv.mkDerivation rec {
-      name = "hello-2.8";
-      src = fetchurl {
-        url = "mirror://gnu/hello/${name}.tar.gz";
-        sha256 = "0wqd8sjmxfskrflaxywc7gqw7sfawrfvdxd9skxawzfgyy0pzdz6";
-      };
-    };
-  in
-  [ my-hello ];
-</programlisting>
-
-Of course, you can also move the definition of
-<literal>my-hello</literal> into a separate Nix expression, e.g.
-<programlisting>
-environment.systemPackages = [ (import ./my-hello.nix) ];
-</programlisting>
-where <filename>my-hello.nix</filename> contains:
-<programlisting>
-with import &lt;nixpkgs> {}; # bring all of Nixpkgs into scope
-
-stdenv.mkDerivation rec {
-  name = "hello-2.8";
-  src = fetchurl {
-    url = "mirror://gnu/hello/${name}.tar.gz";
-    sha256 = "0wqd8sjmxfskrflaxywc7gqw7sfawrfvdxd9skxawzfgyy0pzdz6";
-  };
-}
-</programlisting>
-
-This allows testing the package easily:
-<screen>
-$ nix-build my-hello.nix
-$ ./result/bin/hello
-Hello, world!
-</screen>
-
-</para>
-
-</section>
-
-</section>
-
-
-<section><title>Ad hoc package management</title>
-
-<para>With the command <command>nix-env</command>, you can install and
-uninstall packages from the command line.  For instance, to install
-Mozilla Thunderbird:
-
-<screen>
-$ nix-env -iA nixos.pkgs.thunderbird</screen>
-
-If you invoke this as root, the package is installed in the Nix
-profile <filename>/nix/var/nix/profiles/default</filename> and visible
-to all users of the system; otherwise, the package ends up in
-<filename>/nix/var/nix/profiles/per-user/<replaceable>username</replaceable>/profile</filename>
-and is not visible to other users.  The <option>-A</option> flag
-specifies the package by its attribute name; without it, the package
-is installed by matching against its package name
-(e.g. <literal>thunderbird</literal>).  The latter is slower because
-it requires matching against all available Nix packages, and is
-ambiguous if there are multiple matching packages.</para>
-
-<para>Packages come from the NixOS channel.  You typically upgrade a
-package by updating to the latest version of the NixOS channel:
-<screen>
-$ nix-channel --update nixos
-</screen>
-and then running <literal>nix-env -i</literal> again.  Other packages
-in the profile are <emphasis>not</emphasis> affected; this is the
-crucial difference with the declarative style of package management,
-where running <command>nixos-rebuild switch</command> causes all
-packages to be updated to their current versions in the NixOS channel.
-You can however upgrade all packages for which there is a newer
-version by doing:
-<screen>
-$ nix-env -u '*'
-</screen>
-</para>
-
-<para>A package can be uninstalled using the <option>-e</option>
-flag:
-<screen>
-$ nix-env -e thunderbird
-</screen>
-</para>
-
-<para>Finally, you can roll back an undesirable
-<command>nix-env</command> action:
-<screen>
-$ nix-env --rollback
-</screen>
-</para>
-
-<para><command>nix-env</command> has many more flags.  For details,
-see the
-<citerefentry><refentrytitle>nix-env</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-manpage or the Nix manual.</para>
-
-</section>
-
-
-</section>
-
-
-<!--===============================================================-->
-
-<section xml:id="sec-user-management"><title>User management</title>
-
-<para>NixOS supports both declarative and imperative styles of user
-management.  In the declarative style, users are specified in
-<filename>configuration.nix</filename>.  For instance, the following
-states that a user account named <literal>alice</literal> shall exist:
-
-<programlisting>
-users.extraUsers.alice =
-  { createHome = true;
-    home = "/home/alice";
-    description = "Alice Foobar";
-    extraGroups = [ "wheel" "networkmanager" ];
-    useDefaultShell = true;
-    openssh.authorizedKeys.keys = [ "ssh-dss AAAAB3Nza... alice@foobar" ];
-  };
-</programlisting>
-
-Note that <literal>alice</literal> is a member of the
-<literal>wheel</literal> and <literal>networkmanager</literal> groups,
-which allows her to use <command>sudo</command> to execute commands as
-<literal>root</literal> and to configure the network, respectively.
-Also note the SSH public key that allows remote logins with the
-corresponding private key. Users created in this way do not have a
-password by default, so they cannot log in via mechanisms that require
-a password. However, you can use the <command>passwd</command> program
-to set a password, which is retained across invocations of
-<command>nixos-rebuild</command>.</para>
-
-<para>If you set users.mutableUsers to false, then the contents of /etc/passwd
-and /etc/group will be congruent to your NixOS configuration. For instance,
-if you remove a user from users.extraUsers and run nixos-rebuild, the user
-account will cease to exist. Also, imperative commands for managing users
-and groups, such as useradd, are no longer available.</para>
-
-<para>A user ID (uid) is assigned automatically.  You can also specify
-a uid manually by adding
-
-<programlisting>
-    uid = 1000;
-</programlisting>
-
-to the user specification.</para>
-
-<para>Groups can be specified similarly.  The following states that a
-group named <literal>students</literal> shall exist:
-
-<programlisting>
-users.extraGroups.students.gid = 1000;
-</programlisting>
-
-As with users, the group ID (gid) is optional and will be assigned
-automatically if it’s missing.</para>
-
-<warning><para>Currently declarative user management is not perfect:
-<command>nixos-rebuild</command> does not know how to realise certain
-configuration changes.  This includes removing a user or group, and
-removing group membership from a user.</para></warning>
-
-<para>In the imperative style, users and groups are managed by
-commands such as <command>useradd</command>,
-<command>groupmod</command> and so on.  For instance, to create a user
-account named <literal>alice</literal>:
-
-<screen>
-$ useradd -m alice</screen>
-
-The flag <option>-m</option> causes the creation of a home directory
-for the new user, which is generally what you want.  The user does not
-have an initial password and therefore cannot log in.  A password can
-be set using the <command>passwd</command> utility:
-
-<screen>
-$ passwd alice
-Enter new UNIX password: ***
-Retype new UNIX password: ***
-</screen>
-
-A user can be deleted using <command>userdel</command>:
-
-<screen>
-$ userdel -r alice</screen>
-
-The flag <option>-r</option> deletes the user’s home directory.
-Accounts can be modified using <command>usermod</command>.  Unix
-groups can be managed using <command>groupadd</command>,
-<command>groupmod</command> and <command>groupdel</command>.</para>
-
-</section>
-
-
-<!--===============================================================-->
-
-<section><title>File systems</title>
-
-<para>You can define file systems using the
-<option>fileSystems</option> configuration option.  For instance, the
-following definition causes NixOS to mount the Ext4 file system on
-device <filename>/dev/disk/by-label/data</filename> onto the mount
-point <filename>/data</filename>:
-
-<programlisting>
-fileSystems."/data" =
-  { device = "/dev/disk/by-label/data";
-    fsType = "ext4";
-  };
-</programlisting>
-
-Mount points are created automatically if they don’t already exist.
-For <option>device</option>, it’s best to use the topology-independent
-device aliases in <filename>/dev/disk/by-label</filename> and
-<filename>/dev/disk/by-uuid</filename>, as these don’t change if the
-topology changes (e.g. if a disk is moved to another IDE
-controller).</para>
-
-<para>You can usually omit the file system type
-(<option>fsType</option>), since <command>mount</command> can usually
-detect the type and load the necessary kernel module automatically.
-However, if the file system is needed at early boot (in the initial
-ramdisk) and is not <literal>ext2</literal>, <literal>ext3</literal>
-or <literal>ext4</literal>, then it’s best to specify
-<option>fsType</option> to ensure that the kernel module is
-available.</para>
-
-<section><title>LUKS-encrypted file systems</title>
-
-<para>NixOS supports file systems that are encrypted using
-<emphasis>LUKS</emphasis> (Linux Unified Key Setup).  For example,
-here is how you create an encrypted Ext4 file system on the device
-<filename>/dev/sda2</filename>:
-
-<screen>
-$ cryptsetup luksFormat /dev/sda2
-
-WARNING!
-========
-This will overwrite data on /dev/sda2 irrevocably.
-
-Are you sure? (Type uppercase yes): YES
-Enter LUKS passphrase: ***
-Verify passphrase: ***
-
-$ cryptsetup luksOpen /dev/sda2 crypted
-Enter passphrase for /dev/sda2: ***
-
-$ mkfs.ext4 /dev/mapper/crypted
-</screen>
-
-To ensure that this file system is automatically mounted at boot time
-as <filename>/</filename>, add the following to
-<filename>configuration.nix</filename>:
-
-<programlisting>
-boot.initrd.luks.devices = [ { device = "/dev/sda2"; name = "crypted"; } ];
-fileSystems."/".device = "/dev/mapper/crypted";
-</programlisting>
-
-</para>
-
-</section>
-
-</section>
-
-
-<!--===============================================================-->
-
-<section xml:id="sec-x11"><title>X Window System</title>
-
-<para>The X Window System (X11) provides the basis of NixOS’ graphical
-user interface.  It can be enabled as follows:
-<programlisting>
-services.xserver.enable = true;
-</programlisting>
-The X server will automatically detect and use the appropriate video
-driver from a set of X.org drivers (such as <literal>vesa</literal>
-and <literal>intel</literal>).  You can also specify a driver
-manually, e.g.
-<programlisting>
-services.xserver.videoDrivers = [ "r128" ];
-</programlisting>
-to enable X.org’s <literal>xf86-video-r128</literal> driver.</para>
-
-<para>You also need to enable at least one desktop or window manager.
-Otherwise, you can only log into a plain undecorated
-<command>xterm</command> window.  Thus you should pick one or more of
-the following lines:
-<programlisting>
-services.xserver.desktopManager.kde4.enable = true;
-services.xserver.desktopManager.xfce.enable = true;
-services.xserver.windowManager.xmonad.enable = true;
-services.xserver.windowManager.twm.enable = true;
-services.xserver.windowManager.icewm.enable = true;
-</programlisting>
-</para>
-
-<para>NixOS’s default <emphasis>display manager</emphasis> (the
-program that provides a graphical login prompt and manages the X
-server) is SLiM.  You can select KDE’s <command>kdm</command> instead:
-<programlisting>
-services.xserver.displayManager.kdm.enable = true;
-</programlisting>
-</para>
-
-<para>The X server is started automatically at boot time.  If you
-don’t want this to happen, you can set:
-<programlisting>
-services.xserver.autorun = false;
-</programlisting>
-The X server can then be started manually:
-<screen>
-$ systemctl start display-manager.service
-</screen>
-</para>
-
-
-<section><title>NVIDIA graphics cards</title>
-
-<para>NVIDIA provides a proprietary driver for its graphics cards that
-has better 3D performance than the X.org drivers.  It is not enabled
-by default because it’s not free software.  You can enable it as follows:
-<programlisting>
-services.xserver.videoDrivers = [ "nvidia" ];
-</programlisting>
-You may need to reboot after enabling this driver to prevent a clash
-with other kernel modules.</para>
-
-<para>On 64-bit systems, if you want full acceleration for 32-bit
-programs such as Wine, you should also set the following:
-<programlisting>
-services.xserver.driSupport32Bit = true;
-</programlisting>
-</para>
-
-</section>
-
-
-<section><title>Touchpads</title>
-
-<para>Support for Synaptics touchpads (found in many laptops such as
-the Dell Latitude series) can be enabled as follows:
-<programlisting>
-services.xserver.synaptics.enable = true;
-</programlisting>
-The driver has many options (see <xref linkend="ch-options"/>).  For
-instance, the following enables two-finger scrolling:
-<programlisting>
-services.xserver.synaptics.twoFingerScroll = true;
-</programlisting>
-</para>
-
-</section>
-
-
-</section>
-
-
-<!--===============================================================-->
-
-<section xml:id="sec-networking"><title>Networking</title>
-
-<section xml:id="sec-networkmanager"><title>NetworkManager</title>
-
-<para>To facilitate network configuration, some desktop environments
-use NetworkManager. You can enable NetworkManager by setting:
-
-<programlisting>
-services.networkmanager.enable = true;
-</programlisting>
-
-Some desktop managers (e.g., GNOME) enable NetworkManager
-automatically for you.</para>
-
-<para>All users that should have permission to change network settings
-must belong to the <code>networkmanager</code> group.</para>
-
-<note><para><code>services.networkmanager</code> and
-<code>services.wireless</code> can not be enabled at the same time:
-you can still connect to the wireless networks using
-NetworkManager.</para></note>
-
-</section>
-
-<section xml:id="sec-ssh"><title>Secure shell access</title>
-
-<para>Secure shell (SSH) access to your machine can be enabled by
-setting:
-
-<programlisting>
-services.openssh.enable = true;
-</programlisting>
-
-By default, root logins using a password are disallowed.  They can be
-disabled entirely by setting
-<literal>services.openssh.permitRootLogin</literal> to
-<literal>"no"</literal>.</para>
-
-<para>You can declaratively specify authorised RSA/DSA public keys for
-a user as follows:
-
-<!-- FIXME: this might not work if the user is unmanaged. -->
-<programlisting>
-users.extraUsers.alice.openssh.authorizedKeys.keys =
-  [ "ssh-dss AAAAB3NzaC1kc3MAAACBAPIkGWVEt4..." ];
-</programlisting>
-
-</para>
-
-</section>
-
-
-<section xml:id="sec-ipv4"><title>IPv4 configuration</title>
-
-<para>By default, NixOS uses DHCP (specifically,
-<command>dhcpcd</command>) to automatically configure network
-interfaces.  However, you can configure an interface manually as
-follows:
-
-<programlisting>
-networking.interfaces.eth0 = { ipAddress = "192.168.1.2"; prefixLength = 24; };
-</programlisting>
-
-(The network prefix can also be specified using the option
-<literal>subnetMask</literal>,
-e.g. <literal>"255.255.255.0"</literal>, but this is deprecated.)
-Typically you’ll also want to set a default gateway and set of name
-servers:
-
-<programlisting>
-networking.defaultGateway = "192.168.1.1";
-networking.nameservers = [ "8.8.8.8" ];
-</programlisting>
-
-</para>
-
-<note><para>Statically configured interfaces are set up by the systemd
-service
-<replaceable>interface-name</replaceable><literal>-cfg.service</literal>.
-The default gateway and name server configuration is performed by
-<literal>network-setup.service</literal>.</para></note>
-
-<para>The host name is set using <option>networking.hostName</option>:
-
-<programlisting>
-networking.hostName = "cartman";
-</programlisting>
-
-The default host name is <literal>nixos</literal>.  Set it to the
-empty string (<literal>""</literal>) to allow the DHCP server to
-provide the host name.</para>
-
-</section>
-
-
-<section xml:id="sec-ipv6"><title>IPv6 configuration</title>
-
-<para>IPv6 is enabled by default.  Stateless address autoconfiguration
-is used to automatically assign IPv6 addresses to all interfaces.  You
-can disable IPv6 support globally by setting:
-
-<programlisting>
-networking.enableIPv6 = false;
-</programlisting>
-
-</para>
-
-</section>
-
-
-<section xml:id="sec-firewall"><title>Firewall</title>
-
-<para>NixOS has a simple stateful firewall that blocks incoming
-connections and other unexpected packets.  The firewall applies to
-both IPv4 and IPv6 traffic. It is enabled by default. It can be
-disabled as follows:
-
-<programlisting>
-networking.firewall.enable = false;
-</programlisting>
-
-If the firewall is enabled, you can open specific TCP ports to the
-outside world:
-
-<programlisting>
-networking.firewall.allowedTCPPorts = [ 80 443 ];
-</programlisting>
-
-Note that TCP port 22 (ssh) is opened automatically if the SSH daemon
-is enabled (<option>services.openssh.enable = true</option>).  UDP
-ports can be opened through
-<option>networking.firewall.allowedUDPPorts</option>.  Also of
-interest is
-
-<programlisting>
-networking.firewall.allowPing = true;
-</programlisting>
-
-to allow the machine to respond to ping requests.  (ICMPv6 pings are
-always allowed.)</para>
-
-</section>
-
-
-<section xml:id="sec-wireless"><title>Wireless networks</title>
-
-<para>For a desktop installation using NetworkManager (e.g., GNOME),
-you just have to make sure the user is in the
-<code>networkmanager</code> group and you can skip the rest of this
-section on wireless networks.</para>
-
-<para>
-NixOS will start wpa_supplicant for you if you enable this setting:
-
-<programlisting>
-networking.wireless.enable = true;
-</programlisting>
-
-NixOS currently does not generate wpa_supplicant's
-configuration file, <literal>/etc/wpa_supplicant.conf</literal>. You should edit this file
-yourself to define wireless networks, WPA keys and so on (see
-wpa_supplicant.conf(5)).
-</para>
-
-<para>
-If you are using WPA2 the <command>wpa_passphrase</command> tool might be useful
-to generate the <literal>wpa_supplicant.conf</literal>.
-
-<screen>
-$ wpa_passphrase ESSID PSK > /etc/wpa_supplicant.conf</screen>
-
-After you have edited the <literal>wpa_supplicant.conf</literal>,
-you need to restart the wpa_supplicant service.
-
-<screen>
-$ systemctl restart wpa_supplicant.service</screen>
-</para>
-
-
-</section>
-
-
-<section><title>Ad-hoc configuration</title>
-
-<para>You can use <option>networking.localCommands</option> to specify
-shell commands to be run at the end of
-<literal>network-setup.service</literal>.  This is useful for doing
-network configuration not covered by the existing NixOS modules.  For
-instance, to statically configure an IPv6 address:
-
-<programlisting>
-networking.localCommands =
-  ''
-    ip -6 addr add 2001:610:685:1::1/64 dev eth0
-  '';
-</programlisting>
-
-</para>
-
-</section>
-
-
-<!-- TODO: OpenVPN, NAT -->
-
-
-</section>
-
-
-<!--===============================================================-->
-
-<section xml:id="sec-kernel-config"><title>Linux kernel</title>
-
-<para>You can override the Linux kernel and associated packages using
-the option <option>boot.kernelPackages</option>.  For instance, this
-selects the Linux 3.10 kernel:
-<programlisting>
-boot.kernelPackages = pkgs.linuxPackages_3_10;
-</programlisting>
-Note that this not only replaces the kernel, but also packages that
-are specific to the kernel version, such as the NVIDIA video drivers.
-This ensures that driver packages are consistent with the
-kernel.</para>
-
-<para>The default Linux kernel configuration should be fine for most users. You can see the configuration of your current kernel with the following command:
-<programlisting>
-cat /proc/config.gz | gunzip
-</programlisting>
-If you want to change the kernel configuration, you can use the
-<option>packageOverrides</option> feature (see <xref
-linkend="sec-customising-packages" />).  For instance, to enable
-support for the kernel debugger KGDB:
-
-<programlisting>
-nixpkgs.config.packageOverrides = pkgs:
-  { linux_3_4 = pkgs.linux_3_4.override {
-      extraConfig =
-        ''
-          KGDB y
-        '';
-    };
-  };
-</programlisting>
-
-<varname>extraConfig</varname> takes a list of Linux kernel
-configuration options, one per line.  The name of the option should
-not include the prefix <literal>CONFIG_</literal>.  The option value
-is typically <literal>y</literal>, <literal>n</literal> or
-<literal>m</literal> (to build something as a kernel module).</para>
-
-<para>Kernel modules for hardware devices are generally loaded
-automatically by <command>udev</command>.  You can force a module to
-be loaded via <option>boot.kernelModules</option>, e.g.
-<programlisting>
-boot.kernelModules = [ "fuse" "kvm-intel" "coretemp" ];
-</programlisting>
-If the module is required early during the boot (e.g. to mount the
-root file system), you can use
-<option>boot.initrd.extraKernelModules</option>:
-<programlisting>
-boot.initrd.extraKernelModules = [ "cifs" ];
-</programlisting>
-This causes the specified modules and their dependencies to be added
-to the initial ramdark.</para>
-
-<para>Kernel runtime parameters can be set through
-<option>boot.kernel.sysctl</option>, e.g.
-<programlisting>
-boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 120;
-</programlisting>
-sets the kernel’s TCP keepalive time to 120 seconds.  To see the
-available parameters, run <command>sysctl -a</command>.</para>
-
-</section>
-
-
-<!-- Apache; libvirtd virtualisation -->
-
-
-</chapter>
diff --git a/nixos/doc/manual/configuration/LUKS-file-systems.xml b/nixos/doc/manual/configuration/LUKS-file-systems.xml
new file mode 100644
index 000000000000..45475dbcd446
--- /dev/null
+++ b/nixos/doc/manual/configuration/LUKS-file-systems.xml
@@ -0,0 +1,42 @@
+<section xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="sec-luks-file-systems">
+
+<title>LUKS-Encrypted File Systems</title>
+
+<para>NixOS supports file systems that are encrypted using
+<emphasis>LUKS</emphasis> (Linux Unified Key Setup).  For example,
+here is how you create an encrypted Ext4 file system on the device
+<filename>/dev/sda2</filename>:
+
+<screen>
+$ cryptsetup luksFormat /dev/sda2
+
+WARNING!
+========
+This will overwrite data on /dev/sda2 irrevocably.
+
+Are you sure? (Type uppercase yes): YES
+Enter LUKS passphrase: ***
+Verify passphrase: ***
+
+$ cryptsetup luksOpen /dev/sda2 crypted
+Enter passphrase for /dev/sda2: ***
+
+$ mkfs.ext4 /dev/mapper/crypted
+</screen>
+
+To ensure that this file system is automatically mounted at boot time
+as <filename>/</filename>, add the following to
+<filename>configuration.nix</filename>:
+
+<programlisting>
+boot.initrd.luks.devices = [ { device = "/dev/sda2"; name = "crypted"; } ];
+fileSystems."/".device = "/dev/mapper/crypted";
+</programlisting>
+
+</para>
+
+</section>
diff --git a/nixos/doc/manual/configuration/abstractions.xml b/nixos/doc/manual/configuration/abstractions.xml
new file mode 100644
index 000000000000..cbd54bca62f9
--- /dev/null
+++ b/nixos/doc/manual/configuration/abstractions.xml
@@ -0,0 +1,166 @@
+<section xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="sec-module-abstractions">
+
+<title>Abstractions</title>
+
+<para>If you find yourself repeating yourself over and over, it’s time
+to abstract.  Take, for instance, this Apache HTTP Server configuration:
+
+<programlisting>
+{
+  services.httpd.virtualHosts =
+    [ { hostName = "example.org";
+        documentRoot = "/webroot";
+        adminAddr = "alice@example.org";
+        enableUserDir = true;
+      }
+      { hostName = "example.org";
+        documentRoot = "/webroot";
+        adminAddr = "alice@example.org";
+        enableUserDir = true;
+        enableSSL = true;
+        sslServerCert = "/root/ssl-example-org.crt";
+        sslServerKey = "/root/ssl-example-org.key";
+      }
+    ];
+}
+</programlisting>
+
+It defines two virtual hosts with nearly identical configuration; the
+only difference is that the second one has SSL enabled.  To prevent
+this duplication, we can use a <literal>let</literal>:
+
+<programlisting>
+let
+  exampleOrgCommon =
+    { hostName = "example.org";
+      documentRoot = "/webroot";
+      adminAddr = "alice@example.org";
+      enableUserDir = true;
+    };
+in
+{
+  services.httpd.virtualHosts =
+    [ exampleOrgCommon
+      (exampleOrgCommon // {
+        enableSSL = true;
+        sslServerCert = "/root/ssl-example-org.crt";
+        sslServerKey = "/root/ssl-example-org.key";
+      })
+    ];
+}
+</programlisting>
+
+The <literal>let exampleOrgCommon =
+<replaceable>...</replaceable></literal> defines a variable named
+<literal>exampleOrgCommon</literal>.  The <literal>//</literal>
+operator merges two attribute sets, so the configuration of the second
+virtual host is the set <literal>exampleOrgCommon</literal> extended
+with the SSL options.</para>
+
+<para>You can write a <literal>let</literal> wherever an expression is
+allowed.  Thus, you also could have written:
+
+<programlisting>
+{
+  services.httpd.virtualHosts =
+    let exampleOrgCommon = <replaceable>...</replaceable>; in
+    [ exampleOrgCommon
+      (exampleOrgCommon // { <replaceable>...</replaceable> })
+    ];
+}
+</programlisting>
+
+but not <literal>{ let exampleOrgCommon =
+<replaceable>...</replaceable>; in <replaceable>...</replaceable>;
+}</literal> since attributes (as opposed to attribute values) are not
+expressions.</para>
+
+<para><emphasis>Functions</emphasis> provide another method of
+abstraction.  For instance, suppose that we want to generate lots of
+different virtual hosts, all with identical configuration except for
+the host name.  This can be done as follows:
+
+<programlisting>
+{
+  services.httpd.virtualHosts =
+    let
+      makeVirtualHost = name:
+        { hostName = name;
+          documentRoot = "/webroot";
+          adminAddr = "alice@example.org";
+        };
+    in
+      [ (makeVirtualHost "example.org")
+        (makeVirtualHost "example.com")
+        (makeVirtualHost "example.gov")
+        (makeVirtualHost "example.nl")
+      ];
+}
+</programlisting>
+
+Here, <varname>makeVirtualHost</varname> is a function that takes a
+single argument <literal>name</literal> and returns the configuration
+for a virtual host.  That function is then called for several names to
+produce the list of virtual host configurations.</para>
+
+<para>We can further improve on this by using the function
+<varname>map</varname>, which applies another function to every
+element in a list:
+
+<programlisting>
+{
+  services.httpd.virtualHosts =
+    let
+      makeVirtualHost = <replaceable>...</replaceable>;
+    in map makeVirtualHost
+      [ "example.org" "example.com" "example.gov" "example.nl" ];
+}
+</programlisting>
+
+(The function <literal>map</literal> is called a
+<emphasis>higher-order function</emphasis> because it takes another
+function as an argument.)</para>
+
+<para>What if you need more than one argument, for instance, if we
+want to use a different <literal>documentRoot</literal> for each
+virtual host?  Then we can make <varname>makeVirtualHost</varname> a
+function that takes a <emphasis>set</emphasis> as its argument, like this:
+
+<programlisting>
+{
+  services.httpd.virtualHosts =
+    let
+      makeVirtualHost = { name, root }:
+        { hostName = name;
+          documentRoot = root;
+          adminAddr = "alice@example.org";
+        };
+    in map makeVirtualHost
+      [ { name = "example.org"; root = "/sites/example.org"; }
+        { name = "example.com"; root = "/sites/example.com"; }
+        { name = "example.gov"; root = "/sites/example.gov"; }
+        { name = "example.nl"; root = "/sites/example.nl"; }
+      ];
+}
+</programlisting>
+
+But in this case (where every root is a subdirectory of
+<filename>/sites</filename> named after the virtual host), it would
+have been shorter to define <varname>makeVirtualHost</varname> as
+<programlisting>
+makeVirtualHost = name:
+  { hostName = name;
+    documentRoot = "/sites/${name}";
+    adminAddr = "alice@example.org";
+  };
+</programlisting>
+
+Here, the construct
+<literal>${<replaceable>...</replaceable>}</literal> allows the result
+of an expression to be spliced into a string.</para>
+
+</section>
diff --git a/nixos/doc/manual/configuration/ad-hoc-network-config.xml b/nixos/doc/manual/configuration/ad-hoc-network-config.xml
new file mode 100644
index 000000000000..26a572ba1fb5
--- /dev/null
+++ b/nixos/doc/manual/configuration/ad-hoc-network-config.xml
@@ -0,0 +1,24 @@
+<section xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="ad-hoc-network-config">
+
+<title>Ad-Hoc Configuration</title>
+
+<para>You can use <option>networking.localCommands</option> to specify
+shell commands to be run at the end of
+<literal>network-setup.service</literal>.  This is useful for doing
+network configuration not covered by the existing NixOS modules.  For
+instance, to statically configure an IPv6 address:
+
+<programlisting>
+networking.localCommands =
+  ''
+    ip -6 addr add 2001:610:685:1::1/64 dev eth0
+  '';
+</programlisting>
+
+</para>
+
+</section>
diff --git a/nixos/doc/manual/configuration/ad-hoc-packages.xml b/nixos/doc/manual/configuration/ad-hoc-packages.xml
new file mode 100644
index 000000000000..e237e20c4fff
--- /dev/null
+++ b/nixos/doc/manual/configuration/ad-hoc-packages.xml
@@ -0,0 +1,63 @@
+<section xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="sec-ad-hoc-packages">
+
+<title>Ad-Hoc Package Management</title>
+
+<para>With the command <command>nix-env</command>, you can install and
+uninstall packages from the command line.  For instance, to install
+Mozilla Thunderbird:
+
+<screen>
+$ nix-env -iA nixos.pkgs.thunderbird</screen>
+
+If you invoke this as root, the package is installed in the Nix
+profile <filename>/nix/var/nix/profiles/default</filename> and visible
+to all users of the system; otherwise, the package ends up in
+<filename>/nix/var/nix/profiles/per-user/<replaceable>username</replaceable>/profile</filename>
+and is not visible to other users.  The <option>-A</option> flag
+specifies the package by its attribute name; without it, the package
+is installed by matching against its package name
+(e.g. <literal>thunderbird</literal>).  The latter is slower because
+it requires matching against all available Nix packages, and is
+ambiguous if there are multiple matching packages.</para>
+
+<para>Packages come from the NixOS channel.  You typically upgrade a
+package by updating to the latest version of the NixOS channel:
+<screen>
+$ nix-channel --update nixos
+</screen>
+and then running <literal>nix-env -i</literal> again.  Other packages
+in the profile are <emphasis>not</emphasis> affected; this is the
+crucial difference with the declarative style of package management,
+where running <command>nixos-rebuild switch</command> causes all
+packages to be updated to their current versions in the NixOS channel.
+You can however upgrade all packages for which there is a newer
+version by doing:
+<screen>
+$ nix-env -u '*'
+</screen>
+</para>
+
+<para>A package can be uninstalled using the <option>-e</option>
+flag:
+<screen>
+$ nix-env -e thunderbird
+</screen>
+</para>
+
+<para>Finally, you can roll back an undesirable
+<command>nix-env</command> action:
+<screen>
+$ nix-env --rollback
+</screen>
+</para>
+
+<para><command>nix-env</command> has many more flags.  For details,
+see the
+<citerefentry><refentrytitle>nix-env</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+manpage or the Nix manual.</para>
+
+</section>
diff --git a/nixos/doc/manual/configuration/adding-custom-packages.xml b/nixos/doc/manual/configuration/adding-custom-packages.xml
new file mode 100644
index 000000000000..c1789fcbc041
--- /dev/null
+++ b/nixos/doc/manual/configuration/adding-custom-packages.xml
@@ -0,0 +1,84 @@
+<section xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="sec-custom-packages">
+
+<title>Adding Custom Packages</title>
+
+<para>It’s possible that a package you need is not available in NixOS.
+In that case, you can do two things.  First, you can clone the Nixpkgs
+repository, add the package to your clone, and (optionally) submit a
+patch or pull request to have it accepted into the main Nixpkgs
+repository.  This is described in detail in the <link
+xlink:href="http://nixos.org/nixpkgs/manual">Nixpkgs manual</link>.
+In short, you clone Nixpkgs:
+
+<screen>
+$ git clone git://github.com/NixOS/nixpkgs.git
+$ cd nixpkgs
+</screen>
+
+Then you write and test the package as described in the Nixpkgs
+manual.  Finally, you add it to
+<literal>environment.systemPackages</literal>, e.g.
+
+<programlisting>
+environment.systemPackages = [ pkgs.my-package ];
+</programlisting>
+
+and you run <command>nixos-rebuild</command>, specifying your own
+Nixpkgs tree:
+
+<screen>
+$ nixos-rebuild switch -I nixpkgs=/path/to/my/nixpkgs</screen>
+
+</para>
+
+<para>The second possibility is to add the package outside of the
+Nixpkgs tree.  For instance, here is how you specify a build of the
+<link xlink:href="http://www.gnu.org/software/hello/">GNU Hello</link>
+package directly in <filename>configuration.nix</filename>:
+
+<programlisting>
+environment.systemPackages =
+  let
+    my-hello = with pkgs; stdenv.mkDerivation rec {
+      name = "hello-2.8";
+      src = fetchurl {
+        url = "mirror://gnu/hello/${name}.tar.gz";
+        sha256 = "0wqd8sjmxfskrflaxywc7gqw7sfawrfvdxd9skxawzfgyy0pzdz6";
+      };
+    };
+  in
+  [ my-hello ];
+</programlisting>
+
+Of course, you can also move the definition of
+<literal>my-hello</literal> into a separate Nix expression, e.g.
+<programlisting>
+environment.systemPackages = [ (import ./my-hello.nix) ];
+</programlisting>
+where <filename>my-hello.nix</filename> contains:
+<programlisting>
+with import &lt;nixpkgs> {}; # bring all of Nixpkgs into scope
+
+stdenv.mkDerivation rec {
+  name = "hello-2.8";
+  src = fetchurl {
+    url = "mirror://gnu/hello/${name}.tar.gz";
+    sha256 = "0wqd8sjmxfskrflaxywc7gqw7sfawrfvdxd9skxawzfgyy0pzdz6";
+  };
+}
+</programlisting>
+
+This allows testing the package easily:
+<screen>
+$ nix-build my-hello.nix
+$ ./result/bin/hello
+Hello, world!
+</screen>
+
+</para>
+
+</section>
diff --git a/nixos/doc/manual/configuration/config-file.xml b/nixos/doc/manual/configuration/config-file.xml
new file mode 100644
index 000000000000..2a58ff25941c
--- /dev/null
+++ b/nixos/doc/manual/configuration/config-file.xml
@@ -0,0 +1,213 @@
+<section xmlns="http://docbook.org/ns/docbook"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    version="5.0"
+    xml:id="sec-configuration-file">
+
+<title>NixOS Configuration File</title>
+
+<para>The NixOS configuration file generally looks like this:
+
+<programlisting>
+{ config, pkgs, ... }:
+
+{ <replaceable>option definitions</replaceable>
+}
+</programlisting>
+
+The first line (<literal>{ config, pkgs, ... }:</literal>) denotes
+that this is actually a function that takes at least the two arguments
+ <varname>config</varname> and <varname>pkgs</varname>.  (These are
+explained later.)  The function returns a <emphasis>set</emphasis> of
+option definitions (<literal>{ <replaceable>...</replaceable> }</literal>).  These definitions have the
+form <literal><replaceable>name</replaceable> =
+<replaceable>value</replaceable></literal>, where
+<replaceable>name</replaceable> is the name of an option and
+<replaceable>value</replaceable> is its value.  For example,
+
+<programlisting>
+{ config, pkgs, ... }:
+
+{ services.httpd.enable = true;
+  services.httpd.adminAddr = "alice@example.org";
+  services.httpd.documentRoot = "/webroot";
+}
+</programlisting>
+
+defines a configuration with three option definitions that together
+enable the Apache HTTP Server with <filename>/webroot</filename> as
+the document root.</para>
+
+<para>Sets can be nested, and in fact dots in option names are
+shorthand for defining a set containing another set.  For instance,
+<option>services.httpd.enable</option> defines a set named
+<varname>services</varname> that contains a set named
+<varname>httpd</varname>, which in turn contains an option definition
+named <varname>enable</varname> with value <literal>true</literal>.
+This means that the example above can also be written as:
+
+<programlisting>
+{ config, pkgs, ... }:
+
+{ services = {
+    httpd = {
+      enable = true;
+      adminAddr = "alice@example.org";
+      documentRoot = "/webroot";
+    };
+  };
+}
+</programlisting>
+
+which may be more convenient if you have lots of option definitions
+that share the same prefix (such as
+<literal>services.httpd</literal>).</para>
+
+<para>NixOS checks your option definitions for correctness.  For
+instance, if you try to define an option that doesn’t exist (that is,
+doesn’t have a corresponding <emphasis>option declaration</emphasis>),
+<command>nixos-rebuild</command> will give an error like:
+<screen>
+The option `services.httpd.enabl' defined in `/etc/nixos/configuration.nix' does not exist.
+</screen>
+Likewise, values in option definitions must have a correct type.  For
+instance, <option>services.httpd.enable</option> must be a Boolean
+(<literal>true</literal> or <literal>false</literal>).  Trying to give
+it a value of another type, such as a string, will cause an error:
+<screen>
+The option value `services.httpd.enable' in `/etc/nixos/configuration.nix' is not a boolean.
+</screen>
+
+</para>
+
+<para>Options have various types of values.  The most important are:
+
+<variablelist>
+  <varlistentry>
+    <term>Strings</term>
+    <listitem>
+      <para>Strings are enclosed in double quotes, e.g.
+
+<programlisting>
+networking.hostName = "dexter";
+</programlisting>
+
+      Special characters can be escaped by prefixing them with a
+      backslash (e.g. <literal>\"</literal>).</para>
+
+      <para>Multi-line strings can be enclosed in <emphasis>double
+      single quotes</emphasis>, e.g.
+
+<programlisting>
+networking.extraHosts =
+  ''
+    127.0.0.2 other-localhost
+    10.0.0.1 server
+  '';
+</programlisting>
+
+      The main difference is that preceding whitespace is
+      automatically stripped from each line, and that characters like
+      <literal>"</literal> and <literal>\</literal> are not special
+      (making it more convenient for including things like shell
+      code).</para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term>Booleans</term>
+    <listitem>
+      <para>These can be <literal>true</literal> or
+      <literal>false</literal>, e.g.
+
+<programlisting>
+networking.firewall.enable = true;
+networking.firewall.allowPing = false;
+</programlisting>
+      </para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term>Integers</term>
+    <listitem>
+      <para>For example,
+
+<programlisting>
+boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 60;
+</programlisting>
+
+      (Note that here the attribute name
+      <literal>net.ipv4.tcp_keepalive_time</literal> is enclosed in
+      quotes to prevent it from being interpreted as a set named
+      <literal>net</literal> containing a set named
+      <literal>ipv4</literal>, and so on.  This is because it’s not a
+      NixOS option but the literal name of a Linux kernel
+      setting.)</para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term>Sets</term>
+    <listitem>
+      <para>Sets were introduced above.  They are name/value pairs
+      enclosed in braces, as in the option definition
+
+<programlisting>
+fileSystems."/boot" =
+  { device = "/dev/sda1";
+    fsType = "ext4";
+    options = "rw,data=ordered,relatime";
+  };
+</programlisting>
+      </para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term>Lists</term>
+    <listitem>
+      <para>The important thing to note about lists is that list
+      elements are separated by whitespace, like this:
+
+<programlisting>
+boot.kernelModules = [ "fuse" "kvm-intel" "coretemp" ];
+</programlisting>
+
+      List elements can be any other type, e.g. sets:
+
+<programlisting>
+swapDevices = [ { device = "/dev/disk/by-label/swap"; } ];
+</programlisting>
+      </para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term>Packages</term>
+    <listitem>
+      <para>Usually, the packages you need are already part of the Nix
+      Packages collection, which is a set that can be accessed through
+      the function argument <varname>pkgs</varname>.  Typical uses:
+
+<programlisting>
+environment.systemPackages =
+  [ pkgs.thunderbird
+    pkgs.emacs
+  ];
+
+postgresql.package = pkgs.postgresql90;
+</programlisting>
+
+      The latter option definition changes the default PostgreSQL
+      package used by NixOS’s PostgreSQL service to 9.0.  For more
+      information on packages, including how to add new ones, see
+      <xref linkend="sec-custom-packages"/>.</para>
+    </listitem>
+  </varlistentry>
+
+</variablelist>
+
+</para>
+
+</section>
diff --git a/nixos/doc/manual/configuration/config-syntax.xml b/nixos/doc/manual/configuration/config-syntax.xml
new file mode 100644
index 000000000000..87847f8451ec
--- /dev/null
+++ b/nixos/doc/manual/configuration/config-syntax.xml
@@ -0,0 +1,27 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="sec-configuration-syntax">
+
+<title>Configuration Syntax</title>
+
+<para>The NixOS configuration file
+<filename>/etc/nixos/configuration.nix</filename> is actually a
+<emphasis>Nix expression</emphasis>, which is the Nix package
+manager’s purely functional language for describing how to build
+packages and configurations.  This means you have all the expressive
+power of that language at your disposal, including the ability to
+abstract over common patterns, which is very useful when managing
+complex systems.  The syntax and semantics of the Nix language are
+fully described in the <link
+xlink:href="http://nixos.org/nix/manual/#chap-writing-nix-expressions">Nix
+manual</link>, but here we give a short overview of the most important
+constructs useful in NixOS configuration files.</para>
+
+<xi:include href="config-file.xml" />
+<xi:include href="abstractions.xml" />
+<xi:include href="modularity.xml" />
+<xi:include href="summary.xml" />
+
+</chapter>
diff --git a/nixos/doc/manual/configuration/configuration.xml b/nixos/doc/manual/configuration/configuration.xml
new file mode 100644
index 000000000000..e15c700017c4
--- /dev/null
+++ b/nixos/doc/manual/configuration/configuration.xml
@@ -0,0 +1,29 @@
+<part xmlns="http://docbook.org/ns/docbook"
+      xmlns:xlink="http://www.w3.org/1999/xlink"
+      xmlns:xi="http://www.w3.org/2001/XInclude"
+      version="5.0"
+      xml:id="ch-configuration">
+
+<title>Configuration</title>
+
+<partintro>
+
+<para>This chapter describes how to configure various aspects of a
+NixOS machine through the configuration file
+<filename>/etc/nixos/configuration.nix</filename>.  As described in
+<xref linkend="sec-changing-config" />, changes to this file only take
+effect after you run <command>nixos-rebuild</command>.</para>
+
+</partintro>
+
+<xi:include href="config-syntax.xml" />
+<xi:include href="package-mgmt.xml" />
+<xi:include href="user-mgmt.xml" />
+<xi:include href="file-systems.xml" />
+<xi:include href="x-windows.xml" />
+<xi:include href="networking.xml" />
+<xi:include href="linux-kernel.xml" />
+
+<!-- Apache; libvirtd virtualisation -->
+
+</part>
diff --git a/nixos/doc/manual/configuration/customizing-packages.xml b/nixos/doc/manual/configuration/customizing-packages.xml
new file mode 100644
index 000000000000..6ee7a95dc6fa
--- /dev/null
+++ b/nixos/doc/manual/configuration/customizing-packages.xml
@@ -0,0 +1,92 @@
+<section xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="sec-customising-packages">
+
+<title>Customising Packages</title>
+
+<para>Some packages in Nixpkgs have options to enable or disable
+optional functionality or change other aspects of the package.  For
+instance, the Firefox wrapper package (which provides Firefox with a
+set of plugins such as the Adobe Flash player) has an option to enable
+the Google Talk plugin.  It can be set in
+<filename>configuration.nix</filename> as follows:
+
+<filename>
+nixpkgs.config.firefox.enableGoogleTalkPlugin = true;
+</filename>
+</para>
+
+<warning><para>Unfortunately, Nixpkgs currently lacks a way to query
+available configuration options.</para></warning>
+
+<para>Apart from high-level options, it’s possible to tweak a package
+in almost arbitrary ways, such as changing or disabling dependencies
+of a package.  For instance, the Emacs package in Nixpkgs by default
+has a dependency on GTK+ 2.  If you want to build it against GTK+ 3,
+you can specify that as follows:
+
+<programlisting>
+environment.systemPackages = [ (pkgs.emacs.override { gtk = pkgs.gtk3; }) ];
+</programlisting>
+
+The function <varname>override</varname> performs the call to the Nix
+function that produces Emacs, with the original arguments amended by
+the set of arguments specified by you.  So here the function argument
+<varname>gtk</varname> gets the value <literal>pkgs.gtk3</literal>,
+causing Emacs to depend on GTK+ 3.  (The parentheses are necessary
+because in Nix, function application binds more weakly than list
+construction, so without them,
+<literal>environment.systemPackages</literal> would be a list with two
+elements.)</para>
+
+<para>Even greater customisation is possible using the function
+<varname>overrideDerivation</varname>.  While the
+<varname>override</varname> mechanism above overrides the arguments of
+a package function, <varname>overrideDerivation</varname> allows
+changing the <emphasis>result</emphasis> of the function.  This
+permits changing any aspect of the package, such as the source code.
+For instance, if you want to override the source code of Emacs, you
+can say:
+
+<programlisting>
+environment.systemPackages =
+  [ (pkgs.lib.overrideDerivation pkgs.emacs (attrs: {
+      name = "emacs-25.0-pre";
+      src = /path/to/my/emacs/tree;
+    }))
+  ];
+</programlisting>
+
+Here, <varname>overrideDerivation</varname> takes the Nix derivation
+specified by <varname>pkgs.emacs</varname> and produces a new
+derivation in which the original’s <literal>name</literal> and
+<literal>src</literal> attribute have been replaced by the given
+values.  The original attributes are accessible via
+<varname>attrs</varname>.</para>
+
+<para>The overrides shown above are not global.  They do not affect
+the original package; other packages in Nixpkgs continue to depend on
+the original rather than the customised package.  This means that if
+another package in your system depends on the original package, you
+end up with two instances of the package.  If you want to have
+everything depend on your customised instance, you can apply a
+<emphasis>global</emphasis> override as follows:
+
+<screen>
+nixpkgs.config.packageOverrides = pkgs:
+  { emacs = pkgs.emacs.override { gtk = pkgs.gtk3; };
+  };
+</screen>
+
+The effect of this definition is essentially equivalent to modifying
+the <literal>emacs</literal> attribute in the Nixpkgs source tree.
+Any package in Nixpkgs that depends on <literal>emacs</literal> will
+be passed your customised instance.  (However, the value
+<literal>pkgs.emacs</literal> in
+<varname>nixpkgs.config.packageOverrides</varname> refers to the
+original rather than overridden instance, to prevent an infinite
+recursion.)</para>
+
+</section>
diff --git a/nixos/doc/manual/configuration/declarative-packages.xml b/nixos/doc/manual/configuration/declarative-packages.xml
new file mode 100644
index 000000000000..6de38b452e24
--- /dev/null
+++ b/nixos/doc/manual/configuration/declarative-packages.xml
@@ -0,0 +1,43 @@
+<section xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="sec-declarative-package-mgmt">
+
+<title>Declarative Package Management</title>
+
+<para>With declarative package management, you specify which packages
+you want on your system by setting the option
+<option>environment.systemPackages</option>.  For instance, adding the
+following line to <filename>configuration.nix</filename> enables the
+Mozilla Thunderbird email application:
+
+<programlisting>
+environment.systemPackages = [ pkgs.thunderbird ];
+</programlisting>
+
+The effect of this specification is that the Thunderbird package from
+Nixpkgs will be built or downloaded as part of the system when you run
+<command>nixos-rebuild switch</command>.</para>
+
+<para>You can get a list of the available packages as follows:
+<screen>
+$ nix-env -qaP '*' --description
+nixos.pkgs.firefox   firefox-23.0   Mozilla Firefox - the browser, reloaded
+<replaceable>...</replaceable>
+</screen>
+
+The first column in the output is the <emphasis>attribute
+name</emphasis>, such as
+<literal>nixos.pkgs.thunderbird</literal>. (The
+<literal>nixos</literal> prefix allows distinguishing between
+different channels that you might have.)</para>
+
+<para>To “uninstall” a package, simply remove it from
+<option>environment.systemPackages</option> and run
+<command>nixos-rebuild switch</command>.</para>
+
+<xi:include href="customizing-packages.xml" />
+<xi:include href="adding-custom-packages.xml" />
+
+</section>
diff --git a/nixos/doc/manual/configuration/file-systems.xml b/nixos/doc/manual/configuration/file-systems.xml
new file mode 100644
index 000000000000..52ad6d62f130
--- /dev/null
+++ b/nixos/doc/manual/configuration/file-systems.xml
@@ -0,0 +1,40 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="ch-file-systems">
+
+<title>File Systems</title>
+
+<para>You can define file systems using the
+<option>fileSystems</option> configuration option.  For instance, the
+following definition causes NixOS to mount the Ext4 file system on
+device <filename>/dev/disk/by-label/data</filename> onto the mount
+point <filename>/data</filename>:
+
+<programlisting>
+fileSystems."/data" =
+  { device = "/dev/disk/by-label/data";
+    fsType = "ext4";
+  };
+</programlisting>
+
+Mount points are created automatically if they don’t already exist.
+For <option>device</option>, it’s best to use the topology-independent
+device aliases in <filename>/dev/disk/by-label</filename> and
+<filename>/dev/disk/by-uuid</filename>, as these don’t change if the
+topology changes (e.g. if a disk is moved to another IDE
+controller).</para>
+
+<para>You can usually omit the file system type
+(<option>fsType</option>), since <command>mount</command> can usually
+detect the type and load the necessary kernel module automatically.
+However, if the file system is needed at early boot (in the initial
+ramdisk) and is not <literal>ext2</literal>, <literal>ext3</literal>
+or <literal>ext4</literal>, then it’s best to specify
+<option>fsType</option> to ensure that the kernel module is
+available.</para>
+
+<xi:include href="LUKS-file-systems.xml" />
+
+</chapter>
diff --git a/nixos/doc/manual/configuration/firewall.xml b/nixos/doc/manual/configuration/firewall.xml
new file mode 100644
index 000000000000..87406c28c2f7
--- /dev/null
+++ b/nixos/doc/manual/configuration/firewall.xml
@@ -0,0 +1,38 @@
+<section xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="sec-firewall">
+
+<title>Firewall</title>
+
+<para>NixOS has a simple stateful firewall that blocks incoming
+connections and other unexpected packets.  The firewall applies to
+both IPv4 and IPv6 traffic. It is enabled by default. It can be
+disabled as follows:
+
+<programlisting>
+networking.firewall.enable = false;
+</programlisting>
+
+If the firewall is enabled, you can open specific TCP ports to the
+outside world:
+
+<programlisting>
+networking.firewall.allowedTCPPorts = [ 80 443 ];
+</programlisting>
+
+Note that TCP port 22 (ssh) is opened automatically if the SSH daemon
+is enabled (<option>services.openssh.enable = true</option>).  UDP
+ports can be opened through
+<option>networking.firewall.allowedUDPPorts</option>.  Also of
+interest is
+
+<programlisting>
+networking.firewall.allowPing = true;
+</programlisting>
+
+to allow the machine to respond to ping requests.  (ICMPv6 pings are
+always allowed.)</para>
+
+</section>
diff --git a/nixos/doc/manual/configuration/ipv4-config.xml b/nixos/doc/manual/configuration/ipv4-config.xml
new file mode 100644
index 000000000000..e2c51518349d
--- /dev/null
+++ b/nixos/doc/manual/configuration/ipv4-config.xml
@@ -0,0 +1,47 @@
+<section xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="sec-ipv4">
+
+<title>IPv4 Configuration</title>
+
+<para>By default, NixOS uses DHCP (specifically,
+<command>dhcpcd</command>) to automatically configure network
+interfaces.  However, you can configure an interface manually as
+follows:
+
+<programlisting>
+networking.interfaces.eth0 = { ipAddress = "192.168.1.2"; prefixLength = 24; };
+</programlisting>
+
+(The network prefix can also be specified using the option
+<literal>subnetMask</literal>,
+e.g. <literal>"255.255.255.0"</literal>, but this is deprecated.)
+Typically you’ll also want to set a default gateway and set of name
+servers:
+
+<programlisting>
+networking.defaultGateway = "192.168.1.1";
+networking.nameservers = [ "8.8.8.8" ];
+</programlisting>
+
+</para>
+
+<note><para>Statically configured interfaces are set up by the systemd
+service
+<replaceable>interface-name</replaceable><literal>-cfg.service</literal>.
+The default gateway and name server configuration is performed by
+<literal>network-setup.service</literal>.</para></note>
+
+<para>The host name is set using <option>networking.hostName</option>:
+
+<programlisting>
+networking.hostName = "cartman";
+</programlisting>
+
+The default host name is <literal>nixos</literal>.  Set it to the
+empty string (<literal>""</literal>) to allow the DHCP server to
+provide the host name.</para>
+
+</section>
diff --git a/nixos/doc/manual/configuration/ipv6-config.xml b/nixos/doc/manual/configuration/ipv6-config.xml
new file mode 100644
index 000000000000..592bf20e545d
--- /dev/null
+++ b/nixos/doc/manual/configuration/ipv6-config.xml
@@ -0,0 +1,19 @@
+<section xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="sec-ipv6">
+
+<title>IPv6 Configuration</title>
+
+<para>IPv6 is enabled by default.  Stateless address autoconfiguration
+is used to automatically assign IPv6 addresses to all interfaces.  You
+can disable IPv6 support globally by setting:
+
+<programlisting>
+networking.enableIPv6 = false;
+</programlisting>
+
+</para>
+
+</section>
diff --git a/nixos/doc/manual/configuration/linux-kernel.xml b/nixos/doc/manual/configuration/linux-kernel.xml
new file mode 100644
index 000000000000..8fe2f5255df3
--- /dev/null
+++ b/nixos/doc/manual/configuration/linux-kernel.xml
@@ -0,0 +1,69 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="sec-kernel-config">
+
+<title>Linux Kernel</title>
+
+<para>You can override the Linux kernel and associated packages using
+the option <option>boot.kernelPackages</option>.  For instance, this
+selects the Linux 3.10 kernel:
+<programlisting>
+boot.kernelPackages = pkgs.linuxPackages_3_10;
+</programlisting>
+Note that this not only replaces the kernel, but also packages that
+are specific to the kernel version, such as the NVIDIA video drivers.
+This ensures that driver packages are consistent with the
+kernel.</para>
+
+<para>The default Linux kernel configuration should be fine for most users. You can see the configuration of your current kernel with the following command:
+<programlisting>
+cat /proc/config.gz | gunzip
+</programlisting>
+If you want to change the kernel configuration, you can use the
+<option>packageOverrides</option> feature (see <xref
+linkend="sec-customising-packages" />).  For instance, to enable
+support for the kernel debugger KGDB:
+
+<programlisting>
+nixpkgs.config.packageOverrides = pkgs:
+  { linux_3_4 = pkgs.linux_3_4.override {
+      extraConfig =
+        ''
+          KGDB y
+        '';
+    };
+  };
+</programlisting>
+
+<varname>extraConfig</varname> takes a list of Linux kernel
+configuration options, one per line.  The name of the option should
+not include the prefix <literal>CONFIG_</literal>.  The option value
+is typically <literal>y</literal>, <literal>n</literal> or
+<literal>m</literal> (to build something as a kernel module).</para>
+
+<para>Kernel modules for hardware devices are generally loaded
+automatically by <command>udev</command>.  You can force a module to
+be loaded via <option>boot.kernelModules</option>, e.g.
+<programlisting>
+boot.kernelModules = [ "fuse" "kvm-intel" "coretemp" ];
+</programlisting>
+If the module is required early during the boot (e.g. to mount the
+root file system), you can use
+<option>boot.initrd.extraKernelModules</option>:
+<programlisting>
+boot.initrd.extraKernelModules = [ "cifs" ];
+</programlisting>
+This causes the specified modules and their dependencies to be added
+to the initial ramdark.</para>
+
+<para>Kernel runtime parameters can be set through
+<option>boot.kernel.sysctl</option>, e.g.
+<programlisting>
+boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 120;
+</programlisting>
+sets the kernel’s TCP keepalive time to 120 seconds.  To see the
+available parameters, run <command>sysctl -a</command>.</para>
+
+</chapter>
diff --git a/nixos/doc/manual/configuration/modularity.xml b/nixos/doc/manual/configuration/modularity.xml
new file mode 100644
index 000000000000..d95091bd1628
--- /dev/null
+++ b/nixos/doc/manual/configuration/modularity.xml
@@ -0,0 +1,143 @@
+<section xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="sec-modularity">
+
+<title>Modularity</title>
+
+<para>The NixOS configuration mechanism is modular.  If your
+<filename>configuration.nix</filename> becomes too big, you can split
+it into multiple files.  Likewise, if you have multiple NixOS
+configurations (e.g. for different computers) with some commonality,
+you can move the common configuration into a shared file.</para>
+
+<para>Modules have exactly the same syntax as
+<filename>configuration.nix</filename>.  In fact,
+<filename>configuration.nix</filename> is itself a module.  You can
+use other modules by including them from
+<filename>configuration.nix</filename>, e.g.:
+
+<programlisting>
+{ config, pkgs, ... }:
+
+{ imports = [ ./vpn.nix ./kde.nix ];
+  services.httpd.enable = true;
+  environment.systemPackages = [ pkgs.emacs ];
+  <replaceable>...</replaceable>
+}
+</programlisting>
+
+Here, we include two modules from the same directory,
+<filename>vpn.nix</filename> and <filename>kde.nix</filename>.  The
+latter might look like this:
+
+<programlisting>
+{ config, pkgs, ... }:
+
+{ services.xserver.enable = true;
+  services.xserver.displayManager.kdm.enable = true;
+  services.xserver.desktopManager.kde4.enable = true;
+  environment.systemPackages = [ pkgs.kde4.kscreensaver ];
+}
+</programlisting>
+
+Note that both <filename>configuration.nix</filename> and
+<filename>kde.nix</filename> define the option
+<option>environment.systemPackages</option>.  When multiple modules
+define an option, NixOS will try to <emphasis>merge</emphasis> the
+definitions.  In the case of
+<option>environment.systemPackages</option>, that’s easy: the lists of
+packages can simply be concatenated.  The value in
+<filename>configuration.nix</filename> is merged last, so for
+list-type options, it will appear at the end of the merged list. If
+you want it to appear first, you can use <varname>mkBefore</varname>:
+
+<programlisting>
+boot.kernelModules = mkBefore [ "kvm-intel" ];
+</programlisting>
+
+This causes the <literal>kvm-intel</literal> kernel module to be
+loaded before any other kernel modules.</para>
+
+<para>For other types of options, a merge may not be possible. For
+instance, if two modules define
+<option>services.httpd.adminAddr</option>,
+<command>nixos-rebuild</command> will give an error:
+
+<screen>
+The unique option `services.httpd.adminAddr' is defined multiple times, in `/etc/nixos/httpd.nix' and `/etc/nixos/configuration.nix'.
+</screen>
+
+When that happens, it’s possible to force one definition take
+precedence over the others:
+
+<programlisting>
+services.httpd.adminAddr = pkgs.lib.mkForce "bob@example.org";
+</programlisting>
+
+</para>
+
+<para>When using multiple modules, you may need to access
+configuration values defined in other modules.  This is what the
+<varname>config</varname> function argument is for: it contains the
+complete, merged system configuration.  That is,
+<varname>config</varname> is the result of combining the
+configurations returned by every module<footnote><para>If you’re
+wondering how it’s possible that the (indirect)
+<emphasis>result</emphasis> of a function is passed as an
+<emphasis>input</emphasis> to that same function: that’s because Nix
+is a “lazy” language — it only computes values when they are needed.
+This works as long as no individual configuration value depends on
+itself.</para></footnote>.  For example, here is a module that adds
+some packages to <option>environment.systemPackages</option> only if
+<option>services.xserver.enable</option> is set to
+<literal>true</literal> somewhere else:
+
+<programlisting>
+{ config, pkgs, ... }:
+
+{ environment.systemPackages =
+    if config.services.xserver.enable then
+      [ pkgs.firefox
+        pkgs.thunderbird
+      ]
+    else
+      [ ];
+}
+</programlisting>
+
+</para>
+
+<para>With multiple modules, it may not be obvious what the final
+value of a configuration option is.  The command
+<option>nixos-option</option> allows you to find out:
+
+<screen>
+$ nixos-option services.xserver.enable
+true
+
+$ nixos-option boot.kernelModules
+[ "tun" "ipv6" "loop" <replaceable>...</replaceable> ]
+</screen>
+
+Interactive exploration of the configuration is possible using
+<command
+xlink:href="https://github.com/edolstra/nix-repl">nix-repl</command>,
+a read-eval-print loop for Nix expressions.  It’s not installed by
+default; run <literal>nix-env -i nix-repl</literal> to get it.  A
+typical use:
+
+<screen>
+$ nix-repl '&lt;nixos>'
+
+nix-repl> config.networking.hostName
+"mandark"
+
+nix-repl> map (x: x.hostName) config.services.httpd.virtualHosts
+[ "example.org" "example.gov" ]
+</screen>
+
+</para>
+
+</section>
diff --git a/nixos/doc/manual/configuration/network-manager.xml b/nixos/doc/manual/configuration/network-manager.xml
new file mode 100644
index 000000000000..e65060021b40
--- /dev/null
+++ b/nixos/doc/manual/configuration/network-manager.xml
@@ -0,0 +1,27 @@
+<section xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="sec-networkmanager">
+
+<title>NetworkManager</title>
+
+<para>To facilitate network configuration, some desktop environments
+use NetworkManager. You can enable NetworkManager by setting:
+
+<programlisting>
+services.networkmanager.enable = true;
+</programlisting>
+
+Some desktop managers (e.g., GNOME) enable NetworkManager
+automatically for you.</para>
+
+<para>All users that should have permission to change network settings
+must belong to the <code>networkmanager</code> group.</para>
+
+<note><para><code>services.networkmanager</code> and
+<code>services.wireless</code> can not be enabled at the same time:
+you can still connect to the wireless networks using
+NetworkManager.</para></note>
+
+</section>
diff --git a/nixos/doc/manual/configuration/networking.xml b/nixos/doc/manual/configuration/networking.xml
new file mode 100644
index 000000000000..5f08bc1f1275
--- /dev/null
+++ b/nixos/doc/manual/configuration/networking.xml
@@ -0,0 +1,22 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="sec-networking">
+
+<title>Networking</title>
+
+<para>This section describes how to configure networking components on
+your NixOS machine.</para>
+
+<xi:include href="network-manager.xml" />
+<xi:include href="ssh.xml" />
+<xi:include href="ipv4-config.xml" />
+<xi:include href="ipv6-config.xml" />
+<xi:include href="firewall.xml" />
+<xi:include href="wireless.xml" />
+<xi:include href="ad-hoc-network-config.xml" />
+
+<!-- TODO: OpenVPN, NAT -->
+
+</chapter>
diff --git a/nixos/doc/manual/configuration/package-mgmt.xml b/nixos/doc/manual/configuration/package-mgmt.xml
new file mode 100644
index 000000000000..73c1722da02c
--- /dev/null
+++ b/nixos/doc/manual/configuration/package-mgmt.xml
@@ -0,0 +1,34 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="sec-package-management">
+
+<title>Package Management</title>
+
+<para>This section describes how to add additional packages to your
+system.  NixOS has two distinct styles of package management:
+
+<itemizedlist>
+
+  <listitem><para><emphasis>Declarative</emphasis>, where you declare
+  what packages you want in your
+  <filename>configuration.nix</filename>.  Every time you run
+  <command>nixos-rebuild</command>, NixOS will ensure that you get a
+  consistent set of binaries corresponding to your
+  specification.</para></listitem>
+
+  <listitem><para><emphasis>Ad hoc</emphasis>, where you install,
+  upgrade and uninstall packages via the <command>nix-env</command>
+  command.  This style allows mixing packages from different Nixpkgs
+  versions.  It’s the only choice for non-root
+  users.</para></listitem>
+
+</itemizedlist>
+
+</para>
+
+<xi:include href="declarative-packages.xml" />
+<xi:include href="ad-hoc-packages.xml" />
+
+</chapter>
diff --git a/nixos/doc/manual/configuration/ssh.xml b/nixos/doc/manual/configuration/ssh.xml
new file mode 100644
index 000000000000..7c928baaf896
--- /dev/null
+++ b/nixos/doc/manual/configuration/ssh.xml
@@ -0,0 +1,32 @@
+<section xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="sec-ssh">
+
+<title>Secure Shell Access</title>
+
+<para>Secure shell (SSH) access to your machine can be enabled by
+setting:
+
+<programlisting>
+services.openssh.enable = true;
+</programlisting>
+
+By default, root logins using a password are disallowed.  They can be
+disabled entirely by setting
+<literal>services.openssh.permitRootLogin</literal> to
+<literal>"no"</literal>.</para>
+
+<para>You can declaratively specify authorised RSA/DSA public keys for
+a user as follows:
+
+<!-- FIXME: this might not work if the user is unmanaged. -->
+<programlisting>
+users.extraUsers.alice.openssh.authorizedKeys.keys =
+  [ "ssh-dss AAAAB3NzaC1kc3MAAACBAPIkGWVEt4..." ];
+</programlisting>
+
+</para>
+
+</section>
diff --git a/nixos/doc/manual/configuration/summary.xml b/nixos/doc/manual/configuration/summary.xml
new file mode 100644
index 000000000000..9bb5e35e16bc
--- /dev/null
+++ b/nixos/doc/manual/configuration/summary.xml
@@ -0,0 +1,191 @@
+<section xmlns="http://docbook.org/ns/docbook"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    version="5.0"
+    xml:id="sec-nix-syntax-summary">
+
+<title>Syntax Summary</title>
+
+<para>Below is a summary of the most important syntactic constructs in
+the Nix expression language.  It’s not complete.  In particular, there
+are many other built-in functions.  See the <link
+xlink:href="http://nixos.org/nix/manual/#chap-writing-nix-expressions">Nix
+manual</link> for the rest.</para>
+
+<informaltable frame='none'>
+  <tgroup cols='2'>
+    <colspec colname='c1' rowsep='1' colsep='1' />
+    <colspec colname='c2' rowsep='1' />
+    <thead>
+      <row>
+        <entry>Example</entry>
+        <entry>Description</entry>
+      </row>
+    </thead>
+    <tbody>
+
+      <row>
+        <entry namest="c1" nameend="c2"><emphasis>Basic values</emphasis></entry>
+      </row>
+      <row>
+        <entry><literal>"Hello world"</literal></entry>
+        <entry>A string</entry>
+      </row>
+      <row>
+        <entry><literal>"${pkgs.bash}/bin/sh"</literal></entry>
+        <entry>A string containing an expression (expands to <literal>"/nix/store/<replaceable>hash</replaceable>-bash-<replaceable>version</replaceable>/bin/sh"</literal>)</entry>
+      </row>
+      <row>
+        <entry><literal>true</literal>, <literal>false</literal></entry>
+        <entry>Booleans</entry>
+      </row>
+      <row>
+        <entry><literal>123</literal></entry>
+        <entry>An integer</entry>
+      </row>
+      <row>
+        <entry><literal>./foo.png</literal></entry>
+        <entry>A path (relative to the containing Nix expression)</entry>
+      </row>
+
+      <row>
+        <entry namest="c1" nameend="c2"><emphasis>Compound values</emphasis></entry>
+      </row>
+      <row>
+        <entry><literal>{ x = 1; y = 2; }</literal></entry>
+        <entry>An set with attributes names <literal>x</literal> and <literal>y</literal></entry>
+      </row>
+      <row>
+        <entry><literal>{ foo.bar = 1; }</literal></entry>
+        <entry>A nested set, equivalent to <literal>{ foo = { bar = 1; }; }</literal></entry>
+      </row>
+      <row>
+        <entry><literal>rec { x = "bla"; y = x + "bar"; }</literal></entry>
+        <entry>A recursive set, equivalent to <literal>{ x = "foo"; y = "foobar"; }</literal></entry>
+      </row>
+      <row>
+        <entry><literal>[ "foo" "bar" ]</literal></entry>
+        <entry>A list with two elements</entry>
+      </row>
+
+      <row>
+        <entry namest="c1" nameend="c2"><emphasis>Operators</emphasis></entry>
+      </row>
+      <row>
+        <entry><literal>"foo" + "bar"</literal></entry>
+        <entry>String concatenation</entry>
+      </row>
+      <row>
+        <entry><literal>1 + 2</literal></entry>
+        <entry>Integer addition</entry>
+      </row>
+      <row>
+        <entry><literal>"foo" == "f" + "oo"</literal></entry>
+        <entry>Equality test (evaluates to <literal>true</literal>)</entry>
+      </row>
+      <row>
+        <entry><literal>"foo" != "bar"</literal></entry>
+        <entry>Inequality test (evaluates to <literal>true</literal>)</entry>
+      </row>
+      <row>
+        <entry><literal>!true</literal></entry>
+        <entry>Boolean negation</entry>
+      </row>
+      <row>
+        <entry><literal>{ x = 1; y = 2; }.x</literal></entry>
+        <entry>Attribute selection (evaluates to <literal>1</literal>)</entry>
+      </row>
+      <row>
+        <entry><literal>{ x = 1; y = 2; }.z or 3</literal></entry>
+        <entry>Attribute selection with default (evaluates to <literal>3</literal>)</entry>
+      </row>
+      <row>
+        <entry><literal>{ x = 1; y = 2; } // { z = 3; }</literal></entry>
+        <entry>Merge two sets (attributes in the right-hand set taking precedence)</entry>
+      </row>
+
+      <row>
+        <entry namest="c1" nameend="c2"><emphasis>Control structures</emphasis></entry>
+      </row>
+      <row>
+        <entry><literal>if 1 + 1 == 2 then "yes!" else "no!"</literal></entry>
+        <entry>Conditional expression</entry>
+      </row>
+      <row>
+        <entry><literal>assert 1 + 1 == 2; "yes!"</literal></entry>
+        <entry>Assertion check (evaluates to <literal>"yes!"</literal>)</entry>
+      </row>
+      <row>
+        <entry><literal>let x = "foo"; y = "bar"; in x + y</literal></entry>
+        <entry>Variable definition</entry>
+      </row>
+      <row>
+        <entry><literal>with pkgs.lib; head [ 1 2 3 ]</literal></entry>
+        <entry>Add all attributes from the given set to the scope
+        (evaluates to <literal>1</literal>)</entry>
+      </row>
+
+      <row>
+        <entry namest="c1" nameend="c2"><emphasis>Functions (lambdas)</emphasis></entry>
+      </row>
+      <row>
+        <entry><literal>x: x + 1</literal></entry>
+        <entry>A function that expects an integer and returns it increased by 1</entry>
+      </row>
+      <row>
+        <entry><literal>(x: x + 1) 100</literal></entry>
+        <entry>A function call (evaluates to 101)</entry>
+      </row>
+      <row>
+        <entry><literal>let inc = x: x + 1; in inc (inc (inc 100))</literal></entry>
+        <entry>A function bound to a variable and subsequently called by name (evaluates to 103)</entry>
+      </row>
+      <row>
+        <entry><literal>{ x, y }: x + y</literal></entry>
+        <entry>A function that expects a set with required attributes
+        <literal>x</literal> and <literal>y</literal> and concatenates
+        them</entry>
+      </row>
+      <row>
+        <entry><literal>{ x, y ? "bar" }: x + y</literal></entry>
+        <entry>A function that expects a set with required attribute
+        <literal>x</literal> and optional <literal>y</literal>, using
+        <literal>"bar"</literal> as default value for
+        <literal>y</literal></entry>
+      </row>
+      <row>
+        <entry><literal>{ x, y, ... }: x + y</literal></entry>
+        <entry>A function that expects a set with required attributes
+        <literal>x</literal> and <literal>y</literal> and ignores any
+        other attributes</entry>
+      </row>
+      <row>
+        <entry><literal>{ x, y } @ args: x + y</literal></entry>
+        <entry>A function that expects a set with required attributes
+        <literal>x</literal> and <literal>y</literal>, and binds the
+        whole set to <literal>args</literal></entry>
+      </row>
+
+      <row>
+        <entry namest="c1" nameend="c2"><emphasis>Built-in functions</emphasis></entry>
+      </row>
+      <row>
+        <entry><literal>import ./foo.nix</literal></entry>
+        <entry>Load and return Nix expression in given file</entry>
+      </row>
+      <row>
+        <entry><literal>map (x: x + x) [ 1 2 3 ]</literal></entry>
+        <entry>Apply a function to every element of a list (evaluates to <literal>[ 2 4 6 ]</literal>)</entry>
+      </row>
+      <!--
+      <row>
+        <entry><literal>throw "Urgh"</literal></entry>
+        <entry>Raise an error condition</entry>
+      </row>
+      -->
+
+    </tbody>
+  </tgroup>
+</informaltable>
+
+</section>
diff --git a/nixos/doc/manual/configuration/user-mgmt.xml b/nixos/doc/manual/configuration/user-mgmt.xml
new file mode 100644
index 000000000000..40dc687d03bb
--- /dev/null
+++ b/nixos/doc/manual/configuration/user-mgmt.xml
@@ -0,0 +1,95 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="sec-user-management">
+
+<title>User Management</title>
+
+<para>NixOS supports both declarative and imperative styles of user
+management.  In the declarative style, users are specified in
+<filename>configuration.nix</filename>.  For instance, the following
+states that a user account named <literal>alice</literal> shall exist:
+
+<programlisting>
+users.extraUsers.alice =
+  { createHome = true;
+    home = "/home/alice";
+    description = "Alice Foobar";
+    extraGroups = [ "wheel" "networkmanager" ];
+    useDefaultShell = true;
+    openssh.authorizedKeys.keys = [ "ssh-dss AAAAB3Nza... alice@foobar" ];
+  };
+</programlisting>
+
+Note that <literal>alice</literal> is a member of the
+<literal>wheel</literal> and <literal>networkmanager</literal> groups,
+which allows her to use <command>sudo</command> to execute commands as
+<literal>root</literal> and to configure the network, respectively.
+Also note the SSH public key that allows remote logins with the
+corresponding private key. Users created in this way do not have a
+password by default, so they cannot log in via mechanisms that require
+a password. However, you can use the <command>passwd</command> program
+to set a password, which is retained across invocations of
+<command>nixos-rebuild</command>.</para>
+
+<para>If you set users.mutableUsers to false, then the contents of /etc/passwd
+and /etc/group will be congruent to your NixOS configuration. For instance,
+if you remove a user from users.extraUsers and run nixos-rebuild, the user
+account will cease to exist. Also, imperative commands for managing users
+and groups, such as useradd, are no longer available.</para>
+
+<para>A user ID (uid) is assigned automatically.  You can also specify
+a uid manually by adding
+
+<programlisting>
+    uid = 1000;
+</programlisting>
+
+to the user specification.</para>
+
+<para>Groups can be specified similarly.  The following states that a
+group named <literal>students</literal> shall exist:
+
+<programlisting>
+users.extraGroups.students.gid = 1000;
+</programlisting>
+
+As with users, the group ID (gid) is optional and will be assigned
+automatically if it’s missing.</para>
+
+<warning><para>Currently declarative user management is not perfect:
+<command>nixos-rebuild</command> does not know how to realise certain
+configuration changes.  This includes removing a user or group, and
+removing group membership from a user.</para></warning>
+
+<para>In the imperative style, users and groups are managed by
+commands such as <command>useradd</command>,
+<command>groupmod</command> and so on.  For instance, to create a user
+account named <literal>alice</literal>:
+
+<screen>
+$ useradd -m alice</screen>
+
+The flag <option>-m</option> causes the creation of a home directory
+for the new user, which is generally what you want.  The user does not
+have an initial password and therefore cannot log in.  A password can
+be set using the <command>passwd</command> utility:
+
+<screen>
+$ passwd alice
+Enter new UNIX password: ***
+Retype new UNIX password: ***
+</screen>
+
+A user can be deleted using <command>userdel</command>:
+
+<screen>
+$ userdel -r alice</screen>
+
+The flag <option>-r</option> deletes the user’s home directory.
+Accounts can be modified using <command>usermod</command>.  Unix
+groups can be managed using <command>groupadd</command>,
+<command>groupmod</command> and <command>groupdel</command>.</para>
+
+</chapter>
diff --git a/nixos/doc/manual/configuration/wireless.xml b/nixos/doc/manual/configuration/wireless.xml
new file mode 100644
index 000000000000..373a9168cc87
--- /dev/null
+++ b/nixos/doc/manual/configuration/wireless.xml
@@ -0,0 +1,41 @@
+<section xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="sec-wireless">
+
+<title>Wireless Networks</title>
+
+<para>For a desktop installation using NetworkManager (e.g., GNOME),
+you just have to make sure the user is in the
+<code>networkmanager</code> group and you can skip the rest of this
+section on wireless networks.</para>
+
+<para>
+NixOS will start wpa_supplicant for you if you enable this setting:
+
+<programlisting>
+networking.wireless.enable = true;
+</programlisting>
+
+NixOS currently does not generate wpa_supplicant's
+configuration file, <literal>/etc/wpa_supplicant.conf</literal>. You should edit this file
+yourself to define wireless networks, WPA keys and so on (see
+wpa_supplicant.conf(5)).
+</para>
+
+<para>
+If you are using WPA2 the <command>wpa_passphrase</command> tool might be useful
+to generate the <literal>wpa_supplicant.conf</literal>.
+
+<screen>
+$ wpa_passphrase ESSID PSK > /etc/wpa_supplicant.conf</screen>
+
+After you have edited the <literal>wpa_supplicant.conf</literal>,
+you need to restart the wpa_supplicant service.
+
+<screen>
+$ systemctl restart wpa_supplicant.service</screen>
+</para>
+
+</section>
diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml
new file mode 100644
index 000000000000..bc58bb1f0669
--- /dev/null
+++ b/nixos/doc/manual/configuration/x-windows.xml
@@ -0,0 +1,94 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="sec-x11">
+
+<title>X Window System</title>
+    
+<para>The X Window System (X11) provides the basis of NixOS’ graphical
+user interface.  It can be enabled as follows:
+<programlisting>
+services.xserver.enable = true;
+</programlisting>
+The X server will automatically detect and use the appropriate video
+driver from a set of X.org drivers (such as <literal>vesa</literal>
+and <literal>intel</literal>).  You can also specify a driver
+manually, e.g.
+<programlisting>
+services.xserver.videoDrivers = [ "r128" ];
+</programlisting>
+to enable X.org’s <literal>xf86-video-r128</literal> driver.</para>
+
+<para>You also need to enable at least one desktop or window manager.
+Otherwise, you can only log into a plain undecorated
+<command>xterm</command> window.  Thus you should pick one or more of
+the following lines:
+<programlisting>
+services.xserver.desktopManager.kde4.enable = true;
+services.xserver.desktopManager.xfce.enable = true;
+services.xserver.windowManager.xmonad.enable = true;
+services.xserver.windowManager.twm.enable = true;
+services.xserver.windowManager.icewm.enable = true;
+</programlisting>
+</para>
+
+<para>NixOS’s default <emphasis>display manager</emphasis> (the
+program that provides a graphical login prompt and manages the X
+server) is SLiM.  You can select KDE’s <command>kdm</command> instead:
+<programlisting>
+services.xserver.displayManager.kdm.enable = true;
+</programlisting>
+</para>
+
+<para>The X server is started automatically at boot time.  If you
+don’t want this to happen, you can set:
+<programlisting>
+services.xserver.autorun = false;
+</programlisting>
+The X server can then be started manually:
+<screen>
+$ systemctl start display-manager.service
+</screen>
+</para>
+
+
+<simplesect><title>NVIDIA Graphics Cards</title>
+
+<para>NVIDIA provides a proprietary driver for its graphics cards that
+has better 3D performance than the X.org drivers.  It is not enabled
+by default because it’s not free software.  You can enable it as follows:
+<programlisting>
+services.xserver.videoDrivers = [ "nvidia" ];
+</programlisting>
+You may need to reboot after enabling this driver to prevent a clash
+with other kernel modules.</para>
+
+<para>On 64-bit systems, if you want full acceleration for 32-bit
+programs such as Wine, you should also set the following:
+<programlisting>
+services.xserver.driSupport32Bit = true;
+</programlisting>
+</para>
+
+</simplesect>
+
+
+<simplesect><title>Touchpads</title>
+
+<para>Support for Synaptics touchpads (found in many laptops such as
+the Dell Latitude series) can be enabled as follows:
+<programlisting>
+services.xserver.synaptics.enable = true;
+</programlisting>
+The driver has many options (see <xref linkend="ch-options"/>).  For
+instance, the following enables two-finger scrolling:
+<programlisting>
+services.xserver.synaptics.twoFingerScroll = true;
+</programlisting>
+</para>
+
+</simplesect>
+
+
+</chapter>
diff --git a/nixos/doc/manual/containers.xml b/nixos/doc/manual/containers.xml
deleted file mode 100644
index 2530d5195212..000000000000
--- a/nixos/doc/manual/containers.xml
+++ /dev/null
@@ -1,242 +0,0 @@
-<chapter xmlns="http://docbook.org/ns/docbook"
-         xmlns:xlink="http://www.w3.org/1999/xlink"
-         xml:id="ch-containers">
-
-<title>Containers</title>
-
-<para>NixOS allows you to easily run other NixOS instances as
-<emphasis>containers</emphasis>. Containers are a light-weight
-approach to virtualisation that runs software in the container at the
-same speed as in the host system. NixOS containers share the Nix store
-of the host, making container creation very efficient.</para>
-
-<warning><para>Currently, NixOS containers are not perfectly isolated
-from the host system. This means that a user with root access to the
-container can do things that affect the host. So you should not give
-container root access to untrusted users.</para></warning>
-
-<para>NixOS containers can be created in two ways: imperatively, using
-the command <command>nixos-container</command>, and declaratively, by
-specifying them in your <filename>configuration.nix</filename>. The
-declarative approach implies that containers get upgraded along with
-your host system when you run <command>nixos-rebuild</command>, which
-is often not what you want. By contrast, in the imperative approach,
-containers are configured and updated independently from the host
-system.</para>
-
-
-<section><title>Imperative container management</title>
-
-<para>We’ll cover imperative container management using
-<command>nixos-container</command> first. You create a container with
-identifier <literal>foo</literal> as follows:
-
-<screen>
-$ nixos-container create foo
-</screen>
-
-This creates the container’s root directory in
-<filename>/var/lib/containers/foo</filename> and a small configuration
-file in <filename>/etc/containers/foo.conf</filename>. It also builds
-the container’s initial system configuration and stores it in
-<filename>/nix/var/nix/profiles/per-container/foo/system</filename>. You
-can modify the initial configuration of the container on the command
-line. For instance, to create a container that has
-<command>sshd</command> running, with the given public key for
-<literal>root</literal>:
-
-<screen>
-$ nixos-container create foo --config 'services.openssh.enable = true; \
-  users.extraUsers.root.openssh.authorizedKeys.keys = ["ssh-dss AAAAB3N…"];'
-</screen>
-
-</para>
-
-<para>Creating a container does not start it. To start the container,
-run:
-
-<screen>
-$ nixos-container start foo
-</screen>
-
-This command will return as soon as the container has booted and has
-reached <literal>multi-user.target</literal>. On the host, the
-container runs within a systemd unit called
-<literal>container@<replaceable>container-name</replaceable>.service</literal>.
-Thus, if something went wrong, you can get status info using
-<command>systemctl</command>:
-
-<screen>
-$ systemctl status container@foo
-</screen>
-
-</para>
-
-<para>If the container has started succesfully, you can log in as
-root using the <command>root-login</command> operation:
-
-<screen>
-$ nixos-container root-login foo
-[root@foo:~]#
-</screen>
-
-Note that only root on the host can do this (since there is no
-authentication).  You can also get a regular login prompt using the
-<command>login</command> operation, which is available to all users on
-the host:
-
-<screen>
-$ nixos-container login foo
-foo login: alice
-Password: ***
-</screen>
-
-With <command>nixos-container run</command>, you can execute arbitrary
-commands in the container:
-
-<screen>
-$ nixos-container run foo -- uname -a
-Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux
-</screen>
-
-</para>
-
-<para>There are several ways to change the configuration of the
-container. First, on the host, you can edit
-<literal>/var/lib/container/<replaceable>name</replaceable>/etc/nixos/configuration.nix</literal>,
-and run
-
-<screen>
-$ nixos-container update foo
-</screen>
-
-This will build and activate the new configuration. You can also
-specify a new configuration on the command line:
-
-<screen>
-$ nixos-container update foo --config 'services.httpd.enable = true; \
-  services.httpd.adminAddr = "foo@example.org";'
-
-$ curl http://$(nixos-container show-ip foo)/
-&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">…
-</screen>
-
-However, note that this will overwrite the container’s
-<filename>/etc/nixos/configuration.nix</filename>.</para>
-
-<para>Alternatively, you can change the configuration from within the
-container itself by running <command>nixos-rebuild switch</command>
-inside the container. Note that the container by default does not have
-a copy of the NixOS channel, so you should run <command>nix-channel
---update</command> first.</para>
-
-<para>Containers can be stopped and started using
-<literal>nixos-container stop</literal> and <literal>nixos-container
-start</literal>, respectively, or by using
-<command>systemctl</command> on the container’s service unit. To
-destroy a container, including its file system, do
-
-<screen>
-$ nixos-container destroy foo
-</screen>
-
-</para>
-
-</section>
-
-
-<section><title>Declarative container specification</title>
-
-<para>You can also specify containers and their configuration in the
-host’s <filename>configuration.nix</filename>.  For example, the
-following specifies that there shall be a container named
-<literal>database</literal> running PostgreSQL:
-
-<programlisting>
-containers.database =
-  { config =
-      { config, pkgs, ... }:
-      { services.postgresql.enable = true;
-        services.postgresql.package = pkgs.postgresql92;
-      };
-  };
-</programlisting>
-
-If you run <literal>nixos-rebuild switch</literal>, the container will
-be built and started. If the container was already running, it will be
-updated in place, without rebooting.</para>
-
-<para>By default, declarative containers share the network namespace
-of the host, meaning that they can listen on (privileged)
-ports. However, they cannot change the network configuration. You can
-give a container its own network as follows:
-
-<programlisting>
-containers.database =
-  { privateNetwork = true;
-    hostAddress = "192.168.100.10";
-    localAddress = "192.168.100.11";
-  };
-</programlisting>
-
-This gives the container a private virtual Ethernet interface with IP
-address <literal>192.168.100.11</literal>, which is hooked up to a
-virtual Ethernet interface on the host with IP address
-<literal>192.168.100.10</literal>.  (See the next section for details
-on container networking.)</para>
-
-<para>To disable the container, just remove it from
-<filename>configuration.nix</filename> and run <literal>nixos-rebuild
-switch</literal>. Note that this will not delete the root directory of
-the container in <literal>/var/lib/containers</literal>.</para>
-
-</section>
-
-
-<section><title>Networking</title>
-
-<para>When you create a container using <literal>nixos-container
-create</literal>, it gets it own private IPv4 address in the range
-<literal>10.233.0.0/16</literal>. You can get the container’s IPv4
-address as follows:
-
-<screen>
-$ nixos-container show-ip foo
-10.233.4.2
-
-$ ping -c1 10.233.4.2
-64 bytes from 10.233.4.2: icmp_seq=1 ttl=64 time=0.106 ms
-</screen>
-
-</para>
-
-<para>Networking is implemented using a pair of virtual Ethernet
-devices. The network interface in the container is called
-<literal>eth0</literal>, while the matching interface in the host is
-called <literal>ve-<replaceable>container-name</replaceable></literal>
-(e.g., <literal>ve-foo</literal>).  The container has its own network
-namespace and the <literal>CAP_NET_ADMIN</literal> capability, so it
-can perform arbitrary network configuration such as setting up
-firewall rules, without affecting or having access to the host’s
-network.</para>
-
-<para>By default, containers cannot talk to the outside network. If
-you want that, you should set up Network Address Translation (NAT)
-rules on the host to rewrite container traffic to use your external
-IP address. This can be accomplished using the following configuration
-on the host:
-
-<programlisting>
-networking.nat.enable = true;
-networking.nat.internalInterfaces = ["ve-+"];
-networking.nat.externalInterface = "eth0";
-</programlisting>
-where <literal>eth0</literal> should be replaced with the desired
-external interface. Note that <literal>ve-+</literal> is a wildcard
-that matches all container interfaces.</para>
-
-</section>
-
-
-</chapter>
-
diff --git a/nixos/doc/manual/development.xml b/nixos/doc/manual/development.xml
deleted file mode 100644
index 2f0c2a7aa8da..000000000000
--- a/nixos/doc/manual/development.xml
+++ /dev/null
@@ -1,1119 +0,0 @@
-<chapter xmlns="http://docbook.org/ns/docbook"
-         xmlns:xlink="http://www.w3.org/1999/xlink"
-         xml:id="ch-development">
-
-<title>Development</title>
-
-<para>This chapter describes how you can modify and extend
-NixOS.</para>
-
-
-<!--===============================================================-->
-
-<section xml:id="sec-getting-sources">
-
-<title>Getting the sources</title>
-
-<para>By default, NixOS’s <command>nixos-rebuild</command> command
-uses the NixOS and Nixpkgs sources provided by the
-<literal>nixos-unstable</literal> channel (kept in
-<filename>/nix/var/nix/profiles/per-user/root/channels/nixos</filename>).
-To modify NixOS, however, you should check out the latest sources from
-Git.  This is done using the following command:
-
-<screen>
-$ nixos-checkout <replaceable>/my/sources</replaceable>
-</screen>
-
-or
-
-<screen>
-$ mkdir -p <replaceable>/my/sources</replaceable>
-$ cd <replaceable>/my/sources</replaceable>
-$ nix-env -i git
-$ git clone git://github.com/NixOS/nixpkgs.git
-</screen>
-
-This will check out the latest NixOS sources to
-<filename><replaceable>/my/sources</replaceable>/nixpkgs/nixos</filename>
-and the Nixpkgs sources to
-<filename><replaceable>/my/sources</replaceable>/nixpkgs</filename>.
-(The NixOS source tree lives in a subdirectory of the Nixpkgs
-repository.)</para>
-
-<para>It’s often inconvenient to develop directly on the master
-branch, since if somebody has just committed (say) a change to GCC,
-then the binary cache may not have caught up yet and you’ll have to
-rebuild everything from source. So you may want to create a local
-branch based on your current NixOS version:
-
-<screen>
-$ nixos-version
-14.04.273.ea1952b (Baboon)
-
-$ git checkout -b local ea1952b
-</screen>
-
-Or, to base your local branch on the latest version available in the
-NixOS channel:
-
-<screen>
-$ curl -sI http://nixos.org/channels/nixos-unstable/ | grep Location
-Location: http://releases.nixos.org/nixos/unstable/nixos-14.10pre43986.acaf4a6/
-
-$ git checkout -b local acaf4a6
-</screen>
-
-You can then use <command>git rebase</command> to sync your local
-branch with the upstream branch, and use <command>git
-cherry-pick</command> to copy commits from your local branch to the
-upstream branch.</para>
-
-<para>If you want to rebuild your system using your (modified)
-sources, you need to tell <command>nixos-rebuild</command> about them
-using the <option>-I</option> flag:
-
-<screen>
-$ nixos-rebuild switch -I nixpkgs=<replaceable>/my/sources</replaceable>/nixpkgs
-</screen>
-
-</para>
-
-<para>If you want <command>nix-env</command> to use the expressions in
-<replaceable>/my/sources</replaceable>, use <command>nix-env -f
-<replaceable>/my/sources</replaceable>/nixpkgs</command>, or change
-the default by adding a symlink in
-<filename>~/.nix-defexpr</filename>:
-
-<screen>
-$ ln -s <replaceable>/my/sources</replaceable>/nixpkgs ~/.nix-defexpr/nixpkgs
-</screen>
-
-You may want to delete the symlink
-<filename>~/.nix-defexpr/channels_root</filename> to prevent root’s
-NixOS channel from clashing with your own tree.</para>
-
-<!-- FIXME: not sure what this means.
-<para>You should not pass the base directory
-<filename><replaceable>/my/sources</replaceable></filename>
-to <command>nix-env</command>, as it will break after interpreting expressions
-in <filename>nixos/</filename> as packages.</para>
--->
-
-</section>
-
-
-<!--===============================================================-->
-
-<section xml:id="sec-writing-modules">
-
-<title>Writing NixOS modules</title>
-
-<para>NixOS has a modular system for declarative configuration.  This
-system combines multiple <emphasis>modules</emphasis> to produce the
-full system configuration.  One of the modules that constitute the
-configuration is <filename>/etc/nixos/configuration.nix</filename>.
-Most of the others live in the <link
-xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/modules"><filename>nixos/modules</filename></link>
-subdirectory of the Nixpkgs tree.</para>
-
-<para>Each NixOS module is a file that handles one logical aspect of
-the configuration, such as a specific kind of hardware, a service, or
-network settings.  A module configuration does not have to handle
-everything from scratch; it can use the functionality provided by
-other modules for its implementation.  Thus a module can
-<emphasis>declare</emphasis> options that can be used by other
-modules, and conversely can <emphasis>define</emphasis> options
-provided by other modules in its own implementation.  For example, the
-module <link
-xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/security/pam.nix"><filename>pam.nix</filename></link>
-declares the option <option>security.pam.services</option> that allows
-other modules (e.g. <link
-xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/services/networking/ssh/sshd.nix"><filename>sshd.nix</filename></link>)
-to define PAM services; and it defines the option
-<option>environment.etc</option> (declared by <link
-xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/system/etc/etc.nix"><filename>etc.nix</filename></link>)
-to cause files to be created in
-<filename>/etc/pam.d</filename>.</para>
-
-<para xml:id="para-module-syn">In <xref
-linkend="sec-configuration-syntax"/>, we saw the following structure
-of NixOS modules:
-
-<programlisting>
-{ config, pkgs, ... }:
-
-{ <replaceable>option definitions</replaceable>
-}
-</programlisting>
-
-This is actually an <emphasis>abbreviated</emphasis> form of module
-that only defines options, but does not declare any.  The structure of
-full NixOS modules is shown in <xref linkend='ex-module-syntax' />.</para>
-
-<example xml:id='ex-module-syntax'><title>Structure of NixOS modules</title>
-<programlisting>
-{ config, pkgs, ... }: <co xml:id='module-syntax-1' />
-
-{
-  imports =
-    [ <replaceable>paths of other modules</replaceable> <co xml:id='module-syntax-2' />
-    ];
-
-  options = {
-    <replaceable>option declarations</replaceable> <co xml:id='module-syntax-3' />
-  };
-
-  config = {
-    <replaceable>option definitions</replaceable> <co xml:id='module-syntax-4' />
-  };
-}</programlisting>
-</example>
-
-<para>The meaning of each part is as follows.
-
-<calloutlist>
-  <callout arearefs='module-syntax-1'>
-    <para>This line makes the current Nix expression a function.  The
-    variable <varname>pkgs</varname> contains Nixpkgs, while
-    <varname>config</varname> contains the full system configuration.
-    This line can be omitted if there is no reference to
-    <varname>pkgs</varname> and <varname>config</varname> inside the
-    module.</para>
-  </callout>
-
-  <callout arearefs='module-syntax-2'>
-    <para>This list enumerates the paths to other NixOS modules that
-    should be included in the evaluation of the system configuration.
-    A default set of modules is defined in the file
-    <filename>modules/module-list.nix</filename>.  These don't need to
-    be added in the import list.</para>
-  </callout>
-
-  <callout arearefs='module-syntax-3'>
-    <para>The attribute <varname>options</varname> is a nested set of
-    <emphasis>option declarations</emphasis> (described below).</para>
-  </callout>
-
-  <callout arearefs='module-syntax-4'>
-    <para>The attribute <varname>config</varname> is a nested set of
-    <emphasis>option definitions</emphasis> (also described
-    below).</para>
-  </callout>
-</calloutlist>
-
-</para>
-
-<para><xref linkend='locate-example' /> shows a module that handles
-the regular update of the “locate” database, an index of all files in
-the file system.  This module declares two options that can be defined
-by other modules (typically the user’s
-<filename>configuration.nix</filename>):
-<option>services.locate.enable</option> (whether the database should
-be updated) and <option>services.locate.period</option> (when the
-update should be done).  It implements its functionality by defining
-two options declared by other modules:
-<option>systemd.services</option> (the set of all systemd services)
-and <option>services.cron.systemCronJobs</option> (the list of
-commands to be executed periodically by <command>cron</command>).</para>
-
-<example xml:id='locate-example'><title>NixOS module for the “locate” service</title>
-<programlisting>
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let locatedb = "/var/cache/locatedb"; in
-
-{
-  options = {
-
-    services.locate = {
-
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          If enabled, NixOS will periodically update the database of
-          files used by the <command>locate</command> command.
-        '';
-      };
-
-      period = mkOption {
-        type = types.str;
-        default = "15 02 * * *";
-        description = ''
-          This option defines (in the format used by cron) when the
-          locate database is updated.  The default is to update at
-          02:15 at night every day.
-        '';
-      };
-
-    };
-
-  };
-
-  config = {
-
-    systemd.services.update-locatedb =
-      { description = "Update Locate Database";
-        path  = [ pkgs.su ];
-        script =
-          ''
-            mkdir -m 0755 -p $(dirname ${locatedb})
-            exec updatedb --localuser=nobody --output=${locatedb} --prunepaths='/tmp /var/tmp /media /run'
-          '';
-      };
-
-    services.cron.systemCronJobs = optional config.services.locate.enable
-      "${config.services.locate.period} root ${config.systemd.package}/bin/systemctl start update-locatedb.service";
-
-  };
-}</programlisting>
-</example>
-
-<section><title>Option declarations</title>
-
-<para>An option declaration specifies the name, type and description
-of a NixOS configuration option.  It is illegal to define an option
-that hasn’t been declared in any module.  A option declaration
-generally looks like this:
-
-<programlisting>
-options = {
-  <replaceable>name</replaceable> = mkOption {
-    type = <replaceable>type specification</replaceable>;
-    default = <replaceable>default value</replaceable>;
-    example = <replaceable>example value</replaceable>;
-    description = "<replaceable>Description for use in the NixOS manual.</replaceable>";
-  };
-};
-</programlisting>
-
-</para>
-
-<para>The function <varname>mkOption</varname> accepts the following arguments.
-
-<variablelist>
-
-  <varlistentry>
-    <term><varname>type</varname></term>
-    <listitem>
-      <para>The type of the option (see below).  It may be omitted,
-      but that’s not advisable since it may lead to errors that are
-      hard to diagnose.</para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>default</varname></term>
-    <listitem>
-      <para>The default value used if no value is defined by any
-      module.  A default is not required; in that case, if the option
-      value is ever used, an error will be thrown.</para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>example</varname></term>
-    <listitem>
-      <para>An example value that will be shown in the NixOS manual.</para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>description</varname></term>
-    <listitem>
-      <para>A textual description of the option, in DocBook format,
-      that will be included in the NixOS manual.</para>
-    </listitem>
-  </varlistentry>
-
-</variablelist>
-
-</para>
-
-<para>Here is a non-exhaustive list of option types:
-
-<variablelist>
-
-  <varlistentry>
-    <term><varname>types.bool</varname></term>
-    <listitem>
-      <para>A Boolean.</para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>types.int</varname></term>
-    <listitem>
-      <para>An integer.</para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>types.str</varname></term>
-    <listitem>
-      <para>A string.</para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>types.lines</varname></term>
-    <listitem>
-      <para>A string.  If there are multiple definitions, they are
-      concatenated, with newline characters in between.</para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>types.path</varname></term>
-    <listitem>
-      <para>A path, defined as anything that, when coerced to a
-      string, starts with a slash.  This includes derivations.</para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>types.listOf</varname> <replaceable>t</replaceable></term>
-    <listitem>
-      <para>A list of elements of type <replaceable>t</replaceable>
-      (e.g., <literal>types.listOf types.str</literal> is a list of
-      strings).  Multiple definitions are concatenated together.</para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>types.attrsOf</varname> <replaceable>t</replaceable></term>
-    <listitem>
-      <para>A set of elements of type <replaceable>t</replaceable>
-      (e.g., <literal>types.attrsOf types.int</literal> is a set of
-      name/value pairs, the values being integers).</para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>types.nullOr</varname> <replaceable>t</replaceable></term>
-    <listitem>
-      <para>Either the value <literal>null</literal> or something of
-      type <replaceable>t</replaceable>.</para>
-    </listitem>
-  </varlistentry>
-
-</variablelist>
-
-You can also create new types using the function
-<varname>mkOptionType</varname>.  See
-<filename>lib/types.nix</filename> in Nixpkgs for details.</para>
-
-</section>
-
-
-<section><title>Option definitions</title>
-
-<para>Option definitions are generally straight-forward bindings of values to option names, like
-
-<programlisting>
-config = {
-  services.httpd.enable = true;
-};
-</programlisting>
-
-However, sometimes you need to wrap an option definition or set of
-option definitions in a <emphasis>property</emphasis> to achieve
-certain effects:</para>
-
-<simplesect><title>Delaying conditionals</title>
-
-<para>If a set of option definitions is conditional on the value of
-another option, you may need to use <varname>mkIf</varname>.
-Consider, for instance:
-
-<programlisting>
-config = if config.services.httpd.enable then {
-  environment.systemPackages = [ <replaceable>...</replaceable> ];
-  <replaceable>...</replaceable>
-} else {};
-</programlisting>
-
-This definition will cause Nix to fail with an “infinite recursion”
-error.  Why?  Because the value of
-<option>config.services.httpd.enable</option> depends on the value
-being constructed here.  After all, you could also write the clearly
-circular and contradictory:
-<programlisting>
-config = if config.services.httpd.enable then {
-  services.httpd.enable = false;
-} else {
-  services.httpd.enable = true;
-};
-</programlisting>
-
-The solution is to write:
-
-<programlisting>
-config = mkIf config.services.httpd.enable {
-  environment.systemPackages = [ <replaceable>...</replaceable> ];
-  <replaceable>...</replaceable>
-};
-</programlisting>
-
-The special function <varname>mkIf</varname> causes the evaluation of
-the conditional to be “pushed down” into the individual definitions,
-as if you had written:
-
-<programlisting>
-config = {
-  environment.systemPackages = if config.services.httpd.enable then [ <replaceable>...</replaceable> ] else [];
-  <replaceable>...</replaceable>
-};
-</programlisting>
-
-</para>
-
-</simplesect>
-
-<simplesect><title>Setting priorities</title>
-
-<para>A module can override the definitions of an option in other
-modules by setting a <emphasis>priority</emphasis>.  All option
-definitions that do not have the lowest priority value are discarded.
-By default, option definitions have priority 1000.  You can specify an
-explicit priority by using <varname>mkOverride</varname>, e.g.
-
-<programlisting>
-services.openssh.enable = mkOverride 10 false;
-</programlisting>
-
-This definition causes all other definitions with priorities above 10
-to be discarded.  The function <varname>mkForce</varname> is
-equal to <varname>mkOverride 50</varname>.</para>
-
-</simplesect>
-
-<simplesect><title>Merging configurations</title>
-
-<para>In conjunction with <literal>mkIf</literal>, it is sometimes
-useful for a module to return multiple sets of option definitions, to
-be merged together as if they were declared in separate modules.  This
-can be done using <varname>mkMerge</varname>:
-
-<programlisting>
-config = mkMerge
-  [ # Unconditional stuff.
-    { environment.systemPackages = [ <replaceable>...</replaceable> ];
-    }
-    # Conditional stuff.
-    (mkIf config.services.bla.enable {
-      environment.systemPackages = [ <replaceable>...</replaceable> ];
-    })
-  ];
-</programlisting>
-
-</para>
-
-</simplesect>
-
-</section>
-
-
-<section><title>Important options</title>
-
-<para>NixOS has many options, but some are of particular importance to
-module writers.</para>
-
-<variablelist>
-
-  <varlistentry>
-    <term><option>environment.etc</option></term>
-    <listitem>
-      <para>This set defines files in <filename>/etc</filename>.  A
-      typical use is:
-<programlisting>
-environment.etc."os-release".text =
-  ''
-    NAME=NixOS
-    <replaceable>...</replaceable>
-  '';
-</programlisting>
-      which causes a file named <filename>/etc/os-release</filename>
-      to be created with the given contents.</para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><option>system.activationScripts</option></term>
-    <listitem>
-      <para>A set of shell script fragments that must be executed
-      whenever the configuration is activated (i.e., at boot time, or
-      after running <command>nixos-rebuild switch</command>).  For instance,
-<programlisting>
-system.activationScripts.media =
-  ''
-    mkdir -m 0755 -p /media
-  '';
-</programlisting>
-      causes the directory <filename>/media</filename> to be created.
-      Activation scripts must be idempotent.  They should not start
-      background processes such as daemons; use
-      <option>systemd.services</option> for that.</para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><option>systemd.services</option></term>
-    <listitem>
-      <para>This is the set of systemd services.  Example:
-<programlisting>
-systemd.services.dhcpcd =
-  { description = "DHCP Client";
-    wantedBy = [ "multi-user.target" ];
-    after = [ "systemd-udev-settle.service" ];
-    path = [ dhcpcd pkgs.nettools pkgs.openresolv ];
-    serviceConfig =
-      { Type = "forking";
-        PIDFile = "/run/dhcpcd.pid";
-        ExecStart = "${dhcpcd}/sbin/dhcpcd --config ${dhcpcdConf}";
-        Restart = "always";
-      };
-  };
-</programlisting>
-      which creates the systemd unit
-      <literal>dhcpcd.service</literal>.  The option
-      <option>wantedBy</option> determined which other units pull this
-      one in; <literal>multi-user.target</literal> is the default
-      target of the system, so <literal>dhcpcd.service</literal> will
-      always be started.  The option
-      <option>serviceConfig.ExecStart</option> provides the main
-      command for the service; it’s also possible to provide pre-start
-      actions, stop scripts, and so on.</para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><option>users.extraUsers</option></term>
-    <term><option>users.extraGroups</option></term>
-    <listitem>
-      <para>If your service requires special UIDs or GIDs, you can
-      define them with these options.  See <xref
-      linkend="sec-user-management"/> for details.</para>
-    </listitem>
-  </varlistentry>
-
-</variablelist>
-
-</section>
-
-
-</section>
-
-
-<!--===============================================================-->
-
-<section xml:id="sec-building-parts">
-
-<title>Building specific parts of NixOS</title>
-
-<para>With the command <command>nix-build</command>, you can build
-specific parts of your NixOS configuration.  This is done as follows:
-
-<screen>
-$ cd <replaceable>/path/to/nixpkgs/nixos</replaceable>
-$ nix-build -A config.<replaceable>option</replaceable></screen>
-
-where <replaceable>option</replaceable> is a NixOS option with type
-“derivation” (i.e. something that can be built).  Attributes of
-interest include:
-
-<variablelist>
-
-  <varlistentry>
-    <term><varname>system.build.toplevel</varname></term>
-    <listitem>
-      <para>The top-level option that builds the entire NixOS system.
-      Everything else in your configuration is indirectly pulled in by
-      this option.  This is what <command>nixos-rebuild</command>
-      builds and what <filename>/run/current-system</filename> points
-      to afterwards.</para>
-
-      <para>A shortcut to build this is:
-
-<screen>
-$ nix-build -A system</screen>
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>system.build.manual.manual</varname></term>
-    <listitem><para>The NixOS manual.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>system.build.etc</varname></term>
-    <listitem><para>A tree of symlinks that form the static parts of
-    <filename>/etc</filename>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>system.build.initialRamdisk</varname></term>
-    <term><varname>system.build.kernel</varname></term>
-    <listitem>
-      <para>The initial ramdisk and kernel of the system.  This allows
-      a quick way to test whether the kernel and the initial ramdisk
-      boot correctly, by using QEMU’s <option>-kernel</option> and
-      <option>-initrd</option> options:
-
-<screen>
-$ nix-build -A config.system.build.initialRamdisk -o initrd
-$ nix-build -A config.system.build.kernel -o kernel
-$ qemu-system-x86_64 -kernel ./kernel/bzImage -initrd ./initrd/initrd -hda /dev/null
-</screen>
-
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>system.build.nixos-rebuild</varname></term>
-    <term><varname>system.build.nixos-install</varname></term>
-    <term><varname>system.build.nixos-generate-config</varname></term>
-    <listitem>
-      <para>These build the corresponding NixOS commands.</para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>systemd.units.<replaceable>unit-name</replaceable>.unit</varname></term>
-    <listitem>
-      <para>This builds the unit with the specified name.  Note that
-      since unit names contain dots
-      (e.g. <literal>httpd.service</literal>), you need to put them
-      between quotes, like this:
-
-<screen>
-$ nix-build -A 'config.systemd.units."httpd.service".unit'
-</screen>
-
-      You can also test individual units, without rebuilding the whole
-      system, by putting them in
-      <filename>/run/systemd/system</filename>:
-
-<screen>
-$ cp $(nix-build -A 'config.systemd.units."httpd.service".unit')/httpd.service \
-    /run/systemd/system/tmp-httpd.service
-$ systemctl daemon-reload
-$ systemctl start tmp-httpd.service
-</screen>
-
-      Note that the unit must not have the same name as any unit in
-      <filename>/etc/systemd/system</filename> since those take
-      precedence over <filename>/run/systemd/system</filename>.
-      That’s why the unit is installed as
-      <filename>tmp-httpd.service</filename> here.</para>
-    </listitem>
-  </varlistentry>
-
-</variablelist>
-
-</para>
-
-</section>
-
-
-<!--===============================================================-->
-
-<section xml:id="sec-building-cd">
-
-<title>Building your own NixOS CD</title>
-
-<para>Building a NixOS CD is as easy as configuring your own computer. The
-idea is to use another module which will replace
-your <filename>configuration.nix</filename> to configure the system that
-would be installed on the CD.</para>
-
-<para>Default CD/DVD configurations are available
-inside <filename>nixos/modules/installer/cd-dvd</filename>.  To build them
-you have to set <envar>NIXOS_CONFIG</envar> before
-running <command>nix-build</command> to build the ISO.
-
-<screen>
-$ nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd-dvd/installation-cd-minimal.nix</screen>
-
-</para>
-
-<para>Before burning your CD/DVD, you can check the content of the image by mounting anywhere like
-suggested by the following command:
-
-<screen>
-$ mount -o loop -t iso9660 ./result/iso/cd.iso /mnt/iso</screen>
-
-</para>
-
-</section>
-
-
-<!--===============================================================-->
-
-<section>
-
-<title>Testing the installer</title>
-
-<para>Building, burning, and booting from an installation CD is rather
-tedious, so here is a quick way to see if the installer works
-properly:
-
-<screen>
-$ nix-build -A config.system.build.nixos-install
-$ mount -t tmpfs none /mnt
-$ ./result/bin/nixos-install</screen>
-
-To start a login shell in the new NixOS installation in
-<filename>/mnt</filename>:
-
-<screen>
-$ ./result/bin/nixos-install --chroot
-</screen>
-
-</para>
-
-</section>
-
-
-
-<!--===============================================================-->
-
-<section xml:id="sec-nixos-tests">
-
-<title>NixOS tests</title>
-
-<para>When you add some feature to NixOS, you should write a test for
-it. NixOS tests are kept in the directory <filename
-xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/tests">nixos/tests</filename>,
-and are executed (using Nix) by a testing framework that automatically
-starts one or more virtual machines containing the NixOS system(s)
-required for the test.</para>
-
-<simplesect><title>Writing tests</title>
-
-<para>A NixOS test is a Nix expression that has the following structure:
-
-<programlisting>
-import ./make-test.nix {
-
-  # Either the configuration of a single machine:
-  machine =
-    { config, pkgs, ... }:
-    { <replaceable>configuration…</replaceable>
-    };
-
-  # Or a set of machines:
-  nodes =
-    { <replaceable>machine1</replaceable> =
-        { config, pkgs, ... }: { <replaceable>…</replaceable> };
-      <replaceable>machine2</replaceable> =
-        { config, pkgs, ... }: { <replaceable>…</replaceable> };
-      …
-    };
-
-  testScript =
-    ''
-      <replaceable>Perl code…</replaceable>
-    '';
-}
-</programlisting>
-
-The attribute <literal>testScript</literal> is a bit of Perl code that
-executes the test (described below). During the test, it will start
-one or more virtual machines, the configuration of which is described
-by the attribute <literal>machine</literal> (if you need only one
-machine in your test) or by the attribute <literal>nodes</literal> (if
-you need multiple machines). For instance, <filename
-xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/login.nix">login.nix</filename>
-only needs a single machine to test whether users can log in on the
-virtual console, whether device ownership is correctly maintained when
-switching between consoles, and so on. On the other hand, <filename
-xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nfs.nix">nfs.nix</filename>,
-which tests NFS client and server functionality in the Linux kernel
-(including whether locks are maintained across server crashes),
-requires three machines: a server and two clients.</para>
-
-<para>There are a few special NixOS configuration options for test
-VMs:
-
-<!-- FIXME: would be nice to generate this automatically. -->
-
-<variablelist>
-
-  <varlistentry>
-    <term><option>virtualisation.memorySize</option></term>
-    <listitem><para>The memory of the VM in
-    megabytes.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><option>virtualisation.vlans</option></term>
-    <listitem><para>The virtual networks to which the VM is
-    connected. See <filename
-    xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nat.nix">nat.nix</filename>
-    for an example.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><option>virtualisation.writableStore</option></term>
-    <listitem><para>By default, the Nix store in the VM is not
-    writable. If you enable this option, a writable union file system
-    is mounted on top of the Nix store to make it appear
-    writable. This is necessary for tests that run Nix operations that
-    modify the store.</para></listitem>
-  </varlistentry>
-
-</variablelist>
-
-For more options, see the module <filename
-xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/virtualisation/qemu-vm.nix">qemu-vm.nix</filename>.</para>
-
-<para>The test script is a sequence of Perl statements that perform
-various actions, such as starting VMs, executing commands in the VMs,
-and so on. Each virtual machine is represented as an object stored in
-the variable <literal>$<replaceable>name</replaceable></literal>,
-where <replaceable>name</replaceable> is the identifier of the machine
-(which is just <literal>machine</literal> if you didn’t specify
-multiple machines using the <literal>nodes</literal> attribute). For
-instance, the following starts the machine, waits until it has
-finished booting, then executes a command and checks that the output
-is more-or-less correct:
-
-<programlisting>
-$machine->start;
-$machine->waitForUnit("default.target");
-$machine->succeed("uname") =~ /Linux/;
-</programlisting>
-
-The first line is actually unnecessary; machines are implicitly
-started when you first execute an action on them (such as
-<literal>waitForUnit</literal> or <literal>succeed</literal>). If you
-have multiple machines, you can speed up the test by starting them in
-parallel:
-
-<programlisting>
-startAll;
-</programlisting>
-
-</para>
-
-<para>The following methods are available on machine objects:
-
-<variablelist>
-
-  <varlistentry>
-    <term><methodname>start</methodname></term>
-    <listitem><para>Start the virtual machine. This method is
-    asynchronous — it does not wait for the machine to finish
-    booting.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><methodname>shutdown</methodname></term>
-    <listitem><para>Shut down the machine, waiting for the VM to
-    exit.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><methodname>crash</methodname></term>
-    <listitem><para>Simulate a sudden power failure, by telling the VM
-    to exit immediately.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><methodname>block</methodname></term>
-    <listitem><para>Simulate unplugging the Ethernet cable that
-    connects the machine to the other machines.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><methodname>unblock</methodname></term>
-    <listitem><para>Undo the effect of
-    <methodname>block</methodname>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><methodname>screenshot</methodname></term>
-    <listitem><para>Take a picture of the display of the virtual
-    machine, in PNG format. The screenshot is linked from the HTML
-    log.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><methodname>sendMonitorCommand</methodname></term>
-    <listitem><para>Send a command to the QEMU monitor. This is rarely
-    used, but allows doing stuff such as attaching virtual USB disks
-    to a running machine.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><methodname>sendKeys</methodname></term>
-    <listitem><para>Simulate pressing keys on the virtual keyboard,
-    e.g., <literal>sendKeys("ctrl-alt-delete")</literal>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><methodname>sendChars</methodname></term>
-    <listitem><para>Simulate typing a sequence of characters on the
-    virtual keyboard, e.g., <literal>sendKeys("foobar\n")</literal>
-    will type the string <literal>foobar</literal> followed by the
-    Enter key.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><methodname>execute</methodname></term>
-    <listitem><para>Execute a shell command, returning a list
-    <literal>(<replaceable>status</replaceable>,
-    <replaceable>stdout</replaceable>)</literal>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><methodname>succeed</methodname></term>
-    <listitem><para>Execute a shell command, raising an exception if
-    the exit status is not zero, otherwise returning the standard
-    output.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><methodname>fail</methodname></term>
-    <listitem><para>Like <methodname>succeed</methodname>, but raising
-    an exception if the command returns a zero status.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><methodname>waitUntilSucceeds</methodname></term>
-    <listitem><para>Repeat a shell command with 1-second intervals
-    until it succeeds.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><methodname>waitUntilFails</methodname></term>
-    <listitem><para>Repeat a shell command with 1-second intervals
-    until it fails.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><methodname>waitForUnit</methodname></term>
-    <listitem><para>Wait until the specified systemd unit has reached
-    the “active” state.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><methodname>waitForFile</methodname></term>
-    <listitem><para>Wait until the specified file
-    exists.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><methodname>waitForOpenPort</methodname></term>
-    <listitem><para>Wait until a process is listening on the given TCP
-    port (on <literal>localhost</literal>, at least).</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><methodname>waitForClosedPort</methodname></term>
-    <listitem><para>Wait until nobody is listening on the given TCP
-    port.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><methodname>waitForX</methodname></term>
-    <listitem><para>Wait until the X11 server is accepting
-    connections.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><methodname>waitForWindow</methodname></term>
-    <listitem><para>Wait until an X11 window has appeared whose name
-    matches the given regular expression, e.g.,
-    <literal>waitForWindow(qr/Terminal/)</literal>.</para></listitem>
-  </varlistentry>
-
-</variablelist>
-
-</para>
-
-</simplesect>
-
-
-<simplesect><title>Running tests</title>
-
-<para>You can run tests using <command>nix-build</command>. For
-example, to run the test <filename
-xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/login.nix">login.nix</filename>,
-you just do:
-
-<screen>
-$ nix-build '&lt;nixpkgs/nixos/tests/login.nix>'
-</screen>
-
-or, if you don’t want to rely on <envar>NIX_PATH</envar>:
-
-<screen>
-$ cd /my/nixpkgs/nixos/tests
-$ nix-build login.nix
-…
-running the VM test script
-machine: QEMU running (pid 8841)
-…
-6 out of 6 tests succeeded
-</screen>
-
-After building/downloading all required dependencies, this will
-perform a build that starts a QEMU/KVM virtual machine containing a
-NixOS system. The virtual machine mounts the Nix store of the host;
-this makes VM creation very fast, as no disk image needs to be
-created. Afterwards, you can view a pretty-printed log of the test:
-
-<screen>
-$ firefox result/log.html
-</screen>
-
-</para>
-
-<para>It is also possible to run the test environment interactively,
-allowing you to experiment with the VMs.  For example:
-
-<screen>
-$ nix-build login.nix -A driver
-$ ./result/bin/nixos-run-vms
-</screen>
-
-The script <command>nixos-run-vms</command> starts the virtual
-machines defined by test.  The root file system of the VMs is created
-on the fly and kept across VM restarts in
-<filename>./</filename><varname>hostname</varname><filename>.qcow2</filename>.</para>
-
-<para>Finally, the test itself can be run interactively.  This is
-particularly useful when developing or debugging a test:
-
-<screen>
-$ nix-build tests/ -A nfs.driver
-$ ./result/bin/nixos-test-driver
-starting VDE switch for network 1
-&gt;
-</screen>
-
-You can then take any Perl statement, e.g.
-
-<screen>
-&gt; startAll
-&gt; $machine->succeed("touch /tmp/foo")
-</screen>
-
-The function <command>testScript</command> executes the entire test
-script and drops you back into the test driver command line upon its
-completion.  This allows you to inspect the state of the VMs after the
-test (e.g. to debug the test script).</para>
-
-</simplesect>
-
-</section>
-
-
-</chapter>
diff --git a/nixos/doc/manual/development/building-nixos.xml b/nixos/doc/manual/development/building-nixos.xml
new file mode 100644
index 000000000000..21c5bfe6a5b1
--- /dev/null
+++ b/nixos/doc/manual/development/building-nixos.xml
@@ -0,0 +1,32 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        version="5.0"
+        xml:id="sec-building-cd">
+
+<title>Building Your Own NixOS CD</title>
+
+<para>Building a NixOS CD is as easy as configuring your own computer. The
+idea is to use another module which will replace
+your <filename>configuration.nix</filename> to configure the system that
+would be installed on the CD.</para>
+
+<para>Default CD/DVD configurations are available
+inside <filename>nixos/modules/installer/cd-dvd</filename>.  To build them
+you have to set <envar>NIXOS_CONFIG</envar> before
+running <command>nix-build</command> to build the ISO.
+
+<screen>
+$ nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd-dvd/installation-cd-minimal.nix</screen>
+
+</para>
+
+<para>Before burning your CD/DVD, you can check the content of the image by mounting anywhere like
+suggested by the following command:
+
+<screen>
+$ mount -o loop -t iso9660 ./result/iso/cd.iso /mnt/iso</screen>
+
+</para>
+
+</chapter>
\ No newline at end of file
diff --git a/nixos/doc/manual/development/building-parts.xml b/nixos/doc/manual/development/building-parts.xml
new file mode 100644
index 000000000000..cb8dee039c8e
--- /dev/null
+++ b/nixos/doc/manual/development/building-parts.xml
@@ -0,0 +1,113 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        version="5.0"
+        xml:id="sec-building-parts">
+
+<title>Building Specific Parts of NixOS</title>
+
+<para>With the command <command>nix-build</command>, you can build
+specific parts of your NixOS configuration.  This is done as follows:
+
+<screen>
+$ cd <replaceable>/path/to/nixpkgs/nixos</replaceable>
+$ nix-build -A config.<replaceable>option</replaceable></screen>
+
+where <replaceable>option</replaceable> is a NixOS option with type
+“derivation” (i.e. something that can be built).  Attributes of
+interest include:
+
+<variablelist>
+
+  <varlistentry>
+    <term><varname>system.build.toplevel</varname></term>
+    <listitem>
+      <para>The top-level option that builds the entire NixOS system.
+      Everything else in your configuration is indirectly pulled in by
+      this option.  This is what <command>nixos-rebuild</command>
+      builds and what <filename>/run/current-system</filename> points
+      to afterwards.</para>
+
+      <para>A shortcut to build this is:
+
+<screen>
+$ nix-build -A system</screen>
+      </para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><varname>system.build.manual.manual</varname></term>
+    <listitem><para>The NixOS manual.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><varname>system.build.etc</varname></term>
+    <listitem><para>A tree of symlinks that form the static parts of
+    <filename>/etc</filename>.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><varname>system.build.initialRamdisk</varname></term>
+    <term><varname>system.build.kernel</varname></term>
+    <listitem>
+      <para>The initial ramdisk and kernel of the system.  This allows
+      a quick way to test whether the kernel and the initial ramdisk
+      boot correctly, by using QEMU’s <option>-kernel</option> and
+      <option>-initrd</option> options:
+
+<screen>
+$ nix-build -A config.system.build.initialRamdisk -o initrd
+$ nix-build -A config.system.build.kernel -o kernel
+$ qemu-system-x86_64 -kernel ./kernel/bzImage -initrd ./initrd/initrd -hda /dev/null
+</screen>
+
+      </para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><varname>system.build.nixos-rebuild</varname></term>
+    <term><varname>system.build.nixos-install</varname></term>
+    <term><varname>system.build.nixos-generate-config</varname></term>
+    <listitem>
+      <para>These build the corresponding NixOS commands.</para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><varname>systemd.units.<replaceable>unit-name</replaceable>.unit</varname></term>
+    <listitem>
+      <para>This builds the unit with the specified name.  Note that
+      since unit names contain dots
+      (e.g. <literal>httpd.service</literal>), you need to put them
+      between quotes, like this:
+
+<screen>
+$ nix-build -A 'config.systemd.units."httpd.service".unit'
+</screen>
+
+      You can also test individual units, without rebuilding the whole
+      system, by putting them in
+      <filename>/run/systemd/system</filename>:
+
+<screen>
+$ cp $(nix-build -A 'config.systemd.units."httpd.service".unit')/httpd.service \
+    /run/systemd/system/tmp-httpd.service
+$ systemctl daemon-reload
+$ systemctl start tmp-httpd.service
+</screen>
+
+      Note that the unit must not have the same name as any unit in
+      <filename>/etc/systemd/system</filename> since those take
+      precedence over <filename>/run/systemd/system</filename>.
+      That’s why the unit is installed as
+      <filename>tmp-httpd.service</filename> here.</para>
+    </listitem>
+  </varlistentry>
+
+</variablelist>
+
+</para>
+
+</chapter>
\ No newline at end of file
diff --git a/nixos/doc/manual/development/development.xml b/nixos/doc/manual/development/development.xml
new file mode 100644
index 000000000000..747159c44270
--- /dev/null
+++ b/nixos/doc/manual/development/development.xml
@@ -0,0 +1,20 @@
+<part   xmlns="http://docbook.org/ns/docbook"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        version="5.0"
+        xml:id="ch-development">
+
+<title>Development</title>
+
+<partintro>
+<para>This chapter describes how you can modify and extend
+NixOS.</para>
+</partintro>
+
+<xi:include href="sources.xml" />
+<xi:include href="writing-modules.xml" />
+<xi:include href="building-parts.xml" />
+<xi:include href="building-nixos.xml" />
+<xi:include href="testing-installer.xml" />
+
+</part>
diff --git a/nixos/doc/manual/development/nixos-tests.xml b/nixos/doc/manual/development/nixos-tests.xml
new file mode 100644
index 000000000000..a98da9933309
--- /dev/null
+++ b/nixos/doc/manual/development/nixos-tests.xml
@@ -0,0 +1,19 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        version="5.0"
+        xml:id="sec-nixos-tests">
+
+<title>NixOS Tests</title>
+
+<para>When you add some feature to NixOS, you should write a test for
+it. NixOS tests are kept in the directory <filename
+xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/tests">nixos/tests</filename>,
+and are executed (using Nix) by a testing framework that automatically
+starts one or more virtual machines containing the NixOS system(s)
+required for the test.</para>
+
+<xi:include href="writing-nixos-tests.xml" />
+<xi:include href="running-nixos-tests.xml" />
+
+</chapter>
\ No newline at end of file
diff --git a/nixos/doc/manual/development/option-declarations.xml b/nixos/doc/manual/development/option-declarations.xml
new file mode 100644
index 000000000000..6d93dc5c0094
--- /dev/null
+++ b/nixos/doc/manual/development/option-declarations.xml
@@ -0,0 +1,141 @@
+<section xmlns="http://docbook.org/ns/docbook"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        version="5.0"
+        xml:id="sec-option-declarations">
+
+<title>Option Declarations</title>
+
+<para>An option declaration specifies the name, type and description
+of a NixOS configuration option.  It is illegal to define an option
+that hasn’t been declared in any module.  A option declaration
+generally looks like this:
+
+<programlisting>
+options = {
+  <replaceable>name</replaceable> = mkOption {
+    type = <replaceable>type specification</replaceable>;
+    default = <replaceable>default value</replaceable>;
+    example = <replaceable>example value</replaceable>;
+    description = "<replaceable>Description for use in the NixOS manual.</replaceable>";
+  };
+};
+</programlisting>
+
+</para>
+
+<para>The function <varname>mkOption</varname> accepts the following arguments.
+
+<variablelist>
+
+  <varlistentry>
+    <term><varname>type</varname></term>
+    <listitem>
+      <para>The type of the option (see below).  It may be omitted,
+      but that’s not advisable since it may lead to errors that are
+      hard to diagnose.</para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><varname>default</varname></term>
+    <listitem>
+      <para>The default value used if no value is defined by any
+      module.  A default is not required; in that case, if the option
+      value is ever used, an error will be thrown.</para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><varname>example</varname></term>
+    <listitem>
+      <para>An example value that will be shown in the NixOS manual.</para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><varname>description</varname></term>
+    <listitem>
+      <para>A textual description of the option, in DocBook format,
+      that will be included in the NixOS manual.</para>
+    </listitem>
+  </varlistentry>
+
+</variablelist>
+
+</para>
+
+<para>Here is a non-exhaustive list of option types:
+
+<variablelist>
+
+  <varlistentry>
+    <term><varname>types.bool</varname></term>
+    <listitem>
+      <para>A Boolean.</para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><varname>types.int</varname></term>
+    <listitem>
+      <para>An integer.</para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><varname>types.str</varname></term>
+    <listitem>
+      <para>A string.</para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><varname>types.lines</varname></term>
+    <listitem>
+      <para>A string.  If there are multiple definitions, they are
+      concatenated, with newline characters in between.</para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><varname>types.path</varname></term>
+    <listitem>
+      <para>A path, defined as anything that, when coerced to a
+      string, starts with a slash.  This includes derivations.</para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><varname>types.listOf</varname> <replaceable>t</replaceable></term>
+    <listitem>
+      <para>A list of elements of type <replaceable>t</replaceable>
+      (e.g., <literal>types.listOf types.str</literal> is a list of
+      strings).  Multiple definitions are concatenated together.</para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><varname>types.attrsOf</varname> <replaceable>t</replaceable></term>
+    <listitem>
+      <para>A set of elements of type <replaceable>t</replaceable>
+      (e.g., <literal>types.attrsOf types.int</literal> is a set of
+      name/value pairs, the values being integers).</para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><varname>types.nullOr</varname> <replaceable>t</replaceable></term>
+    <listitem>
+      <para>Either the value <literal>null</literal> or something of
+      type <replaceable>t</replaceable>.</para>
+    </listitem>
+  </varlistentry>
+
+</variablelist>
+
+You can also create new types using the function
+<varname>mkOptionType</varname>.  See
+<filename>lib/types.nix</filename> in Nixpkgs for details.</para>
+
+</section>
\ No newline at end of file
diff --git a/nixos/doc/manual/development/option-def.xml b/nixos/doc/manual/development/option-def.xml
new file mode 100644
index 000000000000..4e267ecfd1e3
--- /dev/null
+++ b/nixos/doc/manual/development/option-def.xml
@@ -0,0 +1,112 @@
+<section xmlns="http://docbook.org/ns/docbook"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        version="5.0"
+        xml:id="sec-option-definitions">
+
+<title>Option Definitions</title>
+
+<para>Option definitions are generally straight-forward bindings of values to option names, like
+
+<programlisting>
+config = {
+  services.httpd.enable = true;
+};
+</programlisting>
+
+However, sometimes you need to wrap an option definition or set of
+option definitions in a <emphasis>property</emphasis> to achieve
+certain effects:</para>
+
+<simplesect><title>Delaying Conditionals</title>
+
+<para>If a set of option definitions is conditional on the value of
+another option, you may need to use <varname>mkIf</varname>.
+Consider, for instance:
+
+<programlisting>
+config = if config.services.httpd.enable then {
+  environment.systemPackages = [ <replaceable>...</replaceable> ];
+  <replaceable>...</replaceable>
+} else {};
+</programlisting>
+
+This definition will cause Nix to fail with an “infinite recursion”
+error.  Why?  Because the value of
+<option>config.services.httpd.enable</option> depends on the value
+being constructed here.  After all, you could also write the clearly
+circular and contradictory:
+<programlisting>
+config = if config.services.httpd.enable then {
+  services.httpd.enable = false;
+} else {
+  services.httpd.enable = true;
+};
+</programlisting>
+
+The solution is to write:
+
+<programlisting>
+config = mkIf config.services.httpd.enable {
+  environment.systemPackages = [ <replaceable>...</replaceable> ];
+  <replaceable>...</replaceable>
+};
+</programlisting>
+
+The special function <varname>mkIf</varname> causes the evaluation of
+the conditional to be “pushed down” into the individual definitions,
+as if you had written:
+
+<programlisting>
+config = {
+  environment.systemPackages = if config.services.httpd.enable then [ <replaceable>...</replaceable> ] else [];
+  <replaceable>...</replaceable>
+};
+</programlisting>
+
+</para>
+
+</simplesect>
+
+<simplesect><title>Setting Priorities</title>
+
+<para>A module can override the definitions of an option in other
+modules by setting a <emphasis>priority</emphasis>.  All option
+definitions that do not have the lowest priority value are discarded.
+By default, option definitions have priority 1000.  You can specify an
+explicit priority by using <varname>mkOverride</varname>, e.g.
+
+<programlisting>
+services.openssh.enable = mkOverride 10 false;
+</programlisting>
+
+This definition causes all other definitions with priorities above 10
+to be discarded.  The function <varname>mkForce</varname> is
+equal to <varname>mkOverride 50</varname>.</para>
+
+</simplesect>
+
+<simplesect><title>Merging Configurations</title>
+
+<para>In conjunction with <literal>mkIf</literal>, it is sometimes
+useful for a module to return multiple sets of option definitions, to
+be merged together as if they were declared in separate modules.  This
+can be done using <varname>mkMerge</varname>:
+
+<programlisting>
+config = mkMerge
+  [ # Unconditional stuff.
+    { environment.systemPackages = [ <replaceable>...</replaceable> ];
+    }
+    # Conditional stuff.
+    (mkIf config.services.bla.enable {
+      environment.systemPackages = [ <replaceable>...</replaceable> ];
+    })
+  ];
+</programlisting>
+
+</para>
+
+</simplesect>
+
+</section>
\ No newline at end of file
diff --git a/nixos/doc/manual/development/running-nixos-tests.xml b/nixos/doc/manual/development/running-nixos-tests.xml
new file mode 100644
index 000000000000..d9be761eb01d
--- /dev/null
+++ b/nixos/doc/manual/development/running-nixos-tests.xml
@@ -0,0 +1,77 @@
+<section xmlns="http://docbook.org/ns/docbook"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        version="5.0"
+        xml:id="sec-running-nixos-tests">
+
+<title>Running Tests</title>
+
+<para>You can run tests using <command>nix-build</command>. For
+example, to run the test <filename
+xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/login.nix">login.nix</filename>,
+you just do:
+
+<screen>
+$ nix-build '&lt;nixpkgs/nixos/tests/login.nix>'
+</screen>
+
+or, if you don’t want to rely on <envar>NIX_PATH</envar>:
+
+<screen>
+$ cd /my/nixpkgs/nixos/tests
+$ nix-build login.nix
+…
+running the VM test script
+machine: QEMU running (pid 8841)
+…
+6 out of 6 tests succeeded
+</screen>
+
+After building/downloading all required dependencies, this will
+perform a build that starts a QEMU/KVM virtual machine containing a
+NixOS system. The virtual machine mounts the Nix store of the host;
+this makes VM creation very fast, as no disk image needs to be
+created. Afterwards, you can view a pretty-printed log of the test:
+
+<screen>
+$ firefox result/log.html
+</screen>
+
+</para>
+
+<para>It is also possible to run the test environment interactively,
+allowing you to experiment with the VMs.  For example:
+
+<screen>
+$ nix-build login.nix -A driver
+$ ./result/bin/nixos-run-vms
+</screen>
+
+The script <command>nixos-run-vms</command> starts the virtual
+machines defined by test.  The root file system of the VMs is created
+on the fly and kept across VM restarts in
+<filename>./</filename><varname>hostname</varname><filename>.qcow2</filename>.</para>
+
+<para>Finally, the test itself can be run interactively.  This is
+particularly useful when developing or debugging a test:
+
+<screen>
+$ nix-build tests/ -A nfs.driver
+$ ./result/bin/nixos-test-driver
+starting VDE switch for network 1
+&gt;
+</screen>
+
+You can then take any Perl statement, e.g.
+
+<screen>
+&gt; startAll
+&gt; $machine->succeed("touch /tmp/foo")
+</screen>
+
+The function <command>testScript</command> executes the entire test
+script and drops you back into the test driver command line upon its
+completion.  This allows you to inspect the state of the VMs after the
+test (e.g. to debug the test script).</para>
+
+</section>
\ No newline at end of file
diff --git a/nixos/doc/manual/development/sources.xml b/nixos/doc/manual/development/sources.xml
new file mode 100644
index 000000000000..992a07af9813
--- /dev/null
+++ b/nixos/doc/manual/development/sources.xml
@@ -0,0 +1,95 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        version="5.0"
+        xml:id="sec-getting-sources">
+
+<title>Getting the Sources</title>
+
+<para>By default, NixOS’s <command>nixos-rebuild</command> command
+uses the NixOS and Nixpkgs sources provided by the
+<literal>nixos-unstable</literal> channel (kept in
+<filename>/nix/var/nix/profiles/per-user/root/channels/nixos</filename>).
+To modify NixOS, however, you should check out the latest sources from
+Git.  This is done using the following command:
+
+<screen>
+$ nixos-checkout <replaceable>/my/sources</replaceable>
+</screen>
+
+or
+
+<screen>
+$ mkdir -p <replaceable>/my/sources</replaceable>
+$ cd <replaceable>/my/sources</replaceable>
+$ nix-env -i git
+$ git clone git://github.com/NixOS/nixpkgs.git
+</screen>
+
+This will check out the latest NixOS sources to
+<filename><replaceable>/my/sources</replaceable>/nixpkgs/nixos</filename>
+and the Nixpkgs sources to
+<filename><replaceable>/my/sources</replaceable>/nixpkgs</filename>.
+(The NixOS source tree lives in a subdirectory of the Nixpkgs
+repository.)</para>
+
+<para>It’s often inconvenient to develop directly on the master
+branch, since if somebody has just committed (say) a change to GCC,
+then the binary cache may not have caught up yet and you’ll have to
+rebuild everything from source. So you may want to create a local
+branch based on your current NixOS version:
+
+<screen>
+$ nixos-version
+14.04.273.ea1952b (Baboon)
+
+$ git checkout -b local ea1952b
+</screen>
+
+Or, to base your local branch on the latest version available in the
+NixOS channel:
+
+<screen>
+$ curl -sI http://nixos.org/channels/nixos-unstable/ | grep Location
+Location: http://releases.nixos.org/nixos/unstable/nixos-14.10pre43986.acaf4a6/
+
+$ git checkout -b local acaf4a6
+</screen>
+
+You can then use <command>git rebase</command> to sync your local
+branch with the upstream branch, and use <command>git
+cherry-pick</command> to copy commits from your local branch to the
+upstream branch.</para>
+
+<para>If you want to rebuild your system using your (modified)
+sources, you need to tell <command>nixos-rebuild</command> about them
+using the <option>-I</option> flag:
+
+<screen>
+$ nixos-rebuild switch -I nixpkgs=<replaceable>/my/sources</replaceable>/nixpkgs
+</screen>
+
+</para>
+
+<para>If you want <command>nix-env</command> to use the expressions in
+<replaceable>/my/sources</replaceable>, use <command>nix-env -f
+<replaceable>/my/sources</replaceable>/nixpkgs</command>, or change
+the default by adding a symlink in
+<filename>~/.nix-defexpr</filename>:
+
+<screen>
+$ ln -s <replaceable>/my/sources</replaceable>/nixpkgs ~/.nix-defexpr/nixpkgs
+</screen>
+
+You may want to delete the symlink
+<filename>~/.nix-defexpr/channels_root</filename> to prevent root’s
+NixOS channel from clashing with your own tree.</para>
+
+<!-- FIXME: not sure what this means.
+<para>You should not pass the base directory
+<filename><replaceable>/my/sources</replaceable></filename>
+to <command>nix-env</command>, as it will break after interpreting expressions
+in <filename>nixos/</filename> as packages.</para>
+-->
+
+</chapter>
\ No newline at end of file
diff --git a/nixos/doc/manual/development/testing-installer.xml b/nixos/doc/manual/development/testing-installer.xml
new file mode 100644
index 000000000000..87e40e326171
--- /dev/null
+++ b/nixos/doc/manual/development/testing-installer.xml
@@ -0,0 +1,27 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        version="5.0"
+        xml:id="ch-testing-installer">
+
+<title>Testing the Installer</title>
+
+<para>Building, burning, and booting from an installation CD is rather
+tedious, so here is a quick way to see if the installer works
+properly:
+
+<screen>
+$ nix-build -A config.system.build.nixos-install
+$ mount -t tmpfs none /mnt
+$ ./result/bin/nixos-install</screen>
+
+To start a login shell in the new NixOS installation in
+<filename>/mnt</filename>:
+
+<screen>
+$ ./result/bin/nixos-install --chroot
+</screen>
+
+</para>
+
+</chapter>
\ No newline at end of file
diff --git a/nixos/doc/manual/development/writing-modules.xml b/nixos/doc/manual/development/writing-modules.xml
new file mode 100644
index 000000000000..9cf29e5dc57d
--- /dev/null
+++ b/nixos/doc/manual/development/writing-modules.xml
@@ -0,0 +1,175 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        version="5.0"
+        xml:id="sec-writing-modules">
+
+<title>Writing NixOS Modules</title>
+
+<para>NixOS has a modular system for declarative configuration.  This
+system combines multiple <emphasis>modules</emphasis> to produce the
+full system configuration.  One of the modules that constitute the
+configuration is <filename>/etc/nixos/configuration.nix</filename>.
+Most of the others live in the <link
+xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/modules"><filename>nixos/modules</filename></link>
+subdirectory of the Nixpkgs tree.</para>
+
+<para>Each NixOS module is a file that handles one logical aspect of
+the configuration, such as a specific kind of hardware, a service, or
+network settings.  A module configuration does not have to handle
+everything from scratch; it can use the functionality provided by
+other modules for its implementation.  Thus a module can
+<emphasis>declare</emphasis> options that can be used by other
+modules, and conversely can <emphasis>define</emphasis> options
+provided by other modules in its own implementation.  For example, the
+module <link
+xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/security/pam.nix"><filename>pam.nix</filename></link>
+declares the option <option>security.pam.services</option> that allows
+other modules (e.g. <link
+xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/services/networking/ssh/sshd.nix"><filename>sshd.nix</filename></link>)
+to define PAM services; and it defines the option
+<option>environment.etc</option> (declared by <link
+xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/system/etc/etc.nix"><filename>etc.nix</filename></link>)
+to cause files to be created in
+<filename>/etc/pam.d</filename>.</para>
+
+<para xml:id="para-module-syn">In <xref
+linkend="sec-configuration-syntax"/>, we saw the following structure
+of NixOS modules:
+
+<programlisting>
+{ config, pkgs, ... }:
+
+{ <replaceable>option definitions</replaceable>
+}
+</programlisting>
+
+This is actually an <emphasis>abbreviated</emphasis> form of module
+that only defines options, but does not declare any.  The structure of
+full NixOS modules is shown in <xref linkend='ex-module-syntax' />.</para>
+
+<example xml:id='ex-module-syntax'><title>Structure of NixOS Modules</title>
+<programlisting>
+{ config, pkgs, ... }: <co xml:id='module-syntax-1' />
+
+{
+  imports =
+    [ <replaceable>paths of other modules</replaceable> <co xml:id='module-syntax-2' />
+    ];
+
+  options = {
+    <replaceable>option declarations</replaceable> <co xml:id='module-syntax-3' />
+  };
+
+  config = {
+    <replaceable>option definitions</replaceable> <co xml:id='module-syntax-4' />
+  };
+}</programlisting>
+</example>
+
+<para>The meaning of each part is as follows.
+
+<calloutlist>
+  <callout arearefs='module-syntax-1'>
+    <para>This line makes the current Nix expression a function.  The
+    variable <varname>pkgs</varname> contains Nixpkgs, while
+    <varname>config</varname> contains the full system configuration.
+    This line can be omitted if there is no reference to
+    <varname>pkgs</varname> and <varname>config</varname> inside the
+    module.</para>
+  </callout>
+
+  <callout arearefs='module-syntax-2'>
+    <para>This list enumerates the paths to other NixOS modules that
+    should be included in the evaluation of the system configuration.
+    A default set of modules is defined in the file
+    <filename>modules/module-list.nix</filename>.  These don't need to
+    be added in the import list.</para>
+  </callout>
+
+  <callout arearefs='module-syntax-3'>
+    <para>The attribute <varname>options</varname> is a nested set of
+    <emphasis>option declarations</emphasis> (described below).</para>
+  </callout>
+
+  <callout arearefs='module-syntax-4'>
+    <para>The attribute <varname>config</varname> is a nested set of
+    <emphasis>option definitions</emphasis> (also described
+    below).</para>
+  </callout>
+</calloutlist>
+
+</para>
+
+<para><xref linkend='locate-example' /> shows a module that handles
+the regular update of the “locate” database, an index of all files in
+the file system.  This module declares two options that can be defined
+by other modules (typically the user’s
+<filename>configuration.nix</filename>):
+<option>services.locate.enable</option> (whether the database should
+be updated) and <option>services.locate.period</option> (when the
+update should be done).  It implements its functionality by defining
+two options declared by other modules:
+<option>systemd.services</option> (the set of all systemd services)
+and <option>services.cron.systemCronJobs</option> (the list of
+commands to be executed periodically by <command>cron</command>).</para>
+
+<example xml:id='locate-example'><title>NixOS Module for the “locate” Service</title>
+<programlisting>
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let locatedb = "/var/cache/locatedb"; in
+
+{
+  options = {
+
+    services.locate = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          If enabled, NixOS will periodically update the database of
+          files used by the <command>locate</command> command.
+        '';
+      };
+
+      period = mkOption {
+        type = types.str;
+        default = "15 02 * * *";
+        description = ''
+          This option defines (in the format used by cron) when the
+          locate database is updated.  The default is to update at
+          02:15 at night every day.
+        '';
+      };
+
+    };
+
+  };
+
+  config = {
+
+    systemd.services.update-locatedb =
+      { description = "Update Locate Database";
+        path  = [ pkgs.su ];
+        script =
+          ''
+            mkdir -m 0755 -p $(dirname ${locatedb})
+            exec updatedb --localuser=nobody --output=${locatedb} --prunepaths='/tmp /var/tmp /media /run'
+          '';
+      };
+
+    services.cron.systemCronJobs = optional config.services.locate.enable
+      "${config.services.locate.period} root ${config.systemd.package}/bin/systemctl start update-locatedb.service";
+
+  };
+}</programlisting>
+</example>
+
+<xi:include href="option-declarations.xml" />
+<xi:include href="option-def.xml" />
+
+</chapter>
\ No newline at end of file
diff --git a/nixos/doc/manual/development/writing-nixos-tests.xml b/nixos/doc/manual/development/writing-nixos-tests.xml
new file mode 100644
index 000000000000..bbb655eed2a6
--- /dev/null
+++ b/nixos/doc/manual/development/writing-nixos-tests.xml
@@ -0,0 +1,251 @@
+<section xmlns="http://docbook.org/ns/docbook"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        version="5.0"
+        xml:id="sec-writing-nixos-tests">
+
+<title>Writing Tests</title>
+
+<para>A NixOS test is a Nix expression that has the following structure:
+
+<programlisting>
+import ./make-test.nix {
+
+  # Either the configuration of a single machine:
+  machine =
+    { config, pkgs, ... }:
+    { <replaceable>configuration…</replaceable>
+    };
+
+  # Or a set of machines:
+  nodes =
+    { <replaceable>machine1</replaceable> =
+        { config, pkgs, ... }: { <replaceable>…</replaceable> };
+      <replaceable>machine2</replaceable> =
+        { config, pkgs, ... }: { <replaceable>…</replaceable> };
+      …
+    };
+
+  testScript =
+    ''
+      <replaceable>Perl code…</replaceable>
+    '';
+}
+</programlisting>
+
+The attribute <literal>testScript</literal> is a bit of Perl code that
+executes the test (described below). During the test, it will start
+one or more virtual machines, the configuration of which is described
+by the attribute <literal>machine</literal> (if you need only one
+machine in your test) or by the attribute <literal>nodes</literal> (if
+you need multiple machines). For instance, <filename
+xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/login.nix">login.nix</filename>
+only needs a single machine to test whether users can log in on the
+virtual console, whether device ownership is correctly maintained when
+switching between consoles, and so on. On the other hand, <filename
+xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nfs.nix">nfs.nix</filename>,
+which tests NFS client and server functionality in the Linux kernel
+(including whether locks are maintained across server crashes),
+requires three machines: a server and two clients.</para>
+
+<para>There are a few special NixOS configuration options for test
+VMs:
+
+<!-- FIXME: would be nice to generate this automatically. -->
+
+<variablelist>
+
+  <varlistentry>
+    <term><option>virtualisation.memorySize</option></term>
+    <listitem><para>The memory of the VM in
+    megabytes.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><option>virtualisation.vlans</option></term>
+    <listitem><para>The virtual networks to which the VM is
+    connected. See <filename
+    xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nat.nix">nat.nix</filename>
+    for an example.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><option>virtualisation.writableStore</option></term>
+    <listitem><para>By default, the Nix store in the VM is not
+    writable. If you enable this option, a writable union file system
+    is mounted on top of the Nix store to make it appear
+    writable. This is necessary for tests that run Nix operations that
+    modify the store.</para></listitem>
+  </varlistentry>
+
+</variablelist>
+
+For more options, see the module <filename
+xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/virtualisation/qemu-vm.nix">qemu-vm.nix</filename>.</para>
+
+<para>The test script is a sequence of Perl statements that perform
+various actions, such as starting VMs, executing commands in the VMs,
+and so on. Each virtual machine is represented as an object stored in
+the variable <literal>$<replaceable>name</replaceable></literal>,
+where <replaceable>name</replaceable> is the identifier of the machine
+(which is just <literal>machine</literal> if you didn’t specify
+multiple machines using the <literal>nodes</literal> attribute). For
+instance, the following starts the machine, waits until it has
+finished booting, then executes a command and checks that the output
+is more-or-less correct:
+
+<programlisting>
+$machine->start;
+$machine->waitForUnit("default.target");
+$machine->succeed("uname") =~ /Linux/;
+</programlisting>
+
+The first line is actually unnecessary; machines are implicitly
+started when you first execute an action on them (such as
+<literal>waitForUnit</literal> or <literal>succeed</literal>). If you
+have multiple machines, you can speed up the test by starting them in
+parallel:
+
+<programlisting>
+startAll;
+</programlisting>
+
+</para>
+
+<para>The following methods are available on machine objects:
+
+<variablelist>
+
+  <varlistentry>
+    <term><methodname>start</methodname></term>
+    <listitem><para>Start the virtual machine. This method is
+    asynchronous — it does not wait for the machine to finish
+    booting.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><methodname>shutdown</methodname></term>
+    <listitem><para>Shut down the machine, waiting for the VM to
+    exit.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><methodname>crash</methodname></term>
+    <listitem><para>Simulate a sudden power failure, by telling the VM
+    to exit immediately.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><methodname>block</methodname></term>
+    <listitem><para>Simulate unplugging the Ethernet cable that
+    connects the machine to the other machines.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><methodname>unblock</methodname></term>
+    <listitem><para>Undo the effect of
+    <methodname>block</methodname>.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><methodname>screenshot</methodname></term>
+    <listitem><para>Take a picture of the display of the virtual
+    machine, in PNG format. The screenshot is linked from the HTML
+    log.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><methodname>sendMonitorCommand</methodname></term>
+    <listitem><para>Send a command to the QEMU monitor. This is rarely
+    used, but allows doing stuff such as attaching virtual USB disks
+    to a running machine.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><methodname>sendKeys</methodname></term>
+    <listitem><para>Simulate pressing keys on the virtual keyboard,
+    e.g., <literal>sendKeys("ctrl-alt-delete")</literal>.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><methodname>sendChars</methodname></term>
+    <listitem><para>Simulate typing a sequence of characters on the
+    virtual keyboard, e.g., <literal>sendKeys("foobar\n")</literal>
+    will type the string <literal>foobar</literal> followed by the
+    Enter key.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><methodname>execute</methodname></term>
+    <listitem><para>Execute a shell command, returning a list
+    <literal>(<replaceable>status</replaceable>,
+    <replaceable>stdout</replaceable>)</literal>.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><methodname>succeed</methodname></term>
+    <listitem><para>Execute a shell command, raising an exception if
+    the exit status is not zero, otherwise returning the standard
+    output.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><methodname>fail</methodname></term>
+    <listitem><para>Like <methodname>succeed</methodname>, but raising
+    an exception if the command returns a zero status.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><methodname>waitUntilSucceeds</methodname></term>
+    <listitem><para>Repeat a shell command with 1-second intervals
+    until it succeeds.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><methodname>waitUntilFails</methodname></term>
+    <listitem><para>Repeat a shell command with 1-second intervals
+    until it fails.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><methodname>waitForUnit</methodname></term>
+    <listitem><para>Wait until the specified systemd unit has reached
+    the “active” state.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><methodname>waitForFile</methodname></term>
+    <listitem><para>Wait until the specified file
+    exists.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><methodname>waitForOpenPort</methodname></term>
+    <listitem><para>Wait until a process is listening on the given TCP
+    port (on <literal>localhost</literal>, at least).</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><methodname>waitForClosedPort</methodname></term>
+    <listitem><para>Wait until nobody is listening on the given TCP
+    port.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><methodname>waitForX</methodname></term>
+    <listitem><para>Wait until the X11 server is accepting
+    connections.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><methodname>waitForWindow</methodname></term>
+    <listitem><para>Wait until an X11 window has appeared whose name
+    matches the given regular expression, e.g.,
+    <literal>waitForWindow(qr/Terminal/)</literal>.</para></listitem>
+  </varlistentry>
+
+</variablelist>
+
+</para>
+
+</section>
\ No newline at end of file
diff --git a/nixos/doc/manual/installation.xml b/nixos/doc/manual/installation.xml
deleted file mode 100644
index 4cbfcc229fa4..000000000000
--- a/nixos/doc/manual/installation.xml
+++ /dev/null
@@ -1,570 +0,0 @@
-<chapter xmlns="http://docbook.org/ns/docbook"
-         xmlns:xlink="http://www.w3.org/1999/xlink"
-         xml:id="ch-installation">
-
-<title>Installing NixOS</title>
-
-
-<!--===============================================================-->
-
-<section xml:id="sec-obtaining">
-
-<title>Obtaining NixOS</title>
-
-<para>NixOS ISO images can be downloaded from the <link
-xlink:href="http://nixos.org/nixos/download.html">NixOS
-homepage</link>.  These can be burned onto a CD.  It is also possible
-to copy them onto a USB stick and install NixOS from there.  For
-details, see the <link
-xlink:href="https://nixos.org/wiki/Installing_NixOS_from_a_USB_stick">NixOS
-Wiki</link>.</para>
-
-<para>As an alternative to installing NixOS yourself, you can get a
-running NixOS system through several other means:
-
-<itemizedlist>
-  <listitem>
-    <para>Using virtual appliances in Open Virtualization Format (OVF)
-    that can be imported into VirtualBox.  These are available from
-    the <link xlink:href="http://nixos.org/nixos/download.html">NixOS
-    homepage</link>.</para>
-  </listitem>
-  <listitem>
-    <para>Using AMIs for Amazon’s EC2.  To find one for your region
-    and instance type, please refer to the <link
-    xlink:href="https://github.com/NixOS/nixops/blob/master/nix/ec2-amis.nix">list
-    of most recent AMIs</link>.</para>
-  </listitem>
-  <listitem>
-    <para>Using NixOps, the NixOS-based cloud deployment tool, which
-    allows you to provision VirtualBox and EC2 NixOS instances from
-    declarative specifications.  Check out the <link
-    xlink:href="https://github.com/NixOS/nixops">NixOps
-    homepage</link> for details.</para>
-  </listitem>
-</itemizedlist>
-
-</para>
-
-</section>
-
-
-<!--===============================================================-->
-
-<section xml:id="sec-installation">
-
-<title>Installation</title>
-
-<orderedlist>
-
-  <listitem><para>Boot from the CD.</para></listitem>
-
-  <listitem><para>The CD contains a basic NixOS installation.  (It
-  also contains Memtest86+, useful if you want to test new hardware.)
-  When it’s finished booting, it should have detected most of your
-  hardware and brought up networking (check
-  <command>ifconfig</command>).  Networking is necessary for the
-  installer, since it will download lots of stuff (such as source
-  tarballs or Nixpkgs channel binaries).  It’s best if you have a DHCP
-  server on your network.  Otherwise configure networking manually
-  using <command>ifconfig</command>.</para></listitem>
-
-  <listitem><para>The NixOS manual is available on virtual console 8
-  (press Alt+F8 to access).</para></listitem>
-
-  <listitem><para>Login as <literal>root</literal> and the empty
-  password.</para></listitem>
-
-  <listitem><para>If you downloaded the graphical ISO image, you can
-  run <command>start display-manager</command> to start KDE.</para></listitem>
-
-  <listitem><para>The NixOS installer doesn’t do any partitioning or
-  formatting yet, so you need to that yourself.  Use the following
-  commands:
-
-  <itemizedlist>
-
-    <listitem><para>For partitioning:
-    <command>fdisk</command>.</para></listitem>
-
-    <listitem><para>For initialising Ext4 partitions:
-    <command>mkfs.ext4</command>.  It is recommended that you assign a
-    unique symbolic label to the file system using the option
-    <option>-L <replaceable>label</replaceable></option>, since this
-    makes the file system configuration independent from device
-    changes.  For example:
-
-<screen>
-$ mkfs.ext4 -L nixos /dev/sda1</screen>
-
-    </para></listitem>
-
-    <listitem><para>For creating swap partitions:
-    <command>mkswap</command>.  Again it’s recommended to assign a
-    label to the swap partition: <option>-L
-    <replaceable>label</replaceable></option>.</para></listitem>
-
-    <listitem><para>For creating LVM volumes, the LVM commands, e.g.,
-
-<screen>
-$ pvcreate /dev/sda1 /dev/sdb1
-$ vgcreate MyVolGroup /dev/sda1 /dev/sdb1
-$ lvcreate --size 2G --name bigdisk MyVolGroup
-$ lvcreate --size 1G --name smalldisk MyVolGroup</screen>
-
-    </para></listitem>
-
-    <listitem><para>For creating software RAID devices, use
-    <command>mdadm</command>.</para></listitem>
-
-  </itemizedlist>
-
-  </para></listitem>
-
-  <listitem><para>Mount the target file system on which NixOS should
-  be installed on <filename>/mnt</filename>, e.g.
-
-<screen>
-$ mount /dev/disk/by-label/nixos /mnt
-</screen>
-
-  </para></listitem>
-
-  <listitem><para>If your machine has a limited amount of memory, you
-  may want to activate swap devices now (<command>swapon
-  <replaceable>device</replaceable></command>).  The installer (or
-  rather, the build actions that it may spawn) may need quite a bit of
-  RAM, depending on your configuration.</para></listitem>
-
-  <listitem>
-
-    <para>You now need to create a file
-    <filename>/mnt/etc/nixos/configuration.nix</filename> that
-    specifies the intended configuration of the system.  This is
-    because NixOS has a <emphasis>declarative</emphasis> configuration
-    model: you create or edit a description of the desired
-    configuration of your system, and then NixOS takes care of making
-    it happen.  The syntax of the NixOS configuration file is
-    described in <xref linkend="sec-configuration-syntax"/>, while a
-    list of available configuration options appears in <xref
-    linkend="ch-options"/>.  A minimal example is shown in <xref
-    linkend="ex-config"/>.</para>
-
-    <para>The command <command>nixos-generate-config</command> can
-    generate an initial configuration file for you:
-
-<screen>
-$ nixos-generate-config --root /mnt</screen>
-
-    You should then edit
-    <filename>/mnt/etc/nixos/configuration.nix</filename> to suit your
-    needs:
-
-<screen>
-$ nano /mnt/etc/nixos/configuration.nix
-</screen>
-
-    The <command>vim</command> text editor is also available.</para>
-
-    <para>You <emphasis>must</emphasis> set the option
-    <option>boot.loader.grub.device</option> to specify on which disk
-    the GRUB boot loader is to be installed.  Without it, NixOS cannot
-    boot.</para>
-
-    <para>Another critical option is <option>fileSystems</option>,
-    specifying the file systems that need to be mounted by NixOS.
-    However, you typically don’t need to set it yourself, because
-    <command>nixos-generate-config</command> sets it automatically in
-    <filename>/mnt/etc/nixos/hardware-configuration.nix</filename>
-    from your currently mounted file systems.  (The configuration file
-    <filename>hardware-configuration.nix</filename> is included from
-    <filename>configuration.nix</filename> and will be overwritten by
-    future invocations of <command>nixos-generate-config</command>;
-    thus, you generally should not modify it.)</para>
-
-    <note><para>Depending on your hardware configuration or type of
-    file system, you may need to set the option
-    <option>boot.initrd.kernelModules</option> to include the kernel
-    modules that are necessary for mounting the root file system,
-    otherwise the installed system will not be able to boot.  (If this
-    happens, boot from the CD again, mount the target file system on
-    <filename>/mnt</filename>, fix
-    <filename>/mnt/etc/nixos/configuration.nix</filename> and rerun
-    <filename>nixos-install</filename>.)  In most cases,
-    <command>nixos-generate-config</command> will figure out the
-    required modules.</para></note>
-
-    <para>Examples of real-world NixOS configuration files can be
-    found at <link
-    xlink:href="https://nixos.org/repos/nix/configurations/trunk/"/>.</para>
-
-  </listitem>
-
-  <listitem><para>Do the installation:
-
-<screen>
-$ nixos-install</screen>
-
-    Cross fingers.  If this fails due to a temporary problem (such as
-    a network issue while downloading binaries from the NixOS binary
-    cache), you can just re-run <command>nixos-install</command>.
-    Otherwise, fix your <filename>configuration.nix</filename> and
-    then re-run <command>nixos-install</command>.</para>
-
-    <para>As the last step, <command>nixos-install</command> will ask
-    you to set the password for the <literal>root</literal> user, e.g.
-
-<screen>
-setting root password...
-Enter new UNIX password: ***
-Retype new UNIX password: ***
-</screen>
-
-    </para>
-
-  </listitem>
-
-  <listitem><para>If everything went well:
-
-<screen>
-$ reboot</screen>
-
-  </para></listitem>
-
-  <listitem>
-
-    <para>You should now be able to boot into the installed NixOS.
-    The GRUB boot menu shows a list of <emphasis>available
-    configurations</emphasis> (initially just one).  Every time you
-    change the NixOS configuration (see <xref
-    linkend="sec-changing-config" />), a new item appears in the menu.
-    This allows you to easily roll back to another configuration if
-    something goes wrong.</para>
-
-    <para>You should log in and change the <literal>root</literal>
-    password with <command>passwd</command>.</para>
-
-    <para>You’ll probably want to create some user accounts as well,
-    which can be done with <command>useradd</command>:
-
-<screen>
-$ useradd -c 'Eelco Dolstra' -m eelco
-$ passwd eelco</screen>
-
-    </para>
-
-    <para>You may also want to install some software.  For instance,
-
-<screen>
-$ nix-env -qa \*</screen>
-
-    shows what packages are available, and
-
-<screen>
-$ nix-env -i w3m</screen>
-
-    install the <literal>w3m</literal> browser.</para>
-
-  </listitem>
-
-</orderedlist>
-
-<para>To summarise, <xref linkend="ex-install-sequence" /> shows a
-typical sequence of commands for installing NixOS on an empty hard
-drive (here <filename>/dev/sda</filename>).  <xref linkend="ex-config"
-/> shows a corresponding configuration Nix expression.</para>
-
-<example xml:id='ex-install-sequence'><title>Commands for installing NixOS on <filename>/dev/sda</filename></title>
-<screen>
-$ fdisk /dev/sda # <lineannotation>(or whatever device you want to install on)</lineannotation>
-$ mkfs.ext4 -L nixos /dev/sda1
-$ mkswap -L swap /dev/sda2
-$ swapon /dev/sda2
-$ mount /dev/disk/by-label/nixos /mnt
-$ nixos-generate-config --root /mnt
-$ nano /mnt/etc/nixos/configuration.nix
-$ nixos-install
-$ reboot</screen>
-</example>
-
-<example xml:id='ex-config'><title>NixOS configuration</title>
-<screen>
-{ config, pkgs, ... }:
-
-{
-  imports =
-    [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-    ];
-
-  boot.loader.grub.device = "/dev/sda";
-
-  # Note: setting fileSystems is generally not
-  # necessary, since nixos-generate-config figures them out
-  # automatically in hardware-configuration.nix.
-  #fileSystems."/".device = "/dev/disk/by-label/nixos";
-
-  # Enable the OpenSSH server.
-  services.sshd.enable = true;
-}</screen>
-</example>
-
-<section xml:id="sec-uefi-installation">
-
-<title>UEFI Installation</title>
-
-<para>NixOS can also be installed on UEFI systems.  The procedure
-is by and large the same as a BIOS installation, with the following
-changes:
-
-<itemizedlist>
-  <listitem>
-    <para>You should boot the live CD in UEFI mode (consult your
-    specific hardware's documentation for instructions). You may find
-    the <link
-    xlink:href="http://www.rodsbooks.com/refind">rEFInd
-    boot manager</link> useful.</para>
-  </listitem>
-  <listitem>
-    <para>Instead of <command>fdisk</command>, you should use
-    <command>gdisk</command> to partition your disks. You will need to
-    have a separate partition for <filename>/boot</filename> with
-    partition code EF00, and it should be formatted as a
-    <literal>vfat</literal> filesystem.</para>
-  </listitem>
-  <listitem>
-    <para>You must set <option>boot.loader.gummiboot.enable</option> to
-    <literal>true</literal>. <command>nixos-generate-config</command>
-    should do this automatically for new configurations when booted in
-    UEFI mode.</para>
-  </listitem>
-  <listitem>
-    <para>After having mounted your installation partition to
-    <code>/mnt</code>, you must mount the <code>boot</code> partition
-    to <code>/mnt/boot</code>.</para>
-  </listitem>
-  <listitem>
-    <para>You may want to look at the options starting with
-    <option>boot.loader.efi</option> and <option>boot.loader.gummiboot</option>
-    as well.</para>
-  </listitem>
-  <listitem>
-    <para>To see console messages during early boot, add <literal>"fbcon"</literal>
-    to your <option>boot.initrd.kernelModules</option>.</para>
-  </listitem>
-</itemizedlist>
-</para>
-
-</section>
-
-<section>
-
-<title xml:id="sec-booting-from-usb">Booting from a USB stick</title>
-
-<para>For systems without CD drive, the NixOS livecd can be booted from
-a usb stick. For non-UEFI installations,
-<link xlink:href="http://unetbootin.sourceforge.net/">unetbootin</link>
-will work. For UEFI installations, you should mount the ISO, copy its contents
-verbatim to your drive, then either:
-
-<itemizedlist>
-  <listitem>
-    <para>Change the label of the disk partition to the label of the ISO
-    (visible with the blkid command), or</para>
-  </listitem>
-  <listitem>
-    <para>Edit <filename>loader/entries/nixos-livecd.conf</filename> on the drive
-    and change the <literal>root=</literal> field in the <literal>options</literal>
-    line to point to your drive (see the documentation on <literal>root=</literal>
-    in <link xlink:href="https://www.kernel.org/doc/Documentation/kernel-parameters.txt">
-    the kernel documentation</link> for more details).</para>
-  </listitem>
-</itemizedlist>
-</para>
-</section>
-
-</section>
-
-
-<!--===============================================================-->
-
-<section xml:id="sec-changing-config">
-
-<title>Changing the configuration</title>
-
-<para>The file <filename>/etc/nixos/configuration.nix</filename>
-contains the current configuration of your machine.  Whenever you’ve
-changed something to that file, you should do
-
-<screen>
-$ nixos-rebuild switch</screen>
-
-to build the new configuration, make it the default configuration for
-booting, and try to realise the configuration in the running system
-(e.g., by restarting system services).</para>
-
-<warning><para>These commands must be executed as root, so you should
-either run them from a root shell or by prefixing them with
-<literal>sudo -i</literal>.</para></warning>
-
-<para>You can also do
-
-<screen>
-$ nixos-rebuild test</screen>
-
-to build the configuration and switch the running system to it, but
-without making it the boot default.  So if (say) the configuration
-locks up your machine, you can just reboot to get back to a working
-configuration.</para>
-
-<para>There is also
-
-<screen>
-$ nixos-rebuild boot</screen>
-
-to build the configuration and make it the boot default, but not
-switch to it now (so it will only take effect after the next
-reboot).</para>
-
-<para>You can make your configuration show up in a different submenu
-of the GRUB 2 boot screen by giving it a different <emphasis>profile
-name</emphasis>, e.g.
-
-<screen>
-$ nixos-rebuild switch -p test </screen>
-
-which causes the new configuration (and previous ones created using
-<literal>-p test</literal>) to show up in the GRUB submenu “NixOS -
-Profile 'test'”.  This can be useful to separate test configurations
-from “stable” configurations.</para>
-
-<para>Finally, you can do
-
-<screen>
-$ nixos-rebuild build</screen>
-
-to build the configuration but nothing more.  This is useful to see
-whether everything compiles cleanly.</para>
-
-<para>If you have a machine that supports hardware virtualisation, you
-can also test the new configuration in a sandbox by building and
-running a QEMU <emphasis>virtual machine</emphasis> that contains the
-desired configuration.  Just do
-
-<screen>
-$ nixos-rebuild build-vm
-$ ./result/bin/run-*-vm
-</screen>
-
-The VM does not have any data from your host system, so your existing
-user accounts and home directories will not be available.  You can
-forward ports on the host to the guest.  For instance, the following
-will forward host port 2222 to guest port 22 (SSH):
-
-<screen>
-$ QEMU_NET_OPTS="hostfwd=tcp::2222-:22" ./result/bin/run-*-vm
-</screen>
-
-allowing you to log in via SSH (assuming you have set the appropriate
-passwords or SSH authorized keys):
-
-<screen>
-$ ssh -p 2222 localhost
-</screen>
-
-</para>
-
-</section>
-
-
-<!--===============================================================-->
-
-<section xml:id="sec-upgrading">
-
-<title>Upgrading NixOS</title>
-
-<para>The best way to keep your NixOS installation up to date is to
-use one of the NixOS <emphasis>channels</emphasis>.  A channel is a
-Nix mechanism for distributing Nix expressions and associated
-binaries.  The NixOS channels are updated automatically from NixOS’s
-Git repository after certain tests have passed and all packages have
-been built.  These channels are:
-
-<itemizedlist>
-  <listitem>
-    <para>Stable channels, such as <literal
-    xlink:href="http://nixos.org/channels/nixos-14.04">nixos-14.04</literal>.
-    These only get conservative bug fixes and package upgrades.  For
-    instance, a channel update may cause the Linux kernel on your
-    system to be upgraded from 3.4.66 to 3.4.67 (a minor bug fix), but
-    not from 3.4.<replaceable>x</replaceable> to
-    3.11.<replaceable>x</replaceable> (a major change that has the
-    potential to break things).  Stable channels are generally
-    maintained until the next stable branch is created.</para>
-  </listitem>
-  <listitem>
-    <para>The unstable channel, <literal
-    xlink:href="http://nixos.org/channels/nixos-unstable">nixos-unstable</literal>.
-    This corresponds to NixOS’s main development branch, and may thus
-    see radical changes between channel updates.  It’s not recommended
-    for production systems.</para>
-  </listitem>
-</itemizedlist>
-
-To see what channels are available, go to <link
-xlink:href="http://nixos.org/channels"/>.  (Note that the URIs of the
-various channels redirect to a directory that contains the channel’s
-latest version and includes ISO images and VirtualBox
-appliances.)</para>
-
-<para>When you first install NixOS, you’re automatically subscribed to
-the NixOS channel that corresponds to your installation source.   For
-instance, if you installed from a 14.04 ISO, you will be subscribed to
-the <literal>nixos-14.04</literal> channel.  To see which NixOS
-channel you’re subscribed to, run the following as root:
-
-<screen>
-$ nix-channel --list | grep nixos
-nixos https://nixos.org/channels/nixos-unstable
-</screen>
-
-To switch to a different NixOS channel, do
-
-<screen>
-$ nix-channel --add http://nixos.org/channels/<replaceable>channel-name</replaceable> nixos
-</screen>
-
-(Be sure to include the <literal>nixos</literal> parameter at the
-end.)  For instance, to use the NixOS 14.04 stable channel:
-
-<screen>
-$ nix-channel --add http://nixos.org/channels/nixos-14.04 nixos
-</screen>
-
-But it you want to live on the bleeding edge:
-
-<screen>
-$ nix-channel --add http://nixos.org/channels/nixos-unstable nixos
-</screen>
-
-</para>
-
-<para>You can then upgrade NixOS to the latest version in your chosen
-channel by running
-
-<screen>
-$ nixos-rebuild switch --upgrade
-</screen>
-
-which is equivalent to the more verbose <literal>nix-channel --update
-nixos; nixos-rebuild switch</literal>.</para>
-
-<warning><para>It is generally safe to switch back and forth between
-channels.  The only exception is that a newer NixOS may also have a
-newer Nix version, which may involve an upgrade of Nix’s database
-schema.  This cannot be undone easily, so in that case you will not be
-able to go back to your original channel.</para></warning>
-
-</section>
-
-</chapter>
diff --git a/nixos/doc/manual/installation/changing-config.xml b/nixos/doc/manual/installation/changing-config.xml
new file mode 100644
index 000000000000..aa31742434e4
--- /dev/null
+++ b/nixos/doc/manual/installation/changing-config.xml
@@ -0,0 +1,90 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         version="5.0"
+         xml:id="sec-changing-config">
+
+<title>Changing the Configuration</title>
+
+<para>The file <filename>/etc/nixos/configuration.nix</filename>
+contains the current configuration of your machine.  Whenever you’ve
+changed something to that file, you should do
+
+<screen>
+$ nixos-rebuild switch</screen>
+
+to build the new configuration, make it the default configuration for
+booting, and try to realise the configuration in the running system
+(e.g., by restarting system services).</para>
+
+<warning><para>These commands must be executed as root, so you should
+either run them from a root shell or by prefixing them with
+<literal>sudo -i</literal>.</para></warning>
+
+<para>You can also do
+
+<screen>
+$ nixos-rebuild test</screen>
+
+to build the configuration and switch the running system to it, but
+without making it the boot default.  So if (say) the configuration
+locks up your machine, you can just reboot to get back to a working
+configuration.</para>
+
+<para>There is also
+
+<screen>
+$ nixos-rebuild boot</screen>
+
+to build the configuration and make it the boot default, but not
+switch to it now (so it will only take effect after the next
+reboot).</para>
+
+<para>You can make your configuration show up in a different submenu
+of the GRUB 2 boot screen by giving it a different <emphasis>profile
+name</emphasis>, e.g.
+
+<screen>
+$ nixos-rebuild switch -p test </screen>
+
+which causes the new configuration (and previous ones created using
+<literal>-p test</literal>) to show up in the GRUB submenu “NixOS -
+Profile 'test'”.  This can be useful to separate test configurations
+from “stable” configurations.</para>
+
+<para>Finally, you can do
+
+<screen>
+$ nixos-rebuild build</screen>
+
+to build the configuration but nothing more.  This is useful to see
+whether everything compiles cleanly.</para>
+
+<para>If you have a machine that supports hardware virtualisation, you
+can also test the new configuration in a sandbox by building and
+running a QEMU <emphasis>virtual machine</emphasis> that contains the
+desired configuration.  Just do
+
+<screen>
+$ nixos-rebuild build-vm
+$ ./result/bin/run-*-vm
+</screen>
+
+The VM does not have any data from your host system, so your existing
+user accounts and home directories will not be available.  You can
+forward ports on the host to the guest.  For instance, the following
+will forward host port 2222 to guest port 22 (SSH):
+
+<screen>
+$ QEMU_NET_OPTS="hostfwd=tcp::2222-:22" ./result/bin/run-*-vm
+</screen>
+
+allowing you to log in via SSH (assuming you have set the appropriate
+passwords or SSH authorized keys):
+
+<screen>
+$ ssh -p 2222 localhost
+</screen>
+
+</para>
+
+</chapter>
diff --git a/nixos/doc/manual/installation/installation.xml b/nixos/doc/manual/installation/installation.xml
new file mode 100644
index 000000000000..ee61bedc4183
--- /dev/null
+++ b/nixos/doc/manual/installation/installation.xml
@@ -0,0 +1,21 @@
+<part xmlns="http://docbook.org/ns/docbook"
+      xmlns:xlink="http://www.w3.org/1999/xlink"
+      xmlns:xi="http://www.w3.org/2001/XInclude"
+      version="5.0"
+      xml:id="ch-installation">
+
+<title>Installation</title>
+
+<partintro>
+
+<para>This section describes how to obtain, install, and configure
+NixOS for first-time use.</para>
+
+</partintro>
+
+<xi:include href="obtaining.xml" />
+<xi:include href="installing.xml" />
+<xi:include href="changing-config.xml" />
+<xi:include href="upgrading.xml" />
+
+</part>
diff --git a/nixos/doc/manual/installation/installing-UEFI.xml b/nixos/doc/manual/installation/installing-UEFI.xml
new file mode 100644
index 000000000000..dbd5606c4a56
--- /dev/null
+++ b/nixos/doc/manual/installation/installing-UEFI.xml
@@ -0,0 +1,51 @@
+<section xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="sec-uefi-installation">
+
+<title>UEFI Installation</title>
+    
+<para>NixOS can also be installed on UEFI systems.  The procedure
+is by and large the same as a BIOS installation, with the following
+changes:
+
+<itemizedlist>
+  <listitem>
+    <para>You should boot the live CD in UEFI mode (consult your
+    specific hardware's documentation for instructions). You may find
+    the <link
+    xlink:href="http://www.rodsbooks.com/refind">rEFInd
+    boot manager</link> useful.</para>
+  </listitem>
+  <listitem>
+    <para>Instead of <command>fdisk</command>, you should use
+    <command>gdisk</command> to partition your disks. You will need to
+    have a separate partition for <filename>/boot</filename> with
+    partition code EF00, and it should be formatted as a
+    <literal>vfat</literal> filesystem.</para>
+  </listitem>
+  <listitem>
+    <para>You must set <option>boot.loader.gummiboot.enable</option> to
+    <literal>true</literal>. <command>nixos-generate-config</command>
+    should do this automatically for new configurations when booted in
+    UEFI mode.</para>
+  </listitem>
+  <listitem>
+    <para>After having mounted your installation partition to
+    <code>/mnt</code>, you must mount the <code>boot</code> partition
+    to <code>/mnt/boot</code>.</para>
+  </listitem>
+  <listitem>
+    <para>You may want to look at the options starting with
+    <option>boot.loader.efi</option> and <option>boot.loader.gummiboot</option>
+    as well.</para>
+  </listitem>
+  <listitem>
+    <para>To see console messages during early boot, add <literal>"fbcon"</literal>
+    to your <option>boot.initrd.kernelModules</option>.</para>
+  </listitem>
+</itemizedlist>
+</para>
+
+</section>
diff --git a/nixos/doc/manual/installation/installing-USB.xml b/nixos/doc/manual/installation/installing-USB.xml
new file mode 100644
index 000000000000..97e3d2eaa1c0
--- /dev/null
+++ b/nixos/doc/manual/installation/installing-USB.xml
@@ -0,0 +1,30 @@
+<section xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="sec-booting-from-usb">
+
+<title>Booting from a USB Drive</title>
+
+<para>For systems without CD drive, the NixOS livecd can be booted from
+a usb stick. For non-UEFI installations,
+<link xlink:href="http://unetbootin.sourceforge.net/">unetbootin</link>
+will work. For UEFI installations, you should mount the ISO, copy its contents
+verbatim to your drive, then either:
+
+<itemizedlist>
+  <listitem>
+    <para>Change the label of the disk partition to the label of the ISO
+    (visible with the blkid command), or</para>
+  </listitem>
+  <listitem>
+    <para>Edit <filename>loader/entries/nixos-livecd.conf</filename> on the drive
+    and change the <literal>root=</literal> field in the <literal>options</literal>
+    line to point to your drive (see the documentation on <literal>root=</literal>
+    in <link xlink:href="https://www.kernel.org/doc/Documentation/kernel-parameters.txt">
+    the kernel documentation</link> for more details).</para>
+  </listitem>
+</itemizedlist>
+</para>
+
+</section>
diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml
new file mode 100644
index 000000000000..793b503ad97a
--- /dev/null
+++ b/nixos/doc/manual/installation/installing.xml
@@ -0,0 +1,264 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+            xmlns:xlink="http://www.w3.org/1999/xlink"
+            xmlns:xi="http://www.w3.org/2001/XInclude"
+            version="5.0"
+            xml:id="sec-installation">
+
+<title>Installing NixOS</title>
+
+<orderedlist>
+
+  <listitem><para>Boot from the CD.</para></listitem>
+
+  <listitem><para>The CD contains a basic NixOS installation.  (It
+  also contains Memtest86+, useful if you want to test new hardware.)
+  When it’s finished booting, it should have detected most of your
+  hardware and brought up networking (check
+  <command>ifconfig</command>).  Networking is necessary for the
+  installer, since it will download lots of stuff (such as source
+  tarballs or Nixpkgs channel binaries).  It’s best if you have a DHCP
+  server on your network.  Otherwise configure networking manually
+  using <command>ifconfig</command>.</para></listitem>
+
+  <listitem><para>The NixOS manual is available on virtual console 8
+  (press Alt+F8 to access).</para></listitem>
+
+  <listitem><para>Login as <literal>root</literal> and the empty
+  password.</para></listitem>
+
+  <listitem><para>If you downloaded the graphical ISO image, you can
+  run <command>start display-manager</command> to start KDE.</para></listitem>
+
+  <listitem><para>The NixOS installer doesn’t do any partitioning or
+  formatting yet, so you need to that yourself.  Use the following
+  commands:
+
+  <itemizedlist>
+
+    <listitem><para>For partitioning:
+    <command>fdisk</command>.</para></listitem>
+
+    <listitem><para>For initialising Ext4 partitions:
+    <command>mkfs.ext4</command>.  It is recommended that you assign a
+    unique symbolic label to the file system using the option
+    <option>-L <replaceable>label</replaceable></option>, since this
+    makes the file system configuration independent from device
+    changes.  For example:
+
+<screen>
+$ mkfs.ext4 -L nixos /dev/sda1</screen>
+
+    </para></listitem>
+
+    <listitem><para>For creating swap partitions:
+    <command>mkswap</command>.  Again it’s recommended to assign a
+    label to the swap partition: <option>-L
+    <replaceable>label</replaceable></option>.</para></listitem>
+
+    <listitem><para>For creating LVM volumes, the LVM commands, e.g.,
+
+<screen>
+$ pvcreate /dev/sda1 /dev/sdb1
+$ vgcreate MyVolGroup /dev/sda1 /dev/sdb1
+$ lvcreate --size 2G --name bigdisk MyVolGroup
+$ lvcreate --size 1G --name smalldisk MyVolGroup</screen>
+
+    </para></listitem>
+
+    <listitem><para>For creating software RAID devices, use
+    <command>mdadm</command>.</para></listitem>
+
+  </itemizedlist>
+
+  </para></listitem>
+
+  <listitem><para>Mount the target file system on which NixOS should
+  be installed on <filename>/mnt</filename>, e.g.
+
+<screen>
+$ mount /dev/disk/by-label/nixos /mnt
+</screen>
+
+  </para></listitem>
+
+  <listitem><para>If your machine has a limited amount of memory, you
+  may want to activate swap devices now (<command>swapon
+  <replaceable>device</replaceable></command>).  The installer (or
+  rather, the build actions that it may spawn) may need quite a bit of
+  RAM, depending on your configuration.</para></listitem>
+
+  <listitem>
+
+    <para>You now need to create a file
+    <filename>/mnt/etc/nixos/configuration.nix</filename> that
+    specifies the intended configuration of the system.  This is
+    because NixOS has a <emphasis>declarative</emphasis> configuration
+    model: you create or edit a description of the desired
+    configuration of your system, and then NixOS takes care of making
+    it happen.  The syntax of the NixOS configuration file is
+    described in <xref linkend="sec-configuration-syntax"/>, while a
+    list of available configuration options appears in <xref
+    linkend="ch-options"/>.  A minimal example is shown in <xref
+    linkend="ex-config"/>.</para>
+
+    <para>The command <command>nixos-generate-config</command> can
+    generate an initial configuration file for you:
+
+<screen>
+$ nixos-generate-config --root /mnt</screen>
+
+    You should then edit
+    <filename>/mnt/etc/nixos/configuration.nix</filename> to suit your
+    needs:
+
+<screen>
+$ nano /mnt/etc/nixos/configuration.nix
+</screen>
+
+    The <command>vim</command> text editor is also available.</para>
+
+    <para>You <emphasis>must</emphasis> set the option
+    <option>boot.loader.grub.device</option> to specify on which disk
+    the GRUB boot loader is to be installed.  Without it, NixOS cannot
+    boot.</para>
+
+    <para>Another critical option is <option>fileSystems</option>,
+    specifying the file systems that need to be mounted by NixOS.
+    However, you typically don’t need to set it yourself, because
+    <command>nixos-generate-config</command> sets it automatically in
+    <filename>/mnt/etc/nixos/hardware-configuration.nix</filename>
+    from your currently mounted file systems.  (The configuration file
+    <filename>hardware-configuration.nix</filename> is included from
+    <filename>configuration.nix</filename> and will be overwritten by
+    future invocations of <command>nixos-generate-config</command>;
+    thus, you generally should not modify it.)</para>
+
+    <note><para>Depending on your hardware configuration or type of
+    file system, you may need to set the option
+    <option>boot.initrd.kernelModules</option> to include the kernel
+    modules that are necessary for mounting the root file system,
+    otherwise the installed system will not be able to boot.  (If this
+    happens, boot from the CD again, mount the target file system on
+    <filename>/mnt</filename>, fix
+    <filename>/mnt/etc/nixos/configuration.nix</filename> and rerun
+    <filename>nixos-install</filename>.)  In most cases,
+    <command>nixos-generate-config</command> will figure out the
+    required modules.</para></note>
+
+    <para>Examples of real-world NixOS configuration files can be
+    found at <link
+    xlink:href="https://nixos.org/repos/nix/configurations/trunk/"/>.</para>
+
+  </listitem>
+
+  <listitem><para>Do the installation:
+
+<screen>
+$ nixos-install</screen>
+
+    Cross fingers.  If this fails due to a temporary problem (such as
+    a network issue while downloading binaries from the NixOS binary
+    cache), you can just re-run <command>nixos-install</command>.
+    Otherwise, fix your <filename>configuration.nix</filename> and
+    then re-run <command>nixos-install</command>.</para>
+
+    <para>As the last step, <command>nixos-install</command> will ask
+    you to set the password for the <literal>root</literal> user, e.g.
+
+<screen>
+setting root password...
+Enter new UNIX password: ***
+Retype new UNIX password: ***
+</screen>
+
+    </para>
+
+  </listitem>
+
+  <listitem><para>If everything went well:
+
+<screen>
+$ reboot</screen>
+
+  </para></listitem>
+
+  <listitem>
+
+    <para>You should now be able to boot into the installed NixOS. The GRUB boot menu shows a list
+                of <emphasis>available configurations</emphasis> (initially just one). Every time
+                you change the NixOS configuration (see<link linkend="sec-changing-config">Changing
+                    Configuration</link> ), a new item appears in the menu. This allows you to
+                easily roll back to another configuration if something goes wrong.</para>
+
+    <para>You should log in and change the <literal>root</literal>
+    password with <command>passwd</command>.</para>
+
+    <para>You’ll probably want to create some user accounts as well,
+    which can be done with <command>useradd</command>:
+
+<screen>
+$ useradd -c 'Eelco Dolstra' -m eelco
+$ passwd eelco</screen>
+
+    </para>
+
+    <para>You may also want to install some software.  For instance,
+
+<screen>
+$ nix-env -qa \*</screen>
+
+    shows what packages are available, and
+
+<screen>
+$ nix-env -i w3m</screen>
+
+    install the <literal>w3m</literal> browser.</para>
+
+  </listitem>
+
+</orderedlist>
+
+<para>To summarise, <xref linkend="ex-install-sequence" /> shows a
+typical sequence of commands for installing NixOS on an empty hard
+drive (here <filename>/dev/sda</filename>).  <xref linkend="ex-config"
+/> shows a corresponding configuration Nix expression.</para>
+
+<example xml:id='ex-install-sequence'><title>Commands for Installing NixOS on <filename>/dev/sda</filename></title>
+<screen>
+$ fdisk /dev/sda # <lineannotation>(or whatever device you want to install on)</lineannotation>
+$ mkfs.ext4 -L nixos /dev/sda1
+$ mkswap -L swap /dev/sda2
+$ swapon /dev/sda2
+$ mount /dev/disk/by-label/nixos /mnt
+$ nixos-generate-config --root /mnt
+$ nano /mnt/etc/nixos/configuration.nix
+$ nixos-install
+$ reboot</screen>
+</example>
+
+<example xml:id='ex-config'><title>NixOS Configuration</title>
+<screen>
+{ config, pkgs, ... }:
+
+{
+  imports =
+    [ # Include the results of the hardware scan.
+      ./hardware-configuration.nix
+    ];
+
+  boot.loader.grub.device = "/dev/sda";
+
+  # Note: setting fileSystems is generally not
+  # necessary, since nixos-generate-config figures them out
+  # automatically in hardware-configuration.nix.
+  #fileSystems."/".device = "/dev/disk/by-label/nixos";
+
+  # Enable the OpenSSH server.
+  services.sshd.enable = true;
+}</screen>
+</example>
+
+<xi:include href="installing-UEFI.xml" />
+<xi:include href="installing-USB.xml" />
+
+</chapter>
diff --git a/nixos/doc/manual/installation/obtaining.xml b/nixos/doc/manual/installation/obtaining.xml
new file mode 100644
index 000000000000..ceeeb5c0ac09
--- /dev/null
+++ b/nixos/doc/manual/installation/obtaining.xml
@@ -0,0 +1,44 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="sec-obtaining">
+
+<title>Obtaining NixOS</title>
+
+<para>NixOS ISO images can be downloaded from the <link
+xlink:href="http://nixos.org/nixos/download.html">NixOS
+homepage</link>.  These can be burned onto a CD.  It is also possible
+to copy them onto a USB stick and install NixOS from there.  For
+details, see the <link
+xlink:href="https://nixos.org/wiki/Installing_NixOS_from_a_USB_stick">NixOS
+Wiki</link>.</para>
+
+<para>As an alternative to installing NixOS yourself, you can get a
+running NixOS system through several other means:
+
+<itemizedlist>
+  <listitem>
+    <para>Using virtual appliances in Open Virtualization Format (OVF)
+    that can be imported into VirtualBox.  These are available from
+    the <link xlink:href="http://nixos.org/nixos/download.html">NixOS
+    homepage</link>.</para>
+  </listitem>
+  <listitem>
+    <para>Using AMIs for Amazon’s EC2.  To find one for your region
+    and instance type, please refer to the <link
+    xlink:href="https://github.com/NixOS/nixops/blob/master/nix/ec2-amis.nix">list
+    of most recent AMIs</link>.</para>
+  </listitem>
+  <listitem>
+    <para>Using NixOps, the NixOS-based cloud deployment tool, which
+    allows you to provision VirtualBox and EC2 NixOS instances from
+    declarative specifications.  Check out the <link
+    xlink:href="https://github.com/NixOS/nixops">NixOps
+    homepage</link> for details.</para>
+  </listitem>
+</itemizedlist>
+
+</para>
+
+</chapter>
diff --git a/nixos/doc/manual/installation/upgrading.xml b/nixos/doc/manual/installation/upgrading.xml
new file mode 100644
index 000000000000..ed71a7e23a30
--- /dev/null
+++ b/nixos/doc/manual/installation/upgrading.xml
@@ -0,0 +1,90 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         version="5.0"
+         xml:id="sec-upgrading">
+
+<title>Upgrading NixOS</title>
+
+<para>The best way to keep your NixOS installation up to date is to
+use one of the NixOS <emphasis>channels</emphasis>.  A channel is a
+Nix mechanism for distributing Nix expressions and associated
+binaries.  The NixOS channels are updated automatically from NixOS’s
+Git repository after certain tests have passed and all packages have
+been built.  These channels are:
+
+<itemizedlist>
+  <listitem>
+    <para>Stable channels, such as <literal
+    xlink:href="http://nixos.org/channels/nixos-14.04">nixos-14.04</literal>.
+    These only get conservative bug fixes and package upgrades.  For
+    instance, a channel update may cause the Linux kernel on your
+    system to be upgraded from 3.4.66 to 3.4.67 (a minor bug fix), but
+    not from 3.4.<replaceable>x</replaceable> to
+    3.11.<replaceable>x</replaceable> (a major change that has the
+    potential to break things).  Stable channels are generally
+    maintained until the next stable branch is created.</para>
+  </listitem>
+  <listitem>
+    <para>The unstable channel, <literal
+    xlink:href="http://nixos.org/channels/nixos-unstable">nixos-unstable</literal>.
+    This corresponds to NixOS’s main development branch, and may thus
+    see radical changes between channel updates.  It’s not recommended
+    for production systems.</para>
+  </listitem>
+</itemizedlist>
+
+To see what channels are available, go to <link
+xlink:href="http://nixos.org/channels"/>.  (Note that the URIs of the
+various channels redirect to a directory that contains the channel’s
+latest version and includes ISO images and VirtualBox
+appliances.)</para>
+
+<para>When you first install NixOS, you’re automatically subscribed to
+the NixOS channel that corresponds to your installation source.   For
+instance, if you installed from a 14.04 ISO, you will be subscribed to
+the <literal>nixos-14.04</literal> channel.  To see which NixOS
+channel you’re subscribed to, run the following as root:
+
+<screen>
+$ nix-channel --list | grep nixos
+nixos https://nixos.org/channels/nixos-unstable
+</screen>
+
+To switch to a different NixOS channel, do
+
+<screen>
+$ nix-channel --add http://nixos.org/channels/<replaceable>channel-name</replaceable> nixos
+</screen>
+
+(Be sure to include the <literal>nixos</literal> parameter at the
+end.)  For instance, to use the NixOS 14.04 stable channel:
+
+<screen>
+$ nix-channel --add http://nixos.org/channels/nixos-14.04 nixos
+</screen>
+
+But it you want to live on the bleeding edge:
+
+<screen>
+$ nix-channel --add http://nixos.org/channels/nixos-unstable nixos
+</screen>
+
+</para>
+
+<para>You can then upgrade NixOS to the latest version in your chosen
+channel by running
+
+<screen>
+$ nixos-rebuild switch --upgrade
+</screen>
+
+which is equivalent to the more verbose <literal>nix-channel --update
+nixos; nixos-rebuild switch</literal>.</para>
+
+<warning><para>It is generally safe to switch back and forth between
+channels.  The only exception is that a newer NixOS may also have a
+newer Nix version, which may involve an upgrade of Nix’s database
+schema.  This cannot be undone easily, so in that case you will not be
+able to go back to your original channel.</para></warning>
+
+</chapter>
diff --git a/nixos/doc/manual/manual.xml b/nixos/doc/manual/manual.xml
index f51a04cdf25b..a3ad76209ac8 100644
--- a/nixos/doc/manual/manual.xml
+++ b/nixos/doc/manual/manual.xml
@@ -1,15 +1,14 @@
 <book xmlns="http://docbook.org/ns/docbook"
       xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude">
-
+      xmlns:xi="http://www.w3.org/2001/XInclude"
+      version="5.0"
+      xml:id="NixOSManual">
+  
   <info>
-
     <title>NixOS Manual</title>
     <subtitle>Version <xi:include href="version" parse="text" /></subtitle>
-
   </info>
 
-
   <preface>
     <title>Preface</title>
 
@@ -29,19 +28,14 @@
 
   </preface>
 
-
-  <xi:include href="installation.xml" />
-  <xi:include href="configuration.xml" />
-  <xi:include href="running.xml" />
+  <xi:include href="installation/installation.xml" />
+  <xi:include href="configuration/configuration.xml" />
+  <xi:include href="administration/running.xml" />
   <!-- <xi:include href="userconfiguration.xml" /> -->
-  <xi:include href="troubleshooting.xml" />
-  <xi:include href="containers.xml" />
-  <xi:include href="development.xml" />
-
-  <xi:include href="release-notes.xml" />
+  <xi:include href="release-notes/release-notes.xml" />
 
   <appendix xml:id="ch-options">
-    <title>Configuration options</title>
+    <title>Configuration Options</title>
     <xi:include href="options-db.xml" />
   </appendix>
 
diff --git a/nixos/doc/manual/release-notes/release-notes.xml b/nixos/doc/manual/release-notes/release-notes.xml
new file mode 100644
index 000000000000..fb82d5adcefb
--- /dev/null
+++ b/nixos/doc/manual/release-notes/release-notes.xml
@@ -0,0 +1,17 @@
+<part   xmlns="http://docbook.org/ns/docbook"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        version="5.0"
+        xml:id="ch-release-notes">
+
+<title>Release Notes</title>
+
+<partintro>
+<para>This section lists the release notes for each stable version of NixOS.</para>
+</partintro>
+
+<xi:include href="rl-1410.xml" />
+<xi:include href="rl-1404.xml" />
+<xi:include href="rl-1310.xml" />
+
+</part>
diff --git a/nixos/doc/manual/release-notes/rl-1310.xml b/nixos/doc/manual/release-notes/rl-1310.xml
new file mode 100644
index 000000000000..234fb5a643f6
--- /dev/null
+++ b/nixos/doc/manual/release-notes/rl-1310.xml
@@ -0,0 +1,11 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        version="5.0"
+        xml:id="sec-release-13.10">
+
+<title>Release 13.10 (“Aardvark”, 2013/10/31)</title>
+
+<para>This is the first stable release branch of NixOS.</para>
+
+</chapter>
\ No newline at end of file
diff --git a/nixos/doc/manual/release-notes.xml b/nixos/doc/manual/release-notes/rl-1404.xml
similarity index 83%
rename from nixos/doc/manual/release-notes.xml
rename to nixos/doc/manual/release-notes/rl-1404.xml
index 52e88bb4c861..74af1ed12741 100644
--- a/nixos/doc/manual/release-notes.xml
+++ b/nixos/doc/manual/release-notes/rl-1404.xml
@@ -1,34 +1,8 @@
-<appendix xmlns="http://docbook.org/ns/docbook"
-          xmlns:xlink="http://www.w3.org/1999/xlink"
-          xml:id="ch-release-notes">
-
-<title>Release notes</title>
-
-<!--==================================================================-->
-
-<section xml:id="sec-release-14.10">
-
-<title>Release 14.10 (“Caterpillar”, 2014/10/??)</title>
-
-<para>When upgrading from a previous release, please be aware of the
-following incompatible changes:
-
-<itemizedlist>
-
-  <listitem><para>The host side of a container virtual Ethernet pair
-  is now called <literal>ve-<replaceable>container-name</replaceable></literal>
-  rather than <literal>c-<replaceable>container-name</replaceable></literal>.</para></listitem>
-
-</itemizedlist>
-
-</para>
-
-</section>
-
-
-<!--==================================================================-->
-
-<section xml:id="sec-release-14.04">
+<chapter xmlns="http://docbook.org/ns/docbook"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        version="5.0"
+        xml:id="sec-release-14.04">
 
 <title>Release 14.04 (“Baboon”, 2014/04/30)</title>
 
@@ -183,16 +157,4 @@ networking.firewall.enable = false;
 
 </para>
 
-</section>
-
-<!--==================================================================-->
-
-<section xml:id="sec-release-13.10">
-
-<title>Release 13.10 (“Aardvark”, 2013/10/31)</title>
-
-<para>This is the first stable release branch of NixOS.</para>
-
-</section>
-
-</appendix>
+</chapter>
\ No newline at end of file
diff --git a/nixos/doc/manual/release-notes/rl-1410.xml b/nixos/doc/manual/release-notes/rl-1410.xml
new file mode 100644
index 000000000000..09da15ce2361
--- /dev/null
+++ b/nixos/doc/manual/release-notes/rl-1410.xml
@@ -0,0 +1,22 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        version="5.0"
+        xml:id="sec-release-14.10">
+
+<title>Release 14.10 (“Caterpillar”, 2014/10/??)</title>
+
+<para>When upgrading from a previous release, please be aware of the
+following incompatible changes:
+
+<itemizedlist>
+
+  <listitem><para>The host side of a container virtual Ethernet pair
+  is now called <literal>ve-<replaceable>container-name</replaceable></literal>
+  rather than <literal>c-<replaceable>container-name</replaceable></literal>.</para></listitem>
+
+</itemizedlist>
+
+</para>
+
+</chapter>
\ No newline at end of file
diff --git a/nixos/doc/manual/running.xml b/nixos/doc/manual/running.xml
deleted file mode 100644
index e1a358df2aac..000000000000
--- a/nixos/doc/manual/running.xml
+++ /dev/null
@@ -1,369 +0,0 @@
-<chapter xmlns="http://docbook.org/ns/docbook"
-         xmlns:xlink="http://www.w3.org/1999/xlink"
-         xml:id="ch-running">
-
-<title>Running NixOS</title>
-
-<para>This chapter describes various aspects of managing a running
-NixOS system, such as how to use the <command>systemd</command>
-service manager.</para>
-
-
-<!--===============================================================-->
-
-<section xml:id="sec-systemctl"><title>Service management</title>
-
-<para>In NixOS, all system services are started and monitored using
-the systemd program.  Systemd is the “init” process of the system
-(i.e. PID 1), the parent of all other processes.  It manages a set of
-so-called “units”, which can be things like system services
-(programs), but also mount points, swap files, devices, targets
-(groups of units) and more.  Units can have complex dependencies; for
-instance, one unit can require that another unit must be successfully
-started before the first unit can be started.  When the system boots,
-it starts a unit named <literal>default.target</literal>; the
-dependencies of this unit cause all system services to be started,
-file systems to be mounted, swap files to be activated, and so
-on.</para>
-
-<para>The command <command>systemctl</command> is the main way to
-interact with <command>systemd</command>.  Without any arguments, it
-shows the status of active units:
-
-<screen>
-$ systemctl
--.mount          loaded active mounted   /
-swapfile.swap    loaded active active    /swapfile
-sshd.service     loaded active running   SSH Daemon
-graphical.target loaded active active    Graphical Interface
-<replaceable>...</replaceable>
-</screen>
-
-</para>
-
-<para>You can ask for detailed status information about a unit, for
-instance, the PostgreSQL database service:
-
-<screen>
-$ systemctl status postgresql.service
-postgresql.service - PostgreSQL Server
-          Loaded: loaded (/nix/store/pn3q73mvh75gsrl8w7fdlfk3fq5qm5mw-unit/postgresql.service)
-          Active: active (running) since Mon, 2013-01-07 15:55:57 CET; 9h ago
-        Main PID: 2390 (postgres)
-          CGroup: name=systemd:/system/postgresql.service
-                  ├─2390 postgres
-                  ├─2418 postgres: writer process
-                  ├─2419 postgres: wal writer process
-                  ├─2420 postgres: autovacuum launcher process
-                  ├─2421 postgres: stats collector process
-                  └─2498 postgres: zabbix zabbix [local] idle
-
-Jan 07 15:55:55 hagbard postgres[2394]: [1-1] LOG:  database system was shut down at 2013-01-07 15:55:05 CET
-Jan 07 15:55:57 hagbard postgres[2390]: [1-1] LOG:  database system is ready to accept connections
-Jan 07 15:55:57 hagbard postgres[2420]: [1-1] LOG:  autovacuum launcher started
-Jan 07 15:55:57 hagbard systemd[1]: Started PostgreSQL Server.
-</screen>
-
-Note that this shows the status of the unit (active and running), all
-the processes belonging to the service, as well as the most recent log
-messages from the service.
-
-</para>
-
-<para>Units can be stopped, started or restarted:
-
-<screen>
-$ systemctl stop postgresql.service
-$ systemctl start postgresql.service
-$ systemctl restart postgresql.service
-</screen>
-
-These operations are synchronous: they wait until the service has
-finished starting or stopping (or has failed).  Starting a unit will
-cause the dependencies of that unit to be started as well (if
-necessary).</para>
-
-<!-- - cgroups: each service and user session is a cgroup
-
-- cgroup resource management -->
-
-</section>
-
-
-<!--===============================================================-->
-
-<section xml:id="sec-rebooting"><title>Rebooting and shutting down</title>
-
-<para>The system can be shut down (and automatically powered off) by
-doing:
-
-<screen>
-$ shutdown
-</screen>
-
-This is equivalent to running <command>systemctl
-poweroff</command>.</para>
-
-<para>To reboot the system, run
-
-<screen>
-$ reboot
-</screen>
-
-which is equivalent to <command>systemctl reboot</command>.
-Alternatively, you can quickly reboot the system using
-<literal>kexec</literal>, which bypasses the BIOS by directly loading
-the new kernel into memory:
-
-<screen>
-$ systemctl kexec
-</screen>
-
-</para>
-
-<para>The machine can be suspended to RAM (if supported) using
-<command>systemctl suspend</command>, and suspended to disk using
-<command>systemctl hibernate</command>.</para>
-
-<para>These commands can be run by any user who is logged in locally,
-i.e. on a virtual console or in X11; otherwise, the user is asked for
-authentication.</para>
-
-</section>
-
-
-<!--===============================================================-->
-
-<section xml:id="sec-user-sessions"><title>User sessions</title>
-
-<para>Systemd keeps track of all users who are logged into the system
-(e.g. on a virtual console or remotely via SSH).  The command
-<command>loginctl</command> allows querying and manipulating user
-sessions.  For instance, to list all user sessions:
-
-<screen>
-$ loginctl
-   SESSION        UID USER             SEAT
-        c1        500 eelco            seat0
-        c3          0 root             seat0
-        c4        500 alice
-</screen>
-
-This shows that two users are logged in locally, while another is
-logged in remotely.  (“Seats” are essentially the combinations of
-displays and input devices attached to the system; usually, there is
-only one seat.)  To get information about a session:
-
-<screen>
-$ loginctl session-status c3
-c3 - root (0)
-           Since: Tue, 2013-01-08 01:17:56 CET; 4min 42s ago
-          Leader: 2536 (login)
-            Seat: seat0; vc3
-             TTY: /dev/tty3
-         Service: login; type tty; class user
-           State: online
-          CGroup: name=systemd:/user/root/c3
-                  ├─ 2536 /nix/store/10mn4xip9n7y9bxqwnsx7xwx2v2g34xn-shadow-4.1.5.1/bin/login --
-                  ├─10339 -bash
-                  └─10355 w3m nixos.org
-</screen>
-
-This shows that the user is logged in on virtual console 3.  It also
-lists the processes belonging to this session.  Since systemd keeps
-track of this, you can terminate a session in a way that ensures that
-all the session’s processes are gone:
-
-<screen>
-$ loginctl terminate-session c3
-</screen>
-
-</para>
-
-</section>
-
-
-<!--===============================================================-->
-
-<section xml:id="sec-cgroups"><title>Control groups</title>
-
-<para>To keep track of the processes in a running system, systemd uses
-<emphasis>control groups</emphasis> (cgroups).  A control group is a
-set of processes used to allocate resources such as CPU, memory or I/O
-bandwidth.  There can be multiple control group hierarchies, allowing
-each kind of resource to be managed independently.</para>
-
-<para>The command <command>systemd-cgls</command> lists all control
-groups in the <literal>systemd</literal> hierarchy, which is what
-systemd uses to keep track of the processes belonging to each service
-or user session:
-
-<screen>
-$ systemd-cgls
-├─user
-│ └─eelco
-│   └─c1
-│     ├─ 2567 -:0
-│     ├─ 2682 kdeinit4: kdeinit4 Running...
-│     ├─ <replaceable>...</replaceable>
-│     └─10851 sh -c less -R
-└─system
-  ├─httpd.service
-  │ ├─2444 httpd -f /nix/store/3pyacby5cpr55a03qwbnndizpciwq161-httpd.conf -DNO_DETACH
-  │ └─<replaceable>...</replaceable>
-  ├─dhcpcd.service
-  │ └─2376 dhcpcd --config /nix/store/f8dif8dsi2yaa70n03xir8r653776ka6-dhcpcd.conf
-  └─ <replaceable>...</replaceable>
-</screen>
-
-Similarly, <command>systemd-cgls cpu</command> shows the cgroups in
-the CPU hierarchy, which allows per-cgroup CPU scheduling priorities.
-By default, every systemd service gets its own CPU cgroup, while all
-user sessions are in the top-level CPU cgroup.  This ensures, for
-instance, that a thousand run-away processes in the
-<literal>httpd.service</literal> cgroup cannot starve the CPU for one
-process in the <literal>postgresql.service</literal> cgroup.  (By
-contrast, it they were in the same cgroup, then the PostgreSQL process
-would get 1/1001 of the cgroup’s CPU time.)  You can limit a service’s
-CPU share in <filename>configuration.nix</filename>:
-
-<programlisting>
-systemd.services.httpd.serviceConfig.CPUShares = 512;
-</programlisting>
-
-By default, every cgroup has 1024 CPU shares, so this will halve the
-CPU allocation of the <literal>httpd.service</literal> cgroup.</para>
-
-<para>There also is a <literal>memory</literal> hierarchy that
-controls memory allocation limits; by default, all processes are in
-the top-level cgroup, so any service or session can exhaust all
-available memory.  Per-cgroup memory limits can be specified in
-<filename>configuration.nix</filename>; for instance, to limit
-<literal>httpd.service</literal> to 512 MiB of RAM (excluding swap)
-and 640 MiB of RAM (including swap):
-
-<programlisting>
-systemd.services.httpd.serviceConfig.MemoryLimit = "512M";
-systemd.services.httpd.serviceConfig.ControlGroupAttribute = [ "memory.memsw.limit_in_bytes 640M" ];
-</programlisting>
-
-</para>
-
-<para>The command <command>systemd-cgtop</command> shows a
-continuously updated list of all cgroups with their CPU and memory
-usage.</para>
-
-</section>
-
-
-<!--===============================================================-->
-
-<section xml:id="sec-logging"><title>Logging</title>
-
-<para>System-wide logging is provided by systemd’s
-<emphasis>journal</emphasis>, which subsumes traditional logging
-daemons such as syslogd and klogd.  Log entries are kept in binary
-files in <filename>/var/log/journal/</filename>.  The command
-<literal>journalctl</literal> allows you to see the contents of the
-journal.  For example,
-
-<screen>
-$ journalctl -b
-</screen>
-
-shows all journal entries since the last reboot.  (The output of
-<command>journalctl</command> is piped into <command>less</command> by
-default.)  You can use various options and match operators to restrict
-output to messages of interest.  For instance, to get all messages
-from PostgreSQL:
-
-<screen>
-$ journalctl -u postgresql.service
--- Logs begin at Mon, 2013-01-07 13:28:01 CET, end at Tue, 2013-01-08 01:09:57 CET. --
-...
-Jan 07 15:44:14 hagbard postgres[2681]: [2-1] LOG:  database system is shut down
--- Reboot --
-Jan 07 15:45:10 hagbard postgres[2532]: [1-1] LOG:  database system was shut down at 2013-01-07 15:44:14 CET
-Jan 07 15:45:13 hagbard postgres[2500]: [1-1] LOG:  database system is ready to accept connections
-</screen>
-
-Or to get all messages since the last reboot that have at least a
-“critical” severity level:
-
-<screen>
-$ journalctl -b -p crit
-Dec 17 21:08:06 mandark sudo[3673]: pam_unix(sudo:auth): auth could not identify password for [alice]
-Dec 29 01:30:22 mandark kernel[6131]: [1053513.909444] CPU6: Core temperature above threshold, cpu clock throttled (total events = 1)
-</screen>
-
-</para>
-
-<para>The system journal is readable by root and by users in the
-<literal>wheel</literal> and <literal>systemd-journal</literal>
-groups.  All users have a private journal that can be read using
-<command>journalctl</command>.</para>
-
-</section>
-
-
-<!--===============================================================-->
-
-<section xml:id="sec-nix-gc"><title>Cleaning up the Nix store</title>
-
-<para>Nix has a purely functional model, meaning that packages are
-never upgraded in place.  Instead new versions of packages end up in a
-different location in the Nix store (<filename>/nix/store</filename>).
-You should periodically run Nix’s <emphasis>garbage
-collector</emphasis> to remove old, unreferenced packages.  This is
-easy:
-
-<screen>
-$ nix-collect-garbage
-</screen>
-
-Alternatively, you can use a systemd unit that does the same in the
-background:
-
-<screen>
-$ systemctl start nix-gc.service
-</screen>
-
-You can tell NixOS in <filename>configuration.nix</filename> to run
-this unit automatically at certain points in time, for instance, every
-night at 03:15:
-
-<programlisting>
-nix.gc.automatic = true;
-nix.gc.dates = "03:15";
-</programlisting>
-
-</para>
-
-<para>The commands above do not remove garbage collector roots, such
-as old system configurations.  Thus they do not remove the ability to
-roll back to previous configurations.  The following command deletes
-old roots, removing the ability to roll back to them:
-<screen>
-$ nix-collect-garbage -d
-</screen>
-You can also do this for specific profiles, e.g.
-<screen>
-$ nix-env -p /nix/var/nix/profiles/per-user/eelco/profile --delete-generations old
-</screen>
-Note that NixOS system configurations are stored in the profile
-<filename>/nix/var/nix/profiles/system</filename>.</para>
-
-<para>Another way to reclaim disk space (often as much as 40% of the
-size of the Nix store) is to run Nix’s store optimiser, which seeks
-out identical files in the store and replaces them with hard links to
-a single copy.
-<screen>
-$ nix-store --optimise
-</screen>
-Since this command needs to read the entire Nix store, it can take
-quite a while to finish.</para>
-
-</section>
-
-
-</chapter>
diff --git a/nixos/doc/manual/troubleshooting.xml b/nixos/doc/manual/troubleshooting.xml
deleted file mode 100644
index c7d65112b649..000000000000
--- a/nixos/doc/manual/troubleshooting.xml
+++ /dev/null
@@ -1,199 +0,0 @@
-<chapter xmlns="http://docbook.org/ns/docbook"
-         xmlns:xlink="http://www.w3.org/1999/xlink"
-         xml:id="ch-troubleshooting">
-
-<title>Troubleshooting</title>
-
-
-<!--===============================================================-->
-
-<section xml:id="sec-boot-problems"><title>Boot problems</title>
-
-<para>If NixOS fails to boot, there are a number of kernel command
-line parameters that may help you to identify or fix the issue.  You
-can add these parameters in the GRUB boot menu by pressing “e” to
-modify the selected boot entry and editing the line starting with
-<literal>linux</literal>.  The following are some useful kernel command
-line parameters that are recognised by the NixOS boot scripts or by
-systemd:
-
-<variablelist>
-
-  <varlistentry><term><literal>boot.shell_on_fail</literal></term>
-    <listitem><para>Start a root shell if something goes wrong in
-    stage 1 of the boot process (the initial ramdisk).  This is
-    disabled by default because there is no authentication for the
-    root shell.</para></listitem>
-  </varlistentry>
-
-  <varlistentry><term><literal>boot.debug1</literal></term>
-    <listitem><para>Start an interactive shell in stage 1 before
-    anything useful has been done.  That is, no modules have been
-    loaded and no file systems have been mounted, except for
-    <filename>/proc</filename> and
-    <filename>/sys</filename>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry><term><literal>boot.trace</literal></term>
-    <listitem><para>Print every shell command executed by the stage 1
-    and 2 boot scripts.</para></listitem>
-  </varlistentry>
-
-  <varlistentry><term><literal>single</literal></term>
-    <listitem><para>Boot into rescue mode (a.k.a. single user mode).
-    This will cause systemd to start nothing but the unit
-    <literal>rescue.target</literal>, which runs
-    <command>sulogin</command> to prompt for the root password and
-    start a root login shell.  Exiting the shell causes the system to
-    continue with the normal boot process.</para></listitem>
-  </varlistentry>
-
-  <varlistentry><term><literal>systemd.log_level=debug systemd.log_target=console</literal></term>
-    <listitem><para>Make systemd very verbose and send log messages to
-    the console instead of the journal.</para></listitem>
-  </varlistentry>
-
-</variablelist>
-
-For more parameters recognised by systemd, see
-<citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>.</para>
-
-<para>If no login prompts or X11 login screens appear (e.g. due to
-hanging dependencies), you can press Alt+ArrowUp.  If you’re lucky,
-this will start rescue mode (described above).  (Also note that since
-most units have a 90-second timeout before systemd gives up on them,
-the <command>agetty</command> login prompts should appear eventually
-unless something is very wrong.)</para>
-
-</section>
-
-
-<!--===============================================================-->
-
-<section xml:id="sec-maintenance-mode"><title>Maintenance mode</title>
-
-<para>You can enter rescue mode by running:
-
-<screen>
-$ systemctl rescue</screen>
-
-This will eventually give you a single-user root shell.  Systemd will
-stop (almost) all system services.  To get out of maintenance mode,
-just exit from the rescue shell.</para>
-
-</section>
-
-
-<!--===============================================================-->
-
-<section xml:id="sec-rollback"><title>Rolling back configuration changes</title>
-
-<para>After running <command>nixos-rebuild</command> to switch to a
-new configuration, you may find that the new configuration doesn’t
-work very well.  In that case, there are several ways to return to a
-previous configuration.</para>
-
-<para>First, the GRUB boot manager allows you to boot into any
-previous configuration that hasn’t been garbage-collected.  These
-configurations can be found under the GRUB submenu “NixOS - All
-configurations”.  This is especially useful if the new configuration
-fails to boot.  After the system has booted, you can make the selected
-configuration the default for subsequent boots:
-
-<screen>
-$ /run/current-system/bin/switch-to-configuration boot</screen>
-
-</para>
-
-<para>Second, you can switch to the previous configuration in a running
-system:
-
-<screen>
-$ nixos-rebuild switch --rollback</screen>
-
-This is equivalent to running:
-
-<screen>
-$ /nix/var/nix/profiles/system-<replaceable>N</replaceable>-link/bin/switch-to-configuration switch</screen>
-
-where <replaceable>N</replaceable> is the number of the NixOS system
-configuration.  To get a list of the available configurations, do:
-
-<screen>
-$ ls -l /nix/var/nix/profiles/system-*-link
-<replaceable>...</replaceable>
-lrwxrwxrwx 1 root root 78 Aug 12 13:54 /nix/var/nix/profiles/system-268-link -> /nix/store/202b...-nixos-13.07pre4932_5a676e4-4be1055
-</screen>
-
-</para>
-
-</section>
-
-
-<!--===============================================================-->
-
-<section xml:id="sec-nix-store-corruption"><title>Nix store corruption</title>
-
-<para>After a system crash, it’s possible for files in the Nix store
-to become corrupted.  (For instance, the Ext4 file system has the
-tendency to replace un-synced files with zero bytes.)  NixOS tries
-hard to prevent this from happening: it performs a
-<command>sync</command> before switching to a new configuration, and
-Nix’s database is fully transactional.  If corruption still occurs,
-you may be able to fix it automatically.</para>
-
-<para>If the corruption is in a path in the closure of the NixOS
-system configuration, you can fix it by doing
-
-<screen>
-$ nixos-rebuild switch --repair
-</screen>
-
-This will cause Nix to check every path in the closure, and if its
-cryptographic hash differs from the hash recorded in Nix’s database,
-the path is rebuilt or redownloaded.</para>
-
-<para>You can also scan the entire Nix store for corrupt paths:
-
-<screen>
-$ nix-store --verify --check-contents --repair
-</screen>
-
-Any corrupt paths will be redownloaded if they’re available in a
-binary cache; otherwise, they cannot be repaired.</para>
-
-</section>
-
-
-<!--===============================================================-->
-
-<section xml:id="sec-nix-network-issues"><title>Nix network issues</title>
-
-<para>Nix uses a so-called <emphasis>binary cache</emphasis> to
-optimise building a package from source into downloading it as a
-pre-built binary.  That is, whenever a command like
-<command>nixos-rebuild</command> needs a path in the Nix store, Nix
-will try to download that path from the Internet rather than build it
-from source.  The default binary cache is
-<uri>http://cache.nixos.org/</uri>.  If this cache is unreachable, Nix
-operations may take a long time due to HTTP connection timeouts.  You
-can disable the use of the binary cache by adding <option>--option
-use-binary-caches false</option>, e.g.
-
-<screen>
-$ nixos-rebuild switch --option use-binary-caches false
-</screen>
-
-If you have an alternative binary cache at your disposal, you can use
-it instead:
-
-<screen>
-$ nixos-rebuild switch --option binary-caches http://my-cache.example.org/
-</screen>
-
-</para>
-
-</section>
-
-
-</chapter>

From 60e6cc81b5a76751c289d7184ff5842f5e5cca84 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 26 Aug 2014 15:45:47 +0200
Subject: [PATCH 0621/1453] No caps in filenames

---
 nixos/doc/manual/configuration/file-systems.xml               | 2 +-
 .../{LUKS-file-systems.xml => luks-file-systems.xml}          | 0
 .../installation/{installing-UEFI.xml => installing-uefi.xml} | 0
 .../installation/{installing-USB.xml => installing-usb.xml}   | 0
 nixos/doc/manual/installation/installing.xml                  | 4 ++--
 5 files changed, 3 insertions(+), 3 deletions(-)
 rename nixos/doc/manual/configuration/{LUKS-file-systems.xml => luks-file-systems.xml} (100%)
 rename nixos/doc/manual/installation/{installing-UEFI.xml => installing-uefi.xml} (100%)
 rename nixos/doc/manual/installation/{installing-USB.xml => installing-usb.xml} (100%)

diff --git a/nixos/doc/manual/configuration/file-systems.xml b/nixos/doc/manual/configuration/file-systems.xml
index 52ad6d62f130..d1b324af3f12 100644
--- a/nixos/doc/manual/configuration/file-systems.xml
+++ b/nixos/doc/manual/configuration/file-systems.xml
@@ -35,6 +35,6 @@ or <literal>ext4</literal>, then it’s best to specify
 <option>fsType</option> to ensure that the kernel module is
 available.</para>
 
-<xi:include href="LUKS-file-systems.xml" />
+<xi:include href="luks-file-systems.xml" />
 
 </chapter>
diff --git a/nixos/doc/manual/configuration/LUKS-file-systems.xml b/nixos/doc/manual/configuration/luks-file-systems.xml
similarity index 100%
rename from nixos/doc/manual/configuration/LUKS-file-systems.xml
rename to nixos/doc/manual/configuration/luks-file-systems.xml
diff --git a/nixos/doc/manual/installation/installing-UEFI.xml b/nixos/doc/manual/installation/installing-uefi.xml
similarity index 100%
rename from nixos/doc/manual/installation/installing-UEFI.xml
rename to nixos/doc/manual/installation/installing-uefi.xml
diff --git a/nixos/doc/manual/installation/installing-USB.xml b/nixos/doc/manual/installation/installing-usb.xml
similarity index 100%
rename from nixos/doc/manual/installation/installing-USB.xml
rename to nixos/doc/manual/installation/installing-usb.xml
diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml
index 793b503ad97a..b140c56fbee1 100644
--- a/nixos/doc/manual/installation/installing.xml
+++ b/nixos/doc/manual/installation/installing.xml
@@ -258,7 +258,7 @@ $ reboot</screen>
 }</screen>
 </example>
 
-<xi:include href="installing-UEFI.xml" />
-<xi:include href="installing-USB.xml" />
+<xi:include href="installing-uefi.xml" />
+<xi:include href="installing-usb.xml" />
 
 </chapter>

From bd811d32b4b194b9e551a66069641a76bd8eab58 Mon Sep 17 00:00:00 2001
From: Joachim Schiele <js@lastlog.de>
Date: Tue, 26 Aug 2014 10:44:59 +0200
Subject: [PATCH 0622/1453] grub: removed orphaned mkOption configurationName

---
 nixos/modules/system/boot/loader/grub/grub.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index 0cc060db8f90..721e8f21cce5 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -86,15 +86,6 @@ in
         '';
       };
 
-      configurationName = mkOption {
-        default = "";
-        example = "Stable 2.6.21";
-        type = types.str;
-        description = ''
-          GRUB entry name instead of default.
-        '';
-      };
-
       extraPrepareConfig = mkOption {
         default = "";
         type = types.lines;

From f6b4214567979247f6dac2b5b6bc92fa89a619db Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 26 Aug 2014 19:30:45 +0200
Subject: [PATCH 0623/1453] /dev/sda1 -> "/dev/sda1"

Otherwise Nix might try to copy /dev/sda1 under certain circumstances
:-)
---
 nixos/modules/system/boot/luksroot.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index c923cc49c449..68392e3cfe25 100644
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@@ -348,7 +348,7 @@ in
 
               options = {
                 device = mkOption {
-                  default = /dev/sda1;
+                  default = "/dev/sda1";
                   type = types.path;
                   description = ''
                     An unencrypted device that will temporarily be mounted in stage-1.

From 4f2781019e38f678ada1cb0572798351e02e955d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 26 Aug 2014 19:50:32 +0200
Subject: [PATCH 0624/1453] pypy: properly hint sqlite3 headers

---
 pkgs/development/interpreters/pypy/2.3/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/pypy/2.3/default.nix b/pkgs/development/interpreters/pypy/2.3/default.nix
index ba0fb6f111a8..abf12a66ed81 100644
--- a/pkgs/development/interpreters/pypy/2.3/default.nix
+++ b/pkgs/development/interpreters/pypy/2.3/default.nix
@@ -53,8 +53,7 @@ let
         --replace "linklibs=['tcl', 'tk']" "linklibs=['tcl8.5', 'tk8.5']" \
         --replace "libdirs = []" "libdirs = ['${tk}/lib', '${tcl}/lib']"
 
-      substituteInPlace lib_pypy/_sqlite3.py \
-        --replace "libraries=['sqlite3']" "libraries=['sqlite3'], include_dirs=['${sqlite}/include'], library_dirs=['${sqlite}/lib']"
+      sed -i "s@libraries=\['sqlite3'\]\$@libraries=['sqlite3'], include_dirs=['${sqlite}/include'], library_dirs=['${sqlite}/lib']@" lib_pypy/_sqlite3.py
     '';
 
     setupHook = ./setup-hook.sh;

From 686fa594ab63d117416ab1199ac2daf22a466709 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Tue, 26 Aug 2014 16:36:35 -0500
Subject: [PATCH 0625/1453] coq_HEAD: update to latest Git HEAD

---
 pkgs/applications/science/logic/coq/HEAD.nix  |  9 ++++++---
 .../science/logic/coq/no-codesign.patch       | 19 +++++++++++++++++++
 2 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/applications/science/logic/coq/no-codesign.patch

diff --git a/pkgs/applications/science/logic/coq/HEAD.nix b/pkgs/applications/science/logic/coq/HEAD.nix
index 8e6fde6bc240..ed922b3aedbe 100644
--- a/pkgs/applications/science/logic/coq/HEAD.nix
+++ b/pkgs/applications/science/logic/coq/HEAD.nix
@@ -3,7 +3,7 @@
 {stdenv, fetchgit, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null}:
 
 let 
-  version = "8.5pre-8bc01590";
+  version = "8.5pre-c70d5b2";
   buildIde = lablgtk != null;
   ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
   idePath = if buildIde then ''
@@ -16,17 +16,20 @@ stdenv.mkDerivation {
 
   src = fetchgit {
     url = git://scm.gforge.inria.fr/coq/coq.git;
-    rev = "8bc0159095cb0230a50c55a1611c8b77134a6060";
-    sha256 = "1cp4hbk9jw78y03vwz099yvixax161h60hsbyvwiwz2z5czjxzcv";
+    rev = "c70d5b27ad5872c74e20b6c997383fb4462a68dc";
+    sha256 = "02wks2aivgjcf4h3ss9rn683vyawz8gl8rbysdq7awxh062316l2";
   };
 
   buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ];
 
+  patches = [ ./no-codesign.patch ];
+
   postPatch = ''
     UNAME=$(type -tp uname)
     RM=$(type -tp rm)
     substituteInPlace configure --replace "/bin/uname" "$UNAME"
     substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM"
+    substituteInPlace Makefile.build --replace "ifeq (\$(ARCH),Darwin)" "ifeq (\$(ARCH),Darwinx)"
   '';
 
   preConfigure = ''
diff --git a/pkgs/applications/science/logic/coq/no-codesign.patch b/pkgs/applications/science/logic/coq/no-codesign.patch
new file mode 100644
index 000000000000..0f917fbf56d4
--- /dev/null
+++ b/pkgs/applications/science/logic/coq/no-codesign.patch
@@ -0,0 +1,19 @@
+diff --git a/Makefile.build b/Makefile.build
+index 2963a3d..876479c 100644
+--- a/Makefile.build
++++ b/Makefile.build
+@@ -101,13 +101,8 @@ BYTEFLAGS=$(CAMLDEBUG) $(USERFLAGS)
+ OPTFLAGS=$(CAMLDEBUGOPT) $(CAMLTIMEPROF) $(USERFLAGS)
+ DEPFLAGS= $(LOCALINCLUDES) -I ide -I ide/utils
+ 
+-ifeq ($(ARCH),Darwin)
+-LINKMETADATA=-ccopt "-sectcreate __TEXT __info_plist config/Info-$(notdir $@).plist"
+-CODESIGN=codesign -s -
+-else
+ LINKMETADATA=
+ CODESIGN=true
+-endif
+ 
+ define bestocaml
+ $(if $(OPT),\
+

From aedbfdff8485044529953585bc7d042ece080b00 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <emery@vfemail.net>
Date: Tue, 26 Aug 2014 21:24:09 -0400
Subject: [PATCH 0626/1453] unbound: run in chroot

---
 nixos/modules/services/networking/unbound.nix | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix
index 415ff13bdda5..73b10c1d5611 100644
--- a/nixos/modules/services/networking/unbound.nix
+++ b/nixos/modules/services/networking/unbound.nix
@@ -6,8 +6,6 @@ let
 
   cfg = config.services.unbound;
 
-  username = "unbound";
-
   stateDir = "/var/lib/unbound";
 
   access = concatMapStrings (x: "  access-control: ${x} allow\n") cfg.allowedAccess;
@@ -21,21 +19,13 @@ let
   confFile = pkgs.writeText "unbound.conf" ''
     server:
       directory: "${stateDir}"
-      username: ${username}
-      # make sure unbound can access entropy from inside the chroot.
-      # e.g. on linux the use these commands (on BSD, devfs(8) is used):
-      #      mount --bind -n /dev/random /etc/unbound/dev/random
-      # and  mount --bind -n /dev/log /etc/unbound/dev/log
+      username: unbound
       chroot: "${stateDir}"
-      # logfile: "${stateDir}/unbound.log"  #uncomment to use logfile.
-      pidfile: "${stateDir}/unbound.pid"
-      verbosity: 1      # uncomment and increase to get more logging.
+      pidfile: ""
       ${interfaces}
       ${access}
-
-    ${forward}
-
     ${cfg.extraConfig}
+    ${forward}
   '';
 
 in
@@ -82,7 +72,7 @@ in
     environment.systemPackages = [ pkgs.unbound ];
 
     users.extraUsers = singleton {
-      name = username;
+      name = "unbound";
       uid = config.ids.uids.unbound;
       description = "unbound daemon user";
       home = stateDir;
@@ -96,8 +86,18 @@ in
       wants = [" nss-lookup.target" ];
       wantedBy = [ "multi-user.target" ];
 
-      path = [ pkgs.unbound ];
-      serviceConfig.ExecStart = "${pkgs.unbound}/sbin/unbound -d -c ${confFile}";
+      preStart = ''
+        mkdir -m 0755 -p ${stateDir}/dev/
+	cp ${confFile} ${stateDir}/unbound.conf
+	chown unbound ${stateDir}
+	touch ${stateDir}/dev/random
+        ${pkgs.utillinux}/bin/mount --bind -n /dev/random ${stateDir}/dev/random
+      '';
+
+      serviceConfig = {
+        ExecStart = "${pkgs.unbound}/sbin/unbound -d -c ${stateDir}/unbound.conf";
+        ExecStopPost="${pkgs.utillinux}/bin/umount ${stateDir}/dev/random";
+      };
     };
 
   };

From 0dc4edd90addfd63a3002a9e7f495fc8be9677df Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 27 Aug 2014 03:21:03 -0400
Subject: [PATCH 0627/1453] Add zendopcache php package

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

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 1225021ad377..700547450ec2 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -39,6 +39,12 @@ let self = with self; {
     sha256 = "1gcsh9iar5qa1yzpjki9bb5rivcb6yjp45lmjmp98wlyf83vmy2y";
   };
 
+  zendopcache = buildPecl {
+    name = "zendopcache-7.0.3";
+
+    sha256 = "0qpfbkfy4wlnsfq4vc4q5wvaia83l89ky33s08gqrcfp3p1adn88";
+  };
+
   zmq = buildPecl {
     name = "zmq-1.1.2";
 

From 4061c18c9878ca4b97a0e97debd5c533fc1422ff Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 27 Aug 2014 03:26:40 -0400
Subject: [PATCH 0628/1453] Revert "grub: removed orphaned mkOption
 configurationName"

The configurationName option value is still used by NixOS, this removal
breaks grub users.

This reverts commit bd811d32b4b194b9e551a66069641a76bd8eab58.
---
 nixos/modules/system/boot/loader/grub/grub.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index 721e8f21cce5..0cc060db8f90 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -86,6 +86,15 @@ in
         '';
       };
 
+      configurationName = mkOption {
+        default = "";
+        example = "Stable 2.6.21";
+        type = types.str;
+        description = ''
+          GRUB entry name instead of default.
+        '';
+      };
+
       extraPrepareConfig = mkOption {
         default = "";
         type = types.lines;

From a3800db3d2e85f08395dec16abb2aa732e3fe22f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Wed, 27 Aug 2014 15:39:34 +0800
Subject: [PATCH 0629/1453] add anthy, Japanese input method

---
 pkgs/tools/inputmethods/anthy/default.nix | 18 ++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 20 insertions(+)
 create mode 100644 pkgs/tools/inputmethods/anthy/default.nix

diff --git a/pkgs/tools/inputmethods/anthy/default.nix b/pkgs/tools/inputmethods/anthy/default.nix
new file mode 100644
index 000000000000..34ffa1568b98
--- /dev/null
+++ b/pkgs/tools/inputmethods/anthy/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
+  name = "anthy-9100h";
+
+  meta = with stdenv.lib; {
+    description = "Hiragana text to Kana Kanji mixed text Japanese input method";
+    homepace    = http://sourceforge.jp/projects/anthy/;
+    license     = licenses.gpl2Plus;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ iyzsong ];
+  };
+
+  src = fetchurl {
+    url = "http://dl.sourceforge.jp/anthy/37536/anthy-9100h.tar.gz";
+    sha256 = "0ism4zibcsa5nl77wwi12vdsfjys3waxcphn1p5s7d0qy1sz0mnj";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fa205e71133a..fb8f6e5bdcac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -801,6 +801,8 @@ let
 
   usb_modeswitch = callPackage ../development/tools/misc/usb-modeswitch { };
 
+  anthy = callPackage ../tools/inputmethods/anthy { };
+
   biosdevname = callPackage ../tools/networking/biosdevname { };
 
   clamav = callPackage ../tools/security/clamav { };

From 6f6724027d10c8989f08df9dc36b09b27152ae36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Wed, 27 Aug 2014 15:13:54 +0800
Subject: [PATCH 0630/1453] fcitx: update to 4.2.8.4

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

diff --git a/pkgs/tools/inputmethods/fcitx/default.nix b/pkgs/tools/inputmethods/fcitx/default.nix
index 2795b0d4d871..2db5d36a10d8 100644
--- a/pkgs/tools/inputmethods/fcitx/default.nix
+++ b/pkgs/tools/inputmethods/fcitx/default.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "fcitx-4.2.8.3";
+  name = "fcitx-4.2.8.4";
 
   src = fetchurl {
     url = "http://download.fcitx-im.org/fcitx/${name}_dict.tar.xz";
-    sha256 = "05dw6cbjh2jyjrkr4qx2bcq6nyhhrs0akf6fcjk5a72bgphhwqnb";
+    sha256 = "1yhvqg4q0knywdrh8sljqjn1i72rd8ya0fr70pc0w7fq25013x37";
   };
 
   patchPhase = ''

From 92f728d546bba5d2c0e87ff28dd91b4d347b66d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Wed, 27 Aug 2014 17:05:14 +0800
Subject: [PATCH 0631/1453] add fcitx-anthy

---
 pkgs/tools/inputmethods/fcitx/fcitx-anthy.nix | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/tools/inputmethods/fcitx/fcitx-anthy.nix

diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-anthy.nix b/pkgs/tools/inputmethods/fcitx/fcitx-anthy.nix
new file mode 100644
index 000000000000..2099220f2a1f
--- /dev/null
+++ b/pkgs/tools/inputmethods/fcitx/fcitx-anthy.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, cmake, fcitx, anthy }:
+
+stdenv.mkDerivation rec {
+  name = "fcitx-anthy-0.2.1";
+
+  meta = with stdenv.lib; {
+    description = "Fcitx Wrapper for anthy";
+    license     = licenses.gpl2Plus;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ iyzsong ];
+  };
+
+  src = fetchurl {
+    url = "http://download.fcitx-im.org/fcitx-anthy/${name}.tar.xz";
+    sha256 = "13fpfhhxkzbq53h10i3hifa37nngm47jq361i70z22bgcrs8887x";
+  };
+
+  buildInputs = [ cmake fcitx anthy ];
+
+  preInstall = ''
+    substituteInPlace src/cmake_install.cmake \
+      --replace ${fcitx} $out
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fb8f6e5bdcac..f5daed73c9de 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1021,6 +1021,8 @@ let
 
   fcitx = callPackage ../tools/inputmethods/fcitx { };
 
+  fcitx-anthy = callPackage ../tools/inputmethods/fcitx/fcitx-anthy.nix { };
+
   fcron = callPackage ../tools/system/fcron { };
 
   fdm = callPackage ../tools/networking/fdm {};

From 005f78e7393b16fa0cbe53b329dad8cf2b071202 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 27 Aug 2014 11:08:26 +0200
Subject: [PATCH 0632/1453] Fix opening NixOS manual

http://hydra.nixos.org/build/13760576
---
 nixos/modules/services/misc/nixos-manual.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix
index 808c5dcbdc6f..c0d7885280a5 100644
--- a/nixos/modules/services/misc/nixos-manual.nix
+++ b/nixos/modules/services/misc/nixos-manual.nix
@@ -28,7 +28,7 @@ let
     options = eval.options;
   };
 
-  entry = "${manual.manual}/share/doc/nixos/manual.html";
+  entry = "${manual.manual}/share/doc/nixos/index.html";
 
   help = pkgs.writeScriptBin "nixos-help"
     ''

From df3006679071421d57af4cfdcc53cee07b3157d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 27 Aug 2014 11:18:59 +0200
Subject: [PATCH 0633/1453] pypy: test sqlite3 and verify the module

---
 pkgs/development/interpreters/pypy/2.3/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/pypy/2.3/default.nix b/pkgs/development/interpreters/pypy/2.3/default.nix
index abf12a66ed81..f31bc731a32f 100644
--- a/pkgs/development/interpreters/pypy/2.3/default.nix
+++ b/pkgs/development/interpreters/pypy/2.3/default.nix
@@ -67,9 +67,8 @@ let
        # disable socket because it has two actual network tests that fail
        # disable test_mhlib because it fails for unknown reason
        # disable test_multiprocessing due to transient errors
-       # disable sqlite3 due to https://bugs.pypy.org/issue1740
        # disable test_os because test_urandom_failure fails
-      ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k '-test_sqlite -test_socket -test_os -test_shutil -test_mhlib -test_multiprocessing' lib-python
+      ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k '-test_socket -test_os -test_shutil -test_mhlib -test_multiprocessing' lib-python
     '';
 
     installPhase = ''
@@ -84,7 +83,7 @@ let
        ln -s $out/pypy-c/lib-python/${pythonVersion} $out/lib/${libPrefix}
 
        # verify cffi modules
-       $out/bin/pypy -c "import Tkinter"
+       $out/bin/pypy -c "import Tkinter;import sqlite3"
 
        # TODO: compile python files?
     '';

From 5e7a1cf955e43e1fa3c1c157c0d6961e1bcf9801 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 27 Aug 2014 10:48:26 +0200
Subject: [PATCH 0634/1453] build-support: Fix nix-prefetch-* on OS X.

Fixes a regression on OS X introduced by f83af95.

Don't use --tmpdir for mktemp, because that flag doesn't exist on OS X.
However, using -t is deprecated in GNU coreutils, so as suggested by
@ip1981 we're now using parameter expansion on ${TMPDIR:-/tmp} to
provide /tmp as a fallback if TMPDIR is not set and use it instead.

Also use this approach for nix-prefetch-cvs now in order to stay
consistent.

Reported-by: Vladimir Kirillov <proger@wilab.org.ua>
Tested-by: Igor Pashev <pashev.igor@gmail.com>
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/build-support/fetchbzr/nix-prefetch-bzr | 2 +-
 pkgs/build-support/fetchcvs/nix-prefetch-cvs | 2 +-
 pkgs/build-support/fetchgit/nix-prefetch-git | 2 +-
 pkgs/build-support/fetchhg/nix-prefetch-hg   | 2 +-
 pkgs/build-support/fetchsvn/nix-prefetch-svn | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/build-support/fetchbzr/nix-prefetch-bzr b/pkgs/build-support/fetchbzr/nix-prefetch-bzr
index 346c2b05cbdd..8143fca7025d 100755
--- a/pkgs/build-support/fetchbzr/nix-prefetch-bzr
+++ b/pkgs/build-support/fetchbzr/nix-prefetch-bzr
@@ -43,7 +43,7 @@ fi
 # If we don't know the hash or a path with that hash doesn't exist,
 # download the file and add it to the store.
 if test -z "$finalPath"; then
-    tmpPath="$(mktemp --tmpdir -d bzr-checkout-tmp-XXXXXXXX)"
+    tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/bzr-checkout-tmp-XXXXXXXX")"
     trap "rm -rf \"$tmpPath\"" EXIT
 
     tmpFile="$tmpPath/$dstFile"
diff --git a/pkgs/build-support/fetchcvs/nix-prefetch-cvs b/pkgs/build-support/fetchcvs/nix-prefetch-cvs
index 29e0d29b52e9..f9ed8ffa066f 100755
--- a/pkgs/build-support/fetchcvs/nix-prefetch-cvs
+++ b/pkgs/build-support/fetchcvs/nix-prefetch-cvs
@@ -20,7 +20,7 @@ fi
 
 
 mkTempDir() {
-    tmpPath=$(mktemp -d -t nix-prefetch-cvs-XXXXXXXX)
+    tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/nix-prefetch-cvs-XXXXXXXX")"
     trap removeTempDir EXIT SIGINT SIGQUIT
 }
 
diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git
index 0d2536e225c3..4f9dd2ac272b 100755
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@@ -256,7 +256,7 @@ else
   # download the file and add it to the store.
   if test -z "$finalPath"; then
 
-      tmpPath="$(mktemp --tmpdir -d git-checkout-tmp-XXXXXXXX)"
+      tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/git-checkout-tmp-XXXXXXXX")"
       trap "rm -rf \"$tmpPath\"" EXIT
 
       tmpFile="$tmpPath/git-export"
diff --git a/pkgs/build-support/fetchhg/nix-prefetch-hg b/pkgs/build-support/fetchhg/nix-prefetch-hg
index 7d4c0c8d7413..a8916176f8af 100755
--- a/pkgs/build-support/fetchhg/nix-prefetch-hg
+++ b/pkgs/build-support/fetchhg/nix-prefetch-hg
@@ -35,7 +35,7 @@ fi
 # download the file and add it to the store.
 if test -z "$finalPath"; then
 
-    tmpPath="$(mktemp --tmpdir -d hg-checkout-tmp-XXXXXXXX)"
+    tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/hg-checkout-tmp-XXXXXXXX")"
     trap "rm -rf \"$tmpPath\"" EXIT
 
     tmpArchive="$tmpPath/hg-archive"
diff --git a/pkgs/build-support/fetchsvn/nix-prefetch-svn b/pkgs/build-support/fetchsvn/nix-prefetch-svn
index 74de0a14c801..03b9eb9a03df 100755
--- a/pkgs/build-support/fetchsvn/nix-prefetch-svn
+++ b/pkgs/build-support/fetchsvn/nix-prefetch-svn
@@ -41,7 +41,7 @@ fi
 # If we don't know the hash or a path with that hash doesn't exist,
 # download the file and add it to the store.
 if test -z "$finalPath"; then
-    tmpPath="$(mktemp --tmpdir -d svn-checkout-tmp-XXXXXXXX)"
+    tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/svn-checkout-tmp-XXXXXXXX")"
     trap "rm -rf \"$tmpPath\"" EXIT
 
     tmpFile="$tmpPath/$dstFile"

From 08d2bee3ec60cc575f3aff9a6989ba69c06eed07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 27 Aug 2014 11:49:06 +0200
Subject: [PATCH 0635/1453] pythonPackages: fix last failing builds

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 071730688103..a8de2fe5bdda 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3072,12 +3072,12 @@ rec {
 
 
   django_evolution = buildPythonPackage rec {
-    name = "django_evolution-0.7.3";
+    name = "django_evolution-0.6.9";
     disabled = isPy3k;
 
     src = fetchurl {
-      url = "http://downloads.reviewboard.org/releases/django-evolution/0.7/${name}.tar.gz";
-      md5 = "c51895b6501dd58b0e5dc8f5a5fb6f68";
+      url = "http://downloads.reviewboard.org/releases/django-evolution/${name}.tar.gz";
+      md5 = "c0d7d10bc41898c88b14d434c48766ff";
     };
 
     propagatedBuildInputs = [ django_1_5 ];
@@ -3259,6 +3259,8 @@ rec {
       url = "http://pypi.python.org/packages/source/e/enum/${name}.tar.gz";
       md5 = "ce75c7c3c86741175a84456cc5bd531e";
     };
+    
+    doCheck = !isPyPy;
 
     buildInputs = [ ];
 
@@ -4149,6 +4151,9 @@ rec {
       sha256 = "1flccphpyrb8y8dra2fq2s2v3fg615d77kjjmzl0gmiidabkkdqf";
     };
 
+    buildInputs =
+      [ fs gdata python_keyczar mock pyasn1 pycrypto pytest six ];
+
     meta = with stdenv.lib; {
       description = "Store and access your passwords safely";
       homepage    = "https://pypi.python.org/pypi/keyring";
@@ -4156,9 +4161,6 @@ rec {
       maintainers = with maintainers; [ lovek323 ];
       platforms   = platforms.unix;
     };
-
-    buildInputs =
-      [ fs gdata python_keyczar mock pyasn1 pycrypto pytest ];
   };
 
   kitchen = buildPythonPackage (rec {
@@ -7021,9 +7023,9 @@ rec {
     };
 
     propagatedBuildInputs =
-      [ recaptcha_client pytz memcached dateutil_1_5 paramiko flup pygments
-        djblets django_1_3 django_evolution pycrypto modules.sqlite3
-        pysvn pil psycopg2
+      [ django_1_3 recaptcha_client pytz memcached dateutil_1_5 paramiko flup pygments
+        djblets django_evolution pycrypto modules.sqlite3
+        pysvn pil psycopg2 
       ];
   };
 

From 42ee3b2478010d5d7f9f1a06cf7fc47fbcb9044a Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Tue, 12 Aug 2014 13:50:40 +0200
Subject: [PATCH 0636/1453] openldap - speedup build

---
 pkgs/development/libraries/openldap/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix
index c9da441705c8..cfbbce2f5591 100644
--- a/pkgs/development/libraries/openldap/default.nix
+++ b/pkgs/development/libraries/openldap/default.nix
@@ -12,6 +12,7 @@ stdenv.mkDerivation rec {
 
   configureFlags =
     [ "--enable-overlays"
+      "--disable-dependency-tracking"   # speeds up one-time build
     ] ++ stdenv.lib.optional (openssl == null) "--without-tls"
       ++ stdenv.lib.optional (cyrus_sasl == null) "--without-cyrus-sasl";
 

From 212d91a7dd61f23de853258d3c30849498f7e076 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Thu, 17 Apr 2014 14:43:05 +0200
Subject: [PATCH 0637/1453] bitcoin: add support for altcoins

---
 pkgs/applications/misc/bitcoin/altcoins.nix   | 100 ++++++++++++++++++
 pkgs/applications/misc/bitcoin/default.nix    |  18 ++--
 .../misc/bitcoin/namecoin_dynamic.patch       |  11 ++
 pkgs/top-level/all-packages.nix               |   7 +-
 4 files changed, 128 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/applications/misc/bitcoin/altcoins.nix
 create mode 100644 pkgs/applications/misc/bitcoin/namecoin_dynamic.patch

diff --git a/pkgs/applications/misc/bitcoin/altcoins.nix b/pkgs/applications/misc/bitcoin/altcoins.nix
new file mode 100644
index 000000000000..2b99bad58da4
--- /dev/null
+++ b/pkgs/applications/misc/bitcoin/altcoins.nix
@@ -0,0 +1,100 @@
+{ fetchurl, stdenv, pkgconfig
+, openssl, db48, boost, zlib, miniupnpc, qt4, qrencode, glib, protobuf, utillinux }:
+
+with stdenv.lib;
+
+let
+  buildAltcoin = makeOverridable ({walletName, gui ? true, ...}@a:
+    stdenv.mkDerivation ({
+      name = "${walletName}${toString (optional (!gui) "d")}-${a.version}";
+      buildInputs = [ openssl db48 boost zlib miniupnpc ]
+        ++ optionals gui [ qt4 qrencode ] ++ a.extraBuildInputs or [];
+
+      configurePhase = optional gui "qmake";
+
+      preBuild = optional (!gui) "cd src";
+      makefile = optional (!gui) "makefile.unix";
+
+      installPhase = if gui then ''
+        install -D "${walletName}-qt" "$out/bin/${walletName}-qt"
+      '' else ''
+        install -D "${walletName}d" "$out/bin/${walletName}d"
+      '';
+
+      passthru.walletName = walletName;
+
+      meta = {
+        platforms = platforms.unix;
+        license = license.mit;
+        maintainers = [ maintainers.offline ];
+      };
+    } // a)
+  );
+
+in rec {
+  inherit buildAltcoin;
+
+  litecoin = buildAltcoin rec {
+    walletName = "litecoin";
+    version = "0.8.5.3-rc3";
+
+    src = fetchurl {
+      url = "https://github.com/litecoin-project/litecoin/archive/v${version}.tar.gz";
+      sha256 = "1z4a7bm3z9kd7n0s38kln31z8shsd32d5d5v3br5p0jlnr5g3lk7";
+    };
+
+    meta = {
+      description = "Litecoin is a lite version of Bitcoin using scrypt as a proof-of-work algorithm.";
+      longDescription= ''
+        Litecoin is a peer-to-peer Internet currency that enables instant payments
+        to anyone in the world. It is based on the Bitcoin protocol but differs
+        from Bitcoin in that it can be efficiently mined with consumer-grade hardware.
+        Litecoin provides faster transaction confirmations (2.5 minutes on average)
+        and uses a memory-hard, scrypt-based mining proof-of-work algorithm to target
+        the regular computers and GPUs most people already have.
+        The Litecoin network is scheduled to produce 84 million currency units.
+      '';
+      homepage = https://litecoin.org/;
+    };
+  };
+  litecoind = litecoin.override { gui = false; };
+
+  namecoin = buildAltcoin rec {
+    walletName = "namecoin";
+    version = "0.3.51.00";
+    gui = false;
+
+    src = fetchurl {
+      url = "https://github.com/namecoin/namecoin/archive/nc${version}.tar.gz";
+      sha256 = "0r6zjzichfjzhvpdy501gwy9h3zvlla3kbgb38z1pzaa0ld9siyx";
+    };
+
+    patches = [ ./namecoin_dynamic.patch ];
+
+    extraBuildInputs = [ glib ];
+
+    meta = {
+      description = "Namecoin is a decentralized key/value registration and transfer system based on Bitcoin technology.";
+      homepage = http://namecoin.info;
+    };
+  };
+
+  dogecoin = buildAltcoin rec {
+    walletName = "dogecoin";
+    version = "1.4";
+
+    src = fetchurl {
+      url = "https://github.com/dogecoin/dogecoin/archive/1.4.tar.gz";
+      sha256 = "4af983f182976c98f0e32d525083979c9509b28b7d6faa0b90c5bd40b71009cc";
+    };
+
+    meta = {
+      description = "Wow, such coin, much shiba, very rich";
+      longDescription = "wow";
+      homepage = http://www.dogecoin.com/;
+      maintainers = [ maintainers.offline maintainers.edwtjo ];
+    };
+  };
+  dogecoind = dogecoin.override { gui = false; };
+
+}
diff --git a/pkgs/applications/misc/bitcoin/default.nix b/pkgs/applications/misc/bitcoin/default.nix
index d7c1fbc487b7..2b68c58b12dd 100644
--- a/pkgs/applications/misc/bitcoin/default.nix
+++ b/pkgs/applications/misc/bitcoin/default.nix
@@ -1,19 +1,21 @@
 { fetchurl, stdenv, openssl, db48, boost, zlib, miniupnpc, qt4, utillinux
-, pkgconfig, protobuf, qrencode }:
+, pkgconfig, protobuf, qrencode, gui ? true }:
+
+with stdenv.lib;
 
 stdenv.mkDerivation rec {
   version = "0.9.2.1";
-  name = "bitcoin-${version}";
+  name = "bitcoin${toString (optional (!gui) "d")}-${version}";
 
   src = fetchurl {
-    url = "https://bitcoin.org/bin/${version}/${name}-linux.tar.gz";
+    url = "https://bitcoin.org/bin/${version}/bitcoin-${version}-linux.tar.gz";
     sha256 = "0060f7d38b98113ab912d4c184000291d7f026eaf77ca5830deec15059678f54";
   };
 
   # hexdump from utillinux is required for tests
   buildInputs = [
-    openssl db48 boost zlib miniupnpc qt4 utillinux pkgconfig protobuf qrencode
-  ];
+    openssl db48 boost zlib miniupnpc utillinux pkgconfig protobuf 
+  ] ++ optionals gui [ qt4 qrencode ];
 
   unpackPhase = ''
     mkdir tmp-extract && (cd tmp-extract && tar xf $src)
@@ -34,6 +36,8 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  passthru.walletName = "bitcoin";
+
   meta = {
       description = "Peer-to-peer electronic cash system";
       longDescription= ''
@@ -43,7 +47,7 @@ stdenv.mkDerivation rec {
         with each other, with the help of a P2P network to check for double-spending.
       '';
       homepage = "http://www.bitcoin.org/";
-      maintainers = [ stdenv.lib.maintainers.roconnor ];
-      license = stdenv.lib.licenses.mit;
+      maintainers = [ maintainers.roconnor ];
+      license = licenses.mit;
   };
 }
diff --git a/pkgs/applications/misc/bitcoin/namecoin_dynamic.patch b/pkgs/applications/misc/bitcoin/namecoin_dynamic.patch
new file mode 100644
index 000000000000..ef4184ede73f
--- /dev/null
+++ b/pkgs/applications/misc/bitcoin/namecoin_dynamic.patch
@@ -0,0 +1,11 @@
+diff -u -r a/src/makefile.unix b/src/makefile.unix
+--- a/src/makefile.unix	2014-01-22 22:07:59.801601964 -0800
++++ b/src/makefile.unix	2014-01-22 22:08:07.980332839 -0800
+@@ -12,7 +12,6 @@
+ 
+ # for boost 1.37, add -mt to the boost libraries
+ LIBS= \
+- -Wl,-Bstatic \
+    -l boost_system \
+    -l boost_filesystem \
+    -l boost_program_options \
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a5fa04d8936e..8ff0a9d043fb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8275,7 +8275,12 @@ let
 
   bibletime = callPackage ../applications/misc/bibletime { };
 
-  bitcoin = callPackage ../applications/misc/bitcoin { };
+  bitcoin = callPackage ../applications/misc/bitcoin {};
+  bitcoind = callPackage ../applications/misc/bitcoin { gui = false; };
+
+  altcoins = recurseIntoAttrs (
+    callPackage ../applications/misc/bitcoin/altcoins.nix {}
+  );
 
   bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee {
     gnutls = gnutls;

From 41788255ab904ca36ce22fa9263318ad081f3e1a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 27 Aug 2014 12:24:10 +0200
Subject: [PATCH 0638/1453] Manual: Start of module-specific documentation

---
 .../manual/configuration/configuration.xml    |  3 +
 nixos/doc/manual/default.nix                  |  4 +-
 .../modules/services/databases/postgresql.xml | 77 +++++++++++++++++++
 3 files changed, 83 insertions(+), 1 deletion(-)
 create mode 100644 nixos/modules/services/databases/postgresql.xml

diff --git a/nixos/doc/manual/configuration/configuration.xml b/nixos/doc/manual/configuration/configuration.xml
index e15c700017c4..8fde0dc7e611 100644
--- a/nixos/doc/manual/configuration/configuration.xml
+++ b/nixos/doc/manual/configuration/configuration.xml
@@ -24,6 +24,9 @@ effect after you run <command>nixos-rebuild</command>.</para>
 <xi:include href="networking.xml" />
 <xi:include href="linux-kernel.xml" />
 
+<!-- FIXME: auto-include NixOS module docs -->
+<xi:include href="postgresql.xml" />
+
 <!-- Apache; libvirtd virtualisation -->
 
 </part>
diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix
index f5cc33919b8f..47e01437ccc4 100644
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@@ -41,6 +41,8 @@ let
   copySources =
     ''
       cp -prd $sources/* . # */
+      chmod -R u+w .
+      cp ${../../modules/services/databases/postgresql.xml} configuration/postgresql.xml
       ln -s ${optionsDocBook} options-db.xml
       echo "${version}" > version
     '';
@@ -74,7 +76,7 @@ in rec {
         --param toc.section.depth 3 \
         --stringparam admon.style "" \
         --stringparam callout.graphics.extension .gif \
-        --param chunk.section.depth 1 \
+        --param chunk.section.depth 0 \
         --param chunk.first.sections 1 \
         --param use.id.as.filename 1 \
         --stringparam generate.toc "book toc chapter toc appendix toc" \
diff --git a/nixos/modules/services/databases/postgresql.xml b/nixos/modules/services/databases/postgresql.xml
new file mode 100644
index 000000000000..e98b431bd60a
--- /dev/null
+++ b/nixos/modules/services/databases/postgresql.xml
@@ -0,0 +1,77 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="module-postgresql">
+
+<title>PostgreSQL</title>
+
+<!-- FIXME: render nicely -->
+
+<!-- FIXME: source can be added automatically -->
+<para><emphasis>Source:</emphasis> <filename>modules/services/databases/postgresql.nix</filename></para>
+
+<para><emphasis>Upstream documentation:</emphasis> <link xlink:href="http://www.postgresql.org/docs/"/></para>
+
+<!-- FIXME: more stuff, like maintainer? -->
+
+<para>PostgreSQL is an advanced, free relational database.<!-- MORE --></para>
+
+<section><title>Configuring</title>
+
+<para>To enable PostgreSQL, add the following to your
+<filename>configuration.nix</filename>:
+
+<programlisting>
+services.postgresql.enable = true;
+services.postgresql.package = pkgs.postgresql93;
+</programlisting>
+
+Note that you are required to specify the desired version of
+PostgreSQL (e.g. <literal>pkgs.postgresql93</literal>). Since
+upgrading your PostgreSQL version requires a database dump and reload
+(see below), NixOS cannot provide a default value for
+<option>services.postgresql.package</option> such as the most recent
+release of PostgreSQL.</para>
+
+<!--
+<para>After running <command>nixos-rebuild</command>, you can verify
+whether PostgreSQL works by running <command>psql</command>:
+
+<screen>
+$ psql
+psql (9.2.9)
+Type "help" for help.
+
+alice=>
+</screen>
+-->
+
+<para>By default, PostgreSQL stores its databases in
+<filename>/var/db/postgresql</filename>. You can override this using
+<option>services.postgresql.dataDir</option>, e.g.
+
+<programlisting>
+services.postgresql.dataDir = "/data/postgresql";
+</programlisting>
+
+</para>
+
+</section>
+
+
+<section><title>Upgrading</title>
+
+<para>FIXME: document dump/upgrade/load cycle.</para>
+
+</section>
+
+
+<section><title>Options</title>
+
+<para>FIXME: auto-generated list of module options.</para>
+
+</section>
+
+
+</chapter>

From 49336878851c852f36fe9d95cbc0c8a0bc660c69 Mon Sep 17 00:00:00 2001
From: Andrew Morsillo <andrew@peeramid.org>
Date: Tue, 26 Aug 2014 13:44:49 -0400
Subject: [PATCH 0639/1453] Bump mongodb version from 2.6.0 to 2.6.4

---
 pkgs/servers/nosql/mongodb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix
index aa9da965d172..f51a2b8fe3f8 100644
--- a/pkgs/servers/nosql/mongodb/default.nix
+++ b/pkgs/servers/nosql/mongodb/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, scons, boost, gperftools, pcre, snappy }:
 
-let version = "2.6.0";
+let version = "2.6.4";
     system-libraries = [
       "tcmalloc"
       "pcre"
@@ -18,7 +18,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://downloads.mongodb.org/src/mongodb-src-r${version}.tar.gz";
-    sha256 = "066kppjdmdpadjr09ildla3aw42anzsc9pa55iwp3wa4rgqd2i33";
+    sha256 = "1h4rrgcb95234ryjma3fjg50qsm1bnxjx5ib0c3p9nzmc2ji2m07";
   };
 
   nativeBuildInputs = [ scons boost gperftools pcre snappy ];

From ea7c41236825d14bc2a86e25dd951154f1c4e6e5 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <emery@vfemail.net>
Date: Sun, 29 Jun 2014 00:05:39 -0400
Subject: [PATCH 0640/1453] cpuminer-multi: initial expression

---
 pkgs/tools/misc/cpuminer-multi/default.nix | 31 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/tools/misc/cpuminer-multi/default.nix

diff --git a/pkgs/tools/misc/cpuminer-multi/default.nix b/pkgs/tools/misc/cpuminer-multi/default.nix
new file mode 100644
index 000000000000..c61e0ff00b3f
--- /dev/null
+++ b/pkgs/tools/misc/cpuminer-multi/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchgit, curl, jansson, autoconf, automake, openssl
+, aesni ? true }:
+
+let
+  rev = "4230012da5d1cc491976c6f5e45da36db6d9f576";
+  date = "20140619";
+in
+stdenv.mkDerivation rec {
+  name = "cpuminer-multi-${date}-${stdenv.lib.strings.substring 0 7 rev}";
+
+  src = fetchgit {
+    inherit rev;
+    url = https://github.com/wolf9466/cpuminer-multi.git;
+    sha256 = "c19a5dd1bfdbbaec3729f61248e858a5d8701424fffe67fdabf8179ced9c110b";
+  };
+
+  buildInputs = [ autoconf automake curl jansson openssl ];
+
+  preConfigure = ''
+    ./autogen.sh
+  '';
+
+  configureFlags = if aesni then [ "--disable-aes-ni" ] else [ ];
+
+  meta = with stdenv.lib; {
+    description = "Multi-algo CPUMiner";
+    homepage = https://github.com/wolf9466/cpuminer-multi;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.emery ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8ff0a9d043fb..9b6da45fe5d9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -793,6 +793,8 @@ let
 
   cpuminer = callPackage ../tools/misc/cpuminer { };
 
+  cpuminer-multi = callPackage ../tools/misc/cpuminer-multi { };
+
   cuetools = callPackage ../tools/cd-dvd/cuetools { };
 
   unifdef = callPackage ../development/tools/misc/unifdef { };

From ac90177cb1f793c7f05b7c3fb33f0bc08bb1334f Mon Sep 17 00:00:00 2001
From: Nathan Bijnens <nathan@nathan.gs>
Date: Sun, 24 Aug 2014 17:43:45 +0200
Subject: [PATCH 0641/1453] Zookeeper

---
 nixos/modules/misc/ids.nix                |   1 +
 nixos/modules/module-list.nix             |   1 +
 nixos/modules/services/misc/zookeeper.nix | 145 ++++++++++++++++++++++
 pkgs/servers/zookeeper/default.nix        |  36 ++++++
 pkgs/top-level/all-packages.nix           |   2 +
 5 files changed, 185 insertions(+)
 create mode 100755 nixos/modules/services/misc/zookeeper.nix
 create mode 100755 pkgs/servers/zookeeper/default.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 99a33f68735c..92ab241deaa1 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -147,6 +147,7 @@
       riemann = 137;
       riemanndash = 138;
       radvd = 139;
+      zookeeper = 140;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 59c69f060b9a..e2f2921b8701 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -164,6 +164,7 @@
   ./services/misc/siproxd.nix
   ./services/misc/svnserve.nix
   ./services/misc/synergy.nix
+  ./services/misc/zookeeper.nix
   ./services/monitoring/apcupsd.nix
   ./services/monitoring/dd-agent.nix
   ./services/monitoring/graphite.nix
diff --git a/nixos/modules/services/misc/zookeeper.nix b/nixos/modules/services/misc/zookeeper.nix
new file mode 100755
index 000000000000..47675b8876cc
--- /dev/null
+++ b/nixos/modules/services/misc/zookeeper.nix
@@ -0,0 +1,145 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.zookeeper;
+  
+  zookeeperConfig = ''
+    dataDir=${cfg.dataDir}
+    clientPort=${toString cfg.port}
+    autopurge.purgeInterval=${toString cfg.purgeInterval}
+    ${cfg.extraConf}
+    ${cfg.servers}
+  '';
+
+  configDir = pkgs.buildEnv {
+    name = "zookeeper-conf";
+    paths = [
+      (pkgs.writeTextDir "zoo.cfg" zookeeperConfig)
+      (pkgs.writeTextDir "log4j.properties" cfg.logging)
+    ];
+  };
+
+in {
+
+  options.services.zookeeper = {
+    enable = mkOption {
+      description = "Whether to enable Zookeeper.";
+      default = false;
+      type = types.uniq types.bool;
+    };
+
+    port = mkOption {
+      description = "Zookeeper Client port.";
+      default = 2181;
+      type = types.int;
+    };
+
+    id = mkOption {
+      description = "Zookeeper ID.";
+      default = 0;
+      type = types.int;
+    };
+
+    purgeInterval = mkOption {
+      description = ''
+        The time interval in hours for which the purge task has to be triggered. Set to a positive integer (1 and above) to enable the auto purging.
+      '';
+      default = 1;
+      type = types.int;
+    };
+ 
+    extraConf = mkOption {
+      description = "Extra configuration for Zookeeper.";
+      type = types.lines;
+      default = ''
+        initLimit=5
+        syncLimit=2
+        tickTime=2000
+      '';
+    };
+
+    servers = mkOption {
+      description = "All Zookeeper Servers.";
+      default = "";
+      type = types.lines;
+      example = ''
+        server.0=host0:2888:3888
+        server.1=host1:2888:3888
+        server.2=host2:2888:3888
+      '';
+    };
+
+    logging = mkOption {
+      description = "Zookeeper logging configuration.";
+      default = ''
+        zookeeper.root.logger=INFO, CONSOLE
+        log4j.rootLogger=INFO, CONSOLE
+        log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+        log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+        log4j.appender.CONSOLE.layout.ConversionPattern=[myid:%X{myid}] - %-5p [%t:%C{1}@%L] - %m%n
+      '';
+      type = types.lines;
+    };
+
+    dataDir = mkOption {
+      type = types.path;
+      default = "/var/lib/zookeeper";
+      description = ''
+        Data directory for Zookeeper
+      '';
+    };
+
+    extraCmdLineOptions = mkOption {
+      description = "Extra command line options for the Zookeeper launcher.";
+      default = [ "-Dcom.sun.management.jmxremote" "-Dcom.sun.management.jmxremote.local.only=true" ];
+      type = types.listOf types.string;
+      example = [ "-Djava.net.preferIPv4Stack=true" "-Dcom.sun.management.jmxremote" "-Dcom.sun.management.jmxremote.local.only=true" ];
+    };
+
+    preferIPv4 = mkOption {
+      type = types.bool;
+      default = true;
+      description = ''
+        Add the -Djava.net.preferIPv4Stack=true flag to the Zookeeper server.
+      '';
+    };
+
+  };
+
+
+  config = mkIf cfg.enable {
+    systemd.services.zookeeper = {
+      description = "Zookeeper Daemon";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network-interfaces.target" ];
+      environment = { ZOOCFGDIR = configDir; };
+      serviceConfig = {
+        ExecStart = ''
+          ${pkgs.jre}/bin/java \
+            -cp "${pkgs.zookeeper}/lib/*:${pkgs.zookeeper}/${pkgs.zookeeper.name}.jar:${configDir}" \
+            ${toString cfg.extraCmdLineOptions} \
+            -Dzookeeper.datadir.autocreate=false \
+            ${optionalString cfg.preferIPv4 "-Djava.net.preferIPv4Stack=true"} \
+            org.apache.zookeeper.server.quorum.QuorumPeerMain \
+            ${configDir}/zoo.cfg
+        '';
+        User = "zookeeper";
+        PermissionsStartOnly = true;
+      };
+      preStart = ''
+        mkdir -m 0700 -p ${cfg.dataDir}
+        if [ "$(id -u)" = 0 ]; then chown zookeeper ${cfg.dataDir}; fi
+        echo "${toString cfg.id}" > ${cfg.dataDir}/myid
+      '';
+    };
+
+    users.extraUsers = singleton {
+      name = "zookeeper";
+      uid = config.ids.uids.zookeeper;
+      description = "Zookeeper daemon user";
+      home = cfg.dataDir;
+    };
+  };
+}
diff --git a/pkgs/servers/zookeeper/default.nix b/pkgs/servers/zookeeper/default.nix
new file mode 100755
index 000000000000..307993a958ad
--- /dev/null
+++ b/pkgs/servers/zookeeper/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, jre, makeWrapper, bash }:
+
+stdenv.mkDerivation rec {
+	name = "zookeeper-3.4.6";
+
+	src = fetchurl {
+		url = "mirror://apache/zookeeper/${name}/${name}.tar.gz";
+		sha256 = "01b3938547cd620dc4c93efe07c0360411f4a66962a70500b163b59014046994";
+	};
+
+	buildInputs = [ makeWrapper jre ];
+
+	phases = ["unpackPhase" "installPhase"];
+
+	installPhase = ''
+		mkdir -p $out
+		cp -R conf docs lib ${name}.jar $out
+		mkdir -p $out/bin
+		cp -R bin/{zkCli,zkCleanup,zkEnv}.sh $out/bin
+		for i in $out/bin/{zkCli,zkCleanup}.sh; do
+			wrapProgram $i \
+				--set JAVA_HOME "${jre}" \
+				--prefix PATH : "${bash}/bin"
+		done
+                chmod -x $out/bin/zkEnv.sh
+	'';
+
+	meta = with stdenv.lib; {
+		homepage = "http://zookeeper.apache.org";
+		description = "Apache Zookeeper";
+		license = licenses.asl20;
+		maintainers = [ maintainers.nathan-gs ];	
+		platforms = platforms.unix;	
+	};		
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9b6da45fe5d9..fe27dd2c9704 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7086,6 +7086,8 @@ let
 
   xinetd = callPackage ../servers/xinetd { };
 
+  zookeeper = callPackage ../servers/zookeeper { };
+
   xquartz = callPackage ../servers/x11/xquartz { };
   quartz-wm = callPackage ../servers/x11/quartz-wm { stdenv = clangStdenv; };
 

From 21090fa778a0ed28ef5bfd81ad8c9d046034fc6a Mon Sep 17 00:00:00 2001
From: "ambrop7@gmail.com" <Ambroz Bizjak>
Date: Wed, 27 Aug 2014 12:51:21 +0200
Subject: [PATCH 0642/1453] Add BOSSA.

BOSSA is a flash programming utility for Atmel's SAM family of flash-based ARM microcontrollers. The motivation behind
BOSSA is to create a simple, easy-to-use, open source utility to replace Atmel's SAM-BA software. BOSSA is an acronym
for Basic Open Source SAM-BA Application to reflect that goal.
---
 pkgs/development/tools/misc/bossa/bin2c.c     | 122 ++++++++++++++++++
 pkgs/development/tools/misc/bossa/default.nix |  49 +++++++
 pkgs/top-level/all-packages.nix               |   4 +
 3 files changed, 175 insertions(+)
 create mode 100644 pkgs/development/tools/misc/bossa/bin2c.c
 create mode 100644 pkgs/development/tools/misc/bossa/default.nix

diff --git a/pkgs/development/tools/misc/bossa/bin2c.c b/pkgs/development/tools/misc/bossa/bin2c.c
new file mode 100644
index 000000000000..f0b915de540a
--- /dev/null
+++ b/pkgs/development/tools/misc/bossa/bin2c.c
@@ -0,0 +1,122 @@
+// bin2c.c
+//
+// convert a binary file into a C source vector
+//
+// THE "BEER-WARE LICENSE" (Revision 3.1415):
+// sandro AT sigala DOT it wrote this file. As long as you retain this notice you can do
+// whatever you want with this stuff.  If we meet some day, and you think this stuff is
+// worth it, you can buy me a beer in return.  Sandro Sigala
+//
+// syntax:  bin2c [-c] [-z] <input_file> <output_file>
+//
+//          -c    add the "const" keyword to definition
+//          -z    terminate the array with a zero (useful for embedded C strings)
+//
+// examples:
+//     bin2c -c myimage.png myimage_png.cpp
+//     bin2c -z sometext.txt sometext_txt.cpp
+ 
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+ 
+#ifndef PATH_MAX
+#define PATH_MAX 1024
+#endif
+ 
+int useconst = 0;
+int zeroterminated = 0;
+ 
+int myfgetc(FILE *f)
+{
+	int c = fgetc(f);
+	if (c == EOF && zeroterminated)
+	{
+		zeroterminated = 0;
+		return 0;
+	}
+	return c;
+}
+ 
+void process(const char *ifname, const char *ofname)
+{
+	FILE *ifile, *ofile;
+	ifile = fopen(ifname, "rb");
+	if (ifile == NULL)
+	{
+		fprintf(stderr, "cannot open %s for reading\n", ifname);
+		exit(1);
+	}
+	ofile = fopen(ofname, "wb");
+	if (ofile == NULL)
+	{
+		fprintf(stderr, "cannot open %s for writing\n", ofname);
+		exit(1);
+	}
+	char buf[PATH_MAX], *p;
+	const char *cp;
+	if ((cp = strrchr(ifname, '/')) != NULL)
+	{
+		++cp;
+	} else {
+		if ((cp = strrchr(ifname, '\\')) != NULL)
+			++cp;
+		else
+			cp = ifname;
+	}
+	strcpy(buf, cp);
+	for (p = buf; *p != '\0'; ++p)
+	{
+		if (!isalnum(*p))
+			*p = '_';
+	}
+	fprintf(ofile, "static %sunsigned char %s[] = {\n", useconst ? "const " : "", buf);
+	int c, col = 1;
+	while ((c = myfgetc(ifile)) != EOF)
+	{
+		if (col >= 78 - 6)
+		{
+			fputc('\n', ofile);
+			col = 1;
+		}
+		fprintf(ofile, "0x%.2x, ", c);
+		col += 6;
+	}
+	fprintf(ofile, "\n};\n");
+ 
+	fclose(ifile);
+	fclose(ofile);
+}
+ 
+void usage(void)
+{
+	fprintf(stderr, "usage: bin2c [-cz] <input_file> <output_file>\n");
+	exit(1);
+}
+ 
+int main(int argc, char **argv)
+{
+	while (argc > 3)
+	{
+		if (!strcmp(argv[1], "-c"))
+		{
+			useconst = 1;
+			--argc;
+			++argv;
+		} else if (!strcmp(argv[1], "-z"))
+		{
+			zeroterminated = 1;
+			--argc;
+			++argv;
+		} else {
+			usage();
+		}
+	}
+	if (argc != 3)
+	{
+		usage();
+	}
+	process(argv[1], argv[2]);
+	return 0;
+}
diff --git a/pkgs/development/tools/misc/bossa/default.nix b/pkgs/development/tools/misc/bossa/default.nix
new file mode 100644
index 000000000000..f0b6d81e69eb
--- /dev/null
+++ b/pkgs/development/tools/misc/bossa/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchgit, wxGTK, libX11, readline }:
+
+let
+  # BOSSA needs a "bin2c" program to embed images.
+  # Source taken from:
+  # http://wiki.wxwidgets.org/Embedding_PNG_Images-Bin2c_In_C
+  bin2c = stdenv.mkDerivation {
+    name = "bossa-bin2c";
+    src = ./bin2c.c;
+    unpackPhase = "true";
+    buildPhase = ''cc $src -o bin2c'';
+    installPhase = ''mkdir -p $out/bin; cp bin2c $out/bin/'';
+  };
+
+in
+stdenv.mkDerivation rec {
+  name = "bossa";
+
+  src = fetchgit {
+    url = https://github.com/shumatech/BOSSA;
+    rev = "0f0a41cb1c3a65e909c5c744d8ae664e896a08ac"; /* arduino branch */
+    sha256 = "01y8r45fw02rps9q995mv82bxrm6p0mysv4wir5glpagrhnyw7md";
+  };
+
+  nativeBuildInputs = [ bin2c ];
+  buildInputs = [ wxGTK libX11 readline ];
+
+  # Explicitly specify targets so they don't get stripped.
+  makeFlags = [ "bin/bossac" "bin/bossash" "bin/bossa" ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp bin/bossa{c,sh,} $out/bin/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A flash programming utility for Atmel's SAM family of flash-based ARM microcontrollers";
+    longDescription = ''
+      BOSSA is a flash programming utility for Atmel's SAM family of
+      flash-based ARM microcontrollers. The motivation behind BOSSA is
+      to create a simple, easy-to-use, open source utility to replace
+      Atmel's SAM-BA software. BOSSA is an acronym for Basic Open
+      Source SAM-BA Application to reflect that goal.
+    '';
+    homepage = http://www.shumatech.com/web/products/bossa;
+    license = licenses.bsd3;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fe27dd2c9704..0a97c43463d4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3854,6 +3854,10 @@ let
   bison3 = callPackage ../development/tools/parsing/bison/3.x.nix { };
   bison = bison3;
 
+  bossa = callPackage ../development/tools/misc/bossa {
+    wxGTK = wxGTK30;
+  };
+
   buildbot = callPackage ../development/tools/build-managers/buildbot {
     inherit (pythonPackages) twisted jinja2 sqlalchemy sqlalchemy_migrate;
     dateutil = pythonPackages.dateutil_1_5;

From d52d71a04bd99794401178acaf164fec94b8e387 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 27 Aug 2014 12:09:42 +0200
Subject: [PATCH 0643/1453] pythonPackages.boto_1_9: remove

---
 .../virtualization/nova/default.nix           |  2 +-
 .../virtualization/virt-manager/default.nix   |  2 +-
 .../virtualization/virtinst/default.nix       |  2 +-
 pkgs/top-level/python-packages.nix            | 27 -------------------
 4 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/pkgs/applications/virtualization/nova/default.nix b/pkgs/applications/virtualization/nova/default.nix
index c1ef20b7aa08..0023cf44f33b 100644
--- a/pkgs/applications/virtualization/nova/default.nix
+++ b/pkgs/applications/virtualization/nova/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   pythonPath = with pythonPackages;
     [ setuptools eventlet greenlet gflags netaddr sqlalchemy carrot routes
-      paste_deploy m2crypto ipy boto_1_9 twisted sqlalchemy_migrate
+      paste_deploy m2crypto ipy twisted sqlalchemy_migrate
       distutils_extra simplejson readline glance cheetah lockfile httplib2
       # !!! should libvirt be a build-time dependency?  Note that
       # libxml2Python is a dependency of libvirt.py.
diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix
index 9df6967704af..e451ff79a945 100644
--- a/pkgs/applications/virtualization/virt-manager/default.nix
+++ b/pkgs/applications/virtualization/virt-manager/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs =
     [ eventlet greenlet gflags netaddr sqlalchemy carrot routes
-      paste_deploy m2crypto ipy boto_1_9 twisted sqlalchemy_migrate
+      paste_deploy m2crypto ipy twisted sqlalchemy_migrate
       distutils_extra simplejson readline glance cheetah lockfile httplib2
       urlgrabber virtinst pyGtkGlade pythonDBus gnome_python pygobject3
       libvirt libxml2Python ipaddr vte
diff --git a/pkgs/applications/virtualization/virtinst/default.nix b/pkgs/applications/virtualization/virtinst/default.nix
index 8e2da5c3b764..9b89a78f8382 100644
--- a/pkgs/applications/virtualization/virtinst/default.nix
+++ b/pkgs/applications/virtualization/virtinst/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   pythonPath = with pythonPackages;
     [ setuptools eventlet greenlet gflags netaddr sqlalchemy carrot routes
-      paste_deploy m2crypto ipy boto_1_9 twisted sqlalchemy_migrate
+      paste_deploy m2crypto ipy twisted sqlalchemy_migrate
       distutils_extra simplejson readline glance cheetah lockfile httplib2
       # !!! should libvirt be a build-time dependency?  Note that
       # libxml2Python is a dependency of libvirt.py. 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a8de2fe5bdda..6185be2739dc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -900,33 +900,6 @@ rec {
    };
 
 
-  # euca2ools (and maybe Nova) needs boto 1.9, 2.0 doesn't work.
-  boto_1_9 = buildPythonPackage (rec {
-    name = "boto-1.9b";
-
-    src = fetchurl {
-      url = "http://boto.googlecode.com/files/${name}.tar.gz";
-      sha1 = "00a033b0a593c3ca82927867950f73d88b831155";
-    };
-
-    patches = [ ../development/python-modules/boto-1.9-python-2.7.patch ];
-
-    meta = {
-      homepage = http://code.google.com/p/boto/;
-
-      license = "bsd";
-
-      description = "Python interface to Amazon Web Services";
-
-      longDescription = ''
-        The boto module is an integrated interface to current and
-        future infrastructural services offered by Amazon Web
-        Services.  This includes S3, SQS, EC2, among others.
-      '';
-    };
-  });
-
-
   boto = buildPythonPackage rec {
     name = "boto-${version}";
     version = "2.32.0";

From 8b36efaf6a4e6bd7fa0ea384bd2255fb0b11adea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 27 Aug 2014 13:25:55 +0200
Subject: [PATCH 0644/1453] python3Packages: more build fixes

---
 pkgs/top-level/python-packages.nix | 108 ++++++++++++++++++++++-------
 1 file changed, 84 insertions(+), 24 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6185be2739dc..6d598ef1060c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -476,6 +476,7 @@ rec {
 
   async = buildPythonPackage rec {
     name = "async-0.6.1";
+    disabled = isPy3k;
     meta.maintainers = [ stdenv.lib.maintainers.mornfall ];
 
     buildInputs = [ pkgs.zlib ];
@@ -1170,6 +1171,7 @@ rec {
 
   clientform = buildPythonPackage (rec {
     name = "clientform-0.2.10";
+    disabled = isPy3k;
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/C/ClientForm/ClientForm-0.2.10.tar.gz";
@@ -1299,11 +1301,11 @@ rec {
 
 
   configobj = buildPythonPackage (rec {
-    name = "configobj-4.7.2";
+    name = "configobj-5.0.6";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/c/configobj/${name}.tar.gz";
-      md5 = "201dbaa732a9049c839f9bb6c27fc7b5";
+      md5 = "e472a3a1c2a67bb0ec9b5d54c13a47d6";
     };
 
     # error: invalid command 'test'
@@ -1619,6 +1621,7 @@ rec {
 
   darcsver = buildPythonPackage (rec {
     name = "darcsver-1.7.4";
+    disabled = isPy3k;
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/d/darcsver/${name}.tar.gz";
@@ -1852,6 +1855,7 @@ rec {
 
   dpkt = buildPythonPackage rec {
     name = "dpkt-1.8";
+    disabled = isPy3k;
 
     src = fetchurl {
       url = "https://dpkt.googlecode.com/files/${name}.tar.gz";
@@ -2006,6 +2010,7 @@ rec {
 
   faker = buildPythonPackage rec {
     name = "faker-0.0.4";
+    disabled = isPy3k;
     src = fetchurl {
       url = https://pypi.python.org/packages/source/F/Faker/Faker-0.0.4.tar.gz;
       sha256 = "09q5jna3j8di0gw5yjx0dvlndkrk2x9vvqzwyfsvg3nlp8h38js1";
@@ -2219,6 +2224,7 @@ rec {
   koji = buildPythonPackage (rec {
     name = "koji-1.8";
     meta.maintainers = [ stdenv.lib.maintainers.mornfall ];
+    disabled = isPy3k;
 
     src = fetchurl {
       url = "https://fedorahosted.org/released/koji/koji-1.8.0.tar.bz2";
@@ -2828,7 +2834,16 @@ rec {
     };
   };
 
+  zope_tales = buildPythonPackage rec {
+    name = "zope.tales-4.0.2";
 
+    propagatedBuildInputs = [ zope_interface six zope_testrunner ];
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/z/zope.tales/${name}.zip";
+      md5 = "902b03a5f9774f6e2decf3f06d18a09d";
+    };
+  };
 
 
   zope_deprecation = buildPythonPackage rec {
@@ -3101,6 +3116,7 @@ rec {
 
   dulwich = buildPythonPackage rec {
     name = "dulwich-0.8.7";
+    disabled = isPy3k || isPyPy;
 
     src = fetchurl {
       url = "http://samba.org/~jelmer/dulwich/${name}.tar.gz";
@@ -3227,6 +3243,7 @@ rec {
 
   enum = buildPythonPackage rec {
     name = "enum-0.4.4";
+    disabled = isPy3k;
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/e/enum/${name}.tar.gz";
@@ -3431,6 +3448,7 @@ rec {
 
   flup = buildPythonPackage (rec {
     name = "flup-1.0.2";
+    disabled = isPy3k;
 
     src = fetchurl {
       url = "http://www.saddi.com/software/flup/dist/${name}.tar.gz";
@@ -3497,6 +3515,7 @@ rec {
     baseName = "fuse";
     version = "0.2.1";
     name = "${baseName}-${version}";
+    disabled = isPy3k;
 
     src = fetchurl {
       url = "mirror://sourceforge/fuse/fuse-python-${version}.tar.gz";
@@ -4138,6 +4157,8 @@ rec {
 
   kitchen = buildPythonPackage (rec {
     name = "kitchen-1.1.1";
+    disabled = isPy3k;
+
     meta.maintainers = [ stdenv.lib.maintainers.mornfall ];
 
     src = fetchurl {
@@ -4779,6 +4800,8 @@ rec {
 
   MySQL_python = buildPythonPackage {
     name = "MySQL-python-1.2.3";
+    
+    disabled = isPy3k;
 
     # plenty of failing tests
     doCheck = false;
@@ -4888,12 +4911,12 @@ rec {
   };
 
   netifaces = buildPythonPackage rec {
-    version = "0.8";
+    version = "0.10.4";
     name = "netifaces-${version}";
 
     src = fetchurl {
-      url = "http://alastairs-place.net/projects/netifaces/${name}.tar.gz";
-      sha256 = "1v5i39kx4yz1pwgjfbzi63w55l2z318zgmi9f77ybmmkil1i39sk";
+      url = "http://pypi.python.org/packages/source/n/netifaces/${name}.tar.gz";
+      sha256 = "1plw237a4zib4z8s62g0mrs8gm3kjfrp5sxh6bbk9nl3rdls2mln";
     };
 
     meta = {
@@ -5582,7 +5605,7 @@ rec {
 
   pika = buildPythonPackage {
     name = "pika-0.9.12";
-    diabled = isPy3k;
+    disabled = isPy3k;
     src = fetchurl {
       url = https://pypi.python.org/packages/source/p/pika/pika-0.9.12.tar.gz;
       md5 = "7174fc7cc5570314fa3cfaa729106482";
@@ -5756,6 +5779,11 @@ rec {
       url = "http://pypi.python.org/packages/source/P/PrettyTable/${name}.tar.bz2";
       sha1 = "ad346a18d92c1d95f2295397c7a8a4f489e48851";
     };
+    
+    preCheck = ''
+      export LANG="en_US.UTF-8"
+      export LOCALE_ARCHIVE=${pkgs.glibcLocales}/lib/locale/locale-archive
+    '';
 
     meta = {
       description = "Simple Python library for easily displaying tabular data in a visually appealing ASCII table format";
@@ -6617,6 +6645,7 @@ rec {
 
   pysqlite = buildPythonPackage (rec {
     name = "pysqlite-2.6.3";
+    disabled = isPy3k;
 
     src = fetchurl {
       url = "https://pypi.python.org/packages/source/p/pysqlite/${name}.tar.gz";
@@ -7436,11 +7465,11 @@ rec {
   });
 
   sigal = buildPythonPackage rec {
-    name = "sigal-0.5.0";
+    name = "sigal-0.7.0";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/s/sigal/${name}.tar.gz";
-      md5 = "93c93725674c0702583a638f5a09c9e4";
+      md5 = "d2386706ac8543378aebde1ea4edeba4";
     };
 
     propagatedBuildInputs = [ jinja2 markdown pillow pilkit clint argh pytest ];
@@ -7999,6 +8028,7 @@ rec {
 
   stompclient = buildPythonPackage (rec {
     name = "stompclient-0.3.2";
+    disabled = isPy3k;
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/s/stompclient/${name}.tar.gz";
@@ -8039,6 +8069,11 @@ rec {
   sure = buildPythonPackage rec {
     name = "sure-${version}";
     version = "1.2.7";
+    
+    preBuild = ''
+      export LOCALE_ARCHIVE=${pkgs.glibcLocales}/lib/locale/locale-archive
+      export LC_ALL="en_US.UTF-8"
+    '';
 
     # Not picking up from PyPI because it doesn't contain tests.
     src = fetchgit {
@@ -8046,6 +8081,8 @@ rec {
       rev = "86ab9faa97aa9c1720c7d090deac2be385ed3d7a";
       sha256 = "02vffcdgr6vbj80lhl925w7zqy6cqnfvs088i0rbkjs5lxc511b3";
     };
+    
+    
 
     buildInputs = [ nose ];
 
@@ -9108,6 +9145,21 @@ rec {
         maintainers = [ stdenv.lib.maintainers.goibhniu ];
     };
   };
+  
+  zope_browserresource = buildPythonPackage rec {
+    name = "zope.browserresource-4.0.1";
+
+    propagatedBuildInputs = [
+      zope_component zope_configuration zope_contenttype zope_i18n
+      zope_interface zope_location zope_publisher zope_schema zope_traversing
+    ];
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/z/zope.browserresource/zope.browserresource-4.0.1.zip";
+      md5 = "81bbe92c1f04725561470f89d73222c5";
+    };
+  };
+
 
 
   zope_component = buildPythonPackage rec {
@@ -9149,11 +9201,11 @@ rec {
 
 
   zope_container = buildPythonPackage rec {
-    name = "zope.container-3.11.2";
+    name = "zope.container-4.0.0";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/z/zope.container/${name}.tar.gz";
-      md5 = "fc66d85a17b8ffb701091c9328983dcc";
+      md5 = "b24d2303ece65a2d9ce23a5bd074c335";
     };
 
     propagatedBuildInputs = [
@@ -9169,11 +9221,11 @@ rec {
 
 
   zope_contenttype = buildPythonPackage rec {
-    name = "zope.contenttype-3.5.5";
+    name = "zope.contenttype-4.0.1";
 
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.contenttype/${name}.zip";
-      md5 = "c6ac80e6887de4108a383f349fbdf332";
+      url = "http://pypi.python.org/packages/source/z/zope.contenttype/${name}.tar.gz";
+      md5 = "171be44753e86742da8c81b3ad008ce0";
     };
 
     meta = {
@@ -9356,7 +9408,7 @@ rec {
     name = "zope.schema-4.2.2";
 
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.schema/zope.schema-4.2.2.tar.gz";
+      url = "http://pypi.python.org/packages/source/z/zope.schema/${name}.tar.gz";
       md5 = "e7e581af8193551831560a736a53cf58";
     };
 
@@ -9372,13 +9424,13 @@ rec {
     name = "zope.security-4.0.1";
 
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.security/zope.security-3.7.4.tar.gz";
-      md5 = "072ab8d11adc083eace11262da08630c";
+      url = "http://pypi.python.org/packages/source/z/zope.security/${name}.tar.gz";
+      md5 = "27d1f2873a0ee9c1f485f7b8f22d8e1c";
     };
 
     propagatedBuildInputs = [
       zope_component zope_configuration zope_i18nmessageid zope_schema
-      zope_proxy
+      zope_proxy zope_testrunner
     ];
 
     meta = {
@@ -9470,14 +9522,17 @@ rec {
 
 
   zope_traversing = buildPythonPackage rec {
-    name = "zope.traversing-3.13.2";
+    name = "zope.traversing-4.0.0";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/z/zope.traversing/${name}.zip";
-      md5 = "eaad8fc7bbef126f9f8616b074ec00aa";
+      md5 = "5cc40c552f953939f7c597ebbedd586f";
     };
 
-    propagatedBuildInputs = [ zope_location zope_security zope_publisher ];
+    propagatedBuildInputs = [ zope_location zope_security zope_publisher transaction zope_tales ];
+
+    # circular dependency on zope_browserresource
+    doCheck = false;
 
     meta = {
         maintainers = [ stdenv.lib.maintainers.goibhniu ];
@@ -9486,11 +9541,11 @@ rec {
 
 
   zope_interface = buildPythonPackage rec {
-    name = "zope.interface-4.0.3";
+    name = "zope.interface-4.1.1";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/z/zope.interface/${name}.tar.gz";
-      md5 = "1ddd308f2c83703accd1696158c300eb";
+      md5 = "edcd5f719c5eb2e18894c4d06e29b6c6";
     };
 
     propagatedBuildInputs = [ zope_event ];
@@ -9525,6 +9580,7 @@ rec {
   cliapp = buildPythonPackage rec {
     name = "cliapp-${version}";
     version = "1.20140719";
+    disabled = isPy3k;
 
     src = fetchurl rec {
       url = "http://code.liw.fi/debian/pool/main/p/python-cliapp/python-cliapp_${version}.orig.tar.gz";
@@ -10016,15 +10072,19 @@ rec {
 
   IMAPClient = buildPythonPackage rec {
     name = "IMAPClient-${version}";
-    version = "0.9.2";
+    version = "0.11";
+    disabled = isPy34;
 
     src = fetchurl {
       url = "http://freshfoo.com/projects/IMAPClient/${name}.tar.gz";
-      sha256 = "10alpj7074djs048xjc4j7ggd1nrqdqpy0fzl7fj9hddp0rbchs9";
+      sha256 = "1w54h8gz25qf6ggazzp6xf7kvsyiadsjfkkk17gm0p6pmzvvccbn";
     };
+    
+    buildInputs = [ mock ];
 
     preConfigure = ''
       sed -i '/distribute_setup/d' setup.py
+      substituteInPlace setup.py --replace "mock==0.8.0" "mock"
     '';
 
     meta = {

From 8493813850d26a780d69bed27f3f2155c50c06f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 27 Aug 2014 13:34:38 +0200
Subject: [PATCH 0645/1453] python3Packages: more build fixes

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6d598ef1060c..7a2e90e56d28 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4619,8 +4619,10 @@ rec {
     };
   });
 
-  moinmoin = let ver="1.9.7"; in buildPythonPackage (rec {
+  moinmoin = buildPythonPackage (rec {
     name = "moinmoin-${ver}";
+    disabled = isPy3k;
+    ver = "1.9.7";
 
     src = fetchurl {
       url = "http://static.moinmo.in/files/moin-${ver}.tar.gz";
@@ -5374,6 +5376,7 @@ rec {
 
   osc = buildPythonPackage (rec {
     name = "osc-0.133+git";
+    disabled = isPy3k;
 
     src = fetchgit {
       url = git://gitorious.org/opensuse/osc.git;
@@ -5381,7 +5384,7 @@ rec {
       sha256 = "a39ce0e321e40e9758bf7b9128d316c71b35b80eabc84f13df492083bb6f1cc6";
     };
 
-    buildPhase = "python setup.py build";
+    buildPhase = "${python}/bin/${python.executable} setup.py build";
     doCheck = false;
     postInstall = "ln -s $out/bin/osc-wrapper.py $out/bin/osc";
 
@@ -6344,6 +6347,7 @@ rec {
 
   pyro3 = buildPythonPackage (rec {
     name = "Pyro-3.16";
+    disabled = isPy3k;
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/P/Pyro/${name}.tar.gz";
@@ -8134,6 +8138,7 @@ rec {
 
   tarsnapper = buildPythonPackage rec {
     name = "tarsnapper-0.2.1";
+    disabled = isPy3k;
 
     src = fetchgit {
       url = https://github.com/miracle2k/tarsnapper.git;

From 78bcfef61a0c714a7ff783163a47d416622b2c60 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <emery@vfemail.net>
Date: Sat, 23 Aug 2014 17:51:41 -0400
Subject: [PATCH 0646/1453] libdiscid update from 0.2.2 to 0.6.1

---
 .../libraries/libdiscid/default.nix           | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/libdiscid/default.nix b/pkgs/development/libraries/libdiscid/default.nix
index f9d1fc87870d..8c5c8bef3513 100644
--- a/pkgs/development/libraries/libdiscid/default.nix
+++ b/pkgs/development/libraries/libdiscid/default.nix
@@ -1,26 +1,21 @@
 { stdenv, fetchurl, cmake, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "libdiscid-0.2.2";
+  name = "libdiscid-0.6.1";
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ cmake ];
 
   src = fetchurl {
-    url = "http://users.musicbrainz.org/~matt/${name}.tar.gz";
-    sha256 = "00l4ln9rk0vqf67iccwqrgc9qx1al92i05zylh85kd1zn9d5sjwp";
+    url = "http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/${name}.tar.gz";
+    sha256 = "1mbd5y9056638cffpfwc6772xwrsk18prv1djsr6jpfim38jpsxc";
   };
 
-  # developer forgot to update his version number
-  # this is propagated to pkg-config
-  preConfigure = ''
-    substituteInPlace "CMakeLists.txt" \
-      --replace "PROJECT_VERSION 0.1.1" "PROJECT_VERSION 0.2.2"
-  '';
-
-  meta = {
+  meta = with stdenv.lib; {
     description = "A C library for creating MusicBrainz DiscIDs from audio CDs";
     homepage = http://musicbrainz.org/doc/libdiscid;
-    license = stdenv.lib.licenses.lgpl21;
+    maintainers = with maintainers; [ emery ];
+    license = licenses.lgpl21;
+    platforms = platforms.all;
   };
 }

From d41b8b30912ea32d5c7f06a968f26b3150a23639 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <emery@vfemail.net>
Date: Sat, 23 Aug 2014 17:53:27 -0400
Subject: [PATCH 0647/1453] chromaprint: switch FFT implementation to ffmpeg,
 build fpcalc

FFmpeg is prefered over FFTW3, and a mutual dependency of picard and acoustid-fingerprinter
---
 pkgs/development/libraries/chromaprint/default.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/chromaprint/default.nix b/pkgs/development/libraries/chromaprint/default.nix
index 40d41b633d26..010d2cb7ccc2 100644
--- a/pkgs/development/libraries/chromaprint/default.nix
+++ b/pkgs/development/libraries/chromaprint/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, fftw, boost }:
+{ stdenv, fetchurl, cmake, ffmpeg, boost }:
 
 stdenv.mkDerivation rec {
   name = "chromaprint-${version}";
@@ -9,11 +9,17 @@ stdenv.mkDerivation rec {
     sha256 = "04nd8xmy4kgnpfffj6hw893f80bwhp43i01zpmrinn3497mdf53b";
   };
 
-  buildInputs = [ cmake fftw boost ];
+  buildInputs = [ cmake ffmpeg boost ];
 
-  meta = {
+  cmakeFlags = [ "-DBUILD_EXAMPLES=ON" ];
+
+  postInstall = "installBin examples/fpcalc";
+
+  meta = with stdenv.lib; {
     homepage = "http://acoustid.org/chromaprint";
     description = "AcoustID audio fingerprinting library";
-    license = stdenv.lib.licenses.lgpl21Plus;
+    maintainers = with maintainers; [ emery ];
+    license = licenses.lgpl21Plus;
+    platforms = platforms.all;
   };
 }

From 4fc7e4e10edeaf2ed613a0f779a1176f3d67727f Mon Sep 17 00:00:00 2001
From: Emery Hemingway <emery@vfemail.net>
Date: Sat, 23 Aug 2014 17:56:06 -0400
Subject: [PATCH 0648/1453] picard: fix libdisc and acoustid fingerprinting
 issues

fpcalc is the external fingerprinter, not acoustid-fingerprinter
---
 pkgs/applications/audio/picard/default.nix | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix
index 07753216d3c3..235a81a6a32a 100644
--- a/pkgs/applications/audio/picard/default.nix
+++ b/pkgs/applications/audio/picard/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pythonPackages, gettext, pyqt4
-, pkgconfig, libdiscid, libofa, ffmpeg, acoustidFingerprinter
+, pkgconfig, libdiscid, libofa, ffmpeg, chromaprint
 }:
 
 pythonPackages.buildPythonPackage rec {
@@ -9,14 +9,16 @@ pythonPackages.buildPythonPackage rec {
 
   src = fetchurl {
     url = "http://ftp.musicbrainz.org/pub/musicbrainz/picard/${name}.tar.gz";
-    md5 = "d1086687b7f7b0d359a731b1a25e7b66";
+    sha256 = "0sbsf8hzxhxcnnjqvsd6mc23lmk7w33nln0f3w72f89mjgs6pxm6";
   };
 
   postPatch = let
-    fpr = "${acoustidFingerprinter}/bin/acoustid-fingerprinter";
+    discid = "${libdiscid}/lib/libdiscid.so.0";
+    fpr = "${chromaprint}/bin/fpcalc";
   in ''
-    sed -ri -e 's|(TextOption.*"acoustid_fpcalc"[^"]*")[^"]*|\1${fpr}|' \
-      picard/ui/options/fingerprinting.py
+    substituteInPlace picard/disc.py --replace libdiscid.so.0 ${discid}
+    substituteInPlace picard/const.py \
+        --replace "FPCALC_NAMES = [" "FPCALC_NAMES = ['${fpr}',"
   '';
 
   buildInputs = [
@@ -46,9 +48,11 @@ pythonPackages.buildPythonPackage rec {
 
   doCheck = false;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "http://musicbrainz.org/doc/MusicBrainz_Picard";
     description = "The official MusicBrainz tagger";
-    license = stdenv.lib.licenses.gpl2;
+    maintainers = with maintainers; [ emery ];
+    license = licenses.gpl2;
+    platforms = platforms.all;
   };
 }

From be1ac7c04452763627ea4d4272904656f24783bc Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Wed, 27 Aug 2014 12:39:02 +0100
Subject: [PATCH 0649/1453] haskell-free-game: add maintainer

---
 pkgs/development/libraries/haskell/free-game/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/free-game/default.nix b/pkgs/development/libraries/haskell/free-game/default.nix
index d2a0f33892fd..ee47e6bb3f5b 100644
--- a/pkgs/development/libraries/haskell/free-game/default.nix
+++ b/pkgs/development/libraries/haskell/free-game/default.nix
@@ -21,5 +21,6 @@ cabal.mkDerivation (self: {
     description = "Create games for free";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
   };
 })

From d216d87e6ebf571c6c64dd32724679ace96be099 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Wed, 27 Aug 2014 12:49:55 +0100
Subject: [PATCH 0650/1453] haskellPackages.markdown: New expression

---
 .../libraries/haskell/markdown/default.nix    | 27 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/markdown/default.nix

diff --git a/pkgs/development/libraries/haskell/markdown/default.nix b/pkgs/development/libraries/haskell/markdown/default.nix
new file mode 100644
index 000000000000..746bd1c74846
--- /dev/null
+++ b/pkgs/development/libraries/haskell/markdown/default.nix
@@ -0,0 +1,27 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, attoparsec, blazeHtml, conduit, conduitExtra, dataDefault
+, hspec, systemFileio, systemFilepath, text, transformers
+, xssSanitize
+}:
+
+cabal.mkDerivation (self: {
+  pname = "markdown";
+  version = "0.1.9";
+  sha256 = "1bl86alrbl9i690sbqqlxb4hkdd0lv3x5aqc8zi55q9h0rfsi06l";
+  buildDepends = [
+    attoparsec blazeHtml conduit conduitExtra dataDefault text
+    transformers xssSanitize
+  ];
+  testDepends = [
+    blazeHtml conduit conduitExtra hspec systemFileio systemFilepath
+    text transformers
+  ];
+  meta = {
+    homepage = "https://github.com/snoyberg/markdown";
+    description = "Convert Markdown to HTML, with XSS protection";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 3ddf87db53de..88176c01c1bb 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1537,6 +1537,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   machines = callPackage ../development/libraries/haskell/machines {};
 
+  markdown = callPackage ../development/libraries/haskell/markdown {};
+
   markdownUnlit = callPackage ../development/libraries/haskell/markdown-unlit {};
 
   mathFunctions = callPackage ../development/libraries/haskell/math-functions {};

From 591ba58e426407c0f97bfb81ee690900d44e2052 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 27 Aug 2014 14:55:03 +0200
Subject: [PATCH 0651/1453] perlPackages.NetAMQP: fix build

---
 pkgs/top-level/perl-packages.nix | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index a74cd8f2d8f4..f21569b2525b 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6467,7 +6467,7 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  NetAMQP = buildPerlPackage {
+  NetAMQP = buildPerlModule {
     name = "Net-AMQP-0.06";
     src = fetchurl {
       url = mirror://cpan/authors/id/C/CH/CHIPS/Net-AMQP-0.06.tar.gz;
@@ -6481,13 +6481,6 @@ let self = _self // overrides; _self = with self; {
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
-    preConfigure =
-      ''
-        substituteInPlace META.json \
-          '"Module::Build" : "0.40"' '"Module::Build" : "0.39"'
-        substituteInPlace META.yml \
-          'Module::Build: 0.40' 'Module::Build: 0.39'
-      '';
   };
 
   NetCoverArtArchive = buildPerlPackage {

From 0ac13e87d727de8db2ad4b8763d615c77d5ed918 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Wed, 27 Aug 2014 10:06:59 -0300
Subject: [PATCH 0652/1453] Lilyterm: New Package (version 0.9.9.4)

LilyTerm is a terminal emulator based off of libvte that aims to be fast and lightweight.
---
 pkgs/applications/misc/lilyterm/default.nix | 35 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  5 +++
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/applications/misc/lilyterm/default.nix

diff --git a/pkgs/applications/misc/lilyterm/default.nix b/pkgs/applications/misc/lilyterm/default.nix
new file mode 100644
index 000000000000..c87b6a8bc0a1
--- /dev/null
+++ b/pkgs/applications/misc/lilyterm/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl
+, pkgconfig
+, autoconf, automake, intltool, gettext
+, gtk, vte }:
+
+stdenv.mkDerivation rec {
+
+  name = "lilyterm-${version}";
+  version = "0.9.9.4";
+
+  src = fetchurl {
+    url = "http://lilyterm.luna.com.tw/file/${name}.tar.gz";
+    sha256 = "0x2x59qsxq6d6xg5sd5lxbsbwsdvkwqlk17iw3h4amjg3m1jc9mp";
+  };
+
+  buildInputs = [ pkgconfig autoconf automake intltool gettext gtk vte ];
+
+  preConfigure = "sh autogen.sh";
+
+  configureFlags = ''
+    --enable-nls
+    --enable-safe-mode
+  '';
+
+    meta = {
+    description = "A fast, lightweight terminal emulator";
+    longDescription = ''
+    LilyTerm is a terminal emulator based off of libvte that aims to be fast and lightweight.
+    '';
+    homepage = http://lilyterm.luna.com.tw/;
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = [ stdenv.lib.maintainers.AndersonTorres ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0a97c43463d4..6362a617bd93 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9201,6 +9201,11 @@ let
 
   handbrake = callPackage ../applications/video/handbrake { };
 
+  lilyterm = callPackage ../applications/misc/lilyterm {
+    inherit (gnome) vte;
+    gtk = gtk2;
+  };
+  
   lynx = callPackage ../applications/networking/browsers/lynx { };
 
   lyx = callPackage ../applications/misc/lyx { };

From aaa6156deba990018d48d9521a1d1ce9277bde0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 27 Aug 2014 15:13:43 +0200
Subject: [PATCH 0653/1453] python3Packages.subprocess32: disable on py3k

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7a2e90e56d28..3eb09bca40d2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7837,6 +7837,7 @@ rec {
 
   subprocess32 = buildPythonPackage rec {
     name = "subprocess32-3.2.6";
+    disabled = isPy3k;
 
     src = fetchurl {
       url = "https://pypi.python.org/packages/source/s/subprocess32/${name}.tar.gz";

From 1cb510784ac5881334379e10bd433e987cc24b92 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Wed, 27 Aug 2014 11:46:19 +0100
Subject: [PATCH 0654/1453] haskell-dns: update to 1.4.4

---
 pkgs/development/libraries/haskell/dns/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/dns/default.nix b/pkgs/development/libraries/haskell/dns/default.nix
index 113e1af46eed..ab74819965a7 100644
--- a/pkgs/development/libraries/haskell/dns/default.nix
+++ b/pkgs/development/libraries/haskell/dns/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "dns";
-  version = "1.4.3";
-  sha256 = "15v24f338w71dn3cxrzwyg04hk3vxvrvswbv3nnf2ggjgg46yq3i";
+  version = "1.4.4";
+  sha256 = "1g910rlahvrhjlg6jl7gpya1y3mqkkpmihfr2jnmmlzykll10dnd";
   buildDepends = [
     attoparsec binary blazeBuilder conduit conduitExtra iproute mtl
     network random resourcet
@@ -21,5 +21,6 @@ cabal.mkDerivation (self: {
     description = "DNS library in Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
   };
 })

From 422073018cfffbc2ed4f94afdd64e4e45f4817fc Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Wed, 27 Aug 2014 11:46:30 +0100
Subject: [PATCH 0655/1453] haskell-github: update to 0.11.0

---
 pkgs/development/libraries/haskell/github/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/github/default.nix b/pkgs/development/libraries/haskell/github/default.nix
index b35055b77198..f20976b8dcfb 100644
--- a/pkgs/development/libraries/haskell/github/default.nix
+++ b/pkgs/development/libraries/haskell/github/default.nix
@@ -7,18 +7,18 @@
 
 cabal.mkDerivation (self: {
   pname = "github";
-  version = "0.10.0";
-  sha256 = "1llwzkhyw5wazczpiv3w8dq4l7j3q49ii64yh7cxwakkp2h5yiwb";
+  version = "0.11.0";
+  sha256 = "13p0iplxr85fvgx5lird76xchmhh7xpddq900qr02kbvn5mqv607";
   buildDepends = [
     aeson attoparsec caseInsensitive conduit dataDefault failure
     hashable HTTP httpConduit httpTypes network text time
     unorderedContainers vector
   ];
-  jailbreak = true;
   meta = {
     homepage = "https://github.com/fpco/github";
     description = "Access to the Github API, v3";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
   };
 })

From 44922143fa4eba93c690177c839d9e30406db0a0 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Wed, 27 Aug 2014 11:46:42 +0100
Subject: [PATCH 0656/1453] haskell-hakyll: update to 4.5.4.0

---
 .../development/libraries/haskell/hakyll/default.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix
index 1bb23f07bdbb..e38eadad0575 100644
--- a/pkgs/development/libraries/haskell/hakyll/default.nix
+++ b/pkgs/development/libraries/haskell/hakyll/default.nix
@@ -5,13 +5,13 @@
 , HUnit, lrucache, mtl, network, pandoc, pandocCiteproc, parsec
 , QuickCheck, random, regexBase, regexTdfa, snapCore, snapServer
 , systemFilepath, tagsoup, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2, text, time
+, testFrameworkQuickcheck2, text, time, utillinux
 }:
 
 cabal.mkDerivation (self: {
   pname = "hakyll";
-  version = "4.5.3.0";
-  sha256 = "11ibpjff1zkihpxydlzvvzbgd1vxswi4c7g3lr0hhaaw89bikypy";
+  version = "4.5.4.0";
+  sha256 = "16srkm2fxjw1xg7zaikn49zz4xsz9awddnjm6ibv522k3xf3l24c";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -25,15 +25,13 @@ cabal.mkDerivation (self: {
     filepath fsnotify httpConduit httpTypes HUnit lrucache mtl network
     pandoc pandocCiteproc parsec QuickCheck random regexBase regexTdfa
     snapCore snapServer systemFilepath tagsoup testFramework
-    testFrameworkHunit testFrameworkQuickcheck2 text time
+    testFrameworkHunit testFrameworkQuickcheck2 text time utillinux
   ];
-  doCheck = false;
   meta = {
     homepage = "http://jaspervdj.be/hakyll";
     description = "A static website compiler library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
+    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
   };
 })

From e50deca4401083f10b8e81599679cc6b8c252111 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 27 Aug 2014 15:39:47 +0200
Subject: [PATCH 0657/1453] python3Packages.statd: rename to python_statsd,
 disable on py3k

---
 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 3eb09bca40d2..49b739884583 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8012,9 +8012,10 @@ rec {
   };
 
 
-  statd = buildPythonPackage rec {
+  python_statsd = buildPythonPackage rec {
     name = "python-statsd-${version}";
     version = "1.6.0";
+    disabled = isPy3k;  # next release will be py3k compatible
 
     src = fetchurl {
       url = "https://pypi.python.org/packages/source/p/python-statsd/${name}.tar.gz";

From 62345fee552f1285ccd5ad60615ee922639dc5a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 27 Aug 2014 15:52:44 +0200
Subject: [PATCH 0658/1453] python: provide better message if python
 interpreter is not supported

---
 pkgs/development/python-modules/generic/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix
index 0f5d84994541..4c9c53aab834 100644
--- a/pkgs/development/python-modules/generic/default.nix
+++ b/pkgs/development/python-modules/generic/default.nix
@@ -49,10 +49,9 @@
 
 , ... } @ attrs:
 
-assert (!disabled);
 
 # Keep extra attributes from `attrs`, e.g., `patchPhase', etc.
-python.stdenv.mkDerivation (attrs // {
+if disabled then throw "${name} not supported for interpreter ${python.executable}" else python.stdenv.mkDerivation (attrs // {
   inherit doCheck;
 
   name = namePrefix + name;

From 6f689c50169f5567a382984063ca296055a3043a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 27 Aug 2014 15:53:00 +0200
Subject: [PATCH 0659/1453] python3Packages: disable some more packages

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 49b739884583..81ec988d8809 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8311,6 +8311,7 @@ rec {
 
   trac = buildPythonPackage {
     name = "trac-1.0.1";
+    disabled = isPy3k;
 
     src = fetchurl {
       url = http://ftp.edgewall.com/pub/trac/Trac-1.0.1.tar.gz;
@@ -8414,6 +8415,7 @@ rec {
 
   tweepy = buildPythonPackage (rec {
     name = "tweepy-2.3.0";
+    disabled = isPy3k;
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/t/tweepy/${name}.tar.gz";

From 1f3af28e8a6674841c674fb883edde2bbeecee2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 27 Aug 2014 16:04:55 +0200
Subject: [PATCH 0660/1453] python3Packages.execnet: disable tests

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 81ec988d8809..92f30ed5ca92 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1985,6 +1985,8 @@ rec {
       md5 = "be885ccd9612966bb81839670d2da099";
     };
 
+    doCheck = !isPy3k;  # failures..
+
     meta = {
       description = "rapid multi-Python deployment";
       license = stdenv.lib.licenses.gpl2;

From 2faf1c5b8115c765ef0344f76dda91ecae6c6d95 Mon Sep 17 00:00:00 2001
From: Bodil Stokke <bodil@bodil.org>
Date: Wed, 27 Aug 2014 15:38:15 +0100
Subject: [PATCH 0661/1453] Add evilvte package.

---
 pkgs/applications/misc/evilvte/default.nix | 35 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  4 +++
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/applications/misc/evilvte/default.nix

diff --git a/pkgs/applications/misc/evilvte/default.nix b/pkgs/applications/misc/evilvte/default.nix
new file mode 100644
index 000000000000..5921cc308b5b
--- /dev/null
+++ b/pkgs/applications/misc/evilvte/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchgit, makeWrapper, pkgconfig,
+  gnome, glib, pango, cairo, gdk_pixbuf, atk, freetype, xlibs,
+  configH
+}:
+
+stdenv.mkDerivation rec {
+  name = "evilvte-${version}";
+  version = "0.5.2-20140827";
+
+  src = fetchgit {
+    url = https://github.com/caleb-/evilvte.git;
+    rev = "8dfa41e26bc640dd8d8c7317ff7d04e3c01ded8a";
+    sha256 = "70f1d4234d077121e2223a735d749d1b53f0b84393507b635b8a37c3716e94d3";
+  };
+
+  buildInputs = [
+    gnome.vte glib pango gnome.gtk cairo gdk_pixbuf atk freetype xlibs.libX11
+    xlibs.xproto xlibs.kbproto xlibs.libXext xlibs.xextproto makeWrapper pkgconfig
+  ];
+
+  buildPhase = ''
+    cat >src/config.h <<EOF
+    ${configH}
+    EOF
+    make
+  '';
+
+  meta = with stdenv.lib; {
+    description = "VTE based, highly customizable terminal emulator";
+    homepage = http://www.calno.com/evilvte;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.bodil ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0a97c43463d4..36910fafadcd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8661,6 +8661,10 @@ let
     inherit (gnome) gnomedocutils libgnome libglade libgnomeui scrollkeeper;
   };
 
+  evilvte = callPackage ../applications/misc/evilvte {
+    configH = config.evilvte.config or "";
+  };
+
   evopedia = callPackage ../applications/misc/evopedia { };
 
   keepassx = callPackage ../applications/misc/keepassx { };

From f4a9d3c0d0f9b1bddd79b91e103fe91db9975422 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 13 Aug 2014 04:53:31 +0200
Subject: [PATCH 0662/1453] chromium: Clean up/remove old/unused stuff.

We no longer need to supply compiler and binutils to the build process,
se we can safely remove them. In addition, we're now passing the new
options linux_use_gold_binary and linux_use_bundled_gold to gyp, for
details, see:

https://codereview.chromium.org/239163003

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../networking/browsers/chromium/common.nix       | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index b9011c0236f3..da06a7f466f0 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -10,7 +10,7 @@
 , python, pythonPackages, perl, pkgconfig
 , nspr, udev, krb5
 , utillinux, alsaLib
-, gcc, bison, gperf
+, bison, gperf
 , glib, gtk, dbus_glib
 , libXScrnSaver, libXcursor, libXtst, mesa
 , protobuf, speechd, libXdamage
@@ -145,6 +145,8 @@ let
     '';
 
     gypFlags = mkGypFlags (gypFlagsUseSystemLibs // {
+      linux_use_bundled_binutils = false;
+      linux_use_bundled_gold = false;
       linux_use_gold_binary = false;
       linux_use_gold_flags = false;
       proprietary_codecs = false;
@@ -192,20 +194,15 @@ let
     '';
 
     buildPhase = let
-      CC = "${gcc}/bin/gcc";
-      CXX = "${gcc}/bin/g++";
       buildCommand = target: let
         # XXX: Only needed for version 36 and older!
         targetSuffix = optionalString
           (versionOlder source.version "37.0.0.0" && target == "mksnapshot")
           (if stdenv.is64bit then ".x64" else ".ia32");
       in ''
-        CC="${CC}" CC_host="${CC}"     \
-        CXX="${CXX}" CXX_host="${CXX}" \
-        LINK_host="${CXX}"             \
-          "${ninja}/bin/ninja" -C "${buildPath}"  \
-            -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES \
-            "${target}${targetSuffix}"
+        "${ninja}/bin/ninja" -C "${buildPath}"  \
+          -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES \
+          "${target}${targetSuffix}"
       '' + optionalString (target == "mksnapshot" || target == "chrome") ''
         paxmark m "${buildPath}/${target}${targetSuffix}"
       '';

From 1488fbe27b5d767176000f6499e3292a458e3d33 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 13 Aug 2014 04:49:53 +0200
Subject: [PATCH 0663/1453] chromium: Update all channels to latest versions.

With this commit, the following new upstream versions are introduced:

stable: 36.0.1985.125 -> 37.0.2062.94
beta:   37.0.2062.58  -> 37.0.2062.94
dev:    38.0.2107.3   -> 38.0.2125.8

All channels built fine on my machine and were tested against a few
sites.

Stable and beta channel now contain the same release, because version
37 hit the stable channel. For release notes, please have a look at the
announcement:

http://googlechromereleases.blogspot.de/2014/08/stable-channel-update_26.html

Of course we're also dropping all version 36 specific crap, such as the
architecture-specific target suffix for builds, which now is no longer
needed.

The gyp flag use_mojo=0 is no longer needed, as it was a workaround
concerning version 37.0.2054.3 only.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../networking/browsers/chromium/common.nix   | 14 +++--------
 .../browsers/chromium/source/sources.nix      | 24 +++++++++----------
 2 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index da06a7f466f0..46dadd280c9a 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -163,9 +163,6 @@ let
       werror = "";
       clang = false;
 
-      # FIXME: In version 37, omnibox.mojom.js doesn't seem to be generated.
-      use_mojo = versionOlder source.version "37.0.0.0";
-
       # Google API keys, see:
       #   http://www.chromium.org/developers/how-tos/api-keys
       # Note: These are for NixOS/nixpkgs use ONLY. For your own distribution,
@@ -194,17 +191,12 @@ let
     '';
 
     buildPhase = let
-      buildCommand = target: let
-        # XXX: Only needed for version 36 and older!
-        targetSuffix = optionalString
-          (versionOlder source.version "37.0.0.0" && target == "mksnapshot")
-          (if stdenv.is64bit then ".x64" else ".ia32");
-      in ''
+      buildCommand = target: ''
         "${ninja}/bin/ninja" -C "${buildPath}"  \
           -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES \
-          "${target}${targetSuffix}"
+          "${target}"
       '' + optionalString (target == "mksnapshot" || target == "chrome") ''
-        paxmark m "${buildPath}/${target}${targetSuffix}"
+        paxmark m "${buildPath}/${target}"
       '';
       targets = extraAttrs.buildTargets or [];
       commands = map buildCommand targets;
diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix
index 4a610827913f..71c825188c3c 100644
--- a/pkgs/applications/networking/browsers/chromium/source/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix
@@ -1,21 +1,21 @@
 # This file is autogenerated from update.sh in the parent directory.
 {
   dev = {
-    version = "38.0.2107.3";
-    sha256 = "0zb1mj3xgvvs5ijix4b52vj9dlymqkipn8srfzvhwl7g4hx5ss3v";
-    sha256bin32 = "12lvvmg3bqacb0qw72bwlxm2m57s39mz2810agngdgzv0hd835cv";
-    sha256bin64 = "1vw36s8nlvdsl8pjbh4gny00kvcizn1i2lznzqzysicz2rz7ncrh";
+    version = "38.0.2125.8";
+    sha256 = "1h3vkp0mgznqv48ksnsndlh7ywh3jby25x6dxxd7py445pg6y3c6";
+    sha256bin32 = "1ynqm5yp7m8j3mwgqaa2vvw835g9ifn3dfniqh9z9n0swha27a69";
+    sha256bin64 = "1vdm4wffkvj3jwrb2nihghxkxcvp81xcc5wygpd1w495vrhy4bpf";
   };
   beta = {
-    version = "37.0.2062.58";
-    sha256 = "0jck4s6nrizj9wmifsjviin9ifnviihs21fi05wzljyfnbgc4byl";
-    sha256bin32 = "1cm1r8bqy66gvdhbrgn9pdc11i72dca96ab5j3m3349p6728jbgk";
-    sha256bin64 = "0cpb189pn5jiplldkgy8lfbcwvfik66kjjf6y2i708xa5ggfpwfi";
+    version = "37.0.2062.94";
+    sha256 = "0cz5kivimxcaiml6x5mysarjyfvvanbw02qz2d1y3jvl1dc1jz6j";
+    sha256bin32 = "0pa209sjdfb0y96kicvp4lnn1inwdcgj8kpmn28cmi8l1cr8yy3b";
+    sha256bin64 = "0kk2dm2gwvzvrrp03k7cw6zzp3197lrq2p1si3pr2wbgm8sb5dk5";
   };
   stable = {
-    version = "36.0.1985.125";
-    sha256 = "08shkm89qzzdlrjg0rg5qiszbk6ziginsicyxqyk353y76jx10hp";
-    sha256bin32 = "1ahazz56k127xncgl1lzwsmydbh0vcxq0hzrb9cm9zzdkzqjzg03";
-    sha256bin64 = "0qx5316cd8l9g8w389aqi5m3csmr5s8hs7sivlk02mbs0jzi8ppc";
+    version = "37.0.2062.94";
+    sha256 = "0cz5kivimxcaiml6x5mysarjyfvvanbw02qz2d1y3jvl1dc1jz6j";
+    sha256bin32 = "0vszphfz4mnw08yc6bid4g6q2w4f5smvfhlzyb2vvv65ndr64b8k";
+    sha256bin64 = "0h4fb7v0b1w9d47iy6fk5g0fpzgczps7nzmknyk7vx68ybi39ssw";
   };
 }

From 47f84c63bb09904a38952fedc44ca17d64aada40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 27 Aug 2014 17:17:31 +0200
Subject: [PATCH 0664/1453] python3Packages: more build fixes

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 92f30ed5ca92..bb467d74a66a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -694,7 +694,7 @@ rec {
     };
 
     buildInputs = [ pkgs.btrfsProgs ];
-    propagatedBuildInputs = with pkgs; [ contextlib2 sqlalchemy8 pyxdg pycparser cffi alembic ];
+    propagatedBuildInputs = with pkgs; [ contextlib2 sqlalchemy9 pyxdg pycparser cffi alembic ];
 
     meta = {
       description = "Deduplication for Btrfs";
@@ -6069,6 +6069,7 @@ rec {
 
   pycurl2 = buildPythonPackage (rec {
     name = "pycurl2-7.20.0";
+    disabled = isPy3k;
 
     src = fetchgit {
       url = "https://github.com/Lispython/pycurl.git";
@@ -6091,6 +6092,7 @@ rec {
 
   pydot = buildPythonPackage rec {
     name = "pydot-1.0.2";
+    disabled = isPy3k;
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/p/pydot/${name}.tar.gz";
@@ -6600,6 +6602,7 @@ rec {
 
   pyreport = buildPythonPackage (rec {
     name = "pyreport-0.3.4c";
+    disabled = isPy3k;
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/p/pyreport/${name}.tar.gz";
@@ -7565,12 +7568,17 @@ rec {
   };
 
   sympy = buildPythonPackage rec {
-    name = "sympy-0.7.3";
+    name = "sympy-0.7.4";
 
     src = fetchurl {
       url    = "https://github.com/sympy/sympy/releases/download/${name}/${name}.tar.gz";
-      sha256 = "081g9gs2d1d41ipn8zr034d98cnrxvc4zsmihqmfwzirwzpcii5x";
+      sha256 = "0h1b9mx0snyyybj1x1ga69qssgjzkkgx2rw6nddjhyz1fknf8ywh";
     };
+    
+    preCheck = ''
+      export LANG="en_US.UTF-8"
+      export LOCALE_ARCHIVE=${pkgs.glibcLocales}/lib/locale/locale-archive
+    '';
 
     meta = with stdenv.lib; {
       description = "A Python library for symbolic mathematics";
@@ -7915,6 +7923,7 @@ rec {
 
   sqlalchemy = pkgs.lib.overrideDerivation sqlalchemy9 (args: rec {
     name = "SQLAlchemy-0.7.10";
+    disabled = isPy3k;
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/S/SQLAlchemy/${name}.tar.gz";
       sha256 = "0rhxgr85xdhjn467qfs0dkyj8x46zxcv6ad3dfx3w14xbkb3kakp";
@@ -7926,7 +7935,6 @@ rec {
     ];
   });
 
-
   sqlalchemy8 = pkgs.lib.overrideDerivation sqlalchemy9 (args: rec {
     name = "SQLAlchemy-0.8.7";
     src = fetchurl {

From e7597b12b88ac0ecfe3f8ca8d2bc7aade2aaef99 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <emery@vfemail.net>
Date: Tue, 22 Jul 2014 18:30:04 -0400
Subject: [PATCH 0665/1453] privoxy: upstart to systemd conversion, actions
 file editing

fix missing actions and filters
---
 nixos/modules/services/networking/privoxy.nix | 76 +++++++++++--------
 1 file changed, 44 insertions(+), 32 deletions(-)

diff --git a/nixos/modules/services/networking/privoxy.nix b/nixos/modules/services/networking/privoxy.nix
index 950112b2dabe..94beb78ef5a4 100644
--- a/nixos/modules/services/networking/privoxy.nix
+++ b/nixos/modules/services/networking/privoxy.nix
@@ -6,19 +6,18 @@ let
 
   inherit (pkgs) privoxy;
 
-  stateDir = "/var/spool/privoxy";
-
   privoxyUser = "privoxy";
 
-  privoxyFlags = "--no-daemon --user ${privoxyUser} ${privoxyCfg}";
+  cfg = config.services.privoxy;
 
-  privoxyCfg = pkgs.writeText "privoxy.conf" ''
-    listen-address  ${config.services.privoxy.listenAddress}
-    logdir          ${config.services.privoxy.logDir}
-    confdir         ${privoxy}/etc
-    filterfile      default.filter
-
-    ${config.services.privoxy.extraConfig}
+  confFile = pkgs.writeText "privoxy.conf" ''
+    user-manual ${privoxy}/share/doc/privoxy/user-manual
+    confdir ${privoxy}/etc/
+    listen-address  ${cfg.listenAddress}
+    enable-edit-actions ${if (cfg.enableEditActions == true) then "1" else "0"}
+    ${concatMapStrings (f: "actionsfile ${f}\n") cfg.actionsFiles}
+    ${concatMapStrings (f: "filterfile ${f}\n") cfg.filterFiles}
+    ${cfg.extraConfig}
   '';
 
 in
@@ -32,27 +31,51 @@ in
     services.privoxy = {
 
       enable = mkOption {
+        type = types.bool;
         default = false;
         description = ''
-          Whether to run the machine as a HTTP proxy server.
+          Whether to enable the Privoxy non-caching filtering proxy.
         '';
       };
 
       listenAddress = mkOption {
+        type = types.str;
         default = "127.0.0.1:8118";
         description = ''
           Address the proxy server is listening to.
         '';
       };
 
-      logDir = mkOption {
-        default = "/var/log/privoxy" ;
+      actionsFiles = mkOption {
+        type = types.listOf types.str;
+        example = [ "match-all.action" "default.action" "/etc/privoxy/user.action" ];
+        default = [ "match-all.action" "default.action" ];
         description = ''
-          Location for privoxy log files.
+          List of paths to Privoxy action files.
+          These paths may either be absolute or relative to the privoxy configuration directory.
+        '';
+      };
+
+      filterFiles = mkOption {
+        type = types.listOf types.str;
+        example = [ "default.filter" "/etc/privoxy/user.filter" ];
+        default = [ "default.filter" ];
+        description = ''
+          List of paths to Privoxy filter files.
+          These paths may either be absolute or relative to the privoxy configuration directory.
+        '';
+      };
+
+      enableEditActions = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether or not the web-based actions file editor may be used.
         '';
       };
 
       extraConfig = mkOption {
+        type = types.lines;
         default = "" ;
         description = ''
           Extra configuration. Contents will be added verbatim to the configuration file.
@@ -62,33 +85,22 @@ in
 
   };
 
-
   ###### implementation
 
-  config = mkIf config.services.privoxy.enable {
+  config = mkIf cfg.enable {
   
-    environment.systemPackages = [ privoxy ];
-
     users.extraUsers = singleton
       { name = privoxyUser;
         uid = config.ids.uids.privoxy;
         description = "Privoxy daemon user";
-        home = stateDir;
       };
 
-    jobs.privoxy =
-      { name = "privoxy";
-
-        startOn = "startup";
-
-        preStart =
-          ''
-            mkdir -m 0755 -p ${stateDir}
-            chown ${privoxyUser} ${stateDir}
-          '';
-
-        exec = "${privoxy}/sbin/privoxy ${privoxyFlags}";
-      };
+    systemd.services.privoxy = {
+      description = "Filtering web proxy";
+      after = [ "network.target" "nss-lookup.target" ];
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig.ExecStart = "${privoxy}/sbin/privoxy --no-daemon --user ${privoxyUser} ${confFile}";
+    };
 
   };
 

From 30aac2c87733d4dd5233cb04250f9ff540af443b Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@immobiliare.it>
Date: Wed, 27 Aug 2014 17:16:50 +0200
Subject: [PATCH 0666/1453] glib-tested: skip broken timer test on i686

---
 pkgs/development/libraries/glib/default.nix     |  2 +-
 .../libraries/glib/skip-timer-test.patch        | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/glib/skip-timer-test.patch

diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 93e96bef536a..839ba7cfa951 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
     sha256 = "1d98mbqjmc34s8095lkw1j1bwvnnkw9581yfvjaikjvfjsaz29qd";
   };
 
-  patches = optional stdenv.isDarwin ./darwin-compilation.patch;
+  patches = optional stdenv.isDarwin ./darwin-compilation.patch ++ optional doCheck ./skip-timer-test.patch;
 
   setupHook = ./setup-hook.sh;
 
diff --git a/pkgs/development/libraries/glib/skip-timer-test.patch b/pkgs/development/libraries/glib/skip-timer-test.patch
new file mode 100644
index 000000000000..942f3e7864c4
--- /dev/null
+++ b/pkgs/development/libraries/glib/skip-timer-test.patch
@@ -0,0 +1,17 @@
+Description: Skip test which performs some unreliable floating point comparisons
+Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=722604
+
+Index: b/glib/tests/timer.c
+===================================================================
+--- a/glib/tests/timer.c
++++ b/glib/tests/timer.c
+@@ -203,7 +203,7 @@
+ {
+   g_test_init (&argc, &argv, NULL);
+ 
+-  g_test_add_func ("/timer/basic", test_timer_basic);
++/*  g_test_add_func ("/timer/basic", test_timer_basic);*/
+-  g_test_add_func ("/timer/stop", test_timer_stop);
++/*  g_test_add_func ("/timer/stop", test_timer_stop);*/
+   g_test_add_func ("/timer/continue", test_timer_continue);
+   g_test_add_func ("/timer/reset", test_timer_reset);

From 81c39d40f7aad827a500d1efb779be08ea4f9a04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 27 Aug 2014 17:40:02 +0200
Subject: [PATCH 0667/1453] python3Packages: upgrade rdflib, skype4py

---
 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 bb467d74a66a..c0d9db2b8b1e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7042,11 +7042,11 @@ rec {
 
 
   rdflib = buildPythonPackage (rec {
-    name = "rdflib-3.0.0";
+    name = "rdflib-4.1.2";
 
     src = fetchurl {
-      url = "http://www.rdflib.net/${name}.tar.gz";
-      sha256 = "1c7ipk5vwqnln83rmai5jzyxkjdajdzbk5cgy1z83nyr5hbkgkqr";
+      url = "https://pypi.python.org/packages/source/r/rdflib/${name}.tar.gz";
+      sha256 = "0kvaf332cqbi47rqzlpdx4mbkvw12mkrzkj8n9l19wk713d4py9w";
     };
 
     # error: invalid command 'test'
@@ -7759,6 +7759,7 @@ rec {
 
   skype4py = buildPythonPackage (rec {
     name = "Skype4Py-1.0.32.0";
+    disabled = isPy3k;
 
     src = fetchurl {
       url = mirror://sourceforge/skype4py/Skype4Py-1.0.32.0.tar.gz;

From a81b2f029f58800b6dfe747188a91f8d28b5a78a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 27 Aug 2014 18:04:30 +0200
Subject: [PATCH 0668/1453] python3Packages.{ttystatus,versiontools}: disable
 on py3k

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c0d9db2b8b1e..9ff71c63a85f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9759,6 +9759,7 @@ rec {
   ttystatus = buildPythonPackage rec {
     name = "ttystatus-${version}";
     version = "0.23";
+    disabled = isPy3k;
 
     src = fetchurl rec {
       url = "http://code.liw.fi/debian/pool/main/p/python-ttystatus/python-ttystatus_${version}.orig.tar.gz";
@@ -9944,6 +9945,7 @@ rec {
 
   versiontools = buildPythonPackage rec {
     name = "versiontools-1.9.1";
+    doCheck = (!isPy3k);
 
     src = fetchurl {
       url = "https://pypi.python.org/packages/source/v/versiontools/${name}.tar.gz";

From 6e2e58ea2eaefb22556ed246850542877bcf72d9 Mon Sep 17 00:00:00 2001
From: Alp Mestanogullari <alpmestan@gmail.com>
Date: Wed, 27 Aug 2014 18:05:06 +0200
Subject: [PATCH 0669/1453] add the servant (haskell) packages to nixpkgs

---
 .../haskell/servant-pool/servant-pool.nix     | 16 +++++++++++++++
 .../servant-postgresql/servant-postgresql.nix | 18 +++++++++++++++++
 .../servant-response/servant-response.nix     | 16 +++++++++++++++
 .../haskell/servant-scotty/servant-scotty.nix | 20 +++++++++++++++++++
 .../libraries/haskell/servant/servant.nix     | 15 ++++++++++++++
 pkgs/top-level/haskell-packages.nix           | 10 ++++++++++
 6 files changed, 95 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/servant-pool/servant-pool.nix
 create mode 100644 pkgs/development/libraries/haskell/servant-postgresql/servant-postgresql.nix
 create mode 100644 pkgs/development/libraries/haskell/servant-response/servant-response.nix
 create mode 100644 pkgs/development/libraries/haskell/servant-scotty/servant-scotty.nix
 create mode 100644 pkgs/development/libraries/haskell/servant/servant.nix

diff --git a/pkgs/development/libraries/haskell/servant-pool/servant-pool.nix b/pkgs/development/libraries/haskell/servant-pool/servant-pool.nix
new file mode 100644
index 000000000000..692d694ed468
--- /dev/null
+++ b/pkgs/development/libraries/haskell/servant-pool/servant-pool.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, resourcePool, servant, time }:
+
+cabal.mkDerivation (self: {
+  pname = "servant-pool";
+  version = "0.1";
+  sha256 = "0if4lxb0fpdd4lnkz9j7z6vhjbrcc80pvz9jb6sdb9p6sbbgqf69";
+  buildDepends = [ resourcePool servant time ];
+  meta = {
+    homepage = "http://github.com/zalora/servant-pool";
+    description = "Utility functions for creating servant 'Context's with \"context/connection pooling\" support";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/servant-postgresql/servant-postgresql.nix b/pkgs/development/libraries/haskell/servant-postgresql/servant-postgresql.nix
new file mode 100644
index 000000000000..154eefea320e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/servant-postgresql/servant-postgresql.nix
@@ -0,0 +1,18 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, postgresqlSimple, servant, servantPool, servantResponse }:
+
+cabal.mkDerivation (self: {
+  pname = "servant-postgresql";
+  version = "0.1";
+  sha256 = "1svy1v6sl5pq0zs8ms4qf7wn6zar63bqmfiyfqgz84ryli0wxrhj";
+  buildDepends = [
+    postgresqlSimple servant servantPool servantResponse
+  ];
+  meta = {
+    homepage = "http://github.com/zalora/servant-postgresql";
+    description = "Useful functions and instances for using servant with a PostgreSQL context";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/servant-response/servant-response.nix b/pkgs/development/libraries/haskell/servant-response/servant-response.nix
new file mode 100644
index 000000000000..3f7f9c1eee05
--- /dev/null
+++ b/pkgs/development/libraries/haskell/servant-response/servant-response.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, aeson, httpTypes, text }:
+
+cabal.mkDerivation (self: {
+  pname = "servant-response";
+  version = "0.1";
+  sha256 = "0vgzi6nm3f1vjbnvhzcr6v2fh75fsl18wsps54ya0mbmfn2v6chy";
+  buildDepends = [ aeson httpTypes text ];
+  meta = {
+    homepage = "http://github.com/zalora/servant";
+    description = "Machinery to express how servant should turn results of database operations into proper JSON-encodable response types";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/servant-scotty/servant-scotty.nix b/pkgs/development/libraries/haskell/servant-scotty/servant-scotty.nix
new file mode 100644
index 000000000000..2d053d3409d9
--- /dev/null
+++ b/pkgs/development/libraries/haskell/servant-scotty/servant-scotty.nix
@@ -0,0 +1,20 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, aeson, httpTypes, scotty, servant, servantResponse, text
+, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "servant-scotty";
+  version = "0.1";
+  sha256 = "0nl4ghx4hp1329sgnphirnnikxyn5hgw0iz5dga5ib16bmkzbsvi";
+  buildDepends = [
+    aeson httpTypes scotty servant servantResponse text transformers
+  ];
+  meta = {
+    homepage = "http://github.com/zalora/servant";
+    description = "Generate a web service for servant 'Resource's using scotty and JSON";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/servant/servant.nix b/pkgs/development/libraries/haskell/servant/servant.nix
new file mode 100644
index 000000000000..38f89764c4c8
--- /dev/null
+++ b/pkgs/development/libraries/haskell/servant/servant.nix
@@ -0,0 +1,15 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "servant";
+  version = "0.1";
+  sha256 = "1bm5223rjgcm8rb3s2mclmfj2df7j059jjh572a5py0rdqzg3yj0";
+  meta = {
+    homepage = "http://github.com/zalora/servant";
+    description = "A library to generate REST-style webservices on top of scotty, handling all the boilerplate for you";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 88176c01c1bb..6ecaf116db24 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2152,6 +2152,16 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   semigroupoidExtras = callPackage ../development/libraries/haskell/semigroupoid-extras {};
 
+  servant = callPackage ../development/libraries/haskell/servant {};
+
+  servant-pool = callPackage ../development/libraries/haskell/servant-pool {};
+
+  servant-postgresql = callPackage ../development/libraries/haskell/servant-postgresql {};
+
+  servant-response = callPackage ../development/libraries/haskell/servant-response {};
+
+  servant-scotty = callPackage ../development/libraries/haskell/servant-scotty {};
+
   setenv = callPackage ../development/libraries/haskell/setenv {};
 
   setlocale = callPackage ../development/libraries/haskell/setlocale {};

From 47519e732b2d304ea38d226fc45bee5fdb711ba3 Mon Sep 17 00:00:00 2001
From: Alp Mestanogullari <alpmestan@gmail.com>
Date: Wed, 27 Aug 2014 18:27:18 +0200
Subject: [PATCH 0670/1453] use camelCase instead of dashes for servant package
 names in haskell-packages.nix

---
 pkgs/top-level/haskell-packages.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 6ecaf116db24..7a4d4c4f10bd 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2154,13 +2154,13 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   servant = callPackage ../development/libraries/haskell/servant {};
 
-  servant-pool = callPackage ../development/libraries/haskell/servant-pool {};
+  servantPool = callPackage ../development/libraries/haskell/servant-pool {};
 
-  servant-postgresql = callPackage ../development/libraries/haskell/servant-postgresql {};
+  servantPostgresql = callPackage ../development/libraries/haskell/servant-postgresql {};
 
-  servant-response = callPackage ../development/libraries/haskell/servant-response {};
+  servantResponse = callPackage ../development/libraries/haskell/servant-response {};
 
-  servant-scotty = callPackage ../development/libraries/haskell/servant-scotty {};
+  servantScotty = callPackage ../development/libraries/haskell/servant-scotty {};
 
   setenv = callPackage ../development/libraries/haskell/setenv {};
 

From 9dd3963b4dbd5ead3626d34c5cb9a2c43bc02c38 Mon Sep 17 00:00:00 2001
From: Alp Mestanogullari <alpmestan@gmail.com>
Date: Wed, 27 Aug 2014 18:34:56 +0200
Subject: [PATCH 0671/1453] rename nix files to default.nix for all servant
 pkgs

---
 .../haskell/servant-pool/{servant-pool.nix => default.nix}        | 0
 .../servant-postgresql/{servant-postgresql.nix => default.nix}    | 0
 .../servant-response/{servant-response.nix => default.nix}        | 0
 .../haskell/servant-scotty/{servant-scotty.nix => default.nix}    | 0
 .../libraries/haskell/servant/{servant.nix => default.nix}        | 0
 5 files changed, 0 insertions(+), 0 deletions(-)
 rename pkgs/development/libraries/haskell/servant-pool/{servant-pool.nix => default.nix} (100%)
 rename pkgs/development/libraries/haskell/servant-postgresql/{servant-postgresql.nix => default.nix} (100%)
 rename pkgs/development/libraries/haskell/servant-response/{servant-response.nix => default.nix} (100%)
 rename pkgs/development/libraries/haskell/servant-scotty/{servant-scotty.nix => default.nix} (100%)
 rename pkgs/development/libraries/haskell/servant/{servant.nix => default.nix} (100%)

diff --git a/pkgs/development/libraries/haskell/servant-pool/servant-pool.nix b/pkgs/development/libraries/haskell/servant-pool/default.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/servant-pool/servant-pool.nix
rename to pkgs/development/libraries/haskell/servant-pool/default.nix
diff --git a/pkgs/development/libraries/haskell/servant-postgresql/servant-postgresql.nix b/pkgs/development/libraries/haskell/servant-postgresql/default.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/servant-postgresql/servant-postgresql.nix
rename to pkgs/development/libraries/haskell/servant-postgresql/default.nix
diff --git a/pkgs/development/libraries/haskell/servant-response/servant-response.nix b/pkgs/development/libraries/haskell/servant-response/default.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/servant-response/servant-response.nix
rename to pkgs/development/libraries/haskell/servant-response/default.nix
diff --git a/pkgs/development/libraries/haskell/servant-scotty/servant-scotty.nix b/pkgs/development/libraries/haskell/servant-scotty/default.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/servant-scotty/servant-scotty.nix
rename to pkgs/development/libraries/haskell/servant-scotty/default.nix
diff --git a/pkgs/development/libraries/haskell/servant/servant.nix b/pkgs/development/libraries/haskell/servant/default.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/servant/servant.nix
rename to pkgs/development/libraries/haskell/servant/default.nix

From 4d84ac77f99dc077f15b04ac2462638c2f1a4ff1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=BCdiger=20Sonderfeld?= <ruediger@c-plusplus.de>
Date: Wed, 27 Aug 2014 18:46:24 +0200
Subject: [PATCH 0672/1453] gimp: Update to 2.8.14.

---
 pkgs/applications/graphics/gimp/2.8.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix
index aca4d822c820..bd155c59c6b2 100644
--- a/pkgs/applications/graphics/gimp/2.8.nix
+++ b/pkgs/applications/graphics/gimp/2.8.nix
@@ -4,11 +4,11 @@
 , python, pygtk, libart_lgpl, libexif, gettext, xlibs, wrapPython }:
 
 stdenv.mkDerivation rec {
-  name = "gimp-2.8.10";
+  name = "gimp-2.8.14";
 
   src = fetchurl {
     url = "http://download.gimp.org/pub/gimp/v2.8/${name}.tar.bz2";
-    sha256 = "1rha8yx0pplfjziqczjrxxp16vsvpmb5ziq3c218s4w9z4cqpzg7";
+    sha256 = "d82a958641c9c752d68e35f65840925c08e314cea90222ad845892a40e05b22d";
   };
 
   buildInputs =

From ef9bcbd0b2b5d5f8c1d08f643c138e68c0e7a5d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 27 Aug 2014 19:02:05 +0200
Subject: [PATCH 0673/1453] ino: set six as dep

---
 pkgs/development/arduino/ino/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/arduino/ino/default.nix b/pkgs/development/arduino/ino/default.nix
index 3e74c143c61b..484de02f05dd 100644
--- a/pkgs/development/arduino/ino/default.nix
+++ b/pkgs/development/arduino/ino/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   # TODO: add avrgcclibc, it must be rebuild with C++ support
   propagatedBuildInputs =
     [ arduino_core avrdude minicom pythonPackages.configobj
-      pythonPackages.jinja2 pythonPackages.pyserial ];
+      pythonPackages.jinja2 pythonPackages.pyserial pythonPackages.six ];
 
   patchPhase = ''
     echo "Patching Arduino distribution path"

From 7b7fb6331450ab7148dab51c5363ac86cb7d0371 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 27 Aug 2014 19:04:38 +0200
Subject: [PATCH 0674/1453] pypy: disable test_sqlite again...

---
 pkgs/development/interpreters/pypy/2.3/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/pypy/2.3/default.nix b/pkgs/development/interpreters/pypy/2.3/default.nix
index f31bc731a32f..0ed13e2f6462 100644
--- a/pkgs/development/interpreters/pypy/2.3/default.nix
+++ b/pkgs/development/interpreters/pypy/2.3/default.nix
@@ -66,9 +66,10 @@ let
        # disable shutils because it assumes gid 0 exists
        # disable socket because it has two actual network tests that fail
        # disable test_mhlib because it fails for unknown reason
+       # disable sqlite3 due to https://bugs.pypy.org/issue1740
        # disable test_multiprocessing due to transient errors
        # disable test_os because test_urandom_failure fails
-      ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k '-test_socket -test_os -test_shutil -test_mhlib -test_multiprocessing' lib-python
+      ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k '-test_sqlite -test_socket -test_os -test_shutil -test_mhlib -test_multiprocessing' lib-python
     '';
 
     installPhase = ''

From 1fc1e9c82c28397d6530fa942497143a8a9a54e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 27 Aug 2014 19:11:08 +0200
Subject: [PATCH 0675/1453] xca: mark as broken

---
 pkgs/applications/misc/xca/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix
index 0bc2170340c8..09edb086c9f2 100644
--- a/pkgs/applications/misc/xca/default.nix
+++ b/pkgs/applications/misc/xca/default.nix
@@ -28,5 +28,6 @@ stdenv.mkDerivation rec {
     homepage = http://xca.sourceforge.net/;
     platforms = platforms.all;
     license = licenses.bsd3;
+    broken = true;
   };
 }

From 26ee668860119576e7826031584ad770ecd88729 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 27 Aug 2014 19:17:05 +0200
Subject: [PATCH 0676/1453] pythonPackages.zope_container: disable tests
 (failing)

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9ff71c63a85f..2b4674d643c0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9228,6 +9228,9 @@ rec {
       md5 = "b24d2303ece65a2d9ce23a5bd074c335";
     };
 
+    # a test is failing
+    doCheck = false;
+
     propagatedBuildInputs = [
       zodb3 zope_broken zope_dottedname zope_publisher
       zope_filerepresentation zope_lifecycleevent zope_size

From 4008f01c045c5a592bca12958aa634fba6f9041a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 27 Aug 2014 19:20:39 +0200
Subject: [PATCH 0677/1453] perlPackages.TaskCatalystTutorial: fix build

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index f21569b2525b..a50a56177947 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4246,6 +4246,7 @@ let self = _self // overrides; _self = with self; {
       url = mirror://cpan/authors/id/C/CF/CFRANKS/HTML-Widget-1.11.tar.gz;
       sha256 = "02w21rd30cza094m5xs9clzw8ayigbhg2ddzl6jycp4jam0dyhmy";
     };
+    doCheck = false;
     propagatedBuildInputs = [
       TestNoWarnings ClassAccessor ClassAccessorChained
       ClassDataAccessor ModulePluggableFast HTMLTree
@@ -8161,6 +8162,7 @@ let self = _self // overrides; _self = with self; {
       CatalystPluginSession CatalystPluginAuthentication
       CatalystAuthenticationStoreDBIxClass
       CatalystPluginAuthorizationRoles
+      CatalystPluginSessionStateCookie
       CatalystPluginAuthorizationACL
       CatalystPluginHTMLWidget
       CatalystPluginSessionStoreFastMmap

From e7fca7b31dcf8b71ac08583a9fc9f5855d1259a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 27 Aug 2014 19:21:33 +0200
Subject: [PATCH 0678/1453] python3Packages.zope_sqlalchemy: fix build

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2b4674d643c0..05849e59c432 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9486,8 +9486,8 @@ rec {
       md5 = "8b317b41244fc2e67f2f286890ba59a0";
     };
 
-    buildInputs = [ sqlalchemy zope_testing zope_interface setuptools ];
-    propagatedBuildInputs = [ sqlalchemy transaction ];
+    buildInputs = [ zope_testing zope_interface ];
+    propagatedBuildInputs = [ sqlalchemy9 transaction ];
 
     meta = {
       maintainers = [

From 1b376347f5f5244173c83c949bd32a4e44bc54c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 27 Aug 2014 19:21:50 +0200
Subject: [PATCH 0679/1453] python3Packages.pygit2: fix build

---
 pkgs/development/libraries/git2/default.nix |  4 ++--
 pkgs/top-level/python-packages.nix          | 14 ++++++++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix
index abb782641dde..7cab317380e8 100644
--- a/pkgs/development/libraries/git2/default.nix
+++ b/pkgs/development/libraries/git2/default.nix
@@ -1,13 +1,13 @@
 {stdenv, fetchurl, cmake, zlib, python}:
 
 stdenv.mkDerivation rec {
-  version = "0.20.0";
+  version = "0.21.1";
   name = "libgit2-${version}";
 
   src = fetchurl {
     name = "${name}.tar.gz";
     url = "https://github.com/libgit2/libgit2/tarball/v${version}";
-    sha256 = "1iyncz8fqazw683dxjls3lf5pw3f5ma8kachkvjz7dsq57wxllbj";
+    sha256 = "0afbvcsryg7bsmbfj23l09b1xngkmqhf043njl8wm44qslrxibkz";
   };
 
   cmakeFlags = "-DTHREADSAFE=ON";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 05849e59c432..5ca33ba23a53 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1492,7 +1492,7 @@ rec {
       md5 = "d329f5cb2053fd31dafc02e2c9ef0299";
     };
 
-    buildInputs = [ pkgs.libffi pycparser ];
+    propagatedBuildInputs = [ pkgs.libffi pycparser ];
 
     meta = {
       maintainers = [ stdenv.lib.maintainers.iElectric ];
@@ -5920,18 +5920,24 @@ rec {
 
 
   pygit2 = buildPythonPackage rec {
-    name = "pygit2-0.20.0";
+    name = "pygit2-0.21.2";
 
     src = fetchurl {
       url = "https://pypi.python.org/packages/source/p/pygit2/${name}.tar.gz";
-      sha256 = "04132q7bn8k7q7ky7nj3bkza8r9xkzkdpfv462b6rgjsd1x6h340";
+      sha256 = "0lya4v91d4y5fwrb55n8m8avgmz0l81jml2spvx6r7j1czcx3zic";
     };
 
     preConfigure = ( if stdenv.isDarwin then ''
       export DYLD_LIBRARY_PATH="${pkgs.libgit2}/lib"
     '' else "" );
 
-    propagatedBuildInputs = [ pkgs.libgit2 ];
+    propagatedBuildInputs = [ pkgs.libgit2 cffi ];
+
+    preCheck = ''
+      # disable tests that require networking
+      rm test/test_repository.py
+      rm test/test_credentials.py
+    '';
 
     meta = {
       homepage = https://pypi.python.org/pypi/pygit2;

From 45563c61a7cb14227498ff7568c92fa9151efc34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 27 Aug 2014 19:28:33 +0200
Subject: [PATCH 0680/1453] python3Packages.hcs_utils: fix build

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5ca33ba23a53..7b837d380f66 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3827,13 +3827,20 @@ rec {
   };
 
   hcs_utils = buildPythonPackage rec {
-    name = "hcs_utils-1.3";
+    name = "hcs_utils-1.5";
 
     src = fetchurl {
-      url    = "https://pypi.python.org/packages/source/h/hcs_utils/hcs_utils-1.3.tar.gz";
-      sha256 = "0mcjfc0ssil86i74dg323z7mikkw1xazqyr92347x1y33zyffgxh";
+      url    = "https://pypi.python.org/packages/source/h/hcs_utils/${name}.tar.gz";
+      sha256 = "1d2za9crkgzildx610w3zif2i8phcqhh6n8nzg3yvy2mg0s18mkl";
     };
 
+    preBuild = ''
+      export LOCALE_ARCHIVE=${pkgs.glibcLocales}/lib/locale/locale-archive
+      export LC_ALL="en_US.UTF-8"
+    '';
+
+    buildInputs = [ six ];
+
     meta = with stdenv.lib; {
       description = "Library collecting some useful snippets";
       homepage    = https://pypi.python.org/pypi/hcs_utils/1.3;

From 9cd8c65eea6569bc12055ee3e7363e48ebf26c51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 27 Aug 2014 19:31:12 +0200
Subject: [PATCH 0681/1453] python3Packages.eyeD3: fix build

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7b837d380f66..8de633318172 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1944,12 +1944,12 @@ rec {
 
 
   eyeD3 = buildPythonPackage rec {
-    version = "0.7.2";
+    version = "0.7.4";
     name    = "eyeD3-${version}";
 
     src = fetchurl {
-      url = http://eyed3.nicfit.net/releases/eyeD3-0.7.2.tgz;
-      sha256 = "1r0vxdflrj83s8jc5f2qg4p00k37pskn3djym0w73bvq167vkxar";
+      url = "http://eyed3.nicfit.net/releases/${name}.tgz";
+      sha256 = "001hzgqqnf2ig432mq78jsxidpky2rl2ilm28xwjp32vzphycf51";
     };
 
     buildInputs = [ paver ];

From cfbdb07159d024a726c4778d3bbfc8ebdd60a59b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 27 Aug 2014 19:34:49 +0200
Subject: [PATCH 0682/1453] python3Packages.goobook: disable on py3k

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8de633318172..c58ef3afe26b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3719,12 +3719,15 @@ rec {
 
   goobook = buildPythonPackage rec {
     name = "goobook-1.5";
+    disabled = isPy3k;
 
     src = fetchurl {
       url    = "https://pypi.python.org/packages/source/g/goobook/${name}.tar.gz";
       sha256 = "05vpriy391l5i05ckl5ja5bswqyvl3rwrbmks9pi46w1813j7p5z";
     };
 
+    buildInputs = [ six ];
+
     preConfigure = ''
       sed -i '/distribute/d' setup.py
     '';

From ede4ec6eea94cb47e32c024ea661138c39e0d41a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 27 Aug 2014 19:37:58 +0200
Subject: [PATCH 0683/1453] python3Packages.qutip: fix build

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c58ef3afe26b..6a1e71ba021c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6985,7 +6985,7 @@ rec {
     };
 
     propagatedBuildInputs = [ numpy scipy matplotlib pkgs.pyqt4
-      pkgs.cython ];
+      cython ];
 
     buildInputs = with pkgs; [ gcc qt4 blas ] ++ [ nose ];
 

From 3eb2e2b4eb166ac3e336fd7f3f02bbd8d88a22c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 27 Aug 2014 19:43:37 +0200
Subject: [PATCH 0684/1453] python3Packages: more fixes

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6a1e71ba021c..a44401e664dd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7146,6 +7146,7 @@ rec {
   robotframework-ride = buildPythonPackage rec {
     version = "1.2.3";
     name = "robotframework-ride-${version}";
+    disabled = isPy3k;
 
     src = fetchurl {
       url = "https://robotframework-ride.googlecode.com/files/${name}.tar.gz";
@@ -9190,6 +9191,9 @@ rec {
       zope_interface zope_location zope_publisher zope_schema zope_traversing
     ];
 
+    # all tests fail
+    doCheck = false;
+
     src = fetchurl {
       url = "https://pypi.python.org/packages/source/z/zope.browserresource/zope.browserresource-4.0.1.zip";
       md5 = "81bbe92c1f04725561470f89d73222c5";

From e75cf5d166fbb04f747d61d4bbcbce79ac9345c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 27 Aug 2014 19:46:15 +0200
Subject: [PATCH 0685/1453] coprthr: mark as broken (cc @thoughtpolice)

---
 pkgs/development/libraries/coprthr/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/coprthr/default.nix b/pkgs/development/libraries/coprthr/default.nix
index 0e521aa19e8a..40be21131d20 100644
--- a/pkgs/development/libraries/coprthr/default.nix
+++ b/pkgs/development/libraries/coprthr/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url    = "https://github.com/browndeer/coprthr/archive/stable-${version}.zip";
-    sha256 = "042aykmcxhdpck0j6k5rcp6a0b5i377fv2nz96v1bpfhzxd1mjwg";
+    sha256 = "0ilx4v1ydppjnq1i0z5j0x4lmi29z39sappar7c0wqady0b5dpz9";
   };
 
   buildInputs =
@@ -33,5 +33,6 @@ stdenv.mkDerivation rec {
     license     = stdenv.lib.licenses.lgpl3;
     platforms   = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+    broken = true;
   };
 }

From 0a1c255bc9f129b61ce9f26630bbe060609f13b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 27 Aug 2014 20:53:02 +0200
Subject: [PATCH 0686/1453] zeitgeist: fix build

---
 pkgs/development/libraries/zeitgeist/default.nix |  5 +++--
 pkgs/top-level/python-packages.nix               | 16 ++++++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix
index 3ef43baca5ed..d0de624890b5 100644
--- a/pkgs/development/libraries/zeitgeist/default.nix
+++ b/pkgs/development/libraries/zeitgeist/default.nix
@@ -3,10 +3,11 @@
 , gtk3, json_glib, librdf_raptor2, pythonPackages, dbus_glib }:
 
 stdenv.mkDerivation rec {
-  name = "zeitgeist-0.0.14";
+  version = "0.9.15";
+  name = "zeitgeist-${version}";
 
   src = fetchurl {
-    url = "https://github.com/seiflotfy/zeitgeist/archive/v0.9.15.tar.gz";
+    url = "https://github.com/seiflotfy/zeitgeist/archive/v${version}.tar.gz";
     sha256 = "07pnc7kmjpd0ncm32z6s3ny5p4zl52v9lld0n0f8sp6cw87k12p0";
   };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a44401e664dd..75785ebc8a55 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7067,12 +7067,28 @@ rec {
 
     # error: invalid command 'test'
     doCheck = false;
+    
+    propagatedBuildInputs = [ isodate ];
 
     meta = {
       description = "RDFLib is a Python library for working with RDF, a simple yet powerful language for representing information.";
       homepage = http://www.rdflib.net/;
     };
   });
+  
+  isodate = buildPythonPackage rec {
+    name = "isodate-0.5.0";
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/i/isodate/${name}.tar.gz";
+      md5 = "9a267e9327feb3d021cae26002ba6e0e";
+    };
+
+    meta = with stdenv.lib; {
+      description = "ISO 8601 date/time parser";
+      homepage = http://cheeseshop.python.org/pypi/isodate;
+    };
+  };
 
 
   robotframework = buildPythonPackage rec {

From 81a2e4ce4c65819f6071e149c4ad737947bd0060 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 27 Aug 2014 21:01:43 +0200
Subject: [PATCH 0687/1453] python3Packages: disable some

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 75785ebc8a55..8374e29162a9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1919,12 +1919,13 @@ rec {
 
 
   evdev = buildPythonPackage rec {
-    version = "0.3.2";
+    version = "0.4.5";
     name = "evdev-${version}";
+    disabled = isPy34;  # see http://bugs.python.org/issue21121
 
     src = fetchurl {
       url = "https://pypi.python.org/packages/source/e/evdev/${name}.tar.gz";
-      sha256 = "07gmynz764sln2sq18aafx13yawkv5nkqrkk06rj71sq71fsr9h9";
+      sha256 = "0w8ib3ab4mpfc1rvd335l8xkd41qbh3iyb0vfiiapgcfvqk74aq7";
     };
 
     buildInputs = [ pkgs.linuxHeaders ];
@@ -3968,6 +3969,7 @@ rec {
   httpretty = buildPythonPackage rec {
     name = "httpretty-${version}";
     version = "0.8.3";
+    disabled = isPy3k;
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/h/httpretty/${name}.tar.gz";

From 10a3369c994edfdb796026be2675d61e68f0e92c Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Wed, 27 Aug 2014 21:21:35 +0200
Subject: [PATCH 0688/1453] virtinst: fix name resolution ambiguity breaking
 the runnability

---
 pkgs/applications/virtualization/virtinst/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/virtinst/default.nix b/pkgs/applications/virtualization/virtinst/default.nix
index 9b89a78f8382..6441bb884234 100644
--- a/pkgs/applications/virtualization/virtinst/default.nix
+++ b/pkgs/applications/virtualization/virtinst/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pythonPackages, intltool, libvirt, libxml2Python, curl }:
+{ stdenv, fetchurl, pythonPackages, intltool, libxml2Python, curl }:
 
 with stdenv.lib;
 

From a501db1b7ec829d57af91c25d46bed9ec5764b01 Mon Sep 17 00:00:00 2001
From: Alp Mestanogullari <alpmestan@gmail.com>
Date: Wed, 27 Aug 2014 22:03:15 +0200
Subject: [PATCH 0689/1453] servant-scotty/default.nix: switch to version 0.1.1
 which relaxes the bounds on the transformers package

---
 .../libraries/haskell/servant-scotty/default.nix       | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/servant-scotty/default.nix b/pkgs/development/libraries/haskell/servant-scotty/default.nix
index 2d053d3409d9..1c1f358cf159 100644
--- a/pkgs/development/libraries/haskell/servant-scotty/default.nix
+++ b/pkgs/development/libraries/haskell/servant-scotty/default.nix
@@ -1,4 +1,5 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+# This file was auto-generated by cabal2nix. Please do NOT edit
+  manually!
 
 { cabal, aeson, httpTypes, scotty, servant, servantResponse, text
 , transformers
@@ -6,14 +7,15 @@
 
 cabal.mkDerivation (self: {
   pname = "servant-scotty";
-  version = "0.1";
-  sha256 = "0nl4ghx4hp1329sgnphirnnikxyn5hgw0iz5dga5ib16bmkzbsvi";
+  version = "0.1.1";
+  sha256 = "0d3yc7aa2p1izizqnj81iscj9hbgbkpyav1ncmxzkr48svr6h783";
   buildDepends = [
     aeson httpTypes scotty servant servantResponse text transformers
   ];
   meta = {
     homepage = "http://github.com/zalora/servant";
-    description = "Generate a web service for servant 'Resource's using scotty and JSON";
+    description = "Generate a web service for servant 'Resource's
+  using scotty and JSON";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
   };

From 940a918825bc4c79230c7ec5aa8079cf7e902258 Mon Sep 17 00:00:00 2001
From: Alp Mestanogullari <alpmestan@gmail.com>
Date: Wed, 27 Aug 2014 22:04:27 +0200
Subject: [PATCH 0690/1453] fix a small typo

---
 pkgs/development/libraries/haskell/servant-scotty/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/servant-scotty/default.nix b/pkgs/development/libraries/haskell/servant-scotty/default.nix
index 1c1f358cf159..562c966bcc7c 100644
--- a/pkgs/development/libraries/haskell/servant-scotty/default.nix
+++ b/pkgs/development/libraries/haskell/servant-scotty/default.nix
@@ -1,5 +1,4 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit
-  manually!
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, aeson, httpTypes, scotty, servant, servantResponse, text
 , transformers

From 2dc2699ca4e1ef5ba5bd6993de563d9bcc52285b Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 27 Aug 2014 15:13:53 -0500
Subject: [PATCH 0691/1453] linux/grsec: updates

3.15.10 is EOL soon, but grsecurity/unstable hasn't moved to 3.16.x yet.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/os-specific/linux/kernel/linux-3.12.nix    |  4 ++--
 pkgs/os-specific/linux/kernel/linux-testing.nix |  9 ++++-----
 pkgs/os-specific/linux/kernel/patches.nix       | 12 ++++++------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix
index 291e43a98e58..c67c531667a5 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.12.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.12.26";
+  version = "3.12.27";
   extraMeta.branch = "3.12";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1gp6brk2ix30g8dznd5yv1fq7yx82295va6cn7lwv6jj9w287s6c";
+    sha256 = "0c8psz9k6k413b48dphclqs6wkh9wiwf5nslykg27afdqd6v4ycc";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index f44f3d327921..ae9dfc8ef38f 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,14 +1,13 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  # Reason to add:  RTL8192EE
-  version = "3.16-rc3";
-  modDirVersion = "3.16.0-rc3";
-  extraMeta.branch = "3.16";
+  version = "3.17-rc2";
+  modDirVersion = "3.17.0-rc2";
+  extraMeta.branch = "3.17";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/testing/linux-${version}.tar.xz";
-    sha256 = "17jgv1hnx2im68f8721x11yfg8mpas7lsxg0j00qxv2fc6km2glm";
+    sha256 = "094r4kqp7bj1wcdfsgdmv73law4zb7d0sd8lw82v3rz944mlm9y3";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index cfe006fbe4b5..c91b8ddfb44d 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -60,17 +60,17 @@ rec {
   };
 
   grsecurity_stable = grsecPatch
-    { kversion  = "3.14.10";
-      revision  = "201407012152";
+    { kversion  = "3.14.17";
+      revision  = "201408260041";
       branch    = "stable";
-      sha256    = "1119044lzkr9wpr1gpl1g0bz67c2xpdd9bkddllij7ja24jv8sx1";
+      sha256    = "1brcfxbdd5f29vci3bj2dk3878z24ncrjw268j4i1n8ms65jqda0";
     };
 
   grsecurity_unstable = grsecPatch
-    { kversion  = "3.15.3";
-      revision  = "201407012153";
+    { kversion  = "3.15.10";
+      revision  = "201408212335";
       branch    = "test";
-      sha256    = "0bccayakprc77530crxfr9v2hbs6hlcf290pj1ywlh1p861ljgbm";
+      sha256    = "0ynnci7jms5a1acn8cpdw4w2j4jz5xai1da5w1l5r65909kwmx0k";
     };
 
   grsec_fix_path =

From 9667a4067c7e3f02a6a0fe8f1f3344c1cb1d7ef7 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 27 Aug 2014 22:44:56 +0200
Subject: [PATCH 0692/1453] nixos: Use literalExample for systemPackages.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/modules/config/system-path.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix
index 83c14e45685b..f3e86bfd2019 100644
--- a/nixos/modules/config/system-path.nix
+++ b/nixos/modules/config/system-path.nix
@@ -63,7 +63,7 @@ in
       systemPackages = mkOption {
         type = types.listOf types.path;
         default = [];
-        example = "[ pkgs.firefox pkgs.thunderbird ]";
+        example = literalExample "[ pkgs.firefox pkgs.thunderbird ]";
         description = ''
           The set of packages that appear in
           /run/current-system/sw.  These packages are

From 8a56a55bb442cbf2e2126d40df55e67b9aea0361 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 27 Aug 2014 23:41:15 +0200
Subject: [PATCH 0693/1453] nixos/manual: Use literalExample when feasible.

Should bring most of the examples into a better consistency regarding
syntactic representation in the manual.

Thanks to @devhell for reporting.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/modules/config/fonts/fonts.nix                      | 2 +-
 nixos/modules/config/power-management.nix                 | 8 ++++++--
 nixos/modules/config/pulseaudio.nix                       | 2 +-
 nixos/modules/config/shells-environment.nix               | 4 +++-
 nixos/modules/installer/cd-dvd/iso-image.nix              | 7 ++++---
 nixos/modules/installer/cd-dvd/system-tarball.nix         | 7 ++++---
 nixos/modules/misc/crashdump.nix                          | 2 +-
 nixos/modules/services/audio/mopidy.nix                   | 2 +-
 nixos/modules/services/backup/rsnapshot.nix               | 2 +-
 nixos/modules/services/logging/syslog-ng.nix              | 4 +++-
 nixos/modules/services/monitoring/smartd.nix              | 2 +-
 nixos/modules/services/networking/ircd-hybrid/default.nix | 4 ++--
 nixos/modules/services/networking/znc.nix                 | 2 +-
 .../modules/services/web-servers/apache-httpd/default.nix | 2 +-
 nixos/modules/services/x11/desktop-managers/gnome3.nix    | 4 ++--
 nixos/modules/services/x11/desktop-managers/kde4.nix      | 2 +-
 nixos/modules/services/x11/display-managers/default.nix   | 6 ++++--
 nixos/modules/services/x11/xserver.nix                    | 4 ++--
 18 files changed, 39 insertions(+), 27 deletions(-)

diff --git a/nixos/modules/config/fonts/fonts.nix b/nixos/modules/config/fonts/fonts.nix
index 49b1e1d42a3f..f6060a910a15 100644
--- a/nixos/modules/config/fonts/fonts.nix
+++ b/nixos/modules/config/fonts/fonts.nix
@@ -11,7 +11,7 @@ with lib;
       # TODO: find another name for it.
       fonts = mkOption {
         type = types.listOf types.path;
-        example = [ pkgs.dejavu_fonts ];
+        example = literalExample "[ pkgs.dejavu_fonts ]";
         description = "List of primary font paths.";
         apply = list: list ++
           [ # - the user's current profile
diff --git a/nixos/modules/config/power-management.nix b/nixos/modules/config/power-management.nix
index 17f3ed00b9be..32a7987617ad 100644
--- a/nixos/modules/config/power-management.nix
+++ b/nixos/modules/config/power-management.nix
@@ -35,7 +35,9 @@ in
       powerUpCommands = mkOption {
         type = types.lines;
         default = "";
-        example = "${pkgs.hdparm}/sbin/hdparm -B 255 /dev/sda";
+        example = literalExample ''
+          "''${pkgs.hdparm}/sbin/hdparm -B 255 /dev/sda"
+        '';
         description =
           ''
             Commands executed when the machine powers up.  That is,
@@ -47,7 +49,9 @@ in
       powerDownCommands = mkOption {
         type = types.lines;
         default = "";
-        example = "${pkgs.hdparm}/sbin/hdparm -B 255 /dev/sda";
+        example = literalExample ''
+          "''${pkgs.hdparm}/sbin/hdparm -B 255 /dev/sda"
+        '';
         description =
           ''
             Commands executed when the machine powers down.  That is,
diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix
index 96593885e5b7..1b84bbaf10c5 100644
--- a/nixos/modules/config/pulseaudio.nix
+++ b/nixos/modules/config/pulseaudio.nix
@@ -81,7 +81,7 @@ in {
       package = mkOption {
         type = types.package;
         default = pulseaudioFull;
-        example = literalExample "pulseaudioFull";
+        example = literalExample "pkgs.pulseaudioFull";
         description = ''
           The PulseAudio derivation to use.  This can be used to disable
           features (such as JACK support, Bluetooth) that are enabled in the
diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix
index cc079cdc5856..2559c53ac163 100644
--- a/nixos/modules/config/shells-environment.nix
+++ b/nixos/modules/config/shells-environment.nix
@@ -122,7 +122,9 @@ in
 
     environment.binsh = mkOption {
       default = "${config.system.build.binsh}/bin/sh";
-      example = "\${pkgs.dash}/bin/dash";
+      example = literalExample ''
+        "''${pkgs.dash}/bin/dash"
+      '';
       type = types.path;
       description = ''
         The shell executable that is linked system-wide to
diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
index d43fa2203818..623cfdedd269 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -113,11 +113,12 @@ in
     };
 
     isoImage.contents = mkOption {
-      example =
+      example = literalExample ''
         [ { source = pkgs.memtest86 + "/memtest.bin";
             target = "boot/memtest.bin";
           }
-        ];
+        ]
+      '';
       description = ''
         This option lists files to be copied to fixed locations in the
         generated ISO image.
@@ -125,7 +126,7 @@ in
     };
 
     isoImage.storeContents = mkOption {
-      example = [pkgs.stdenv];
+      example = literalExample "[ pkgs.stdenv ]";
       description = ''
         This option lists additional derivations to be included in the
         Nix store in the generated ISO image.
diff --git a/nixos/modules/installer/cd-dvd/system-tarball.nix b/nixos/modules/installer/cd-dvd/system-tarball.nix
index eaecbe1381f5..c24fe97fba46 100644
--- a/nixos/modules/installer/cd-dvd/system-tarball.nix
+++ b/nixos/modules/installer/cd-dvd/system-tarball.nix
@@ -15,11 +15,12 @@ in
 {
   options = {
     tarball.contents = mkOption {
-      example =
+      example = literalExample ''
         [ { source = pkgs.memtest86 + "/memtest.bin";
             target = "boot/memtest.bin";
           }
-        ];
+        ]
+      '';
       description = ''
         This option lists files to be copied to fixed locations in the
         generated ISO image.
@@ -27,7 +28,7 @@ in
     };
 
     tarball.storeContents = mkOption {
-      example = [pkgs.stdenv];
+      example = literalExample "[ pkgs.stdenv ]";
       description = ''
         This option lists additional derivations to be included in the
         Nix store in the generated ISO image.
diff --git a/nixos/modules/misc/crashdump.nix b/nixos/modules/misc/crashdump.nix
index d68f38bae2f5..773b5ac9da3e 100644
--- a/nixos/modules/misc/crashdump.nix
+++ b/nixos/modules/misc/crashdump.nix
@@ -28,7 +28,7 @@ in
           # We don't want to evaluate all of linuxPackages for the manual
           # - some of it might not even evaluate correctly.
           defaultText = "pkgs.linuxPackages";
-          example = "pkgs.linuxPackages_2_6_25";
+          example = literalExample "pkgs.linuxPackages_2_6_25";
           description = ''
             This will override the boot.kernelPackages, and will add some
             kernel configuration parameters for the crash dump to work.
diff --git a/nixos/modules/services/audio/mopidy.nix b/nixos/modules/services/audio/mopidy.nix
index 5b865cf4c1be..a7a7e8ae688b 100644
--- a/nixos/modules/services/audio/mopidy.nix
+++ b/nixos/modules/services/audio/mopidy.nix
@@ -49,7 +49,7 @@ in {
       extensionPackages = mkOption {
         default = [];
         type = types.listOf types.package;
-        example = [ mopidy-spotify ];
+        example = literalExample "[ pkgs.mopidy-spotify ]";
         description = ''
           Mopidy extensions that should be loaded by the service.
         '';
diff --git a/nixos/modules/services/backup/rsnapshot.nix b/nixos/modules/services/backup/rsnapshot.nix
index 48ad7582b7e6..091b5cfd4d59 100644
--- a/nixos/modules/services/backup/rsnapshot.nix
+++ b/nixos/modules/services/backup/rsnapshot.nix
@@ -31,7 +31,7 @@ in
 
       cronIntervals = mkOption {
         default = {};
-        example = { "hourly" = "0 * * * *"; "daily" = "50 21 * * *"; };
+        example = { hourly = "0 * * * *"; daily = "50 21 * * *"; };
         type = types.attrsOf types.string;
         description = ''
           Periodicity at which intervals should be run by cron.
diff --git a/nixos/modules/services/logging/syslog-ng.nix b/nixos/modules/services/logging/syslog-ng.nix
index 8b892a33bb7d..0b3f0cabb007 100644
--- a/nixos/modules/services/logging/syslog-ng.nix
+++ b/nixos/modules/services/logging/syslog-ng.nix
@@ -49,7 +49,9 @@ in {
       extraModulePaths = mkOption {
         type = types.listOf types.str;
         default = [];
-        example = [ "${pkgs.syslogng_incubator}/lib/syslog-ng" ];
+        example = literalExample ''
+          [ "''${pkgs.syslogng_incubator}/lib/syslog-ng" ]
+        '';
         description = ''
           A list of paths that should be included in syslog-ng's
           <literal>--module-path</literal> option. They should usually
diff --git a/nixos/modules/services/monitoring/smartd.nix b/nixos/modules/services/monitoring/smartd.nix
index 250035fe447f..803bd9e9a65a 100644
--- a/nixos/modules/services/monitoring/smartd.nix
+++ b/nixos/modules/services/monitoring/smartd.nix
@@ -62,7 +62,7 @@ in
       enable = mkOption {
         default = false;
         type = types.bool;
-        example = "true";
+        example = true;
         description = ''
           Run smartd from the smartmontools package. Note that e-mail
           notifications will not be enabled unless you configure the list of
diff --git a/nixos/modules/services/networking/ircd-hybrid/default.nix b/nixos/modules/services/networking/ircd-hybrid/default.nix
index a3d5b71740f6..2c397f94d230 100644
--- a/nixos/modules/services/networking/ircd-hybrid/default.nix
+++ b/nixos/modules/services/networking/ircd-hybrid/default.nix
@@ -66,7 +66,7 @@ in
 
       rsaKey = mkOption {
         default = null;
-        example = /root/certificates/irc.key;
+        example = literalExample "/root/certificates/irc.key";
         description = "
           IRCD server RSA key.
         ";
@@ -74,7 +74,7 @@ in
 
       certificate = mkOption {
         default = null;
-        example = /root/certificates/irc.pem;
+        example = literalExample "/root/certificates/irc.pem";
         description = "
           IRCD server SSL certificate. There are some limitations - read manual.
         ";
diff --git a/nixos/modules/services/networking/znc.nix b/nixos/modules/services/networking/znc.nix
index 4d53cd0750fb..2aa63c6e7dfb 100644
--- a/nixos/modules/services/networking/znc.nix
+++ b/nixos/modules/services/networking/znc.nix
@@ -228,7 +228,7 @@ in
       modulePackages = mkOption {
         type = types.listOf types.package;
         default = [ ];
-        example = [ pkgs.zncModules.fish pkgs.zncModules.push ];
+        example = literalExample "[ pkgs.zncModules.fish pkgs.zncModules.push ]";
         description = ''
           A list of global znc module packages to add to znc.
         '';
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index b83cf276ed52..9ac28373dacb 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -423,7 +423,7 @@ in
       package = mkOption {
         type = types.package;
         default = pkgs.apacheHttpd.override { mpm = mainCfg.multiProcessingModule; };
-        example = "pkgs.apacheHttpd_2_4";
+        example = literalExample "pkgs.apacheHttpd_2_4";
         description = ''
           Overridable attribute of the Apache HTTP Server package to use.
         '';
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 06bcb6dbb8be..049c96c54e71 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -37,7 +37,7 @@ in {
 
     services.xserver.desktopManager.gnome3.sessionPath = mkOption {
       default = [];
-      example = "[ pkgs.gnome3.gpaste ]";
+      example = literalExample "[ pkgs.gnome3.gpaste ]";
       description = "Additional list of packages to be added to the session search path.
                      Useful for gnome shell extensions or gsettings-conditionated autostart.";
       apply = list: list ++ [ gnome3.gnome_shell ]; 
@@ -51,7 +51,7 @@ in {
     
     environment.gnome3.excludePackages = mkOption {
       default = [];
-      example = "[ pkgs.gnome3.totem ]";
+      example = literalExample "[ pkgs.gnome3.totem ]";
       type = types.listOf types.package;
       description = "Which packages gnome should exclude from the default environment";
     };
diff --git a/nixos/modules/services/x11/desktop-managers/kde4.nix b/nixos/modules/services/x11/desktop-managers/kde4.nix
index f74dd7e04449..669ddbd904f0 100644
--- a/nixos/modules/services/x11/desktop-managers/kde4.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde4.nix
@@ -65,7 +65,7 @@ in
 
     environment.kdePackages = mkOption {
       default = [];
-      example = "[ pkgs.kde4.kdesdk ]";
+      example = literalExample "[ pkgs.kde4.kdesdk ]";
       type = types.listOf types.package;
       description = "This option is obsolete.  Please use <option>environment.systemPackages</option> instead.";
     };
diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index 3bf18bd58c84..6e61576f501f 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -251,14 +251,16 @@ in
 
         execCmd = mkOption {
           type = types.str;
-          example = "${pkgs.slim}/bin/slim";
+          example = literalExample ''
+            "''${pkgs.slim}/bin/slim"
+          '';
           description = "Command to start the display manager.";
         };
 
         environment = mkOption {
           type = types.attrsOf types.unspecified;
           default = {};
-          example = { SLIM_CFGFILE = /etc/slim.conf; };
+          example = { SLIM_CFGFILE = "/etc/slim.conf"; };
           description = "Additional environment variables needed by the display manager.";
         };
 
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 5f3e8003b45b..21eaf6bb6b76 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -151,7 +151,7 @@ in
       modules = mkOption {
         type = types.listOf types.path;
         default = [];
-        example = [ pkgs.xf86_input_wacom ];
+        example = literalExample "[ pkgs.xf86_input_wacom ]";
         description = "Packages to be added to the module search path of the X server.";
       };
 
@@ -201,7 +201,7 @@ in
       vaapiDrivers = mkOption {
         type = types.listOf types.path;
         default = [ ];
-        example = "[ pkgs.vaapiIntel pkgs.vaapiVdpau ]";
+        example = literalExample "[ pkgs.vaapiIntel pkgs.vaapiVdpau ]";
         description = ''
           Packages providing libva acceleration drivers.
         '';

From 2b5479658535b0ddceaab73e3c21291176bbc4c9 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Thu, 28 Aug 2014 00:09:26 +0100
Subject: [PATCH 0694/1453] cantata: update to 1.4.1

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

diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix
index 015d887a5846..88931520c42a 100644
--- a/pkgs/applications/audio/cantata/default.nix
+++ b/pkgs/applications/audio/cantata/default.nix
@@ -39,7 +39,7 @@ assert withOnlineServices -> withTaglib;
 assert withReplaygain -> withTaglib;
 
 let
-  version = "1.4.0";
+  version = "1.4.1";
   pname = "cantata";
   fstat = x: fn: "-DENABLE_" + fn + "=" + (if x then "ON" else "OFF");
   fstats = x: map (fstat x);
@@ -50,8 +50,8 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     inherit name;
-    url = "https://drive.google.com/uc?export=download&id=0Bzghs6gQWi60WDI1WjRtUDJ4QlU";
-    sha256 = "63a03872ec9a2b212c497d4b10e255d5654f96370734e86420bf711354048e01";
+    url = "https://drive.google.com/uc?export=download&id=0Bzghs6gQWi60eXhuZ1Z3bGM2bjQ";
+    sha256 = "b0d5a1798efd275d72dffb87bc0f016fc865dbd1384b7c9af039cebdffe0cca3";
   };
 
   buildInputs =
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional (withTaglib && !withKDE4 && withDevices) udisks2;
 
   unpackPhase = "tar -xvf $src";
-  sourceRoot = "cantata-1.4.0";
+  sourceRoot = "${name}";
 
   # Qt4 is implicit when KDE is switched off.
   cmakeFlags = stdenv.lib.flatten [

From 6773babd5b75d34afa850351fd292310e3dd3fc8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 27 Aug 2014 19:31:22 +0200
Subject: [PATCH 0695/1453] Containers: Use nsenter to execute commands in
 containers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Also remove ‘nixos-container set-root-password’, which is kind of
pointless now.
---
 .../virtualisation/container-config.nix       | 71 -------------------
 nixos/modules/virtualisation/containers.nix   |  7 +-
 .../modules/virtualisation/nixos-container.pl | 40 +++++------
 3 files changed, 23 insertions(+), 95 deletions(-)

diff --git a/nixos/modules/virtualisation/container-config.nix b/nixos/modules/virtualisation/container-config.nix
index 84e3aa283520..a7e8953827a6 100644
--- a/nixos/modules/virtualisation/container-config.nix
+++ b/nixos/modules/virtualisation/container-config.nix
@@ -18,77 +18,6 @@ with lib;
     # Shut up warnings about not having a boot loader.
     system.build.installBootLoader = "${pkgs.coreutils}/bin/true";
 
-    # Provide a root login prompt on /var/lib/root-login.socket that
-    # doesn't ask for a password. This socket can only be used by root
-    # on the host.
-    systemd.sockets.root-login =
-      { description = "Root Login Socket";
-        wantedBy = [ "sockets.target" ];
-        socketConfig =
-          { ListenStream = "/var/lib/root-login.socket";
-            SocketMode = "0600";
-            Accept = true;
-          };
-      };
-
-    systemd.services."root-login@" =
-      { description = "Root Login %i";
-        environment.TERM = "linux";
-        serviceConfig =
-          { Type = "simple";
-            StandardInput = "socket";
-            ExecStart = "${pkgs.socat}/bin/socat -t0 - \"exec:${pkgs.shadow}/bin/login -f root,pty,setsid,setpgid,stderr,ctty\"";
-            TimeoutStopSec = 1; # FIXME
-          };
-        restartIfChanged = false;
-      };
-
-    # Provide a daemon on /var/lib/run-command.socket that reads a
-    # command from stdin and executes it.
-    systemd.sockets.run-command =
-      { description = "Run Command Socket";
-        wantedBy = [ "sockets.target" ];
-        socketConfig =
-          { ListenStream = "/var/lib/run-command.socket";
-            SocketMode = "0600";  # only root can connect
-            Accept = true;
-          };
-      };
-
-    systemd.services."run-command@" =
-      { description = "Run Command %i";
-        environment.TERM = "linux";
-        serviceConfig =
-          { Type = "simple";
-            StandardInput = "socket";
-            TimeoutStopSec = 1; # FIXME
-          };
-        script =
-          ''
-            #! ${pkgs.stdenv.shell} -e
-            source /etc/bashrc
-            read c
-            eval "command=($c)"
-            exec "''${command[@]}"
-          '';
-        restartIfChanged = false;
-      };
-
-    systemd.services.container-startup-done =
-      { description = "Container Startup Notification";
-        wantedBy = [ "multi-user.target" ];
-        after = [ "multi-user.target" ];
-        script =
-          ''
-            if [ -p /var/lib/startup-done ]; then
-              echo done > /var/lib/startup-done
-            fi
-          '';
-        serviceConfig.Type = "oneshot";
-        serviceConfig.RemainAfterExit = true;
-        restartIfChanged = false;
-      };
-
     systemd.services.systemd-remount-fs.enable = false;
 
   };
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 292b96e6eb24..d62340f2c798 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -10,7 +10,7 @@ let
     isExecutable = true;
     src = ./nixos-container.pl;
     perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl";
-    inherit (pkgs) socat;
+    inherit (pkgs) utillinux;
   };
 
   # The container's init script, a small wrapper around the regular
@@ -254,9 +254,8 @@ in
           ExecReload = pkgs.writeScript "reload-container"
             ''
               #! ${pkgs.stdenv.shell} -e
-              SYSTEM_PATH=/nix/var/nix/profiles/system
-              echo $SYSTEM_PATH/bin/switch-to-configuration test | \
-                ${pkgs.socat}/bin/socat unix:$root/var/lib/run-command.socket -
+              ${nixos-container}/bin/nixos-container run "$INSTANCE" -- \
+                bash --login -c "/nix/var/nix/profiles/system/bin/switch-to-configuration test"
             '';
 
           SyslogIdentifier = "container %i";
diff --git a/nixos/modules/virtualisation/nixos-container.pl b/nixos/modules/virtualisation/nixos-container.pl
index bf6f16fc6c77..b829eeb05790 100644
--- a/nixos/modules/virtualisation/nixos-container.pl
+++ b/nixos/modules/virtualisation/nixos-container.pl
@@ -7,7 +7,7 @@ use File::Slurp;
 use Fcntl ':flock';
 use Getopt::Long qw(:config gnu_getopt);
 
-my $socat = '@socat@/bin/socat';
+my $nsenter = "@utillinux@/bin/nsenter";
 
 # Ensure a consistent umask.
 umask 0022;
@@ -25,7 +25,6 @@ Usage: nixos-container list
        nixos-container login <container-name>
        nixos-container root-login <container-name>
        nixos-container run <container-name> -- args...
-       nixos-container set-root-password <container-name> <password>
        nixos-container show-ip <container-name>
        nixos-container show-host-key <container-name>
 EOF
@@ -186,6 +185,23 @@ sub stopContainer {
         or die "$0: failed to stop container\n";
 }
 
+# Return the PID of the init process of the container.
+sub getLeader {
+    my $s = `machinectl show "$containerName" -p Leader`;
+    chomp $s;
+    $s =~ /^Leader=(\d+)$/ or die "unable to get container's main PID\n";
+    return int($1);
+}
+
+# Run a command in the container.
+sub runInContainer {
+    my @args = @_;
+    my $leader = getLeader;
+    # FIXME: initialise the environment properly.
+    exec($nsenter, "-t", $leader, "-m", "-u", "-i", "-n", "-p", "--", "env", "-i", "--", @args);
+    die "cannot run ‘nsenter’: $!\n";
+}
+
 if ($action eq "destroy") {
     die "$0: cannot destroy declarative container (remove it from your configuration.nix instead)\n"
         unless POSIX::access($confFile, &POSIX::W_OK);
@@ -235,28 +251,12 @@ elsif ($action eq "login") {
 }
 
 elsif ($action eq "root-login") {
-    exec($socat, "unix:$root/var/lib/root-login.socket", "-,echo=0,raw");
+    runInContainer("bash", "--login");
 }
 
 elsif ($action eq "run") {
     shift @ARGV; shift @ARGV;
-    my $pid = open(SOCAT, "|-", $socat, "-t0", "-", "unix:$root/var/lib/run-command.socket") or die "$0: cannot start $socat: $!\n";
-    print SOCAT join(' ', map { "'$_'" } @ARGV), "\n";
-    flush SOCAT;
-    waitpid($pid, 0);
-    close(SOCAT);
-}
-
-elsif ($action eq "set-root-password") {
-    # FIXME: don't get password from the command line.
-    my $password = $ARGV[2] or die "$0: no password given\n";
-    my $pid = open(SOCAT, "|-", $socat, "-t0", "-", "unix:$root/var/lib/run-command.socket") or die "$0: cannot start $socat: $!\n";
-    print SOCAT "passwd\n";
-    print SOCAT "$password\n";
-    print SOCAT "$password\n";
-    flush SOCAT;
-    waitpid($pid, 0);
-    close(SOCAT);
+    runInContainer(@ARGV);
 }
 
 elsif ($action eq "show-ip") {

From 21ab4e054c1570dd5000a18cb114e665729b378a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 27 Aug 2014 21:12:18 +0200
Subject: [PATCH 0696/1453] =?UTF-8?q?nixos-container=20run:=20Execute=20co?=
 =?UTF-8?q?mmand=20using=20=E2=80=98su=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This ensures that the environment is set up correctly.
---
 nixos/modules/virtualisation/nixos-container.pl | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/virtualisation/nixos-container.pl b/nixos/modules/virtualisation/nixos-container.pl
index b829eeb05790..7403a42f0f14 100644
--- a/nixos/modules/virtualisation/nixos-container.pl
+++ b/nixos/modules/virtualisation/nixos-container.pl
@@ -197,8 +197,7 @@ sub getLeader {
 sub runInContainer {
     my @args = @_;
     my $leader = getLeader;
-    # FIXME: initialise the environment properly.
-    exec($nsenter, "-t", $leader, "-m", "-u", "-i", "-n", "-p", "--", "env", "-i", "--", @args);
+    exec($nsenter, "-t", $leader, "-m", "-u", "-i", "-n", "-p", "--", @args);
     die "cannot run ‘nsenter’: $!\n";
 }
 
@@ -251,12 +250,14 @@ elsif ($action eq "login") {
 }
 
 elsif ($action eq "root-login") {
-    runInContainer("bash", "--login");
+    runInContainer("su", "root", "-l");
 }
 
 elsif ($action eq "run") {
     shift @ARGV; shift @ARGV;
-    runInContainer(@ARGV);
+    # Escape command.
+    my $s = join(' ', map { s/'/'\\''/g; "'$_'" } @ARGV);
+    runInContainer("su", "root", "-l", "-c", "exec " . $s);
 }
 
 elsif ($action eq "show-ip") {

From 013aedffead2450cfea6d5fccc16cb51be890e02 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 27 Aug 2014 22:51:18 -0400
Subject: [PATCH 0697/1453] ats2: bump

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

diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix
index 8c71138ab78e..c66143fe1f32 100644
--- a/pkgs/development/compilers/ats2/default.nix
+++ b/pkgs/development/compilers/ats2/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "ats2-${version}";
-  version = "0.1.0";
+  version = "0.1.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz";
-    sha256 = "0i7b9v7xki9j2jjjpydz0gl33af94b4jjmk75b9w20bs003v8vd4";
+    sha256 = "17yr5zc4cr4zlizhzy43ihfcidl63wjxcc002amzahskib4fsbmb";
   };
 
   buildInputs = [ gmp ];

From 7b9fa26b10dacb7eda26c8ba0bf4b6a982dbe1b7 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Wed, 27 Aug 2014 11:51:54 +0200
Subject: [PATCH 0698/1453] Quote paths from example & default attributes.

---
 nixos/modules/misc/locate.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix
index 7de63c606492..f3ed2aaba09d 100644
--- a/nixos/modules/misc/locate.nix
+++ b/nixos/modules/misc/locate.nix
@@ -41,7 +41,7 @@ in {
 
       output = mkOption {
         type = types.path;
-        default = /var/cache/locatedb;
+        default = "/var/cache/locatedb";
         description = ''
           The database file to build.
         '';

From 9c6614687c3ba58732b06ac700673933283fba94 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Thu, 28 Aug 2014 10:05:00 +0100
Subject: [PATCH 0699/1453] Update haskellPackages.engineIo and
 haskellPackages.socketIo

---
 pkgs/development/libraries/haskell/engine-io/default.nix | 5 ++---
 pkgs/development/libraries/haskell/socket-io/default.nix | 6 +++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/engine-io/default.nix b/pkgs/development/libraries/haskell/engine-io/default.nix
index 82cb1240610d..6d3f29206f8c 100644
--- a/pkgs/development/libraries/haskell/engine-io/default.nix
+++ b/pkgs/development/libraries/haskell/engine-io/default.nix
@@ -7,13 +7,12 @@
 
 cabal.mkDerivation (self: {
   pname = "engine-io";
-  version = "1.1.0";
-  sha256 = "0l2jwgzi22ky13k9kmqhn15zyxyg5gr167rkywb458n1si4jr3jh";
+  version = "1.1.1";
+  sha256 = "0y3jppxppms1i0lg6izpl6xiczsjkxd0z2adxna1h7b399ivzcmg";
   buildDepends = [
     aeson async attoparsec base64Bytestring either monadLoops mwcRandom
     stm text transformers unorderedContainers vector websockets
   ];
-  jailbreak = true;
   meta = {
     homepage = "http://github.com/ocharles/engine.io";
     description = "A Haskell implementation of Engine.IO";
diff --git a/pkgs/development/libraries/haskell/socket-io/default.nix b/pkgs/development/libraries/haskell/socket-io/default.nix
index 19d6ff3a667a..0a7d4b1c2300 100644
--- a/pkgs/development/libraries/haskell/socket-io/default.nix
+++ b/pkgs/development/libraries/haskell/socket-io/default.nix
@@ -6,14 +6,14 @@
 
 cabal.mkDerivation (self: {
   pname = "socket-io";
-  version = "1.0.1";
-  sha256 = "0257c5wf6b9rmprqq5q5d7fih4s2szwv98w16ggl61p8khf5d2qs";
+  version = "1.1.0";
+  sha256 = "1ffip6jlp3i6pz8gbk8m2ra2q8568mgwgi988yh046w787yf9kpw";
   buildDepends = [
     aeson attoparsec engineIo mtl stm text transformers
     unorderedContainers vector
   ];
-  jailbreak = true;
   meta = {
+    homepage = "http://github.com/ocharles/engine.io";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = with self.stdenv.lib.maintainers; [ ocharles ];

From ce16840c683074962165f309b83769dd3b2f7b66 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Thu, 28 Aug 2014 10:11:15 +0100
Subject: [PATCH 0700/1453] haskellPackages.engineIo: Update to 1.1.2

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

diff --git a/pkgs/development/libraries/haskell/engine-io/default.nix b/pkgs/development/libraries/haskell/engine-io/default.nix
index 6d3f29206f8c..f1f9d06c76a7 100644
--- a/pkgs/development/libraries/haskell/engine-io/default.nix
+++ b/pkgs/development/libraries/haskell/engine-io/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "engine-io";
-  version = "1.1.1";
-  sha256 = "0y3jppxppms1i0lg6izpl6xiczsjkxd0z2adxna1h7b399ivzcmg";
+  version = "1.1.2";
+  sha256 = "1ry6rklrij7x1z8mw31vh41lc0axzj8l0lhmjsmhs554nv50062f";
   buildDepends = [
     aeson async attoparsec base64Bytestring either monadLoops mwcRandom
     stm text transformers unorderedContainers vector websockets

From 31f015f2e85459f59b984e9913a6f9c7e3c462ed Mon Sep 17 00:00:00 2001
From: Sven Keidel <svenkeidel@googlemail.com>
Date: Thu, 7 Aug 2014 17:49:16 +0200
Subject: [PATCH 0701/1453] gpodder: Update to 3.8.0

---
 pkgs/applications/audio/gpodder/default.nix | 38 ++++++++++++++++++---
 1 file changed, 33 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix
index 19b61ebc76d4..de5ef0551254 100644
--- a/pkgs/applications/audio/gpodder/default.nix
+++ b/pkgs/applications/audio/gpodder/default.nix
@@ -1,5 +1,6 @@
 { pkgs, stdenv, fetchurl, python, buildPythonPackage, pythonPackages, mygpoclient, intltool,
-  ipodSupport ? true, libgpod, gpodderHome ? "", gpodderDownloadDir ? "" }:
+  ipodSupport ? true, libgpod, gpodderHome ? "", gpodderDownloadDir ? "",
+  gnome3, hicolor_icon_theme }:
 
 with pkgs.lib;
 
@@ -7,14 +8,18 @@ let
   inherit (pythonPackages) coverage feedparser minimock sqlite3 dbus pygtk eyeD3;
 
 in buildPythonPackage rec {
-  name = "gpodder-3.7.0";
+  name = "gpodder-3.8.0";
 
   src = fetchurl {
     url = "http://gpodder.org/src/${name}.tar.gz";
-    sha256 = "fa90ef4bdd3fd9eef95404f7f43f70912ae3ab4f8d24078484a2f3e11b14dc47";
+    sha256 = "0731f08f4270c81872b841b55200ae80feb4502706397d0085079471fb9a8fe4";
   };
 
-  buildInputs = [ coverage feedparser minimock sqlite3 mygpoclient intltool ];
+  buildInputs = [
+    coverage feedparser minimock sqlite3 mygpoclient intltool
+    gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic
+    hicolor_icon_theme
+  ];
 
   propagatedBuildInputs = [ feedparser dbus mygpoclient sqlite3 pygtk eyeD3 ]
     ++ stdenv.lib.optional ipodSupport libgpod;
@@ -26,7 +31,30 @@ in buildPythonPackage rec {
   preFixup = ''
     wrapProgram $out/bin/gpodder \
       ${optionalString (gpodderHome != "") "--set GPODDER_HOME ${gpodderHome}"} \
-      ${optionalString (gpodderDownloadDir != "") "--set GPODDER_DOWNLOAD_DIR ${gpodderDownloadDir}"}
+      ${optionalString (gpodderDownloadDir != "") "--set GPODDER_DOWNLOAD_DIR ${gpodderDownloadDir}"} \
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  # The `wrapPythonPrograms` script in the postFixup phase breaks gpodder. The
+  # easiest way to fix this is to call wrapPythonPrograms and then to clean up
+  # the wrapped file.
+  postFixup = ''
+    wrapPythonPrograms
+
+    if test -e $out/nix-support/propagated-build-inputs; then
+        ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages
+    fi
+
+    createBuildInputsPth build-inputs "$buildInputStrings"
+    for inputsfile in propagated-build-inputs propagated-native-build-inputs; do
+      if test -e $out/nix-support/$inputsfile; then
+          createBuildInputsPth $inputsfile "$(cat $out/nix-support/$inputsfile)"
+      fi
+    done
+
+    sed -i "$out/bin/..gpodder-wrapped-wrapped" -e '{
+        /import sys; sys.argv/d
+    }'
   '';
 
   installPhase = "DESTDIR=/ PREFIX=$out make install";

From d5ea3b1e4491482e21efafc32ac91822d3ee9b55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=BCdiger=20Sonderfeld?= <ruediger@c-plusplus.de>
Date: Thu, 28 Aug 2014 12:55:34 +0200
Subject: [PATCH 0702/1453] parallel: Update to 20140822.

https://savannah.gnu.org/forum/forum.php?forum_id=8067
---
 pkgs/tools/misc/parallel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index 4b0332c75060..727657ca6e8d 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, perl }:
 
 stdenv.mkDerivation rec {
-  name = "parallel-20140222";
+  name = "parallel-20140822";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/${name}.tar.bz2";
-    sha256 = "0zb3hg92br6a53jn0pzfl16ffc1hfw81jk7nzw5spkshsdrcqx3y";
+    sha256 = "8a146a59bc71218921d561f2c801b85e06fe3a21571083b58e6e0966dd397fd4";
   };
 
   patchPhase =

From ae9afc4d31a8d44d062954b6885ade6900a32a3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=BCdiger=20Sonderfeld?= <ruediger@c-plusplus.de>
Date: Tue, 19 Aug 2014 15:02:20 +0200
Subject: [PATCH 0703/1453] licenses: Add CC0 license.

A universal public domain license.

http://creativecommons.org/publicdomain/zero/1.0/
---
 lib/licenses.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/licenses.nix b/lib/licenses.nix
index 02618f1c6ca7..95098aba1f29 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -62,6 +62,11 @@ rec {
     fullName = ''BSD 4-clause "Original" or "Old" License'';
   };
 
+  cc0 = spdx {
+    shortName = "CC0-1.0";
+    fullName = ''Creative Commons Zero v1.0 Universal'';
+  };
+
   cc-by-30 = spdx {
     shortName = "CC-BY-3.0";
     fullName = "Creative Commons Attribution 3.0";

From 57c8f292324ffa525daf6d94c4d4af581cd6b9cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=BCdiger=20Sonderfeld?= <ruediger@c-plusplus.de>
Date: Tue, 19 Aug 2014 15:03:21 +0200
Subject: [PATCH 0704/1453] Add comic-neue font.

---
 pkgs/data/fonts/comic-neue/default.nix | 33 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/data/fonts/comic-neue/default.nix

diff --git a/pkgs/data/fonts/comic-neue/default.nix b/pkgs/data/fonts/comic-neue/default.nix
new file mode 100644
index 000000000000..91608d17db44
--- /dev/null
+++ b/pkgs/data/fonts/comic-neue/default.nix
@@ -0,0 +1,33 @@
+{stdenv, fetchurl, unzip}:
+
+stdenv.mkDerivation rec {
+  name = "comic-neue-1.1";
+
+  src = fetchurl {
+    url = "http://comicneue.com/comic-neue-1.1.zip";
+    sha256 = "f9442fc42252db62ea788bd0247ae0e74571678d1dbd3e3edc229389050d6923";
+  };
+
+  buildInputs = [unzip];
+  phases = [ "unpackPhase" "installPhase" ];
+  sourceRoot = name;
+
+  installPhase = ''
+    mkdir -p $out/share/fonts/truetype
+    cp -v *.ttf $out/share/fonts/truetype
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://comicneue.com/;
+    description = "A casual type face: Make your lemonade stand look like a fortune 500 company";
+    longDescription = ''
+      It is inspired by Comic Sans but more regular.  The font was
+      designed by Craig Rozynski.  It is available in two variants:
+      Comic Neue and Comic Neue Angular.  The former having round and
+      the latter angular terminals.  Both variants come in Light,
+      Regular, and Bold weights with Oblique variants.
+    '';
+    license = licenses.cc0;
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0a97c43463d4..a9bab284b906 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8004,6 +8004,8 @@ let
 
   cantarell_fonts = callPackage ../data/fonts/cantarell-fonts { };
 
+  comic-neue = callPackage ../data/fonts/comic-neue { };
+
   corefonts = callPackage ../data/fonts/corefonts { };
 
   wrapFonts = paths : ((import ../data/fonts/fontWrap) {

From e07b5c95af31c5ef970097dc160562c1439caf25 Mon Sep 17 00:00:00 2001
From: Michael Fellinger <m.fellinger@gmail.com>
Date: Thu, 28 Aug 2014 14:16:11 +0200
Subject: [PATCH 0705/1453] Add di package

---
 lib/maintainers.nix              |  3 ++-
 pkgs/tools/system/di/default.nix | 20 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix  |  2 ++
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/tools/system/di/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 67936416ae8f..d3d46fc6862e 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -66,14 +66,15 @@
   lovek323 = "Jason O'Conal <jason@oconal.id.au>";
   ludo = "Ludovic Courtès <ludo@gnu.org>";
   madjar = "Georges Dubus <georges.dubus@compiletoi.net>";
+  manveru = "Michael Fellinger <m.fellinger@gmail.com>";
   marcweber = "Marc Weber <marco-oweber@gmx.de>";
   matejc = "Matej Cotman <cotman.matej@gmail.com>";
   meisternu = "Matt Miemiec <meister@krutt.org>";
   modulistic = "Pablo Costa <modulistic@gmail.com>";
   mornfall = "Petr Ročkai <me@mornfall.net>";
+  MP2E = "Cray Elliott <MP2E@archlinux.us>";
   msackman = "Matthew Sackman <matthew@wellquite.org>";
   nathan-gs = "Nathan Bijnens <nathan@nathan.gs>";
-  MP2E = "Cray Elliott <MP2E@archlinux.us>";
   notthemessiah = "Brian Cohen <brian.cohen.88@gmail.com>";
   ocharles = "Oliver Charles <ollie@ocharles.org.uk>";
   offline = "Jaka Hudoklin <jakahudoklin@gmail.com>";
diff --git a/pkgs/tools/system/di/default.nix b/pkgs/tools/system/di/default.nix
new file mode 100644
index 000000000000..dc15ce13bccb
--- /dev/null
+++ b/pkgs/tools/system/di/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "di-4.35";
+
+  src = fetchurl {
+    url = "http://gentoo.com/di/${name}.tar.gz";
+    sha256 = "1lkiggvdm6wi14xy8845w6mqqr50j2q7g0i2rdcs7qw5gb7gmprc";
+  };
+
+  makeFlags = "INSTALL_DIR=$(out)";
+
+  meta = with stdenv.lib; {
+    description = "A disk information utility, displaying everything (and more) that your 'df' command does";
+    homepage = http://www.gentoo.com/di/;
+    license = licenses.zlib;
+    maintainers = with maintainers; [ manveru ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0a97c43463d4..212b185bbff2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -901,6 +901,8 @@ let
 
   dhcpcd = callPackage ../tools/networking/dhcpcd { };
 
+  di = callPackage ../tools/system/di { };
+
   diffstat = callPackage ../tools/text/diffstat { };
 
   diffutils = callPackage ../tools/text/diffutils { };

From a5143dd20806f3b029a65342a79adaf66266618d Mon Sep 17 00:00:00 2001
From: Georges Dubus <georges.dubus@numergy.com>
Date: Thu, 28 Aug 2014 17:36:13 +0200
Subject: [PATCH 0706/1453] rabbitmq-server: updated to 3.3.5

---
 pkgs/servers/amqp/rabbitmq-server/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix
index 09b091b323c8..b5f9195abbde 100644
--- a/pkgs/servers/amqp/rabbitmq-server/default.nix
+++ b/pkgs/servers/amqp/rabbitmq-server/default.nix
@@ -4,11 +4,11 @@
 stdenv.mkDerivation rec {
   name = "rabbitmq-server-${version}";
 
-  version = "3.3.4";
+  version = "3.3.5";
 
   src = fetchurl {
     url = "http://www.rabbitmq.com/releases/rabbitmq-server/v${version}/${name}.tar.gz";
-    sha256 = "13nnsn34b44mz8w4b69bcpxmq4daqnxzd0lppg0f138pcssha43l";
+    sha256 = "1hkhkpv2f0nzvw09zfrqg89mphdpn4nwvzrlqnhqf82bd2pzhsvs";
   };
 
   buildInputs =

From 7fec14e74a61ef8ffb39ca9e72b941879df3d2f2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 28 Aug 2014 18:08:32 +0200
Subject: [PATCH 0707/1453] haskell-hspec2: mark 'broken' because of
 https://github.com/hspec/hspec/issues/187

---
 pkgs/development/libraries/haskell/hspec2/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/haskell/hspec2/default.nix b/pkgs/development/libraries/haskell/hspec2/default.nix
index 9b57dbd7627f..295b01b4e326 100644
--- a/pkgs/development/libraries/haskell/hspec2/default.nix
+++ b/pkgs/development/libraries/haskell/hspec2/default.nix
@@ -25,5 +25,7 @@ cabal.mkDerivation (self: {
     description = "Alpha version of Hspec 2.0";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
+    broken = true;
   };
 })

From 1e7885f9c2f7bc352064f95429917f77babc9fd4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 28 Aug 2014 18:09:00 +0200
Subject: [PATCH 0708/1453] haskell-servant-scotty: re-generate with cabal2nix

---
 pkgs/development/libraries/haskell/servant-scotty/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/servant-scotty/default.nix b/pkgs/development/libraries/haskell/servant-scotty/default.nix
index 562c966bcc7c..732b2c95cc7e 100644
--- a/pkgs/development/libraries/haskell/servant-scotty/default.nix
+++ b/pkgs/development/libraries/haskell/servant-scotty/default.nix
@@ -13,8 +13,7 @@ cabal.mkDerivation (self: {
   ];
   meta = {
     homepage = "http://github.com/zalora/servant";
-    description = "Generate a web service for servant 'Resource's
-  using scotty and JSON";
+    description = "Generate a web service for servant 'Resource's using scotty and JSON";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
   };

From 1851efa1a7143b3f1fad4c4f1e046ff418f69d0e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 28 Aug 2014 18:15:54 +0200
Subject: [PATCH 0709/1453] haskell-hspec-wai: disable builds because it
 depends on broken hspec2

---
 pkgs/development/libraries/haskell/hspec-wai/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/hspec-wai/default.nix b/pkgs/development/libraries/haskell/hspec-wai/default.nix
index 3170318f540b..1341bf198c96 100644
--- a/pkgs/development/libraries/haskell/hspec-wai/default.nix
+++ b/pkgs/development/libraries/haskell/hspec-wai/default.nix
@@ -21,5 +21,6 @@ cabal.mkDerivation (self: {
     description = "Experimental Hspec support for testing WAI applications (depends on hspec2!)";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
   };
 })

From cefe9fac459b7d51dd7b080bd16d24c24735d9f6 Mon Sep 17 00:00:00 2001
From: Gergely Risko <errge@nilcons.com>
Date: Thu, 28 Aug 2014 18:33:51 +0200
Subject: [PATCH 0710/1453] Enable parallel building for cloog and isl

Since these are GCC dependencies, this speeds up building the
stdenv closure.
---
 pkgs/development/libraries/cloog/default.nix | 2 ++
 pkgs/development/libraries/isl/0.12.2.nix    | 2 ++
 pkgs/development/libraries/isl/default.nix   | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/cloog/default.nix b/pkgs/development/libraries/cloog/default.nix
index da4501285e12..242af84eb908 100644
--- a/pkgs/development/libraries/cloog/default.nix
+++ b/pkgs/development/libraries/cloog/default.nix
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--with-isl=system" ];
 
+  enableParallelBuilding = true;
+
   doCheck = true;
 
   meta = {
diff --git a/pkgs/development/libraries/isl/0.12.2.nix b/pkgs/development/libraries/isl/0.12.2.nix
index f1da2c064092..67620881bca6 100644
--- a/pkgs/development/libraries/isl/0.12.2.nix
+++ b/pkgs/development/libraries/isl/0.12.2.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ gmp ];
 
+  enableParallelBuilding = true;
+
   meta = {
     homepage = http://www.kotnet.org/~skimo/isl/;
     license = stdenv.lib.licenses.lgpl21;
diff --git a/pkgs/development/libraries/isl/default.nix b/pkgs/development/libraries/isl/default.nix
index 7e08c8afe6f6..931ee831b734 100644
--- a/pkgs/development/libraries/isl/default.nix
+++ b/pkgs/development/libraries/isl/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
   buildInputs = [ gmp ];
   patches = [ ./fix-gcc-build.diff ];
 
+  enableParallelBuilding = true;
+
   meta = {
     homepage = http://www.kotnet.org/~skimo/isl/;
     license = stdenv.lib.licenses.lgpl21;

From 86141f80670ab59add19fbcfee729c962ff554fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=BCdiger=20Sonderfeld?= <ruediger@c-plusplus.de>
Date: Thu, 28 Aug 2014 19:12:34 +0200
Subject: [PATCH 0711/1453] lightning: Update to 2.0.5.

---
 pkgs/development/libraries/lightning/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/lightning/default.nix b/pkgs/development/libraries/lightning/default.nix
index 73d98023c845..036d9c61d07a 100644
--- a/pkgs/development/libraries/lightning/default.nix
+++ b/pkgs/development/libraries/lightning/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, binutils }:
 
 stdenv.mkDerivation rec {
-  name = "lightning-2.0.4";
+  name = "lightning-2.0.5";
 
   src = fetchurl {
-    url = "ftp://ftp.gnu.org/gnu/lightning/${name}.tar.gz";
-    sha256 = "1lrckrx51d5hrv66bc99fd4b7g2wwn4vr304hwq3glfzhb8jqcdy";
+    url = "mirror://gnu/lightning/${name}.tar.gz";
+    sha256 = "0jm9a8ddxc1v9hyzyv4ybg37fjac2yjqv1hkd262wxzqms36mdk5";
   };
 
   # Needs libopcodes.so  from binutils for 'make check'

From adbb9ff7966c1c17588100d6afddda66eafc9453 Mon Sep 17 00:00:00 2001
From: Paul Colomiets <paul@colomiets.name>
Date: Thu, 3 Jul 2014 01:59:35 +0300
Subject: [PATCH 0712/1453] dnsmasq: upgrade to 2.71, fixed dnsmasq module

* The module now has systemd config

* Add resolveLocalQueries option which sets up it as a dns server for
  local host (including reasonable setup of resolvconf)

* Add "dnsmasq" user for running daemon

* Enabled dbus and dnssec support for the package

Conflicts:
	nixos/modules/misc/ids.nix
---
 nixos/modules/config/networking.nix           |  8 +++-
 nixos/modules/misc/ids.nix                    |  1 +
 nixos/modules/services/networking/dnsmasq.nix | 45 +++++++++++++++----
 pkgs/tools/networking/dnsmasq/default.nix     | 24 +++++++++-
 4 files changed, 67 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix
index fd1e55f673ae..136a5bda7459 100644
--- a/nixos/modules/config/networking.nix
+++ b/nixos/modules/config/networking.nix
@@ -7,6 +7,9 @@ with lib;
 let
 
   cfg = config.networking;
+  dnsmasqResolve = config.services.dnsmasq.enable &&
+                   config.services.dnsmasq.resolveLocalQueries;
+  hasLocalResolver = config.services.bind.enable || dnsmasqResolve;
 
 in
 
@@ -74,9 +77,12 @@ in
             '' + optionalString cfg.dnsSingleRequest ''
               # only send one DNS request at a time
               resolv_conf_options='single-request'
-            '' + optionalString config.services.bind.enable ''
+            '' + optionalString hasLocalResolver ''
               # This hosts runs a full-blown DNS resolver.
               name_servers='127.0.0.1'
+            '' + optionalString dnsmasqResolve ''
+              dnsmasq_conf=/etc/dnsmasq-conf.conf
+              dnsmasq_resolv=/etc/dnsmasq-resolv.conf
             '';
       };
 
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 92ab241deaa1..513da5d50a18 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -148,6 +148,7 @@
       riemanndash = 138;
       radvd = 139;
       zookeeper = 140;
+      dnsmasq = 141;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
diff --git a/nixos/modules/services/networking/dnsmasq.nix b/nixos/modules/services/networking/dnsmasq.nix
index 8e38b9d017a3..d2a8af6ac8b1 100644
--- a/nixos/modules/services/networking/dnsmasq.nix
+++ b/nixos/modules/services/networking/dnsmasq.nix
@@ -6,10 +6,12 @@ let
   cfg = config.services.dnsmasq;
   dnsmasq = pkgs.dnsmasq;
 
-  serversParam = concatMapStrings (s: "-S ${s} ") cfg.servers;
-
   dnsmasqConf = pkgs.writeText "dnsmasq.conf" ''
-    ${cfg.extraConfig}
+    ${optionalString cfg.resolveLocalQueries ''
+      conf-file=/etc/dnsmasq-conf.conf
+      resolv-file=/etc/dnsmasq-resolv.conf
+    ''}
+      ${cfg.extraConfig}
   '';
 
 in
@@ -29,6 +31,14 @@ in
         '';
       };
 
+      resolveLocalQueries = mkOption {
+        default = true;
+        description = ''
+          Whether dnsmasq should resolve local queries (i.e. add 127.0.0.1 to
+          /etc/resolv.conf)
+        '';
+      };
+
       servers = mkOption {
         default = [];
         example = [ "8.8.8.8" "8.8.4.4" ];
@@ -37,6 +47,8 @@ in
         '';
       };
 
+
+
       extraConfig = mkOption {
         type = types.string;
         default = "";
@@ -55,16 +67,31 @@ in
 
   config = mkIf config.services.dnsmasq.enable {
 
-    jobs.dnsmasq =
-      { description = "dnsmasq daemon";
+    environment.systemPackages = [ dnsmasq ]
+      ++ (if cfg.resolveLocalQueries then [ pkgs.openresolv ] else []);
 
-        startOn = "ip-up";
+    services.dbus.packages = [ dnsmasq ];
 
-        daemonType = "daemon";
-
-        exec = "${dnsmasq}/bin/dnsmasq -R ${serversParam} -o -C ${dnsmasqConf}";
+    users.extraUsers = singleton
+      { name = "dnsmasq";
+        uid = config.ids.uids.dnsmasq;
+        description = "Dnsmasq daemon user";
+        home = "/var/empty";
       };
 
+    systemd.services.dnsmasq = {
+        description = "dnsmasq daemon";
+        after = [ "network.target" ];
+        wantedBy = [ "multi-user.target" ];
+        serviceConfig = {
+          Type = "dbus";
+          BusName = "uk.org.thekelleys.dnsmasq";
+          ExecStartPre = "${dnsmasq}/bin/dnsmasq --test";
+          ExecStart = "${dnsmasq}/bin/dnsmasq -k --enable-dbus --user=dnsmasq -C ${dnsmasqConf}";
+          ExecReload = "${dnsmasq}/bin/kill -HUP $MAINPID";
+        };
+    };
+
   };
 
 }
diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix
index cec4057a284f..ba59071d0cef 100644
--- a/pkgs/tools/networking/dnsmasq/default.nix
+++ b/pkgs/tools/networking/dnsmasq/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ pkgconfig, dbus_libs, nettle, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "dnsmasq-2.71";
@@ -8,8 +8,30 @@ stdenv.mkDerivation rec {
     sha256 = "1fpzpzja7qr8b4kfdhh4i4sijp62c634yf0xvq2n4p7d5xbzn6a9";
   };
 
+  # Can't rely on make flags because of space in one of the parameters
+  buildPhase = ''
+    make COPTS="-DHAVE_DNSSEC -DHAVE_DBUS"
+  '';
+
+  # make flags used for installation only
   makeFlags = "DESTDIR= BINDIR=$(out)/bin MANDIR=$(out)/man LOCALEDIR=$(out)/share/locale";
 
+  postInstall = ''
+    install -Dm644 dbus/dnsmasq.conf $out/etc/dbus-1/system.d/dnsmasq.conf
+    install -Dm644 trust-anchors.conf $out/share/dnsmasq/trust-anchors.conf
+
+    ensureDir $out/share/dbus-1/system-services
+    cat <<END > $out/share/dbus-1/system-services/uk.org.thekelleys.dnsmasq.service
+    [D-BUS Service]
+    Name=uk.org.thekelleys.dnsmasq
+    Exec=$out/sbin/dnsmasq -k -1
+    User=root
+    SystemdService=dnsmasq.service
+    END
+  '';
+
+  buildInputs = [ pkgconfig dbus_libs nettle ];
+
   meta = {
     description = "An integrated DNS, DHCP and TFTP server for small networks";
     homepage = http://www.thekelleys.org.uk/dnsmasq/doc.html;

From 9194f69e73aface9ad039a428710ee669b6d3204 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 11 Aug 2014 15:48:36 -0500
Subject: [PATCH 0713/1453] dnsmasq: Meta Update

---
 pkgs/tools/networking/dnsmasq/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix
index ba59071d0cef..02f24ce4c003 100644
--- a/pkgs/tools/networking/dnsmasq/default.nix
+++ b/pkgs/tools/networking/dnsmasq/default.nix
@@ -32,11 +32,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig dbus_libs nettle ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "An integrated DNS, DHCP and TFTP server for small networks";
     homepage = http://www.thekelleys.org.uk/dnsmasq/doc.html;
-    license = "GPL";
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
+    license = licenses.gpl2;
+    platforms = with platforms; linux ++ darwin;
+    maintainers = with maintainers; [ eelco ];
   };
 }

From 859a2c446cbe1f802ec3f6ad07d3913c4518e11d Mon Sep 17 00:00:00 2001
From: Linquize <linquize@yahoo.com.hk>
Date: Mon, 25 Aug 2014 17:35:47 +0200
Subject: [PATCH 0714/1453] protobuf: Update to 2.6.0

---
 pkgs/development/libraries/protobuf/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/protobuf/default.nix b/pkgs/development/libraries/protobuf/default.nix
index bba8481780a5..3452335decdc 100644
--- a/pkgs/development/libraries/protobuf/default.nix
+++ b/pkgs/development/libraries/protobuf/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "protobuf-2.5.0";
+  name = "protobuf-2.6.0";
 
   src = fetchurl {
-    url = "http://protobuf.googlecode.com/files/${name}.tar.bz2";
-    sha256 = "0xxn9gxhvsgzz2sgmihzf6pf75clr05mqj6218camwrwajpcbgqk";
+    url = "http://protobuf.googlecode.com/svn-history/r579/rc/protobuf-2.6.0.tar.bz2";
+    sha256 = "0krfkxc85vfznqwbh59qlhp7ld81al9ss35av0gfbg74i0rvjids";
   };
 
   buildInputs = [ zlib ];

From 39320b0fa38bfe6dba1c285758b4663de43cd371 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 28 Aug 2014 18:35:53 +0200
Subject: [PATCH 0715/1453] gnome3.gitg: fix build by updating it to unstable

---
 pkgs/desktops/gnome-3/3.10/misc/gitg/default.nix       |  6 +++---
 .../gnome-3/3.10/misc/libgit2-glib/default.nix         | 10 ++++++----
 pkgs/desktops/gnome-3/3.12/misc/gitg/default.nix       |  6 +++---
 .../gnome-3/3.12/misc/libgit2-glib/default.nix         |  8 ++++----
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.10/misc/gitg/default.nix b/pkgs/desktops/gnome-3/3.10/misc/gitg/default.nix
index 7ca35a8255f9..401d5cf2f36a 100644
--- a/pkgs/desktops/gnome-3/3.10/misc/gitg/default.nix
+++ b/pkgs/desktops/gnome-3/3.10/misc/gitg/default.nix
@@ -6,11 +6,11 @@
 # use packaged gnome3.gnome_icon_theme_symbolic 
 
 stdenv.mkDerivation rec {
-  name = "gitg-0.3.2";
+  name = "gitg-3.13.91";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gitg/0.3/${name}.tar.xz";
-    sha256 = "03vc59d1r3326piqdph6qjqnc40chm1lpg52lpf8466ddjs0x8vp";
+    url = "mirror://gnome/sources/gitg/3.13/${name}.tar.xz";
+    sha256 = "1c2016grvgg5f3l5xkracz85rblsc1a4brzr6vgn6kh2h494rv37";
   };
 
   preCheck = ''
diff --git a/pkgs/desktops/gnome-3/3.10/misc/libgit2-glib/default.nix b/pkgs/desktops/gnome-3/3.10/misc/libgit2-glib/default.nix
index 17c3b4fa0a8c..82e2b5855094 100644
--- a/pkgs/desktops/gnome-3/3.10/misc/libgit2-glib/default.nix
+++ b/pkgs/desktops/gnome-3/3.10/misc/libgit2-glib/default.nix
@@ -1,18 +1,20 @@
-{ stdenv, fetchurl, gnome3, libtool, pkgconfig
+{ stdenv, fetchurl, gnome3, libtool, pkgconfig, vala
 , gtk_doc, gobjectIntrospection, libgit2, glib }:
 
 stdenv.mkDerivation rec {
   name = "libgit2-glib-${version}";
-  version = "0.0.10";
+  version = "0.0.20";
 
   src = fetchurl {
     url = "https://github.com/GNOME/libgit2-glib/archive/v${version}.tar.gz";
-    sha256 = "0zn3k85jw6yks8s5ca8dyh9mwh4if1lni9gz9bd5lqlpa803ixxs";
+    sha256 = "1s2hj0ji73ishniqvr6mx90l1ji5jjwwrwhp91i87fxk0d3sry5x";
   };
+  
+  cmakeFlags = "-DTHREADSAFE=ON";
 
   configureScript = "sh ./autogen.sh";
 
-  buildInputs = [ gnome3.gnome_common libtool pkgconfig
+  buildInputs = [ gnome3.gnome_common libtool pkgconfig vala
                   gtk_doc gobjectIntrospection libgit2 glib ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.12/misc/gitg/default.nix b/pkgs/desktops/gnome-3/3.12/misc/gitg/default.nix
index 7ca35a8255f9..401d5cf2f36a 100644
--- a/pkgs/desktops/gnome-3/3.12/misc/gitg/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/misc/gitg/default.nix
@@ -6,11 +6,11 @@
 # use packaged gnome3.gnome_icon_theme_symbolic 
 
 stdenv.mkDerivation rec {
-  name = "gitg-0.3.2";
+  name = "gitg-3.13.91";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gitg/0.3/${name}.tar.xz";
-    sha256 = "03vc59d1r3326piqdph6qjqnc40chm1lpg52lpf8466ddjs0x8vp";
+    url = "mirror://gnome/sources/gitg/3.13/${name}.tar.xz";
+    sha256 = "1c2016grvgg5f3l5xkracz85rblsc1a4brzr6vgn6kh2h494rv37";
   };
 
   preCheck = ''
diff --git a/pkgs/desktops/gnome-3/3.12/misc/libgit2-glib/default.nix b/pkgs/desktops/gnome-3/3.12/misc/libgit2-glib/default.nix
index 17c3b4fa0a8c..94776c90cf99 100644
--- a/pkgs/desktops/gnome-3/3.12/misc/libgit2-glib/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/misc/libgit2-glib/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, fetchurl, gnome3, libtool, pkgconfig
+{ stdenv, fetchurl, gnome3, libtool, pkgconfig, vala
 , gtk_doc, gobjectIntrospection, libgit2, glib }:
 
 stdenv.mkDerivation rec {
   name = "libgit2-glib-${version}";
-  version = "0.0.10";
+  version = "0.0.20";
 
   src = fetchurl {
     url = "https://github.com/GNOME/libgit2-glib/archive/v${version}.tar.gz";
-    sha256 = "0zn3k85jw6yks8s5ca8dyh9mwh4if1lni9gz9bd5lqlpa803ixxs";
+    sha256 = "1s2hj0ji73ishniqvr6mx90l1ji5jjwwrwhp91i87fxk0d3sry5x";
   };
 
   configureScript = "sh ./autogen.sh";
 
-  buildInputs = [ gnome3.gnome_common libtool pkgconfig
+  buildInputs = [ gnome3.gnome_common libtool pkgconfig vala
                   gtk_doc gobjectIntrospection libgit2 glib ];
 
   meta = with stdenv.lib; {

From 0005e1896d9bdef48aedcff9e86843351ac024e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 28 Aug 2014 20:19:31 +0200
Subject: [PATCH 0716/1453] python3Packages: disable some more

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8374e29162a9..d276413f3d38 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2152,6 +2152,7 @@ rec {
   googlecl = buildPythonPackage rec {
     version = "0.9.14";
     name    = "googlecl-${version}";
+    disabled = isPy3k;
 
     src = fetchurl {
       url    = "https://googlecl.googlecode.com/files/${name}.tar.gz";
@@ -3764,6 +3765,7 @@ rec {
 
    google_apputils = buildPythonPackage rec {
     name = "google-apputils-0.4.0";
+    disabled = isPy3k;
 
     src = fetchurl {
       url = http://pypi.python.org/packages/source/g/google-apputils/google-apputils-0.4.0.tar.gz;
@@ -3917,6 +3919,7 @@ rec {
 
   http_signature = buildPythonPackage (rec {
     name = "http_signature-0.1.4";
+    disabled = isPy3k;
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/h/http_signature/${name}.tar.gz";
@@ -4797,6 +4800,7 @@ rec {
 
   muttils = buildPythonPackage (rec {
     name = "muttils-1.3";
+    disabled = isPy3k;
 
     src = fetchurl {
       url = http://www.blacktrash.org/hg/muttils/archive/8bb26094df06.tar.bz2;
@@ -4859,6 +4863,7 @@ rec {
 
   namebench = buildPythonPackage (rec {
     name = "namebench-1.0.5";
+    disabled = isPy3k;
 
     src = fetchurl {
       url = "http://namebench.googlecode.com/files/${name}.tgz";
@@ -5073,6 +5078,7 @@ rec {
 
   nose-cprof = buildPythonPackage rec {
     name = "nose-cprof-0.1-0";
+    disabled = isPy3k;
 
     src = fetchurl {
       url = "https://pypi.python.org/packages/source/n/nose-cprof/${name}.tar.gz";
@@ -5812,8 +5818,9 @@ rec {
   protobuf = buildPythonPackage rec {
     inherit (pkgs.protobuf) name src;
 
-    propagatedBuildInputs = [ pkgs.protobuf setuptools ];
+    propagatedBuildInputs = [ pkgs.protobuf google_apputils  ];
     sourceRoot = "${name}/python";
+    
 
     meta = {
       description = "Protocol Buffers are Google's data interchange format.";
@@ -6150,6 +6157,8 @@ rec {
     };
 
     buildInputs = [ unittest2 ];
+    
+    doCheck = !isPyPy;
 
     meta = {
       homepage = "https://launchpad.net/pyflakes";
@@ -8206,6 +8215,7 @@ rec {
 
   taskcoach = buildPythonPackage rec {
     name = "TaskCoach-1.3.22";
+    disabled = isPy3k;
 
     src = fetchurl {
       url = "mirror://sourceforge/taskcoach/${name}.tar.gz";
@@ -8347,6 +8357,7 @@ rec {
 
   smmap = buildPythonPackage rec {
     name = "smmap-0.8.2";
+    disabled = isPy3k;  # next release will have py3k support
     meta.maintainers = [ stdenv.lib.maintainers.mornfall ];
 
     src = fetchurl {

From a2eb68a6dc094169384fb5ba5bf73829ad74ce59 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Thu, 28 Aug 2014 21:27:08 +0200
Subject: [PATCH 0717/1453] update virtualbox to 4.3.14

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

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 682e7159ac8f..f3e7bea3ca9a 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -11,7 +11,7 @@ with stdenv.lib;
 
 let
 
-  version = "4.3.12"; # changes ./guest-additions as well
+  version = "4.3.14"; # changes ./guest-additions as well
 
   forEachModule = action: ''
     for mod in \
@@ -31,13 +31,13 @@ let
   '';
 
   # See https://github.com/NixOS/nixpkgs/issues/672 for details
-  extpackRevision = "93733";
+  extpackRevision = "95030";
   extensionPack = requireFile rec {
     name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}.vbox-extpack";
     # IMPORTANT: Hash must be base16 encoded because it's used as an input to
     # VBoxExtPackHelperApp!
     # Tip: see http://dlc.sun.com.edgesuite.net/virtualbox/4.3.10/SHA256SUMS
-    sha256 = "f931ce41b2cc9500dc43aba004630cf7bb7050ba737eae38827e91062f072d1f";
+    sha256 = "b965c3565e7933bc61019d2992f4da084944cfd9e809fbeaff330f4743d47537";
     message = ''
       In order to use the extension pack, you need to comply with the VirtualBox Personal Use
       and Evaluation License (PUEL) by downloading the related binaries from:
@@ -56,7 +56,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
-    sha256 = "db84ddf47d1ecd316ec46417595f0252e3ec2f67e35e1e17320aba87b7c2934f";
+    sha256 = "bc893adde4449a2d35d8b4d0b8b247f0f2ac62a434fd8a8f7c54f613a100855a";
   };
 
   buildInputs =

From 792afca11318aaac0715f343d7454ea4933a932a Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 28 Aug 2014 15:26:32 -0500
Subject: [PATCH 0718/1453] spiped: 1.3.1 -> 1.4.0

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/tools/networking/spiped/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/spiped/default.nix b/pkgs/tools/networking/spiped/default.nix
index ac2736ffb19e..f854b92b87e5 100644
--- a/pkgs/tools/networking/spiped/default.nix
+++ b/pkgs/tools/networking/spiped/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "spiped-${version}";
-  version = "1.3.1";
+  version = "1.4.0";
 
   src = fetchurl {
     url    = "http://www.tarsnap.com/spiped/${name}.tgz";
-    sha256 = "1viglk61v1v2ga1n31r0h8rvib5gy2h02lhhbbnqh2s6ps1sjn4a";
+    sha256 = "0pyg1llnqgfx7n7mi3dq4ra9xg3vkxlf01z5jzn7ncq5d6ii7ynq";
   };
 
   buildInputs = [ openssl ];

From 4f832b521729daf54f83d0b5c6ff008d5311a81a Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 2 May 2014 05:02:09 -0500
Subject: [PATCH 0719/1453] Revert "grub: Allow setting the boot root
 explicitly"

This reverts commit e4630c1d41d513eb709bddb39043da84442235a7.
---
 nixos/modules/system/boot/loader/grub/grub.nix        | 11 +----------
 nixos/modules/system/boot/loader/grub/install-grub.pl |  5 -----
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index 0cc060db8f90..a3b09223cbb8 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -25,7 +25,7 @@ let
       inherit (cfg)
         version extraConfig extraPerEntryConfig extraEntries
         extraEntriesBeforeNixOS extraPrepareConfig configurationLimit copyKernels timeout
-        default devices explicitBootRoot;
+        default devices;
       path = (makeSearchPath "bin" [
         pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.findutils pkgs.diffutils
       ]) + ":" + (makeSearchPath "sbin" [
@@ -209,15 +209,6 @@ in
         '';
       };
 
-      explicitBootRoot = mkOption {
-        default = "";
-        type = types.str;
-        description = ''
-          The relative path of /boot within the parent volume. Leave empty
-          if /boot is not a btrfs subvolume.
-        '';
-      };
-
     };
 
   };
diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index c3aa8518b8bb..a83733db63b0 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -39,7 +39,6 @@ my $configurationLimit = int(get("configurationLimit"));
 my $copyKernels = get("copyKernels") eq "true";
 my $timeout = int(get("timeout"));
 my $defaultEntry = int(get("default"));
-my $explicitBootRoot = get("explicitBootRoot");
 $ENV{'PATH'} = get("path");
 
 die "unsupported GRUB version\n" if $grubVersion != 1 && $grubVersion != 2;
@@ -62,10 +61,6 @@ if (stat("/")->dev != stat("/boot")->dev) {
     $copyKernels = 1;
 }
 
-if ($explicitBootRoot ne "") {
-    $bootRoot = $explicitBootRoot;
-}
-
 
 # Generate the header.
 my $conf .= "# Automatically generated.  DO NOT EDIT THIS FILE!\n";

From f2bef62716b4c5853ea16465f31182569dbb80ef Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 21 Oct 2013 05:09:02 -0500
Subject: [PATCH 0720/1453] Update grub 2.00 to 2.02-beta2

---
 pkgs/tools/misc/grub/2.0x.nix   | 40 ++++++++++++++++++---------------
 pkgs/top-level/all-packages.nix |  2 +-
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix
index b1877bdcf98c..59658e47a08f 100644
--- a/pkgs/tools/misc/grub/2.0x.nix
+++ b/pkgs/tools/misc/grub/2.0x.nix
@@ -1,11 +1,17 @@
-{ fetchurl, stdenv, flex, bison, gettext, ncurses, libusb, freetype, qemu
-, devicemapper, EFIsupport ? false }:
+{ fetchurl, stdenv, autogen, flex, bison, python, autoconf, automake
+, gettext, ncurses, libusb, freetype, qemu, devicemapper
+, linuxPackages ? null
+, EFIsupport ? false
+, zfsSupport ? false
+}:
+
+assert zfsSupport -> linuxPackages != null && linuxPackages.zfs != null;
 
 let
 
   prefix = "grub${if EFIsupport then "-efi" else ""}";
 
-  version = "2.00";
+  version = "2.02-beta2";
 
   unifont_bdf = fetchurl {
     url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz";
@@ -18,13 +24,14 @@ stdenv.mkDerivation rec {
   name = "${prefix}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnu/grub/grub-${version}.tar.xz";
-    sha256 = "0n64hpmsccvicagvr0c6v0kgp2yw0kgnd3jvsyd26cnwgs7c6kkq";
+    url = "http://git.savannah.gnu.org/cgit/grub.git/snapshot/grub-2.02-beta2.tar.gz";
+    sha256 = "1n2l7k76lqqaavz12615vx5kca0kl8g13bkimc7xsd9s7c1ir5lr";
   };
 
-  nativeBuildInputs = [ flex bison ];
+  nativeBuildInputs = [ autogen flex bison python autoconf automake ];
   buildInputs = [ ncurses libusb freetype gettext devicemapper ]
-    ++ stdenv.lib.optional doCheck qemu;
+    ++ stdenv.lib.optional doCheck qemu
+    ++ stdenv.lib.optional zfsSupport linuxPackages.zfs;
 
   preConfigure =
     '' for i in "tests/util/"*.in
@@ -43,14 +50,11 @@ stdenv.mkDerivation rec {
        # See <http://www.mail-archive.com/qemu-devel@nongnu.org/msg22775.html>.
        sed -i "tests/util/grub-shell.in" \
            -e's/qemu-system-i386/qemu-system-x86_64 -nodefaults/g'
-
-       # Fix for building on Glibc 2.16.  Won't be needed once the
-       # gnulib in grub is updated.
-       sed -i '/gets is a security hole/d' grub-core/gnulib/stdio.in.h
     '';
 
   prePatch =
-    '' gunzip < "${unifont_bdf}" > "unifont.bdf"
+    '' sh autogen.sh
+       gunzip < "${unifont_bdf}" > "unifont.bdf"
        sed -i "configure" \
            -e "s|/usr/src/unifont.bdf|$PWD/unifont.bdf|g"
     '';
@@ -61,8 +65,8 @@ stdenv.mkDerivation rec {
     let arch = if stdenv.system == "i686-linux" then "i386"
                else if stdenv.system == "x86_64-linux" then "x86_64"
                else throw "unsupported EFI firmware architecture";
-    in
-      stdenv.lib.optionals EFIsupport
+    in stdenv.lib.optional zfsSupport "--enable-libzfs"
+      ++ stdenv.lib.optionals EFIsupport
         [ "--with-platform=efi" "--target=${arch}" "--program-prefix=" ];
 
   doCheck = false;
@@ -72,7 +76,7 @@ stdenv.mkDerivation rec {
     paxmark pms $out/sbin/grub-{probe,bios-setup}
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "GNU GRUB, the Grand Unified Boot Loader (2.x beta)";
 
     longDescription =
@@ -87,13 +91,13 @@ stdenv.mkDerivation rec {
          operating system (e.g., GNU).
       '';
 
-    homepage = http://www.gnu.org/software/grub/;
+    homepage = http://wwwp.gnu.org/software/grub/; 
 
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = licenses.gpl3Plus;
 
     platforms = if EFIsupport then
       [ "i686-linux" "x86_64-linux" ]
     else
-      stdenv.lib.platforms.gnu;
+      platforms.gnu;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a8540bdb1f61..c5b511df9c02 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1218,7 +1218,7 @@ let
     buggyBiosCDSupport = config.grub.buggyBiosCDSupport or true;
   };
 
-  grub2 = callPackage ../tools/misc/grub/2.0x.nix { libusb = libusb1; flex = flex_2_5_35; };
+  grub2 = callPackage ../tools/misc/grub/2.0x.nix { };
 
   grub2_efi = grub2.override { EFIsupport = true; };
 

From 3c6e2fbba910cd3f110a0388c0a374d1573082ef Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 9 Apr 2014 13:27:18 -0500
Subject: [PATCH 0721/1453] Add optional zfsSupport to the nixos grub
 configuration

---
 nixos/modules/system/boot/loader/grub/grub.nix | 14 +++++++++++++-
 pkgs/top-level/all-packages.nix                |  2 ++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index a3b09223cbb8..25cec57431e1 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -6,7 +6,8 @@ let
 
   cfg = config.boot.loader.grub;
 
-  realGrub = if cfg.version == 1 then pkgs.grub else pkgs.grub2;
+  realGrub = if cfg.version == 1 then pkgs.grub
+    else pkgs.grub2.override { zfsSupport = cfg.zfsSupport };
 
   grub =
     # Don't include GRUB if we're only generating a GRUB menu (e.g.,
@@ -209,6 +210,14 @@ in
         '';
       };
 
+      zfsSupport = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          Whether grub should be build against libzfs.
+        '';
+      };
+
     };
 
   };
@@ -251,6 +260,9 @@ in
           ${pkgs.coreutils}/bin/cp -pf "${v}" "/boot/${n}"
         '') config.boot.loader.grub.extraFiles);
 
+    assertions = [{ assertion = !cfg.zfsSupport || cfg.version == 2;
+                    message = "Only grub version 2 provides zfs support";}];
+
     })
 
   ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c5b511df9c02..2dc957cb3db3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1222,6 +1222,8 @@ let
 
   grub2_efi = grub2.override { EFIsupport = true; };
 
+  grub2_zfs = grub2.override { zfsSupport = true; };
+
   gssdp = callPackage ../development/libraries/gssdp {
     inherit (gnome) libsoup;
   };

From 02ab48d0eea6e37d3432f6b8ce4c31b85e8d3ffe Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 9 Apr 2014 13:27:45 -0500
Subject: [PATCH 0722/1453] Enable grub zfsSupport if zfs is built into the
 initrd

---
 nixos/modules/system/boot/loader/grub/grub.nix | 2 +-
 nixos/modules/tasks/filesystems/zfs.nix        | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index 25cec57431e1..67fcd10ceb8c 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -7,7 +7,7 @@ let
   cfg = config.boot.loader.grub;
 
   realGrub = if cfg.version == 1 then pkgs.grub
-    else pkgs.grub2.override { zfsSupport = cfg.zfsSupport };
+    else pkgs.grub2.override { zfsSupport = cfg.zfsSupport; };
 
   grub =
     # Don't include GRUB if we're only generating a GRUB menu (e.g.,
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index d7deb44c407c..1c4bbc16b499 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -133,7 +133,7 @@ in
       };
 
       boot.initrd = mkIf inInitrd {
-        kernelModules = [ "spl" "zfs" ] ;
+        kernelModules = [ "spl" "zfs" ];
         extraUtilsCommands =
           ''
             cp -v ${zfsPkg}/sbin/zfs $out/bin
@@ -148,6 +148,10 @@ in
           '';
       };
 
+      boot.loader.grub = mkIf inInitrd {
+        zfsSupport = true;
+      };
+
       systemd.services."zpool-import" = {
         description = "Import zpools";
         after = [ "systemd-udev-settle.service" ];

From c5bdb469ce06cd0b36d1dcd4a977f97644776546 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 21 Oct 2013 01:17:23 -0500
Subject: [PATCH 0723/1453] Update the grub configuration script to handle more
 complex filesystem layouts including full zfs / and /boot

---
 .../system/boot/loader/grub/install-grub.pl   | 79 +++++++++++++++----
 1 file changed, 64 insertions(+), 15 deletions(-)

diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index a83733db63b0..b9f61337cefd 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -1,5 +1,6 @@
 use strict;
 use warnings;
+use Class::Struct;
 use XML::LibXML;
 use File::Basename;
 use File::Path;
@@ -47,20 +48,64 @@ print STDERR "updating GRUB $grubVersion menu...\n";
 
 mkpath("/boot/grub", 0, 0700);
 
-
 # Discover whether /boot is on the same filesystem as / and
 # /nix/store.  If not, then all kernels and initrds must be copied to
-# /boot, and all paths in the GRUB config file must be relative to the
-# root of the /boot filesystem.  `$bootRoot' is the path to be
-# prepended to paths under /boot.
-my $bootRoot = "/boot";
-if (stat("/")->dev != stat("/boot")->dev) {
-    $bootRoot = "";
-    $copyKernels = 1;
-} elsif (stat("/boot")->dev != stat("/nix/store")->dev) {
+# /boot.
+if (stat("/boot")->dev != stat("/nix")->dev) {
     $copyKernels = 1;
 }
 
+# Discover information about the location of /boot
+struct(Fs => {
+    device => '$',
+    type => '$',
+    mount => '$',
+});
+sub GetFs {
+    my ($dir) = @_;
+    my @boot = split(/[ \n\t]+/, `df -T "$dir" | tail -n 1`);
+    return Fs->new(device => $boot[0], type => $boot[1], mount => $boot[6]);
+}
+struct (Grub => {
+    path => '$',
+    search => '$',
+});
+my $driveid = 1;
+sub GrubFs {
+    my ($dir) = @_;
+    my $fs = GetFs($dir);
+    my $path = "/" . substr($dir, length($fs->mount));
+    my $search = "";
+    if ($grubVersion > 1) {
+        if ($fs->type eq "zfs") {
+            my $sid = index($fs->device, "/");
+            if ($sid < 0) {
+                $search = "--label " . $fs->device;
+                $path = "/@" . $path;
+            } else {
+                $search = "--label " . substr($fs->device, 0, $sid);
+                $path = "/" . substr($fs->device, $sid) . "/@" . $path;
+            }
+        } else {
+            my $lbl = "/dev/disk/by-label/";
+            if (index($fs->device, $lbl) == 0) {
+                $search = "--label " . substr($fs->device, length($lbl));
+            }
+            my $uuid = "/dev/disk/by-uuid/";
+            if (index($fs->device, $uuid) == 0) {
+                $search = "--fs-uuid " . substr($fs->device, length($uuid));
+            }
+        }
+        if (not $search eq "") {
+            $search = "search --set=drive$driveid " . $search;
+            $path = "(\$drive$driveid)" . $path;
+            $driveid += 1;
+        }
+    }
+    return Grub->new(path => $path, search => $search);
+}
+my $grubBoot = GrubFs("/boot");
+my $grubStore = GrubFs("/nix");
 
 # Generate the header.
 my $conf .= "# Automatically generated.  DO NOT EDIT THIS FILE!\n";
@@ -72,12 +117,14 @@ if ($grubVersion == 1) {
     ";
     if ($splashImage) {
         copy $splashImage, "/boot/background.xpm.gz" or die "cannot copy $splashImage to /boot\n";
-        $conf .= "splashimage $bootRoot/background.xpm.gz\n";
+        $conf .= "splashimage " . $grubBoot->path . "/background.xpm.gz\n";
     }
 }
 
 else {
     $conf .= "
+        " . $grubBoot->search . "
+        " . $grubStore->search . "
         if [ -s \$prefix/grubenv ]; then
           load_env
         fi
@@ -98,7 +145,7 @@ else {
           set timeout=$timeout
         fi
 
-        if loadfont $bootRoot/grub/fonts/unicode.pf2; then
+        if loadfont " . $grubBoot->path . "/grub/fonts/unicode.pf2; then
           set gfxmode=640x480
           insmod gfxterm
           insmod vbe
@@ -112,7 +159,7 @@ else {
         copy $splashImage, "/boot/background.png" or die "cannot copy $splashImage to /boot\n";
         $conf .= "
             insmod png
-            if background_image $bootRoot/background.png; then
+            if background_image " . $grubBoot->path . "/background.png; then
               set color_normal=white/black
               set color_highlight=black/white
             else
@@ -134,7 +181,7 @@ mkpath("/boot/kernels", 0, 0755) if $copyKernels;
 
 sub copyToKernelsDir {
     my ($path) = @_;
-    return $path unless $copyKernels;
+    return $grubStore->path . substr($path, length("/nix")) unless $copyKernels;
     $path =~ /\/nix\/store\/(.*)/ or die;
     my $name = $1; $name =~ s/\//-/g;
     my $dst = "/boot/kernels/$name";
@@ -147,7 +194,7 @@ sub copyToKernelsDir {
         rename $tmp, $dst or die "cannot rename $tmp to $dst\n";
     }
     $copied{$dst} = 1;
-    return "$bootRoot/kernels/$name";
+    return $grubBoot->path . "/kernels/$name";
 }
 
 sub addEntry {
@@ -174,6 +221,8 @@ sub addEntry {
         $conf .= "  " . ($xen ? "module" : "initrd") . " $initrd\n\n";
     } else {
         $conf .= "menuentry \"$name\" {\n";
+	$conf .= $grubBoot->search . "\n";
+	$conf .= $grubStore->search . "\n";
         $conf .= "  $extraPerEntryConfig\n" if $extraPerEntryConfig;
         $conf .= "  multiboot $xen $xenParams\n" if $xen;
         $conf .= "  " . ($xen ? "module" : "linux") . " $kernel $kernelParams\n";
@@ -191,7 +240,7 @@ addEntry("NixOS - Default", $defaultConfig);
 $conf .= "$extraEntries\n" unless $extraEntriesBeforeNixOS;
 
 # extraEntries could refer to @bootRoot@, which we have to substitute
-$conf =~ s/\@bootRoot\@/$bootRoot/g;
+$conf =~ s/\@bootRoot\@/$grubBoot->path/g;
 
 # Emit submenus for all system profiles.
 sub addProfile {

From fba9f641a8ed54c27b1d9fadbd2022d8e18ce180 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 29 Apr 2014 22:26:23 -0500
Subject: [PATCH 0724/1453] grub: Add support for forcing devices to be
 identified with labels or  UUIDs

---
 .../modules/system/boot/loader/grub/grub.nix  | 19 ++++++++++--
 .../system/boot/loader/grub/install-grub.pl   | 30 ++++++++++++++-----
 2 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index 67fcd10ceb8c..bc19dd8c62fa 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -26,11 +26,11 @@ let
       inherit (cfg)
         version extraConfig extraPerEntryConfig extraEntries
         extraEntriesBeforeNixOS extraPrepareConfig configurationLimit copyKernels timeout
-        default devices;
+        default devices fsIdentifier;
       path = (makeSearchPath "bin" [
         pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.findutils pkgs.diffutils
       ]) + ":" + (makeSearchPath "sbin" [
-        pkgs.mdadm
+        pkgs.mdadm pkgs.utillinux
       ]);
     });
 
@@ -210,6 +210,21 @@ in
         '';
       };
 
+      fsIdentifier = mkOption {
+        default = "uuid";
+        type = types.addCheck types.string
+          (type: type == "uuid" || type == "label" || type = "provided");
+        description = ''
+          Determines how grub will identify devices when generating the
+          configuration file. A value of uuid / label signifies that grub
+          will always resolve the uuid or label of the device before using
+          it in the configuration. A value of provided means that grub will
+          use the device name as show in <command>df</command> or
+          <command>mount</command>. Note, zfs zpools / datasets are ignored
+          and will always be mounted using their labels.
+        '';
+      };
+
       zfsSupport = mkOption {
         default = false;
         type = types.bool;
diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index b9f61337cefd..2615bc3ae11e 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -8,6 +8,7 @@ use File::stat;
 use File::Copy;
 use POSIX;
 use Cwd;
+use Switch;
 
 my $defaultConfig = $ARGV[1] or die;
 
@@ -40,6 +41,7 @@ my $configurationLimit = int(get("configurationLimit"));
 my $copyKernels = get("copyKernels") eq "true";
 my $timeout = int(get("timeout"));
 my $defaultEntry = int(get("default"));
+my $fsIdentifier = get("fsIdentifier");
 $ENV{'PATH'} = get("path");
 
 die "unsupported GRUB version\n" if $grubVersion != 1 && $grubVersion != 2;
@@ -87,13 +89,27 @@ sub GrubFs {
                 $path = "/" . substr($fs->device, $sid) . "/@" . $path;
             }
         } else {
-            my $lbl = "/dev/disk/by-label/";
-            if (index($fs->device, $lbl) == 0) {
-                $search = "--label " . substr($fs->device, length($lbl));
-            }
-            my $uuid = "/dev/disk/by-uuid/";
-            if (index($fs->device, $uuid) == 0) {
-                $search = "--fs-uuid " . substr($fs->device, length($uuid));
+            my $idCmd = "\$(blkid -o export $fs->device) 2>/dev/null; echo"
+            switch ($fsIdentifier) {
+                case "uuid" {
+                    $search = "--fs-uuid " . `$idCmd \$UUID`;
+                }
+                case "label" {
+                    $search = "--label " . `$idCmd \$LABEL`;
+                }
+                case "provided" {
+                    my $lbl = "/dev/disk/by-label/";
+                    if (index($fs->device, $lbl) == 0) {
+                        $search = "--label " . substr($fs->device, length($lbl));
+                    }
+                    my $uuid = "/dev/disk/by-uuid/";
+                    if (index($fs->device, $uuid) == 0) {
+                        $search = "--fs-uuid " . substr($fs->device, length($uuid));
+                    }
+                }
+                else {
+                    die "invalid fs identifier type\n";
+                }
             }
         }
         if (not $search eq "") {

From a6e6c85f06395a92062eb31753a8dd8f3b7e733c Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 29 Apr 2014 22:53:11 -0500
Subject: [PATCH 0725/1453] grub: Add support for detecting btrfs subvolumes

---
 nixos/modules/system/boot/loader/grub/grub.nix        | 2 +-
 nixos/modules/system/boot/loader/grub/install-grub.pl | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index bc19dd8c62fa..581b76f8fb21 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -28,7 +28,7 @@ let
         extraEntriesBeforeNixOS extraPrepareConfig configurationLimit copyKernels timeout
         default devices fsIdentifier;
       path = (makeSearchPath "bin" [
-        pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.findutils pkgs.diffutils
+        pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.findutils pkgs.diffutils pkgs.btrfsProgs
       ]) + ":" + (makeSearchPath "sbin" [
         pkgs.mdadm pkgs.utillinux
       ]);
diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index 2615bc3ae11e..814ae7e05f7c 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -111,6 +111,13 @@ sub GrubFs {
                     die "invalid fs identifier type\n";
                 }
             }
+            if ($fs->type eq "btrfs") {
+                $subvol = `mount | sed -n 's,^$fs->device on .*subvol=\([^,)]*\).*$,\1,p'`
+                if ($subvol eq "") {
+                    $subvol = `btrfs subvol get-default $fs->mount | sed -n 's,^.*path \([^ ]*\) .*$,\1,p'`
+                }
+                $path = "/$subvol";
+            }
         }
         if (not $search eq "") {
             $search = "search --set=drive$driveid " . $search;

From 70c11772a69dad8f414366f1bce511282853a80b Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 30 Apr 2014 16:51:34 -0500
Subject: [PATCH 0726/1453] nixos/grub: Fix some silly perl struct accesses

---
 nixos/modules/system/boot/loader/grub/install-grub.pl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index 814ae7e05f7c..64151a282f16 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -89,7 +89,7 @@ sub GrubFs {
                 $path = "/" . substr($fs->device, $sid) . "/@" . $path;
             }
         } else {
-            my $idCmd = "\$(blkid -o export $fs->device) 2>/dev/null; echo"
+            my $idCmd = "\$(blkid -o export " . $fs->device . ") 2>/dev/null; echo"
             switch ($fsIdentifier) {
                 case "uuid" {
                     $search = "--fs-uuid " . `$idCmd \$UUID`;
@@ -112,9 +112,9 @@ sub GrubFs {
                 }
             }
             if ($fs->type eq "btrfs") {
-                $subvol = `mount | sed -n 's,^$fs->device on .*subvol=\([^,)]*\).*$,\1,p'`
+                $subvol = `mount | sed -n 's,^@{[$fs->device]} on .*subvol=\([^,)]*\).*\$,\1,p'`
                 if ($subvol eq "") {
-                    $subvol = `btrfs subvol get-default $fs->mount | sed -n 's,^.*path \([^ ]*\) .*$,\1,p'`
+                    $subvol = `btrfs subvol get-default @{[$fs->mount]} | sed -n 's,^.*path \([^ ]*\) .*\$,\1,p'`
                 }
                 $path = "/$subvol";
             }

From 525acb4d4fbfdf1ef18486fba4b2aa673065666a Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 30 Apr 2014 17:53:23 -0500
Subject: [PATCH 0727/1453] nixos/grub: Fix typo

---
 nixos/modules/system/boot/loader/grub/grub.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index 581b76f8fb21..57bf2cefa6f4 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -213,7 +213,7 @@ in
       fsIdentifier = mkOption {
         default = "uuid";
         type = types.addCheck types.string
-          (type: type == "uuid" || type == "label" || type = "provided");
+          (type: type == "uuid" || type == "label" || type == "provided");
         description = ''
           Determines how grub will identify devices when generating the
           configuration file. A value of uuid / label signifies that grub

From 1f460e00efb99a1450f5b5806d68ff6633641ad8 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 30 Apr 2014 18:04:45 -0500
Subject: [PATCH 0728/1453] grub: Build grub2 from git instead of using the
 unpredictable generated tarball

---
 pkgs/tools/misc/grub/2.0x.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix
index 59658e47a08f..04971b68a845 100644
--- a/pkgs/tools/misc/grub/2.0x.nix
+++ b/pkgs/tools/misc/grub/2.0x.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, autogen, flex, bison, python, autoconf, automake
+{ stdenv, fetchurl, fetchgit, autogen, flex, bison, python, autoconf, automake
 , gettext, ncurses, libusb, freetype, qemu, devicemapper
 , linuxPackages ? null
 , EFIsupport ? false
@@ -23,9 +23,10 @@ in
 stdenv.mkDerivation rec {
   name = "${prefix}-${version}";
 
-  src = fetchurl {
-    url = "http://git.savannah.gnu.org/cgit/grub.git/snapshot/grub-2.02-beta2.tar.gz";
-    sha256 = "1n2l7k76lqqaavz12615vx5kca0kl8g13bkimc7xsd9s7c1ir5lr";
+  src = fetchgit {
+    url = "git://git.sv.gnu.org/grub.git";
+    rev = "refs/tags/grub-2.02-beta2";
+    sha256 = "157bknkcxibmvq19pagphlwfxd9xny7002gcanfzhjzcjpfz4scy";
   };
 
   nativeBuildInputs = [ autogen flex bison python autoconf automake ];

From 99b4792554859b57b6263a807f9335edceb7a4b0 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 30 Apr 2014 18:45:44 -0500
Subject: [PATCH 0729/1453] nixos/grub: Refactor perl script to remove the
 Switch module

---
 .../system/boot/loader/grub/install-grub.pl   | 48 ++++++++++---------
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index 64151a282f16..fd298333cc4a 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -8,7 +8,6 @@ use File::stat;
 use File::Copy;
 use POSIX;
 use Cwd;
-use Switch;
 
 my $defaultConfig = $ARGV[1] or die;
 
@@ -78,9 +77,13 @@ sub GrubFs {
     my $fs = GetFs($dir);
     my $path = "/" . substr($dir, length($fs->mount));
     my $search = "";
+
     if ($grubVersion > 1) {
+        # ZFS is completely separate logic as zpools are always identified by a label
+        # or custom UUID
         if ($fs->type eq "zfs") {
             my $sid = index($fs->device, "/");
+
             if ($sid < 0) {
                 $search = "--label " . $fs->device;
                 $path = "/@" . $path;
@@ -89,32 +92,33 @@ sub GrubFs {
                 $path = "/" . substr($fs->device, $sid) . "/@" . $path;
             }
         } else {
-            my $idCmd = "\$(blkid -o export " . $fs->device . ") 2>/dev/null; echo"
-            switch ($fsIdentifier) {
-                case "uuid" {
-                    $search = "--fs-uuid " . `$idCmd \$UUID`;
+            my $idCmd = "\$(blkid -o export " . $fs->device . ") 2>/dev/null; echo";
+
+            if ($fsIdentifier eq "uuid") {
+                $search = "--fs-uuid " . `$idCmd \$UUID`;
+            } elsif ($fsIdentifier eq "label") {
+                $search = "--label " . `$idCmd \$LABEL`;
+            } elsif ($fsIdentifier eq "provided") {
+                my $lbl = "/dev/disk/by-label/";
+
+                # If the provided dev is identifying the partition using a label or uuid,
+                # we should get the label / uuid and do a proper search
+                if (index($fs->device, $lbl) == 0) {
+                    $search = "--label " . substr($fs->device, length($lbl));
                 }
-                case "label" {
-                    $search = "--label " . `$idCmd \$LABEL`;
-                }
-                case "provided" {
-                    my $lbl = "/dev/disk/by-label/";
-                    if (index($fs->device, $lbl) == 0) {
-                        $search = "--label " . substr($fs->device, length($lbl));
-                    }
-                    my $uuid = "/dev/disk/by-uuid/";
-                    if (index($fs->device, $uuid) == 0) {
-                        $search = "--fs-uuid " . substr($fs->device, length($uuid));
-                    }
-                }
-                else {
-                    die "invalid fs identifier type\n";
+                my $uuid = "/dev/disk/by-uuid/";
+                if (index($fs->device, $uuid) == 0) {
+                    $search = "--fs-uuid " . substr($fs->device, length($uuid));
                 }
+            } else {
+                die "invalid fs identifier type\n";
             }
+
+            # BTRFS is a special case in that we need to fix the referrenced path based on subvolumes
             if ($fs->type eq "btrfs") {
-                $subvol = `mount | sed -n 's,^@{[$fs->device]} on .*subvol=\([^,)]*\).*\$,\1,p'`
+                my $subvol = `mount | sed -n 's,^@{[$fs->device]} on .*subvol=\([^,)]*\).*\$,\1,p'`;
                 if ($subvol eq "") {
-                    $subvol = `btrfs subvol get-default @{[$fs->mount]} | sed -n 's,^.*path \([^ ]*\) .*\$,\1,p'`
+                    $subvol = `btrfs subvol get-default @{[$fs->mount]} | sed -n 's,^.*path \([^ ]*\) .*\$,\1,p'`;
                 }
                 $path = "/$subvol";
             }

From d4e2040099b33f62971aee2f8530e693115cd680 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 1 May 2014 06:04:57 -0500
Subject: [PATCH 0730/1453] nixos/grub: Refactor install-grub.pl and correct
 perl syntax

---
 .../system/boot/loader/grub/install-grub.pl   | 64 ++++++++++++-------
 1 file changed, 40 insertions(+), 24 deletions(-)

diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index fd298333cc4a..f95e8f75431c 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -81,46 +81,62 @@ sub GrubFs {
     if ($grubVersion > 1) {
         # ZFS is completely separate logic as zpools are always identified by a label
         # or custom UUID
-        if ($fs->type eq "zfs") {
-            my $sid = index($fs->device, "/");
+        if ($fs->type eq 'zfs') {
+            my $sid = index($fs->device, '/');
 
             if ($sid < 0) {
-                $search = "--label " . $fs->device;
-                $path = "/@" . $path;
+                $search = '--label ' . $fs->device;
+                $path = '/@' . $path;
             } else {
-                $search = "--label " . substr($fs->device, 0, $sid);
-                $path = "/" . substr($fs->device, $sid) . "/@" . $path;
+                $search = '--label ' . substr($fs->device, 0, $sid);
+                $path = '/' . substr($fs->device, $sid) . '/@' . $path;
             }
         } else {
-            my $idCmd = "\$(blkid -o export " . $fs->device . ") 2>/dev/null; echo";
-
-            if ($fsIdentifier eq "uuid") {
-                $search = "--fs-uuid " . `$idCmd \$UUID`;
-            } elsif ($fsIdentifier eq "label") {
-                $search = "--label " . `$idCmd \$LABEL`;
-            } elsif ($fsIdentifier eq "provided") {
-                my $lbl = "/dev/disk/by-label/";
-
+            if ($fsIdentifier eq 'provided') {
                 # If the provided dev is identifying the partition using a label or uuid,
                 # we should get the label / uuid and do a proper search
+                my $lbl = '/dev/disk/by-label/';
                 if (index($fs->device, $lbl) == 0) {
-                    $search = "--label " . substr($fs->device, length($lbl));
+                    $search = '--label ' . substr($fs->device, length($lbl));
                 }
-                my $uuid = "/dev/disk/by-uuid/";
+
+                my $uuid = '/dev/disk/by-uuid/';
                 if (index($fs->device, $uuid) == 0) {
-                    $search = "--fs-uuid " . substr($fs->device, length($uuid));
+                    $search = '--fs-uuid ' . substr($fs->device, length($uuid));
                 }
             } else {
-                die "invalid fs identifier type\n";
+                # Determine the identifying type
+                my %types = ('uuid' => '--fs-uuid', 'label' => '--label');
+                $search = $types{$fsIdentifier} . ' ';
+
+                # Based on the type pull in the identifier from the system
+                my $devInfo = `blkid -o export @{[$fs->device]}`;
+                my @matches = $devInfo =~ m/@{[uc $fsIdentifier]}=([^\n]*)/;
+                if ($#matches != 0) {
+                    die "Couldn't find a $types{$fsIdentifier} for @{[$fs->device]}\n"
+                }
+                $search .= $matches[0];
             }
 
             # BTRFS is a special case in that we need to fix the referrenced path based on subvolumes
-            if ($fs->type eq "btrfs") {
-                my $subvol = `mount | sed -n 's,^@{[$fs->device]} on .*subvol=\([^,)]*\).*\$,\1,p'`;
-                if ($subvol eq "") {
-                    $subvol = `btrfs subvol get-default @{[$fs->mount]} | sed -n 's,^.*path \([^ ]*\) .*\$,\1,p'`;
+            if ($fs->type eq 'btrfs') {
+                my $subvol = "";
+
+                my @subvols = `mount` =~ m/@{[$fs->device]} on [^\n]*subvol=([^,)]*)/;
+                if ($#subvols > 0) {
+                    die "Btrfs device @{[$fs->device]} listed multiple times in mount\n"
+                } elsif ($#subvols == 0) {
+                    $subvol = $subvols[0];
+                } else {
+                    my $btrfsDefault = `btrfs subvol get-default @{[$fs->mount]}`;
+                    my @results = $btrfsDefault =~ m/path ([^ ]*)/;
+                    if ($#results > 0) {
+                        die "Btrfs device @{[$fs->device]} has multiple default subvolumes\n";
+                    } elsif ($#results == 1) {
+                        $subvol = $results[0];
+                    }
                 }
-                $path = "/$subvol";
+                $path = "/$subvol" . $path;
             }
         }
         if (not $search eq "") {

From 769d2dc6bf7bba3867e13c125fc0a6d5c76aa19a Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 1 May 2014 19:08:54 -0500
Subject: [PATCH 0731/1453] nixos/grub: Catch errors from command execution

---
 .../system/boot/loader/grub/install-grub.pl   | 34 +++++++++++++++----
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index f95e8f75431c..6748a5ca08fa 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -28,6 +28,14 @@ sub writeFile {
     close FILE or die;
 }
 
+sub runCommand {
+    my ($cmd) = @_;
+    open FILE, "$cmd 2>/dev/null |" or die "Failed to execute: $cmd\n";
+    my @ret = <FILE>;
+    close FILE;
+    return ($?, @ret);
+}
+
 my $grub = get("grub");
 my $grubVersion = int(get("version"));
 my $extraConfig = get("extraConfig");
@@ -64,7 +72,11 @@ struct(Fs => {
 });
 sub GetFs {
     my ($dir) = @_;
-    my @boot = split(/[ \n\t]+/, `df -T "$dir" | tail -n 1`);
+	my ($status, @dfOut) = runCommand("df -T $dir");
+	if ($status != 0 || $#dfOut != 1) {
+		die "Failed to retrieve output about $dir from `df`";
+	}
+    my @boot = split(/[ \n\t]+/, $dfOut[1]);
     return Fs->new(device => $boot[0], type => $boot[1], mount => $boot[6]);
 }
 struct (Grub => {
@@ -110,8 +122,11 @@ sub GrubFs {
                 $search = $types{$fsIdentifier} . ' ';
 
                 # Based on the type pull in the identifier from the system
-                my $devInfo = `blkid -o export @{[$fs->device]}`;
-                my @matches = $devInfo =~ m/@{[uc $fsIdentifier]}=([^\n]*)/;
+                my ($status, @devInfo) = runCommand("blkid -o export @{[$fs->device]}");
+				if ($status != 0) {
+					die "Failed to get blkid info for @{[$fs->device]}";
+				}
+                my @matches = join("", @devInfo) =~ m/@{[uc $fsIdentifier]}=([^\n]*)/;
                 if ($#matches != 0) {
                     die "Couldn't find a $types{$fsIdentifier} for @{[$fs->device]}\n"
                 }
@@ -122,14 +137,21 @@ sub GrubFs {
             if ($fs->type eq 'btrfs') {
                 my $subvol = "";
 
-                my @subvols = `mount` =~ m/@{[$fs->device]} on [^\n]*subvol=([^,)]*)/;
+                my ($status, @mounts) = runCommand('mount');
+                if ($status != 0) {
+                    die "Failed to retreive mount info";
+                }
+                my @subvols = join("", @mounts) =~ m/@{[$fs->device]} on [^\n]*subvol=([^,)]*)/;
                 if ($#subvols > 0) {
                     die "Btrfs device @{[$fs->device]} listed multiple times in mount\n"
                 } elsif ($#subvols == 0) {
                     $subvol = $subvols[0];
                 } else {
-                    my $btrfsDefault = `btrfs subvol get-default @{[$fs->mount]}`;
-                    my @results = $btrfsDefault =~ m/path ([^ ]*)/;
+                    my ($status, @btrfsOut) = runCommand("btrfs subvol get-default @{[$fs->mount]}");
+                    if ($status != 0) {
+                        die "Failed to retrieve btrfs default subvolume"
+                    }
+                    my @results = join("", @btrfsOut) =~ m/path ([^ ]*)/;
                     if ($#results > 0) {
                         die "Btrfs device @{[$fs->device]} has multiple default subvolumes\n";
                     } elsif ($#results == 1) {

From 5870ae613f42c99456dcbbc4df01abdce3c1f448 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 1 May 2014 20:21:02 -0500
Subject: [PATCH 0732/1453] nixos/release: Dynamically generate installer tests

---
 nixos/release.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/nixos/release.nix b/nixos/release.nix
index 0620b46d46ad..e5a4e7337ab0 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -222,12 +222,11 @@ in rec {
   tests.firefox = callTest tests/firefox.nix {};
   tests.firewall = callTest tests/firewall.nix {};
   tests.gnome3 = callTest tests/gnome3.nix {};
-  tests.installer.efi = forAllSystems (system: (import tests/installer.nix { inherit system; }).efi.test);
-  tests.installer.grub1 = forAllSystems (system: (import tests/installer.nix { inherit system; }).grub1.test);
-  tests.installer.lvm = forAllSystems (system: (import tests/installer.nix { inherit system; }).lvm.test);
-  tests.installer.rebuildCD = forAllSystems (system: (import tests/installer.nix { inherit system; }).rebuildCD.test);
-  tests.installer.separateBoot = forAllSystems (system: (import tests/installer.nix { inherit system; }).separateBoot.test);
-  tests.installer.simple = forAllSystems (system: (import tests/installer.nix { inherit system; }).simple.test);
+  tests.installer = with pkgs.lib;
+    let installer = import tests/installer.nix; in
+    flip mapAttrs (installer { }) (name: _:
+      forAllSystems (system: (installer { system = system; }).${name}.test)
+    );
   tests.influxdb = callTest tests/influxdb.nix {};
   tests.ipv6 = callTest tests/ipv6.nix {};
   tests.jenkins = callTest tests/jenkins.nix {};

From 8329d12b799b98a2b220e34ed347417c2d5b8fbe Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 1 May 2014 23:11:18 -0500
Subject: [PATCH 0733/1453] grub: Change fsIdentifier to str from string

---
 nixos/modules/system/boot/loader/grub/grub.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index 57bf2cefa6f4..8ba7ae2c7fa2 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -212,7 +212,7 @@ in
 
       fsIdentifier = mkOption {
         default = "uuid";
-        type = types.addCheck types.string
+        type = types.addCheck types.str
           (type: type == "uuid" || type == "label" || type == "provided");
         description = ''
           Determines how grub will identify devices when generating the

From 809caa87ab88fae9164347c3f1a63f6117c09821 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 1 May 2014 06:21:30 -0500
Subject: [PATCH 0734/1453] tests/installer: Add btrfs tests for grub and
 nixos-generate-config

---
 nixos/tests/installer.nix | 45 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 621afffbfc1f..89abafcab83a 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -394,4 +394,49 @@ in {
           $machine->shutdown;
         '';
     };
+
+  # Simple btrfs grub testing
+  btrfsSimple = makeInstallerTest {
+    createPartitions = ''
+      $machine->succeed(
+        "sgdisk -Z /dev/vda",
+        "sgdisk -n 1:0:+1M -N 2 -t 1:ef02 -t 2:8300 -c 2:root /dev/vda",
+        "mkfs.btrfs -L root /dev/vda2",
+        "mount LABEL=root /mnt",
+      );
+    '';
+  };
+
+  # Test to see if we can detect /boot and /nix on subvolumes
+  btrfsSubvols = makeInstallerTest {
+    createPartitions = ''
+      $machine->succeed(
+        "sgdisk -Z /dev/vda",
+        "sgdisk -n 1:0:+1M -N 2 -t 1:ef02 -t 2:8300 -c 2:root /dev/vda",
+        "mkfs.btrfs -L root /dev/vda2",
+        "btrfs device scan",
+        "mount LABEL=root /mnt",
+        "btrfs subvol create /mnt/boot",
+        "btrfs subvol create /mnt/nixos",
+        "umount /mnt",
+        "mount -o defaults,subvol=mnt LABEL=root /mnt",
+        "mkdir /mnt/boot",
+        "mount -o defaults,subvol=boot LABEL=root /mnt/boot",
+      );
+    '';
+  };
+
+  # Test to see if we can detect subvols by their id's
+  btrfsSubvolId = makeInstallerTest {
+    createPartitions = ''
+      $machine->succeed("false");
+    '';
+  };
+
+  # Test to see if we can detect a default subvolume on /
+  btrfsDefaultSubvol = makeInstallerTest {
+    createPartitions = ''
+      $machine->succeed("false");
+    '';
+  };
 }

From 2b703f82d5f257b91389267f11e7914d8df550bf Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 1 May 2014 23:11:49 -0500
Subject: [PATCH 0735/1453] tests/installer: Test for more grub configurations

---
 nixos/tests/installer.nix | 42 +++++++++++++++++++++++++++++++++------
 1 file changed, 36 insertions(+), 6 deletions(-)

diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 89abafcab83a..2bee2f77999f 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -35,8 +35,8 @@ let
 
 
   # The configuration to install.
-  makeConfig = { testChannel, useEFI, grubVersion, grubDevice }: pkgs.writeText "configuration.nix"
-    ''
+  makeConfig = { testChannel, useEFI, grubVersion, grubDevice, grubIdentifier }:
+    pkgs.writeText "configuration.nix" ''
       { config, pkgs, modulesPath, ... }:
 
       { imports =
@@ -54,6 +54,7 @@ let
           ''}
           boot.loader.grub.device = "${grubDevice}";
           boot.loader.grub.extraConfig = "serial; terminal_output.serial";
+          boot.loader.grub.fsIdentifier = "${grubIdentifier}";
         ''}
 
         environment.systemPackages = [ ${optionalString testChannel "pkgs.rlwrap"} ];
@@ -93,7 +94,7 @@ let
   # disk, and then reboot from the hard disk.  It's parameterized with
   # a test script fragment `createPartitions', which must create
   # partitions and filesystems.
-  testScriptFun = { createPartitions, testChannel, useEFI, grubVersion, grubDevice }:
+  testScriptFun = { createPartitions, testChannel, useEFI, grubVersion, grubDevice, grubIdentifier }:
     let
       # FIXME: OVMF doesn't boot from virtio http://www.mail-archive.com/edk2-devel@lists.sourceforge.net/msg01501.html
       iface = if useEFI || grubVersion == 1 then "scsi" else "virtio";
@@ -161,7 +162,7 @@ let
       $machine->succeed("cat /mnt/etc/nixos/hardware-configuration.nix >&2");
 
       $machine->copyFileFromHost(
-          "${ makeConfig { inherit testChannel useEFI grubVersion grubDevice; } }",
+          "${ makeConfig { inherit testChannel useEFI grubVersion grubDevice grubIdentifier; } }",
           "/mnt/etc/nixos/configuration.nix");
 
       # Perform the installation.
@@ -216,13 +217,13 @@ let
 
 
   makeInstallerTest = name:
-    { createPartitions, testChannel ? false, useEFI ? false, grubVersion ? 2, grubDevice ? "/dev/vda" }:
+    { createPartitions, testChannel ? false, useEFI ? false, grubVersion ? 2, grubDevice ? "/dev/vda", grubIdentifier ? "uuid" }:
     makeTest {
       inherit iso;
       name = "installer-" + name;
       nodes = if testChannel then { inherit webserver; } else { };
       testScript = testScriptFun {
-        inherit createPartitions testChannel useEFI grubVersion grubDevice;
+        inherit createPartitions testChannel useEFI grubVersion grubDevice grubIdentifier;
       };
     };
 
@@ -395,6 +396,35 @@ in {
         '';
     };
 
+  # Test using labels to identify volumes in grub
+  simpleLabels = makeInstallerTest {
+    createPartitions = ''
+      $machine->succeed(
+        "sgdisk -Z /dev/vda",
+        "sgdisk -n 1:0:+1M -N 2 -t 1:ef02 -t 2:8300 -c 2:root /dev/vda",
+        "mkfs.ext4 -L root /dev/vda2",
+        "mount LABEL=root /mnt",
+      );
+    '';
+    grubIdentifier = "label";
+  };
+
+  # Test using the provided disk name within grub
+  simpleProvided = makeInstallerTest {
+    createPartitions = ''
+      $machine->succeed(
+        "sgdisk -Z /dev/vda",
+        "sgdisk -n 1:0:+1M -n 2:0:+100M -N 3 -t 1:ef02 -t 2:8300 -t 3:8300 -c 2:boot -c 3:root /dev/vda",
+        "mkfs.ext4 -L boot /dev/vda2",
+        "mkfs.ext4 -L root /dev/vda3",
+        "mount LABEL=root /mnt",
+        "mkdir /mnt/boot",
+        "$(blkid -o export /dev/vda2); mount /dev/disk/by-uuid/$UUID /mnt/boot"
+      );
+    '';
+    grubIdentifier = "provided";
+  };
+
   # Simple btrfs grub testing
   btrfsSimple = makeInstallerTest {
     createPartitions = ''

From 62fedf6081200e38df515204683df472e0fe959d Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 1 May 2014 23:22:21 -0500
Subject: [PATCH 0736/1453] installer/btrfs: Typo in subvol

---
 nixos/tests/installer.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 2bee2f77999f..2064675ecd94 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -449,7 +449,7 @@ in {
         "btrfs subvol create /mnt/boot",
         "btrfs subvol create /mnt/nixos",
         "umount /mnt",
-        "mount -o defaults,subvol=mnt LABEL=root /mnt",
+        "mount -o defaults,subvol=nixos LABEL=root /mnt",
         "mkdir /mnt/boot",
         "mount -o defaults,subvol=boot LABEL=root /mnt/boot",
       );

From d4a9645ef0d365e4ff30d2ae29ec163a53869625 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 1 May 2014 23:40:51 -0500
Subject: [PATCH 0737/1453] nixos/grub: Needs mount so add utillinux to bin

---
 nixos/modules/system/boot/loader/grub/grub.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index 8ba7ae2c7fa2..bc9a155ac95b 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -29,6 +29,7 @@ let
         default devices fsIdentifier;
       path = (makeSearchPath "bin" [
         pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.findutils pkgs.diffutils pkgs.btrfsProgs
+        pkgs.utillinux
       ]) + ":" + (makeSearchPath "sbin" [
         pkgs.mdadm pkgs.utillinux
       ]);

From 8b36bf5c59ef7d2af849a0304f76a6a25b997408 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 1 May 2014 23:52:06 -0500
Subject: [PATCH 0738/1453] tests/installer: fix mount

---
 nixos/tests/installer.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 2064675ecd94..a7f7c766157e 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -419,7 +419,7 @@ in {
         "mkfs.ext4 -L root /dev/vda3",
         "mount LABEL=root /mnt",
         "mkdir /mnt/boot",
-        "$(blkid -o export /dev/vda2); mount /dev/disk/by-uuid/$UUID /mnt/boot"
+        "$(blkid -o export /dev/vda2); mount /dev/disk/by-uuid/\\$UUID /mnt/boot"
       );
     '';
     grubIdentifier = "provided";

From 8ff4b3b78048231a9e56d1597ee09592dd05eab8 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 2 May 2014 00:01:32 -0500
Subject: [PATCH 0739/1453] tests/installer: Add swap to the new tests

---
 nixos/tests/installer.nix | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index a7f7c766157e..93b6182a09cf 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -401,7 +401,9 @@ in {
     createPartitions = ''
       $machine->succeed(
         "sgdisk -Z /dev/vda",
-        "sgdisk -n 1:0:+1M -N 2 -t 1:ef02 -t 2:8300 -c 2:root /dev/vda",
+        "sgdisk -n 1:0:+1M -n 2:0:+100M -N 3 -t 1:ef02 -t 2:8200 -t 3:8300 -c 3:root /dev/vda",
+        "mkswap /dev/vda2 -L swap",
+        "swapon -L swap",
         "mkfs.ext4 -L root /dev/vda2",
         "mount LABEL=root /mnt",
       );
@@ -414,9 +416,11 @@ in {
     createPartitions = ''
       $machine->succeed(
         "sgdisk -Z /dev/vda",
-        "sgdisk -n 1:0:+1M -n 2:0:+100M -N 3 -t 1:ef02 -t 2:8300 -t 3:8300 -c 2:boot -c 3:root /dev/vda",
+        "sgdisk -n 1:0:+1M -n 2:0:+100M -n 3:0:+100M -N 4 -t 1:ef02 -t 2:8300 -t 3:8200 -t 4:8300 -c 2:boot -c 4:root /dev/vda",
+        "mkswap /dev/vda3 -L swap",
+        "swapon -L swap",
         "mkfs.ext4 -L boot /dev/vda2",
-        "mkfs.ext4 -L root /dev/vda3",
+        "mkfs.ext4 -L root /dev/vda4",
         "mount LABEL=root /mnt",
         "mkdir /mnt/boot",
         "$(blkid -o export /dev/vda2); mount /dev/disk/by-uuid/\\$UUID /mnt/boot"
@@ -430,8 +434,10 @@ in {
     createPartitions = ''
       $machine->succeed(
         "sgdisk -Z /dev/vda",
-        "sgdisk -n 1:0:+1M -N 2 -t 1:ef02 -t 2:8300 -c 2:root /dev/vda",
-        "mkfs.btrfs -L root /dev/vda2",
+        "sgdisk -n 1:0:+1M -n 2:0:+100M -N 3 -t 1:ef02 -t 2:8200 -t 3:8300 -c 3:root /dev/vda",
+        "mkswap /dev/vda2 -L swap",
+        "swapon -L swap",
+        "mkfs.btrfs -L root /dev/vda3",
         "mount LABEL=root /mnt",
       );
     '';
@@ -442,8 +448,10 @@ in {
     createPartitions = ''
       $machine->succeed(
         "sgdisk -Z /dev/vda",
-        "sgdisk -n 1:0:+1M -N 2 -t 1:ef02 -t 2:8300 -c 2:root /dev/vda",
-        "mkfs.btrfs -L root /dev/vda2",
+        "sgdisk -n 1:0:+1M -n 2:0:+100M -N 3 -t 1:ef02 -t 2:8200 -t 3:8300 -c 3:root /dev/vda",
+        "mkswap /dev/vda2 -L swap",
+        "swapon -L swap",
+        "mkfs.btrfs -L root /dev/vda3",
         "btrfs device scan",
         "mount LABEL=root /mnt",
         "btrfs subvol create /mnt/boot",

From 429f785135ebca304767ecf435b5d5e979c2f3f2 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 2 May 2014 00:25:38 -0500
Subject: [PATCH 0740/1453] tests/installer: Fix simple tests

---
 nixos/tests/installer.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 93b6182a09cf..4fceb19f2342 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -404,7 +404,7 @@ in {
         "sgdisk -n 1:0:+1M -n 2:0:+100M -N 3 -t 1:ef02 -t 2:8200 -t 3:8300 -c 3:root /dev/vda",
         "mkswap /dev/vda2 -L swap",
         "swapon -L swap",
-        "mkfs.ext4 -L root /dev/vda2",
+        "mkfs.ext4 -L root /dev/vda3",
         "mount LABEL=root /mnt",
       );
     '';
@@ -423,7 +423,7 @@ in {
         "mkfs.ext4 -L root /dev/vda4",
         "mount LABEL=root /mnt",
         "mkdir /mnt/boot",
-        "$(blkid -o export /dev/vda2); mount /dev/disk/by-uuid/\\$UUID /mnt/boot"
+        "$(blkid -o export /dev/vda2); mount /dev/disk/by-uuid/\$UUID /mnt/boot"
       );
     '';
     grubIdentifier = "provided";

From 87d5e457fe124facb261d13f52e14a7c6e6511af Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 2 May 2014 00:44:36 -0500
Subject: [PATCH 0741/1453] nixos/grub: Grub detection is much simpler using
 subvol show

---
 .../system/boot/loader/grub/install-grub.pl   | 28 +++++--------------
 1 file changed, 7 insertions(+), 21 deletions(-)

diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index 6748a5ca08fa..82809edd6e86 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -135,35 +135,21 @@ sub GrubFs {
 
             # BTRFS is a special case in that we need to fix the referrenced path based on subvolumes
             if ($fs->type eq 'btrfs') {
-                my $subvol = "";
-
-                my ($status, @mounts) = runCommand('mount');
+                my ($status, @info) = runCommand("btrfs subvol show @{[$fs->device]}");
                 if ($status != 0) {
-                    die "Failed to retreive mount info";
+                    die "Failed to retreive subvolume info for @{[$fs->device]}";
                 }
-                my @subvols = join("", @mounts) =~ m/@{[$fs->device]} on [^\n]*subvol=([^,)]*)/;
+                my @subvols = join("", @info) =~ m/Name:[ \t\n]([^ \t\n]*)/;
                 if ($#subvols > 0) {
-                    die "Btrfs device @{[$fs->device]} listed multiple times in mount\n"
+                    die "Btrfs subvol name for @{[$fs->device]} listed multiple times in mount\n"
                 } elsif ($#subvols == 0) {
-                    $subvol = $subvols[0];
-                } else {
-                    my ($status, @btrfsOut) = runCommand("btrfs subvol get-default @{[$fs->mount]}");
-                    if ($status != 0) {
-                        die "Failed to retrieve btrfs default subvolume"
-                    }
-                    my @results = join("", @btrfsOut) =~ m/path ([^ ]*)/;
-                    if ($#results > 0) {
-                        die "Btrfs device @{[$fs->device]} has multiple default subvolumes\n";
-                    } elsif ($#results == 1) {
-                        $subvol = $results[0];
-                    }
-                }
-                $path = "/$subvol" . $path;
+	                $path = "/$subvols[0]$path";
+				}
             }
         }
         if (not $search eq "") {
             $search = "search --set=drive$driveid " . $search;
-            $path = "(\$drive$driveid)" . $path;
+            $path = "(\$drive$driveid)$path";
             $driveid += 1;
         }
     }

From 3bf22679b30bc6f92b7df2a72cdba0403be3be86 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 2 May 2014 00:45:06 -0500
Subject: [PATCH 0742/1453] nixos/grub: Kernels don't need to be copied if we
 can read the nix store

---
 nixos/modules/system/boot/loader/grub/install-grub.pl | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index 82809edd6e86..d0d5307a804e 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -158,6 +158,11 @@ sub GrubFs {
 my $grubBoot = GrubFs("/boot");
 my $grubStore = GrubFs("/nix");
 
+# We don't need to copy if we can read the kernels directly
+if ($grubStore->search ne "") {
+	$copyKernels = 0;
+}
+
 # Generate the header.
 my $conf .= "# Automatically generated.  DO NOT EDIT THIS FILE!\n";
 

From 7264941a465b3312c35f2dde6184447c746d9d17 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 2 May 2014 00:51:26 -0500
Subject: [PATCH 0743/1453] tests/installer: Remove unneeded tests

---
 nixos/tests/installer.nix | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 4fceb19f2342..6f20f6614ebf 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -463,18 +463,4 @@ in {
       );
     '';
   };
-
-  # Test to see if we can detect subvols by their id's
-  btrfsSubvolId = makeInstallerTest {
-    createPartitions = ''
-      $machine->succeed("false");
-    '';
-  };
-
-  # Test to see if we can detect a default subvolume on /
-  btrfsDefaultSubvol = makeInstallerTest {
-    createPartitions = ''
-      $machine->succeed("false");
-    '';
-  };
 }

From b651097d193089d14e9407a67b95397bf02129e5 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 2 May 2014 01:05:10 -0500
Subject: [PATCH 0744/1453] tests/installer: Swapspace should be larger

---
 nixos/tests/installer.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 6f20f6614ebf..cb9cc1200626 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -401,7 +401,7 @@ in {
     createPartitions = ''
       $machine->succeed(
         "sgdisk -Z /dev/vda",
-        "sgdisk -n 1:0:+1M -n 2:0:+100M -N 3 -t 1:ef02 -t 2:8200 -t 3:8300 -c 3:root /dev/vda",
+        "sgdisk -n 1:0:+1M -n 2:0:+1G -N 3 -t 1:ef02 -t 2:8200 -t 3:8300 -c 3:root /dev/vda",
         "mkswap /dev/vda2 -L swap",
         "swapon -L swap",
         "mkfs.ext4 -L root /dev/vda3",
@@ -416,7 +416,7 @@ in {
     createPartitions = ''
       $machine->succeed(
         "sgdisk -Z /dev/vda",
-        "sgdisk -n 1:0:+1M -n 2:0:+100M -n 3:0:+100M -N 4 -t 1:ef02 -t 2:8300 -t 3:8200 -t 4:8300 -c 2:boot -c 4:root /dev/vda",
+        "sgdisk -n 1:0:+1M -n 2:0:+1G -n 3:0:+100M -N 4 -t 1:ef02 -t 2:8300 -t 3:8200 -t 4:8300 -c 2:boot -c 4:root /dev/vda",
         "mkswap /dev/vda3 -L swap",
         "swapon -L swap",
         "mkfs.ext4 -L boot /dev/vda2",
@@ -434,7 +434,7 @@ in {
     createPartitions = ''
       $machine->succeed(
         "sgdisk -Z /dev/vda",
-        "sgdisk -n 1:0:+1M -n 2:0:+100M -N 3 -t 1:ef02 -t 2:8200 -t 3:8300 -c 3:root /dev/vda",
+        "sgdisk -n 1:0:+1M -n 2:0:+1G -N 3 -t 1:ef02 -t 2:8200 -t 3:8300 -c 3:root /dev/vda",
         "mkswap /dev/vda2 -L swap",
         "swapon -L swap",
         "mkfs.btrfs -L root /dev/vda3",
@@ -448,7 +448,7 @@ in {
     createPartitions = ''
       $machine->succeed(
         "sgdisk -Z /dev/vda",
-        "sgdisk -n 1:0:+1M -n 2:0:+100M -N 3 -t 1:ef02 -t 2:8200 -t 3:8300 -c 3:root /dev/vda",
+        "sgdisk -n 1:0:+1M -n 2:0:+1G -N 3 -t 1:ef02 -t 2:8200 -t 3:8300 -c 3:root /dev/vda",
         "mkswap /dev/vda2 -L swap",
         "swapon -L swap",
         "mkfs.btrfs -L root /dev/vda3",

From 6549bcff9607efd68ecd8fca8ca15c4446b16fb9 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 2 May 2014 01:07:12 -0500
Subject: [PATCH 0745/1453] tests/installer: Fix provided test uuid and label
 mounts

---
 nixos/tests/installer.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index cb9cc1200626..d15c43d29bbe 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -421,9 +421,9 @@ in {
         "swapon -L swap",
         "mkfs.ext4 -L boot /dev/vda2",
         "mkfs.ext4 -L root /dev/vda4",
-        "mount LABEL=root /mnt",
+        "mount /dev/disk/by-label/root /mnt",
         "mkdir /mnt/boot",
-        "$(blkid -o export /dev/vda2); mount /dev/disk/by-uuid/\$UUID /mnt/boot"
+        "mount /dev/disk/by-uuid/\$(blkid -s UUID -o value /dev/vda2) /mnt/boot"
       );
     '';
     grubIdentifier = "provided";

From c02bc3a9de319195597a16173e04357023e97643 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 2 May 2014 01:46:07 -0500
Subject: [PATCH 0746/1453] nixos/grub: Fix regex for getting subvolume name in
 btrfs

---
 nixos/modules/system/boot/loader/grub/install-grub.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index d0d5307a804e..2725cea59960 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -139,7 +139,7 @@ sub GrubFs {
                 if ($status != 0) {
                     die "Failed to retreive subvolume info for @{[$fs->device]}";
                 }
-                my @subvols = join("", @info) =~ m/Name:[ \t\n]([^ \t\n]*)/;
+                my @subvols = join("", @info) =~ m/Name:[ \t\n]*([^ \t\n]*)/;
                 if ($#subvols > 0) {
                     die "Btrfs subvol name for @{[$fs->device]} listed multiple times in mount\n"
                 } elsif ($#subvols == 0) {

From 4f096c044f987f036af3fc1888090e6567aaf7b1 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 2 May 2014 02:53:32 -0500
Subject: [PATCH 0747/1453] nixos/grub: Simplify detection of labels / uuids
 for provided device names

---
 .../system/boot/loader/grub/install-grub.pl   | 22 +++++++++----------
 nixos/tests/installer.nix                     |  2 +-
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index 2725cea59960..3c84fccac34c 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -104,28 +104,26 @@ sub GrubFs {
                 $path = '/' . substr($fs->device, $sid) . '/@' . $path;
             }
         } else {
+            my %types = ('uuid' => '--fs-uuid', 'label' => '--label');
+
             if ($fsIdentifier eq 'provided') {
                 # If the provided dev is identifying the partition using a label or uuid,
                 # we should get the label / uuid and do a proper search
-                my $lbl = '/dev/disk/by-label/';
-                if (index($fs->device, $lbl) == 0) {
-                    $search = '--label ' . substr($fs->device, length($lbl));
-                }
-
-                my $uuid = '/dev/disk/by-uuid/';
-                if (index($fs->device, $uuid) == 0) {
-                    $search = '--fs-uuid ' . substr($fs->device, length($uuid));
+                my @matches = $fs->device =~ m/\/dev\/disk\/by-(label|uuid)\/(.*)/;
+                if ($#matches > 1) {
+                    die "Too many matched devices"
+                } elsif ($#matches == 1) {
+                    $search = "$types{$matches[0]} $matches[1]"
                 }
             } else {
                 # Determine the identifying type
-                my %types = ('uuid' => '--fs-uuid', 'label' => '--label');
                 $search = $types{$fsIdentifier} . ' ';
 
                 # Based on the type pull in the identifier from the system
                 my ($status, @devInfo) = runCommand("blkid -o export @{[$fs->device]}");
-				if ($status != 0) {
-					die "Failed to get blkid info for @{[$fs->device]}";
-				}
+                if ($status != 0) {
+                    die "Failed to get blkid info for @{[$fs->device]}";
+                }
                 my @matches = join("", @devInfo) =~ m/@{[uc $fsIdentifier]}=([^\n]*)/;
                 if ($#matches != 0) {
                     die "Couldn't find a $types{$fsIdentifier} for @{[$fs->device]}\n"
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index d15c43d29bbe..0eb67eaa813e 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -416,7 +416,7 @@ in {
     createPartitions = ''
       $machine->succeed(
         "sgdisk -Z /dev/vda",
-        "sgdisk -n 1:0:+1M -n 2:0:+1G -n 3:0:+100M -N 4 -t 1:ef02 -t 2:8300 -t 3:8200 -t 4:8300 -c 2:boot -c 4:root /dev/vda",
+        "sgdisk -n 1:0:+1M -n 2:0:+100M -n 3:0:+1G -N 4 -t 1:ef02 -t 2:8300 -t 3:8200 -t 4:8300 -c 2:boot -c 4:root /dev/vda",
         "mkswap /dev/vda3 -L swap",
         "swapon -L swap",
         "mkfs.ext4 -L boot /dev/vda2",

From cc62623b37c4ac6e17968b36d9ced8bbf28fb883 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 2 May 2014 02:03:25 -0500
Subject: [PATCH 0748/1453] tests/installer: Provided test should add symlinks
 to /dev/disk if udev doesn't

---
 nixos/tests/installer.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 0eb67eaa813e..ef11fcb10019 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -412,8 +412,10 @@ in {
   };
 
   # Test using the provided disk name within grub
+  # TODO: Fix udev so the symlinks are unneeded in /dev/disks
   simpleProvided = makeInstallerTest {
     createPartitions = ''
+      my $UUID = "\$(blkid -s UUID -o value /dev/vda2)";
       $machine->succeed(
         "sgdisk -Z /dev/vda",
         "sgdisk -n 1:0:+1M -n 2:0:+100M -n 3:0:+1G -N 4 -t 1:ef02 -t 2:8300 -t 3:8200 -t 4:8300 -c 2:boot -c 4:root /dev/vda",
@@ -421,9 +423,13 @@ in {
         "swapon -L swap",
         "mkfs.ext4 -L boot /dev/vda2",
         "mkfs.ext4 -L root /dev/vda4",
+      );
+      $machine->execute("ln -s ../../vda2 /dev/disk/by-uuid/$UUID");
+      $machine->execute("ln -s ../../vda4 /dev/disk/by-label/root");
+      $machine->succeed(
         "mount /dev/disk/by-label/root /mnt",
         "mkdir /mnt/boot",
-        "mount /dev/disk/by-uuid/\$(blkid -s UUID -o value /dev/vda2) /mnt/boot"
+        "mount /dev/disk/by-uuid/$UUID /mnt/boot"
       );
     '';
     grubIdentifier = "provided";

From 0f6079d999e3922782f3ce6daf742f32568118ac Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 2 May 2014 03:37:50 -0500
Subject: [PATCH 0749/1453] nixos/grub: Fix spacing and correct subvolume
 detection

---
 .../system/boot/loader/grub/install-grub.pl      | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index 3c84fccac34c..acfb85f3bc5c 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -72,10 +72,10 @@ struct(Fs => {
 });
 sub GetFs {
     my ($dir) = @_;
-	my ($status, @dfOut) = runCommand("df -T $dir");
-	if ($status != 0 || $#dfOut != 1) {
-		die "Failed to retrieve output about $dir from `df`";
-	}
+    my ($status, @dfOut) = runCommand("df -T $dir");
+    if ($status != 0 || $#dfOut != 1) {
+        die "Failed to retrieve output about $dir from `df`";
+    }
     my @boot = split(/[ \n\t]+/, $dfOut[1]);
     return Fs->new(device => $boot[0], type => $boot[1], mount => $boot[6]);
 }
@@ -133,16 +133,16 @@ sub GrubFs {
 
             # BTRFS is a special case in that we need to fix the referrenced path based on subvolumes
             if ($fs->type eq 'btrfs') {
-                my ($status, @info) = runCommand("btrfs subvol show @{[$fs->device]}");
+                my ($status, @info) = runCommand("btrfs subvol show @{[$fs->mount]}");
                 if ($status != 0) {
-                    die "Failed to retreive subvolume info for @{[$fs->device]}";
+                    die "Failed to retreive subvolume info for @{[$fs->mount]}";
                 }
                 my @subvols = join("", @info) =~ m/Name:[ \t\n]*([^ \t\n]*)/;
                 if ($#subvols > 0) {
                     die "Btrfs subvol name for @{[$fs->device]} listed multiple times in mount\n"
                 } elsif ($#subvols == 0) {
-	                $path = "/$subvols[0]$path";
-				}
+                    $path = "/$subvols[0]$path";
+                }
             }
         }
         if (not $search eq "") {

From 940c57e4e86f14cbc25bd63949ef27cc96856425 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 2 May 2014 03:44:07 -0500
Subject: [PATCH 0750/1453] nixos/ova: Grub uuid detection is broken when
 generating the ova

---
 nixos/modules/installer/virtualbox-demo.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/installer/virtualbox-demo.nix b/nixos/modules/installer/virtualbox-demo.nix
index f68f8dc40aa8..49ec08996104 100644
--- a/nixos/modules/installer/virtualbox-demo.nix
+++ b/nixos/modules/installer/virtualbox-demo.nix
@@ -10,6 +10,9 @@ with lib;
       ../profiles/clone-config.nix
     ];
 
+  # FIXME: UUID detection is currently broken
+  boot.loader.grub.fsIdentifier = "provided";
+
   # Allow mounting of shared folders.
   users.extraUsers.demo.extraGroups = [ "vboxsf" ];
 

From 2ea1433b77755b954df979307525fa6578f241b8 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 2 May 2014 09:17:54 -0500
Subject: [PATCH 0751/1453] grub: Fetch from alpha.gnu.org instead of git

---
 pkgs/tools/misc/grub/2.0x.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix
index 04971b68a845..2c150f8ec96f 100644
--- a/pkgs/tools/misc/grub/2.0x.nix
+++ b/pkgs/tools/misc/grub/2.0x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchgit, autogen, flex, bison, python, autoconf, automake
+{ stdenv, fetchurl, autogen, flex, bison, python, autoconf, automake
 , gettext, ncurses, libusb, freetype, qemu, devicemapper
 , linuxPackages ? null
 , EFIsupport ? false
@@ -23,10 +23,10 @@ in
 stdenv.mkDerivation rec {
   name = "${prefix}-${version}";
 
-  src = fetchgit {
-    url = "git://git.sv.gnu.org/grub.git";
-    rev = "refs/tags/grub-2.02-beta2";
-    sha256 = "157bknkcxibmvq19pagphlwfxd9xny7002gcanfzhjzcjpfz4scy";
+  src = fetchurl {
+    name = "grub-2.02-beta2.tar.xz";
+    url = "http://alpha.gnu.org/gnu/grub/grub-2.02~beta2.tar.xz";
+    sha256 = "13a13fhc0wf473dn73zhga15mjvkg6vqp4h25dxg4n7am2r05izn";
   };
 
   nativeBuildInputs = [ autogen flex bison python autoconf automake ];

From dd18e67cfb27515791620a0e69e4e427b77e2670 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 3 May 2014 19:59:47 -0500
Subject: [PATCH 0752/1453] grub: Cleanup efi support

---
 pkgs/tools/misc/grub/2.0x.nix   | 37 ++++++++++++++++-----------------
 pkgs/top-level/all-packages.nix |  2 +-
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix
index 2c150f8ec96f..028ec5657529 100644
--- a/pkgs/tools/misc/grub/2.0x.nix
+++ b/pkgs/tools/misc/grub/2.0x.nix
@@ -1,15 +1,20 @@
 { stdenv, fetchurl, autogen, flex, bison, python, autoconf, automake
 , gettext, ncurses, libusb, freetype, qemu, devicemapper
 , linuxPackages ? null
-, EFIsupport ? false
+, efiSupport ? false
 , zfsSupport ? false
 }:
 
-assert zfsSupport -> linuxPackages != null && linuxPackages.zfs != null;
-
+with stdenv.lib;
 let
+  efiSystems = {
+    "i686-linux".target = "i386";
+    "x86_64-linux".target = "x86_64";
+  };
 
-  prefix = "grub${if EFIsupport then "-efi" else ""}";
+  canEfi = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) efiSystems);
+
+  prefix = "grub${if efiSupport then "-efi" else ""}";
 
   version = "2.02-beta2";
 
@@ -17,8 +22,10 @@ let
     url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz";
     sha256 = "0s0qfff6n6282q28nwwblp5x295zd6n71kl43xj40vgvdqxv0fxx";
   };
+in (
 
-in
+assert efiSupport -> canEfi;
+assert zfsSupport -> linuxPackages != null && linuxPackages.zfs != null;
 
 stdenv.mkDerivation rec {
   name = "${prefix}-${version}";
@@ -31,8 +38,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autogen flex bison python autoconf automake ];
   buildInputs = [ ncurses libusb freetype gettext devicemapper ]
-    ++ stdenv.lib.optional doCheck qemu
-    ++ stdenv.lib.optional zfsSupport linuxPackages.zfs;
+    ++ optional doCheck qemu
+    ++ optional zfsSupport linuxPackages.zfs;
 
   preConfigure =
     '' for i in "tests/util/"*.in
@@ -62,13 +69,8 @@ stdenv.mkDerivation rec {
 
   patches = [ ./fix-bash-completion.patch ];
 
-  configureFlags =
-    let arch = if stdenv.system == "i686-linux" then "i386"
-               else if stdenv.system == "x86_64-linux" then "x86_64"
-               else throw "unsupported EFI firmware architecture";
-    in stdenv.lib.optional zfsSupport "--enable-libzfs"
-      ++ stdenv.lib.optionals EFIsupport
-        [ "--with-platform=efi" "--target=${arch}" "--program-prefix=" ];
+  configureFlags = optional zfsSupport "--enable-libzfs"
+    ++ optionals efiSupport [ "--with-platform=efi" "--target=${efiSystems.${stdenv.system}.target}" "--program-prefix=" ];
 
   doCheck = false;
   enableParallelBuilding = true;
@@ -96,9 +98,6 @@ stdenv.mkDerivation rec {
 
     license = licenses.gpl3Plus;
 
-    platforms = if EFIsupport then
-      [ "i686-linux" "x86_64-linux" ]
-    else
-      platforms.gnu;
+    platforms = platforms.gnu;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2dc957cb3db3..3d2350b661e5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1220,7 +1220,7 @@ let
 
   grub2 = callPackage ../tools/misc/grub/2.0x.nix { };
 
-  grub2_efi = grub2.override { EFIsupport = true; };
+  grub2_efi = grub2.override { efiSupport = true; };
 
   grub2_zfs = grub2.override { zfsSupport = true; };
 

From babcd70c36d0c2e2cb000eb3085aa7a42104a4ba Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 18 Jun 2014 16:21:57 -0500
Subject: [PATCH 0753/1453] nixos/release-combined: Add required installer
 tests

---
 nixos/release-combined.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index dae3b9210a86..23348e1d089e 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -52,6 +52,10 @@ in rec {
         (all nixos.tests.installer.lvm)
         (all nixos.tests.installer.separateBoot)
         (all nixos.tests.installer.simple)
+        (all nixos.tests.installer.simpleLabels)
+        (all nixos.tests.installer.simpleProvided)
+        (all nixos.tests.installer.btrfsSimple)
+        (all nixos.tests.installer.btrfsSubvols)
         (all nixos.tests.ipv6)
         (all nixos.tests.kde4)
         (all nixos.tests.login)

From 36a47733a264dbfe0d8cb62a1a0d5d4d4b07b715 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 18 Jun 2014 18:43:00 -0500
Subject: [PATCH 0754/1453] nixos-generate-config: Detect btrfs subvolumes

---
 .../installer/tools/nixos-generate-config.pl  | 21 +++++++++++++++++++
 nixos/modules/installer/tools/tools.nix       |  1 +
 2 files changed, 22 insertions(+)

diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index 66a8152a3a6c..cabdb09ec9c1 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -20,6 +20,13 @@ sub uniq {
     return @res;
 }
 
+sub runCommand {
+    my ($cmd) = @_;
+    open FILE, "$cmd 2>/dev/null |" or die "Failed to execute: $cmd\n";
+    my @ret = <FILE>;
+    close FILE;
+    return ($?, @ret);
+}
 
 # Process the command line.
 my $outDir = "/etc/nixos";
@@ -337,6 +344,20 @@ EOF
         }
     }
 
+	# Is this a btrfs filesystem?
+	if ($fsType eq "btrfs") {
+		my ($status, @info) = runCommand("btrfs subvol show $rootDir$mountPoint");
+		if ($status != 0) {
+			die "Failed to retreive subvolume info for $mountPoint";
+		}
+		my @subvols = join("", @info) =~ m/Name:[ \t\n]*([^ \t\n]*)/;
+		if ($#subvols > 0) {
+			die "Btrfs subvol name for $mountPoint listed multiple times in mount\n"
+		} elsif ($#subvols == 0) {
+			push @extraOptions, "subvol=$subvols[0]";
+		}
+	}
+
     # Emit the filesystem.
     $fileSystems .= <<EOF;
   fileSystems.\"$mountPoint\" =
diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix
index 39da2f1f0be6..91a30695a7a5 100644
--- a/nixos/modules/installer/tools/tools.nix
+++ b/nixos/modules/installer/tools/tools.nix
@@ -38,6 +38,7 @@ let
   nixos-generate-config = makeProg {
     name = "nixos-generate-config";
     src = ./nixos-generate-config.pl;
+    path = [ pkgs.btrfsProgs ];
     perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl";
   };
 

From cf7f7a51071b9491085eac36ab292163b823e687 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 13 Jul 2014 09:50:45 -0500
Subject: [PATCH 0755/1453] nixos/install-grub: Check /boot against /nix/store
 instead of /nix

---
 nixos/modules/system/boot/loader/grub/install-grub.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index acfb85f3bc5c..d8ee8b500970 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -60,7 +60,7 @@ mkpath("/boot/grub", 0, 0700);
 # Discover whether /boot is on the same filesystem as / and
 # /nix/store.  If not, then all kernels and initrds must be copied to
 # /boot.
-if (stat("/boot")->dev != stat("/nix")->dev) {
+if (stat("/boot")->dev != stat("/nix/store")->dev) {
     $copyKernels = 1;
 }
 

From 0fdbc444113a80c1bd0477676a33ab1fb27bae1a Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 28 Aug 2014 13:36:41 -0700
Subject: [PATCH 0756/1453] grub: Fix typo

---
 pkgs/tools/misc/grub/2.0x.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix
index 028ec5657529..e3c07af759c9 100644
--- a/pkgs/tools/misc/grub/2.0x.nix
+++ b/pkgs/tools/misc/grub/2.0x.nix
@@ -94,7 +94,7 @@ stdenv.mkDerivation rec {
          operating system (e.g., GNU).
       '';
 
-    homepage = http://wwwp.gnu.org/software/grub/; 
+    homepage = http://www.gnu.org/software/grub/;
 
     license = licenses.gpl3Plus;
 

From f25709c48acd60923e019467ff8f97a0435b9764 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 29 Aug 2014 01:14:10 +0400
Subject: [PATCH 0757/1453] List NCSA license properly

---
 lib/licenses.nix                                  | 5 +++++
 pkgs/development/compilers/emscripten/default.nix | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/licenses.nix b/lib/licenses.nix
index 95098aba1f29..812592c74f27 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -215,6 +215,11 @@ rec {
     url       = "http://research.microsoft.com/en-us/projects/pex/msr-la.txt";
   };
 
+  ncsa = spdx {
+    shortName = "NCSA";
+    fullName  = "University of Illinois/NCSA Open Source License";
+  };
+
   ofl = spdx {
     shortName = "OFL-1.1";
     fullName = "SIL Open Font License 1.1";
diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix
index dc81b90b4b90..43f256b58b04 100644
--- a/pkgs/development/compilers/emscripten/default.nix
+++ b/pkgs/development/compilers/emscripten/default.nix
@@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/kripken/emscripten;
     description = "An LLVM-to-JavaScript Compiler";
     maintainers = with maintainers; [ bosu ];
-    license = "MIT and University of Illinois/NCSA Open Source License";
+    license = with licenses; ncsa;
   };
 }

From c7bb162710eda277d19044667a834fd2032da97e Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 29 Aug 2014 01:19:24 +0400
Subject: [PATCH 0758/1453] Factor out the maintainer

---
 lib/maintainers.nix                            | 1 +
 pkgs/development/interpreters/self/default.nix | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index d3d46fc6862e..35e53664bbca 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -37,6 +37,7 @@
   coroa = "Jonas Hörsch <jonas@chaoflow.net>";
   cstrahan = "Charles Strahan <charles.c.strahan@gmail.com>";
   DamienCassou = "Damien Cassou <damien.cassou@gmail.com>";
+  doublec = "Chris Double <chris.double@double.co.nz>";
   ederoyd46 = "Matthew Brown <matt@ederoyd.co.uk>";
   edwtjo = "Edward Tjörnhammar <ed@cflags.cc>";
   eelco = "Eelco Dolstra <eelco.dolstra@logicblox.com>";
diff --git a/pkgs/development/interpreters/self/default.nix b/pkgs/development/interpreters/self/default.nix
index b379044789d0..98e1edee3879 100644
--- a/pkgs/development/interpreters/self/default.nix
+++ b/pkgs/development/interpreters/self/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     description = "A prototype-based dynamic object-oriented programming language, environment, and virtual machine";
     homepage = "http://selflanguage.org/";
     license = stdenv.lib.licenses.bsd3;
-    maintainer = [ "Chris Double <chris.double@double.co.nz>" ];
+    maintainer = [ stdenv.lib.maintainers.doublec ];
     platforms = with stdenv.lib.platforms; linux;
   };
 }

From 121050046dc870df9015a700e0c01809974f928f Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 29 Aug 2014 01:27:28 +0400
Subject: [PATCH 0759/1453] Adding flashrom BIOS update utility. Patch by
 Edward O'Callaghan

---
 lib/maintainers.nix                  |  1 +
 pkgs/tools/misc/flashrom/default.nix | 23 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 3 files changed, 26 insertions(+)
 create mode 100644 pkgs/tools/misc/flashrom/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 35e53664bbca..3de82db1cd98 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -45,6 +45,7 @@
   ertes = "Ertugrul Söylemez <ertesx@gmx.de>";
   falsifian = "James Cook <james.cook@utoronto.ca>";
   flosse = "Markus Kohlhase <mail@markus-kohlhase.de>";
+  funfunctor = "Edward O'Callaghan <eocallaghan@alterapraxis.com>";
   fuuzetsu = "Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>";
   garbas = "Rok Garbas <rok@garbas.si>";
   goibhniu = "Cillian de Róiste <cillian.deroiste@gmail.com>";
diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix
new file mode 100644
index 000000000000..c4e74359b15b
--- /dev/null
+++ b/pkgs/tools/misc/flashrom/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, pkgconfig, libftdi, pciutils }:
+
+let version = "0.9.7"; in
+stdenv.mkDerivation rec {
+  name = "flashrom-${version}";
+
+  src = fetchurl {
+    url = "http://download.flashrom.org/releases/${name}.tar.bz2";
+    sha256 = "5a55212d00791981a9a1cb0cdca9d9e58bea6d399864251e7b410b4d3d6137e9";
+  };
+
+  buildInputs = [ pkgconfig libftdi pciutils ];
+
+  makeFlags = ["PREFIX=$out"];
+
+  meta = {
+    homepage = "http://www.flashrom.org";
+    description = "Utility for reading, writing, erasing and verifying flash ROM chips";
+    license = "GPLv2";
+    maintainers = [ stdenv.lib.maintainers.funfunctor ];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index af7443a056ae..851bf546dcde 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1049,6 +1049,8 @@ let
     platformTools = androidenv.platformTools;
   };
 
+  flashrom = callPackage ../tools/misc/flashrom { };
+
   flpsed = callPackage ../applications/editors/flpsed { };
 
   flvstreamer = callPackage ../tools/networking/flvstreamer { };

From cef0d1a41b62c0f781a6dc05992aa164ec5b2b05 Mon Sep 17 00:00:00 2001
From: Russell O'Connor <oconnorr@google.com>
Date: Thu, 28 Aug 2014 21:41:30 +0000
Subject: [PATCH 0760/1453] Abstract bucket name in gce/create-gce.sh

---
 nixos/maintainers/scripts/gce/create-gce.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/nixos/maintainers/scripts/gce/create-gce.sh b/nixos/maintainers/scripts/gce/create-gce.sh
index 8bf36f33c7db..4261e8bf06b3 100755
--- a/nixos/maintainers/scripts/gce/create-gce.sh
+++ b/nixos/maintainers/scripts/gce/create-gce.sh
@@ -1,5 +1,6 @@
 #! /bin/sh -e
 
+BUCKET_NAME=${BUCKET_NAME:-nixos}
 export NIX_PATH=nixpkgs=../../../..
 export NIXOS_CONFIG=$(dirname $(readlink -f $0))/../../../modules/virtualisation/google-compute-image.nix
 export TIMESTAMP=$(date +%Y%m%d%H%M)
@@ -8,7 +9,7 @@ nix-build '<nixpkgs/nixos>' \
    -A config.system.build.googleComputeImage --argstr system x86_64-linux -o gce --option extra-binary-caches http://hydra.nixos.org -j 10
 
 img=$(echo gce/*.tar.gz)
-if ! gsutil ls gs://nixos/$(basename $img); then
-  gsutil cp $img gs://nixos/$(basename $img)
+if ! gsutil ls gs://${BUCKET_NAME}/$(basename $img); then
+  gsutil cp $img gs://${BUCKET_NAME}/$(basename $img)
 fi
-gcutil addimage $(basename $img .raw.tar.gz | sed 's|\.|-|' | sed 's|_|-|') gs://nixos/$(basename $img)
+gcutil addimage $(basename $img .raw.tar.gz | sed 's|\.|-|' | sed 's|_|-|') gs://${BUCKET_NAME}/$(basename $img)

From a7ef1a50cb0bd90050925fead6ac52abfeea277b Mon Sep 17 00:00:00 2001
From: Russell O'Connor <oconnorr@google.com>
Date: Thu, 28 Aug 2014 21:42:49 +0000
Subject: [PATCH 0761/1453] Replace depricated gcutil with gcloude compute in
 gce/create-gce.sh

---
 nixos/maintainers/scripts/gce/create-gce.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/maintainers/scripts/gce/create-gce.sh b/nixos/maintainers/scripts/gce/create-gce.sh
index 4261e8bf06b3..fc476fb6e403 100755
--- a/nixos/maintainers/scripts/gce/create-gce.sh
+++ b/nixos/maintainers/scripts/gce/create-gce.sh
@@ -12,4 +12,4 @@ img=$(echo gce/*.tar.gz)
 if ! gsutil ls gs://${BUCKET_NAME}/$(basename $img); then
   gsutil cp $img gs://${BUCKET_NAME}/$(basename $img)
 fi
-gcutil addimage $(basename $img .raw.tar.gz | sed 's|\.|-|' | sed 's|_|-|') gs://${BUCKET_NAME}/$(basename $img)
+gcloud compute images create $(basename $img .raw.tar.gz | sed 's|\.|-|' | sed 's|_|-|') --source-uri gs://${BUCKET_NAME}/$(basename $img)

From f152b346cd1e524eb930d83c75ee1973a23b81d8 Mon Sep 17 00:00:00 2001
From: Daniel Bergey <bergey@alum.mit.edu>
Date: Thu, 28 Aug 2014 21:58:31 +0000
Subject: [PATCH 0762/1453] haskell: package diagrams-rasterific and deps

---
 .../libraries/haskell/FontyFruity/default.nix | 16 ++++++++++++
 .../libraries/haskell/Rasterific/default.nix  | 26 +++++++++++++++++++
 .../libraries/haskell/diagrams/rasterific.nix | 24 +++++++++++++++++
 .../libraries/haskell/fsnotify/default.nix    | 22 ++++++++--------
 pkgs/top-level/haskell-packages.nix           |  5 ++++
 5 files changed, 82 insertions(+), 11 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/FontyFruity/default.nix
 create mode 100644 pkgs/development/libraries/haskell/Rasterific/default.nix
 create mode 100644 pkgs/development/libraries/haskell/diagrams/rasterific.nix

diff --git a/pkgs/development/libraries/haskell/FontyFruity/default.nix b/pkgs/development/libraries/haskell/FontyFruity/default.nix
new file mode 100644
index 000000000000..eaa8a5f38246
--- /dev/null
+++ b/pkgs/development/libraries/haskell/FontyFruity/default.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, binary, deepseq, filepath, text, vector }:
+
+cabal.mkDerivation (self: {
+  pname = "FontyFruity";
+  version = "0.3";
+  sha256 = "0ivz7hkz5mx8bqqv5av56a8rw4231wyzzg0dhz6465d59iqmjhd4";
+  buildDepends = [ binary deepseq filepath text vector ];
+  meta = {
+    description = "A true type file format loader";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.bergey ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/Rasterific/default.nix b/pkgs/development/libraries/haskell/Rasterific/default.nix
new file mode 100644
index 000000000000..f8f843236a68
--- /dev/null
+++ b/pkgs/development/libraries/haskell/Rasterific/default.nix
@@ -0,0 +1,26 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, binary, criterion, deepseq, dlist, filepath, FontyFruity
+, free, JuicyPixels, mtl, QuickCheck, statistics, vector
+, vectorAlgorithms
+}:
+
+cabal.mkDerivation (self: {
+  pname = "Rasterific";
+  version = "0.3";
+  sha256 = "1chbcfcb5il7fbzivszap60qfwcwrq85kpx9y6qdr2pim39199fa";
+  buildDepends = [
+    dlist FontyFruity free JuicyPixels mtl vector vectorAlgorithms
+  ];
+  doCheck = false; # depends on criterion < 0.9
+  testDepends = [
+    binary criterion deepseq filepath FontyFruity JuicyPixels
+    QuickCheck statistics vector
+  ];
+  meta = {
+    description = "A pure haskell drawing engine";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.bergey ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/diagrams/rasterific.nix b/pkgs/development/libraries/haskell/diagrams/rasterific.nix
new file mode 100644
index 000000000000..a49c98f988aa
--- /dev/null
+++ b/pkgs/development/libraries/haskell/diagrams/rasterific.nix
@@ -0,0 +1,24 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, dataDefaultClass, diagramsCore, diagramsLib, filepath
+, FontyFruity, JuicyPixels, lens, mtl, optparseApplicative
+, Rasterific, split, statestack, time
+}:
+
+cabal.mkDerivation (self: {
+  pname = "diagrams-rasterific";
+  version = "0.1.0.1";
+  sha256 = "1bgrwnrdhlnbcv5ra80x2nh5yr5bzz81f517zb0ws2y07l072gwm";
+  buildDepends = [
+    dataDefaultClass diagramsCore diagramsLib filepath FontyFruity
+    JuicyPixels lens mtl optparseApplicative Rasterific split
+    statestack time
+  ];
+  meta = {
+    homepage = "http://projects.haskell.org/diagrams/";
+    description = "Rasterific backend for diagrams";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.bergey ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/fsnotify/default.nix b/pkgs/development/libraries/haskell/fsnotify/default.nix
index 3d308f6a88fa..70edecb1f8d8 100644
--- a/pkgs/development/libraries/haskell/fsnotify/default.nix
+++ b/pkgs/development/libraries/haskell/fsnotify/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, cabal, Cabal, Glob, hspec, QuickCheck, random
-, systemFileio, systemFilepath, text, time, uniqueid
-, hinotify, hfsevents
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, async, hinotify, systemFileio, systemFilepath, tasty
+, tastyHunit, temporaryRc, text, time
 }:
 
 cabal.mkDerivation (self: {
   pname = "fsnotify";
-  version = "0.0.11";
-  sha256 = "03m911pncyzgfdx4aj38azbbmj25fdm3s9l1w27zv0l730fy8ywq";
-  buildDepends = [ systemFileio systemFilepath text time ] ++
-    (if stdenv.isDarwin then [ hfsevents ] else [ hinotify ]);
+  version = "0.1.0.3";
+  sha256 = "0m6jyg45azk377jklgwyqrx95q174cxd5znpyh9azznkh09wq58z";
+  buildDepends = [
+    async hinotify systemFileio systemFilepath text time
+  ];
   testDepends = [
-    Cabal Glob hspec QuickCheck random systemFileio
-    systemFilepath text time uniqueid
-  ] ++ (if stdenv.isDarwin then [ hfsevents ] else [ hinotify ]);
-  doCheck = false;
+    async systemFileio systemFilepath tasty tastyHunit temporaryRc
+  ];
   meta = {
     description = "Cross platform library for file change notification";
     license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 7a4d4c4f10bd..f20646e79e62 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -642,6 +642,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   diagramsContrib = callPackage ../development/libraries/haskell/diagrams/contrib.nix {};
   diagramsLib = callPackage ../development/libraries/haskell/diagrams/lib.nix {};
   diagramsPostscript = callPackage ../development/libraries/haskell/diagrams/postscript.nix {};
+  diagramsRasterific = callPackage ../development/libraries/haskell/diagrams/rasterific.nix {};
   diagramsSvg = callPackage ../development/libraries/haskell/diagrams/svg.nix {};
 
   Diff = callPackage ../development/libraries/haskell/Diff {};
@@ -853,6 +854,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   folds = callPackage ../development/libraries/haskell/folds {};
 
+  FontyFruity = callPackage ../development/libraries/haskell/FontyFruity {};
+
   forceLayout = callPackage ../development/libraries/haskell/force-layout {};
 
   formatting = callPackage ../development/libraries/haskell/formatting {};
@@ -2014,6 +2017,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   ranges = callPackage ../development/libraries/haskell/ranges {};
 
+  Rasterific = callPackage ../development/libraries/haskell/Rasterific {};
+
   reserve = callPackage ../development/libraries/haskell/reserve {};
 
   rvar = callPackage ../development/libraries/haskell/rvar {};

From f6954aa8d5d2c775b4bfe5b40e6b1682bc2f9143 Mon Sep 17 00:00:00 2001
From: Emil Rangden <emil.rangden@chas.se>
Date: Thu, 28 Aug 2014 23:58:08 +0200
Subject: [PATCH 0763/1453] updated wkhtmltopdf and use patched qt

With stock version of qt4 wkthmltopdf lacks a lot of features, including:
  * Running without an X11 server
  * Printing more then one HTML document into a PDF file
  * Adding a document outline to the PDF file
  * Adding headers and footers to the PDF file
  * Generating a table of contents
  * Adding links in the generated PDF file
  * Printing using the screen media-type
  * Disabling the smart shrink feature of webkit
---
 pkgs/tools/graphics/wkhtmltopdf/default.nix   | 80 +++++++++++++++++--
 pkgs/tools/graphics/wkhtmltopdf/makefix.patch | 24 ++++++
 pkgs/top-level/all-packages.nix               |  5 +-
 3 files changed, 101 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/tools/graphics/wkhtmltopdf/makefix.patch

diff --git a/pkgs/tools/graphics/wkhtmltopdf/default.nix b/pkgs/tools/graphics/wkhtmltopdf/default.nix
index 84b271acf2b0..2f3929b82b8e 100644
--- a/pkgs/tools/graphics/wkhtmltopdf/default.nix
+++ b/pkgs/tools/graphics/wkhtmltopdf/default.nix
@@ -1,22 +1,88 @@
-{ stdenv, fetchurl, qt4 }:
+{ stdenv, fetchgit, qt4, fontconfig, freetype, libpng, zlib, libjpeg
+, openssl, libX11, libXext, libXrender, overrideDerivation }:
 
 stdenv.mkDerivation rec {
-  name = "wkhtmltopdf-0.11.0_rc1";
+  version = "0.12.1";
+  name = "wkhtmltopdf-${version}";
 
-  src = fetchurl {
-    url = "http://wkhtmltopdf.googlecode.com/files/${name}.tar.bz2";
-    sha1 = "db03922d281856e503b3d562614e3936285728c7";
+  src = fetchgit {
+    url = "https://github.com/wkhtmltopdf/wkhtmltopdf.git";
+    rev = "refs/tags/${version}";
+    sha256 = "0wjzaaviy1k3z8r2kzb2rmyx6xdj23a338b86sxcb15ws3kzwgwh";
   };
 
-  buildInputs = [ qt4 ];
+  wkQt = overrideDerivation qt4 (deriv: {
+    name = "qt-mod-4.8.6";
+    src = fetchgit {
+      url = "https://github.com/wkhtmltopdf/qt.git";
+      rev = "82b568b"; # From git submodule spec in wkhtml repo.
+      sha256 = "0whppwxnymh5bdayqsqx54n074m99yk6v78z7f0k5prja55yvwyx";
+    };
+    configureFlags =
+      ''
+        -v -no-separate-debug-info -release -confirm-license -opensource
+        -qdbus -glib -dbus-linked -openssl-linked
+      ''
+      + # This is taken from the wkhtml build script that we don't run
+      ''
+        -fast
+        -static
+        -exceptions
+        -xmlpatterns
+        -webkit
+        -system-zlib
+        -system-libpng
+        -system-libjpeg
+        -no-libmng
+        -no-libtiff
+        -no-accessibility
+        -no-stl
+        -no-qt3support
+        -no-phonon
+        -no-phonon-backend
+        -no-opengl
+        -no-declarative
+        -no-sql-ibase
+        -no-sql-mysql
+        -no-sql-odbc
+        -no-sql-psql
+        -no-sql-sqlite
+        -no-sql-sqlite2
+        -no-mmx
+        -no-3dnow
+        -no-sse
+        -no-sse2
+        -no-multimedia
+        -nomake demos
+        -nomake docs
+        -nomake examples
+        -nomake tools
+        -nomake tests
+        -nomake translations
+      '';
+  });
+
+  buildInputs = [ wkQt fontconfig freetype libpng zlib libjpeg openssl
+    libX11 libXext libXrender
+    ];
 
   configurePhase = "qmake wkhtmltopdf.pro INSTALLBASE=$out";
   
+  patches = [ ./makefix.patch ];
+
   enableParallelBuilding = true;
 
   meta = {
-    homepage = http://code.google.com/p/wkhtmltopdf/;
+    homepage = http://wkhtmltopdf.org/;
     description = "Tools for rendering web pages to PDF or images";
+    longDescription = ''
+      wkhtmltopdf and wkhtmltoimage are open source (LGPL) command line tools
+      to render HTML into PDF and various image formats using the QT Webkit
+      rendering engine. These run entirely "headless" and do not require a
+      display or display service.
+
+      There is also a C library, if you're into that kind of thing.
+    '';
     license = stdenv.lib.licenses.gpl3Plus;
   };
 }
diff --git a/pkgs/tools/graphics/wkhtmltopdf/makefix.patch b/pkgs/tools/graphics/wkhtmltopdf/makefix.patch
new file mode 100644
index 000000000000..0642a23afa9e
--- /dev/null
+++ b/pkgs/tools/graphics/wkhtmltopdf/makefix.patch
@@ -0,0 +1,24 @@
+diff -Naur a/src/image/image.pro b/src/image/image.pro
+--- a/src/image/image.pro	2014-08-28 14:07:51.024561967 +0200
++++ b/src/image/image.pro	2014-08-28 14:08:22.383623390 +0200
+@@ -25,7 +25,7 @@
+ 
+ unix {
+     man.path=$$INSTALLBASE/share/man/man1
+-    man.extra=LD_LIBRARY_PATH=../../bin/ ../../bin/wkhtmltoimage --manpage | gzip > $(INSTALL_ROOT)/share/man/man1/wkhtmltoimage.1.gz
++    man.extra=LD_LIBRARY_PATH=../../bin/ ../../bin/wkhtmltoimage --manpage | gzip > $$INSTALLBASE/share/man/man1/wkhtmltoimage.1.gz
+ 
+     QMAKE_EXTRA_TARGETS += man
+     INSTALLS += man
+diff -Naur a/src/pdf/pdf.pro b/src/pdf/pdf.pro
+--- a/src/pdf/pdf.pro	2014-08-28 14:10:02.305818775 +0200
++++ b/src/pdf/pdf.pro	2014-08-28 14:09:47.360789555 +0200
+@@ -25,7 +25,7 @@
+ 
+ unix {
+     man.path=$$INSTALLBASE/share/man/man1
+-    man.extra=LD_LIBRARY_PATH=../../bin/ ../../bin/wkhtmltopdf --manpage | gzip > $(INSTALL_ROOT)/share/man/man1/wkhtmltopdf.1.gz
++    man.extra=LD_LIBRARY_PATH=../../bin/ ../../bin/wkhtmltopdf --manpage | gzip > $$INSTALLBASE/share/man/man1/wkhtmltopdf.1.gz
+ 
+     QMAKE_EXTRA_TARGETS += man
+     INSTALLS += man
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0754239b849f..e53f29483d4b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2462,7 +2462,10 @@ let
 
   wicd = callPackage ../tools/networking/wicd { };
 
-  wkhtmltopdf = callPackage ../tools/graphics/wkhtmltopdf { };
+  wkhtmltopdf = callPackage ../tools/graphics/wkhtmltopdf {
+    overrideDerivation = lib.overrideDerivation;
+    inherit (xlibs) libX11 libXext libXrender;
+  };
 
   wv = callPackage ../tools/misc/wv { };
 

From 8dbe652739a31725954b2fc783e171f248dbb7b7 Mon Sep 17 00:00:00 2001
From: Andrew Morsillo <andrew@peeramid.org>
Date: Thu, 28 Aug 2014 21:12:05 -0400
Subject: [PATCH 0764/1453] Bump DF version to 40_10

---
 pkgs/games/dwarf-fortress/df2014.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/dwarf-fortress/df2014.nix b/pkgs/games/dwarf-fortress/df2014.nix
index e9affd7bbf02..300d7557e02b 100644
--- a/pkgs/games/dwarf-fortress/df2014.nix
+++ b/pkgs/games/dwarf-fortress/df2014.nix
@@ -13,8 +13,8 @@ let
     };
 
     df = fetchurl {
-      url = "http://www.bay12games.com/dwarves/df_40_09_linux.tar.bz2";
-      sha256 = "1aka2vblhip4sjkcpkxfra1fa9z4hzlj0sdl6rh2qda0l7q7i0ki";
+      url = "http://www.bay12games.com/dwarves/df_40_10_linux.tar.bz2";
+      sha256 = "0hfm4395y0lacgsl7wqr6vwcw42pqm03xp7giqfk3mfsn32wqnm7";
     };
   };
 
@@ -23,7 +23,7 @@ in
 assert stdenv.system == "i686-linux";
 
 stdenv.mkDerivation rec {
-  name = "dwarf-fortress-0.40.09";
+  name = "dwarf-fortress-0.40.10";
 
 
   buildInputs = [ SDL SDL_image SDL_ttf gtk2 glib glew mesa ncurses openal glibc libsndfile pango atk cmake gdk_pixbuf];

From 1eb08ee693619fa56513d0a79180b5c43752cad7 Mon Sep 17 00:00:00 2001
From: Daniel Peebles <pumpkin@me.com>
Date: Thu, 28 Aug 2014 22:08:49 -0400
Subject: [PATCH 0765/1453] Add patch to fix 3.17 build breakage (also
 submitted to lkml, but not yet merged)

---
 .../linux/kernel/3.17-buildfix.patch          | 62 +++++++++++++++++++
 .../linux/kernel/linux-testing.nix            |  2 +
 2 files changed, 64 insertions(+)
 create mode 100644 pkgs/os-specific/linux/kernel/3.17-buildfix.patch

diff --git a/pkgs/os-specific/linux/kernel/3.17-buildfix.patch b/pkgs/os-specific/linux/kernel/3.17-buildfix.patch
new file mode 100644
index 000000000000..234f0ac749f6
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/3.17-buildfix.patch
@@ -0,0 +1,62 @@
+From	Shea Levy <>
+Subject	[PATCH 1/1] usb: gadget: Remove use of PWD in Makefiles
+Date	Thu, 28 Aug 2014 01:30:46 -0400
+
+Using PWD breaks out-of-tree builds in certain circumstances [1], and
+other kernel Makefiles use relative paths just fine.
+
+[1]: https://bugzilla.kernel.org/show_bug.cgi?id=83251
+
+Signed-off-by: Shea Levy <shea@shealevy.com>
+---
+ drivers/usb/gadget/Makefile          | 2 +-
+ drivers/usb/gadget/function/Makefile | 4 ++--
+ drivers/usb/gadget/legacy/Makefile   | 6 +++---
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile
+index a186afe..9add915 100644
+--- a/drivers/usb/gadget/Makefile
++++ b/drivers/usb/gadget/Makefile
+@@ -3,7 +3,7 @@
+ #
+ subdir-ccflags-$(CONFIG_USB_GADGET_DEBUG)	:= -DDEBUG
+ subdir-ccflags-$(CONFIG_USB_GADGET_VERBOSE)	+= -DVERBOSE_DEBUG
+-ccflags-y				+= -I$(PWD)/drivers/usb/gadget/udc
++ccflags-y				+= -Idrivers/usb/gadget/udc
+ 
+ obj-$(CONFIG_USB_LIBCOMPOSITE)	+= libcomposite.o
+ libcomposite-y			:= usbstring.o config.o epautoconf.o
+diff --git a/drivers/usb/gadget/function/Makefile b/drivers/usb/gadget/function/Makefile
+index 6d91f21..83ae106 100644
+--- a/drivers/usb/gadget/function/Makefile
++++ b/drivers/usb/gadget/function/Makefile
+@@ -2,8 +2,8 @@
+ # USB peripheral controller drivers
+ #
+ 
+-ccflags-y			:= -I$(PWD)/drivers/usb/gadget/
+-ccflags-y			+= -I$(PWD)/drivers/usb/gadget/udc/
++ccflags-y			:= -Idrivers/usb/gadget/
++ccflags-y			+= -Idrivers/usb/gadget/udc/
+ 
+ # USB Functions
+ usb_f_acm-y			:= f_acm.o
+diff --git a/drivers/usb/gadget/legacy/Makefile b/drivers/usb/gadget/legacy/Makefile
+index a11aad5..edba2d1 100644
+--- a/drivers/usb/gadget/legacy/Makefile
++++ b/drivers/usb/gadget/legacy/Makefile
+@@ -2,9 +2,9 @@
+ # USB gadget drivers
+ #
+ 
+-ccflags-y			:= -I$(PWD)/drivers/usb/gadget/
+-ccflags-y			+= -I$(PWD)/drivers/usb/gadget/udc/
+-ccflags-y			+= -I$(PWD)/drivers/usb/gadget/function/
++ccflags-y			:= -Idrivers/usb/gadget/
++ccflags-y			+= -Idrivers/usb/gadget/udc/
++ccflags-y			+= -Idrivers/usb/gadget/function/
+ 
+ g_zero-y			:= zero.o
+ g_audio-y			:= audio.o
+-- 
+2.1.0
\ No newline at end of file
diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index ae9dfc8ef38f..ebbdd79ba167 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -10,6 +10,8 @@ import ./generic.nix (args // rec {
     sha256 = "094r4kqp7bj1wcdfsgdmv73law4zb7d0sd8lw82v3rz944mlm9y3";
   };
 
+  kernelPatches = args.kernelPatches ++ [ { name = "3.17-buildfix.patch"; patch = ./3.17-buildfix.patch; } ];
+
   features.iwlwifi = true;
   features.efiBootStub = true;
   features.needsCifsUtils = true;

From e0e65cbf8e4ce940c67b5d0fb0d349758230119e Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 29 Aug 2014 07:17:19 +0200
Subject: [PATCH 0766/1453] nixos/users-groups: Fix eval on missing uid/gid.

This hopefully fixes a regression introduced by 08b214a.

In bf129a2, it was already fixed for normal uid/gid values and it got
reintroduced by sub-uid/gid-handling again, so I've refactored it a bit
into a filterNull function which takes care of also the filtering
introduced by bf129a2.

I have not tested this extensively, but master is already broken for
systems with `mutableUsers = true` and no uid values set.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/modules/config/users-groups.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index f1ddd377ed01..a55593c2bad8 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -309,19 +309,19 @@ let
       u.description u.home u.shell
     ];
 
+  filterNull = a: filter (x: hasAttr a x && getAttr a x != null);
+
   sortOn = a: sort (as1: as2: lessThan (getAttr a as1) (getAttr a as2));
 
   groupFile = pkgs.writeText "group" (
     concatStringsSep "\n" (map (g: mkGroupEntry g.name) (
-      let f = g: g.gid != null; in
-        sortOn "gid" (filter f (attrValues cfg.extraGroups))
+      sortOn "gid" (filterNull "gid" (attrValues cfg.extraGroups))
     ))
   );
 
   passwdFile = pkgs.writeText "passwd" (
     concatStringsSep "\n" (map (u: mkPasswdEntry u.name) (
-      let f = u: u.createUser && (u.uid != null); in
-        sortOn "uid" (filter f (attrValues cfg.extraUsers))
+      sortOn "uid" (filterNull "uid" (attrValues cfg.extraUsers))
     ))
   );
 
@@ -330,14 +330,14 @@ let
         user.subUidRanges);
 
   subuidFile = concatStrings (map mkSubuidEntry (
-    sortOn "uid" (attrValues cfg.extraUsers)));
+    sortOn "uid" (filterNull "uid" (attrValues cfg.extraUsers))));
 
   mkSubgidEntry = user: concatStrings (
     map (range: "${user.name}:${toString range.startGid}:${toString range.count}\n")
         user.subGidRanges);
 
   subgidFile = concatStrings (map mkSubgidEntry (
-    sortOn "uid" (attrValues cfg.extraUsers)));
+    sortOn "uid" (filterNull "uid" (attrValues cfg.extraUsers))));
 
   # If mutableUsers is true, this script adds all users/groups defined in
   # users.extra{Users,Groups} to /etc/{passwd,group} iff there isn't any

From 0bb14e4fea539bc247faffe7c9c4943eef54b118 Mon Sep 17 00:00:00 2001
From: Daniel Peebles <pumpkingod@gmail.com>
Date: Fri, 29 Aug 2014 01:49:32 -0400
Subject: [PATCH 0767/1453] Disable NFC on 3.17 or above

This should only be temporary, but there's a bug in the 3.17 rc1 and rc2 that leads to cyclic module dependencies and a segfault during the build process.
---
 pkgs/os-specific/linux/kernel/common-config.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 7a6ba94eb9fe..d5c754eebc7b 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -337,6 +337,8 @@ with stdenv.lib;
     ZSMALLOC y
   ''}
   ZRAM m
+  
+  ${optionalString (versionAtLeast version "3.17") "NFC? n"}
 
   ${kernelPlatform.kernelExtraConfig or ""}
   ${extraConfig}

From b90dd7089f5ecb61a138fb1eeec101977c60b3b5 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 29 Aug 2014 10:35:03 +0200
Subject: [PATCH 0768/1453] calibre: update from 2.0.0 to 2.1.0

---
 pkgs/applications/misc/calibre/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 190b57e1070e..00a5d15a84c9 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "calibre-2.0.0";
+  name = "calibre-2.1.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/calibre/${name}.tar.xz";
-    sha256 = "1fpn8icfyag2ybj2ywd81sva56ycsin56gyap5m9j5crx63p4c91";
+    sha256 = "1znwrmz740m08bihkmdijm193bvav4nm313xsagd5x9mjh2nffg7";
   };
 
   inherit python;

From a4738b27cf6a5d1c9542abfa05975135d6232d56 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Wed, 27 Aug 2014 19:10:47 -0300
Subject: [PATCH 0769/1453] Tilda (version 1.1.12): New Package

Tida is a GTK-based drop-down terminal emulator
---
 pkgs/applications/misc/tilda/default.nix | 29 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  5 ++++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/applications/misc/tilda/default.nix

diff --git a/pkgs/applications/misc/tilda/default.nix b/pkgs/applications/misc/tilda/default.nix
new file mode 100644
index 000000000000..cb5813fa5f72
--- /dev/null
+++ b/pkgs/applications/misc/tilda/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, pkgconfig
+, autoconf, automake, gettext
+, confuse, vte, gtk
+}:
+
+stdenv.mkDerivation rec {
+
+  name = "tilda-${version}";
+  version = "1.1.12";
+
+  src = fetchurl {
+    url = "https://github.com/lanoxx/tilda/archive/${name}.tar.gz";
+    sha256 = "10kjlcdaylkisb8i0cw4wfssg52mrz2lxr5zmw3q4fpnhh2xlaix";
+  };
+
+  buildInputs = [ pkgconfig autoconf automake gettext confuse vte gtk ];
+
+  preConfigure = ''
+    sh autogen.sh
+  '';
+  
+  meta = {
+    description = "A Gtk based drop down terminal for Linux and Unix";
+    homepage = https://github.com/lanoxx/tilda/;
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = [ stdenv.lib.maintainers.AndersonTorres ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0754239b849f..45c15e3ba70e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9876,6 +9876,11 @@ let
 
   tig = gitAndTools.tig;
 
+  tilda = callPackage ../applications/misc/tilda {
+    vte = gnome3.vte;
+    gtk = gtk3;    
+  };
+
   timidity = callPackage ../tools/misc/timidity { };
 
   tint2 = callPackage ../applications/misc/tint2 { };

From aeca8b6c3e9d331e6209304d6786d25214f62506 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 29 Aug 2014 11:27:21 +0200
Subject: [PATCH 0770/1453] tilda: fixups; seems to work now

- xgettext hack inspired by a guix thread
- gsettings to prevent crashes
- expression refactoring
---
 pkgs/applications/misc/tilda/default.nix | 23 ++++++++++++++---------
 pkgs/top-level/all-packages.nix          |  2 +-
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/misc/tilda/default.nix b/pkgs/applications/misc/tilda/default.nix
index cb5813fa5f72..50c4184c91e9 100644
--- a/pkgs/applications/misc/tilda/default.nix
+++ b/pkgs/applications/misc/tilda/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchurl, pkgconfig
-, autoconf, automake, gettext
+, autoreconfHook, gettext, expat
 , confuse, vte, gtk
+, makeWrapper
 }:
 
 stdenv.mkDerivation rec {
@@ -13,17 +14,21 @@ stdenv.mkDerivation rec {
     sha256 = "10kjlcdaylkisb8i0cw4wfssg52mrz2lxr5zmw3q4fpnhh2xlaix";
   };
 
-  buildInputs = [ pkgconfig autoconf automake gettext confuse vte gtk ];
+  buildInputs = [ pkgconfig autoreconfHook gettext confuse vte gtk makeWrapper ];
 
-  preConfigure = ''
-    sh autogen.sh
+  LD_LIBRARY_PATH = "${expat}/lib"; # ugly hack for xgettext to work during build
+
+  postInstall = ''
+    wrapProgram "$out/bin/tilda" \
+        --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
   '';
-  
-  meta = {
+
+  meta = with stdenv.lib; {
     description = "A Gtk based drop down terminal for Linux and Unix";
     homepage = https://github.com/lanoxx/tilda/;
-    license = stdenv.lib.licenses.gpl3;
-    maintainers = [ stdenv.lib.maintainers.AndersonTorres ];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl3;
+    maintainers = [ maintainers.AndersonTorres ];
+    platforms = platforms.linux;
   };
 }
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 45c15e3ba70e..6f02f2650ace 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9878,7 +9878,7 @@ let
 
   tilda = callPackage ../applications/misc/tilda {
     vte = gnome3.vte;
-    gtk = gtk3;    
+    gtk = gtk3;
   };
 
   timidity = callPackage ../tools/misc/timidity { };

From b8a546a13aff5807c12c4045cb9d6b8f89f9fb4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=BCdiger=20Sonderfeld?= <ruediger@c-plusplus.de>
Date: Thu, 28 Aug 2014 13:39:27 +0200
Subject: [PATCH 0771/1453] gnutls: Update to 3.1.26 and 3.2.17.

---
 pkgs/development/libraries/gnutls/3.1.nix | 4 ++--
 pkgs/development/libraries/gnutls/3.2.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/gnutls/3.1.nix b/pkgs/development/libraries/gnutls/3.1.nix
index 6aea78a3ac52..44ea0176e38c 100644
--- a/pkgs/development/libraries/gnutls/3.1.nix
+++ b/pkgs/development/libraries/gnutls/3.1.nix
@@ -4,11 +4,11 @@
 assert guileBindings -> guile != null;
 
 stdenv.mkDerivation rec {
-  name = "gnutls-3.1.25";
+  name = "gnutls-3.1.26";
 
   src = fetchurl {
     url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/${name}.tar.lz";
-    sha256 = "1i1v8pbaw72k0ps09i3lvc1zr9gn34jpliiijbs8k7axrv2w9n5g";
+    sha256 = "7947e18fd0c292c0274d810c9bdf674b8faa3566e056ea404a39f335982607a3";
   };
 
   # FreeBSD doesn't have <alloca.h>, and Gnulib's `alloca' module isn't used.
diff --git a/pkgs/development/libraries/gnutls/3.2.nix b/pkgs/development/libraries/gnutls/3.2.nix
index cd48e08a39c4..5bf933fbc961 100644
--- a/pkgs/development/libraries/gnutls/3.2.nix
+++ b/pkgs/development/libraries/gnutls/3.2.nix
@@ -4,11 +4,11 @@
 assert guileBindings -> guile != null;
 
 stdenv.mkDerivation rec {
-  name = "gnutls-3.2.15";
+  name = "gnutls-3.2.17";
 
   src = fetchurl {
     url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/${name}.tar.lz";
-    sha256 = "16c5c4k41mxib8i06npks940p9xllgn1wrackfp8712wdvl5zc4q";
+    sha256 = "a332adda1d294fbee859ae46ee0c128d8959c4a5b9c28e7cdbe5c9b56898fc25";
   };
 
   patches =

From dd3f3bdcc28282e6d235ff16d7173ee9ea81d7b0 Mon Sep 17 00:00:00 2001
From: Gergely Risko <errge@nilcons.com>
Date: Thu, 28 Aug 2014 18:03:22 +0200
Subject: [PATCH 0772/1453] GCC >= 4.8 doesn't depend on ppl

---
 pkgs/development/compilers/gcc/4.8/default.nix | 16 ++--------------
 pkgs/development/compilers/gcc/4.9/default.nix | 13 +------------
 2 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 7985b445ae06..f56ee003f505 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -13,7 +13,7 @@
 , perl ? null # optional, for texi2pod (then pod2man); required for Java
 , gmp, mpfr, mpc, gettext, which
 , libelf                      # optional, for link-time optimizations (LTO)
-, ppl ? null, cloog ? null, isl ? null # optional, for the Graphite optimization framework.
+, cloog ? null, isl ? null # optional, for the Graphite optimization framework.
 , zlib ? null, boehmgc ? null
 , zip ? null, unzip ? null, pkgconfig ? null, gtk ? null, libart_lgpl ? null
 , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null
@@ -276,7 +276,6 @@ stdenv.mkDerivation ({
     ++ (optional javaAwtGtk pkgconfig);
 
   buildInputs = [ gmp mpfr mpc libelf ]
-    ++ (optional (ppl != null) ppl)
     ++ (optional (cloog != null) cloog)
     ++ (optional (isl != null) isl)
     ++ (optional (zlib != null) zlib)
@@ -293,15 +292,7 @@ stdenv.mkDerivation ({
 
   NIX_LDFLAGS = stdenv.lib.optionalString  stdenv.isSunOS "-lm -ldl";
 
-  preConfigure = ''
-    configureFlagsArray=(
-      ${stdenv.lib.optionalString (ppl != null && ppl ? dontDisableStatic && ppl.dontDisableStatic)
-        "'--with-host-libstdcxx=-lstdc++ -lgcc_s'"}
-      ${stdenv.lib.optionalString (ppl != null && stdenv.isSunOS)
-        "\"--with-host-libstdcxx=-Wl,-rpath,\$prefix/lib/amd64 -lstdc++\"
-         \"--with-boot-ldflags=-L../prev-x86_64-pc-solaris2.11/libstdc++-v3/src/.libs\""}
-    );
-  '' + stdenv.lib.optionalString (stdenv.isSunOS && stdenv.is64bit) ''
+  preConfigure = stdenv.lib.optionalString (stdenv.isSunOS && stdenv.is64bit) ''
     export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g`
     export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET"
     export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"
@@ -329,7 +320,6 @@ stdenv.mkDerivation ({
     ${if enableMultilib then "--disable-libquadmath" else "--disable-multilib"}
     ${if enableShared then "" else "--disable-shared"}
     ${if enablePlugin then "--enable-plugin" else "--disable-plugin"}
-    ${if ppl != null then "--with-ppl=${ppl} --disable-ppl-version-check" else ""}
     ${optionalString (isl != null) "--with-isl=${isl}"}
     ${optionalString (cloog != null) "--with-cloog=${cloog} --disable-cloog-version-check --enable-cloog-backend=isl"}
     ${if langJava then
@@ -412,7 +402,6 @@ stdenv.mkDerivation ({
     configureFlags = ''
       ${if enableMultilib then "" else "--disable-multilib"}
       ${if enableShared then "" else "--disable-shared"}
-      ${if ppl != null then "--with-ppl=${ppl.crossDrv}" else ""}
       ${if cloog != null then "--with-cloog=${cloog.crossDrv} --enable-cloog-backend=isl" else ""}
       ${if langJava then "--with-ecj-jar=${javaEcj.crossDrv}" else ""}
       ${if javaAwtGtk then "--enable-java-awt=gtk" else ""}
@@ -521,7 +510,6 @@ stdenv.mkDerivation ({
 
     maintainers = with stdenv.lib.maintainers; [ ludo viric shlevy simons ];
 
-    # Volunteers needed for the {Cyg,Dar}win ports of *PPL.
     # gnatboot is not available out of linux platforms, so we disable the darwin build
     # for the gnat (ada compiler).
     platforms =
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index f61e6b4445a0..d38040a48b38 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -11,7 +11,7 @@
 , perl ? null # optional, for texi2pod (then pod2man); required for Java
 , gmp, mpfr, mpc, gettext, which
 , libelf                      # optional, for link-time optimizations (LTO)
-, ppl ? null, cloog ? null, isl ? null # optional, for the Graphite optimization framework.
+, cloog ? null, isl ? null # optional, for the Graphite optimization framework.
 , zlib ? null, boehmgc ? null
 , zip ? null, unzip ? null, pkgconfig ? null, gtk ? null, libart_lgpl ? null
 , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null
@@ -273,7 +273,6 @@ stdenv.mkDerivation ({
     ++ (optional javaAwtGtk pkgconfig);
 
   buildInputs = [ gmp mpfr mpc libelf ]
-    ++ (optional (ppl != null) ppl)
     ++ (optional (cloog != null) cloog)
     ++ (optional (isl != null) isl)
     ++ (optional (zlib != null) zlib)
@@ -291,13 +290,6 @@ stdenv.mkDerivation ({
   NIX_LDFLAGS = stdenv.lib.optionalString  stdenv.isSunOS "-lm -ldl";
 
   preConfigure = ''
-    configureFlagsArray=(
-      ${stdenv.lib.optionalString (ppl != null && ppl ? dontDisableStatic && ppl.dontDisableStatic)
-        "'--with-host-libstdcxx=-lstdc++ -lgcc_s'"}
-      ${stdenv.lib.optionalString (ppl != null && stdenv.isSunOS)
-        "\"--with-host-libstdcxx=-Wl,-rpath,\$prefix/lib/amd64 -lstdc++\"
-         \"--with-boot-ldflags=-L../prev-x86_64-pc-solaris2.11/libstdc++-v3/src/.libs\""}
-    );
     ${stdenv.lib.optionalString (stdenv.isSunOS && stdenv.is64bit)
       ''
         export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g`
@@ -319,7 +311,6 @@ stdenv.mkDerivation ({
     ${if enableMultilib then "--disable-libquadmath" else "--disable-multilib"}
     ${if enableShared then "" else "--disable-shared"}
     ${if enablePlugin then "--enable-plugin" else "--disable-plugin"}
-    ${if ppl != null then "--with-ppl=${ppl} --disable-ppl-version-check" else ""}
     ${optionalString (isl != null) "--with-isl=${isl}"}
     ${optionalString (cloog != null) "--with-cloog=${cloog} --disable-cloog-version-check --enable-cloog-backend=isl"}
     ${if langJava then
@@ -400,7 +391,6 @@ stdenv.mkDerivation ({
     configureFlags = ''
       ${if enableMultilib then "" else "--disable-multilib"}
       ${if enableShared then "" else "--disable-shared"}
-      ${if ppl != null then "--with-ppl=${ppl.crossDrv}" else ""}
       ${if cloog != null then "--with-cloog=${cloog.crossDrv} --enable-cloog-backend=isl" else ""}
       ${if langJava then "--with-ecj-jar=${javaEcj.crossDrv}" else ""}
       ${if javaAwtGtk then "--enable-java-awt=gtk" else ""}
@@ -507,7 +497,6 @@ stdenv.mkDerivation ({
 
     maintainers = with stdenv.lib.maintainers; [ ludo viric shlevy simons ];
 
-    # Volunteers needed for the {Cyg,Dar}win ports of *PPL.
     # gnatboot is not available out of linux platforms, so we disable the darwin build
     # for the gnat (ada compiler).
     platforms =

From 23b902945546eaf8358afce789a3755fe5092713 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <vincent.laporte@gmail.com>
Date: Fri, 22 Aug 2014 14:43:23 +0200
Subject: [PATCH 0773/1453] Adds ocaml-cmdliner

Cmdliner is an OCaml module for the declarative definition of command
line interfaces.

Homepage: http://erratique.ch/software/cmdliner
---
 .../ocaml-modules/cmdliner/default.nix        | 36 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/cmdliner/default.nix

diff --git a/pkgs/development/ocaml-modules/cmdliner/default.nix b/pkgs/development/ocaml-modules/cmdliner/default.nix
new file mode 100644
index 000000000000..3a00f0c3888c
--- /dev/null
+++ b/pkgs/development/ocaml-modules/cmdliner/default.nix
@@ -0,0 +1,36 @@
+{stdenv, fetchurl, ocaml, findlib, opam}:
+
+let
+  pname = "cmdliner";
+  version = "0.9.5";
+  ocaml_version = (builtins.parseDrvName ocaml.name).version;
+in
+stdenv.mkDerivation {
+
+  name = "ocaml-${pname}-${version}";
+
+  src = fetchurl {
+    url = "http://erratique.ch/software/${pname}/releases/${pname}-${version}.tbz";
+    sha256 = "a0e199c4930450e12edf81604eeceddeeb32d55c43438be689e60df282277a7e";
+  };
+
+  unpackCmd = "tar xjf $src";
+  buildInputs = [ ocaml findlib opam ];
+
+  createFindlibDestdir = true;
+
+  configurePhase = "ocaml pkg/git.ml";
+  buildPhase     = "ocaml pkg/build.ml native=true native-dynlink=true";
+  installPhase   = ''
+    opam-installer --script --prefix=$out ${pname}.install > install.sh
+    sh install.sh
+    ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml_version}/site-lib/
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://erratique.ch/software/cmdliner;
+    description = "An OCaml module for the declarative definition of command line interfaces";
+    license = licenses.bsd3;
+    platforms = ocaml.meta.platforms;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6f02f2650ace..6fc28ac321fa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3255,6 +3255,8 @@ let
 
     ocaml_cairo = callPackage ../development/ocaml-modules/ocaml-cairo { };
 
+    cmdliner = callPackage ../development/ocaml-modules/cmdliner { };
+
     cppo = callPackage ../development/tools/ocaml/cppo { };
 
     cryptokit = callPackage ../development/ocaml-modules/cryptokit { };

From a34a0dfdc58f05d637bcec951dcfd9d02e3fcc73 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@immobiliare.it>
Date: Fri, 29 Aug 2014 11:39:18 +0200
Subject: [PATCH 0774/1453] Revert "nixos/release: Dynamically generate
 installer tests"

This reverts commit 5870ae613f42c99456dcbbc4df01abdce3c1f448.

It makes it hard to comment out installer tests.
---
 nixos/release.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/nixos/release.nix b/nixos/release.nix
index e5a4e7337ab0..0620b46d46ad 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -222,11 +222,12 @@ in rec {
   tests.firefox = callTest tests/firefox.nix {};
   tests.firewall = callTest tests/firewall.nix {};
   tests.gnome3 = callTest tests/gnome3.nix {};
-  tests.installer = with pkgs.lib;
-    let installer = import tests/installer.nix; in
-    flip mapAttrs (installer { }) (name: _:
-      forAllSystems (system: (installer { system = system; }).${name}.test)
-    );
+  tests.installer.efi = forAllSystems (system: (import tests/installer.nix { inherit system; }).efi.test);
+  tests.installer.grub1 = forAllSystems (system: (import tests/installer.nix { inherit system; }).grub1.test);
+  tests.installer.lvm = forAllSystems (system: (import tests/installer.nix { inherit system; }).lvm.test);
+  tests.installer.rebuildCD = forAllSystems (system: (import tests/installer.nix { inherit system; }).rebuildCD.test);
+  tests.installer.separateBoot = forAllSystems (system: (import tests/installer.nix { inherit system; }).separateBoot.test);
+  tests.installer.simple = forAllSystems (system: (import tests/installer.nix { inherit system; }).simple.test);
   tests.influxdb = callTest tests/influxdb.nix {};
   tests.ipv6 = callTest tests/ipv6.nix {};
   tests.jenkins = callTest tests/jenkins.nix {};

From 01f0b1cf1a0d0fc043559a3faa38b1ca51423348 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@immobiliare.it>
Date: Fri, 29 Aug 2014 11:48:00 +0200
Subject: [PATCH 0775/1453] Fix evaluation of nixos tested

---
 nixos/release.nix         | 4 ++++
 nixos/tests/installer.nix | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/nixos/release.nix b/nixos/release.nix
index 0620b46d46ad..f78ecb4383d0 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -228,6 +228,10 @@ in rec {
   tests.installer.rebuildCD = forAllSystems (system: (import tests/installer.nix { inherit system; }).rebuildCD.test);
   tests.installer.separateBoot = forAllSystems (system: (import tests/installer.nix { inherit system; }).separateBoot.test);
   tests.installer.simple = forAllSystems (system: (import tests/installer.nix { inherit system; }).simple.test);
+  tests.installer.simpleLabels = forAllSystems (system: (import tests/installer.nix { inherit system; }).simpleLabels.test);
+  tests.installer.simpleProvided = forAllSystems (system: (import tests/installer.nix { inherit system; }).simpleProvided.test);
+  tests.installer.btrfsSimple = forAllSystems (system: (import tests/installer.nix { inherit system; }).btrfsSimple.test);
+  tests.installer.btrfsSubvols = forAllSystems (system: (import tests/installer.nix { inherit system; }).btrfsSubvols.test);
   tests.influxdb = callTest tests/influxdb.nix {};
   tests.ipv6 = callTest tests/ipv6.nix {};
   tests.jenkins = callTest tests/jenkins.nix {};
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index ef11fcb10019..154f3323d294 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -397,7 +397,7 @@ in {
     };
 
   # Test using labels to identify volumes in grub
-  simpleLabels = makeInstallerTest {
+  simpleLabels = makeInstallerTest "simpleLabels" {
     createPartitions = ''
       $machine->succeed(
         "sgdisk -Z /dev/vda",
@@ -413,7 +413,7 @@ in {
 
   # Test using the provided disk name within grub
   # TODO: Fix udev so the symlinks are unneeded in /dev/disks
-  simpleProvided = makeInstallerTest {
+  simpleProvided = makeInstallerTest "simpleProvided" {
     createPartitions = ''
       my $UUID = "\$(blkid -s UUID -o value /dev/vda2)";
       $machine->succeed(
@@ -436,7 +436,7 @@ in {
   };
 
   # Simple btrfs grub testing
-  btrfsSimple = makeInstallerTest {
+  btrfsSimple = makeInstallerTest "btrfsSimple" {
     createPartitions = ''
       $machine->succeed(
         "sgdisk -Z /dev/vda",
@@ -450,7 +450,7 @@ in {
   };
 
   # Test to see if we can detect /boot and /nix on subvolumes
-  btrfsSubvols = makeInstallerTest {
+  btrfsSubvols = makeInstallerTest "btrfsSubvols" {
     createPartitions = ''
       $machine->succeed(
         "sgdisk -Z /dev/vda",

From ceb75955dd425f47793185b49cd1b3388f85e9be Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 28 Aug 2014 18:13:11 +0200
Subject: [PATCH 0776/1453] haskell-classy-prelude-conduit: update to version
 0.9.4

---
 .../libraries/haskell/classy-prelude-conduit/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix
index 28e940f34896..286a20f2ba22 100644
--- a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "classy-prelude-conduit";
-  version = "0.9.3";
-  sha256 = "0wsl3mhczinxl6ij8dpv5001db740z4jq43l2gpzdylv6pmpldzr";
+  version = "0.9.4";
+  sha256 = "07ggdd3c47bs0pj4hl8vl19k2jlbka73pq7x0m4rsgrrjxc5pr1r";
   buildDepends = [
     classyPrelude conduit conduitCombinators monadControl resourcet
     systemFileio transformers void

From 52d1ffaea71fbd2831a2437115c2efc7133adea5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 28 Aug 2014 18:13:13 +0200
Subject: [PATCH 0777/1453] haskell-classy-prelude: update to version 0.9.4

---
 .../libraries/haskell/classy-prelude/default.nix  | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/haskell/classy-prelude/default.nix b/pkgs/development/libraries/haskell/classy-prelude/default.nix
index e45a6f256b9c..018a54f42d75 100644
--- a/pkgs/development/libraries/haskell/classy-prelude/default.nix
+++ b/pkgs/development/libraries/haskell/classy-prelude/default.nix
@@ -1,19 +1,20 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, basicPrelude, chunkedData, enclosedExceptions, exceptions
-, hashable, hspec, liftedBase, monoTraversable, QuickCheck
-, semigroups, stm, systemFilepath, text, time, transformers
-, unorderedContainers, vector, vectorInstances
+, hashable, hspec, liftedBase, monoTraversable, mtl, primitive
+, QuickCheck, semigroups, stm, systemFilepath, text, time
+, transformers, unorderedContainers, vector, vectorInstances
 }:
 
 cabal.mkDerivation (self: {
   pname = "classy-prelude";
-  version = "0.9.3";
-  sha256 = "06y6zx3mmqjnha5p7y7blzn77bij71kndw2bmi07wz4s4lj9xsiv";
+  version = "0.9.4";
+  sha256 = "1pxg515dg174minvajaxl3sqpqjm862pgfpf7n2ynw5cqmaxngxa";
   buildDepends = [
     basicPrelude chunkedData enclosedExceptions exceptions hashable
-    liftedBase monoTraversable semigroups stm systemFilepath text time
-    transformers unorderedContainers vector vectorInstances
+    liftedBase monoTraversable mtl primitive semigroups stm
+    systemFilepath text time transformers unorderedContainers vector
+    vectorInstances
   ];
   testDepends = [
     hspec QuickCheck transformers unorderedContainers

From 163053a0f54412298043f218ee2ed347c347eeb1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 28 Aug 2014 18:13:15 +0200
Subject: [PATCH 0778/1453] haskell-foldl: update to version 1.0.6

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

diff --git a/pkgs/development/libraries/haskell/foldl/default.nix b/pkgs/development/libraries/haskell/foldl/default.nix
index 7a942e97dc89..2f04330a3157 100644
--- a/pkgs/development/libraries/haskell/foldl/default.nix
+++ b/pkgs/development/libraries/haskell/foldl/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "foldl";
-  version = "1.0.5";
-  sha256 = "08yjzzplg715hzkhwbf8nv2zm7c5wd2kph4zx94iml0cnc6ip048";
+  version = "1.0.6";
+  sha256 = "1i4pm48x7f8l4gqbb2bgqshx5cx44acr24l75czliq656sqm405i";
   buildDepends = [ primitive text transformers vector ];
   meta = {
     description = "Composable, streaming, and efficient left folds";

From 7e0400a110a7e5fb2dc32a38cb6eeff8ff33a2ea Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 28 Aug 2014 18:13:17 +0200
Subject: [PATCH 0779/1453] haskell-highlighting-kate: update to version 0.5.9

---
 .../libraries/haskell/highlighting-kate/default.nix      | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix
index a9540b249502..d77479ff0589 100644
--- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix
+++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix
@@ -1,16 +1,19 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, blazeHtml, filepath, mtl, parsec, regexPcre, utf8String }:
+{ cabal, blazeHtml, Diff, filepath, mtl, parsec, regexPcre
+, utf8String
+}:
 
 cabal.mkDerivation (self: {
   pname = "highlighting-kate";
-  version = "0.5.8.5";
-  sha256 = "0xynbxffjp44189zzqx30wabbrj83mvjl3mj1i5lag1h945yp1nk";
+  version = "0.5.9";
+  sha256 = "025j6d97nwjhhyhdz7bsfhzgpb1ld28va4r8yv7zfh1dvczs6lkr";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     blazeHtml filepath mtl parsec regexPcre utf8String
   ];
+  testDepends = [ blazeHtml Diff filepath ];
   prePatch = "sed -i -e 's|regex-pcre-builtin >= .*|regex-pcre|' highlighting-kate.cabal";
   meta = {
     homepage = "http://github.com/jgm/highlighting-kate";

From 4d3776b18d193b860dcbf77e62157e80d680b903 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 28 Aug 2014 18:13:19 +0200
Subject: [PATCH 0780/1453] haskell-interpolate: update to version 0.0.4

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

diff --git a/pkgs/development/libraries/haskell/interpolate/default.nix b/pkgs/development/libraries/haskell/interpolate/default.nix
index eed6aa835f8f..875759a17eb8 100644
--- a/pkgs/development/libraries/haskell/interpolate/default.nix
+++ b/pkgs/development/libraries/haskell/interpolate/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "interpolate";
-  version = "0.0.3";
-  sha256 = "05aksslx7mvic3cgw9ixwjp0r759a4gf7m178pbp8xm8dpdksjjw";
+  version = "0.0.4";
+  sha256 = "0yr0pahb07r7p6d7hb4bqafa64a4jkd37bchr6vkan2zbffwcrcm";
   buildDepends = [ haskellSrcMeta ];
   testDepends = [
     doctest haskellSrcMeta hspec QuickCheck quickcheckInstances text

From 0211268c303614f9de915a2793eb2aa1028de87d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 28 Aug 2014 18:13:20 +0200
Subject: [PATCH 0781/1453] haskell-mmorph: update to version 1.0.4

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

diff --git a/pkgs/development/libraries/haskell/mmorph/default.nix b/pkgs/development/libraries/haskell/mmorph/default.nix
index b13eeeb5d83e..bf8fb46f7939 100644
--- a/pkgs/development/libraries/haskell/mmorph/default.nix
+++ b/pkgs/development/libraries/haskell/mmorph/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "mmorph";
-  version = "1.0.3";
-  sha256 = "0b8pzb63zxw3cjw8yj73swvqhmi9c4lgw1mis1xbraya7flxc6qm";
+  version = "1.0.4";
+  sha256 = "0k5zlzmnixfwcjrqvhgi3i6xg532b0gsjvc39v5jigw69idndqr2";
   buildDepends = [ transformers ];
   meta = {
     description = "Monad morphisms";

From dbdde708cdb29248449a52c402d42e4349832c69 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 28 Aug 2014 18:13:22 +0200
Subject: [PATCH 0782/1453] haskell-project-template: update to version 0.1.4.2

---
 .../libraries/haskell/project-template/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/project-template/default.nix b/pkgs/development/libraries/haskell/project-template/default.nix
index 9aa8dff59aa3..8cb7dfd32ae1 100644
--- a/pkgs/development/libraries/haskell/project-template/default.nix
+++ b/pkgs/development/libraries/haskell/project-template/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "project-template";
-  version = "0.1.4.1";
-  sha256 = "1vsx8a4kzdcwbdy47hb2wz32najsa6bqq6jkyal9nbc5ydwb65lb";
+  version = "0.1.4.2";
+  sha256 = "10n23s6g7fv0l42hsb804z0qqcyxqw32kwzg1f0w3c6gka844akr";
   buildDepends = [
     base64Bytestring conduit conduitExtra mtl resourcet systemFileio
     systemFilepath text transformers

From 4c5e35a9e8e6fcf4bb35190f88e70e726d34edd5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 28 Aug 2014 18:13:24 +0200
Subject: [PATCH 0783/1453] haskell-pwstore-fast: update to version 2.4.2

---
 .../libraries/haskell/pwstore-fast/default.nix         | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/pwstore-fast/default.nix b/pkgs/development/libraries/haskell/pwstore-fast/default.nix
index 08f18e8fe113..5a92e47417d7 100644
--- a/pkgs/development/libraries/haskell/pwstore-fast/default.nix
+++ b/pkgs/development/libraries/haskell/pwstore-fast/default.nix
@@ -1,12 +1,14 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, base64Bytestring, binary, cryptohash, random, SHA }:
+{ cabal, base64Bytestring, binary, byteable, cryptohash, random }:
 
 cabal.mkDerivation (self: {
   pname = "pwstore-fast";
-  version = "2.4.1";
-  sha256 = "1k98b1s2ld0jx8fy53k8d8pscp6n0plh51b2lj6ai6w8xj4vknw4";
-  buildDepends = [ base64Bytestring binary cryptohash random SHA ];
+  version = "2.4.2";
+  sha256 = "1idpk0cc61jibj50h2a39k37s630c8h5k5d1qvbc89nql4jc132l";
+  buildDepends = [
+    base64Bytestring binary byteable cryptohash random
+  ];
   meta = {
     homepage = "https://github.com/PeterScott/pwstore";
     description = "Secure password storage";

From 4b0cdd2cacef3c71357850495ceb41b0a763602e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 28 Aug 2014 18:13:26 +0200
Subject: [PATCH 0784/1453] haskell-yaml: update to version 0.8.9.1

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

diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix
index 26cb0dec098d..9173baa97baa 100644
--- a/pkgs/development/libraries/haskell/yaml/default.nix
+++ b/pkgs/development/libraries/haskell/yaml/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yaml";
-  version = "0.8.9";
-  sha256 = "13qqqil19yi1qbl9gqma6kxwkz8j5iq6z347fabk916gy9jng3dl";
+  version = "0.8.9.1";
+  sha256 = "129pf4gg3mf2ljag8vxknnqxbrbx53hshzpaggndxjir72303njy";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From c9286fd171aa47fc88aa1e01510554bb1c95f1b1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 28 Aug 2014 18:13:28 +0200
Subject: [PATCH 0785/1453] haskell-hlint: update to version 1.9.4

---
 pkgs/development/tools/haskell/hlint/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix
index 4fe5f01c3d18..92a33602a1f6 100644
--- a/pkgs/development/tools/haskell/hlint/default.nix
+++ b/pkgs/development/tools/haskell/hlint/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hlint";
-  version = "1.9.3";
-  sha256 = "1sdz981yq0amsw9q6hx0aqkd0ayrax5p77s3n3gz4bphpk37n09b";
+  version = "1.9.4";
+  sha256 = "0vqdkrhzxi99py9zrk01cz3hayfbp757rh1c1sgz00a1gf1pyz8m";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 6f4b9ebd22ee99a36391d3f9dd04b5cbebfba4c3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 28 Aug 2014 18:13:44 +0200
Subject: [PATCH 0786/1453] haskell-cgi: add version 3001.2.0.0

---
 .../libraries/haskell/cgi/3001.2.0.0.nix         | 16 ++++++++++++++++
 pkgs/top-level/haskell-packages.nix              |  3 ++-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/haskell/cgi/3001.2.0.0.nix

diff --git a/pkgs/development/libraries/haskell/cgi/3001.2.0.0.nix b/pkgs/development/libraries/haskell/cgi/3001.2.0.0.nix
new file mode 100644
index 000000000000..0f0ea06ee74d
--- /dev/null
+++ b/pkgs/development/libraries/haskell/cgi/3001.2.0.0.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, exceptions, mtl, network, networkUri, parsec, xhtml }:
+
+cabal.mkDerivation (self: {
+  pname = "cgi";
+  version = "3001.2.0.0";
+  sha256 = "03az978d5ayv5v4g89h4wajjhcribyf37b8ws8kvsqir3i7h7k8d";
+  buildDepends = [ exceptions mtl network networkUri parsec xhtml ];
+  meta = {
+    homepage = "https://github.com/cheecheeo/haskell-cgi";
+    description = "A library for writing CGI programs";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 7a4d4c4f10bd..8f9ef6710a32 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -391,7 +391,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   cgi_3001_1_7_4 = callPackage ../development/libraries/haskell/cgi/3001.1.7.4.nix {};
   cgi_3001_1_7_5 = callPackage ../development/libraries/haskell/cgi/3001.1.7.5.nix {};
   cgi_3001_1_8_5 = callPackage ../development/libraries/haskell/cgi/3001.1.8.5.nix {};
-  cgi = self.cgi_3001_1_8_5;
+  cgi_3001_2_0_0 = callPackage ../development/libraries/haskell/cgi/3001.2.0.0.nix {};
+  cgi = self.cgi_3001_2_0_0;
 
   cgrep = callPackage ../development/libraries/haskell/cgrep {};
 

From 17a4dce05e4d445dc1f0c46f5908ff4583a8f891 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 29 Aug 2014 11:07:40 +0200
Subject: [PATCH 0787/1453] haskell-pwstore-fast: update to version 2.4.3

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

diff --git a/pkgs/development/libraries/haskell/pwstore-fast/default.nix b/pkgs/development/libraries/haskell/pwstore-fast/default.nix
index 5a92e47417d7..a59a9b2d2da3 100644
--- a/pkgs/development/libraries/haskell/pwstore-fast/default.nix
+++ b/pkgs/development/libraries/haskell/pwstore-fast/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pwstore-fast";
-  version = "2.4.2";
-  sha256 = "1idpk0cc61jibj50h2a39k37s630c8h5k5d1qvbc89nql4jc132l";
+  version = "2.4.3";
+  sha256 = "02dj297s04fxb4ys9nfdw6aap5zrwlryq515gky0c3af6ss2yiz7";
   buildDepends = [
     base64Bytestring binary byteable cryptohash random
   ];

From 30b88f5f619cf95669d774fe233270759996d1de Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 29 Aug 2014 11:07:47 +0200
Subject: [PATCH 0788/1453] haskell-hspec-meta: update to version 1.11.4

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

diff --git a/pkgs/development/libraries/haskell/hspec-meta/default.nix b/pkgs/development/libraries/haskell/hspec-meta/default.nix
index 844b0a528056..09d3a8425220 100644
--- a/pkgs/development/libraries/haskell/hspec-meta/default.nix
+++ b/pkgs/development/libraries/haskell/hspec-meta/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hspec-meta";
-  version = "1.11.3";
-  sha256 = "0cydxq5kgi4cczf6q70853wz3x1ymrf9mkp7rp71yir5vrhg0b8p";
+  version = "1.11.4";
+  sha256 = "047vp6wibkwgs9rryjpys2qqn4s5p91mh36w0gnxwhggp8nhfqg3";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 8c6bb74e077339d986d68857ba484a8ec42c0edd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 29 Aug 2014 11:07:48 +0200
Subject: [PATCH 0789/1453] haskell-hspec-wai: update to version 0.3.0.1

---
 pkgs/development/libraries/haskell/hspec-wai/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hspec-wai/default.nix b/pkgs/development/libraries/haskell/hspec-wai/default.nix
index 1341bf198c96..8bc6776fd84e 100644
--- a/pkgs/development/libraries/haskell/hspec-wai/default.nix
+++ b/pkgs/development/libraries/haskell/hspec-wai/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hspec-wai";
-  version = "0.3.0";
-  sha256 = "0wkzv406jiyi8ais3g0addm66274y1pvy55gypmnhwx5rp2kr6fb";
+  version = "0.3.0.1";
+  sha256 = "0c04gh32xnvyz0679n7jhp1kdcn7lbkb7248j6lh28irsh84dvp8";
   buildDepends = [
     aeson aesonQq caseInsensitive hspec2 httpTypes text transformers
     wai waiExtra
@@ -21,6 +21,5 @@ cabal.mkDerivation (self: {
     description = "Experimental Hspec support for testing WAI applications (depends on hspec2!)";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
   };
 })

From d86e8835b9e95a57c6f9ab94f9895a7e5f930a19 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 29 Aug 2014 11:07:50 +0200
Subject: [PATCH 0790/1453] haskell-hspec: update to version 1.11.4

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

diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix
index 98cc9f1b97e4..1df977dbf57f 100644
--- a/pkgs/development/libraries/haskell/hspec/default.nix
+++ b/pkgs/development/libraries/haskell/hspec/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hspec";
-  version = "1.11.3";
-  sha256 = "0kq2cds8khwq7nl60pvgk8v6s2fizfkpdplc1p0mj8zyr9gyz7i0";
+  version = "1.11.4";
+  sha256 = "044vr6xyk0ih20faa4gbl4y4v6vkss0x2gmxgkk96ha6chws2svn";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 8315f88e72c639262019a2da6d432403c55c29e2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 29 Aug 2014 11:07:52 +0200
Subject: [PATCH 0791/1453] haskell-hspec2: update to version 0.4.2

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

diff --git a/pkgs/development/libraries/haskell/hspec2/default.nix b/pkgs/development/libraries/haskell/hspec2/default.nix
index 295b01b4e326..e459e99e2fe8 100644
--- a/pkgs/development/libraries/haskell/hspec2/default.nix
+++ b/pkgs/development/libraries/haskell/hspec2/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hspec2";
-  version = "0.4.1";
-  sha256 = "131w90yy7scxdpz7qa37n1wmyr8gvc5jqdsqkpg8s9pqham96w5v";
+  version = "0.4.2";
+  sha256 = "1wk1lvy3lngfa60n0dyllfqbj4gd4v0qxjw7gpvzknfk2y10536x";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -25,7 +25,5 @@ cabal.mkDerivation (self: {
     description = "Alpha version of Hspec 2.0";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
   };
 })

From 2e505d0eb7cdce97fa642294c6a21c6b0496657d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 29 Aug 2014 11:23:56 +0200
Subject: [PATCH 0792/1453] haskell-cgi: mark version 3001.2.0.0 broken

It needs mtl >=2.2.1 && <2.3, and we cannot easily satisfy this requirement.

It's interesting to observe how "cgi" remains broken in current versions of GHC
for months, despite the fact that it's a Haskell Platform package. Makes one
wonder about the purpose of the Haskell Platform, no? In the end, if there is
no maintainer for a package, then it stays unmaintained, HP member or not.
---
 pkgs/development/libraries/haskell/cgi/3001.2.0.0.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/haskell/cgi/3001.2.0.0.nix b/pkgs/development/libraries/haskell/cgi/3001.2.0.0.nix
index 0f0ea06ee74d..2bacef96e085 100644
--- a/pkgs/development/libraries/haskell/cgi/3001.2.0.0.nix
+++ b/pkgs/development/libraries/haskell/cgi/3001.2.0.0.nix
@@ -12,5 +12,7 @@ cabal.mkDerivation (self: {
     description = "A library for writing CGI programs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
+    broken = true;
   };
 })

From e657385acf742770abaaa9d5a3bf4588b84f6d0f Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Fri, 29 Aug 2014 12:09:05 +0100
Subject: [PATCH 0793/1453] extreme-tux-racer: update to 0.6.0

---
 pkgs/games/extremetuxracer/default.nix | 42 ++++++++++++++------------
 pkgs/top-level/all-packages.nix        | 10 ++----
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/pkgs/games/extremetuxracer/default.nix b/pkgs/games/extremetuxracer/default.nix
index e35eb3266c2d..af80467c960d 100644
--- a/pkgs/games/extremetuxracer/default.nix
+++ b/pkgs/games/extremetuxracer/default.nix
@@ -1,34 +1,38 @@
-a :  
-let 
-  fetchurl = a.fetchurl;
+{ stdenv, fetchurl, mesa, libX11, xproto, tcl, freeglut
+, SDL, SDL_mixer, SDL_image, libXi, inputproto
+, libXmu, libXext, xextproto, libXt, libSM, libICE
+, libpng, pkgconfig, gettext, intltool
+}:
 
-  version = a.lib.attrByPath ["version"] "0.5beta" a; 
-  buildInputs = with a; [
+stdenv.mkDerivation rec {
+  version = "0.6.0";
+  name = "extremetuxracer-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/extremetuxracer/etr-${version}.tar.xz";
+    sha256 = "0fl9pwkywqnsmgr6plfj9zb05xrdnl5xb2hcmbjk7ap9l4cjfca4";
+  };
+
+  buildInputs = [
     mesa libX11 xproto tcl freeglut
-    SDL SDL_mixer libXi inputproto
+    SDL SDL_mixer SDL_image libXi inputproto
     libXmu libXext xextproto libXt libSM libICE
     libpng pkgconfig gettext intltool
   ];
-in
-rec {
-  src = fetchurl {
-    url = "mirror://sourceforge/extremetuxracer/extremetuxracer-${version}.tar.gz";
-    sha256 = "04d99fsfna5mc9apjxsiyw0zgnswy33kwmm1s9d03ihw6rba2zxs";
-  };
 
-  inherit buildInputs;
-  configureFlags = [
-  		"--with-tcl=${a.tcl}/lib"
-  	];
+  configureFlags = [ "--with-tcl=${tcl}/lib" ];
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doConfigure" "doMakeInstall"];
+  preConfigure = ''
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${SDL}/include/SDL"
+  '';
 
-  name = "extremetuxracer-" + version;
   meta = {
     description = "High speed arctic racing game based on Tux Racer";
     longDescription = ''
       ExtremeTuxRacer - Tux lies on his belly and accelerates down ice slopes.
     '';
+    license = stdenv.lib.licenses.gpl2Plus;
+    homepage = http://sourceforge.net/projects/extremetuxracer/;
+    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6f02f2650ace..91fd92e301dc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4554,11 +4554,7 @@ let
 
   expat = callPackage ../development/libraries/expat { };
 
-  extremetuxracer = builderDefsPackage (import ../games/extremetuxracer) {
-    inherit mesa tcl freeglut SDL SDL_mixer pkgconfig
-      gettext intltool;
-    inherit (xlibs) libX11 xproto libXi inputproto
-      libXmu libXext xextproto libXt libSM libICE;
+  extremetuxracer = callPackage ../games/extremetuxracer {
     libpng = libpng12;
   };
 
@@ -9209,11 +9205,11 @@ let
     inherit (gnome) vte;
     gtk = gtk2;
   };
-  
+
   lynx = callPackage ../applications/networking/browsers/lynx { };
 
   lyx = callPackage ../applications/misc/lyx { };
-
+  
   makeself = callPackage ../applications/misc/makeself { };
 
   matchbox = callPackage ../applications/window-managers/matchbox { };

From e41a169a60f18f7102137510ff243fea295c0995 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Wed, 27 Aug 2014 15:53:12 +0100
Subject: [PATCH 0794/1453] super-tux-kart: update to 0.8.1

---
 pkgs/games/super-tux-kart/default.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix
index 29d3b4e45571..db42572de5eb 100644
--- a/pkgs/games/super-tux-kart/default.nix
+++ b/pkgs/games/super-tux-kart/default.nix
@@ -1,18 +1,19 @@
 { fetchurl, cmake, stdenv, plib, SDL, openal, freealut, mesa
 , libvorbis, libogg, gettext, libXxf86vm, curl, pkgconfig
-, fribidi, autoconf, automake, libtool }:
+, fribidi, autoconf, automake, libtool, bluez }:
 
 stdenv.mkDerivation rec {
-  name = "supertuxkart-0.8";
+  version = "0.8.1";
+  name = "supertuxkart-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/supertuxkart/${name}-src.tar.bz2";
-    sha256 = "12sbml4wxg2x2wgnnkxfisj96a9gcsaj3fj27kdk8yj524ikv7xr";
+    sha256 = "1mpqmi62a2kl6n58mw11fj0dr5xiwmjkqnfmd2z7ghdhc6p02lrk";
   };
 
   buildInputs = [
     plib SDL openal freealut mesa libvorbis libogg gettext
-    libXxf86vm curl pkgconfig fribidi autoconf automake libtool cmake
+    libXxf86vm curl pkgconfig fribidi autoconf automake libtool cmake bluez
   ];
 
   enableParallelBuilding = true;
@@ -27,15 +28,13 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "SuperTuxKart is a Free 3D kart racing game";
-
     longDescription = ''
       SuperTuxKart is a Free 3D kart racing game, with many tracks,
       characters and items for you to try, similar in spirit to Mario
       Kart.
     '';
-
     homepage = http://supertuxkart.sourceforge.net/;
-
     license = stdenv.lib.licenses.gpl2Plus;
+    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
   };
 }

From 8fe82841ea54b27e3e7e3ad59271124770382842 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Wed, 27 Aug 2014 14:55:26 +0100
Subject: [PATCH 0795/1453] xnee: update to 3.19

---
 pkgs/tools/X11/xnee/default.nix | 7 ++++---
 pkgs/top-level/all-packages.nix | 7 ++-----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/X11/xnee/default.nix b/pkgs/tools/X11/xnee/default.nix
index 35c4ca06c6c5..43fa105e6808 100644
--- a/pkgs/tools/X11/xnee/default.nix
+++ b/pkgs/tools/X11/xnee/default.nix
@@ -2,11 +2,12 @@
 , gtk, libXi, inputproto, pkgconfig, recordproto, texinfo }:
 
 stdenv.mkDerivation rec {
-  name = "xnee-3.12";
+  version = "3.19";
+  name = "xnee-${version}";
 
   src = fetchurl {
     url = "mirror://gnu/xnee/${name}.tar.gz";
-    sha256 = "10vxn0in0l2jir6x90grx5jc64x63l3b0f8liladdbplc8za8zmw";
+    sha256 = "04n2lac0vgpv8zsn7nmb50hf3qb56pmj90dmwnivg09gyrf1x92j";
   };
 
   patchPhase =
@@ -48,7 +49,7 @@ stdenv.mkDerivation rec {
 
     homepage = http://www.gnu.org/software/xnee/;
 
-    maintainers = [ ];
+    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
     platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 91fd92e301dc..9bdf2462406e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10203,10 +10203,7 @@ let
 
   xmp = callPackage ../applications/audio/xmp { };
 
-  xnee = callPackage ../tools/X11/xnee {
-    # Work around "missing separator" error.
-    stdenv = overrideInStdenv stdenv [ gnumake381 ];
-  };
+  xnee = callPackage ../tools/X11/xnee { };
 
   xvidcap = callPackage ../applications/video/xvidcap {
     inherit (gnome) scrollkeeper libglade;
@@ -10918,7 +10915,7 @@ let
   liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { };
 
   openblas = callPackage ../development/libraries/science/math/openblas { };
-  openblas_0_2_10 = callPackage ../development/libraries/science/math/openblas/0.2.10.nix { 
+  openblas_0_2_10 = callPackage ../development/libraries/science/math/openblas/0.2.10.nix {
     liblapack = liblapack_3_5_0;
   };
 

From b4b3bd1bd7d429863dbfc7150baa86381b789aa8 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Wed, 27 Aug 2014 12:56:37 +0100
Subject: [PATCH 0796/1453] cloc: update to 1.62

---
 pkgs/tools/misc/cloc/default.nix | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/tools/misc/cloc/default.nix
index dfe5476f8130..8d7ba0c70c82 100644
--- a/pkgs/tools/misc/cloc/default.nix
+++ b/pkgs/tools/misc/cloc/default.nix
@@ -1,30 +1,25 @@
 { stdenv, fetchurl, perl, AlgorithmDiff, RegexpCommon }:
 
 stdenv.mkDerivation rec {
-  
+
   name = "cloc-${version}";
 
-  version = "1.58";
+  version = "1.62";
 
   src = fetchurl {
     url = "mirror://sourceforge/cloc/cloc-${version}.tar.gz";
-    sha256 = "1k92jldy4m717lh1xd6yachx3l2hhpx76qhj1ipnx12hsxw1zc8w";
+    sha256 = "1cxc663dccd0sc2m0aj5lxdbnbzrys6rh9n8q122h74bfvsiw4f4";
   };
 
   buildInputs = [ perl AlgorithmDiff RegexpCommon ];
 
-  unpackPhase = ''
-    mkdir ${name}
-    tar xf $src -C ${name}
-    cd ${name}
-  '';
-
   makeFlags = [ "prefix=" "DESTDIR=$(out)" "INSTALL=install" ];
 
   meta = {
     description = "A program that counts lines of source code";
     homepage = http://cloc.sourceforge.net;
     license = stdenv.lib.licenses.gpl2;
+    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
   };
 
 }

From 17b88f1b095ad1262b729d75aaea44dd5b0324c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 29 Aug 2014 13:49:04 +0200
Subject: [PATCH 0797/1453] pypy: wrap to provide sqlite3 at runtime

---
 pkgs/development/interpreters/pypy/2.3/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/pypy/2.3/default.nix b/pkgs/development/interpreters/pypy/2.3/default.nix
index 0ed13e2f6462..73a52e6dfc77 100644
--- a/pkgs/development/interpreters/pypy/2.3/default.nix
+++ b/pkgs/development/interpreters/pypy/2.3/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi
-, sqlite, openssl, ncurses, pythonFull, expat, tcl, tk, x11, libX11 }:
+, sqlite, openssl, ncurses, pythonFull, expat, tcl, tk, x11, libX11
+, makeWrapper }:
 
 assert zlibSupport -> zlib != null;
 
@@ -20,7 +21,7 @@ let
       sha256 = "0fg4l48c7n59n5j3b1dgcsr927xzylkfny4a6pnk6z0pq2bhvl9z";
     };
 
-    buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite tk tcl x11 libX11 ]
+    buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite tk tcl x11 libX11 makeWrapper ]
       ++ stdenv.lib.optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc
       ++ stdenv.lib.optional zlibSupport zlib;
 
@@ -86,7 +87,10 @@ let
        # verify cffi modules
        $out/bin/pypy -c "import Tkinter;import sqlite3"
 
-       # TODO: compile python files?
+       # make sure pypy finds sqlite3 library
+       wrapProgram "$out/bin/pypy" \
+         --set LD_LIBRARY_PATH "${LD_LIBRARY_PATH}" \
+         --set LIBRARY_PATH "${LIBRARY_PATH}"
     '';
 
     passthru = {
@@ -98,7 +102,7 @@ let
     enableParallelBuilding = true;
 
     meta = with stdenv.lib; {
-      homepage = "http://pypy.org/";
+      homepage = http://pypy.org/;
       description = "Fast, compliant alternative implementation of the Python language (2.7.3)";
       license = licenses.mit;
       platforms = platforms.linux;

From 019bc6bb2b432cca214ee2f949ef9936c5818161 Mon Sep 17 00:00:00 2001
From: Igor Pashev <pashev.igor@gmail.com>
Date: Fri, 29 Aug 2014 13:56:23 +0200
Subject: [PATCH 0798/1453] Made Mediawiki rewrite rules work for virtual hosts

Related to cdd1785cd6380e971ad0413e7ecfd3af7ab38625
---
 nixos/modules/services/web-servers/apache-httpd/mediawiki.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
index 76c64f8cb29b..bb066aa6c476 100644
--- a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
@@ -133,7 +133,7 @@ in
         RewriteEngine On
         RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-f
         RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-d
-        ${concatMapStringsSep "\n" (u: "RewriteCond %{REQUEST_URI} !^${u.urlPath}") serverInfo.serverConfig.servedDirs}
+        ${concatMapStringsSep "\n" (u: "RewriteCond %{REQUEST_URI} !^${u.urlPath}") serverInfo.vhostConfig.servedDirs}
         RewriteRule ${if config.enableUploads
           then "!^/images"
           else "^.*\$"

From 60902b97fe4a96d370bc0c5e3690fa45da77d78d Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Fri, 29 Aug 2014 11:40:46 +0100
Subject: [PATCH 0799/1453] ed: update to 1.10 (close #3852)

---
 pkgs/applications/editors/ed/default.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix
index d3e9a4c46794..b1b9616eaab3 100644
--- a/pkgs/applications/editors/ed/default.nix
+++ b/pkgs/applications/editors/ed/default.nix
@@ -1,11 +1,12 @@
-{ fetchurl, stdenv }:
+{ fetchurl, stdenv, lzip }:
 
 stdenv.mkDerivation rec {
-  name = "ed-1.9";
+  version = "1.10";
+  name = "ed-${version}";
 
   src = fetchurl {
-    url = "mirror://gnu/ed/${name}.tar.gz";
-    sha256 = "122syihsx2hwzj75mkf5a9ssiky2xby748kp4cc00wzhmp7p5cym";
+    url = "mirror://gnu/ed/${name}.tar.lz";
+    sha256 = "16kycdm5fcvpdr41hxb2da8da6jzs9dqznsg5552z6rh28n0jh4m";
   };
 
   /* FIXME: Tests currently fail on Darwin:
@@ -23,6 +24,8 @@ stdenv.mkDerivation rec {
     compileFlags = [ "CC=${stdenv.cross.config}-gcc" ];
   };
 
+  buildInputs = [ lzip ];
+
   meta = {
     description = "GNU ed, an implementation of the standard Unix editor";
 
@@ -38,9 +41,7 @@ stdenv.mkDerivation rec {
     '';
 
     license = stdenv.lib.licenses.gpl3Plus;
-
     homepage = http://www.gnu.org/software/ed/;
-
-    maintainers = [ ];
+    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
   };
 }

From 98cc03eb2295137701d706f8d857c15f3e54379f Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Fri, 29 Aug 2014 13:04:14 +0100
Subject: [PATCH 0800/1453] ffmpeg: update to 2.3.3

---
 pkgs/development/libraries/ffmpeg/2.x.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/ffmpeg/2.x.nix b/pkgs/development/libraries/ffmpeg/2.x.nix
index 19a4099a8b1c..8114eb4752d2 100644
--- a/pkgs/development/libraries/ffmpeg/2.x.nix
+++ b/pkgs/development/libraries/ffmpeg/2.x.nix
@@ -5,11 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ffmpeg-2.3.2";
+  version = "2.3.3";
+  name = "ffmpeg-${version}";
 
   src = fetchurl {
     url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
-    sha256 = "1lpzqjpklmcjzk327pz070m3qz3s1cwg8v90w6r1sdh8491kbqc4";
+    sha256 = "0ik4c06anh49r5b0d3rq9if4zl6ysjsa341655kzw22fl880sk5v";
   };
 
   subtitleSupport = config.ffmpeg.subtitle or true;
@@ -102,5 +103,6 @@ stdenv.mkDerivation rec {
     description = "A complete, cross-platform solution to record, convert and stream audio and video";
     license = if (fdkAACSupport || faacSupport) then stdenv.lib.licenses.unfree else stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
   };
 }

From 41dc081a09aaa42d6528af1d3e23917b17f898e5 Mon Sep 17 00:00:00 2001
From: Michel Kuhlmann <michel@kuhlmanns.info>
Date: Fri, 29 Aug 2014 14:18:27 +0200
Subject: [PATCH 0801/1453] haskell-present: initial expression

---
 .../libraries/haskell/present/default.nix         | 15 +++++++++++++++
 pkgs/top-level/haskell-packages.nix               |  2 ++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/present/default.nix

diff --git a/pkgs/development/libraries/haskell/present/default.nix b/pkgs/development/libraries/haskell/present/default.nix
new file mode 100644
index 000000000000..7c5f3afbd988
--- /dev/null
+++ b/pkgs/development/libraries/haskell/present/default.nix
@@ -0,0 +1,15 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, aeson, attoLisp, dataDefault, mtl, semigroups, text }:
+
+cabal.mkDerivation (self: {
+  pname = "present";
+  version = "1.1";
+  sha256 = "1hmzq3qi4hz74xr7cnc33kpwki9ziyinvrwazag8hh77d02fl11z";
+  buildDepends = [ aeson attoLisp dataDefault mtl semigroups text ];
+  meta = {
+    description = "Make presentations for data types";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 8f9ef6710a32..18a8e8b7655d 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1932,6 +1932,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   presburger = callPackage ../development/libraries/haskell/presburger {};
 
+  present = callPackage ../development/libraries/haskell/present {};
+
   prettyclass = callPackage ../development/libraries/haskell/prettyclass {};
 
   prettyShow = callPackage ../development/libraries/haskell/pretty-show {};

From dfeba56c0e3ea625965deb46e6200c388d5c9d5f Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Fri, 29 Aug 2014 13:32:10 +0100
Subject: [PATCH 0802/1453] libaal: update to 1.0.6

---
 pkgs/development/libraries/libaal/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/libaal/default.nix b/pkgs/development/libraries/libaal/default.nix
index 596b8e2e84cd..36d1ddc71516 100644
--- a/pkgs/development/libraries/libaal/default.nix
+++ b/pkgs/development/libraries/libaal/default.nix
@@ -1,11 +1,12 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl }:
 
-stdenv.mkDerivation {
-  name = "libaal-1.0.5";
+stdenv.mkDerivation rec {
+  version = "1.0.6";
+  name = "libaal-${version}";
 
   src = fetchurl {
-    url = http://chichkin_i.zelnet.ru/namesys/libaal-1.0.5.tar.gz;
-    sha256 = "109f464hxwms90mpczc7h7lmrdlcmlglabkzh86h25xrlxxdn6pz";
+    url = "mirror://sourceforge/reiser4/${name}.tar.gz";
+    sha256 = "176f2sns6iyxv3h9zyirdinjwi05gdak48zqarhib2s38rvm98di";
   };
 
   preInstall = ''
@@ -15,5 +16,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://www.namesys.com/;
     description = "Support library for Reiser4";
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
   };
 }

From badb705a5cf0ffb3078a6142df0812d3b03bcde6 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Fri, 29 Aug 2014 13:45:04 +0100
Subject: [PATCH 0803/1453] libaio: update to 0.3.110

---
 pkgs/os-specific/linux/libaio/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/libaio/default.nix b/pkgs/os-specific/linux/libaio/default.nix
index bf30530e9ad3..b3df129912e4 100644
--- a/pkgs/os-specific/linux/libaio/default.nix
+++ b/pkgs/os-specific/linux/libaio/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchgit }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libaio-0.3.109";
+  version = "0.3.110";
+  name = "libaio-${version}";
 
-  src = fetchgit {
-    url = https://git.fedorahosted.org/git/libaio.git;
-    rev = "refs/tags/${name}";
-    sha256 = "1wbziq0hqvnbckpxrz1cgr8dlw3mifs4xpy3qhnagbrrsmrq2rhi";
+  src = fetchurl {
+    url = "https://fedorahosted.org/releases/l/i/libaio/${name}.tar.gz";
+    sha256 = "0zjzfkwd1kdvq6zpawhzisv7qbq1ffs343i5fs9p498pcf7046g0";
   };
 
   makeFlags = "prefix=$(out)";
@@ -15,5 +15,7 @@ stdenv.mkDerivation rec {
     description = "Library for asynchronous I/O in Linux";
     homepage = http://lse.sourceforge.net/io/aio.html;
     platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.lgpl21;
+    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
   };
 }

From 5fb879526d894a4650fa84e129251119f6000ea4 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Fri, 29 Aug 2014 13:56:49 +0100
Subject: [PATCH 0804/1453] libao: update to 1.2.0

---
 pkgs/development/libraries/libao/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix
index 401573378ee4..44e800b6f1e4 100644
--- a/pkgs/development/libraries/libao/default.nix
+++ b/pkgs/development/libraries/libao/default.nix
@@ -1,14 +1,15 @@
 { lib, stdenv, fetchurl, pkgconfig, pulseaudio, alsaLib
 , usePulseAudio }:
 
-stdenv.mkDerivation {
-  name = "libao-1.1.0";
+stdenv.mkDerivation rec {
+  version = "1.2.0";
+  name = "libao-${version}";
   src = fetchurl {
-    url = http://downloads.xiph.org/releases/ao/libao-1.1.0.tar.gz;
-    sha256 = "1m0v2y6bhr4iwsgdkc7b3y0qgpvpv1ifbxsy8n8ahsvjn6wmppi9";
+    url = "http://downloads.xiph.org/releases/ao/${name}.tar.gz";
+    sha256 = "1bwwv1g9lchaq6qmhvj1pp3hnyqr64ydd4j38x94pmprs4d27b83";
   };
 
-  buildInputs = 
+  buildInputs =
     [ pkgconfig ] ++
     lib.optional stdenv.isLinux (if usePulseAudio then [ pulseaudio ] else [ alsaLib ]);
 
@@ -19,6 +20,7 @@ stdenv.mkDerivation {
       platforms.
     '';
     homepage = http://xiph.org/ao/;
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
   };
 }

From a0f317cc5b1ce43f21a7cbbcd9f7b557a2a588e7 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Fri, 29 Aug 2014 14:01:51 +0100
Subject: [PATCH 0805/1453] lzo: update from 2.06 to 2.08

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

diff --git a/pkgs/development/libraries/lzo/default.nix b/pkgs/development/libraries/lzo/default.nix
index 7fa6194cbca6..f4bff72fa809 100644
--- a/pkgs/development/libraries/lzo/default.nix
+++ b/pkgs/development/libraries/lzo/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "lzo-2.06";
+  name = "lzo-2.08";
 
   src = fetchurl {
     url = "${meta.homepage}/download/${name}.tar.gz";
-    sha256 = "0wryshs446s7cclrbjykyj766znhcpnr7s3cxy33ybfn6vwfcygz";
+    sha256 = "0536ad3ksk1r8h2a27d0y4p27lwjarzyndw7sagvxzj6xr6kw6xc";
   };
 
   configureFlags = [ "--enable-shared" ];

From 51829a0f39005a6ec682d6aa5f28f0f96806428c Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Fri, 29 Aug 2014 14:17:40 +0100
Subject: [PATCH 0806/1453] murmur: update to 1.2.8

---
 pkgs/applications/networking/mumble/murmur.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mumble/murmur.nix b/pkgs/applications/networking/mumble/murmur.nix
index 17254aa2fdd5..1c06392f60b2 100644
--- a/pkgs/applications/networking/mumble/murmur.nix
+++ b/pkgs/applications/networking/mumble/murmur.nix
@@ -12,11 +12,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "murmur-" + version;
-  version = "1.2.6";
+  version = "1.2.8";
 
   src = fetchurl {
     url = "mirror://sourceforge/mumble/mumble-${version}.tar.gz";
-    sha256 = "1zxnbwbd81p7lvscghlpkad8kynh9gbf1nhc092sp64pp37xwv47";
+    sha256 = "0ng1xd7i0951kqnd9visf84y2dcwia79a1brjwfvr1wnykgw6bsc";
   };
 
   patchPhase = optional iceSupport ''

From 0fb885721aeb13990fe3243743ab4f04d5f5fa8e Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Fri, 29 Aug 2014 14:33:25 +0100
Subject: [PATCH 0807/1453] libmpeg2: update to 0.5.1

The patch seems unnecessary but I'll look out for breakage.
---
 .../libraries/libmpeg2/A00-tags.patch         | 27 -------------------
 .../libraries/libmpeg2/default.nix            | 12 ++++-----
 2 files changed, 5 insertions(+), 34 deletions(-)
 delete mode 100644 pkgs/development/libraries/libmpeg2/A00-tags.patch

diff --git a/pkgs/development/libraries/libmpeg2/A00-tags.patch b/pkgs/development/libraries/libmpeg2/A00-tags.patch
deleted file mode 100644
index 0b5d7d7da12b..000000000000
--- a/pkgs/development/libraries/libmpeg2/A00-tags.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -ru mpeg2dec.orig/libmpeg2/decode.c mpeg2dec/libmpeg2/decode.c
---- mpeg2dec.orig/libmpeg2/decode.c	2008-07-09 12:16:05.000000000 -0700
-+++ mpeg2dec/libmpeg2/decode.c	2009-07-03 16:29:48.000000000 -0700
-@@ -212,7 +212,7 @@
- 
- mpeg2_state_t mpeg2_parse_header (mpeg2dec_t * mpeg2dec)
- {
--    static int (* process_header[]) (mpeg2dec_t * mpeg2dec) = {
-+    static int (* process_header[]) (mpeg2dec_t *) = {
- 	mpeg2_header_picture, mpeg2_header_extension, mpeg2_header_user_data,
- 	mpeg2_header_sequence, NULL, NULL, NULL, NULL, mpeg2_header_gop
-     };
-@@ -368,6 +368,14 @@
- 
- void mpeg2_tag_picture (mpeg2dec_t * mpeg2dec, uint32_t tag, uint32_t tag2)
- {
-+    if (mpeg2dec->num_tags == 0 && mpeg2dec->state == STATE_PICTURE && mpeg2dec->picture) {
-+        // since tags got processed when we entered this state we
-+        // have to set them directly or they'll end up on the next frame.
-+        mpeg2dec->picture->tag = tag;
-+        mpeg2dec->picture->tag2 = tag2;
-+        mpeg2dec->picture->flags |= PIC_FLAG_TAGS;
-+        return;
-+    }
-     mpeg2dec->tag_previous = mpeg2dec->tag_current;
-     mpeg2dec->tag2_previous = mpeg2dec->tag2_current;
-     mpeg2dec->tag_current = tag;
diff --git a/pkgs/development/libraries/libmpeg2/default.nix b/pkgs/development/libraries/libmpeg2/default.nix
index e651a932efe3..c20087008048 100644
--- a/pkgs/development/libraries/libmpeg2/default.nix
+++ b/pkgs/development/libraries/libmpeg2/default.nix
@@ -1,20 +1,18 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libmpeg2-0.5.1p4";
-  
+  version = "0.5.1";
+  name = "libmpeg2-${version}";
+
   src = fetchurl {
     url = "http://libmpeg2.sourceforge.net/files/${name}.tar.gz";
     sha256 = "1m3i322n2fwgrvbs1yck7g5md1dbg22bhq5xdqmjpz5m7j4jxqny";
   };
 
-  # From Handbrake - Project seems unmaintained
-  patches = [
-    ./A00-tags.patch
-  ];
-
   meta = {
     homepage = http://libmpeg2.sourceforge.net/;
     description = "A free library for decoding mpeg-2 and mpeg-1 video streams";
+    license = stdenv.lib.licenses.gpl2;
+    maintainer = with stdenv.lib.maintainers; [ fuuzetsu ];
   };
 }

From 09afbd1f06c54e2e5608bd142e1274e4335f581b Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Fri, 29 Aug 2014 14:06:23 +0100
Subject: [PATCH 0808/1453] mkvtoolnix: update from 6.5.0 to 7.1.0

---
 pkgs/applications/video/mkvtoolnix/default.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix
index ed64448c13a8..e0ab4582cd89 100644
--- a/pkgs/applications/video/mkvtoolnix/default.nix
+++ b/pkgs/applications/video/mkvtoolnix/default.nix
@@ -15,14 +15,18 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "mkvtoolnix-6.5.0";
+  version = "7.1.0";
+  name = "mkvtoolnix-${version}";
 
   src = fetchurl {
     url = "http://www.bunkus.org/videotools/mkvtoolnix/sources/${name}.tar.xz";
-    sha256 = "0a3h878bsjbpb2r7b528xzyqzl8r82yhrniry9bnhmw7rcl53bd8";
+    sha256 = "06xqy4f7gi1xj0yqb6y1wmxwvsxfxal2plfsbl33dkwd0srixj06";
   };
 
-  buildInputs = [ libmatroska flac libvorbis file boost xdg_utils expat wxGTK zlib ruby gettext pkgconfig curl ];
+  buildInputs = [
+    libmatroska flac libvorbis file boost xdg_utils
+    expat wxGTK zlib ruby gettext pkgconfig curl
+  ];
 
   configureFlags = "--with-boost-libdir=${boost}/lib";
   buildPhase = ''
@@ -36,5 +40,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Cross-platform tools for Matroska";
     homepage = http://www.bunkus.org/videotools/mkvtoolnix/;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
   };
 }

From ac73fbcda96d01b26c3be3eb87d718d5e9a0ef73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Wed, 27 Aug 2014 17:58:54 +0200
Subject: [PATCH 0809/1453] dogecoin: 1.4 -> 1.8

---
 pkgs/applications/misc/bitcoin/altcoins.nix | 42 ++++++++++++++++++---
 1 file changed, 36 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/bitcoin/altcoins.nix b/pkgs/applications/misc/bitcoin/altcoins.nix
index 2b99bad58da4..796cedc1ee2c 100644
--- a/pkgs/applications/misc/bitcoin/altcoins.nix
+++ b/pkgs/applications/misc/bitcoin/altcoins.nix
@@ -1,5 +1,6 @@
 { fetchurl, stdenv, pkgconfig
-, openssl, db48, boost, zlib, miniupnpc, qt4, qrencode, glib, protobuf, utillinux }:
+, openssl, db48, boost, zlib, miniupnpc, qt4, qrencode, glib, protobuf
+, utillinux, autogen, autoconf, autobuild, automake, db }:
 
 with stdenv.lib;
 
@@ -79,22 +80,51 @@ in rec {
     };
   };
 
-  dogecoin = buildAltcoin rec {
+  dogecoin = (buildAltcoin rec {
     walletName = "dogecoin";
-    version = "1.4";
+    version = "1.8.0";
 
     src = fetchurl {
-      url = "https://github.com/dogecoin/dogecoin/archive/1.4.tar.gz";
-      sha256 = "4af983f182976c98f0e32d525083979c9509b28b7d6faa0b90c5bd40b71009cc";
+      url = "https://github.com/dogecoin/dogecoin/archive/v${version}.tar.gz";
+      sha256 = "8a33958c04213cd621aa3c86910477813af22512f03b47c98995d20d31f3f935";
     };
 
+    extraBuildInputs = [ autogen autoconf automake pkgconfig db utillinux protobuf ];
+
     meta = {
       description = "Wow, such coin, much shiba, very rich";
       longDescription = "wow";
       homepage = http://www.dogecoin.com/;
       maintainers = [ maintainers.offline maintainers.edwtjo ];
     };
+  }).override rec {
+    patchPhase = ''
+      sed -i \
+        -e 's,BDB_CPPFLAGS=$,BDB_CPPFLAGS="-I${db}/include",g' \
+        -e 's,BDB_LIBS=$,BDB_LIBS="-L${db}/lib",g' \
+        -e 's,bdbdirlist=$,bdbdirlist="${db}/include",g' \
+        src/m4/dogecoin_find_bdb51.m4
+    '';
+    dogeConfigure = ''
+      ./autogen.sh \
+      && ./configure --prefix=$out \
+                     --with-incompatible-bdb \
+                     --with-boost-libdir=${boost}/lib \
+    '';
+    dogeInstall = ''
+      install -D "src/dogecoin-cli" "$out/bin/dogecoin-cli"
+      install -D "src/dogecoind" "$out/bin/dogecoind"
+    '';
+    configurePhase = dogeConfigure + "--with-gui";
+    installPhase = dogeInstall + "install -D src/qt/dogecoin-qt $out/bin/dogecoin-qt";
+  };
+
+  dogecoind = dogecoin.override rec {
+    gui = false;
+    makefile = "Makefile";
+    preBuild = "";
+    configurePhase = dogecoin.dogeConfigure + "--without-gui";
+    installPhase = dogecoin.dogeInstall;
   };
-  dogecoind = dogecoin.override { gui = false; };
 
 }

From 34b18399aaeabdb93cab478a90b8eedbdc7ce10e Mon Sep 17 00:00:00 2001
From: Daniel Bergey <bergey@alum.mit.edu>
Date: Fri, 29 Aug 2014 14:03:07 +0000
Subject: [PATCH 0810/1453] revert fsnotify back to 0.0.11

fsnotify changes need more testing on Darwin
---
 .../libraries/haskell/fsnotify/default.nix    | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/haskell/fsnotify/default.nix b/pkgs/development/libraries/haskell/fsnotify/default.nix
index 70edecb1f8d8..3d308f6a88fa 100644
--- a/pkgs/development/libraries/haskell/fsnotify/default.nix
+++ b/pkgs/development/libraries/haskell/fsnotify/default.nix
@@ -1,19 +1,19 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, hinotify, systemFileio, systemFilepath, tasty
-, tastyHunit, temporaryRc, text, time
+{ stdenv, cabal, Cabal, Glob, hspec, QuickCheck, random
+, systemFileio, systemFilepath, text, time, uniqueid
+, hinotify, hfsevents
 }:
 
 cabal.mkDerivation (self: {
   pname = "fsnotify";
-  version = "0.1.0.3";
-  sha256 = "0m6jyg45azk377jklgwyqrx95q174cxd5znpyh9azznkh09wq58z";
-  buildDepends = [
-    async hinotify systemFileio systemFilepath text time
-  ];
+  version = "0.0.11";
+  sha256 = "03m911pncyzgfdx4aj38azbbmj25fdm3s9l1w27zv0l730fy8ywq";
+  buildDepends = [ systemFileio systemFilepath text time ] ++
+    (if stdenv.isDarwin then [ hfsevents ] else [ hinotify ]);
   testDepends = [
-    async systemFileio systemFilepath tasty tastyHunit temporaryRc
-  ];
+    Cabal Glob hspec QuickCheck random systemFileio
+    systemFilepath text time uniqueid
+  ] ++ (if stdenv.isDarwin then [ hfsevents ] else [ hinotify ]);
+  doCheck = false;
   meta = {
     description = "Cross platform library for file change notification";
     license = self.stdenv.lib.licenses.bsd3;

From 05b83fe6a23e5ca0b531fb47269c419d6a549d7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=BCdiger=20Sonderfeld?= <ruediger@c-plusplus.de>
Date: Fri, 29 Aug 2014 16:40:16 +0200
Subject: [PATCH 0811/1453] octave: Update to 3.8.2.

Also change "," placement to be consistent and remove unnecessary let.
---
 pkgs/development/interpreters/octave/default.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index 1addccb4bf88..eac067da2828 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -1,18 +1,16 @@
-{stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull,
-libX11, graphicsmagick, pcre, liblapack, pkgconfig, mesa, fltk,
-fftw, fftwSinglePrec, zlib, curl, qrupdate
+{ stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull
+, libX11, graphicsmagick, pcre, liblapack, pkgconfig, mesa, fltk
+, fftw, fftwSinglePrec, zlib, curl, qrupdate
 , qt ? null, ghostscript ? null, llvm ? null, hdf5 ? null,glpk ? null
 , suitesparse ? null, gnuplot ? null, openjdk ? null, python ? null
 }:
 
-let
-  version = "3.8.1";
-in
 stdenv.mkDerivation rec {
+  version = "3.8.2";
   name = "octave-${version}";
   src = fetchurl {
     url = "mirror://gnu/octave/${name}.tar.bz2";
-    sha256 = "1gcvzbgyz98mxzy3gjkdbdiirafkl73l9ywml11j412amp92wxnn";
+    sha256 = "83bbd701aab04e7e57d0d5b8373dd54719bebb64ce0a850e69bf3d7454f33bae";
   };
 
   buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11

From 40ccaa2b4c4b60e5a3d308c4713d8d43073a7ecb Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Aug 2014 16:07:30 -0500
Subject: [PATCH 0812/1453] openblas: pin all the versions julia requires

---
 .../science/math/openblas/{default.nix => 0.2.2.nix}   |  0
 pkgs/top-level/all-packages.nix                        | 10 ++++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)
 rename pkgs/development/libraries/science/math/openblas/{default.nix => 0.2.2.nix} (100%)

diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/0.2.2.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/openblas/default.nix
rename to pkgs/development/libraries/science/math/openblas/0.2.2.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9bdf2462406e..6cea37064ccd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3128,10 +3128,12 @@ let
   juliaGit = callPackage ../development/compilers/julia/git-20131013.nix {
     liblapack = liblapack.override {shared = true;};
     llvm = llvm_33;
+    openblas = openblas_0_2_2;
   };
   julia021 = callPackage ../development/compilers/julia/0.2.1.nix {
     liblapack = liblapack.override {shared = true;};
     llvm = llvm_33;
+    openblas = openblas_0_2_2;
   };
   julia030 = let
     liblapack = liblapack_3_5_0.override {shared = true;};
@@ -3140,8 +3142,8 @@ let
     suitesparse = suitesparse.override {
       inherit liblapack;
     };
-    openblas = openblas_0_2_10;
     llvm = llvm_34;
+    openblas = openblas_0_2_10;
   };
   julia = julia021;
 
@@ -10914,10 +10916,14 @@ let
 
   liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { };
 
-  openblas = callPackage ../development/libraries/science/math/openblas { };
+  # julia is pinned to specific versions of openblas, so keep old versions
+  # until they aren't needed. The un-versioned attribute may continue to track
+  # upstream development.
+  openblas = openblas_0_2_10;
   openblas_0_2_10 = callPackage ../development/libraries/science/math/openblas/0.2.10.nix {
     liblapack = liblapack_3_5_0;
   };
+  openblas_0_2_2 = callPackage ../development/libraries/science/math/openblas/0.2.2.nix { };
 
   mathematica = callPackage ../applications/science/math/mathematica { };
 

From df731f151faafc4e68f4504d60be0968faecd6bd Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Aug 2014 16:39:01 -0500
Subject: [PATCH 0813/1453] openblas: add version 0.2.11

---
 .../science/math/openblas/default.nix         | 36 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++-
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/science/math/openblas/default.nix

diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
new file mode 100644
index 000000000000..a1811a4209c9
--- /dev/null
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, gfortran, perl, liblapack, config }:
+
+let local = config.openblas.preferLocalBuild or false;
+    localTarget = config.openblas.target or "";
+in
+stdenv.mkDerivation rec {
+  version = "0.2.11";
+
+  name = "openblas-${version}";
+  src = fetchurl {
+    url = "https://github.com/xianyi/OpenBLAS/tarball/v${version}";
+    sha256 = "1va4yhzgj2chcj6kaxgfbzirajp1zgvkic61959aka2xq2c5igms";
+    name = "openblas-${version}.tar.gz";
+  };
+
+  preBuild = "cp ${liblapack.src} lapack-${liblapack.meta.version}.tgz";
+
+  buildInputs = [gfortran perl];
+
+  cpu = builtins.head (stdenv.lib.splitString "-" stdenv.system);
+
+  target = if local then localTarget else
+    if cpu == "i686" then "P2" else
+    if cpu == "x86_64" then "CORE2" else
+     # allow autodetect
+      "";
+
+  makeFlags = "${if target != "" then "TARGET=" else ""}${target} FC=gfortran CC=cc PREFIX=\"\$(out)\" INTERFACE64=1";
+
+  meta = {
+    description = "Basic Linear Algebra Subprograms";
+    license = stdenv.lib.licenses.bsd3;
+    homepage = "https://github.com/xianyi/OpenBLAS";
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6cea37064ccd..1942be80a7cd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10919,7 +10919,9 @@ let
   # julia is pinned to specific versions of openblas, so keep old versions
   # until they aren't needed. The un-versioned attribute may continue to track
   # upstream development.
-  openblas = openblas_0_2_10;
+  openblas = callPackage ../development/libraries/science/math/openblas {
+    liblapack = liblapack_3_5_0;
+  };
   openblas_0_2_10 = callPackage ../development/libraries/science/math/openblas/0.2.10.nix {
     liblapack = liblapack_3_5_0;
   };

From 9ade2dfa3cefe89776d48cea684c8ea0d3bc8e13 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Aug 2014 18:34:41 -0500
Subject: [PATCH 0814/1453] openblas: add local build preference to pinned
 versions

---
 .../libraries/science/math/openblas/0.2.10.nix            | 8 ++++++--
 .../development/libraries/science/math/openblas/0.2.2.nix | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/science/math/openblas/0.2.10.nix b/pkgs/development/libraries/science/math/openblas/0.2.10.nix
index a8db06319111..c8df06ef3787 100644
--- a/pkgs/development/libraries/science/math/openblas/0.2.10.nix
+++ b/pkgs/development/libraries/science/math/openblas/0.2.10.nix
@@ -1,5 +1,8 @@
-{ stdenv, fetchurl, gfortran, perl, liblapack }:
+{ stdenv, fetchurl, gfortran, perl, liblapack, config }:
 
+let local = config.openblas.preferLocalBuild or false;
+    localTarget = config.openblas.target or "";
+in
 stdenv.mkDerivation rec {
   version = "0.2.10";
 
@@ -16,7 +19,8 @@ stdenv.mkDerivation rec {
 
   cpu = builtins.head (stdenv.lib.splitString "-" stdenv.system);
 
-  target = if cpu == "i686" then "P2" else 
+  target = if local then localTarget else
+    if cpu == "i686" then "P2" else
     if cpu == "x86_64" then "CORE2" else
      # allow autodetect
       "";
diff --git a/pkgs/development/libraries/science/math/openblas/0.2.2.nix b/pkgs/development/libraries/science/math/openblas/0.2.2.nix
index c535b1a39dbb..22dbc491f878 100644
--- a/pkgs/development/libraries/science/math/openblas/0.2.2.nix
+++ b/pkgs/development/libraries/science/math/openblas/0.2.2.nix
@@ -1,5 +1,8 @@
-{ stdenv, fetchurl, gfortran, perl, liblapack }:
+{ stdenv, fetchurl, gfortran, perl, liblapack, config }:
 
+let local = config.openblas.preferLocalBuild or false;
+    localTarget = config.openblas.target or "";
+in
 stdenv.mkDerivation rec {
   version = "0.2.2";
 
@@ -16,7 +19,8 @@ stdenv.mkDerivation rec {
 
   cpu = builtins.head (stdenv.lib.splitString "-" stdenv.system);
 
-  target = if cpu == "i686" then "P2" else 
+  target = if local then localTarget else
+    if cpu == "i686" then "P2" else
     if cpu == "x86_64" then "CORE2" else
      # allow autodetect
       "";

From 634b9ae6d4fc0707d5c58f039ab34c70b77cfef0 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 29 Aug 2014 10:02:39 -0500
Subject: [PATCH 0815/1453] openblas: add ttuegel as maintainer

---
 pkgs/development/libraries/science/math/openblas/0.2.10.nix  | 5 +++--
 pkgs/development/libraries/science/math/openblas/0.2.2.nix   | 5 +++--
 pkgs/development/libraries/science/math/openblas/default.nix | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/science/math/openblas/0.2.10.nix b/pkgs/development/libraries/science/math/openblas/0.2.10.nix
index c8df06ef3787..ec4422ce8951 100644
--- a/pkgs/development/libraries/science/math/openblas/0.2.10.nix
+++ b/pkgs/development/libraries/science/math/openblas/0.2.10.nix
@@ -27,10 +27,11 @@ stdenv.mkDerivation rec {
 
   makeFlags = "${if target != "" then "TARGET=" else ""}${target} FC=gfortran CC=cc PREFIX=\"\$(out)\" INTERFACE64=1";
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Basic Linear Algebra Subprograms";
-    license = stdenv.lib.licenses.bsd3;
+    license = licenses.bsd3;
     homepage = "https://github.com/xianyi/OpenBLAS";
     platforms = [ "x86_64-linux" ];
+    maintainers = with maintainers; [ ttuegel ];
   };
 }
diff --git a/pkgs/development/libraries/science/math/openblas/0.2.2.nix b/pkgs/development/libraries/science/math/openblas/0.2.2.nix
index 22dbc491f878..c476dac955ad 100644
--- a/pkgs/development/libraries/science/math/openblas/0.2.2.nix
+++ b/pkgs/development/libraries/science/math/openblas/0.2.2.nix
@@ -27,10 +27,11 @@ stdenv.mkDerivation rec {
 
   makeFlags = "${if target != "" then "TARGET=" else ""}${target} FC=gfortran CC=cc PREFIX=\"\$(out)\"";
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Basic Linear Algebra Subprograms";
-    license = stdenv.lib.licenses.bsd3;
+    license = licenses.bsd3;
     homepage = "https://github.com/xianyi/OpenBLAS";
     platforms = [ "x86_64-linux" ];
+    maintainers = with maintainers; [ ttuegel ];
   };
 }
diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index a1811a4209c9..6ca1f4ccadae 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -27,10 +27,11 @@ stdenv.mkDerivation rec {
 
   makeFlags = "${if target != "" then "TARGET=" else ""}${target} FC=gfortran CC=cc PREFIX=\"\$(out)\" INTERFACE64=1";
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Basic Linear Algebra Subprograms";
-    license = stdenv.lib.licenses.bsd3;
+    license = licenses.bsd3;
     homepage = "https://github.com/xianyi/OpenBLAS";
     platforms = [ "x86_64-linux" ];
+    maintainers = with maintainers; [ ttuegel ];
   };
 }

From 30ac32ae45a80cbe2b42ca9feb44eaa6d677da80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=BCdiger=20Sonderfeld?= <ruediger@c-plusplus.de>
Date: Fri, 29 Aug 2014 17:19:15 +0200
Subject: [PATCH 0816/1453] libgcrypt: Update 1.5.3 and 1.6.2.

Also changed the description of 1.6.nix to match that of
default.nix (1.5).

* https://lists.gnu.org/archive/html/info-gnu/2014-08/msg00001.html
* https://lists.gnu.org/archive/html/info-gnu/2014-08/msg00011.html
---
 pkgs/development/libraries/libgcrypt/1.6.nix     | 6 +++---
 pkgs/development/libraries/libgcrypt/default.nix | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/libgcrypt/1.6.nix b/pkgs/development/libraries/libgcrypt/1.6.nix
index ced3b723b132..e468c3163d3c 100644
--- a/pkgs/development/libraries/libgcrypt/1.6.nix
+++ b/pkgs/development/libraries/libgcrypt/1.6.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, libgpgerror, transfig, ghostscript, texinfo }:
 
 stdenv.mkDerivation rec {
-  name = "libgcrypt-1.6.1";
+  name = "libgcrypt-1.6.2";
 
   src = fetchurl {
     url = "mirror://gnupg/libgcrypt/${name}.tar.bz2";
-    sha256 = "0w10vhpj1r5nq7qm6jp21p1v1vhf37701cw8yilygzzqd7mfzhx1";
+    sha256 = "de084492a6b38cdb27b67eaf749ceba76bf7029f63a9c0c3c1b05c88c9885c4c";
   };
 
   nativeBuildInputs = [ transfig ghostscript texinfo ];
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = {
-    description = "GNU Libgcrypt, a general-pupose cryptographic library";
+    description = "General-pupose cryptographic library";
 
     longDescription = ''
       GNU Libgcrypt is a general purpose cryptographic library based on
diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix
index f47d3a627295..ed267e23c87b 100644
--- a/pkgs/development/libraries/libgcrypt/default.nix
+++ b/pkgs/development/libraries/libgcrypt/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, libgpgerror }:
 
 stdenv.mkDerivation (rec {
-  name = "libgcrypt-1.5.3";
+  name = "libgcrypt-1.5.4";
 
   src = fetchurl {
     url = "mirror://gnupg/libgcrypt/${name}.tar.bz2";
-    sha256 = "1lar8y3lh61zl5flljpz540d78g99h4d5idfwrfw8lm3gm737xdw";
+    sha256 = "d5f88d9f41a46953dc250cdb8575129b37ee2208401b7fa338c897f667c7fb33";
   };
 
   propagatedBuildInputs = [ libgpgerror ];

From cbb296475a86c664f823de31f287841f646682ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=BCdiger=20Sonderfeld?= <ruediger@c-plusplus.de>
Date: Fri, 29 Aug 2014 17:28:20 +0200
Subject: [PATCH 0817/1453] libidn: Update to 1.29.

Also add repositories.git property.

https://lists.gnu.org/archive/html/info-gnu/2014-08/msg00006.html
---
 pkgs/development/libraries/libidn/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix
index 37d19d10f290..5aea194e39d9 100644
--- a/pkgs/development/libraries/libidn/default.nix
+++ b/pkgs/development/libraries/libidn/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "libidn-1.28";
+  name = "libidn-1.29";
 
   src = fetchurl {
     url = "mirror://gnu/libidn/${name}.tar.gz";
-    sha256 = "1yxbfdiwr3l91m79sksn6v5mgpl4lfj8i82zgryckas9hjb7ldfx";
+    sha256 = "fb82747dbbf9b36f703ed27293317d818d7e851d4f5773dedf3efa4db32a7c7c";
   };
 
   doCheck = ! stdenv.isDarwin;
@@ -30,6 +30,7 @@ stdenv.mkDerivation rec {
       included.
     '';
 
+    repositories.git = git://git.savannah.gnu.org/libidn.git;
     license = stdenv.lib.licenses.lgpl2Plus;
     platforms = stdenv.lib.platforms.all;
     maintainers = [ ];

From ec9d2e6f2b16601e167574f366544fdb7dcea864 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Fri, 29 Aug 2014 17:45:05 +0200
Subject: [PATCH 0818/1453] mongodb: darwin support

---
 pkgs/servers/nosql/mongodb/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix
index f51a2b8fe3f8..4935b7388608 100644
--- a/pkgs/servers/nosql/mongodb/default.nix
+++ b/pkgs/servers/nosql/mongodb/default.nix
@@ -2,14 +2,13 @@
 
 let version = "2.6.4";
     system-libraries = [
-      "tcmalloc"
       "pcre"
       "boost"
       "snappy"
       # "v8"      -- mongo still bundles 3.12 and does not work with 3.15+
       # "stemmer" -- not nice to package yet (no versioning, no makefile, no shared libs)
       # "yaml"    -- it seems nixpkgs' yamlcpp (0.5.1) is problematic for mongo
-    ];
+    ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ "tcmalloc" ];
     system-lib-args = stdenv.lib.concatStringsSep " "
                           (map (lib: "--use-system-${lib}") system-libraries);
 
@@ -43,6 +42,6 @@ in stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.agpl3;
 
     maintainers = [ stdenv.lib.maintainers.bluescreen303 ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }

From 5a9cf400856f379d448c09d9abf5a64512cb0793 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Fri, 29 Aug 2014 17:56:07 +0200
Subject: [PATCH 0819/1453] mongodb: add offline as maintainer

---
 pkgs/servers/nosql/mongodb/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix
index 4935b7388608..40c255d59214 100644
--- a/pkgs/servers/nosql/mongodb/default.nix
+++ b/pkgs/servers/nosql/mongodb/default.nix
@@ -1,5 +1,7 @@
 { stdenv, fetchurl, scons, boost, gperftools, pcre, snappy }:
 
+with stdenv.lib;
+
 let version = "2.6.4";
     system-libraries = [
       "pcre"
@@ -8,9 +10,9 @@ let version = "2.6.4";
       # "v8"      -- mongo still bundles 3.12 and does not work with 3.15+
       # "stemmer" -- not nice to package yet (no versioning, no makefile, no shared libs)
       # "yaml"    -- it seems nixpkgs' yamlcpp (0.5.1) is problematic for mongo
-    ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ "tcmalloc" ];
-    system-lib-args = stdenv.lib.concatStringsSep " "
-                          (map (lib: "--use-system-${lib}") system-libraries);
+    ] ++ optionals (!stdenv.isDarwin) [ "tcmalloc" ];
+    system-lib-args = concatStringsSep " "
+                        (map (lib: "--use-system-${lib}") system-libraries);
 
 in stdenv.mkDerivation rec {
   name = "mongodb-${version}";
@@ -39,9 +41,9 @@ in stdenv.mkDerivation rec {
   meta = {
     description = "a scalable, high-performance, open source NoSQL database";
     homepage = http://www.mongodb.org;
-    license = stdenv.lib.licenses.agpl3;
+    license = licenses.agpl3;
 
-    maintainers = [ stdenv.lib.maintainers.bluescreen303 ];
-    platforms = stdenv.lib.platforms.unix;
+    maintainers = with maintainers; [ bluescreen303 offline ];
+    platforms = platforms.unix;
   };
 }

From 43e52ef0017790d303db0758edb52c46ab6f545a Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Fri, 29 Aug 2014 18:28:34 +0200
Subject: [PATCH 0820/1453] Remove useless use of undocumented submodules.

---
 nixos/modules/services/networking/nsd.nix | 265 ++++++++++------------
 1 file changed, 120 insertions(+), 145 deletions(-)

diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix
index db8cb1228719..cacd52f130fb 100644
--- a/nixos/modules/services/networking/nsd.nix
+++ b/nixos/modules/services/networking/nsd.nix
@@ -456,156 +456,131 @@ in
       };
 
 
-      ratelimit = mkOption {
-        type = types.submodule (
-          { options, ... }:
-          { options = {
-
-              enable = mkOption {
-                type        = types.bool;
-                default     = false;
-                description = ''
-                  Enable ratelimit capabilities.
-                '';
-              };
-
-              size = mkOption {
-                type        = types.int;
-                default     = 1000000;
-                description = ''
-                  Size of the hashtable. More buckets use more memory but lower
-                  the chance of hash hash collisions.
-                '';
-              };
-
-              ratelimit = mkOption {
-                type        = types.int;
-                default     = 200;
-                description = ''
-                  Max qps allowed from any query source.
-                  0 means unlimited. With an verbosity of 2 blocked and
-                  unblocked subnets will be logged.
-                '';
-              };
-
-              whitelistRatelimit = mkOption {
-                type        = types.int;
-                default     = 2000;
-                description = ''
-                  Max qps allowed from whitelisted sources.
-                  0 means unlimited. Set the rrl-whitelist option for specific
-                  queries to apply this limit instead of the default to them.
-                '';
-              };
-
-              slip = mkOption {
-                type        = types.nullOr types.int;
-                default     = null;
-                description = ''
-                  Number of packets that get discarded before replying a SLIP response.
-                  0 disables SLIP responses. 1 will make every response a SLIP response.
-                '';
-              };
-
-              ipv4PrefixLength = mkOption {
-                type        = types.nullOr types.int;
-                default     = null;
-                description = ''
-                  IPv4 prefix length. Addresses are grouped by netblock.
-                '';
-              };
-
-              ipv6PrefixLength = mkOption {
-                type        = types.nullOr types.int;
-                default     = null;
-                description = ''
-                  IPv6 prefix length. Addresses are grouped by netblock.
-                '';
-              };
-
-            };
-          });
-        default = {
+      ratelimit = {
+        enable = mkOption {
+          type        = types.bool;
+          default     = false;
+          description = ''
+            Enable ratelimit capabilities.
+          '';
+        };
+
+        size = mkOption {
+          type        = types.int;
+          default     = 1000000;
+          description = ''
+            Size of the hashtable. More buckets use more memory but lower
+            the chance of hash hash collisions.
+          '';
+        };
+
+        ratelimit = mkOption {
+          type        = types.int;
+          default     = 200;
+          description = ''
+            Max qps allowed from any query source.
+            0 means unlimited. With an verbosity of 2 blocked and
+            unblocked subnets will be logged.
+          '';
+        };
+
+        whitelistRatelimit = mkOption {
+          type        = types.int;
+          default     = 2000;
+          description = ''
+            Max qps allowed from whitelisted sources.
+            0 means unlimited. Set the rrl-whitelist option for specific
+            queries to apply this limit instead of the default to them.
+          '';
+        };
+
+        slip = mkOption {
+          type        = types.nullOr types.int;
+          default     = null;
+          description = ''
+            Number of packets that get discarded before replying a SLIP response.
+            0 disables SLIP responses. 1 will make every response a SLIP response.
+          '';
+        };
+
+        ipv4PrefixLength = mkOption {
+          type        = types.nullOr types.int;
+          default     = null;
+          description = ''
+            IPv4 prefix length. Addresses are grouped by netblock.
+          '';
+        };
+
+        ipv6PrefixLength = mkOption {
+          type        = types.nullOr types.int;
+          default     = null;
+          description = ''
+            IPv6 prefix length. Addresses are grouped by netblock.
+          '';
         };
-        example = {};
-        description = ''
-        '';
       };
 
 
-      remoteControl = mkOption {
-        type = types.submodule (
-          { config, options, ... }:
-          { options = {
-
-              enable = mkOption {
-                type        = types.bool;
-                default     = false;
-                description = ''
-                  Wheter to enable remote control via nsd-control(8).
-                '';
-              };
-
-              interfaces = mkOption {
-                type        = types.listOf types.str;
-                default     = [ "127.0.0.1" "::1" ];
-                description = ''
-                  Which interfaces NSD should bind to for remote control.
-                '';
-              };
-
-              port = mkOption {
-                type        = types.int;
-                default     = 8952;
-                description = ''
-                  Port number for remote control operations (uses TLS over TCP).
-                '';
-              };
-
-              serverKeyFile = mkOption {
-                type        = types.path;
-                default     = "/etc/nsd/nsd_server.key";
-                description = ''
-                  Path to the server private key, which is used by the server
-                  but not by nsd-control. This file is generated by nsd-control-setup.
-                '';
-              };
-
-              serverCertFile = mkOption {
-                type        = types.path;
-                default     = "/etc/nsd/nsd_server.pem";
-                description = ''
-                  Path to the server self signed certificate, which is used by the server
-                  but and by nsd-control. This file is generated by nsd-control-setup.
-                '';
-              };
-
-              controlKeyFile = mkOption {
-                type        = types.path;
-                default     = "/etc/nsd/nsd_control.key";
-                description = ''
-                  Path to the client private key, which is used by nsd-control
-                  but not by the server. This file is generated by nsd-control-setup.
-                '';
-              };
-
-              controlCertFile = mkOption {
-                type        = types.path;
-                default     = "/etc/nsd/nsd_control.pem";
-                description = ''
-                  Path to the client certificate signed with the server certificate.
-                  This file is used by nsd-control and generated by nsd-control-setup.
-                '';
-              };
-
-            };
-
-          });
-        default = {
+      remoteControl = {
+        enable = mkOption {
+          type        = types.bool;
+          default     = false;
+          description = ''
+            Wheter to enable remote control via nsd-control(8).
+          '';
+        };
+
+        interfaces = mkOption {
+          type        = types.listOf types.str;
+          default     = [ "127.0.0.1" "::1" ];
+          description = ''
+            Which interfaces NSD should bind to for remote control.
+          '';
+        };
+
+        port = mkOption {
+          type        = types.int;
+          default     = 8952;
+          description = ''
+            Port number for remote control operations (uses TLS over TCP).
+          '';
+        };
+
+        serverKeyFile = mkOption {
+          type        = types.path;
+          default     = "/etc/nsd/nsd_server.key";
+          description = ''
+            Path to the server private key, which is used by the server
+            but not by nsd-control. This file is generated by nsd-control-setup.
+          '';
+        };
+
+        serverCertFile = mkOption {
+          type        = types.path;
+          default     = "/etc/nsd/nsd_server.pem";
+          description = ''
+            Path to the server self signed certificate, which is used by the server
+            but and by nsd-control. This file is generated by nsd-control-setup.
+          '';
+        };
+
+        controlKeyFile = mkOption {
+          type        = types.path;
+          default     = "/etc/nsd/nsd_control.key";
+          description = ''
+            Path to the client private key, which is used by nsd-control
+            but not by the server. This file is generated by nsd-control-setup.
+          '';
+        };
+
+        controlCertFile = mkOption {
+          type        = types.path;
+          default     = "/etc/nsd/nsd_control.pem";
+          description = ''
+            Path to the client certificate signed with the server certificate.
+            This file is used by nsd-control and generated by nsd-control-setup.
+          '';
         };
-        example = {};
-        description = ''
-        '';
       };
 
 

From beff84c6e315fdffa96c0bbfb43b66ea9fd2c0e7 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Fri, 29 Aug 2014 17:30:04 +0100
Subject: [PATCH 0821/1453] python-packages.nix: strip trailing whitespace

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 533f59b78d81..2d44ee871c8c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -159,7 +159,7 @@ rec {
   pygtk = import ../development/python-modules/pygtk {
     inherit (pkgs) fetchurl stdenv pkgconfig gtk;
     inherit python buildPythonPackage pygobject pycairo isPy3k;
-  }; 
+  };
 
   # XXX: how can we get an override here?
   #pyGtkGlade = pygtk.override {
@@ -572,7 +572,7 @@ rec {
     name = "avro-1.7.6";
 
     disabled = isPy3k;
-    
+
     src = fetchurl {
       url = "https://pypi.python.org/packages/source/a/avro/${name}.tar.gz";
       md5 = "7f4893205e5ad69ac86f6b44efb7df72";
@@ -586,9 +586,9 @@ rec {
 
   avro3k = pkgs.lowPrio (buildPythonPackage (rec {
     name = "avro3k-1.7.7-SNAPSHOT";
-    
+
     disabled = (!isPy3k);
-    
+
     src = fetchurl {
       url = "https://pypi.python.org/packages/source/a/avro3k/${name}.tar.gz";
       sha256 = "15ahl0irwwj558s964abdxg4vp6iwlabri7klsm2am6q5r0ngsky";
@@ -674,7 +674,7 @@ rec {
 
   beaker = buildPythonPackage rec {
     name = "Beaker-1.6.4";
-    
+
     disabled = isPy3k;
 
     src = fetchurl {
@@ -755,9 +755,9 @@ rec {
         modules.sqlite3
         modules.readline
       ];
-      
+
     buildInputs = with pythonPackages; [ mock pyechonest six responses nose ];
-    
+
     # 10 tests are failing
     doCheck = false;
 
@@ -768,12 +768,12 @@ rec {
       maintainers = [ stdenv.lib.maintainers.iElectric ];
     };
   };
-  
+
   responses = pythonPackages.buildPythonPackage rec {
     name = "responses-0.2.2";
 
     propagatedBuildInputs = with pythonPackages; [ requests mock six pytest flake8 ];
-    
+
     doCheck = false;
 
     src = fetchurl {
@@ -782,7 +782,7 @@ rec {
     };
 
   };
- 
+
   rarfile = pythonPackages.buildPythonPackage rec {
     name = "rarfile-2.6";
 
@@ -798,7 +798,7 @@ rec {
       homepage = https://github.com/markokr/rarfile;
     };
   };
-  
+
   pyechonest = pythonPackages.buildPythonPackage rec {
     name = "pyechonest-8.0.2";
 
@@ -1017,10 +1017,10 @@ rec {
       maintainers = [ stdenv.lib.maintainers.garbas ];
     };
   };
-  
+
   zc_buildout171 = buildPythonPackage rec {
     name = "zc.buildout-1.7.1";
-    
+
     disabled = isPy3k;
 
     src = fetchurl {
@@ -1035,10 +1035,10 @@ rec {
       maintainers = [ stdenv.lib.maintainers.garbas ];
     };
   };
-  
+
   zc_buildout152 = buildPythonPackage rec {
     name = "zc.buildout-1.5.2";
-    
+
     disabled = isPy3k;
 
     src = fetchurl {
@@ -1746,7 +1746,7 @@ rec {
       platforms = stdenv.lib.platforms.all;
     };
   };
-  
+
   deform2 = buildPythonPackage rec {
     name = "deform-2.0a2";
 
@@ -2015,7 +2015,7 @@ rec {
 
   facebook-sdk = buildPythonPackage rec {
     name = "facebook-sdk-0.4.0";
-    
+
     disabled = isPy3k;
 
     src = fetchurl {
@@ -2192,14 +2192,14 @@ rec {
   gtimelog = buildPythonPackage rec {
     name = "gtimelog-${version}";
     version = "0.9.1";
-    
+
     disabled = isPy26;
 
     src = fetchurl {
       url = "https://github.com/gtimelog/gtimelog/archive/${version}.tar.gz";
       sha256 = "0qk8fv8cszzqpdi3wl9vvkym1jil502ycn6sic4jrxckw5s9jsfj";
     };
-    
+
     preBuild = ''
       export LOCALE_ARCHIVE=${pkgs.glibcLocales}/lib/locale/locale-archive
       export LC_ALL="en_US.UTF-8"
@@ -2212,12 +2212,12 @@ rec {
       substituteInPlace runtests --replace "/usr/bin/env python" "${python}/bin/${python.executable}"
       ./runtests
     '';
-    
+
     preFixup = ''
         wrapProgram $out/bin/gtimelog \
           --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
           --prefix LD_LIBRARY_PATH ":" "${pkgs.gtk3}/lib" \
-     
+
     '';
 
     meta = with stdenv.lib; {
@@ -2369,7 +2369,7 @@ rec {
       url = "http://pypi.python.org/packages/source/p/pyramid/${name}.tar.gz";
       md5 = "8a1ab3b773d8e22437828f7df22852c1";
     };
-    
+
     preCheck = ''
       # test is failing, see https://github.com/Pylons/pyramid/issues/1405
       rm pyramid/tests/test_response.py
@@ -2651,7 +2651,7 @@ rec {
       url = "http://pypi.python.org/packages/source/p/pyramid_zodbconn/${name}.tar.gz";
       md5 = "3c7746a227fbcda3e138ab8bfab7700b";
     };
-    
+
     # should be fixed in next release
     doCheck = false;
 
@@ -2732,7 +2732,7 @@ rec {
       maintainers = [ stdenv.lib.maintainers.iElectric ];
     };
   };
-  
+
   ZEO = pythonPackages.buildPythonPackage rec {
     name = "ZEO-4.0.0";
 
@@ -2747,7 +2747,7 @@ rec {
       homepage = https://pypi.python.org/pypi/ZEO;
     };
   };
-  
+
   random2 = pythonPackages.buildPythonPackage rec {
     name = "random2-1.0.1";
 
@@ -3272,7 +3272,7 @@ rec {
       url = "http://pypi.python.org/packages/source/e/enum/${name}.tar.gz";
       md5 = "ce75c7c3c86741175a84456cc5bd531e";
     };
-    
+
     doCheck = !isPyPy;
 
     buildInputs = [ ];
@@ -3452,7 +3452,7 @@ rec {
     };
 
     buildInputs = [ nose mock ];
-    
+
     patchPhase = ''
       substituteInPlace jsonschema/tests/test_jsonschema_test_suite.py --replace "python" "${python}/bin/${python.executable}"
     '';
@@ -3614,7 +3614,7 @@ rec {
   gevent = buildPythonPackage rec {
     name = "gevent-1.0.1";
     disabled = isPy3k;
-    
+
     src = fetchurl {
       url = "https://pypi.python.org/packages/source/g/gevent/${name}.tar.gz";
       sha256 = "0hyzfb0gcx9pm5c2igan8y57hqy2wixrwvdjwsaivxsqs0ay49s6";
@@ -4038,7 +4038,7 @@ rec {
       url = "http://pypi.python.org/packages/source/i/iptools/iptools-${version}.tar.gz";
       md5 = "aed4045638fd40c16f8d9bb04606f700";
     };
-    
+
     buildInputs = [ nose ];
 
     meta = {
@@ -4345,7 +4345,7 @@ rec {
     patchPhase = ''
       substituteInPlace magic.py --replace "ctypes.CDLL(dll)" "ctypes.CDLL('${pkgs.file}/lib/libmagic.so')"
     '';
-    
+
     doCheck = false;
 
     # TODO: tests are failing
@@ -4718,7 +4718,7 @@ rec {
     name = "python-mpd-0.3.0";
 
     disabled = isPy3k;
-    
+
     src = fetchurl {
       url = "https://pypi.python.org/packages/source/p/python-mpd/python-mpd-0.3.0.tar.gz";
       md5 = "5b3849b131e2fb12f251434597d65635";
@@ -4783,7 +4783,7 @@ rec {
       url = "http://pypi.python.org/packages/source/m/musicbrainzngs/${name}.tar.gz";
       md5 = "9e17a181af72d04a291c9a960bc73d44";
     };
-    
+
     preCheck = ''
       export LOCALE_ARCHIVE=${pkgs.glibcLocales}/lib/locale/locale-archive
       export LC_ALL="en_US.UTF-8"
@@ -4805,7 +4805,7 @@ rec {
       url = "http://pypi.python.org/packages/source/m/mutagen/${name}.tar.gz";
       sha256 = "12f70aaf5ggdzll76bhhkn64b27xy9s1acx417dbsaqnnbis8s76";
     };
-    
+
     # one unicode test fails
     doCheck = false;
 
@@ -4839,7 +4839,7 @@ rec {
 
   MySQL_python = buildPythonPackage {
     name = "MySQL-python-1.2.3";
-    
+
     disabled = isPy3k;
 
     # plenty of failing tests
@@ -5466,7 +5466,7 @@ rec {
 
     # tests failures since 1.14.0 release..
     doCheck = false;
-    
+
     checkPhase = "${python}/bin/${python.executable} test.py";
 
     meta = {
@@ -5656,37 +5656,37 @@ rec {
 
     propagatedBuildInputs = [ unittest2 ];
   };
-  
+
   pil = buildPythonPackage rec {
     name = "PIL-${version}";
     version = "1.1.7";
-    
+
     src = fetchurl {
       url = "http://effbot.org/downloads/Imaging-${version}.tar.gz";
       sha256 = "04aj80jhfbmxqzvmq40zfi4z3cw6vi01m3wkk6diz3lc971cfnw9";
     };
-  
+
     buildInputs = [ python pkgs.libjpeg pkgs.zlib pkgs.freetype ];
-  
+
     disabled = isPy3k;
-  
+
     doCheck = true;
-  
+
     preConfigure = ''
       sed -i "setup.py" \
           -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = libinclude("${pkgs.freetype}")|g ;
               s|^JPEG_ROOT =.*$|JPEG_ROOT = libinclude("${pkgs.libjpeg}")|g ;
               s|^ZLIB_ROOT =.*$|ZLIB_ROOT = libinclude("${pkgs.zlib}")|g ;'
     '';
-  
+
     checkPhase   = "${python}/bin/${python.executable} selftest.py";
     buildPhase   = "${python}/bin/${python.executable} setup.py build_ext -i";
-  
+
     postInstall = ''
       cd "$out"/lib/python*/site-packages
       ln -s $PWD PIL
     '';
-  
+
     meta = {
       homepage = http://www.pythonware.com/products/pil/;
       description = "The Python Imaging Library (PIL)";
@@ -5821,7 +5821,7 @@ rec {
       url = "http://pypi.python.org/packages/source/P/PrettyTable/${name}.tar.bz2";
       sha1 = "ad346a18d92c1d95f2295397c7a8a4f489e48851";
     };
-    
+
     preCheck = ''
       export LANG="en_US.UTF-8"
       export LOCALE_ARCHIVE=${pkgs.glibcLocales}/lib/locale/locale-archive
@@ -5839,7 +5839,7 @@ rec {
 
     propagatedBuildInputs = [ pkgs.protobuf google_apputils  ];
     sourceRoot = "${name}/python";
-    
+
 
     meta = {
       description = "Protocol Buffers are Google's data interchange format.";
@@ -6176,7 +6176,7 @@ rec {
     };
 
     buildInputs = [ unittest2 ];
-    
+
     doCheck = !isPyPy;
 
     meta = {
@@ -7082,7 +7082,7 @@ rec {
     propagatedBuildInputs =
       [ django_1_3 recaptcha_client pytz memcached dateutil_1_5 paramiko flup pygments
         djblets django_evolution pycrypto modules.sqlite3
-        pysvn pil psycopg2 
+        pysvn pil psycopg2
       ];
   };
 
@@ -7097,7 +7097,7 @@ rec {
 
     # error: invalid command 'test'
     doCheck = false;
-    
+
     propagatedBuildInputs = [ isodate ];
 
     meta = {
@@ -7105,7 +7105,7 @@ rec {
       homepage = http://www.rdflib.net/;
     };
   });
-  
+
   isodate = buildPythonPackage rec {
     name = "isodate-0.5.0";
 
@@ -7224,7 +7224,7 @@ rec {
   rope = buildPythonPackage rec {
     version = "0.9.4";
     name = "rope-${version}";
-    
+
     disabled = isPy3k;
 
     src = fetchurl {
@@ -7637,7 +7637,7 @@ rec {
       url    = "https://github.com/sympy/sympy/releases/download/${name}/${name}.tar.gz";
       sha256 = "0h1b9mx0snyyybj1x1ga69qssgjzkkgx2rw6nddjhyz1fknf8ywh";
     };
-    
+
     preCheck = ''
       export LANG="en_US.UTF-8"
       export LOCALE_ARCHIVE=${pkgs.glibcLocales}/lib/locale/locale-archive
@@ -7749,7 +7749,7 @@ rec {
 
   semantic = buildPythonPackage rec {
     name = "semantic-1.0.3";
-    
+
     disabled = isPy3k;
 
     propagatedBuildInputs = [ quantities numpy ];
@@ -7889,7 +7889,7 @@ rec {
 
   supervisor = buildPythonPackage rec {
     name = "supervisor-3.1.1";
-    
+
     disabled = isPy3k;
 
     src = fetchurl {
@@ -8149,7 +8149,7 @@ rec {
   sure = buildPythonPackage rec {
     name = "sure-${version}";
     version = "1.2.7";
-    
+
     preBuild = ''
       export LOCALE_ARCHIVE=${pkgs.glibcLocales}/lib/locale/locale-archive
       export LC_ALL="en_US.UTF-8"
@@ -8161,8 +8161,8 @@ rec {
       rev = "86ab9faa97aa9c1720c7d090deac2be385ed3d7a";
       sha256 = "02vffcdgr6vbj80lhl925w7zqy6cqnfvs088i0rbkjs5lxc511b3";
     };
-    
-    
+
+
 
     buildInputs = [ nose ];
 
@@ -8269,9 +8269,9 @@ rec {
       url = "http://pypi.python.org/packages/source/T/Tempita/Tempita-${version}.tar.gz";
       md5 = "4c2f17bb9d481821c41b6fbee904cea1";
     };
-    
+
     disabled = isPy3k;
-    
+
     buildInputs = [ nose ];
 
     meta = {
@@ -8363,11 +8363,11 @@ rec {
 
   tox = buildPythonPackage rec {
     name = "tox-1.7.2";
-  
+
     propagatedBuildInputs = [ py virtualenv ];
 
     doCheck = false;
-  
+
     src = fetchurl {
       url = "https://pypi.python.org/packages/source/t/tox/${name}.tar.gz";
       md5 = "0d9b3acb1a9252659d753b0ae6b9b264";
@@ -8511,7 +8511,7 @@ rec {
     # NOTE: When updating please check if new versions still cause issues
     # to packages like carbon (http://stackoverflow.com/questions/19894708/cant-start-carbon-12-04-python-error-importerror-cannot-import-name-daem)
     disabled = isPy3k;
- 
+
     name = "Twisted-11.1.0";
     src = fetchurl {
       url = "https://pypi.python.org/packages/source/T/Twisted/${name}.tar.bz2";
@@ -8847,7 +8847,7 @@ rec {
       url = "http://pypi.python.org/packages/source/W/WebTest/WebTest-${version}.zip";
       md5 = "49314bdba23f4d0bd807facb2a6d3f90";
     };
-    
+
     preConfigure = ''
       substituteInPlace setup.py --replace "nose<1.3.0" "nose"
     '';
@@ -9061,7 +9061,7 @@ rec {
     };
 
     propagatedBuildInputs  = [ zconfig ];
-    
+
     # too many deps..
     doCheck = false;
 
@@ -9121,7 +9121,7 @@ rec {
       maintainers = [ stdenv.lib.maintainers.goibhniu ];
     };
   };
-  
+
   zodb = buildPythonPackage rec {
     name = "zodb-${version}";
     version = "4.0.1";
@@ -9138,7 +9138,7 @@ rec {
       # test failure on py3.4
       rm src/ZODB/tests/testDB.py
     '' else "";
-    
+
     meta = {
       description = "An object-oriented database for Python";
       homepage = http://pypi.python.org/pypi/ZODB;
@@ -9146,7 +9146,7 @@ rec {
       maintainers = [ stdenv.lib.maintainers.goibhniu ];
     };
   };
-  
+
   zodbpickle = pythonPackages.buildPythonPackage rec {
     name = "zodbpickle-0.5.2";
 
@@ -9154,7 +9154,7 @@ rec {
       url = "https://pypi.python.org/packages/source/z/zodbpickle/${name}.tar.gz";
       md5 = "d401bd89f99ec8d56c22493e6f8c0443";
     };
-    
+
     # fails..
     doCheck = false;
 
@@ -9163,10 +9163,10 @@ rec {
     };
   };
 
-  
+
   BTrees = pythonPackages.buildPythonPackage rec {
     name = "BTrees-4.0.8";
-    
+
     patches = [ ./../development/python-modules/btrees_interger_overflow.patch ];
 
     propagatedBuildInputs = [ persistent zope_interface transaction ];
@@ -9182,7 +9182,7 @@ rec {
     };
   };
 
-  
+
   persistent = pythonPackages.buildPythonPackage rec {
     name = "persistent-4.0.8";
 
@@ -9230,7 +9230,7 @@ rec {
         maintainers = [ stdenv.lib.maintainers.goibhniu ];
     };
   };
-  
+
   zope_browserresource = buildPythonPackage rec {
     name = "zope.browserresource-4.0.1";
 
@@ -9575,7 +9575,7 @@ rec {
       url = "http://pypi.python.org/packages/source/z/zope.testing/${name}.tar.gz";
       md5 = "6c73c5b668a67fdc116a25b884058ed9";
     };
-    
+
     doCheck = !(python.isPypy or false);
 
     propagatedBuildInputs = [ zope_interface zope_exceptions zope_location ];
@@ -9726,7 +9726,7 @@ rec {
   tarman = buildPythonPackage rec {
     version = "0.1.3";
     name = "tarman-${version}";
-    
+
     disabled = isPy3k;
 
     src = fetchurl {
@@ -10172,7 +10172,7 @@ rec {
       url = "http://freshfoo.com/projects/IMAPClient/${name}.tar.gz";
       sha256 = "1w54h8gz25qf6ggazzp6xf7kvsyiadsjfkkk17gm0p6pmzvvccbn";
     };
-    
+
     buildInputs = [ mock ];
 
     preConfigure = ''

From 60734bb0f99a01e22cd2050359673af3fb2b5c11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Mon, 25 Aug 2014 19:17:05 +0200
Subject: [PATCH 0822/1453] radicale: 0.9b1 -> 0.9 Added description, editor
 stripped some trailing whitespace.

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2d44ee871c8c..ba6f4afaf7e8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2549,11 +2549,11 @@ rec {
   radicale = buildPythonPackage rec {
     name = "radicale-${version}";
     namePrefix = "";
-    version = "0.9b1";
+    version = "0.9";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/R/Radicale/Radicale-${version}.tar.gz";
-      sha256 = "3a8451909de849f173f577ddec0a085f19040dbb6aa13d5256208a0f8e11d88d";
+      sha256 = "77bf813fd26f0d359c1a7b7bcce9b842b4503c5516989a4a0a4f648e299e41f7";
     };
 
     propagatedBuildInputs = with pythonPackages; [
@@ -2566,6 +2566,7 @@ rec {
 
     meta = {
       homepage = "http://www.radicale.org/";
+      description = "CalDAV CardDAV server";
       longDescription = ''
         The Radicale Project is a complete CalDAV (calendar) and CardDAV
         (contact) server solution. Calendars and address books are available for

From 8c19690d99af8e25a58ce1a96ffda74340b88700 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Fri, 29 Aug 2014 18:43:03 +0200
Subject: [PATCH 0823/1453] Remove useless use of optionSet.

---
 nixos/modules/services/networking/znc.nix | 174 +++++++++++-----------
 nixos/modules/system/boot/luksroot.nix    |  59 ++++----
 2 files changed, 113 insertions(+), 120 deletions(-)

diff --git a/nixos/modules/services/networking/znc.nix b/nixos/modules/services/networking/znc.nix
index 2aa63c6e7dfb..5aed20ee3e0b 100644
--- a/nixos/modules/services/networking/znc.nix
+++ b/nixos/modules/services/networking/znc.nix
@@ -25,85 +25,6 @@ let
     paths = cfg.modulePackages;
   };
 
-  confOptions = { ... }: {
-    options = {
-      modules = mkOption {
-        type = types.listOf types.string;
-        default = [ "partyline" "webadmin" "adminlog" "log" ];
-        example = [ "partyline" "webadmin" "adminlog" "log" ];
-        description = ''
-          A list of modules to include in the `znc.conf` file.
-        '';
-      };
-
-      userModules = mkOption {
-        type = types.listOf types.string;
-        default = [ ];
-        example = [ "fish" "push" ];
-        description = ''
-          A list of user modules to include in the `znc.conf` file.
-        '';
-      };
-
-      userName = mkOption {
-        default = defaultUserName;
-        example = "johntron";
-        type = types.string;
-        description = ''
-          The user name to use when generating the `znc.conf` file.
-          This is the user name used by the user logging into the ZNC web admin. 
-        '';
-      };
-
-      nick = mkOption {
-        default = "znc-user";
-        example = "john";
-        type = types.string;
-        description = ''
-          The IRC nick to use when generating the `znc.conf` file.
-        '';
-      };
-
-      passBlock = mkOption {
-        default = defaultPassBlock;
-        example = "Must be the block generated by the `znc --makepass` command.";
-        type = types.string;
-        description = ''
-          The pass block to use when generating the `znc.conf` file.
-          This is the password used by the user logging into the ZNC web admin.
-          This is the block generated by the `znc --makepass` command.
-          !!! If not specified, please change this after starting the service. !!!
-        '';
-      };
-
-      port = mkOption {
-        default = 5000;
-        example = 5000;
-        type = types.int;
-        description = ''
-          Specifies the port on which to listen.
-        '';
-      };
- 
-      useSSL = mkOption {
-        default = true;
-        example = true;
-        type = types.bool;
-        description = ''
-          Indicates whether the ZNC server should use SSL when listening on the specified port.
-        '';
-      };
-
-      extraZncConf = mkOption {
-        default = "";
-        type = types.lines;
-        description = ''
-          Extra config to `znc.conf` file
-        '';
-      };
-    };
-  };
-
   # Keep znc.conf in nix store, then symlink or copy into `dataDir`, depending on `mutable`.
   mkZncConf = confOpts: ''
     // Also check http://en.znc.in/wiki/Configuration
@@ -211,18 +132,91 @@ in
         '';
       };
 
-      confOptions = mkOption {
-        default = {};
-        example = {
-          modules = [ "log" ];
-          userName = "john";
-          nick = "johntron";
+      /* TODO: add to the documentation of the current module:
+
+         Values to use when creating a `znc.conf` file.
+
+           confOptions = {
+             modules = [ "log" ];
+             userName = "john";
+             nick = "johntron";
+           };
+      */
+      confOptions = {
+        modules = mkOption {
+          type = types.listOf types.string;
+          default = [ "partyline" "webadmin" "adminlog" "log" ];
+          example = [ "partyline" "webadmin" "adminlog" "log" ];
+          description = ''
+            A list of modules to include in the `znc.conf` file.
+          '';
+        };
+
+        userModules = mkOption {
+          type = types.listOf types.string;
+          default = [ ];
+          example = [ "fish" "push" ];
+          description = ''
+            A list of user modules to include in the `znc.conf` file.
+          '';
+        };
+
+        userName = mkOption {
+          default = defaultUserName;
+          example = "johntron";
+          type = types.string;
+          description = ''
+            The user name to use when generating the `znc.conf` file.
+            This is the user name used by the user logging into the ZNC web admin.
+          '';
+        };
+
+        nick = mkOption {
+          default = "znc-user";
+          example = "john";
+          type = types.string;
+          description = ''
+            The IRC nick to use when generating the `znc.conf` file.
+          '';
+        };
+
+        passBlock = mkOption {
+          default = defaultPassBlock;
+          example = "Must be the block generated by the `znc --makepass` command.";
+          type = types.string;
+          description = ''
+            The pass block to use when generating the `znc.conf` file.
+            This is the password used by the user logging into the ZNC web admin.
+            This is the block generated by the `znc --makepass` command.
+            !!! If not specified, please change this after starting the service. !!!
+          '';
+        };
+
+        port = mkOption {
+          default = 5000;
+          example = 5000;
+          type = types.int;
+          description = ''
+            Specifies the port on which to listen.
+          '';
+        };
+
+        useSSL = mkOption {
+          default = true;
+          example = true;
+          type = types.bool;
+          description = ''
+            Indicates whether the ZNC server should use SSL when listening on the specified port.
+          '';
+        };
+
+        extraZncConf = mkOption {
+          default = "";
+          type = types.lines;
+          description = ''
+            Extra config to `znc.conf` file
+          '';
         };
-        type = types.optionSet;
-        description = ''
-          Values to use when creating a `znc.conf` file.
-        '';
-        options = confOptions; 
       };
 
       modulePackages = mkOption {
diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index 68392e3cfe25..70ff1d588a36 100644
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@@ -342,40 +342,39 @@ in
               description = "Path where the ramfs used to update the LUKS key will be mounted in stage-1";
             };
 
-            storage = mkOption {
-              type = types.optionSet;
-              description = "Options related to the storing the salt";
+            /* TODO: Add to the documentation of the current module:
 
-              options = {
-                device = mkOption {
-                  default = "/dev/sda1";
-                  type = types.path;
-                  description = ''
-                    An unencrypted device that will temporarily be mounted in stage-1.
-                    Must contain the current salt to create the challenge for this LUKS device.
-                  '';
-                };
+               Options related to the storing the salt.
+            */
+            storage = {
+              device = mkOption {
+                default = "/dev/sda1";
+                type = types.path;
+                description = ''
+                  An unencrypted device that will temporarily be mounted in stage-1.
+                  Must contain the current salt to create the challenge for this LUKS device.
+                '';
+              };
 
-                fsType = mkOption {
-                  default = "vfat";
-                  type = types.string;
-                  description = "The filesystem of the unencrypted device";
-                };
+              fsType = mkOption {
+                default = "vfat";
+                type = types.string;
+                description = "The filesystem of the unencrypted device";
+              };
 
-                mountPoint = mkOption {
-                  default = "/crypt-storage";
-                  type = types.string;
-                  description = "Path where the unencrypted device will be mounted in stage-1";
-                };
+              mountPoint = mkOption {
+                default = "/crypt-storage";
+                type = types.string;
+                description = "Path where the unencrypted device will be mounted in stage-1";
+              };
 
-                path = mkOption {
-                  default = "/crypt-storage/default";
-                  type = types.string;
-                  description = ''
-                    Absolute path of the salt on the unencrypted device with
-                    that device's root directory as "/".
-                  '';
-                };
+              path = mkOption {
+                default = "/crypt-storage/default";
+                type = types.string;
+                description = ''
+                  Absolute path of the salt on the unencrypted device with
+                  that device's root directory as "/".
+                '';
               };
             };
           };

From 3b6f5050a15ca8854f19b955d33b584245fdf1d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 29 Aug 2014 18:42:25 +0200
Subject: [PATCH 0824/1453] Revert "protobuf: Update to 2.6.0"

This reverts commit 859a2c446cbe1f802ec3f6ad07d3913c4518e11d.

Breaks a bunch of reverse dependencies.
---
 pkgs/development/libraries/protobuf/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/protobuf/default.nix b/pkgs/development/libraries/protobuf/default.nix
index 3452335decdc..bba8481780a5 100644
--- a/pkgs/development/libraries/protobuf/default.nix
+++ b/pkgs/development/libraries/protobuf/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "protobuf-2.6.0";
+  name = "protobuf-2.5.0";
 
   src = fetchurl {
-    url = "http://protobuf.googlecode.com/svn-history/r579/rc/protobuf-2.6.0.tar.bz2";
-    sha256 = "0krfkxc85vfznqwbh59qlhp7ld81al9ss35av0gfbg74i0rvjids";
+    url = "http://protobuf.googlecode.com/files/${name}.tar.bz2";
+    sha256 = "0xxn9gxhvsgzz2sgmihzf6pf75clr05mqj6218camwrwajpcbgqk";
   };
 
   buildInputs = [ zlib ];

From eb7a17a1cfc158b87e6d349f1fcc550761d122b9 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Fri, 29 Aug 2014 18:52:31 +0200
Subject: [PATCH 0825/1453] Add error an message to prevent use of useless
 submodules.

---
 lib/modules.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/modules.nix b/lib/modules.nix
index bcaadc7fd977..9fe26083cfd4 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -277,13 +277,14 @@ rec {
   fixupOptionType = loc: opt:
     let
       options' = opt.options or
-        (throw "Option `${showOption loc'}' has type optionSet but has no option attribute.");
+        (throw "Option `${showOption loc'}' has type optionSet but has no option attribute, in ${showFiles opt.declarations}.");
       coerce = x:
         if isFunction x then x
         else { config, ... }: { options = x; };
       options = map coerce (flatten options');
       f = tp:
-        if tp.name == "option set" then types.submodule options
+        if tp.name == "option set" || tp.name == "submodule" then
+          throw "The option ${showOption loc} uses submodules without a wrapping type, in ${showFiles opt.declarations}."
         else if tp.name == "attribute set of option sets" then types.attrsOf (types.submodule options)
         else if tp.name == "list or attribute set of option sets" then types.loaOf (types.submodule options)
         else if tp.name == "list of option sets" then types.listOf (types.submodule options)

From 4e189f68ab078fbde808ee2346f9b81cda5b8035 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Fri, 29 Aug 2014 18:12:43 +0100
Subject: [PATCH 0826/1453] checkstyle: update to 5.7

---
 .../tools/analysis/checkstyle/default.nix          | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix
index 1dfaa5cf875b..56797d9c7028 100644
--- a/pkgs/development/tools/analysis/checkstyle/default.nix
+++ b/pkgs/development/tools/analysis/checkstyle/default.nix
@@ -1,12 +1,12 @@
-{stdenv, fetchurl, unzip}:
+{ stdenv, fetchurl }:
 
-stdenv.mkDerivation {
-  name = "checkstyle-5.0";
-  buildInputs = [unzip] ; 
+stdenv.mkDerivation rec {
+  version = "5.7";
+  name = "checkstyle-${version}";
 
   src = fetchurl {
-    url = mirror://sourceforge/checkstyle/checkstyle-5.0.zip ;
-    sha256 = "0972afcxjniz64hlnc89ddnd1d0mcd5hb1sd7lpw5k52h39683nh";
+    url = "mirror://sourceforge/checkstyle/${version}/${name}-bin.tar.gz";
+    sha256 = "0kzj507ylynq6p7v097bjzsckkjny5i2fxwxyrlwi5samhi2m06x";
   };
 
   installPhase = ''
@@ -22,6 +22,6 @@ stdenv.mkDerivation {
       Conventions, but is highly configurable.
     '';
     homepage = http://checkstyle.sourceforge.net/;
+    license = stdenv.lib.licenses.lgpl21;
   };
 }
-

From 4cb061111cfed82e151cfe82b25a68777629faa7 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Fri, 8 Aug 2014 16:34:41 -0300
Subject: [PATCH 0827/1453] Higan - new package (alpha stage!)

Higan is a cycle-accurate Nintendo multi-system emulator
It is a preliminary release for Nix - I need to investigate
some issues about install process and hardcoded paths...
---
 pkgs/misc/emulators/higan/builder.sh  | 20 +++++++++++
 pkgs/misc/emulators/higan/default.nix | 48 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 3 files changed, 70 insertions(+)
 create mode 100644 pkgs/misc/emulators/higan/builder.sh
 create mode 100644 pkgs/misc/emulators/higan/default.nix

diff --git a/pkgs/misc/emulators/higan/builder.sh b/pkgs/misc/emulators/higan/builder.sh
new file mode 100644
index 000000000000..144c23d39de5
--- /dev/null
+++ b/pkgs/misc/emulators/higan/builder.sh
@@ -0,0 +1,20 @@
+
+source $stdenv/setup
+
+unpackPhase
+cd $sourceName
+make phoenix=gtk profile=accuracy -C ananke
+make phoenix=gtk profile=accuracy
+
+install -dm 755 $out/share/applications $out/share/pixmaps $out/share/higan/Video\ Shaders $out/bin $out/lib
+
+install -m 644 data/higan.desktop $out/share/applications/
+install -m 644 data/higan.png $out/share/pixmaps/
+cp -dr --no-preserve=ownership profile/* data/cheats.bml $out/share/higan/
+cp -dr --no-preserve=ownership shaders/*.shader $out/share/higan/Video\ Shaders/
+
+install -m 755 out/higan $out/bin/higan
+install -m 644 ananke/libananke.so $out/lib/libananke.so.1
+(cd $out/lib && ln -s libananke.so.1 libananke.so)
+oldRPath=$(patchelf --print-rpath $out/bin/higan)
+patchelf --set-rpath $oldRPath:$out/lib $out/bin/higan
diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix
new file mode 100644
index 000000000000..aceb55b13967
--- /dev/null
+++ b/pkgs/misc/emulators/higan/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchurl
+, pkgconfig
+, libX11, libXv
+, udev
+, mesa, gtk, SDL
+, libao, openal, pulseaudio
+}:
+
+stdenv.mkDerivation rec {
+
+  name = "higan-${version}";
+  version = "094";
+  sourceName = "higan_v${version}-source";
+
+  src = fetchurl {
+    url = "http://byuu.org/files/${sourceName}.tar.xz";
+    sha256 = "06qm271pzf3qf2labfw2lx6k0xcd89jndmn0jzmnc40cspwrs52y";
+    curlOpts = "--user-agent 'Mozilla/5.0'"; # the good old user-agent trick...
+  };
+
+  buildInputs = with stdenv.lib;
+  [ pkgconfig libX11 libXv udev mesa gtk SDL libao openal pulseaudio ];
+
+  builder = ./builder.sh;
+
+  meta = {
+    description = "An open-source, cycle-accurate Nintendo multi-system emulator";
+    longDescription = ''
+      Higan (formerly bsnes) is a Nintendo multi-system emulator.
+      It currently supports the following systems:
+        Famicom; Super Famicom;
+        Game Boy; Game Boy Color; Game Boy Advance
+      higan also supports the following subsystems:
+        Super Game Boy; BS-X Satellaview; Sufami Turbo
+    '';
+    homepage = http://byuu.org/higan/;
+    license = stdenv.lib.licenses.gpl3Plus;
+    maintainers = [ stdenv.lib.maintainers.AndersonTorres ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
+
+#
+# TODO:
+#   - options to choose profiles (accuracy, balanced, performance)
+#     and different GUIs (gtk2, qt4)
+#   - fix the BML and BIOS paths - maybe a custom patch to Higan project?
+#
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1942be80a7cd..d1f9487ab4aa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11569,6 +11569,8 @@ let
 
   snes9x-gtk = callPackage ../misc/emulators/snes9x-gtk { };
 
+  higan = callPackage ../misc/emulators/higan { };
+
   misc = import ../misc/misc.nix { inherit pkgs stdenv; };
 
   bullet = callPackage ../development/libraries/bullet {};

From 0ffa7dc0f28f7aaf517f68c5c6812272cbb822ed Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 29 Aug 2014 19:53:56 +0200
Subject: [PATCH 0828/1453] sox: Enable support for FLAC and PNG.

In case you wonder: PNG support is needed for example to generate
spectograms.

For example:

sox shiny-song.flac -n spectrogram -o even-shinier.png

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/misc/audio/sox/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix
index 0663937c4795..1f86a4164f69 100644
--- a/pkgs/applications/misc/audio/sox/default.nix
+++ b/pkgs/applications/misc/audio/sox/default.nix
@@ -4,6 +4,8 @@
 , enableLame ? false, lame ? null
 , enableLibmad ? true, libmad ? null
 , enableLibogg ? true, libogg ? null, libvorbis ? null
+, enableFLAC ? true, flac ? null
+, enablePNG ? true, libpng ? null
 }:
 
 with stdenv.lib;
@@ -21,7 +23,9 @@ stdenv.mkDerivation rec {
     optional enableLibao libao ++
     optional enableLame lame ++
     optional enableLibmad libmad ++
-    optionals enableLibogg [ libogg libvorbis ];
+    optionals enableLibogg [ libogg libvorbis ] ++
+    optional enableFLAC flac ++
+    optional enablePNG libpng;
 
   meta = {
     description = "Sample Rate Converter for audio";

From 8eb3de7c86355c2061608e9a0f64150fbdbcc7ec Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Fri, 29 Aug 2014 01:45:31 -0700
Subject: [PATCH 0829/1453] Chromium patch, fixes missing header

---
 .../networking/browsers/chromium/source/default.nix   |  2 +-
 .../browsers/chromium/source/missing_alg_import.patch | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/networking/browsers/chromium/source/missing_alg_import.patch

diff --git a/pkgs/applications/networking/browsers/chromium/source/default.nix b/pkgs/applications/networking/browsers/chromium/source/default.nix
index d7ccc412fa4f..91c6ada51381 100644
--- a/pkgs/applications/networking/browsers/chromium/source/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
 
   prePatch = "patchShebangs .";
 
-  patches = singleton ./sandbox_userns_36.patch;
+  patches = [ ./sandbox_userns_36.patch ./missing_alg_import.patch ];
 
   postPatch = ''
     sed -i -r \
diff --git a/pkgs/applications/networking/browsers/chromium/source/missing_alg_import.patch b/pkgs/applications/networking/browsers/chromium/source/missing_alg_import.patch
new file mode 100644
index 000000000000..243e3fe70498
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/source/missing_alg_import.patch
@@ -0,0 +1,11 @@
+diff -Naur chromium-37.0.2062.94.old/media/cast/logging/encoding_event_subscriber.cc chromium-37.0.2062.94/media/cast/logging/encoding_event_subscriber.cc
+--- chromium-37.0.2062.94.old/media/cast/logging/encoding_event_subscriber.cc	2014-08-29 02:05:15.149140733 -0700
++++ chromium-37.0.2062.94/media/cast/logging/encoding_event_subscriber.cc	2014-08-29 02:06:00.182853590 -0700
+@@ -4,6 +4,7 @@
+ 
+ #include "media/cast/logging/encoding_event_subscriber.h"
+ 
++#include <algorithm>
+ #include <cstring>
+ #include <utility>
+ 

From 44281788475016ddbf48539814b6870337e6ef54 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 29 Aug 2014 08:40:23 -0700
Subject: [PATCH 0830/1453] nixos/generate-config: Fix indentation

---
 .../installer/tools/nixos-generate-config.pl  | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index cabdb09ec9c1..73dd87cef5cf 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -344,19 +344,19 @@ EOF
         }
     }
 
-	# Is this a btrfs filesystem?
-	if ($fsType eq "btrfs") {
-		my ($status, @info) = runCommand("btrfs subvol show $rootDir$mountPoint");
-		if ($status != 0) {
-			die "Failed to retreive subvolume info for $mountPoint";
-		}
-		my @subvols = join("", @info) =~ m/Name:[ \t\n]*([^ \t\n]*)/;
-		if ($#subvols > 0) {
-			die "Btrfs subvol name for $mountPoint listed multiple times in mount\n"
-		} elsif ($#subvols == 0) {
-			push @extraOptions, "subvol=$subvols[0]";
-		}
-	}
+    # Is this a btrfs filesystem?
+    if ($fsType eq "btrfs") {
+        my ($status, @info) = runCommand("btrfs subvol show $rootDir$mountPoint");
+        if ($status != 0) {
+            die "Failed to retreive subvolume info for $mountPoint";
+        }
+        my @subvols = join("", @info) =~ m/Name:[ \t\n]*([^ \t\n]*)/;
+        if ($#subvols > 0) {
+            die "Btrfs subvol name for $mountPoint listed multiple times in mount\n"
+        } elsif ($#subvols == 0) {
+            push @extraOptions, "subvol=$subvols[0]";
+        }
+    }
 
     # Emit the filesystem.
     $fileSystems .= <<EOF;

From 7d16a429f0e4ded151398da5433b817166ea8404 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 29 Aug 2014 08:41:07 -0700
Subject: [PATCH 0831/1453] nixos/install-grub: Fix Indentation

---
 nixos/modules/system/boot/loader/grub/install-grub.pl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index d8ee8b500970..7ced51f57e16 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -158,7 +158,7 @@ my $grubStore = GrubFs("/nix");
 
 # We don't need to copy if we can read the kernels directly
 if ($grubStore->search ne "") {
-	$copyKernels = 0;
+    $copyKernels = 0;
 }
 
 # Generate the header.
@@ -275,8 +275,8 @@ sub addEntry {
         $conf .= "  " . ($xen ? "module" : "initrd") . " $initrd\n\n";
     } else {
         $conf .= "menuentry \"$name\" {\n";
-	$conf .= $grubBoot->search . "\n";
-	$conf .= $grubStore->search . "\n";
+        $conf .= $grubBoot->search . "\n";
+        $conf .= $grubStore->search . "\n";
         $conf .= "  $extraPerEntryConfig\n" if $extraPerEntryConfig;
         $conf .= "  multiboot $xen $xenParams\n" if $xen;
         $conf .= "  " . ($xen ? "module" : "linux") . " $kernel $kernelParams\n";

From ceb367a8a21653ef1f179b333c28bec37df90b2a Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 29 Aug 2014 16:13:48 -0400
Subject: [PATCH 0832/1453] ats2: Bump

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

diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix
index c66143fe1f32..b77c7e476676 100644
--- a/pkgs/development/compilers/ats2/default.nix
+++ b/pkgs/development/compilers/ats2/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "ats2-${version}";
-  version = "0.1.1";
+  version = "0.1.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz";
-    sha256 = "17yr5zc4cr4zlizhzy43ihfcidl63wjxcc002amzahskib4fsbmb";
+    sha256 = "1266hl03d4w13qrimq6jsxcmw1mjivl27l3lhf9ddqlz0vy97j6a";
   };
 
   buildInputs = [ gmp ];

From d43f1c86bdd6cc90d93f99005f18b725315ec1c8 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Fri, 29 Aug 2014 15:23:44 -0500
Subject: [PATCH 0833/1453] pkgs: add Rainbowstream, a streaming command-line
 twitter client.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/top-level/python-packages.nix | 83 +++++++++++++++++++++++++++++-
 1 file changed, 82 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ba6f4afaf7e8..174fde47f2e5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -492,6 +492,23 @@ rec {
 
   });
 
+  arrow = buildPythonPackage rec {
+    name = "arrow-${version}";
+    version = "0.4.4";
+
+    src = fetchurl {
+      url    = "https://pypi.python.org/packages/source/a/arrow/${name}.tar.gz";
+      sha256 = "1sdr4gyjgvz86yr0ll0i11mgy8l1slndr7f0ngam87rpy78gp052";
+    };
+
+    doCheck = false;
+
+    meta = {
+      description = "Twitter API library";
+      license     = "apache";
+      maintainers = [ maintainers.thoughtpolice ];
+    };
+  };
 
   async = buildPythonPackage rec {
     name = "async-0.6.1";
@@ -4552,7 +4569,6 @@ rec {
     };
   };
 
-
   memcached = buildPythonPackage rec {
     name = "memcached-1.51";
 
@@ -4607,6 +4623,35 @@ rec {
     };
   };
 
+  rainbowstream = buildPythonPackage rec {
+    name = "rainbowstream-${version}";
+    version = "0.9.3";
+
+    src = fetchurl {
+      url    = "https://pypi.python.org/packages/source/r/rainbowstream/${name}.tar.gz";
+      sha256 = "1xgfxk3qwbfdl2fwabcppi43dxmv8pik0wb9jsbszwxz9xv3fcpk";
+    };
+
+    doCheck = false;
+
+    buildInputs = [
+      pkgs.libjpeg pkgs.freetype pkgs.zlib
+      pillow twitter pyfiglet requests arrow dateutil modules.readline
+    ];
+
+    postInstall = ''
+      wrapProgram "$out/bin/rainbowstream" \
+        --prefix PYTHONPATH : "$PYTHONPATH"
+    '';
+
+    meta = {
+      description = "Streaming command-line twitter client";
+      homepage    = "http://www.rainbowstream.org/";
+      license     = licenses.mit;
+      maintainers = [ maintainers.thoughtpolice ];
+    };
+  };
+
   mitmproxy = buildPythonPackage rec {
     baseName = "mitmproxy";
     name = "${baseName}-${meta.version}";
@@ -6168,6 +6213,24 @@ rec {
     };
   };
 
+  pyfiglet = buildPythonPackage rec {
+    name = "pyfiglet-${version}";
+    version = "0.7.1";
+
+    src = fetchurl {
+      url    = "https://pypi.python.org/packages/source/p/pyfiglet/${name}.tar.gz";
+      sha256 = "14lgwg47gnnad7sfkmmwhknwysbfmr74c9b2a6d9wgjmydycc6ka";
+    };
+
+    doCheck = false;
+
+    meta = {
+      description = "FIGlet in pure Python";
+      license     = licenses.gpl2Plus;
+      maintainers = [ maintainers.thoughtpolice ];
+    };
+  };
+
   pyflakes = buildPythonPackage rec {
     name = "pyflakes-0.8.1";
 
@@ -8508,6 +8571,24 @@ rec {
     };
   });
 
+  twitter = buildPythonPackage rec {
+    name = "twitter-${version}";
+    version = "1.14.3";
+
+    src = fetchurl {
+      url    = "https://pypi.python.org/packages/source/t/twitter/${name}.tar.gz";
+      sha256 = "1nhhjajbq0jik43q2makpnz094qcziq9p8rj35jxamybd0hwwzs9";
+    };
+
+    doCheck = false;
+
+    meta = {
+      description = "Twitter API library";
+      license     = licenses.mit;
+      maintainers = [ maintainers.thoughtpolice ];
+    };
+  };
+
   twisted = buildPythonPackage rec {
     # NOTE: When updating please check if new versions still cause issues
     # to packages like carbon (http://stackoverflow.com/questions/19894708/cant-start-carbon-12-04-python-error-importerror-cannot-import-name-daem)

From feee5f16e189d99784f0c36b76199e3eee8194ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Fri, 29 Aug 2014 22:43:03 +0200
Subject: [PATCH 0834/1453] dogecoin: autotools build factored out

---
 pkgs/applications/misc/bitcoin/altcoins.nix | 47 --------------
 pkgs/applications/misc/bitcoin/dogecoin.nix | 71 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  5 +-
 3 files changed, 74 insertions(+), 49 deletions(-)
 create mode 100644 pkgs/applications/misc/bitcoin/dogecoin.nix

diff --git a/pkgs/applications/misc/bitcoin/altcoins.nix b/pkgs/applications/misc/bitcoin/altcoins.nix
index 796cedc1ee2c..2643094e2f16 100644
--- a/pkgs/applications/misc/bitcoin/altcoins.nix
+++ b/pkgs/applications/misc/bitcoin/altcoins.nix
@@ -80,51 +80,4 @@ in rec {
     };
   };
 
-  dogecoin = (buildAltcoin rec {
-    walletName = "dogecoin";
-    version = "1.8.0";
-
-    src = fetchurl {
-      url = "https://github.com/dogecoin/dogecoin/archive/v${version}.tar.gz";
-      sha256 = "8a33958c04213cd621aa3c86910477813af22512f03b47c98995d20d31f3f935";
-    };
-
-    extraBuildInputs = [ autogen autoconf automake pkgconfig db utillinux protobuf ];
-
-    meta = {
-      description = "Wow, such coin, much shiba, very rich";
-      longDescription = "wow";
-      homepage = http://www.dogecoin.com/;
-      maintainers = [ maintainers.offline maintainers.edwtjo ];
-    };
-  }).override rec {
-    patchPhase = ''
-      sed -i \
-        -e 's,BDB_CPPFLAGS=$,BDB_CPPFLAGS="-I${db}/include",g' \
-        -e 's,BDB_LIBS=$,BDB_LIBS="-L${db}/lib",g' \
-        -e 's,bdbdirlist=$,bdbdirlist="${db}/include",g' \
-        src/m4/dogecoin_find_bdb51.m4
-    '';
-    dogeConfigure = ''
-      ./autogen.sh \
-      && ./configure --prefix=$out \
-                     --with-incompatible-bdb \
-                     --with-boost-libdir=${boost}/lib \
-    '';
-    dogeInstall = ''
-      install -D "src/dogecoin-cli" "$out/bin/dogecoin-cli"
-      install -D "src/dogecoind" "$out/bin/dogecoind"
-    '';
-    configurePhase = dogeConfigure + "--with-gui";
-    installPhase = dogeInstall + "install -D src/qt/dogecoin-qt $out/bin/dogecoin-qt";
-  };
-
-  dogecoind = dogecoin.override rec {
-    gui = false;
-    makefile = "Makefile";
-    preBuild = "";
-    configurePhase = dogecoin.dogeConfigure + "--without-gui";
-    installPhase = dogecoin.dogeInstall;
-  };
-
 }
diff --git a/pkgs/applications/misc/bitcoin/dogecoin.nix b/pkgs/applications/misc/bitcoin/dogecoin.nix
new file mode 100644
index 000000000000..7ace3c161c7b
--- /dev/null
+++ b/pkgs/applications/misc/bitcoin/dogecoin.nix
@@ -0,0 +1,71 @@
+{ fetchurl, stdenv, pkgconfig
+, openssl, boost, zlib, miniupnpc, qt4, qrencode, glib, protobuf
+, utillinux, autogen, autoconf, autobuild, automake, db }:
+
+with stdenv.lib;
+
+let
+
+  mkAutotoolCoin =
+  { name, version, withGui, src, meta }:
+
+  stdenv.mkDerivation {
+    inherit src meta;
+
+    name = name + (toString (optional (!withGui) "d")) + "-" + version;
+
+    buildInputs = [ autogen autoconf automake pkgconfig openssl
+                    boost zlib miniupnpc db utillinux protobuf ]
+                  ++ optionals withGui [ qt4 qrencode ];
+
+    patchPhase = ''
+      sed -i \
+        -e 's,BDB_CPPFLAGS=$,BDB_CPPFLAGS="-I${db}/include",g' \
+        -e 's,BDB_LIBS=$,BDB_LIBS="-L${db}/lib",g' \
+        -e 's,bdbdirlist=$,bdbdirlist="${db}/include",g' \
+        src/m4/dogecoin_find_bdb51.m4
+    '';
+
+    configurePhase = ''
+      ./autogen.sh \
+      && ./configure --prefix=$out \
+                     --with-incompatible-bdb \
+                     --with-boost-libdir=${boost}/lib \
+                     ${ if withGui then "--with-gui" else "" }
+    '';
+
+    installPhase = ''
+      install -D "src/dogecoin-cli" "$out/bin/dogecoin-cli"
+      install -D "src/dogecoind" "$out/bin/dogecoind"
+      ${ if withGui then "install -D src/qt/dogecoin-qt $out/bin/dogecoin-qt" else "" }
+    '';
+
+  };
+
+  mkDogeCoin = { withGui }:
+
+  mkAutotoolCoin rec {
+    name = "dogecoin";
+    version = "1.8.0";
+    inherit withGui;
+
+    src = fetchurl {
+      url = "https://github.com/dogecoin/dogecoin/archive/v${version}.tar.gz";
+      sha256 = "8a33958c04213cd621aa3c86910477813af22512f03b47c98995d20d31f3f935";
+    };
+
+    meta = {
+      description = "Wow, such coin, much shiba, very rich";
+      longDescription = "wow";
+      homepage = http://www.dogecoin.com/;
+      license = licenses.mit;
+      maintainers = with maintainers; [ edwtjo offline ];
+    };
+  };
+
+in {
+
+  dogecoin = mkDogeCoin { withGui = true; };
+  dogecoind = mkDogeCoin { withGui = false; };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d1f9487ab4aa..ceebde40e8a1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8285,7 +8285,8 @@ let
   bitcoind = callPackage ../applications/misc/bitcoin { gui = false; };
 
   altcoins = recurseIntoAttrs (
-    callPackage ../applications/misc/bitcoin/altcoins.nix {}
+    (callPackage ../applications/misc/bitcoin/altcoins.nix {}) //
+    (callPackage ../applications/misc/bitcoin/dogecoin.nix {})
   );
 
   bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee {
@@ -9211,7 +9212,7 @@ let
   lynx = callPackage ../applications/networking/browsers/lynx { };
 
   lyx = callPackage ../applications/misc/lyx { };
-  
+
   makeself = callPackage ../applications/misc/makeself { };
 
   matchbox = callPackage ../applications/window-managers/matchbox { };

From a4b794bb733b11a021990fb81a610a3e750300e5 Mon Sep 17 00:00:00 2001
From: Patrick Mahoney <pat@polycrystal.org>
Date: Sat, 30 Aug 2014 00:05:23 -0500
Subject: [PATCH 0835/1453] s6-portable-utils: new package

s6-portable-utils is a set of tiny general Unix utilities, often
performing well-known tasks such as cut and grep, but optimized for
simplicity and small size.
---
 pkgs/tools/misc/s6-portable-utils/default.nix | 55 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 57 insertions(+)
 create mode 100644 pkgs/tools/misc/s6-portable-utils/default.nix

diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix
new file mode 100644
index 000000000000..f8e7dfaddc9e
--- /dev/null
+++ b/pkgs/tools/misc/s6-portable-utils/default.nix
@@ -0,0 +1,55 @@
+{ stdenv, fetchurl, skalibs }:
+
+let
+
+  version = "1.0.3.2";
+
+in stdenv.mkDerivation rec {
+
+  name = "s6-portable-utils-${version}";
+
+  src = fetchurl {
+    url = "http://www.skarnet.org/software/s6-portable-utils/${name}.tar.gz";
+    sha256 = "040nmls7qbgw8yn502lym4kgqh5zxr2ks734bqajpi2ricnasvhl";
+  };
+
+  buildInputs = [ skalibs ];
+
+  sourceRoot = "admin/${name}";
+
+  configurePhase = ''
+    pushd conf-compile
+
+    printf "$out/bin"           > conf-install-command
+    printf "$out/libexec"       > conf-install-libexec
+
+    # let nix builder strip things, cross-platform
+    truncate --size 0 conf-stripbins
+    truncate --size 0 conf-striplibs
+
+    printf "${skalibs}/sysdeps"      > import
+    printf "%s" "${skalibs}/include" > path-include
+    printf "%s" "${skalibs}/lib"     > path-library
+
+    rm -f flag-slashpackage
+    touch flag-allstatic
+
+    popd
+  '';
+
+  preBuild = ''
+    patchShebangs src/sys
+  '';
+
+  preInstall = ''
+    mkdir -p "$out/libexec"
+  '';
+
+  meta = {
+    homepage = http://www.skarnet.org/software/s6-portable-utils/;
+    description = "A set of tiny general Unix utilities optimized for simplicity and small size.";
+    platforms = stdenv.lib.platforms.all;
+    license = stdenv.lib.licenses.isc;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d1f9487ab4aa..5aa699805f37 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2051,6 +2051,8 @@ let
     ruby = ruby18;
   };
 
+  s6PortableUtils = callPackage ../tools/misc/s6-portable-utils { };
+
   sablotron = callPackage ../tools/text/xml/sablotron { };
 
   safecopy = callPackage ../tools/system/safecopy { };

From 1030ca055012483d9b226c117e81ba1693e2ce2e Mon Sep 17 00:00:00 2001
From: Patrick Mahoney <pat@polycrystal.org>
Date: Sat, 30 Aug 2014 00:06:42 -0500
Subject: [PATCH 0836/1453] s6-dns: new package

s6-dns is a suite of DNS client programs and libraries for Unix systems,
as an alternative to the BIND, djbdns or other DNS clients.
---
 pkgs/tools/networking/s6-dns/default.nix | 53 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 +
 2 files changed, 55 insertions(+)
 create mode 100644 pkgs/tools/networking/s6-dns/default.nix

diff --git a/pkgs/tools/networking/s6-dns/default.nix b/pkgs/tools/networking/s6-dns/default.nix
new file mode 100644
index 000000000000..3165434de3da
--- /dev/null
+++ b/pkgs/tools/networking/s6-dns/default.nix
@@ -0,0 +1,53 @@
+{ stdenv, fetchurl, skalibs }:
+
+let
+
+  version = "0.1.0.0";
+
+in stdenv.mkDerivation rec {
+
+  name = "s6-dns-${version}";
+
+  src = fetchurl {
+    url = "http://www.skarnet.org/software/s6-dns/${name}.tar.gz";
+    sha256 = "1r82l5fnz2rrwm5wq2sldqp74lk9fifr0d8hyq98xdyh24hish68";
+  };
+
+  buildInputs = [ skalibs ];
+
+  sourceRoot = "web/${name}";
+
+  configurePhase = ''
+    pushd conf-compile
+
+    printf "$out/bin"           > conf-install-command
+    printf "$out/include"       > conf-install-include
+    printf "$out/lib"           > conf-install-library
+    printf "$out/lib"           > conf-install-library.so
+
+    # let nix builder strip things, cross-platform
+    truncate --size 0 conf-stripbins
+    truncate --size 0 conf-striplibs
+
+    printf "${skalibs}/sysdeps"      > import
+    printf "%s" "${skalibs}/include" > path-include
+    printf "%s" "${skalibs}/lib"     > path-library
+
+    rm -f flag-slashpackage
+    touch flag-allstatic
+
+    popd
+  '';
+
+  preBuild = ''
+    patchShebangs src/sys
+  '';
+
+  meta = {
+    homepage = http://www.skarnet.org/software/s6-dns/;
+    description = "A suite of DNS client programs and libraries for Unix systems.";
+    platforms = stdenv.lib.platforms.all;
+    license = stdenv.lib.licenses.isc;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5aa699805f37..14f41703f4dd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2051,6 +2051,8 @@ let
     ruby = ruby18;
   };
 
+  s6Dns = callPackage ../tools/networking/s6-dns { };
+
   s6PortableUtils = callPackage ../tools/misc/s6-portable-utils { };
 
   sablotron = callPackage ../tools/text/xml/sablotron { };

From 9247013255acfe2a81c5a6fa7c1bee1febef7d09 Mon Sep 17 00:00:00 2001
From: Patrick Mahoney <pat@polycrystal.org>
Date: Sat, 30 Aug 2014 00:07:45 -0500
Subject: [PATCH 0837/1453] s6-networking: new package

s6-networking is a suite of small networking utilities for Unix systems
including UCSPI Unix and TCP tools, access control tools, and network
time management utilities.
---
 .../networking/s6-networking/default.nix      | 63 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 65 insertions(+)
 create mode 100644 pkgs/tools/networking/s6-networking/default.nix

diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix
new file mode 100644
index 000000000000..3d5e3e048110
--- /dev/null
+++ b/pkgs/tools/networking/s6-networking/default.nix
@@ -0,0 +1,63 @@
+{ stdenv
+, execline
+, fetchurl
+, s6Dns
+, skalibs
+}:
+
+let
+
+  version = "0.1.0.0";
+
+in stdenv.mkDerivation rec {
+
+  name = "s6-networking-${version}";
+
+  src = fetchurl {
+    url = "http://www.skarnet.org/software/s6-networking/${name}.tar.gz";
+    sha256 = "1np9m2j1i2450mbcjvpbb56kv3wc2fbyvmv2a039q61j2lk6vjz7";
+  };
+
+  buildInputs = [ skalibs s6Dns execline ];
+
+  sourceRoot = "net/${name}";
+
+  configurePhase = ''
+    pushd conf-compile
+
+    printf "$out/bin"           > conf-install-command
+    printf "$out/include"       > conf-install-include
+    printf "$out/lib"           > conf-install-library
+    printf "$out/lib"           > conf-install-library.so
+
+    # let nix builder strip things, cross-platform
+    truncate --size 0 conf-stripbins
+    truncate --size 0 conf-striplibs
+
+    printf "${skalibs}/sysdeps"      > import
+
+    rm -f path-include
+    rm -f path-library
+    for dep in "${execline}" "${s6Dns}" "${skalibs}"; do
+      printf "%s\n" "$dep/include" >> path-include
+      printf "%s\n" "$dep/lib"     >> path-library
+    done
+
+    rm -f flag-slashpackage
+    touch flag-allstatic
+
+    popd
+  '';
+
+  preBuild = ''
+    patchShebangs src/sys
+  '';
+
+  meta = {
+    homepage = http://www.skarnet.org/software/s6-networking/;
+    description = "A suite of small networking utilities for Unix systems.";
+    platforms = stdenv.lib.platforms.all;
+    license = stdenv.lib.licenses.isc;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 14f41703f4dd..bf0cc411e1dd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2053,6 +2053,8 @@ let
 
   s6Dns = callPackage ../tools/networking/s6-dns { };
 
+  s6Networking = callPackage ../tools/networking/s6-networking { };
+
   s6PortableUtils = callPackage ../tools/misc/s6-portable-utils { };
 
   sablotron = callPackage ../tools/text/xml/sablotron { };

From b5f33dc13379ef2821d9e40a74206f22e8501cbb Mon Sep 17 00:00:00 2001
From: Patrick Mahoney <pat@polycrystal.org>
Date: Sat, 30 Aug 2014 00:12:38 -0500
Subject: [PATCH 0838/1453] s6-linux-utils: new package

s6-linux-utils is a set of minimalistic Linux-specific system utilities.
---
 .../linux/s6-linux-utils/default.nix          | 53 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 55 insertions(+)
 create mode 100644 pkgs/os-specific/linux/s6-linux-utils/default.nix

diff --git a/pkgs/os-specific/linux/s6-linux-utils/default.nix b/pkgs/os-specific/linux/s6-linux-utils/default.nix
new file mode 100644
index 000000000000..0f0967079dfb
--- /dev/null
+++ b/pkgs/os-specific/linux/s6-linux-utils/default.nix
@@ -0,0 +1,53 @@
+{ stdenv, fetchurl, skalibs }:
+
+let
+
+  version = "1.0.3.1";
+
+in stdenv.mkDerivation rec {
+
+  name = "s6-linux-utils-${version}";
+
+  src = fetchurl {
+    url = "http://www.skarnet.org/software/s6-linux-utils/${name}.tar.gz";
+    sha256 = "1s17g03z5hfpiz32g001g5wyamyvn9l36fr2csk3k7r0jkqfnl0d";
+  };
+
+  buildInputs = [ skalibs ];
+
+  sourceRoot = "admin/${name}";
+
+  configurePhase = ''
+    pushd conf-compile
+
+    printf "$out/bin"           > conf-install-command
+    printf "$out/include"       > conf-install-include
+    printf "$out/lib"           > conf-install-library
+    printf "$out/lib"           > conf-install-library.so
+
+    # let nix builder strip things, cross-platform
+    truncate --size 0 conf-stripbins
+    truncate --size 0 conf-striplibs
+
+    printf "${skalibs}/sysdeps"      > import
+    printf "%s" "${skalibs}/include" > path-include
+    printf "%s" "${skalibs}/lib"     > path-library
+
+    rm -f flag-slashpackage
+    touch flag-allstatic
+
+    popd
+  '';
+
+  preBuild = ''
+    patchShebangs src/sys
+  '';
+
+  meta = {
+    homepage = http://www.skarnet.org/software/s6-linux-utils/;
+    description = "A set of minimalistic Linux-specific system utilities.";
+    platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.isc;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bf0cc411e1dd..a29145144a10 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2053,6 +2053,8 @@ let
 
   s6Dns = callPackage ../tools/networking/s6-dns { };
 
+  s6LinuxUtils = callPackage ../os-specific/linux/s6-linux-utils { };
+
   s6Networking = callPackage ../tools/networking/s6-networking { };
 
   s6PortableUtils = callPackage ../tools/misc/s6-portable-utils { };

From f7aa6e1140fcc1e006a0030ae00b7e5ca646ae25 Mon Sep 17 00:00:00 2001
From: Philip Horger <campadrenalin@gmail.com>
Date: Sun, 24 Aug 2014 13:43:53 -0700
Subject: [PATCH 0839/1453] Fix pianobar license to be accurate (MIT)

This was broken, in a well-intentioned way, in 9350c1d. The maintainer
believed that the Pandora license was in conflict with nixpkg's rights
to build the package, and that it would be safer to avoid picking a
fight. However well-intentioned, though, it was still inaccurate and
unnecessary to change the metadata for the package nixexpr. I will
attempt to support this assertion through several arguments that should
hopefully be independent, such that any one of them would be convincing
enough in isolation to merit merging this commit.

1. The limits of Pandora's TOS

The legal agreement between Pandora and its users applies to the user,
not to third parties. It definitely does not have such an outrageous
scope that Pandora should be allowed to dictate what we may or may not
compile.

Furthermore, most TOS and EULA documents are completely (or at least
mostly) legally bunk. They are constructed such that using any website
or software in a typical manner will result in a violation, and the
consequences for violation are then enforced selectively. However,
when such issues go to court, the court regularly favors the user.
Legal precedent generally follows that such agreements are non-binding
scare tactics, rather than enforceable contracts.

2. Most software can be used for evil

If I buy a lockpick kit, it may have a fully open-source hardware
design, be 3D-print-able, etc. And as long as I don't use it to break
into someone else's home, it is perfectly appropriate for me to
manufacture as many copies as I want, and contribute improvements
upstream.

Conversely, if I do misuse the tools, and I am prosecuted, the person
who made the designs available online is *not* responsible for how I
used them.

If we only package things that cannot be used for evil, we'll have to
stop shipping the Linux kernel, and that could make things...
complicated. But it certainly would discourage the NSA from using NixOS.

3. Intent doesn't matter

There was an argument, in channel, that pianobar's intent is entirely
or predominantly illegal. This is not true, as I'll explain shortly,
but I'd first like to explain why intent does not matter.

First of all, intent is subjective. If someone bumps me on the street,
I may infer ill intent. But from the other person's perspective, she's
just in a rush to get from Point A to Point B.

Second, intent is not related to consequences or development
methodology. Ill intent may lead to positive consequences, and vice
versa, and in all cases the subjectivity argument applies (good for
whom? bad for whom?).

4. Pianobar does not have bad intent

Just look at the project page:

    http://6xq.net/projects/pianobar/

The "most important" means of contribution, according to author, is
keeping Pandora alive. In fact, monetary donations of any kind will not
be accepted.

This seems like it's in conflict with one of the most popular features
of the software - an ad-free experience. But pianobar actually has a
better experience when you have a paid Pandora account - higher-quality
streams become available. Pianobar is fully compatible with paid
accounts, and if the developer does not pay for his Pandora account, I
will eat my hat.

Furthermore, a command line client enables more people to use Pandora in
more ways than the stock Pandora client allows. The stock client is
written in Flash, and is slow, resource-hungry, and useless on a
headless server. Pianobar can be used on just about any hardware, and
there are several hardware recipes listed on the project page which
provide straightforward Pandora-based music appliances, using pianobar's
minimal footprint and remote-control-ability.

Because it opens up more use cases and improves the experience for paid
users, it's actually arguable whether pianobar is "bad for Pandora",
when it clearly *could* be the opposite. It is also probably fair to
note that pianobar has been around for awhile, and Pandora has never
expressed an interest in picking a legal fight with it, or even blocking
pianobar from working.

5. Pianobar's source really is MIT-licensed

It is disingenuous to say that pianobar is nonfree. It's absolutely free
software, you can verify the license content against the MIT license
text for yourself. It is developed and distributed as free and open
source software.

The extent of its 'nonfreedom' is that it interacts with a nonfree
service, in ways that the nonfree service may not allow for in their
TOS. To block it on these grounds, would be like blocking Libreoffice
for its Microsoft Word compatibility, or preventing users from visiting
websites that say "this site only for use with IE7".

------------

In summary, we should strive for technical accuracy, rather than
allowing a third-party pseudocontract that does not apply to us, to
dictate what we may or may not package for our users (who may or may not
use it in a way that benefits Pandora).
---
 pkgs/applications/audio/pianobar/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/pianobar/default.nix b/pkgs/applications/audio/pianobar/default.nix
index a9f4b02fa083..b2f44513bbaa 100644
--- a/pkgs/applications/audio/pianobar/default.nix
+++ b/pkgs/applications/audio/pianobar/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
     description = "A console front-end for Pandora.com";
     homepage = "http://6xq.net/projects/pianobar/";
     platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.unfree;
+    license = stdenv.lib.licenses.mit;
   };
 }

From 3f0ebe7e7542c5cb81acfeffb025f9ab1a5a755a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 30 Aug 2014 07:28:26 +0200
Subject: [PATCH 0840/1453] licenses: comment about two versions of MIT

I decided to follow spdx.org and not to differentiate those two.
Packages would often have the wrong version anyway.
---
 lib/licenses.nix                             | 2 ++
 pkgs/applications/audio/pianobar/default.nix | 2 +-
 pkgs/development/libraries/expat/default.nix | 5 +++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/licenses.nix b/lib/licenses.nix
index 812592c74f27..bdcf8a7b8a7b 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -194,6 +194,8 @@ rec {
     fullName = "Lucent Public License v1.02";
   };
 
+  # spdx.org does not (yet) differentiate between the X11 and Expat versions
+  # for details see http://en.wikipedia.org/wiki/MIT_License#Various_versions
   mit = spdx {
     shortName = "MIT";
     fullName = "MIT License";
diff --git a/pkgs/applications/audio/pianobar/default.nix b/pkgs/applications/audio/pianobar/default.nix
index b2f44513bbaa..a91f25126c1f 100644
--- a/pkgs/applications/audio/pianobar/default.nix
+++ b/pkgs/applications/audio/pianobar/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
     description = "A console front-end for Pandora.com";
     homepage = "http://6xq.net/projects/pianobar/";
     platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.mit;
+    license = stdenv.lib.licenses.mit; # expat version
   };
 }
diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix
index d7915a93962c..9a49225d1723 100644
--- a/pkgs/development/libraries/expat/default.nix
+++ b/pkgs/development/libraries/expat/default.nix
@@ -8,9 +8,10 @@ stdenv.mkDerivation rec {
     sha256 = "11pblz61zyxh68s5pdcbhc30ha1b2vfjd83aiwfg4vc15x3hadw2";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.libexpat.org/;
     description = "A stream-oriented XML parser library written in C";
-    platforms = stdenv.lib.platforms.all;
+    platforms = platforms.all;
+    license = licenses.mit; # expat version
   };
 }

From 685cded7b5b4d9dc426cd25f942324738b587e22 Mon Sep 17 00:00:00 2001
From: Longrin Wischnewski <robberer@freakmail.de>
Date: Sat, 30 Aug 2014 09:14:19 +0200
Subject: [PATCH 0841/1453] nanoblogger: adding version 3.5-rc1

---
 .../applications/misc/nanoblogger/default.nix | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/applications/misc/nanoblogger/default.nix

diff --git a/pkgs/applications/misc/nanoblogger/default.nix b/pkgs/applications/misc/nanoblogger/default.nix
new file mode 100644
index 000000000000..e910c9ed22e1
--- /dev/null
+++ b/pkgs/applications/misc/nanoblogger/default.nix
@@ -0,0 +1,29 @@
+{ fetchurl, stdenv, bash }:
+
+stdenv.mkDerivation rec {
+  version = "3.5-rc1";
+  name = "nanoblogger-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/nanoblogger/${name}.tar.gz";
+    sha256 = "09mv52a5f0h3das8x96irqyznm69arfskx472b7w3b9q4a2ipxbq";
+  };
+
+  buildInputs = [ ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -r * $out
+    cat > $out/bin/nb << EOF 
+    #!${bash}/bin/bash
+    $out/nb "\$@"
+    EOF
+    chmod 755 $out/bin/nb
+  '';
+
+  meta = {
+    description = "Small weblog engine written in Bash for the command line";
+    homepage = http://nanoblogger.sourceforge.net/;
+    license = stdenv.lib.licenses.gpl2;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0a97c43463d4..0fef9addc71f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9427,6 +9427,8 @@ let
 
   nano = callPackage ../applications/editors/nano { };
 
+  nanoblogger = callPackage ../applications/misc/nanoblogger { };
+
   navipowm = callPackage ../applications/misc/navipowm { };
 
   navit = callPackage ../applications/misc/navit { };

From 58bc1ef3d854f47d91d800d9bcfb9a0bee6bbcf1 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 30 Aug 2014 02:56:28 +0200
Subject: [PATCH 0842/1453] chromium: Remove all NSAPI browser wrappers.

Chromium doesn't support NSAPI anymore, so it doesn't make sense to keep
the wrappers, especially because some of them trigger bugs in more
recent versions of Chromium.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/top-level/all-packages.nix | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f990524d5c82..2305a3fe98f8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8343,20 +8343,16 @@ let
 
   chatzilla = callPackage ../applications/networking/irc/chatzilla { };
 
-  chromium = lowPrio (callPackage ../applications/networking/browsers/chromium {
+  chromium = callPackage ../applications/networking/browsers/chromium {
     channel = "stable";
     pulseSupport = config.pulseaudio or true;
     enablePepperFlash = config.chromium.enablePepperFlash or false;
     enablePepperPDF = config.chromium.enablePepperPDF or false;
-  });
+  };
 
   chromiumBeta = lowPrio (chromium.override { channel = "beta"; });
-  chromiumBetaWrapper = lowPrio (wrapChromium chromiumBeta);
 
   chromiumDev = lowPrio (chromium.override { channel = "dev"; });
-  chromiumDevWrapper = lowPrio (wrapChromium chromiumDev);
-
-  chromiumWrapper = wrapChromium chromium;
 
   cinelerra = callPackage ../applications/video/cinelerra { };
 
@@ -10069,13 +10065,6 @@ let
 
   wordnet = callPackage ../applications/misc/wordnet { };
 
-  wrapChromium = browser: wrapFirefox {
-    inherit browser;
-    browserName = browser.packageName;
-    desktopName = "Chromium";
-    icon = "${browser}/share/icons/hicolor/48x48/apps/${browser.packageName}.png";
-  };
-
   wrapFirefox =
     { browser, browserName ? "firefox", desktopName ? "Firefox", nameSuffix ? ""
     , icon ? "${browser}/lib/${browser.name}/browser/icons/mozicon128.png" }:

From f175833fd62e022b9d51a66dac06676dfa15ccec Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 30 Aug 2014 03:15:57 +0200
Subject: [PATCH 0843/1453] chromium: Update beta and dev to latest versions.

beta: 37.0.2062.94 -> 38.0.2125.24 (builds fine, tested)
dev:  38.0.2125.8  -> 39.0.2138.3  (builds fine, tested)

Introduces the new version 39 and finally separates stable/beta again.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../browsers/chromium/source/sources.nix         | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix
index 71c825188c3c..27ba9420f432 100644
--- a/pkgs/applications/networking/browsers/chromium/source/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix
@@ -1,16 +1,16 @@
 # This file is autogenerated from update.sh in the parent directory.
 {
   dev = {
-    version = "38.0.2125.8";
-    sha256 = "1h3vkp0mgznqv48ksnsndlh7ywh3jby25x6dxxd7py445pg6y3c6";
-    sha256bin32 = "1ynqm5yp7m8j3mwgqaa2vvw835g9ifn3dfniqh9z9n0swha27a69";
-    sha256bin64 = "1vdm4wffkvj3jwrb2nihghxkxcvp81xcc5wygpd1w495vrhy4bpf";
+    version = "39.0.2138.3";
+    sha256 = "0adkzv4ydrg02prcacqx3gk8v0ivvs57qisf220wzzicgpzklm26";
+    sha256bin32 = "0rskbr55nhvpmmw6bl90iv2lr0f2chra3r5c92j3ica307y12f2q";
+    sha256bin64 = "0gdyyaxiaq50jpwhvai6d67ypgjxqn8kp9fqix6nbwj4fnmdfcjx";
   };
   beta = {
-    version = "37.0.2062.94";
-    sha256 = "0cz5kivimxcaiml6x5mysarjyfvvanbw02qz2d1y3jvl1dc1jz6j";
-    sha256bin32 = "0pa209sjdfb0y96kicvp4lnn1inwdcgj8kpmn28cmi8l1cr8yy3b";
-    sha256bin64 = "0kk2dm2gwvzvrrp03k7cw6zzp3197lrq2p1si3pr2wbgm8sb5dk5";
+    version = "38.0.2125.24";
+    sha256 = "07v4vk7sc54d2hzgfms0b71cc7z6h85v9d39j110kzk0w1bpk3gy";
+    sha256bin32 = "0l26ci7sqi755cm017qmbcqk74rqja5c08cbzf5v4chsa773qn0m";
+    sha256bin64 = "1ibx40ijjj8z0smpzh5v6y611c57qm5raldk48h5dd1flqbgz0nr";
   };
   stable = {
     version = "37.0.2062.94";

From a283bec71cec60c2b9c84ea9af320fc8df0dfd5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 30 Aug 2014 09:44:07 +0200
Subject: [PATCH 0844/1453] glibc: fix CVE-2014-5119 by Debian patch

---
 .../libraries/glibc/2.19/common.nix           |   1 +
 .../libraries/glibc/2.19/cve-2014-5119.patch  | 206 ++++++++++++++++++
 2 files changed, 207 insertions(+)
 create mode 100644 pkgs/development/libraries/glibc/2.19/cve-2014-5119.patch

diff --git a/pkgs/development/libraries/glibc/2.19/common.nix b/pkgs/development/libraries/glibc/2.19/common.nix
index cd1ba747d7c6..a828148c3d5f 100644
--- a/pkgs/development/libraries/glibc/2.19/common.nix
+++ b/pkgs/development/libraries/glibc/2.19/common.nix
@@ -60,6 +60,7 @@ stdenv.mkDerivation ({
       ./fix-math.patch
 
       ./cve-2014-0475.patch
+      ./cve-2014-5119.patch
     ];
 
   postPatch = ''
diff --git a/pkgs/development/libraries/glibc/2.19/cve-2014-5119.patch b/pkgs/development/libraries/glibc/2.19/cve-2014-5119.patch
new file mode 100644
index 000000000000..cbae03425eb9
--- /dev/null
+++ b/pkgs/development/libraries/glibc/2.19/cve-2014-5119.patch
@@ -0,0 +1,206 @@
+http://anonscm.debian.org/viewvc/pkg-glibc/glibc-package/trunk/debian/patches/any/cvs-CVE-2014-5119.diff?revision=6248&view=co
+
+commit a1a6a401ab0a3c9f15fb7eaebbdcee24192254e8
+Author: Florian Weimer <fweimer@redhat.com>
+Date:   Tue Aug 26 19:38:59 2014 +0200
+
+    __gconv_translit_find: Disable function [BZ #17187]
+    
+    This functionality has never worked correctly, and the implementation
+    contained a security vulnerability (CVE-2014-5119).
+
+2014-08-26  Florian Weimer  <fweimer@redhat.com>
+
+	[BZ #17187]
+	* iconv/gconv_trans.c (struct known_trans, search_tree, lock,
+	trans_compare, open_translit, __gconv_translit_find):
+	Remove module loading code.
+
+--- a/iconv/gconv_trans.c
++++ b/iconv/gconv_trans.c
+@@ -238,181 +238,12 @@ __gconv_transliterate (struct __gconv_step *step,
+   return __GCONV_ILLEGAL_INPUT;
+ }
+ 
+-
+-/* Structure to represent results of found (or not) transliteration
+-   modules.  */
+-struct known_trans
+-{
+-  /* This structure must remain the first member.  */
+-  struct trans_struct info;
+-
+-  char *fname;
+-  void *handle;
+-  int open_count;
+-};
+-
+-
+-/* Tree with results of previous calls to __gconv_translit_find.  */
+-static void *search_tree;
+-
+-/* We modify global data.   */
+-__libc_lock_define_initialized (static, lock);
+-
+-
+-/* Compare two transliteration entries.  */
+-static int
+-trans_compare (const void *p1, const void *p2)
+-{
+-  const struct known_trans *s1 = (const struct known_trans *) p1;
+-  const struct known_trans *s2 = (const struct known_trans *) p2;
+-
+-  return strcmp (s1->info.name, s2->info.name);
+-}
+-
+-
+-/* Open (maybe reopen) the module named in the struct.  Get the function
+-   and data structure pointers we need.  */
+-static int
+-open_translit (struct known_trans *trans)
+-{
+-  __gconv_trans_query_fct queryfct;
+-
+-  trans->handle = __libc_dlopen (trans->fname);
+-  if (trans->handle == NULL)
+-    /* Not available.  */
+-    return 1;
+-
+-  /* Find the required symbol.  */
+-  queryfct = __libc_dlsym (trans->handle, "gconv_trans_context");
+-  if (queryfct == NULL)
+-    {
+-      /* We cannot live with that.  */
+-    close_and_out:
+-      __libc_dlclose (trans->handle);
+-      trans->handle = NULL;
+-      return 1;
+-    }
+-
+-  /* Get the context.  */
+-  if (queryfct (trans->info.name, &trans->info.csnames, &trans->info.ncsnames)
+-      != 0)
+-    goto close_and_out;
+-
+-  /* Of course we also have to have the actual function.  */
+-  trans->info.trans_fct = __libc_dlsym (trans->handle, "gconv_trans");
+-  if (trans->info.trans_fct == NULL)
+-    goto close_and_out;
+-
+-  /* Now the optional functions.  */
+-  trans->info.trans_init_fct =
+-    __libc_dlsym (trans->handle, "gconv_trans_init");
+-  trans->info.trans_context_fct =
+-    __libc_dlsym (trans->handle, "gconv_trans_context");
+-  trans->info.trans_end_fct =
+-    __libc_dlsym (trans->handle, "gconv_trans_end");
+-
+-  trans->open_count = 1;
+-
+-  return 0;
+-}
+-
+-
+ int
+ internal_function
+ __gconv_translit_find (struct trans_struct *trans)
+ {
+-  struct known_trans **found;
+-  const struct path_elem *runp;
+-  int res = 1;
+-
+-  /* We have to have a name.  */
+-  assert (trans->name != NULL);
+-
+-  /* Acquire the lock.  */
+-  __libc_lock_lock (lock);
+-
+-  /* See whether we know this module already.  */
+-  found = __tfind (trans, &search_tree, trans_compare);
+-  if (found != NULL)
+-    {
+-      /* Is this module available?  */
+-      if ((*found)->handle != NULL)
+-	{
+-	  /* Maybe we have to reopen the file.  */
+-	  if ((*found)->handle != (void *) -1)
+-	    /* The object is not unloaded.  */
+-	    res = 0;
+-	  else if (open_translit (*found) == 0)
+-	    {
+-	      /* Copy the data.  */
+-	      *trans = (*found)->info;
+-	      (*found)->open_count++;
+-	      res = 0;
+-	    }
+-	}
+-    }
+-  else
+-    {
+-      size_t name_len = strlen (trans->name) + 1;
+-      int need_so = 0;
+-      struct known_trans *newp;
+-
+-      /* We have to continue looking for the module.  */
+-      if (__gconv_path_elem == NULL)
+-	__gconv_get_path ();
+-
+-      /* See whether we have to append .so.  */
+-      if (name_len <= 4 || memcmp (&trans->name[name_len - 4], ".so", 3) != 0)
+-	need_so = 1;
+-
+-      /* Create a new entry.  */
+-      newp = (struct known_trans *) malloc (sizeof (struct known_trans)
+-					    + (__gconv_max_path_elem_len
+-					       + name_len + 3)
+-					    + name_len);
+-      if (newp != NULL)
+-	{
+-	  char *cp;
+-
+-	  /* Clear the struct.  */
+-	  memset (newp, '\0', sizeof (struct known_trans));
+-
+-	  /* Store a copy of the module name.  */
+-	  newp->info.name = cp = (char *) (newp + 1);
+-	  cp = __mempcpy (cp, trans->name, name_len);
+-
+-	  newp->fname = cp;
+-
+-	  /* Search in all the directories.  */
+-	  for (runp = __gconv_path_elem; runp->name != NULL; ++runp)
+-	    {
+-	      cp = __mempcpy (__stpcpy ((char *) newp->fname, runp->name),
+-			      trans->name, name_len);
+-	      if (need_so)
+-		memcpy (cp, ".so", sizeof (".so"));
+-
+-	      if (open_translit (newp) == 0)
+-		{
+-		  /* We found a module.  */
+-		  res = 0;
+-		  break;
+-		}
+-	    }
+-
+-	  if (res)
+-	    newp->fname = NULL;
+-
+-	  /* In any case we'll add the entry to our search tree.  */
+-	  if (__tsearch (newp, &search_tree, trans_compare) == NULL)
+-	    {
+-	      /* Yickes, this should not happen.  Unload the object.  */
+-	      res = 1;
+-	      /* XXX unload here.  */
+-	    }
+-	}
+-    }
+-
+-  __libc_lock_unlock (lock);
+-
+-  return res;
++  /* Transliteration module loading has been removed because it never
++     worked as intended and suffered from a security vulnerability.
++     Consequently, this function always fails.  */
++  return 1;
+ }

From d8727a927ad5deecabce0cc7ae90b46065b33a3f Mon Sep 17 00:00:00 2001
From: Longrin Wischnewski <robberer@freakmail.de>
Date: Sat, 30 Aug 2014 10:00:12 +0200
Subject: [PATCH 0845/1453] Symbola: fix download url's, adjust installPhase
 and meta

---
 pkgs/data/fonts/symbola/default.nix | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/pkgs/data/fonts/symbola/default.nix b/pkgs/data/fonts/symbola/default.nix
index 993a4c4f46d6..b324e52d0212 100644
--- a/pkgs/data/fonts/symbola/default.nix
+++ b/pkgs/data/fonts/symbola/default.nix
@@ -1,40 +1,39 @@
-{stdenv, fetchurl}:
+{stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
   name = "symbola-7.12";
 
-  ttf = fetchurl {
-    url = "http://users.teilar.gr/~g1951d/Symbola.ttf";
-    sha256 = "7acc058bd4e56cc986b2a46420520f59be402c3565c202b5dcebca7f3bfd8b5a";
+  src = fetchurl {
+    url = "http://users.teilar.gr/~g1951d/Symbola.zip";
+    sha256 = "19q5wcqk1rz8ps7jvvx1rai6x8ais79z71sm8d36hvsk2vr135al";
   };
   docs_pdf = fetchurl {
     url = "http://users.teilar.gr/~g1951d/Symbola.pdf";
-    sha256 = "11bb082ba5c2780a6f94a9bcddf4f314a54e2650bb63ce3081d1dc867c5e6843";
-  };
-  docs_docx = fetchurl {
-    url = "http://users.teilar.gr/~g1951d/Symbola.docx";
-    sha256 = "4f0ab494e1e5a7aac147aa7bb8b8bdba7278aee2da942a35f995feb9051515b9";
+    sha256 = "11h2202p1p4np4nv5m8k41wk7431p2m35sjpmbi1ygizakkbla3p";
   };
 
+  buildInputs = [ unzip ];
+
   phases = [ "installPhase" ];
 
   installPhase = ''
+    unzip ${src}
     mkdir -p $out/share/fonts/truetype
-    cp -v "$ttf" $out/share/fonts/truetype/"${ttf.name}"
+    cp -v Symbola.ttf $out/share/fonts/truetype/
+    cp -v Symbola_hint.ttf $out/share/fonts/truetype/
 
     mkdir -p "$out/doc/${name}"
+    cp -v Symbola.docx "$out/doc/${name}/"
+    cp -v Symbola.htm "$out/doc/${name}/"
     cp -v "$docs_pdf" "$out/doc/${name}/${docs_pdf.name}"
-    cp -v "$docs_docx" "$out/doc/${name}/${docs_docx.name}"
   '';
 
   meta = {
-    description = "Basic Latin, Greek, Cyrillic and many Symbol blocks of Unicode...";
-
+    description = "Basic Latin, Greek, Cyrillic and many Symbol blocks of Unicode";
     # In lieu of a licence:
     # Fonts in this site are offered free for any use;
     # they may be installed, embedded, opened, edited, modified, regenerated, posted, packaged and redistributed.
-    license = "Unicode Fonts for Ancient Scripts";
-
+    license = stdenv.lib.licenses.free;
     homepage = http://users.teilar.gr/~g1951d/;
   };
 }

From fccf486762eb7213a27b4d265ef7eaf2487e7406 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 30 Aug 2014 10:17:40 +0200
Subject: [PATCH 0846/1453] libav: maintenance+security update

CVE-2013-{0848,3672,3674,7020} and CVE-2014-{2098,2263}
---
 pkgs/development/libraries/libav/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix
index 2f9e1786473e..264868e4a973 100644
--- a/pkgs/development/libraries/libav/default.nix
+++ b/pkgs/development/libraries/libav/default.nix
@@ -28,7 +28,7 @@ let
   result = {
     libav_0_8 = libavFun "0.8.13" "1fr3rzykrlm1cla0csm9hqa3gcqp19hf5rgn70nyb9w92r67v685";
     libav_9   = libavFun   "9.16" "18378gdgzqsxaacc9vl7ligwndbdvy95wbn50hs8xvdqn1rn916a";
-    libav_10  = libavFun  "10.3"  "1fq83rc5534fjqjlhkw5i9k54dmyqn2pgvyillm6pws8rkn9yb5r";
+    libav_10  = libavFun  "10.4"  "1zzvjfdlv9swhq7dzvli1pk8cn02q1076ax9m3cx9ipilbg21639";
   };
 
   libavFun = version : sha256 : stdenv.mkDerivation rec {

From 20aacf89a3d197bee10cc8e2d672a8e33f73d296 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 30 Aug 2014 10:25:16 +0200
Subject: [PATCH 0847/1453] libpng: code-cleanup update

---
 pkgs/development/libraries/libpng/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix
index 1f04ae8fca54..3f8622535dbf 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/pkgs/development/libraries/libpng/default.nix
@@ -3,11 +3,11 @@
 assert zlib != null;
 
 let
-  version = "1.6.12";
-  sha256 = "0pkcirbfzhqqsm3hr2alxprw5n22a836qk4df1jnns6jk79gcby3";
+  version = "1.6.13";
+  sha256 = "09g631h1f1xvrdiy36mh1034r9w46damp9jcg7nm507wlmacxj6r";
   patch_src = fetchurl {
     url = "mirror://sourceforge/libpng-apng/libpng-${version}-apng.patch.gz";
-    sha256 = "0r2vmsc4cvxisjr7jqw2vjf66isb2fhs4nnssz3l3jgdangj8wz0";
+    sha256 = "017pnxp3zhhlh6mg2yqn5xrb6dcxc5p3dp1kr46p8xx052i0hzqb";
   };
   whenPatched = stdenv.lib.optionalString apngSupport;
 

From aa3248c62e55e329ebbc271dcd1dc3a72635a4e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 30 Aug 2014 10:47:22 +0200
Subject: [PATCH 0848/1453] harfbuzz: small update

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

diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix
index 8340660e3923..45cdc5be02b1 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -8,11 +8,11 @@
 # (icu is a ~30 MB dependency, the rest is very small in comparison)
 
 stdenv.mkDerivation rec {
-  name = "harfbuzz-0.9.33";
+  name = "harfbuzz-0.9.35";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/harfbuzz/release/${name}.tar.bz2";
-    sha256 = "1iql2ghlndqgx9q6p098xf253rjz5rnrv5qniwgd1b5q0jzwa4yk";
+    sha256 = "1v86596994bnb9hx7laykhw4ipixqz9ckwzyyqf340pmlsmsi88a";
   };
 
   configureFlags = [

From 9c615653ea17c9ba45e654bc7bfae2578463cea6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 30 Aug 2014 11:07:56 +0200
Subject: [PATCH 0849/1453] axis: remove the unused vulnerable version 1.3

---
 pkgs/development/libraries/axis/builder.sh  |  5 -----
 pkgs/development/libraries/axis/default.nix | 16 ----------------
 pkgs/top-level/all-packages.nix             |  2 --
 3 files changed, 23 deletions(-)
 delete mode 100644 pkgs/development/libraries/axis/builder.sh
 delete mode 100644 pkgs/development/libraries/axis/default.nix

diff --git a/pkgs/development/libraries/axis/builder.sh b/pkgs/development/libraries/axis/builder.sh
deleted file mode 100644
index d979eb9d803b..000000000000
--- a/pkgs/development/libraries/axis/builder.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-source $stdenv/setup
-
-mkdir -p $out
-unpackPhase
-mv $directory/* $out
diff --git a/pkgs/development/libraries/axis/default.nix b/pkgs/development/libraries/axis/default.nix
deleted file mode 100644
index 62ae463b5fc8..000000000000
--- a/pkgs/development/libraries/axis/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "axis-1.3";
-  directory = "axis-1_3";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = "http://archive.apache.org/dist/ws/axis/1_3/axis-bin-1_3.tar.gz";
-    md5 = "dd8203f08c37872f4fd2bfb45c4bfe04";
-  };
-  inherit stdenv;
-
-  meta = {
-    description = "Implementation of the SOAP (Simple Object Access Protocol) submission to W3C";
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2305a3fe98f8..94928d92081c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4364,8 +4364,6 @@ let
 
   audiofile = callPackage ../development/libraries/audiofile { };
 
-  axis = callPackage ../development/libraries/axis { };
-
   babl_0_0_22 = callPackage ../development/libraries/babl/0_0_22.nix { };
 
   babl = callPackage ../development/libraries/babl { };

From 01c0be6ece84ff168a33feef08f1f69d1ce91ad7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 30 Aug 2014 11:23:50 +0200
Subject: [PATCH 0850/1453] gstreamer-1: bugfix-only update of all components

1.4.0 -> 1.4.1
---
 pkgs/development/libraries/gstreamer/bad/default.nix   | 6 +++---
 pkgs/development/libraries/gstreamer/base/default.nix  | 4 ++--
 pkgs/development/libraries/gstreamer/core/default.nix  | 6 +++---
 pkgs/development/libraries/gstreamer/good/default.nix  | 4 ++--
 pkgs/development/libraries/gstreamer/libav/default.nix | 4 ++--
 pkgs/development/libraries/gstreamer/ugly/default.nix  | 4 ++--
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index d86e450477dc..a02af7f0cd75 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, python, gst-plugins-base, orc
 , faacSupport ? false, faac ? null
 , faad2, libass, libkate, libmms
-, libmodplug, mpeg2dec, mpg123 
+, libmodplug, mpeg2dec, mpg123
 , openjpeg, libopus, librsvg
 , wildmidi, fluidsynth, libvdpau, wayland
 , libwebp, xvidcore, gnutls
@@ -10,7 +10,7 @@
 assert faacSupport -> faac != null;
 
 stdenv.mkDerivation rec {
-  name = "gst-plugins-bad-1.4.0";
+  name = "gst-plugins-bad-1.4.1";
 
   meta = with stdenv.lib; {
     description = "Gstreamer Bad Plugins";
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz";
-    sha256 = "1y821785rvr6s79cmdll66hg6h740qa2n036xid20nvjyxabfb7z";
+    sha256 = "0268db2faaf0bb22e5b709a11633abbca4f3d289b1f513bb262d0bf3f53e19ae";
   };
 
   nativeBuildInputs = [ pkgconfig python ];
diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix
index 9ae5f194fa22..3b9e94f4c658 100644
--- a/pkgs/development/libraries/gstreamer/base/default.nix
+++ b/pkgs/development/libraries/gstreamer/base/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gst-plugins-base-1.4.0";
+  name = "gst-plugins-base-1.4.1";
 
   meta = {
     description = "Base plugins and helper libraries";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz";
-    sha256 = "07jcs08hjyban0amls5s0g6i4a1hwiir1llwpqzlwkmnhfwx9bjx";
+    sha256 = "aea9e25be6691bd3cc0785d005b2b5d70ce313a2c897901680a3f7e7cab5a499";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix
index a99c0f14ecc3..8e9a2b87a017 100644
--- a/pkgs/development/libraries/gstreamer/core/default.nix
+++ b/pkgs/development/libraries/gstreamer/core/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl, pkgconfig, perl, bison, flex, python, gobjectIntrospection
-, glib 
+, glib
 }:
 
 stdenv.mkDerivation rec {
-  name = "gstreamer-1.4.0";
+  name = "gstreamer-1.4.1";
 
   meta = {
     description = "Open source multimedia framework";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gstreamer/${name}.tar.xz";
-    sha256 = "15f68pn2b47x543ih7hj59czgzl4af14j15bgjq8ky145gf9zhr3";
+    sha256 = "5638f75003282135815c0077d491da11e9a884ad91d4ba6ab3cc78bae0fb452e";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix
index 69ffa81cb25b..176814c5ecd1 100644
--- a/pkgs/development/libraries/gstreamer/good/default.nix
+++ b/pkgs/development/libraries/gstreamer/good/default.nix
@@ -7,7 +7,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gst-plugins-good-1.4.0";
+  name = "gst-plugins-good-1.4.1";
 
   meta = with stdenv.lib; {
     description = "Gstreamer Good Plugins";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz";
-    sha256 = "11965w4zr0jvrsnw33rbcc8d20dlh368rz0x16d2iypzhxwjx9j8";
+    sha256 = "8559d4270065b30ed5c49b826e1b7a3a2bd5ee9a340ae745a2ae3f9718e4c637";
   };
 
   nativeBuildInputs = [ pkgconfig python ];
diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix
index ee4b3c392ddb..e25492c1d13b 100644
--- a/pkgs/development/libraries/gstreamer/libav/default.nix
+++ b/pkgs/development/libraries/gstreamer/libav/default.nix
@@ -6,7 +6,7 @@
 assert withSystemLibav -> libav != null;
 
 stdenv.mkDerivation rec {
-  name = "gst-libav-1.4.0";
+  name = "gst-libav-1.4.1";
 
   meta = {
     homepage = "http://gstreamer.freedesktop.org";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-libav/${name}.tar.xz";
-    sha256 = "1073p7xdpr3pwyx37fnldfni908apnq3k9fbqmxf5wk3g1jplb68";
+    sha256 = "fc125521187fa84f3210269a0eecc51f8a856802f1ca4bb251f118dab90c5a9d";
   };
 
   configureFlags = stdenv.lib.optionalString withSystemLibav
diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix
index da37280af99e..6a80514e8a1c 100644
--- a/pkgs/development/libraries/gstreamer/ugly/default.nix
+++ b/pkgs/development/libraries/gstreamer/ugly/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gst-plugins-ugly-1.4.0";
+  name = "gst-plugins-ugly-1.4.1";
 
   meta = with stdenv.lib; {
     description = "Gstreamer Ugly Plugins";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz";
-    sha256 = "0kblc5f4n0mh2sw8dhf7c9dg3wzm7a0p7pqpcff7n6ixy5hbn52k";
+    sha256 = "25440435ac4ed795d213f2420a0e7355e4a2e2e76d1f9d020b2073f815e8b071";
   };
 
   nativeBuildInputs = [ pkgconfig python ];

From 1f9d579c78c9c4e62cf19ea64f9154f2c1fc8bb5 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 30 Aug 2014 14:34:42 +0400
Subject: [PATCH 0851/1453] =?UTF-8?q?Adding=20gulp=20and=20git-run=20to=20?=
 =?UTF-8?q?node-packages.json=20=E2=80=94=20failed=20to=20regenerate=20nod?=
 =?UTF-8?q?e-packages-generated.nix,=20though;=20but=20the=20next=20succes?=
 =?UTF-8?q?ful=20regeneration=20will=20actually=20add=20these=20packages?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/top-level/node-packages.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json
index fec7884eb251..1ebb9f290b71 100644
--- a/pkgs/top-level/node-packages.json
+++ b/pkgs/top-level/node-packages.json
@@ -83,6 +83,7 @@
 , "grunt-contrib-uglify"
 , "grunt-karma"
 , "grunt-sed"
+, "gulp"
 , "karma"
 , "karma-mocha"
 , "karma-coverage"
@@ -123,4 +124,5 @@
 , "sinon"
 , "shelljs"
 , "typescript"
+, "git-run"
 ]

From 33cbd6687c32d1a849cdf3f4c7ee0863edc46477 Mon Sep 17 00:00:00 2001
From: Longrin Wischnewski <robberer@freakmail.de>
Date: Fri, 22 Aug 2014 13:24:18 +0200
Subject: [PATCH 0852/1453] wxhexeditor: adding version 0.22

wxhexeditor: add the package to all-packages.nix

wxhexeditor: fix shebang
---
 .../editors/wxhexeditor/default.nix           | 41 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/applications/editors/wxhexeditor/default.nix

diff --git a/pkgs/applications/editors/wxhexeditor/default.nix b/pkgs/applications/editors/wxhexeditor/default.nix
new file mode 100644
index 000000000000..de423987c02b
--- /dev/null
+++ b/pkgs/applications/editors/wxhexeditor/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, wxGTK, autoconf, automake, libtool, python, gettext, bash }:
+
+stdenv.mkDerivation rec {
+  name = "wxHexEditor-${version}";
+  version = "v0.22";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/wxhexeditor/${name}-src.tar.bz2";
+    sha256 = "15ir038g4lyw1q5bsay974hvj0nkg2yd9kccwxz808cd45fp411w";
+  };
+
+  buildInputs = [ wxGTK autoconf automake libtool python gettext ];
+
+  patchPhase = ''
+    substituteInPlace Makefile --replace "/usr/local" "$out"
+    substituteInPlace Makefile --replace "mhash; ./configure" "mhash; ./configure --prefix=$out"
+    substituteInPlace udis86/autogen.sh --replace "/bin/bash" "${bash}/bin/bash"
+  '';
+
+  buildPhase = ''
+    make OPTFLAGS="-fopenmp"
+
+  '';
+
+  meta = {
+    description = "Hex Editor / Disk Editor for Huge Files or Devices";
+    longDescription = ''
+      This is not an ordinary hex editor, but could work as low level disk editor too.
+      If you have problems with your HDD or partition, you can recover your data from HDD or
+      from partition via editing sectors in raw hex.
+      You can edit your partition tables or you could recover files from File System by hand
+      with help of wxHexEditor.
+      Or you might want to analyze your big binary files, partitions, devices... If you need
+      a good reverse engineer tool like a good hex editor, you welcome.
+      wxHexEditor could edit HDD/SDD disk devices or partitions in raw up to exabyte sizes.
+    '';
+    homepage = "http://www.wxhexeditor.org/";
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 94928d92081c..f9c1b56c309d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10091,6 +10091,8 @@ let
       gtk_modules = [ libcanberra ];
     };
 
+  wxhexeditor = callPackage ../applications/editors/wxhexeditor { };
+
   x11vnc = callPackage ../tools/X11/x11vnc { };
 
   x2vnc = callPackage ../tools/X11/x2vnc { };

From fcafdd27616b91049c506441802b9cfe970388d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 30 Aug 2014 13:28:44 +0200
Subject: [PATCH 0853/1453] stdenv/setup.sh: unbreak *.lz sources on darwin

---
 pkgs/stdenv/generic/setup.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index c3b9033b49a6..94a73680e3ed 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -450,6 +450,10 @@ unpackFile() {
             # Don't rely on tar knowing about .xz.
             xz -d < $curSrc | tar xf -
             ;;
+        *.tar.lz )
+            # Don't rely on tar knowing about .lz.
+            lzip -d < $curSrc | tar xf -
+            ;;
         *.tar | *.tar.* | *.tgz | *.tbz2)
             # GNU tar can automatically select the decompression method
             # (info "(tar) gzip").

From 4210665c4f349d95685d14a8eacf21c3cf9e030c Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Sat, 30 Aug 2014 13:47:01 +0100
Subject: [PATCH 0854/1453] mcomix: update to 1.00

---
 pkgs/applications/graphics/mcomix/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/mcomix/default.nix b/pkgs/applications/graphics/mcomix/default.nix
index cc1fe8c3a220..53c564beec72 100644
--- a/pkgs/applications/graphics/mcomix/default.nix
+++ b/pkgs/applications/graphics/mcomix/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
     namePrefix = "";
-    name = "mcomix-0.98";
+    name = "mcomix-1.00";
 
     src = fetchurl {
       url = "mirror://sourceforge/mcomix/${name}.tar.bz2";
-      sha256 = "93805b6c8540bd673ac4a6ef6e952f00f8fc10e59a63c7e163324a64db2a6b03";
+      sha256 = "1phcdx1agacdadz8bvbibdbps1apz8idi668zmkky5cpl84k2ifq";
     };
 
     doCheck = false;
@@ -28,7 +28,7 @@ buildPythonPackage rec {
       '';
 
       homepage = http://mcomix.sourceforge.net/;
-
       license = stdenv.lib.licenses.gpl2;
+      maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
     };
 }

From 9a26b38ad30406188702603a1ce9d87948a4c1f7 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien.cassou@gmail.com>
Date: Sat, 30 Aug 2014 15:56:22 +0200
Subject: [PATCH 0855/1453] Make sure gnome-python has gnomevfs binding

---
 pkgs/desktops/gnome-2/bindings/gnome-python/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix
index ed794715ff8d..41ca17bd5e49 100644
--- a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix
+++ b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python, pkgconfig, libgnome, GConf, pygobject, pygtk, glib, gtk, pythonDBus}:
+{ stdenv, fetchurl, python, pkgconfig, libgnome, GConf, pygobject, pygtk, glib, gtk, pythonDBus,  gnome_vfs}:
 
 with stdenv.lib;
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     cp bonobo/*.{py,defs} $out/share/pygtk/2.0/defs/
   '';
 
-  buildInputs = [ python pkgconfig pygobject pygtk glib gtk GConf libgnome pythonDBus ];
+  buildInputs = [ python pkgconfig pygobject pygtk glib gtk GConf libgnome pythonDBus gnome_vfs ];
 
   doCheck = false;
 

From 7fc369cfca5cdcd3da87f807d005f42545f85fa5 Mon Sep 17 00:00:00 2001
From: Patrick Mahoney <pat@polycrystal.org>
Date: Sat, 30 Aug 2014 09:19:23 -0500
Subject: [PATCH 0856/1453] dnsmasq: Replace deprecated ensureDir with mkdir.

---
 pkgs/tools/networking/dnsmasq/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix
index 02f24ce4c003..3cfc902711ea 100644
--- a/pkgs/tools/networking/dnsmasq/default.nix
+++ b/pkgs/tools/networking/dnsmasq/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     install -Dm644 dbus/dnsmasq.conf $out/etc/dbus-1/system.d/dnsmasq.conf
     install -Dm644 trust-anchors.conf $out/share/dnsmasq/trust-anchors.conf
 
-    ensureDir $out/share/dbus-1/system-services
+    mkdir -p $out/share/dbus-1/system-services
     cat <<END > $out/share/dbus-1/system-services/uk.org.thekelleys.dnsmasq.service
     [D-BUS Service]
     Name=uk.org.thekelleys.dnsmasq

From 098c8f4c77b1ed9ea28b5aabadde24b17df8d568 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 4 Jul 2014 14:57:19 -0500
Subject: [PATCH 0857/1453] nixos/network-interfaces: Add support for multiple
 ipv4 / ipv6 addresses

---
 nixos/modules/services/networking/dhcpcd.nix |   2 +-
 nixos/modules/tasks/network-interfaces.nix   | 141 +++++++++++--------
 2 files changed, 87 insertions(+), 56 deletions(-)

diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix
index 89aa9bdb6b68..65b4319b50ab 100644
--- a/nixos/modules/services/networking/dhcpcd.nix
+++ b/nixos/modules/services/networking/dhcpcd.nix
@@ -11,7 +11,7 @@ let
   # Don't start dhcpcd on explicitly configured interfaces or on
   # interfaces that are part of a bridge, bond or sit device.
   ignoredInterfaces =
-    map (i: i.name) (filter (i: i.ipAddress != null) (attrValues config.networking.interfaces))
+    map (i: i.name) (filter (i: i.ip4 != [ ]) (attrValues config.networking.interfaces))
     ++ mapAttrsToList (i: _: i) config.networking.sits
     ++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.bridges))
     ++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.bonds))
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 7dabe70f00c4..30e2a143419b 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -10,6 +10,26 @@ let
   hasSits = cfg.sits != { };
   hasBonds = cfg.bonds != { };
 
+  addrOpts = v:
+    assert v == 4 || v == 6;
+    {
+      address = mkOption {
+        type = types.str;
+        description = ''
+          IPv${toString v} address of the interface.  Leave empty to configure the
+          interface using DHCP.
+        '';
+      };
+
+      prefixLength = mkOption {
+        type = types.addCheck types.int (n: n >= 0 && n <= (if v == 4 then 32 else 128));
+        description = ''
+          Subnet mask of the interface, specified as the number of
+          bits in the prefix (<literal>${if v == 4 then "24" else "64"}</literal>).
+        '';
+      };
+    };
+
   interfaceOpts = { name, ... }: {
 
     options = {
@@ -20,54 +40,64 @@ let
         description = "Name of the interface.";
       };
 
+      ip4 = mkOption {
+        default = [ ];
+        example = [
+          { address = "10.0.0.1"; prefixLength = 16; }
+          { address = "192.168.1.1"; prefixLength = 24; }
+        ];
+        type = types.listOf types.optionSet;
+        options = addrOpts 4;
+        description = ''
+          List of IPv4 addresses that will be statically assigned to the interface.
+        '';
+      };
+
+      ip6 = mkOption {
+        default = [ ];
+        example = [
+          { address = "fdfd:b3f0:482::1"; prefixLength = 48; }
+          { address = "2001:1470:fffd:2098::e006"; prefixLength = 64; }
+        ];
+        type = types.listOf types.optionSet;
+        options = addrOpts 6;
+        description = ''
+          List of IPv6 addresses that will be statically assigned to the interface.
+        '';
+      };
+
       ipAddress = mkOption {
         default = null;
-        example = "10.0.0.1";
-        type = types.nullOr (types.str);
         description = ''
-          IP address of the interface.  Leave empty to configure the
-          interface using DHCP.
+          Defunct, create an address in the ip4 list instead.
         '';
       };
 
       prefixLength = mkOption {
         default = null;
-        example = 24;
-        type = types.nullOr types.int;
         description = ''
-          Subnet mask of the interface, specified as the number of
-          bits in the prefix (<literal>24</literal>).
+          Defunct, supply the prefix length in the ip4 list instead.
         '';
       };
 
       subnetMask = mkOption {
-        default = "";
-        example = "255.255.255.0";
-        type = types.str;
+        default = null;
         description = ''
-          Subnet mask of the interface, specified as a bitmask.
-          This is deprecated; use <option>prefixLength</option>
-          instead.
+          Defunct, supply the prefix length in the ip4 list instead.
         '';
       };
 
       ipv6Address = mkOption {
         default = null;
-        example = "2001:1470:fffd:2098::e006";
-        type = types.nullOr types.string;
         description = ''
-          IPv6 address of the interface.  Leave empty to configure the
-          interface using NDP.
+          Defunct, create an address in the ip6 list instead.
         '';
       };
 
       ipv6prefixLength = mkOption {
-        default = 64;
-        example = 64;
-        type = types.int;
+        default = null;
         description = ''
-          Subnet mask of the interface, specified as the number of
-          bits in the prefix (<literal>64</literal>).
+          Defunct, supply the prefix length in the ip6 list instead.
         '';
       };
 
@@ -438,6 +468,16 @@ in
 
   config = {
 
+    assertions =
+      flip map interfaces (i: {
+        assertion = i.ipAddress == null && i.prefixLength == null && i.subnetMask == null;
+        message = "The networking.interfaces.${i.name}.ipAddress option is defunct. Use networking.ip4 instead.";
+      })
+      ++ flip map interfaces (i: {
+        assertion = i.ipv6Address == null && i.ipv6prefixLength == null;
+        message = "The networking.interfaces.${i.name}.ipv6Address option is defunct. Use networking.ip6 instead.";
+      });
+
     boot.kernelModules = [ ]
       ++ optional cfg.enableIPv6 "ipv6"
       ++ optional hasVirtuals "tun"
@@ -535,11 +575,6 @@ in
         # has appeared, and it's stopped when the interface
         # disappears.
         configureInterface = i: nameValuePair "${i.name}-cfg"
-          (let mask =
-                if i.prefixLength != null then toString i.prefixLength else
-                if i.subnetMask != "" then i.subnetMask else "32";
-               staticIPv6 = cfg.enableIPv6 && i.ipv6Address != null;
-          in
           { description = "Configuration of ${i.name}";
             wantedBy = [ "network-interfaces.target" ];
             bindsTo = [ "sys-subsystem-net-devices-${i.name}.device" ];
@@ -562,36 +597,32 @@ in
                   echo "setting MTU to ${toString i.mtu}..."
                   ip link set "${i.name}" mtu "${toString i.mtu}"
                 ''
-              + optionalString (i.ipAddress != null)
+
+              # Ip Setup
+              +
                 ''
-                  cur=$(ip -4 -o a show dev "${i.name}" | awk '{print $4}')
-                  # Only do a flush/add if it's necessary.  This is
+                  curIps=$(ip -o a show dev "${i.name}" | awk '{print $4}')
+                  # Only do an add if it's necessary.  This is
                   # useful when the Nix store is accessed via this
                   # interface (e.g. in a QEMU VM test).
-                  if [ "$cur" != "${i.ipAddress}/${mask}" ]; then
-                    echo "configuring interface..."
-                    ip -4 addr flush dev "${i.name}"
-                    ip -4 addr add "${i.ipAddress}/${mask}" dev "${i.name}"
-                    restart_network_setup=true
-                  else
-                    echo "skipping configuring interface"
+                ''
+              + flip concatMapStrings (i.ip4 ++ optionals cfg.enableIPv6 i.ip6) (ip:
+                let
+                  address = "${ip.address}/${toString ip.prefixLength}";
+                in
+                ''
+                  echo "checking ip ${address}..."
+                  if ! echo "$curIps" | grep "${address}" >/dev/null 2>&1; then
+                    if out=$(ip addr add "${address}" dev "${i.name}" 2>&1); then
+                      echo "added ip ${address}..."
+                      restart_network_setup=true
+                    elif ! echo "$out" | grep "File exists" >/dev/null 2>&1; then
+                      echo "failed to add ${address}"
+                      exit 1
+                    fi
                   fi
-                ''
-              + optionalString (staticIPv6)
-                ''
-                  # Only do a flush/add if it's necessary.  This is
-                  # useful when the Nix store is accessed via this
-                  # interface (e.g. in a QEMU VM test).
-                  if ! ip -6 -o a show dev "${i.name}" | grep "${i.ipv6Address}/${toString i.ipv6prefixLength}"; then
-                    echo "configuring interface..."
-                    ip -6 addr flush dev "${i.name}"
-                    ip -6 addr add "${i.ipv6Address}/${toString i.ipv6prefixLength}" dev "${i.name}"
-                    restart_network_setup=true
-                  else
-                    echo "skipping configuring interface"
-                  fi
-                ''
-              + optionalString (i.ipAddress != null || staticIPv6)
+                '')
+              + optionalString (i.ip4 != [ ] || (cfg.enableIPv6 && i.ip6 != [ ]))
                 ''
                   if [ restart_network_setup = true ]; then
                     # Ensure that the default gateway remains set.
@@ -608,7 +639,7 @@ in
                 ''
                   echo 1 > /proc/sys/net/ipv6/conf/${i.name}/proxy_ndp
                 '';
-          });
+          };
 
         createTunDevice = i: nameValuePair "${i.name}"
           { description = "Virtual Network Interface ${i.name}";

From 1ff4b838758f36dc8c54995e104dd17ba08a65a4 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 13 Jul 2014 10:39:59 -0500
Subject: [PATCH 0858/1453] nixos/network-interfaces: Add flush upon interface
 going down

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

diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 30e2a143419b..e8c770d077c9 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -639,6 +639,19 @@ in
                 ''
                   echo 1 > /proc/sys/net/ipv6/conf/${i.name}/proxy_ndp
                 '';
+            preStop =
+              ''
+                echo "releasing configured ip's..."
+              ''
+              + flip concatMapStrings (i.ip4 ++ optionals cfg.enableIPv6 i.ip6) (ip:
+                let
+                  address = "${ip.address}/${toString ip.prefixLength}";
+                in
+                ''
+                  echo -n "Deleting ${address}..."
+                  ip addr del "${address}" dev "${i.name}" >/dev/null 2>&1 || echo -n " Failed"
+                  echo ""
+                '');
           };
 
         createTunDevice = i: nameValuePair "${i.name}"

From 86c0f8c549c2ad728e06f8bc11d805fe760e7df8 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 16 Jul 2014 17:29:50 -0500
Subject: [PATCH 0859/1453] Refactor nixos files relying on the old ipAddress /
 prefixLength / subnetMask attributes

---
 nixos/doc/manual/configuration/ipv4-config.xml |  5 +----
 nixos/lib/build-vms.nix                        | 11 ++++++-----
 nixos/modules/programs/virtualbox.nix          |  2 +-
 nixos/modules/tasks/network-interfaces.nix     |  8 ++++----
 nixos/tests/bittorrent.nix                     |  6 +++---
 nixos/tests/nat.nix                            |  2 +-
 6 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/nixos/doc/manual/configuration/ipv4-config.xml b/nixos/doc/manual/configuration/ipv4-config.xml
index e2c51518349d..053501b1736d 100644
--- a/nixos/doc/manual/configuration/ipv4-config.xml
+++ b/nixos/doc/manual/configuration/ipv4-config.xml
@@ -12,12 +12,9 @@ interfaces.  However, you can configure an interface manually as
 follows:
 
 <programlisting>
-networking.interfaces.eth0 = { ipAddress = "192.168.1.2"; prefixLength = 24; };
+networking.interfaces.eth0.ip4 = [ { address = "192.168.1.2"; prefixLength = 24; } ];
 </programlisting>
 
-(The network prefix can also be specified using the option
-<literal>subnetMask</literal>,
-e.g. <literal>"255.255.255.0"</literal>, but this is deprecated.)
 Typically you’ll also want to set a default gateway and set of name
 servers:
 
diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix
index 498c0a377836..ba1895554096 100644
--- a/nixos/lib/build-vms.nix
+++ b/nixos/lib/build-vms.nix
@@ -48,10 +48,11 @@ rec {
             let
               interfacesNumbered = zipTwoLists config.virtualisation.vlans (range 1 255);
               interfaces = flip map interfacesNumbered ({ first, second }:
-                nameValuePair "eth${toString second}"
-                  { ipAddress = "192.168.${toString first}.${toString m.second}";
-                    subnetMask = "255.255.255.0";
-                  });
+                nameValuePair "eth${toString second}" { ip4 =
+                  [ { address = "192.168.${toString first}.${toString m.second}";
+                      prefixLength = 24;
+                  } ];
+                }
             in
             { key = "ip-address";
               config =
@@ -60,7 +61,7 @@ rec {
                   networking.interfaces = listToAttrs interfaces;
 
                   networking.primaryIPAddress =
-                    optionalString (interfaces != []) (head interfaces).value.ipAddress;
+                    optionalString (interfaces != []) (head (head interfaces).value.ip4).address;
 
                   # Put the IP addresses of all VMs in this machine's
                   # /etc/hosts file.  If a machine has multiple
diff --git a/nixos/modules/programs/virtualbox.nix b/nixos/modules/programs/virtualbox.nix
index e2dd76219eb0..fec1a7b61f32 100644
--- a/nixos/modules/programs/virtualbox.nix
+++ b/nixos/modules/programs/virtualbox.nix
@@ -44,5 +44,5 @@ let virtualbox = config.boot.kernelPackages.virtualbox; in
         '';
     };
 
-  networking.interfaces.vboxnet0 = { ipAddress = "192.168.56.1"; prefixLength = 24; };
+  networking.interfaces.vboxnet0.ip4 = [ { address = "192.168.56.1"; prefixLength = 24; } ];
 }
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index e8c770d077c9..054784502eb2 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -254,10 +254,10 @@ in
     networking.interfaces = mkOption {
       default = {};
       example =
-        { eth0 = {
-            ipAddress = "131.211.84.78";
-            subnetMask = "255.255.255.128";
-          };
+        { eth0.ip4 = [ {
+            address = "131.211.84.78";
+            prefixLength = 25;
+          } ];
         };
       description = ''
         The configuration for each network interface.  If
diff --git a/nixos/tests/bittorrent.nix b/nixos/tests/bittorrent.nix
index 002e012f65f0..7eb9c215ee1c 100644
--- a/nixos/tests/bittorrent.nix
+++ b/nixos/tests/bittorrent.nix
@@ -16,7 +16,7 @@ let
   miniupnpdConf = nodes: pkgs.writeText "miniupnpd.conf"
     ''
       ext_ifname=eth1
-      listening_ip=${nodes.router.config.networking.interfaces.eth2.ipAddress}/24
+      listening_ip=${(head nodes.router.config.networking.interfaces.eth2.ip4).address}/24
       allow 1024-65535 192.168.2.0/24 1024-65535
     '';
 
@@ -53,7 +53,7 @@ in
         { environment.systemPackages = [ pkgs.transmission ];
           virtualisation.vlans = [ 2 ];
           networking.defaultGateway =
-            nodes.router.config.networking.interfaces.eth2.ipAddress;
+            (head nodes.router.config.networking.interfaces.eth2.ip4).address;
           networking.firewall.enable = false;
         };
 
@@ -81,7 +81,7 @@ in
       # Create the torrent.
       $tracker->succeed("mkdir /tmp/data");
       $tracker->succeed("cp ${file} /tmp/data/test.tar.bz2");
-      $tracker->succeed("transmission-create /tmp/data/test.tar.bz2 -t http://${nodes.tracker.config.networking.interfaces.eth1.ipAddress}:6969/announce -o /tmp/test.torrent");
+      $tracker->succeed("transmission-create /tmp/data/test.tar.bz2 -t http://${(head nodes.tracker.config.networking.interfaces.eth1.ip4).address}:6969/announce -o /tmp/test.torrent");
       $tracker->succeed("chmod 644 /tmp/test.torrent");
 
       # Start the tracker.  !!! use a less crappy tracker
diff --git a/nixos/tests/nat.nix b/nixos/tests/nat.nix
index 5fdcc0e97ca9..5a57cce6b678 100644
--- a/nixos/tests/nat.nix
+++ b/nixos/tests/nat.nix
@@ -13,7 +13,7 @@ import ./make-test.nix {
         { virtualisation.vlans = [ 1 ];
           networking.firewall.allowPing = true;
           networking.defaultGateway =
-            nodes.router.config.networking.interfaces.eth2.ipAddress;
+            (head nodes.router.config.networking.interfaces.eth2.ip4).address;
         };
 
       router =

From 43654cba2c280ce17b81db44993d1c1bcae3a9c6 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 30 Aug 2014 18:46:51 +0400
Subject: [PATCH 0860/1453] Update LibreOffice to 4.3.1

---
 pkgs/applications/office/libreoffice/default.nix       | 10 +++++-----
 .../office/libreoffice/libreoffice-srcs.nix            |  9 +++++++--
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 63d4db20af37..bf6728abe637 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -24,8 +24,8 @@ let
   langsSpaces = stdenv.lib.concatStringsSep " " langs;
   major = "4";
   minor = "3";
-  patch = "0";
-  tweak = "4";
+  patch = "1";
+  tweak = "2";
   subdir = "${major}.${minor}.${patch}";
   version = "${subdir}${if tweak == "" then "" else "."}${tweak}";
 
@@ -79,14 +79,14 @@ let
 
     translations = fetchSrc {
       name = "translations";
-      sha256 = "1l445284mih0c7d6v3ps1piy5pbjvisyrjjvlrqizvwxqm7bxpr1";
+      sha256 = "0vj1fpr99cb124hag0hijpp3pfbbi0gak56qiikxbwbq7mab6p9h";
     };
 
     # TODO: dictionaries
 
     help = fetchSrc {
       name = "help";
-      sha256 = "0avsc11d4nmycsxvadr0xcd8z9506sjcc89hgmliqlmhmw48ax7y";
+      sha256 = "1q0vzfla764zjz6xcx6r4nc8rikwb3pr2jsraj28hhwr5b26gdfz";
     };
 
   };
@@ -96,7 +96,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
-    sha256 = "1r605nwjdq20qd96chqic1bjkw7y36wmpg2lzzvv5sz6gw12rzi8";
+    sha256 = "0s1j5y1gfyf3r53bbqnzirx17p49i8ah07737nrzik0ggps3lgd5";
   };
 
   # Openoffice will open libcups dynamically, so we link it directly
diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
index 4e7dacfe0a96..6110a54feb55 100644
--- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
+++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
@@ -184,6 +184,11 @@
   md5 = "1e9ddfe25ac9577da709d7b2ea36f939";
   brief = false;
 }
+{
+  name = "source-sans-pro-2.010R-ro-1.065R-it.tar.gz";
+  md5 = "edc4d741888bc0d38e32dbaa17149596";
+  brief = false;
+}
 {
   name = "libfreehand-0.1.0.tar.bz2";
   md5 = "5f029fef73e42a2c2ae4524a7513f97d";
@@ -326,8 +331,8 @@
 }
 {
   name = "libgltf-0.0.0.tar.bz2";
-  md5 = "3d9ea1f2828c46f8ba94b88a87b3326d";
-  brief = false;
+  md5 = "ca5436e916bfe70694adfe2607782786";
+  brief = true;
   subDir = "libgltf/";
 }
 {

From 4d8390be608ed047ef99d96b0a3f58516bad4419 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 30 Aug 2014 08:00:10 -0700
Subject: [PATCH 0861/1453] nixos/network-interfaces: Support the old ip
 configuration convention

---
 nixos/modules/services/networking/dhcpcd.nix |  2 +-
 nixos/modules/tasks/network-interfaces.nix   | 51 ++++++++++++++------
 2 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix
index 65b4319b50ab..7e0b00a3d7b5 100644
--- a/nixos/modules/services/networking/dhcpcd.nix
+++ b/nixos/modules/services/networking/dhcpcd.nix
@@ -11,7 +11,7 @@ let
   # Don't start dhcpcd on explicitly configured interfaces or on
   # interfaces that are part of a bridge, bond or sit device.
   ignoredInterfaces =
-    map (i: i.name) (filter (i: i.ip4 != [ ]) (attrValues config.networking.interfaces))
+    map (i: i.name) (filter (i: i.ip4 != [ ] || i.ipAddress != null) (attrValues config.networking.interfaces))
     ++ mapAttrsToList (i: _: i) config.networking.sits
     ++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.bridges))
     ++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.bonds))
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 054784502eb2..ac3a55332e4e 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -68,36 +68,48 @@ let
 
       ipAddress = mkOption {
         default = null;
+        example = "10.0.0.1";
+        type = types.nullOr types.str;
         description = ''
-          Defunct, create an address in the ip4 list instead.
+          IP address of the interface.  Leave empty to configure the
+          interface using DHCP.
         '';
       };
 
       prefixLength = mkOption {
         default = null;
+        example = 24;
+        type = types.nullOr types.int;
         description = ''
-          Defunct, supply the prefix length in the ip4 list instead.
+          Subnet mask of the interface, specified as the number of
+          bits in the prefix (<literal>24</literal>).
         '';
       };
 
       subnetMask = mkOption {
         default = null;
         description = ''
-          Defunct, supply the prefix length in the ip4 list instead.
+          Defunct, supply the prefix length instead.
         '';
       };
 
       ipv6Address = mkOption {
         default = null;
+        example = "2001:1470:fffd:2098::e006";
+        type = types.nullOr types.str;
         description = ''
-          Defunct, create an address in the ip6 list instead.
+          IPv6 address of the interface.  Leave empty to configure the
+          interface using NDP.
         '';
       };
 
       ipv6prefixLength = mkOption {
-        default = null;
+        default = 64;
+        example = 64;
+        type = types.int;
         description = ''
-          Defunct, supply the prefix length in the ip6 list instead.
+          Subnet mask of the interface, specified as the number of
+          bits in the prefix (<literal>64</literal>).
         '';
       };
 
@@ -470,12 +482,8 @@ in
 
     assertions =
       flip map interfaces (i: {
-        assertion = i.ipAddress == null && i.prefixLength == null && i.subnetMask == null;
-        message = "The networking.interfaces.${i.name}.ipAddress option is defunct. Use networking.ip4 instead.";
-      })
-      ++ flip map interfaces (i: {
-        assertion = i.ipv6Address == null && i.ipv6prefixLength == null;
-        message = "The networking.interfaces.${i.name}.ipv6Address option is defunct. Use networking.ip6 instead.";
+        assertion = i.subnetMask == null;
+        message = "The networking.interfaces.${i.name}.subnetMask option is defunct. Use prefixLength instead.";
       });
 
     boot.kernelModules = [ ]
@@ -574,7 +582,18 @@ in
         # network device, so it only gets started after the interface
         # has appeared, and it's stopped when the interface
         # disappears.
-        configureInterface = i: nameValuePair "${i.name}-cfg"
+        configureInterface = i:
+          let
+            ips = i.ip4 ++ optionals cfg.enableIPv6 i.ip6
+              ++ optional (i.ipAddress != null) {
+                ipAddress = i.ipAddress;
+                prefixLength = i.prefixLength;
+              } ++ optional (cfg.enableIPv6 && i.ipv6Address != null) {
+                ipAddress = i.ipv6Address;
+                prefixLength = i.ipv6PrefixLength;
+              };
+          in
+          nameValuePair "${i.name}-cfg"
           { description = "Configuration of ${i.name}";
             wantedBy = [ "network-interfaces.target" ];
             bindsTo = [ "sys-subsystem-net-devices-${i.name}.device" ];
@@ -606,7 +625,7 @@ in
                   # useful when the Nix store is accessed via this
                   # interface (e.g. in a QEMU VM test).
                 ''
-              + flip concatMapStrings (i.ip4 ++ optionals cfg.enableIPv6 i.ip6) (ip:
+              + flip concatMapStrings (ips) (ip:
                 let
                   address = "${ip.address}/${toString ip.prefixLength}";
                 in
@@ -622,7 +641,7 @@ in
                     fi
                   fi
                 '')
-              + optionalString (i.ip4 != [ ] || (cfg.enableIPv6 && i.ip6 != [ ]))
+              + optionalString (ips != [ ])
                 ''
                   if [ restart_network_setup = true ]; then
                     # Ensure that the default gateway remains set.
@@ -643,7 +662,7 @@ in
               ''
                 echo "releasing configured ip's..."
               ''
-              + flip concatMapStrings (i.ip4 ++ optionals cfg.enableIPv6 i.ip6) (ip:
+              + flip concatMapStrings (ips) (ip:
                 let
                   address = "${ip.address}/${toString ip.prefixLength}";
                 in

From 1c08efb8ab258856c6b2cb8794bdc03c96c2b8c9 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 23 Aug 2014 18:38:29 -0700
Subject: [PATCH 0862/1453] nixos/network-interfaces: Allow explicit virtual
 interface type setting

---
 nixos/modules/tasks/network-interfaces.nix | 32 ++++++++++++++++------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index ac3a55332e4e..985e76cd7086 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -138,8 +138,6 @@ let
           Whether this interface is virtual and should be created by tunctl.
           This is mainly useful for creating bridges between a host a virtual
           network such as VPN or a virtual machine.
-
-          Defaults to tap device, unless interface contains "tun" in its name.
         '';
       };
 
@@ -151,6 +149,15 @@ let
         '';
       };
 
+      virtualType = mkOption {
+        default = null;
+        type = types.nullOr (types.addCheck types.str (v: v == "tun" || v == "tap"));
+        description = ''
+          The explicit type of interface to create. Accepts tun or tap strings.
+          Also accepts null to implicitly detect the type of device.
+        '';
+      };
+
       proxyARP = mkOption {
         default = false;
         type = types.bool;
@@ -673,18 +680,25 @@ in
                 '');
           };
 
-        createTunDevice = i: nameValuePair "${i.name}"
+        createTunDevice = i: nameValuePair "${i.name}-tun"
           { description = "Virtual Network Interface ${i.name}";
             requires = [ "dev-net-tun.device" ];
             after = [ "dev-net-tun.device" ];
             wantedBy = [ "network.target" ];
             requiredBy = [ "sys-subsystem-net-devices-${i.name}.device" ];
-            serviceConfig =
-              { Type = "oneshot";
-                RemainAfterExit = true;
-                ExecStart = "${pkgs.tunctl}/bin/tunctl -t '${i.name}' -u '${i.virtualOwner}'";
-                ExecStop = "${pkgs.tunctl}/bin/tunctl -d '${i.name}'";
-              };
+            path = [ pkgs.iproute ];
+            serviceConfig = {
+              Type = "oneshot";
+              RemainAfterExit = true;
+            };
+            script = ''
+              ip tuntap add dev "${i.name}" \
+              ${optionalString (i.virtualType != null) "mode ${i.virtualType}"} \
+              user "${i.virtualOwner}"
+            '';
+            postStop = ''
+              ip link del ${i.name}
+            '';
           };
 
         createBridgeDevice = n: v:

From ed6040fc8dd833c31c67fadb54de320934e9668c Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 24 Aug 2014 15:16:47 -0700
Subject: [PATCH 0863/1453] nixos/network-interface: Append -netdev for all
 device units

Currently, device units are named directly after the name the user
specifies for the device. A bridge device named lan will be defined
within lan.service. This becomes a problem if you want your interface
named nginx but also want to run the nginx service.

This patch fixes the issue by appending netdev to all virtually created
network device units. Therefore, the lan bridge -> lan-netdev.service.
This naming convention is used for all types of network devices in order
to ensure that all network devices are unique.
---
 nixos/modules/tasks/network-interfaces.nix | 34 +++++++++++-----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 985e76cd7086..14bf96ced7a3 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -680,7 +680,7 @@ in
                 '');
           };
 
-        createTunDevice = i: nameValuePair "${i.name}-tun"
+        createTunDevice = i: nameValuePair "${i.name}-netdev"
           { description = "Virtual Network Interface ${i.name}";
             requires = [ "dev-net-tun.device" ];
             after = [ "dev-net-tun.device" ];
@@ -701,8 +701,8 @@ in
             '';
           };
 
-        createBridgeDevice = n: v:
-          let
+        createBridgeDevice = n: v: nameValuePair "${n}-netdev"
+          (let
             deps = map (i: "sys-subsystem-net-devices-${i}.device") v.interfaces;
           in
           { description = "Bridge Interface ${n}";
@@ -739,10 +739,10 @@ in
                 ip link set "${n}" down
                 brctl delbr "${n}"
               '';
-          };
+          });
 
-        createBondDevice = n: v:
-          let
+        createBondDevice = n: v: nameValuePair "${n}-netdev"
+          (let
             deps = map (i: "sys-subsystem-net-devices-${i}.device") v.interfaces;
           in
           { description = "Bond Interface ${n}";
@@ -778,10 +778,10 @@ in
               ifenslave -d "${n}"
               ip link delete "${n}"
             '';
-          };
+          });
 
-        createSitDevice = n: v:
-          let
+        createSitDevice = n: v: nameValuePair "${n}-netdev"
+          (let
             deps = optional (v.dev != null) "sys-subsystem-net-devices-${v.dev}.device";
           in
           { description = "6-to-4 Tunnel Interface ${n}";
@@ -804,10 +804,10 @@ in
             postStop = ''
               ip link delete "${n}"
             '';
-          };
+          });
 
-        createVlanDevice = n: v:
-          let
+        createVlanDevice = n: v: nameValuePair "${n}-netdev"
+          (let
             deps = [ "sys-subsystem-net-devices-${v.interface}.device" ];
           in
           { description = "Vlan Interface ${n}";
@@ -826,15 +826,15 @@ in
             postStop = ''
               ip link delete "${n}"
             '';
-          };
+          });
 
       in listToAttrs (
            map configureInterface interfaces ++
            map createTunDevice (filter (i: i.virtual) interfaces))
-         // mapAttrs createBridgeDevice cfg.bridges
-         // mapAttrs createBondDevice cfg.bonds
-         // mapAttrs createSitDevice cfg.sits
-         // mapAttrs createVlanDevice cfg.vlans
+         // mapAttrs' createBridgeDevice cfg.bridges
+         // mapAttrs' createBondDevice cfg.bonds
+         // mapAttrs' createSitDevice cfg.sits
+         // mapAttrs' createVlanDevice cfg.vlans
          // { "network-setup" = networkSetup; };
 
     # Set the host and domain names in the activation script.  Don't

From ef92afe0da4ad622026c07a768f0b9e8b29447c9 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 24 Aug 2014 15:56:37 -0700
Subject: [PATCH 0864/1453] nixos/network-interfaces: Fix vlan device coming up
 during switch

---
 nixos/modules/tasks/network-interfaces.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 14bf96ced7a3..1163c729c9b8 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -684,8 +684,7 @@ in
           { description = "Virtual Network Interface ${i.name}";
             requires = [ "dev-net-tun.device" ];
             after = [ "dev-net-tun.device" ];
-            wantedBy = [ "network.target" ];
-            requiredBy = [ "sys-subsystem-net-devices-${i.name}.device" ];
+            wantedBy = [ "network.target" "sys-subsystem-net-devices-${i.name}.device" ];
             path = [ pkgs.iproute ];
             serviceConfig = {
               Type = "oneshot";

From 618f439d2e0c5b31b68f7ff31ce4f7409e596dc1 Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@ens-lyon.org>
Date: Thu, 15 May 2014 11:02:32 +0200
Subject: [PATCH 0865/1453] Add a derivation for ocaml-text

---
 .../ocaml-modules/ocaml-text/default.nix      | 26 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/ocaml-text/default.nix

diff --git a/pkgs/development/ocaml-modules/ocaml-text/default.nix b/pkgs/development/ocaml-modules/ocaml-text/default.nix
new file mode 100644
index 000000000000..08136dd2b100
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ocaml-text/default.nix
@@ -0,0 +1,26 @@
+{stdenv, fetchurl, libiconv, ocaml, findlib, ncurses}:
+
+stdenv.mkDerivation {
+  name = "ocaml-text-0.6";
+
+  src = fetchurl {
+    url = https://forge.ocamlcore.org/frs/download.php/937/ocaml-text-0.6.tar.gz;
+    sha256 = "0j8gaak0ajnlmn8knvfygqwwzs7awjv5rfn5cbj6qxqbxhjd5m6g";
+  };
+
+  buildInputs = [ocaml findlib libiconv ncurses];
+
+  configurePhase = "iconv_prefix=${libiconv} ocaml setup.ml -configure";
+
+  createFindlibDestdir = true;
+
+
+  meta = {
+    homepage = "http://ocaml-text.forge.ocamlcore.org/";
+    description = "OCaml-Text is a library for dealing with ``text'', i.e. sequence of unicode characters, in a convenient way. ";
+    license = "BSD";
+    platforms = ocaml.meta.platforms;
+    maintainers = [
+    ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dac177ecb863..c0c5a179ed49 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3333,6 +3333,8 @@ let
 
     ocaml_ssl = callPackage ../development/ocaml-modules/ssl { };
 
+    ocaml_text = callPackage ../development/ocaml-modules/ocaml-text { };
+
     ounit = callPackage ../development/ocaml-modules/ounit { };
 
     ulex = callPackage ../development/ocaml-modules/ulex { };

From 59b1bd0607e74e20d6cc495bf0ffca16d2c32ab6 Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@ens-lyon.org>
Date: Thu, 15 May 2014 14:08:15 +0200
Subject: [PATCH 0866/1453] Add myself to the maintainer list

---
 lib/maintainers.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 3de82db1cd98..0c71669a8aea 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -47,6 +47,7 @@
   flosse = "Markus Kohlhase <mail@markus-kohlhase.de>";
   funfunctor = "Edward O'Callaghan <eocallaghan@alterapraxis.com>";
   fuuzetsu = "Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>";
+  gal_bolle = "Florent Becker <florent.becker@ens-lyon.org>";
   garbas = "Rok Garbas <rok@garbas.si>";
   goibhniu = "Cillian de Róiste <cillian.deroiste@gmail.com>";
   guibert = "David Guibert <david.guibert@gmail.com>";

From 337a3b821278b41952a4970f84ec740e4c00346b Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@ens-lyon.org>
Date: Sat, 7 Jun 2014 21:33:04 +0200
Subject: [PATCH 0867/1453] Update ocaml-react to 1.1.0

---
 pkgs/development/ocaml-modules/react/default.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/ocaml-modules/react/default.nix b/pkgs/development/ocaml-modules/react/default.nix
index 6b0e694d54a0..dfc8dcd1439c 100644
--- a/pkgs/development/ocaml-modules/react/default.nix
+++ b/pkgs/development/ocaml-modules/react/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, ocaml, findlib, opam}:
 
 stdenv.mkDerivation {
-  name = "ocaml-react-1.0.1";
+  name = "ocaml-react-1.1.0";
 
   src = fetchurl {
-    url = "http://erratique.ch/software/react/releases/react-1.0.1.tbz";
-    sha256 = "007c9kzl0i6xvxnqj9jny4hgm28v9a1i079q53vl5hfb5f7h1mda";
+    url = http://erratique.ch/software/react/releases/react-1.1.0.tbz;
+    sha256 = "1gymn8hy7ga0l9qymmb1jcnnkqvy7l2zr87xavzqz0dfi9ci8dm7";
   };
 
   unpackCmd = "tar xjf $src";
@@ -15,8 +15,13 @@ stdenv.mkDerivation {
 
   configurePhase = "ocaml pkg/git.ml";
   buildPhase     = "ocaml pkg/build.ml native=true native-dynlink=true";
-  installPhase   = ''
+
+  installPhase   =
+  let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version;
+  in
+   ''
     opam-installer --script --prefix=$out react.install > install.sh
+    sed -i s!lib/react!lib/ocaml/${ocamlVersion}/site-lib/react! install.sh
     sh install.sh
   '';
 
@@ -25,6 +30,6 @@ stdenv.mkDerivation {
     description = "Applicative events and signals for OCaml";
     license = licenses.bsd3;
     platforms = ocaml.meta.platforms;
-    maintainers = with maintainers; [ z77z vbmithr ];
+    maintainers = with maintainers; [ z77z vbmithr gal_bolle];
   };
 }

From 7e2766d6464d94d2afd97354b882e777b85d4e60 Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@ens-lyon.org>
Date: Sat, 17 May 2014 20:01:45 +0200
Subject: [PATCH 0868/1453] Update ocaml_lwt to version 2.4.5 (from git)

---
 .../development/ocaml-modules/lwt/default.nix | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix
index 9ef109063655..10175a1dbb0a 100644
--- a/pkgs/development/ocaml-modules/lwt/default.nix
+++ b/pkgs/development/ocaml-modules/lwt/default.nix
@@ -1,21 +1,25 @@
-{stdenv, fetchurl, which, cryptopp, ocaml, findlib, ocaml_react, ocaml_ssl}:
+{stdenv, fetchgit, which, cryptopp, ocaml, findlib, ocaml_react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, ocaml_text, glib}:
 
 let
-  ocaml_version = (builtins.parseDrvName ocaml.name).version;
-  version = "2.1.1";
+  version = "2.4.5";
 in
 
 stdenv.mkDerivation {
+
+
   name = "ocaml-lwt-${version}";
 
-  src = fetchurl {
-    url = "http://ocsigen.org/download/lwt-${version}.tar.gz";
-    sha256 = "1zjn0sgihryshancn4kna1xslhc8gifliny1qd3a85f72xxxnw0w";
+  src = fetchgit {
+    url = git://github.com/ocsigen/lwt;
+    rev = "refs/tags/${version}";
+    sha256 = "2bbf4f216dd62eeb765a89413f3b2b6d417a9c289ca49d595bb4d7a0545e343e";
   };
 
-  buildInputs = [which cryptopp ocaml findlib ocaml_react ocaml_ssl];
+  buildInputs = [ocaml_oasis pkgconfig which cryptopp ocaml findlib ocaml_react ocaml_ssl libev ncurses ocaml_text glib];
 
-  configurePhase = "true";
+  configureFlags = [ "--enable-all" ];
+
+  createFindlibDestdir = true;
 
   meta = {
     homepage = http://ocsigen.org/lwt;
@@ -23,7 +27,7 @@ stdenv.mkDerivation {
     license = "LGPL";
     platforms = ocaml.meta.platforms;
     maintainers = [
-      stdenv.lib.maintainers.z77z
+      stdenv.lib.maintainers.z77z stdenv.lib.maintainers.gal_bolle
     ];
   };
 }

From 892490726c75b7f80f66a1aac794e32a137f5755 Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@ens-lyon.org>
Date: Fri, 18 Jul 2014 17:04:16 +0200
Subject: [PATCH 0869/1453] Use propagated inputs in lwt

---
 pkgs/development/ocaml-modules/lwt/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix
index 10175a1dbb0a..061dbb398fe2 100644
--- a/pkgs/development/ocaml-modules/lwt/default.nix
+++ b/pkgs/development/ocaml-modules/lwt/default.nix
@@ -15,7 +15,9 @@ stdenv.mkDerivation {
     sha256 = "2bbf4f216dd62eeb765a89413f3b2b6d417a9c289ca49d595bb4d7a0545e343e";
   };
 
-  buildInputs = [ocaml_oasis pkgconfig which cryptopp ocaml findlib ocaml_react ocaml_ssl libev ncurses ocaml_text glib];
+  buildInputs = [ocaml_oasis pkgconfig which cryptopp ocaml findlib glib libev ncurses];
+
+  propagatedBuildInputs = [ ocaml_react ocaml_ssl ocaml_text ];
 
   configureFlags = [ "--enable-all" ];
 

From edc11bc4f96754dff40da09ed3275acef756ff05 Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@ens-lyon.org>
Date: Sun, 20 Jul 2014 18:21:14 +0200
Subject: [PATCH 0870/1453] add the 'zed' ocaml editor library

---
 .../development/ocaml-modules/zed/default.nix | 34 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  3 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/zed/default.nix

diff --git a/pkgs/development/ocaml-modules/zed/default.nix b/pkgs/development/ocaml-modules/zed/default.nix
new file mode 100644
index 000000000000..3c2fae472bec
--- /dev/null
+++ b/pkgs/development/ocaml-modules/zed/default.nix
@@ -0,0 +1,34 @@
+{stdenv, fetchurl, ocaml, findlib, camomile, ocaml_react}:
+
+stdenv.mkDerivation rec {
+  version = "1.3";
+  name = "ocaml-zed-${version}";
+
+  src = fetchurl {
+    url = https://github.com/diml/zed/archive/1.3.tar.gz;
+    sha256 = "1fr9xzf5msdnl2wx279aqj051nqbhs6v9aq1mfpv3r1mrqvrrfwj";
+  };
+
+  buildInputs = [ ocaml findlib ocaml_react];
+
+  propagatedBuildInputs = [ camomile ];
+
+  createFindlibDestdir = true;
+
+  meta = {
+    description = "Abstract engine for text edition in OCaml";
+    longDescription = ''
+    Zed is an abstract engine for text edition. It can be used to write text editors, edition widgets, readlines, ...
+
+    Zed uses Camomile to fully support the Unicode specification, and implements an UTF-8 encoded string type with validation, and a rope datastructure to achieve efficient operations on large Unicode buffers. Zed also features a regular expression search on ropes.
+
+    To support efficient text edition capabilities, Zed provides macro recording and cursor management facilities.
+    '';
+    homepage = https://github.com/diml/zed;
+    license = stdenv.lib.licenses.bsd3;
+    platforms = ocaml.meta.platforms;
+    maintainers = [
+      stdenv.lib.maintainers.gal_bolle
+    ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c0c5a179ed49..e745da4f2dca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3370,6 +3370,9 @@ let
     yojson = callPackage ../development/ocaml-modules/yojson { };
 
     zarith = callPackage ../development/ocaml-modules/zarith { };
+
+    zed = callPackage ../development/ocaml-modules/zed { };
+
   };
 
   ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0;

From 328469aa06539b6917bca1374ab9a621a0b0ed8a Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@ens-lyon.org>
Date: Sun, 20 Jul 2014 18:22:16 +0200
Subject: [PATCH 0871/1453] add the ocaml 'lambda-term' library (terminal
 control)

---
 .../ocaml-modules/lambda-term/default.nix     | 41 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/lambda-term/default.nix

diff --git a/pkgs/development/ocaml-modules/lambda-term/default.nix b/pkgs/development/ocaml-modules/lambda-term/default.nix
new file mode 100644
index 000000000000..b6edadb0b14b
--- /dev/null
+++ b/pkgs/development/ocaml-modules/lambda-term/default.nix
@@ -0,0 +1,41 @@
+{stdenv, fetchurl, libev, ocaml, findlib, ocaml_lwt, ocaml_react, zed}:
+
+stdenv.mkDerivation rec {
+  version = "1.6";
+  name = "lambda-term-${version}";
+
+  src = fetchurl {
+    url = https://github.com/diml/lambda-term/archive/1.6.tar.gz;
+    sha256 = "1rhfixdgpylxznf6sa9wr31wb4pjzpfn5mxhxqpbchmpl2afwa09";
+  };
+
+  buildInputs = [ libev ocaml findlib ocaml_lwt ocaml_react ];
+
+  propagatedBuildInputs = [ zed ];
+
+  createFindlibDestdir = true;
+
+  meta = { description = "Terminal manipulation library for OCaml";
+    longDescription = ''
+    Lambda-term is a cross-platform library for
+    manipulating the terminal. It provides an abstraction for keys,
+    mouse events, colors, as well as a set of widgets to write
+    curses-like applications.
+
+    The main objective of lambda-term is to provide a higher level
+    functional interface to terminal manipulation than, for example,
+    ncurses, by providing a native OCaml interface instead of bindings to
+    a C library.
+
+    Lambda-term integrates with zed to provide text edition facilities in
+    console applications.
+    '';
+
+    homepage = https://github.com/diml/lambda-term;
+    license = stdenv.lib.licenses.bsd3;
+    platforms = ocaml.meta.platforms;
+    maintainers = [
+      stdenv.lib.maintainers.gal_bolle
+    ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e745da4f2dca..ccb2b351b8c7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3289,6 +3289,8 @@ let
       gtkmathview = callPackage ../development/libraries/gtkmathview { };
     };
 
+    lambdaTerm = callPackage ../development/ocaml-modules/lambda-term { };
+
     menhir = callPackage ../development/ocaml-modules/menhir { };
 
     merlin = callPackage ../development/tools/ocaml/merlin { };

From d7b67d8cfad6f9021f2eacee4402d6bb51d18b7e Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@ens-lyon.org>
Date: Sun, 20 Jul 2014 18:23:42 +0200
Subject: [PATCH 0872/1453] add utop (improved ocaml toplevel)

---
 pkgs/development/tools/ocaml/utop/default.nix | 46 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 48 insertions(+)
 create mode 100644 pkgs/development/tools/ocaml/utop/default.nix

diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix
new file mode 100644
index 000000000000..1b99c4d4d43b
--- /dev/null
+++ b/pkgs/development/tools/ocaml/utop/default.nix
@@ -0,0 +1,46 @@
+{stdenv, fetchurl, ocaml, findlib, lambdaTerm, ocaml_lwt, makeWrapper,
+ ocaml_react, camomile, zed
+}:
+
+stdenv.mkDerivation rec {
+  version = "1.14";
+  name = "utop-${version}";
+
+  src = fetchurl {
+    url = https://github.com/diml/utop/archive/1.14.tar.gz;
+    sha256 = "17dqinvdrpba2fjs7sl6gxs47rrx6j8a5bbjhc7flp6bdls898zk";
+  };
+
+  buildInputs = [ ocaml findlib makeWrapper];
+
+  propagatedBuildInputs = [ lambdaTerm ocaml_lwt ];
+
+  createFindlibDestdir = true;
+
+  buildPhase = ''
+    make
+    make doc
+    '';
+
+  postFixup =
+  let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version;
+  in
+   ''
+    wrapProgram "$out"/bin/utop --set CAML_LD_LIBRARY_PATH "${ocaml_lwt}"/lib/ocaml/${ocamlVersion}/site-lib/lwt/:"${lambdaTerm}"/lib/ocaml/${ocamlVersion}/site-lib/lambda-term/:'$CAML_LD_LIBRARY_PATH' --set OCAMLPATH "${ocaml_lwt}"/lib/ocaml/${ocamlVersion}/site-lib:${ocaml_react}/lib/ocaml/${ocamlVersion}/site-lib:${camomile}/lib/ocaml/${ocamlVersion}/site-lib:${zed}/lib/ocaml/${ocamlVersion}/site-lib:${lambdaTerm}/lib/ocaml/${ocamlVersion}/site-lib:"$out"/lib/ocaml/${ocamlVersion}/site-lib:'$OCAMLPATH'
+    '';
+
+  meta = {
+    description = "Universal toplevel for OCaml";
+    longDescription = ''
+    utop is an improved toplevel for OCaml. It can run in a terminal or in Emacs. It supports line edition, history, real-time and context sensitive completion, colors, and more.
+
+    It integrates with the tuareg mode in Emacs.
+    '';
+    homepage = https://github.com/diml/utop;
+    license = stdenv.lib.licenses.bsd3;
+    platforms = ocaml.meta.platforms;
+    maintainers = [
+      stdenv.lib.maintainers.gal_bolle
+    ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ccb2b351b8c7..0a92e8ef1e8d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3362,6 +3362,8 @@ let
     opam_1_1 = callPackage ../development/tools/ocaml/opam/1.1.nix { };
     opam = opam_1_1;
 
+    utop = callPackage ../development/tools/ocaml/utop { };
+
     sawja = callPackage ../development/ocaml-modules/sawja { };
 
     uucd = callPackage ../development/ocaml-modules/uucd { };

From 2559ea7138744bdf6e15b52e4c84bf134bba4fbf Mon Sep 17 00:00:00 2001
From: Patrick Mahoney <pat@polycrystal.org>
Date: Sat, 30 Aug 2014 11:41:33 -0500
Subject: [PATCH 0873/1453] nginx: add lua module

---
 pkgs/servers/http/nginx/default.nix | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix
index 903cf038d6e7..700317bc7994 100644
--- a/pkgs/servers/http/nginx/default.nix
+++ b/pkgs/servers/http/nginx/default.nix
@@ -1,10 +1,11 @@
 { stdenv, fetchurl, fetchgit, openssl, zlib, pcre, libxml2, libxslt, expat
-, gd, geoip
+, gd, geoip, luajit
 , rtmp ? false
 , fullWebDAV ? false
 , syslog ? false
 , moreheaders ? false
-, echo ? false }:
+, echo ? false
+, ngx_lua ? false }:
 
 with stdenv.lib;
 
@@ -44,6 +45,19 @@ let
     rev = "refs/tags/v0.53";
     sha256 = "90d4e3a49c678019f4f335bc18529aa108fcc9cfe0747ea4e2f6084a70da2868";
   };
+
+  develkit-ext = fetchgit {
+    url = https://github.com/simpl/ngx_devel_kit.git;
+    rev = "refs/tags/v0.2.19";
+    sha256 = "169m6gsa5b6zh1ws8qx2k7dbswld1zmhm4dh57qka0h07gs5dqjg";
+  };
+
+  lua-ext = fetchgit {
+    url = https://github.com/openresty/lua-nginx-module.git;
+    rev = "refs/tags/v0.9.11";
+    sha256 = "0y7238bvb907n7fsz5sivxbhfz2xnf4f0lzwk3k3h9j20fsyvwqq";
+  };
+
 in
 
 stdenv.mkDerivation rec {
@@ -52,7 +66,11 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ openssl zlib pcre libxml2 libxslt gd geoip
-    ] ++ optional fullWebDAV expat;
+    ] ++ optional fullWebDAV expat
+      ++ optional ngx_lua luajit;
+
+  LUAJIT_LIB = if ngx_lua then "${luajit}/lib" else "";
+  LUAJIT_INC = if ngx_lua then "${luajit}/include/luajit-2.0" else "";
 
   patches = if syslog then [ "${syslog-ext}/syslog-1.5.6.patch" ] else [];
 
@@ -83,6 +101,7 @@ stdenv.mkDerivation rec {
     ++ optional syslog "--add-module=${syslog-ext}"
     ++ optional moreheaders "--add-module=${moreheaders-ext}"
     ++ optional echo "--add-module=${echo-ext}"
+    ++ optional ngx_lua "--add-module=${develkit-ext} --add-module=${lua-ext}"
     ++ optional (elem stdenv.system (with platforms; linux ++ freebsd)) "--with-file-aio";
 
 

From a111e7ff08b116db5943babaa6236bde0cdc92c0 Mon Sep 17 00:00:00 2001
From: Longrin Wischnewski <robberer@freakmail.de>
Date: Sat, 30 Aug 2014 19:14:35 +0200
Subject: [PATCH 0874/1453] texlive: Updated to latest release 2014.20140821

---
 pkgs/tools/typesetting/tex/texlive/default.nix | 8 ++++----
 pkgs/tools/typesetting/tex/texlive/extra.nix   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index c2840fd843ff..beb6a7f3a68c 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -5,16 +5,16 @@ rec {
     sha256 = "0nh8hfayyf60nm4z8zyclrbc3792c62azgsvrwxnl28iq223200s";
   };
 
-  texmfVersion = "2014.20140717";
+  texmfVersion = "2014.20140821";
   texmfSrc = fetchurl {
     url = "mirror://debian/pool/main/t/texlive-base/texlive-base_${texmfVersion}.orig.tar.xz";
-    sha256 = "08vhl6x742r8fl0gags2r6yspz8ynvz26vdjrqb4vyz5h7h3rzc9";
+    sha256 = "02qkzlhb381sybs970fgpc94nhx4jm0l3j5pv8z48l11415lvm9b";
   };
 
-  langTexmfVersion = "2014.20140717";
+  langTexmfVersion = "2014.20140821";
   langTexmfSrc = fetchurl {
     url = "mirror://debian/pool/main/t/texlive-lang/texlive-lang_${langTexmfVersion}.orig.tar.xz";
-    sha256 = "1x9aa3v2cg4lcb58lwksnfdsgrhi0sg968pjqsbndmbxhr1msbp7";
+    sha256 = "075avhhhhzw5pbd19q659rn23rws15b5hv7nv0grd93vn3vfwdcy";
   };
 
   passthru = { inherit texmfSrc langTexmfSrc; };
diff --git a/pkgs/tools/typesetting/tex/texlive/extra.nix b/pkgs/tools/typesetting/tex/texlive/extra.nix
index 4644ee3e50ec..f47fedd927d8 100644
--- a/pkgs/tools/typesetting/tex/texlive/extra.nix
+++ b/pkgs/tools/typesetting/tex/texlive/extra.nix
@@ -1,11 +1,11 @@
 args: with args;
 rec {
   name    = "texlive-extra-2014";
-  version = "2014.20140717";
+  version = "2014.20140821";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/t/texlive-extra/texlive-extra_${version}.orig.tar.xz";
-    sha256 = "1khxqdq9gagm6z8kbpjbraysfzibfjs2cgbrhjpncbd24sxpw13q";
+    sha256 = "1y3w8bgp85s90ng2y5dw9chrrvvdf7ibb6ynss8kycvgc0y4m6b3";
   };
 
   buildInputs = [texLive xz];

From c40a25654862311e757098bf7fbb9d308a9b9bd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Mon, 25 Aug 2014 23:43:14 +0200
Subject: [PATCH 0875/1453] Add processing: A language and IDE for electronic
 arts

(cherry picked from commit 0db6387d1c3a8a8f7a9a1e111532d8acd1f794d6)
---
 .../graphics/processing/default.nix           | 36 ++++++++
 .../graphics/processing/use-nixpkgs-jre.patch | 88 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 126 insertions(+)
 create mode 100644 pkgs/applications/graphics/processing/default.nix
 create mode 100644 pkgs/applications/graphics/processing/use-nixpkgs-jre.patch

diff --git a/pkgs/applications/graphics/processing/default.nix b/pkgs/applications/graphics/processing/default.nix
new file mode 100644
index 000000000000..516068b4ea5c
--- /dev/null
+++ b/pkgs/applications/graphics/processing/default.nix
@@ -0,0 +1,36 @@
+{ fetchurl, stdenv, ant, jre, makeWrapper, libXxf86vm }:
+
+stdenv.mkDerivation rec {
+  name = "processing-${version}";
+  version = "2.2.1";
+
+  src = fetchurl {
+    url = "https://github.com/processing/processing/archive/processing-0227-${version}.tar.gz";
+    sha256 = "1r8q5y0h4gpqap5jwkspc0li6566hzx5chr7hwrdn8mxlzsm50xk";
+  };
+
+  # Stop it trying to download its own version of java
+  patches = [ ./use-nixpkgs-jre.patch ];
+
+  buildInputs = [ ant jre makeWrapper libXxf86vm ];
+
+  buildPhase = "cd build && ant build";
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -r linux/work/* $out/
+    rm $out/processing-java
+    sed -e "s#APPDIR=\`dirname \"\$APPDIR\"\`#APPDIR=$out#" -i $out/processing
+    mv $out/processing $out/bin/
+    wrapProgram $out/bin/processing --prefix PATH : ${jre}/bin --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib
+    mkdir $out/java
+    ln -s ${jre}/bin $out/java/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A language and IDE for electronic arts";
+    homepage = http://processing.org;
+    maintainers = [ maintainers.goibhniu ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/graphics/processing/use-nixpkgs-jre.patch b/pkgs/applications/graphics/processing/use-nixpkgs-jre.patch
new file mode 100644
index 000000000000..8f6a5e2018e1
--- /dev/null
+++ b/pkgs/applications/graphics/processing/use-nixpkgs-jre.patch
@@ -0,0 +1,88 @@
+From d1fb63255ff028ecc9cc66d5a6b21b24031b4b4a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
+Date: Tue, 26 Aug 2014 00:07:58 +0200
+Subject: [PATCH] patch
+
+---
+ build/build.xml | 42 +++++++++++++++++++++---------------------
+ 1 file changed, 21 insertions(+), 21 deletions(-)
+
+diff --git a/build/build.xml b/build/build.xml
+index 4d0f0b2..c3f5c09 100755
+--- a/build/build.xml
++++ b/build/build.xml
+@@ -640,10 +640,11 @@
+ 	      value="jre-tools-6u37-linux${sun.arch.data.model}.tgz" />
+     -->
+ 
++    <!--
+     <get src="http://processing.googlecode.com/files/${jre.file}" 
+ 	 dest="linux/jre.tgz" 
+ 	 usetimestamp="true" />
+-
++    -->
+ <!--	   
+     Cannot use ant version of tar because it doesn't preserve properties.
+     <untar compression="gzip" 
+@@ -655,39 +656,38 @@
+ <!--
+     http://www.gnu.org/software/tar/manual/html_section/transform.html
+ -->
+-    <exec executable="tar" dir="linux">
++    <!-- <exec executable="tar" dir="linux"> -->
+       <!-- Change directory -->
+       <!--
+       <arg value="-C" /> 
+       <arg value="linux/work" />
+       <arg value="-xzpf" />
+       -->
+-      <arg value="xfz" />
+-      <arg value="jre.tgz"/>
+-    </exec>
++    <!--   <arg value="xfz" /> -->
++    <!--   <arg value="jre.tgz"/> -->
++    <!-- </exec> -->
+ 
+     <!--
+     We only want to move when the folder didn't exist before
+     <move file="linux/jre1.7.0_40" tofile="linux/work/java" />
+     -->
+-    <exec executable="rsync" dir="linux">
+-      <arg value="-a" />
+-      <arg value="--delete" />
+-      <arg value="jre1.7.0_40/" />
+-      <arg value="work/java" />
+-    </exec>
+-    <delete dir="linux/jre1.7.0_40" />
++    <!-- <exec executable="rsync" dir="linux"> -->
++    <!--   <arg value="-a" /> -->
++    <!--   <arg value="jre1.7.0_40/" /> -->
++    <!--   <arg value="work/java" /> -->
++    <!-- </exec> -->
++    <!-- <delete dir="linux/jre1.7.0_40" /> -->
+ 
+     <!-- Remove unused JRE bloat. -->
+-    <delete> 
+-      <fileset refid="javafx-basics" />
+-      <fileset refid="javafx-linux-${sun.arch.data.model}" />
+-      <fileset refid="jre-optional-linux" />
+-    </delete>
+-
+-    <copy todir="linux/work/java/lib/fonts">
+-      <fileset dir="shared/lib/fonts" includes="*" />
+-    </copy>
++    <!-- <delete>  -->
++    <!--   <fileset refid="javafx-basics" /> -->
++    <!--   <fileset refid="javafx-linux-${sun.arch.data.model}" /> -->
++    <!--   <fileset refid="jre-optional-linux" /> -->
++    <!-- </delete> -->
++
++    <!-- <copy todir="linux/work/java/lib/fonts"> -->
++    <!--   <fileset dir="shared/lib/fonts" includes="*" /> -->
++    <!-- </copy> -->
+ 
+   </target>
+   
+-- 
+2.1.0
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0a92e8ef1e8d..3d67650ebe59 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9576,6 +9576,8 @@ let
 
   qiv = callPackage ../applications/graphics/qiv { };
 
+  processing = callPackage ../applications/graphics/processing { inherit (xorg) libXxf86vm; };
+
   # perhaps there are better apps for this task? It's how I had configured my preivous system.
   # And I don't want to rewrite all rules
   procmail = callPackage ../applications/misc/procmail { };

From ef9c1d612dab8e2ea7be6e7c6f99f0ce3a7f9bba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sat, 30 Aug 2014 19:53:47 +0200
Subject: [PATCH 0876/1453] processing: add license

---
 pkgs/applications/graphics/processing/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/graphics/processing/default.nix b/pkgs/applications/graphics/processing/default.nix
index 516068b4ea5c..ce3d639d1a30 100644
--- a/pkgs/applications/graphics/processing/default.nix
+++ b/pkgs/applications/graphics/processing/default.nix
@@ -30,6 +30,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "A language and IDE for electronic arts";
     homepage = http://processing.org;
+    license = licenses.gpl2Plus;
     maintainers = [ maintainers.goibhniu ];
     platforms = platforms.linux;
   };

From 704e91bab005eabe968a3b140222fb0cf7afd4db Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Sat, 30 Aug 2014 19:54:09 +0200
Subject: [PATCH 0877/1453] Fix syntax error in nixos/lib/build-vms.nix,
 introduced by 86c0f8c

---
 nixos/lib/build-vms.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix
index ba1895554096..50b3b424166b 100644
--- a/nixos/lib/build-vms.nix
+++ b/nixos/lib/build-vms.nix
@@ -52,7 +52,7 @@ rec {
                   [ { address = "192.168.${toString first}.${toString m.second}";
                       prefixLength = 24;
                   } ];
-                }
+                });
             in
             { key = "ip-address";
               config =

From d0fbe1e8bd2b8ce3ddeefd03573c7d64632d6b29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sat, 30 Aug 2014 19:58:12 +0200
Subject: [PATCH 0878/1453] suil: update from 0.8.0 to 0.8.2

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

diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix
index 87e034726594..f5a98750ded4 100644
--- a/pkgs/development/libraries/audio/suil/default.nix
+++ b/pkgs/development/libraries/audio/suil/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "suil-${version}";
-  version = "0.8.0";
+  version = "0.8.2";
 
   src = fetchurl {
     url = "http://download.drobilla.net/${name}.tar.bz2";
-    sha256 = "0y5sbgaivb03vmr3jcpzj16wqxa5h744ml4w3ylzglbxs2bqgl7n";
+    sha256 = "1s3adyiw7sa5gfvm5wasa61qa23629kprxyv6w8hbxdiwp0hhxkq";
   };
 
   buildInputs = [ gtk lv2 pkgconfig python qt4 serd sord sratom ];

From 8eee0eaef4744b50eef82c001b616565e2eab61f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sat, 30 Aug 2014 19:58:24 +0200
Subject: [PATCH 0879/1453] sord: update from 0.12.0 to 0.12.2

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

diff --git a/pkgs/development/libraries/sord/default.nix b/pkgs/development/libraries/sord/default.nix
index 8f122cb699ac..96a19bf37cc9 100644
--- a/pkgs/development/libraries/sord/default.nix
+++ b/pkgs/development/libraries/sord/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "sord-${version}";
-  version = "0.12.0";
+  version = "0.12.2";
 
   src = fetchurl {
     url = "http://download.drobilla.net/${name}.tar.bz2";
-    sha256 = "1f0wz7ynnk72hyr4jfi0lgvj90ld2va1kig8fkw30s8b903alsqj";
+    sha256 = "0rq7vafdv4vsxi6xk9zf5shr59w3kppdhqbj78185rz5gp9kh1dx";
   };
 
   buildInputs = [ pkgconfig python serd ];

From 455e0e0673d195e8bd67f0461208d6160ba810ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sat, 30 Aug 2014 19:58:37 +0200
Subject: [PATCH 0880/1453] serd: update from 0.18.2 to 0.20.0

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

diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix
index 2fd5c9ad493d..c0935bd33fd0 100644
--- a/pkgs/development/libraries/serd/default.nix
+++ b/pkgs/development/libraries/serd/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "serd-${version}";
-  version = "0.18.2";
+  version = "0.20.0";
 
   src = fetchurl {
     url = "http://download.drobilla.net/${name}.tar.bz2";
-    sha256 = "1hgajhm4iar4n2kh71pv6yr0yhipj28kds9y5mbig8izqc188gcf";
+    sha256 = "1gxbzqsm212wmn8qkdd3lbl6wbv7fwmaf9qh2nxa4yxjbr7mylb4";
   };
 
   buildInputs = [ pcre pkgconfig python ];

From 9f1abe6b59b4a3d2d3435c2be48fd7f28b48d8d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sat, 30 Aug 2014 19:58:59 +0200
Subject: [PATCH 0881/1453] python34Packages.zope_testrunner: update from 4.4.1
 to 4.4.3

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 174fde47f2e5..fa035b38964f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9673,11 +9673,11 @@ rec {
 
   zope_testrunner = buildPythonPackage rec {
     name = "zope.testrunner-${version}";
-    version = "4.4.1";
+    version = "4.4.3";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/z/zope.testrunner/${name}.zip";
-      md5 = "1d689abad000419891494b30dd7d8190";
+      sha256 = "1dwk35kg0bmj2lzp4fd2bgp6dv64q5sda09bf0y8j63y53vqbsw8";
     };
 
     propagatedBuildInputs = [ zope_interface zope_exceptions zope_testing six ] ++ optional (!python.is_py3k or false) subunit;

From 465e5fa21aad1247bbf7279a801f16cd37008259 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sat, 30 Aug 2014 19:59:14 +0200
Subject: [PATCH 0882/1453] python34Packages.zope_size: update from 3.4.1 to
 3.5.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fa035b38964f..e97429c26b12 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9613,11 +9613,11 @@ rec {
 
 
   zope_size = buildPythonPackage rec {
-    name = "zope.size-3.4.1";
+    name = "zope.size-3.5.0";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/z/zope.size/${name}.tar.gz";
-      md5 = "55d9084dfd9dcbdb5ad2191ceb5ed03d";
+      sha256 = "006xfkhvmypwd3ww9gbba4zly7n9w30bpp1h74d53la7l7fiqk2f";
     };
 
     propagatedBuildInputs = [ zope_i18nmessageid zope_interface ];

From f6a529aa5105b45f4b6ed5a74ed05293bfdd23da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sat, 30 Aug 2014 19:59:28 +0200
Subject: [PATCH 0883/1453] python34Packages.zope_schema: update from 4.2.2 to
 4.4.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e97429c26b12..ad4a414c3737 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9578,11 +9578,11 @@ rec {
 
 
   zope_schema = buildPythonPackage rec {
-    name = "zope.schema-4.2.2";
+    name = "zope.schema-4.4.1";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/z/zope.schema/${name}.tar.gz";
-      md5 = "e7e581af8193551831560a736a53cf58";
+      sha256 = "0wpwfggd736ai8bbrwbsnqf522sh5j57d1zxq8m8p6i5nwml0q02";
     };
 
     propagatedBuildInputs = [ zope_location zope_event zope_interface zope_testing ] ++ optional isPy26 ordereddict;

From 8c290a64a78377df2820ba5a4175802bd7ca212f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sat, 30 Aug 2014 20:00:02 +0200
Subject: [PATCH 0884/1453] python34Packages.zope_location: update from 4.0.0
 to 4.0.3

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ad4a414c3737..8834f24b47aa 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9521,11 +9521,11 @@ rec {
 
 
   zope_location = buildPythonPackage rec {
-    name = "zope.location-4.0.0";
+    name = "zope.location-4.0.3";
 
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.location/zope.location-4.0.0.tar.gz";
-      md5 = "cd0e10d5923c95e352bcde505cc11324";
+      url = "http://pypi.python.org/packages/source/z/zope.location/zope.location-4.0.3.tar.gz";
+      sha256 = "1nj9da4ksiyv3h8n2vpzwd0pb03mdsh7zy87hfpx72b6p2zcwg74";
     };
 
     propagatedBuildInputs = [ zope_proxy ];

From 297e9a0e52433e21e20c34067b17dc422d5307f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sat, 30 Aug 2014 20:00:16 +0200
Subject: [PATCH 0885/1453] python34Packages.zope_lifecycleevent: update from
 3.6.2 to 3.7.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8834f24b47aa..58e4ed604d5c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9505,11 +9505,11 @@ rec {
 
 
   zope_lifecycleevent = buildPythonPackage rec {
-    name = "zope.lifecycleevent-3.6.2";
+    name = "zope.lifecycleevent-3.7.0";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/z/zope.lifecycleevent/${name}.tar.gz";
-      md5 = "3ba978f3ba7c0805c81c2c79ea3edb33";
+      sha256 = "0s5brphqzzz89cykg61gy7zcmz0ryq1jj2va7gh2n1b3cccllp95";
     };
 
     propagatedBuildInputs = [ zope_event zope_component ];

From 0b6613e1b60d28715526aa783c85dade7fe3a3e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sat, 30 Aug 2014 20:00:45 +0200
Subject: [PATCH 0886/1453] python34Packages.zope_i18nmessageid: update from
 4.0.2 to 4.0.3

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 58e4ed604d5c..253f0d6d2dbf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9491,11 +9491,11 @@ rec {
 
 
   zope_i18nmessageid = buildPythonPackage rec {
-    name = "zope.i18nmessageid-4.0.2";
+    name = "zope.i18nmessageid-4.0.3";
 
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.i18nmessageid/zope.i18nmessageid-4.0.2.tar.gz";
-      md5 = "c4550f7a0b4a736186e6e0fa3b2471f7";
+      url = "http://pypi.python.org/packages/source/z/zope.i18nmessageid/zope.i18nmessageid-4.0.3.tar.gz";
+      sha256 = "1rslyph0klk58dmjjy4j0jxy21k03azksixc3x2xhqbkv97cmzml";
     };
 
     meta = {

From 45d9d2a8b5ce82a33c1164ce5ffdbd65f0e30e50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sat, 30 Aug 2014 20:00:54 +0200
Subject: [PATCH 0887/1453] python34Packages.zope_i18n: update from 3.7.4 to
 3.8.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 253f0d6d2dbf..d959fc2eca34 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9475,11 +9475,11 @@ rec {
 
 
   zope_i18n = buildPythonPackage rec {
-    name = "zope.i18n-3.7.4";
+    name = "zope.i18n-3.8.0";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/z/zope.i18n/${name}.tar.gz";
-      md5 = "a6fe9d9ad53dd7e94e87cd58fb67d3b7";
+      sha256 = "045nnimmshibcq71yym2d8yrs6wzzhxq5gl7wxjnkpyjm5y0hfkm";
     };
 
     propagatedBuildInputs = [ pytz zope_component ];

From 7acf9a0c1c981d07a14c32aa777ba30da1d86dc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sat, 30 Aug 2014 20:01:02 +0200
Subject: [PATCH 0888/1453] python34Packages.zope_event: update from 4.0.2 to
 4.0.3

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d959fc2eca34..8266c6f1a240 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9422,11 +9422,11 @@ rec {
 
   zope_event = buildPythonPackage rec {
     name = "zope.event-${version}";
-    version = "4.0.2";
+    version = "4.0.3";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/z/zope.event/${name}.tar.gz";
-      md5 = "e08dd299d428d77a1cfcbfe841b81872";
+      sha256 = "1w858k9kmgzfj36h65kp27m9slrmykvi5cjq6c119xqnaz5gdzgm";
     };
 
     meta = {

From 65ef87293ae36e9a42d7ddb1d3169f926f10e08c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sat, 30 Aug 2014 20:01:11 +0200
Subject: [PATCH 0889/1453] python34Packages.zope_configuration: update from
 4.0.2 to 4.0.3

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8266c6f1a240..472dfee2f082 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9355,11 +9355,11 @@ rec {
 
 
   zope_configuration = buildPythonPackage rec {
-    name = "zope.configuration-4.0.2";
+    name = "zope.configuration-4.0.3";
 
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.configuration/zope.configuration-4.0.2.tar.gz";
-      md5 = "40b3c7ad0b748ede532d8cfe2544e44e";
+      url = "http://pypi.python.org/packages/source/z/zope.configuration/zope.configuration-4.0.3.tar.gz";
+      sha256 = "1x9dfqypgympnlm25p9m43xh4qv3p7d75vksv9pzqibrb4cggw5n";
     };
 
     propagatedBuildInputs = [ zope_i18nmessageid zope_schema ];

From c701503a4b86ce02f5468d8c5715d4c88a062a28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sat, 30 Aug 2014 20:01:19 +0200
Subject: [PATCH 0890/1453] python34Packages.zope_component: update from 4.0.2
 to 4.2.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 472dfee2f082..21a7064516e0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9333,11 +9333,11 @@ rec {
 
 
   zope_component = buildPythonPackage rec {
-    name = "zope.component-4.0.2";
+    name = "zope.component-4.2.1";
 
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.component/zope.component-4.0.2.tar.gz";
-      md5 = "8c2fd4414ca23cbbe014dcaf911acebc";
+      url = "http://pypi.python.org/packages/source/z/zope.component/zope.component-4.2.1.tar.gz";
+      sha256 = "1gzbr0j6c2h0cqnpi2cjss38wrz1bcwx8xahl3vykgz5laid15l6";
     };
 
     propagatedBuildInputs = [

From b96574ff157947ec0a375eef9e5e618f3dd2c918 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sat, 30 Aug 2014 20:01:28 +0200
Subject: [PATCH 0891/1453] python34Packages.zope_browser: update from 1.3 to
 2.0.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 21a7064516e0..4467d58456a5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9299,11 +9299,11 @@ rec {
 
 
   zope_browser = buildPythonPackage rec {
-    name = "zope.browser-1.3";
+    name = "zope.browser-2.0.2";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/z/zope.browser/${name}.zip";
-      md5 = "4ff0ddbf64c45bfcc3189e35f4214ded";
+      sha256 = "0f9r5rn9lzgi4hvkhgb6vgw8kpz9sv16jsfb9ws4am8gbqcgv2iy";
     };
 
     propagatedBuildInputs = [ zope_interface ];

From 6aa23db35dfdbb5101381729b6726e97b64cf5cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sat, 30 Aug 2014 20:01:40 +0200
Subject: [PATCH 0892/1453] python27Packages.rope: update from 0.9.4 to 0.10.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4467d58456a5..551c3e458903 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7286,14 +7286,14 @@ rec {
 
 
   rope = buildPythonPackage rec {
-    version = "0.9.4";
+    version = "0.10.2";
     name = "rope-${version}";
 
     disabled = isPy3k;
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/r/rope/${name}.tar.gz";
-      sha256 = "1fm6ahff50b10mlnc0ar4x1fv9sxmcp1g651myyqy7c50hk39h1d";
+      sha256 = "0rdlvp8h74qs49wz1hx6qy8mgp2ddwlfs7z13h9139ynq04a3z7z";
     };
 
     meta = with stdenv.lib; {

From 4fe89ae412f1dee451a73d8d476cd25957c2c66c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sat, 30 Aug 2014 20:02:16 +0200
Subject: [PATCH 0893/1453] lilv: update from 0.18.0 to 0.20.0

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

diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix
index d1510e342380..9f3307742ec4 100644
--- a/pkgs/development/libraries/audio/lilv/default.nix
+++ b/pkgs/development/libraries/audio/lilv/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "lilv-${version}";
-  version = "0.18.0";
+  version = "0.20.0";
 
   src = fetchurl {
     url = "http://download.drobilla.net/${name}.tar.bz2";
-    sha256 = "1k9wfc08ylgbkwbnvh1fx1bdzl3y59xrrx8gv0vk68yzcvcmv6am";
+    sha256 = "0aj2plkx56iar8vzjbq2l7hi7sp0ml99m0h44rgwai2x4vqkk2j2";
   };
 
   buildInputs = [ lv2 pkgconfig python serd sord sratom ];

From 33949a413c4f4ae773876ccba9036db8a694cae7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 30 Aug 2014 20:43:31 +0200
Subject: [PATCH 0894/1453] python34: include a patch to fix
 http://bugs.python.org/issue21121

---
 .../interpreters/python/3.4/default.nix       |  2 +
 .../python/3.4/issue21121-3.patch             | 86 +++++++++++++++++++
 2 files changed, 88 insertions(+)
 create mode 100644 pkgs/development/interpreters/python/3.4/issue21121-3.patch

diff --git a/pkgs/development/interpreters/python/3.4/default.nix b/pkgs/development/interpreters/python/3.4/default.nix
index 3477cedf4b74..312bf247de7c 100644
--- a/pkgs/development/interpreters/python/3.4/default.nix
+++ b/pkgs/development/interpreters/python/3.4/default.nix
@@ -36,6 +36,8 @@ stdenv.mkDerivation {
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
 
+  patches = [ ./issue21121-3.patch ];
+
   preConfigure = ''
     for i in /usr /sw /opt /pkg; do	# improve purity
       substituteInPlace ./setup.py --replace $i /no-such-path
diff --git a/pkgs/development/interpreters/python/3.4/issue21121-3.patch b/pkgs/development/interpreters/python/3.4/issue21121-3.patch
new file mode 100644
index 000000000000..506d9ea9b3d9
--- /dev/null
+++ b/pkgs/development/interpreters/python/3.4/issue21121-3.patch
@@ -0,0 +1,86 @@
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -71,12 +71,17 @@
+ BASECFLAGS=	@BASECFLAGS@
+ BASECPPFLAGS=	@BASECPPFLAGS@
+ CONFIGURE_CFLAGS=	@CFLAGS@
++# CFLAGS_NODIST is used for building the interpreter and stdlib C extensions.
++# Use it when a compiler flag should _not_ be part of the distutils CFLAGS
++# once Python is installed (Issue #21121).
++CONFIGURE_CFLAGS_NODIST=@CFLAGS_NODIST@
+ CONFIGURE_CPPFLAGS=	@CPPFLAGS@
+ CONFIGURE_LDFLAGS=	@LDFLAGS@
+ # Avoid assigning CFLAGS, LDFLAGS, etc. so users can use them on the
+ # command line to append to these values without stomping the pre-set
+ # values.
+ PY_CFLAGS=	$(BASECFLAGS) $(OPT) $(CONFIGURE_CFLAGS) $(CFLAGS) $(EXTRA_CFLAGS)
++PY_CFLAGS_NODIST=$(CONFIGURE_CFLAGS_NODIST) $(CFLAGS_NODIST)
+ # Both CPPFLAGS and LDFLAGS need to contain the shell's value for setup.py to
+ # be able to build extension modules using the directories specified in the
+ # environment variables
+@@ -91,7 +96,7 @@
+ # Extra C flags added for building the interpreter object files.
+ CFLAGSFORSHARED=@CFLAGSFORSHARED@
+ # C flags used for building the interpreter object files
+-PY_CORE_CFLAGS=	$(PY_CFLAGS) $(PY_CPPFLAGS) $(CFLAGSFORSHARED) -DPy_BUILD_CORE
++PY_CORE_CFLAGS=	$(PY_CFLAGS) $(PY_CFLAGS_NODIST) $(PY_CPPFLAGS) $(CFLAGSFORSHARED) -DPy_BUILD_CORE
+ 
+ 
+ # Machine-dependent subdirectories
+diff --git a/configure b/configure
+--- a/configure
++++ b/configure
+@@ -662,6 +662,7 @@
+ LIBTOOL_CRUFT
+ OTHER_LIBTOOL_OPT
+ UNIVERSAL_ARCH_FLAGS
++CFLAGS_NODIST
+ BASECFLAGS
+ OPT
+ ABIFLAGS
+@@ -6504,7 +6505,7 @@
+ 
+     if test $ac_cv_declaration_after_statement_warning = yes
+     then
+-      BASECFLAGS="$BASECFLAGS -Werror=declaration-after-statement"
++      CFLAGS_NODIST="$CFLAGS_NODIST -Werror=declaration-after-statement"
+     fi
+ 
+     # if using gcc on alpha, use -mieee to get (near) full IEEE 754
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -1147,6 +1147,7 @@
+ fi
+ 
+ AC_SUBST(BASECFLAGS)
++AC_SUBST(CFLAGS_NODIST)
+ 
+ # The -arch flags for universal builds on OSX
+ UNIVERSAL_ARCH_FLAGS=
+@@ -1231,7 +1232,7 @@
+ 
+     if test $ac_cv_declaration_after_statement_warning = yes
+     then
+-      BASECFLAGS="$BASECFLAGS -Werror=declaration-after-statement"
++      CFLAGS_NODIST="$CFLAGS_NODIST -Werror=declaration-after-statement"
+     fi
+ 
+     # if using gcc on alpha, use -mieee to get (near) full IEEE 754
+diff --git a/setup.py b/setup.py
+--- a/setup.py
++++ b/setup.py
+@@ -19,6 +19,12 @@
+ 
+ cross_compiling = "_PYTHON_HOST_PLATFORM" in os.environ
+ 
++# Add special CFLAGS reserved for building the interpreter and the stdlib
++# modules (Issue #21121).
++cflags = sysconfig.get_config_var('CFLAGS')
++py_cflags_nodist = sysconfig.get_config_var('PY_CFLAGS_NODIST')
++sysconfig.get_config_vars()['CFLAGS'] = cflags + ' ' + py_cflags_nodist
++
+ def get_platform():
+     # cross build
+     if "_PYTHON_HOST_PLATFORM" in os.environ:

From b8fca7b38c38fe28dc8bfe3d3e566581f296e03a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 30 Aug 2014 21:08:49 +0200
Subject: [PATCH 0895/1453] koji: factor python module into an standalone app

---
 .../tools/package-management/koji/default.nix | 21 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 pkgs/top-level/python-packages.nix            | 19 -----------------
 3 files changed, 23 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/tools/package-management/koji/default.nix

diff --git a/pkgs/tools/package-management/koji/default.nix b/pkgs/tools/package-management/koji/default.nix
new file mode 100644
index 000000000000..7f03ed1625e8
--- /dev/null
+++ b/pkgs/tools/package-management/koji/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, pythonPackages, python }:
+
+stdenv.mkDerivation rec {
+  name = "koji-1.8";
+
+  src = fetchurl {
+    url = "https://fedorahosted.org/released/koji/koji-1.8.0.tar.bz2";
+    sha256 = "10dph209h4jgajb5jmbjhqy4z4hd22i7s2d93vm3ikdf01i8iwf1";
+  };
+
+  propagatedBuildInputs = [ pythonPackages.pycurl python ];
+
+  makeFlags = "DESTDIR=$(out)";
+
+  postInstall = ''
+    cp -R $out/nix/store/*/* $out/
+    rm -rf $out/nix
+  '';
+
+  meta.maintainers = [ stdenv.lib.maintainers.mornfall ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3d67650ebe59..3d3e462f82fc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9123,6 +9123,8 @@ let
     inherit (gnome) libglade;
   };
 
+  koji = callPackage ../tools/package-management/koji { };
+
   lame = callPackage ../applications/audio/lame { };
 
   larswm = callPackage ../applications/window-managers/larswm { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 551c3e458903..ec224fec54ad 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2260,25 +2260,6 @@ rec {
     };
   };
 
-  # TODO: this shouldn't use a buildPythonPackage
-  koji = buildPythonPackage (rec {
-    name = "koji-1.8";
-    meta.maintainers = [ stdenv.lib.maintainers.mornfall ];
-    disabled = isPy3k;
-
-    src = fetchurl {
-      url = "https://fedorahosted.org/released/koji/koji-1.8.0.tar.bz2";
-      sha256 = "10dph209h4jgajb5jmbjhqy4z4hd22i7s2d93vm3ikdf01i8iwf1";
-    };
-
-    configurePhase = ":";
-    buildPhase = ":";
-    installPhase = "make install DESTDIR=$out/ && cp -R $out/nix/store/*/* $out/ && rm -rf $out/nix";
-    doCheck = false;
-    propagatedBuildInputs = [ pythonPackages.pycurl ];
-
-  });
-
   logilab_astng = buildPythonPackage rec {
     name = "logilab-astng-0.24.3";
 

From 1e06594c0c70f618887e1ddaba35b4e165b448d5 Mon Sep 17 00:00:00 2001
From: Patrick Mahoney <pat@polycrystal.org>
Date: Wed, 30 Apr 2014 09:54:35 -0500
Subject: [PATCH 0896/1453] mariadb: Patch to compile on OS X.

* perl is required at build time on darwin. Copied from the
  mysql/5.5.x.nix

* CMake on darwin creates shared libraries with relative 'install_name'
  paths which are made absolute by fixDarwinDylibNames.

  See http://answers.opencv.org/question/4134/cmake-install_name_tool-absolute-path-for-library/

* The asm patch was needed to compile on darwin, though I do not
  understand what is going on. Error before the patch:

  [ 15%] Building C object mysys/CMakeFiles/mysys.dir/my_context.c.o
  .../nix-build-mariadb-10.0.13.drv-1/mariadb-10.0.13/mysys/my_context.c:207:Unknown pseudo-op: .cfi_escape
  .../nix-build-mariadb-10.0.13.drv-1/mariadb-10.0.13/mysys/my_context.c:207:Rest of line ignored. 1st junk character valued 48 (0).
  make[2]: *** [mysys/CMakeFiles/mysys.dir/my_context.c.o] Error 1
---
 pkgs/servers/sql/mariadb/default.nix          | 17 +++++++++++++++--
 pkgs/servers/sql/mariadb/my_context_asm.patch | 18 ++++++++++++++++++
 2 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/servers/sql/mariadb/my_context_asm.patch

diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index bb0c0bc8da86..0efdd542fa4e 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, ncurses, openssl, bison, boost, libxml2, libaio, judy, libevent, groff }:
+{ stdenv, fetchurl, cmake, ncurses, openssl, bison, boost, libxml2, libaio, judy, libevent, groff, perl, fixDarwinDylibNames }:
 
 stdenv.mkDerivation rec {
   name = "mariadb-${version}";
@@ -9,12 +9,25 @@ stdenv.mkDerivation rec {
     sha256 = "039wz89vs03a27anpshj5xaqknm7cqi7mrypvwingqkq26ns0mhs";
   };
 
-  buildInputs = [ cmake ncurses openssl bison boost libxml2 libaio judy libevent groff ];
+  buildInputs = [ cmake ncurses openssl bison boost libxml2 judy libevent groff ]
+     ++ stdenv.lib.optional (!stdenv.isDarwin) libaio
+     ++ stdenv.lib.optionals stdenv.isDarwin [ perl fixDarwinDylibNames ];
+
+  patches = stdenv.lib.optional stdenv.isDarwin ./my_context_asm.patch;
 
   cmakeFlags = [ "-DWITH_READLINE=yes" "-DWITH_EMBEDDED_SERVER=yes" "-DINSTALL_SCRIPTDIR=bin" ];
 
   enableParallelBuilding = true;
 
+  prePatch = ''
+    substituteInPlace cmake/libutils.cmake \
+      --replace /usr/bin/libtool libtool
+  '';
+  postInstall = ''
+    substituteInPlace $out/bin/mysql_install_db \
+      --replace basedir=\"\" basedir=\"$out\"
+  '';
+
   passthru.mysqlVersion = "5.5";
 
   meta = {
diff --git a/pkgs/servers/sql/mariadb/my_context_asm.patch b/pkgs/servers/sql/mariadb/my_context_asm.patch
new file mode 100644
index 000000000000..3a747ed1b03c
--- /dev/null
+++ b/pkgs/servers/sql/mariadb/my_context_asm.patch
@@ -0,0 +1,18 @@
+--- a/mysys/my_context.c
++++ b/mysys/my_context.c
+@@ -206,15 +206,6 @@ my_context_spawn(struct my_context *c, void (*f)(void *), void *d)
+     (
+      "movq %%rsp, (%[save])\n\t"
+      "movq %[stack], %%rsp\n\t"
+-#if __GNUC__ >= 4 && __GNUC_MINOR__ >= 4 && !defined(__INTEL_COMPILER)
+-     /*
+-       This emits a DWARF DW_CFA_undefined directive to make the return address
+-       undefined. This indicates that this is the top of the stack frame, and
+-       helps tools that use DWARF stack unwinding to obtain stack traces.
+-       (I use numeric constant to avoid a dependency on libdwarf includes).
+-     */
+-     ".cfi_escape 0x07, 16\n\t"
+-#endif
+      "movq %%rbp, 8(%[save])\n\t"
+      "movq %%rbx, 16(%[save])\n\t"
+      "movq %%r12, 24(%[save])\n\t"

From d593d3ac8810179501a8c8d404c0d19c06265510 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 30 Aug 2014 23:48:58 +0400
Subject: [PATCH 0897/1453] Fix K3D patching and cmake-configuration phases

---
 pkgs/applications/graphics/k3d/default.nix    |  8 +--
 .../k3d/disable_mutable_in_boost_gil.patch    | 20 -------
 .../graphics/k3d/k3d-0.7.11.0-libpng14.patch  | 54 -------------------
 3 files changed, 2 insertions(+), 80 deletions(-)
 delete mode 100644 pkgs/applications/graphics/k3d/disable_mutable_in_boost_gil.patch
 delete mode 100644 pkgs/applications/graphics/k3d/k3d-0.7.11.0-libpng14.patch

diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix
index 35f3bed866d1..bb577ec0552b 100644
--- a/pkgs/applications/graphics/k3d/default.nix
+++ b/pkgs/applications/graphics/k3d/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl
 , cmake, mesa, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype
 , libpng, boost, doxygen, cairomm, pkgconfig, imagemagick, libjpeg, libtiff
-, gettext, intltool, perl, gtkmm, glibmm, gtkglext
+, gettext, intltool, perl, gtkmm, glibmm, gtkglext, pangox_compat
 }:
 
 stdenv.mkDerivation rec {
@@ -13,11 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   patches = [
-    # debian package source
-    ./disable_mutable_in_boost_gil.patch
     ./k3d_gtkmm224.patch
-    # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-gfx/k3d/files/k3d-0.7.11.0-libpng14.patch
-    ./k3d-0.7.11.0-libpng14.patch
   ];
 
   preConfigure = ''
@@ -29,7 +25,7 @@ stdenv.mkDerivation rec {
      cmake mesa zlib python expat libxml2 libsigcxx libuuid freetype libpng
      boost doxygen cairomm pkgconfig imagemagick libjpeg libtiff gettext
      intltool perl
-     gtkmm glibmm gtkglext
+     gtkmm glibmm gtkglext pangox_compat
     ];
 
   doCheck = false;
diff --git a/pkgs/applications/graphics/k3d/disable_mutable_in_boost_gil.patch b/pkgs/applications/graphics/k3d/disable_mutable_in_boost_gil.patch
deleted file mode 100644
index 1774328c6186..000000000000
--- a/pkgs/applications/graphics/k3d/disable_mutable_in_boost_gil.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/k3dsdk/gil/boost/gil/extension/dynamic_image/apply_operation_base.hpp
-+++ b/k3dsdk/gil/boost/gil/extension/dynamic_image/apply_operation_base.hpp
-@@ -114,7 +114,7 @@
-     template <typename T2, typename Op>
-     struct reduce_bind1 {
-         const T2& _t2;
--        mutable Op&  _op;
-+        Op&  _op;
- 
-         typedef typename Op::result_type result_type;
- 
-@@ -127,7 +127,7 @@
-     struct reduce_bind2 {
-         const Bits1& _bits1;
-         std::size_t _index1;
--        mutable Op&  _op;
-+        Op&  _op;
- 
-         typedef typename Op::result_type result_type;
- 
diff --git a/pkgs/applications/graphics/k3d/k3d-0.7.11.0-libpng14.patch b/pkgs/applications/graphics/k3d/k3d-0.7.11.0-libpng14.patch
deleted file mode 100644
index b54168227b40..000000000000
--- a/pkgs/applications/graphics/k3d/k3d-0.7.11.0-libpng14.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -ur k3d-source-0.7.11.0.orig/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp k3d-source-0.7.11.0/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp
---- k3d-source-0.7.11.0.orig/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp	2009-03-19 22:28:53.000000000 +0200
-+++ k3d-source-0.7.11.0/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp	2010-05-12 12:21:50.000000000 +0300
-@@ -148,12 +148,12 @@
-         // allocate/initialize the image information data
-         _info_ptr = png_create_info_struct(_png_ptr);
-         if (_info_ptr == NULL) {
--            png_destroy_read_struct(&_png_ptr,png_infopp_NULL,png_infopp_NULL);
-+            png_destroy_read_struct(&_png_ptr,NULL,NULL);
-             io_error("png_get_file_size: fail to call png_create_info_struct()");
-         }
-         if (setjmp(png_jmpbuf(_png_ptr))) {
-             //free all of the memory associated with the png_ptr and info_ptr
--            png_destroy_read_struct(&_png_ptr, &_info_ptr, png_infopp_NULL);
-+            png_destroy_read_struct(&_png_ptr, &_info_ptr, NULL);
-             io_error("png_get_file_size: fail to call setjmp()");
-         }
-         png_init_io(_png_ptr, get());
-@@ -165,7 +165,7 @@
-     png_reader(const char* filename) : file_mgr(filename, "rb") { init(); }
- 
-     ~png_reader() {
--        png_destroy_read_struct(&_png_ptr,&_info_ptr,png_infopp_NULL);
-+        png_destroy_read_struct(&_png_ptr,&_info_ptr,NULL);
-     }
-     point2<std::ptrdiff_t> get_dimensions() {
-         return point2<std::ptrdiff_t>(png_get_image_width(_png_ptr,_info_ptr),
-@@ -177,7 +177,7 @@
-         int bit_depth, color_type, interlace_type;
-         png_get_IHDR(_png_ptr, _info_ptr,
-                      &width, &height,&bit_depth,&color_type,&interlace_type,
--                     int_p_NULL, int_p_NULL);
-+                     (int *) NULL, (int *) NULL);
-         io_error_if(((png_uint_32)view.width()!=width || (png_uint_32)view.height()!= height),
-                     "png_read_view: input view size does not match PNG file size");
-         
-@@ -219,7 +219,7 @@
-         int bit_depth, color_type, interlace_type;
-         png_get_IHDR(_png_ptr, _info_ptr,
-                      &width, &height,&bit_depth,&color_type,&interlace_type,
--                     int_p_NULL, int_p_NULL);
-+                     (int *) NULL, (int *) NULL);
-         io_error_if(((png_uint_32)view.width()!=width || (png_uint_32)view.height()!= height),
-                     "png_reader_color_convert::apply(): input view size does not match PNG file size");
-         switch (color_type) {
-@@ -308,7 +308,7 @@
-         io_error_if(!_png_ptr,"png_write_initialize: fail to call png_create_write_struct()");
-         _info_ptr = png_create_info_struct(_png_ptr);
-         if (!_info_ptr) {
--            png_destroy_write_struct(&_png_ptr,png_infopp_NULL);
-+            png_destroy_write_struct(&_png_ptr,NULL);
-             io_error("png_write_initialize: fail to call png_create_info_struct()");
-         }
-         if (setjmp(png_jmpbuf(_png_ptr))) {

From dcb38fc8aa34d603bb57f14b913a338574afcecb Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 31 Aug 2014 00:25:48 +0400
Subject: [PATCH 0898/1453] Add missing libXmu dependency

---
 pkgs/applications/graphics/k3d/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix
index bb577ec0552b..eb45ae3d8e78 100644
--- a/pkgs/applications/graphics/k3d/default.nix
+++ b/pkgs/applications/graphics/k3d/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl
 , cmake, mesa, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype
 , libpng, boost, doxygen, cairomm, pkgconfig, imagemagick, libjpeg, libtiff
-, gettext, intltool, perl, gtkmm, glibmm, gtkglext, pangox_compat
+, gettext, intltool, perl, gtkmm, glibmm, gtkglext, pangox_compat, libXmu
 }:
 
 stdenv.mkDerivation rec {
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
      cmake mesa zlib python expat libxml2 libsigcxx libuuid freetype libpng
      boost doxygen cairomm pkgconfig imagemagick libjpeg libtiff gettext
      intltool perl
-     gtkmm glibmm gtkglext pangox_compat
+     gtkmm glibmm gtkglext pangox_compat libXmu
     ];
 
   doCheck = false;

From 64a18d70e5a0ca60fcfdce4379de7dfd3b7f5c64 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 31 Aug 2014 00:37:01 +0400
Subject: [PATCH 0899/1453] Julia 0.3.0 seems to have no more problems than
 0.2.1, so make it default

---
 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 3d3e462f82fc..f50cdee18987 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3145,7 +3145,7 @@ let
     llvm = llvm_34;
     openblas = openblas_0_2_10;
   };
-  julia = julia021;
+  julia = julia030;
 
   lazarus = builderDefsPackage (import ../development/compilers/fpc/lazarus.nix) {
     inherit makeWrapper gtk glib pango atk gdk_pixbuf;

From 74b808a66f2ce58f8edaca4e08b14f9c28e9a9e7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 30 Aug 2014 22:41:01 +0200
Subject: [PATCH 0900/1453] Revert "ed: update to 1.10 (close #3852)"

This reverts commit 60902b97fe4a96d370bc0c5e3690fa45da77d78d. It
breaks building on Darwin:

  http://hydra.nixos.org/build/13832410

It also adds a gratuitous dependency to the stdenv bootstrap.
---
 pkgs/applications/editors/ed/default.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix
index ea8b2b27987b..0c764fcf8f86 100644
--- a/pkgs/applications/editors/ed/default.nix
+++ b/pkgs/applications/editors/ed/default.nix
@@ -1,12 +1,11 @@
-{ fetchurl, stdenv, lzip }:
+{ fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  version = "1.10";
-  name = "ed-${version}";
+  name = "ed-1.9";
 
   src = fetchurl {
-    url = "mirror://gnu/ed/${name}.tar.lz";
-    sha256 = "16kycdm5fcvpdr41hxb2da8da6jzs9dqznsg5552z6rh28n0jh4m";
+    url = "mirror://gnu/ed/${name}.tar.gz";
+    sha256 = "122syihsx2hwzj75mkf5a9ssiky2xby748kp4cc00wzhmp7p5cym";
   };
 
   /* FIXME: Tests currently fail on Darwin:
@@ -24,8 +23,6 @@ stdenv.mkDerivation rec {
     compileFlags = [ "CC=${stdenv.cross.config}-gcc" ];
   };
 
-  buildInputs = [ lzip ];
-
   meta = {
     description = "An implementation of the standard Unix editor";
 
@@ -41,7 +38,9 @@ stdenv.mkDerivation rec {
     '';
 
     license = stdenv.lib.licenses.gpl3Plus;
+
     homepage = http://www.gnu.org/software/ed/;
-    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+
+    maintainers = [ ];
   };
 }

From 3360fa1afb15bc82e49885d511de5e26b12a092d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 30 Aug 2014 22:41:56 +0200
Subject: [PATCH 0901/1453] Revert "stdenv/setup.sh: unbreak *.lz sources on
 darwin"

This reverts commit fcafdd27616b91049c506441802b9cfe970388d4. We're
trying to modularise stdenv, not add more ad-hoc compression support.
---
 pkgs/stdenv/generic/setup.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 94a73680e3ed..c3b9033b49a6 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -450,10 +450,6 @@ unpackFile() {
             # Don't rely on tar knowing about .xz.
             xz -d < $curSrc | tar xf -
             ;;
-        *.tar.lz )
-            # Don't rely on tar knowing about .lz.
-            lzip -d < $curSrc | tar xf -
-            ;;
         *.tar | *.tar.* | *.tgz | *.tbz2)
             # GNU tar can automatically select the decompression method
             # (info "(tar) gzip").

From c59ef6af6f73cd6993c8ca76ba024d581969fecb Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien.cassou@gmail.com>
Date: Sat, 30 Aug 2014 17:33:04 +0200
Subject: [PATCH 0902/1453] backintime: a simple backup tool

---
 .../networking/sync/backintime/default.nix    | 78 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 80 insertions(+)
 create mode 100644 pkgs/applications/networking/sync/backintime/default.nix

diff --git a/pkgs/applications/networking/sync/backintime/default.nix b/pkgs/applications/networking/sync/backintime/default.nix
new file mode 100644
index 000000000000..9b9e355f8281
--- /dev/null
+++ b/pkgs/applications/networking/sync/backintime/default.nix
@@ -0,0 +1,78 @@
+{stdenv, fetchurl, makeWrapper, gettext, python2, python2Packages, gnome2, pkgconfig, pygobject, glib, libtool }:
+
+let
+  version = "1.0.36";
+
+  src = fetchurl {
+    url = "https://launchpad.net/backintime/1.0/${version}/+download/backintime-${version}.tar.gz";
+    md5 = "28630bc7bd5f663ba8fcfb9ca6a742d8";
+  };
+
+  # because upstream tarball has no top-level directory.
+  # https://bugs.launchpad.net/backintime/+bug/1359076
+  sourceRoot = ".";
+
+  genericBuildInputs = [ makeWrapper gettext python2 python2Packages.dbus ];
+
+  installFlagsArray = [ "DEST=$(out)" ];
+
+  meta = {
+    homepage = https://launchpad.net/backintime;
+    description = "Simple backup tool for Linux";
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.DamienCassou ];
+    platforms = stdenv.lib.platforms.linux;
+    longDescription = ''
+      Back In Time is a simple backup tool (on top of rsync) for Linux
+      inspired from “flyback project” and “TimeVault”. The backup is
+      done by taking snapshots of a specified set of directories.
+    '';
+  };
+
+  common = stdenv.mkDerivation rec {
+    inherit version src sourceRoot installFlagsArray meta;
+
+    name = "backintime-common-${version}";
+
+    buildInputs = genericBuildInputs;
+
+    preConfigure = "cd common";
+
+    dontAddPrefix = true;
+
+    preFixup =
+      ''
+      substituteInPlace "$out/bin/backintime" \
+        --replace "=\"/usr/share" "=\"$prefix/share"
+      wrapProgram "$out/bin/backintime" \
+        --prefix PYTHONPATH : "$PYTHONPATH"
+    '';
+  };
+
+in
+stdenv.mkDerivation rec {
+  inherit version src sourceRoot installFlagsArray meta;
+
+  name = "backintime-gnome-${version}";
+
+  buildInputs = genericBuildInputs ++ [ common python2Packages.pygtk python2Packages.notify gnome2.gnome_python ];
+
+  preConfigure = "cd gnome";
+  configureFlagsArray = [ "--no-check" ];
+
+  preFixup =
+      ''
+      substituteInPlace "$out/share/backintime/gnome/app.py" \
+         --replace "glade_file = os.path.join(self.config.get_app_path()," \
+                   "glade_file = os.path.join('$prefix/share/backintime',"
+      substituteInPlace "$out/share/backintime/gnome/settingsdialog.py" \
+        --replace "glade_file = os.path.join(self.config.get_app_path()," \
+                  "glade_file = os.path.join('$prefix/share/backintime',"
+      substituteInPlace "$out/bin/backintime-gnome" \
+        --replace "=\"/usr/share" "=\"$prefix/share"
+      wrapProgram "$out/bin/backintime-gnome" \
+        --prefix PYTHONPATH : "${gnome2.gnome_python}/lib/python2.7/site-packages/gtk-2.0:${common}/share/backintime/common:$PYTHONPATH" \
+        --prefix PATH : "$PATH"
+    '';
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f50cdee18987..64bf223e5d9a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8269,6 +8269,8 @@ let
 
   inherit (gnome3) baobab;
 
+  backintime = callPackage ../applications/networking/sync/backintime { };
+
   bar = callPackage ../applications/window-managers/bar { };
 
   baresip = callPackage ../applications/networking/instant-messengers/baresip {

From acba6b4da25e4b92e2422036104ad2040bef1acd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 30 Aug 2014 22:52:27 +0200
Subject: [PATCH 0903/1453] ed: update to 1.10, working around *.lz problem

---
 pkgs/applications/editors/ed/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix
index 0c764fcf8f86..bccd7754efbd 100644
--- a/pkgs/applications/editors/ed/default.nix
+++ b/pkgs/applications/editors/ed/default.nix
@@ -1,11 +1,14 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "ed-1.9";
+  name = "ed-1.10";
 
   src = fetchurl {
-    url = "mirror://gnu/ed/${name}.tar.gz";
-    sha256 = "122syihsx2hwzj75mkf5a9ssiky2xby748kp4cc00wzhmp7p5cym";
+    # gnu only provides *.lz tarball, which is unfriendly for stdenv bootstrapping
+    #url = "mirror://gnu/ed/${name}.tar.gz";
+    url = "http://pkgs.fedoraproject.org/repo/extras/ed/${name}.tar.bz2"
+      + "/38204d4c690a17a989e802ba01b45e98/${name}.tar.bz2";
+    sha256 = "16qvshl8470f3znjfrrci3lzllqkzc6disk5kygzsg9hh4f6wysq";
   };
 
   /* FIXME: Tests currently fail on Darwin:

From e9e5ff87765469aadee4b33417596d01502e8c43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 30 Aug 2014 21:11:15 +0200
Subject: [PATCH 0904/1453] pypyPackages.random2: disable tests

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ec224fec54ad..894ffbd3ce9b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2749,6 +2749,8 @@ rec {
 
   random2 = pythonPackages.buildPythonPackage rec {
     name = "random2-1.0.1";
+    
+    doCheck = !isPyPy;
 
     src = fetchurl {
       url = "https://pypi.python.org/packages/source/r/random2/${name}.zip";

From b746a1644f0a249c2eb1091343722783a9a0b9bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 30 Aug 2014 22:43:35 +0200
Subject: [PATCH 0905/1453] fix eval

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 894ffbd3ce9b..6a988e4340ba 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7356,7 +7356,7 @@ rec {
 
     # buildPhase = "python setup.py build";
     # doCheck = false;
-    propagatedBuildInputs = [ pycurl koji GitPython pkgs.git
+    propagatedBuildInputs = [ pycurl pkgs.koji GitPython pkgs.git
                               pkgs.rpm pkgs.pyopenssl ];
 
   });

From 188f0796b9a0d7d2e9d91ab69d673238ed0c09cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 30 Aug 2014 23:00:31 +0200
Subject: [PATCH 0906/1453] mesos: fix build

---
 pkgs/applications/networking/cluster/mesos/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix
index 4329308ba04d..fe93a072b2cf 100644
--- a/pkgs/applications/networking/cluster/mesos/default.nix
+++ b/pkgs/applications/networking/cluster/mesos/default.nix
@@ -18,7 +18,7 @@ in stdenv.mkDerivation {
 
   buildInputs = [
     makeWrapper autoconf automake libtool curl sasl jdk maven
-    python wrapPython boto distutils-cfg
+    python wrapPython boto distutils-cfg setuptools
   ];
 
   propagatedBuildInputs = [

From df98dda81d93f3067bbcfac9307fa544415f7d74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 30 Aug 2014 23:00:46 +0200
Subject: [PATCH 0907/1453] pypy: compile also curses

---
 pkgs/development/interpreters/pypy/2.3/default.nix | 2 +-
 pkgs/top-level/python-packages.nix                 | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/pypy/2.3/default.nix b/pkgs/development/interpreters/pypy/2.3/default.nix
index 73a52e6dfc77..0b3ca7390920 100644
--- a/pkgs/development/interpreters/pypy/2.3/default.nix
+++ b/pkgs/development/interpreters/pypy/2.3/default.nix
@@ -85,7 +85,7 @@ let
        ln -s $out/pypy-c/lib-python/${pythonVersion} $out/lib/${libPrefix}
 
        # verify cffi modules
-       $out/bin/pypy -c "import Tkinter;import sqlite3"
+       $out/bin/pypy -c "import Tkinter;import sqlite3;import curses"
 
        # make sure pypy finds sqlite3 library
        wrapProgram "$out/bin/pypy" \
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6a988e4340ba..2ee854bdc9cf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1521,11 +1521,11 @@ rec {
   };
 
   cffi = buildPythonPackage rec {
-    name = "cffi-0.7.2";
+    name = "cffi-0.8.6";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/c/cffi/${name}.tar.gz";
-      md5 = "d329f5cb2053fd31dafc02e2c9ef0299";
+      md5 = "474b5a68299a6f05009171de1dc91be6";
     };
 
     propagatedBuildInputs = [ pkgs.libffi pycparser ];

From cafeb8e4f580e4a981d5cfa7aca3cd2c1039192b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 30 Aug 2014 23:11:30 +0200
Subject: [PATCH 0908/1453] Disable Xen kernel builds

Xen itself is currently broken in Nixpkgs, so building kernels for it
is kind of pointless.
---
 pkgs/top-level/all-packages.nix | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 64bf223e5d9a..c85521ecab82 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7398,12 +7398,6 @@ let
     kernelPatches = [];
   };
 
-  linux_3_2_xen = lowPrio (linux_3_2.override {
-    extraConfig = ''
-      XEN_DOM0 y
-    '';
-  });
-
   linux_3_4 = makeOverridable (import ../os-specific/linux/kernel/linux-3.4.nix) {
     inherit fetchurl stdenv perl buildLinux;
     kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips")
@@ -7601,7 +7595,6 @@ let
 
   # Build the kernel modules for the some of the kernels.
   linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 linuxPackages_3_2);
-  linuxPackages_3_2_xen = linuxPackagesFor pkgs.linux_3_2_xen linuxPackages_3_2_xen;
   linuxPackages_3_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4 linuxPackages_3_4);
   linuxPackages_3_6_rpi = linuxPackagesFor pkgs.linux_3_6_rpi linuxPackages_3_6_rpi;
   linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10 linuxPackages_3_10);

From 4b7f1a9be33bcc098d5bf5a9c1f7310d68e6c08d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 30 Aug 2014 23:14:17 +0200
Subject: [PATCH 0909/1453] lttng-modules: Mark as broken

These do not build for any kernel:

  http://hydra.nixos.org/eval/1149989?filter=lttng&compare=1149981
---
 pkgs/os-specific/linux/lttng-modules/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix
index 8e20bf1e3d3f..4794cd8f96c3 100644
--- a/pkgs/os-specific/linux/lttng-modules/default.nix
+++ b/pkgs/os-specific/linux/lttng-modules/default.nix
@@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
     # TODO license = with licenses; [ lgpl21 gpl2 mit ];
     platforms = platforms.linux;
     maintainers = [ maintainers.bjornfor ];
+    broken = true;
   };
 
 }

From 6437e2541a11f93d95df3b8b2d16ffb8578f5a62 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 30 Aug 2014 23:20:57 +0200
Subject: [PATCH 0910/1453] Remove numerous failing kernel packages from Hydra

  http://hydra.nixos.org/eval/1149989?filter=linuxPackages
---
 pkgs/top-level/release.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 9970c2789ac1..07c3126e5abe 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -440,6 +440,14 @@ let
         xfwm4 = linux;
       };
 
+      linuxPackages_testing = { };
+      linuxPackages_grsec_stable_desktop = { };
+      linuxPackages_grsec_stable_server = { };
+      linuxPackages_grsec_stable_server_xen = { };
+      linuxPackages_grsec_testing_desktop = { };
+      linuxPackages_grsec_testing_server = { };
+      linuxPackages_grsec_testing_server_xen = { };
+
     } ));
 
 in jobs

From 3182cf00ff7da0a6102d981c14d750ddaff12a65 Mon Sep 17 00:00:00 2001
From: Daniel Peebles <pumpkin@me.com>
Date: Sat, 30 Aug 2014 17:22:51 -0400
Subject: [PATCH 0911/1453] Add xar

---
 lib/maintainers.nix                    |  1 +
 pkgs/tools/compression/xar/default.nix | 34 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 3 files changed, 37 insertions(+)
 create mode 100644 pkgs/tools/compression/xar/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 0c71669a8aea..9ff9f7ea27ae 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -34,6 +34,7 @@
   cfouche = "Chaddaï Fouché <chaddai.fouche@gmail.com>";
   chaoflow = "Florian Friesdorf <flo@chaoflow.net>";
   coconnor = "Corey O'Connor <coreyoconnor@gmail.com>";
+  copumpkin = "Dan Peebles <pumpkingod@gmail.com>";
   coroa = "Jonas Hörsch <jonas@chaoflow.net>";
   cstrahan = "Charles Strahan <charles.c.strahan@gmail.com>";
   DamienCassou = "Damien Cassou <damien.cassou@gmail.com>";
diff --git a/pkgs/tools/compression/xar/default.nix b/pkgs/tools/compression/xar/default.nix
new file mode 100644
index 000000000000..0bb4a1fb2ae4
--- /dev/null
+++ b/pkgs/tools/compression/xar/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, libxml2, openssl, zlib, bzip2 }:
+
+stdenv.mkDerivation rec {
+  version = "1.5.2";
+  name    = "xar-${version}";
+
+  src = fetchurl {
+    url    = "https://xar.googlecode.com/files/${name}.tar.gz";
+    sha256 = "1rp3va6akzlh35yqrapfqnbxaxa0zi8wyr93swbapprwh215cpac";
+  };
+
+  buildInputs = [ libxml2 openssl zlib bzip2 ];
+
+  meta = {
+    homepage    = https://code.google.com/p/xar/;
+    description = "Extensible Archiver";
+
+    longDescription =
+      '' The XAR project aims to provide an easily extensible archive format.
+         Important design decisions include an easily extensible XML table of
+         contents for random access to archived files, storing the toc at the
+         beginning of the archive to allow for efficient handling of streamed
+         archives, the ability to handle files of arbitrarily large sizes, the
+         ability to choose independent encodings for individual files in the
+         archive, the ability to store checksums for individual files in both
+         compressed and uncompressed form, and the ability to query the table
+         of content's rich meta-data.
+      '';
+
+    license     = stdenv.lib.licenses.bsd3;
+    maintainers = with stdenv.lib.maintainers; [ copumpkin ];
+    platforms   = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c85521ecab82..e0e97c0fe3da 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2407,6 +2407,8 @@ let
 
   unrar = callPackage ../tools/archivers/unrar { };
 
+  xar = callPackage ../tools/compression/xar { };
+
   xarchive = callPackage ../tools/archivers/xarchive { };
 
   xarchiver = callPackage ../tools/archivers/xarchiver { };

From 408832ac67ed9b6d517cc4395749cc488038f049 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 30 Aug 2014 23:59:07 +0200
Subject: [PATCH 0912/1453] help2man: update from 1.44.1 to 1.46.1 and add
 myself as a maintainer

---
 pkgs/development/tools/misc/help2man/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix
index c4ba7073889d..c8cff1162821 100644
--- a/pkgs/development/tools/misc/help2man/default.nix
+++ b/pkgs/development/tools/misc/help2man/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl, gettext, LocaleGettext, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "help2man-1.44.1";
+  name = "help2man-1.46.1";
 
   src = fetchurl {
     url = "mirror://gnu/help2man/${name}.tar.xz";
-    sha256 = "1yyyfw9zrfdvslnv91bnhyqmazwx243wmkc9wdaz888rfx36ipi2";
+    sha256 = "0iqwb3qirl7rp1wwpbh01q89qxvi4h3bc73wi03av6hl4sh05z9x";
   };
 
   buildInputs = [ makeWrapper perl gettext LocaleGettext ];
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     '';
 
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Generate man pages from `--help' output";
 
     longDescription =
@@ -28,8 +28,8 @@ stdenv.mkDerivation rec {
 
     homepage = http://www.gnu.org/software/help2man/;
 
-    license = stdenv.lib.licenses.gpl3Plus;
-    platforms = stdenv.lib.platforms.gnu;         # arbitrary choice
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    license = licenses.gpl3Plus;
+    platforms = platforms.gnu;         # arbitrary choice
+    maintainers = with maintainers; [ ludo pSub ];
   };
 }

From 5c3c7574e248d36b2933b476f10652b6fb525f2d Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 31 Aug 2014 00:32:37 +0200
Subject: [PATCH 0913/1453] lirc: update from 0.9.0 to 0.9.1, add meta
 information and adopt it

---
 pkgs/development/libraries/lirc/default.nix | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix
index 75f175a5b2da..3adddada27bf 100644
--- a/pkgs/development/libraries/lirc/default.nix
+++ b/pkgs/development/libraries/lirc/default.nix
@@ -1,18 +1,30 @@
-{ stdenv, fetchurl, alsaLib }:
+{ stdenv, fetchurl, alsaLib, bash, help2man }:
 
 stdenv.mkDerivation rec {
-  name = "lirc-0.9.0";
+  name = "lirc-0.9.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/lirc/${name}.tar.bz2";
-    sha256 = "1zx4mcnjwzz6jsi6ln7a3dkgx05nvg1pxxvmjqvd966ldapay8v3";
+    sha256 = "0vakq9x10hyj9k7iv35sm5f4dhxvk0miwxvv6kn0bhwkr2mnapj6";
   };
 
-  buildInputs = [ alsaLib ];
+  preBuild = "patchShebangs .";
+
+  buildInputs = [ alsaLib help2man ];
 
   configureFlags = [
     "--with-driver=devinput"
     "--sysconfdir=$(out)/etc"
     "--enable-sandboxed"
   ];
+
+  makeFlags = [ "m4dir=$(out)/m4" ];
+
+  meta = with stdenv.lib; {
+    description = "Allows to receive and send infrared signals";
+    homepage = http://www.lirc.org/;
+    license = licenses.gpl2;
+    platforms = platforms.linux
+    maintainers = with maintainers; [ pSub ];
+  };
 }

From 907845127e2b0a31971ee1ada81ad130985ba141 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 31 Aug 2014 00:41:40 +0200
Subject: [PATCH 0914/1453] mcabber: update from 0.10.1 to 0.10.3, add
 meta-information and adopt it

---
 .../instant-messengers/mcabber/default.nix    | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/applications/networking/instant-messengers/mcabber/default.nix
index cae0213c6be2..6830e4614eee 100644
--- a/pkgs/applications/networking/instant-messengers/mcabber/default.nix
+++ b/pkgs/applications/networking/instant-messengers/mcabber/default.nix
@@ -1,19 +1,22 @@
 {stdenv, fetchurl, openssl, ncurses, pkgconfig, glib, loudmouth}:
 
-stdenv.mkDerivation {
-
-  name = "mcabber-0.10.1";
+stdenv.mkDerivation rec {
+  name = "mcabber-${version}";
+  version = "0.10.3";
 
   src = fetchurl {
-    url = "http://mcabber.com/files/mcabber-0.10.1.tar.bz2";
+    url = "http://mcabber.com/files/mcabber-${version}.tar.bz2";
     sha256 = "1248cgci1v2ypb90wfhyipwdyp1wskn3gzh78af5ai1a4w5rrjq0";
   };
 
-  meta = { homepage = "http://mcabber.com/";
-           description = "Small Jabber console client";
-         };
-
   buildInputs = [openssl ncurses pkgconfig glib loudmouth];
 
   configureFlags = "--with-openssl=${openssl}";
+  
+  meta = with stdevn.lib; {
+    homepage = http://mcabber.com/;
+    description = "Small Jabber console client";
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ pSub ];
+  };
 }

From b88c4796eaba32a4b132515ca76b68e25a3cb4a8 Mon Sep 17 00:00:00 2001
From: Dmitry Malikov <malikov.d.y@gmail.com>
Date: Sun, 31 Aug 2014 00:36:49 +0200
Subject: [PATCH 0915/1453] Add haskell-tagged-transformer 0.7.1

---
 .../haskell/tagged-transformer/default.nix    | 21 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/tagged-transformer/default.nix

diff --git a/pkgs/development/libraries/haskell/tagged-transformer/default.nix b/pkgs/development/libraries/haskell/tagged-transformer/default.nix
new file mode 100644
index 000000000000..34da51018e00
--- /dev/null
+++ b/pkgs/development/libraries/haskell/tagged-transformer/default.nix
@@ -0,0 +1,21 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, comonad, contravariant, distributive, exceptions, mtl
+, reflection, semigroupoids, tagged
+}:
+
+cabal.mkDerivation (self: {
+  pname = "tagged-transformer";
+  version = "0.7.1";
+  sha256 = "1qgfx546pj4aqdblb4gddfxp642snn5dx4kxj3sn5q7c9lsgdh8j";
+  buildDepends = [
+    comonad contravariant distributive exceptions mtl reflection
+    semigroupoids tagged
+  ];
+  meta = {
+    homepage = "http://github.com/ekmett/tagged-transformer";
+    description = "Provides newtype wrappers for phantom types to avoid unsafely passing dummy arguments";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 272091b151ab..7c88f1cee5fe 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2403,6 +2403,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   tagged = callPackage ../development/libraries/haskell/tagged {};
 
+  taggedTransformer = callPackage ../development/libraries/haskell/tagged-transformer {};
+
   taggy = callPackage ../development/libraries/haskell/taggy {};
 
   taggyLens = callPackage ../development/libraries/haskell/taggy-lens {};

From 86d72b2c304c0a64f014476fadb50726e64e7399 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 30 Aug 2014 07:36:54 -0700
Subject: [PATCH 0916/1453] btrfsProgs: 3.14.2 -> 3.16.0

Additionally, add myself as a maintainer.
---
 pkgs/tools/filesystems/btrfsprogs/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix
index 66152f9589b7..02f214ad430e 100644
--- a/pkgs/tools/filesystems/btrfsprogs/default.nix
+++ b/pkgs/tools/filesystems/btrfsprogs/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, attr, acl, zlib, libuuid, e2fsprogs, lzo
 , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }:
 
-let version = "3.14.2"; in
+let version = "3.16"; in
 
 stdenv.mkDerivation rec {
   name = "btrfs-progs-${version}";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/people/mason/btrfs-progs/btrfs-progs-v${version}.tar.xz";
-    sha256 = "14vpj6f2v076v9zabgrz8l4dp6n1ar2mvk3lvii51ykvi35d1qbh";
+    sha256 = "0phbrgipl04q8cdj9nnshik7b6p2bg51jxb3l1gvfc04dkgm2xls";
   };
 
   buildInputs = [
@@ -21,10 +21,11 @@ stdenv.mkDerivation rec {
 
   makeFlags = "prefix=$(out)";
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Utilities for the btrfs filesystem";
     homepage = https://btrfs.wiki.kernel.org/;
-    maintainers = [ stdenv.lib.maintainers.raskin ];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ raskin wkennington ];
+    platforms = platforms.linux;
   };
 }

From 2bee211fc9bba7f8d7cf41ec19067191b0867cae Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 31 Aug 2014 02:09:21 +0200
Subject: [PATCH 0917/1453] mcabber: fix mispelled stdenv

---
 .../networking/instant-messengers/mcabber/default.nix           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/applications/networking/instant-messengers/mcabber/default.nix
index 6830e4614eee..362bf0de9774 100644
--- a/pkgs/applications/networking/instant-messengers/mcabber/default.nix
+++ b/pkgs/applications/networking/instant-messengers/mcabber/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = "--with-openssl=${openssl}";
   
-  meta = with stdevn.lib; {
+  meta = with stdenv.lib; {
     homepage = http://mcabber.com/;
     description = "Small Jabber console client";
     license = licenses.gpl2;

From efdb6ecb0cf5be0c340a2abca949db59e9c4ac79 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 31 Aug 2014 02:17:19 +0200
Subject: [PATCH 0918/1453] lirc: add missing semicolon

---
 pkgs/development/libraries/lirc/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix
index 3adddada27bf..88565d5d51b5 100644
--- a/pkgs/development/libraries/lirc/default.nix
+++ b/pkgs/development/libraries/lirc/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     description = "Allows to receive and send infrared signals";
     homepage = http://www.lirc.org/;
     license = licenses.gpl2;
-    platforms = platforms.linux
+    platforms = platforms.linux;
     maintainers = with maintainers; [ pSub ];
   };
 }

From 9073a30ceecf750012a22983289ee74cdf0372e2 Mon Sep 17 00:00:00 2001
From: Suvash Thapaliya <suvash@gmail.com>
Date: Sun, 31 Aug 2014 03:01:55 +0200
Subject: [PATCH 0919/1453] Add `extraConfig` option for SLiM

so that various configuration options can be set without having to
expose every single configurable parameter
---
 nixos/modules/services/x11/display-managers/slim.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/nixos/modules/services/x11/display-managers/slim.nix b/nixos/modules/services/x11/display-managers/slim.nix
index 9ee4e0dc7cb0..c7fbfa85e335 100644
--- a/nixos/modules/services/x11/display-managers/slim.nix
+++ b/nixos/modules/services/x11/display-managers/slim.nix
@@ -19,6 +19,7 @@ let
       reboot_cmd ${config.systemd.package}/sbin/shutdown -r now
       ${optionalString (cfg.defaultUser != null) ("default_user " + cfg.defaultUser)}
       ${optionalString cfg.autoLogin "auto_login yes"}
+      ${cfg.extraConfig}
     '';
 
   # Unpack the SLiM theme, or use the default.
@@ -89,6 +90,15 @@ in
         '';
       };
 
+      extraConfig = mkOption {
+        type = types.lines;
+        default = "";
+        description = ''
+          Extra configuration options for SLiM login manager. Do not
+          add options that can be configured directly.
+        '';
+      };
+
     };
 
   };

From 0847250505aab535ecdc35c6b8f3c87d8f9dd0fe Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Sat, 30 Aug 2014 23:48:45 -0300
Subject: [PATCH 0920/1453] Higan - a quick&dirty workaround

Higan uses a lot of hardcoded paths when it looks for runtime files
as shaders, icons and mainly BIOS files. So, we made a q&d wrapper
script: it copies all these files to $HOME/.config/higan in the 1st
invocation.
---
 pkgs/misc/emulators/higan/builder.sh  | 22 ++++++++++++++++++++++
 pkgs/misc/emulators/higan/default.nix |  3 ++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/pkgs/misc/emulators/higan/builder.sh b/pkgs/misc/emulators/higan/builder.sh
index 144c23d39de5..a99ccf26dbbd 100644
--- a/pkgs/misc/emulators/higan/builder.sh
+++ b/pkgs/misc/emulators/higan/builder.sh
@@ -18,3 +18,25 @@ install -m 644 ananke/libananke.so $out/lib/libananke.so.1
 (cd $out/lib && ln -s libananke.so.1 libananke.so)
 oldRPath=$(patchelf --print-rpath $out/bin/higan)
 patchelf --set-rpath $oldRPath:$out/lib $out/bin/higan
+
+# A dirty workaround, suggested by @cpages:
+# we create a wrapper script to set up
+# $HOME local configuration before higan runs
+
+mv $out/bin/higan $out/bin/.higan-wrapped
+cat <<EOF > $out/bin/higan 
+
+#!/bin/bash
+if [ ! -e \$HOME/.config/higan/.was_configured ]
+then
+    cp --update --recursive $out/share/higan \$HOME/.config
+    chmod --recursive u+w \$HOME/.config/higan
+    touch \$HOME/.config/higan/.was_configured
+fi
+# LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:$out/lib
+$out/bin/.higan-wrapped "\$@"
+
+EOF
+
+patchShebangs $out/bin/higan
+chmod +x $out/bin/higan
diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix
index aceb55b13967..532eeef2280f 100644
--- a/pkgs/misc/emulators/higan/default.nix
+++ b/pkgs/misc/emulators/higan/default.nix
@@ -44,5 +44,6 @@ stdenv.mkDerivation rec {
 # TODO:
 #   - options to choose profiles (accuracy, balanced, performance)
 #     and different GUIs (gtk2, qt4)
-#   - fix the BML and BIOS paths - maybe a custom patch to Higan project?
+#   - fix the BML and BIOS paths - maybe submitting
+#     a custom patch to Higan project would not be a bad idea...
 #

From 347dd52019d57ae15c25d56a36aa881c0badc05f Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 31 Aug 2014 12:52:59 +0400
Subject: [PATCH 0921/1453] Fix K3D build

---
 pkgs/applications/graphics/k3d/default.nix    |  5 +-
 .../graphics/k3d/libpng-1.4.patch             | 53 +++++++++++++++++++
 2 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/graphics/k3d/libpng-1.4.patch

diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix
index eb45ae3d8e78..6a66685e42b8 100644
--- a/pkgs/applications/graphics/k3d/default.nix
+++ b/pkgs/applications/graphics/k3d/default.nix
@@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./k3d_gtkmm224.patch
+    ./libpng-1.4.patch
   ];
 
   preConfigure = ''
@@ -28,7 +29,9 @@ stdenv.mkDerivation rec {
      gtkmm glibmm gtkglext pangox_compat libXmu
     ];
 
-  doCheck = false;
+  #doCheck = false;
+
+  enableParallelBuilding = true;
 
   meta = {
     description = "A 3D editor with support for procedural editing";
diff --git a/pkgs/applications/graphics/k3d/libpng-1.4.patch b/pkgs/applications/graphics/k3d/libpng-1.4.patch
new file mode 100644
index 000000000000..e67236617afe
--- /dev/null
+++ b/pkgs/applications/graphics/k3d/libpng-1.4.patch
@@ -0,0 +1,53 @@
+--- k3d-source-0.8.0.1/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp	2010-04-18 13:49:33.000000000 +0800
++++ k3d-source-0.8.0.1-patched/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp	2010-06-10 21:17:51.555920268 +0800
+@@ -148,12 +148,12 @@
+         // allocate/initialize the image information data
+         _info_ptr = png_create_info_struct(_png_ptr);
+         if (_info_ptr == NULL) {
+-            png_destroy_read_struct(&_png_ptr,png_infopp_NULL,png_infopp_NULL);
++			png_destroy_read_struct(&_png_ptr,NULL,NULL);
+             io_error("png_get_file_size: fail to call png_create_info_struct()");
+         }
+         if (setjmp(png_jmpbuf(_png_ptr))) {
+             //free all of the memory associated with the png_ptr and info_ptr
+-            png_destroy_read_struct(&_png_ptr, &_info_ptr, png_infopp_NULL);
++			png_destroy_read_struct(&_png_ptr, &_info_ptr, NULL);
+             io_error("png_get_file_size: fail to call setjmp()");
+         }
+         png_init_io(_png_ptr, get());
+@@ -165,7 +165,7 @@
+     png_reader(const char* filename) : file_mgr(filename, "rb") { init(); }
+ 
+     ~png_reader() {
+-        png_destroy_read_struct(&_png_ptr,&_info_ptr,png_infopp_NULL);
++		png_destroy_read_struct(&_png_ptr,&_info_ptr,NULL); 
+     }
+     point2<std::ptrdiff_t> get_dimensions() {
+         return point2<std::ptrdiff_t>(png_get_image_width(_png_ptr,_info_ptr),
+@@ -177,7 +177,7 @@
+         int bit_depth, color_type, interlace_type;
+         png_get_IHDR(_png_ptr, _info_ptr,
+                      &width, &height,&bit_depth,&color_type,&interlace_type,
+-                     int_p_NULL, int_p_NULL);
++					 (int *) NULL, (int *) NULL);
+         io_error_if(((png_uint_32)view.width()!=width || (png_uint_32)view.height()!= height),
+                     "png_read_view: input view size does not match PNG file size");
+         
+@@ -219,7 +219,7 @@
+         int bit_depth, color_type, interlace_type;
+         png_get_IHDR(_png_ptr, _info_ptr,
+                      &width, &height,&bit_depth,&color_type,&interlace_type,
+-                     int_p_NULL, int_p_NULL);
++					 (int *) NULL, (int *) NULL);
+         io_error_if(((png_uint_32)view.width()!=width || (png_uint_32)view.height()!= height),
+                     "png_reader_color_convert::apply(): input view size does not match PNG file size");
+         switch (color_type) {
+@@ -308,7 +308,7 @@
+         io_error_if(!_png_ptr,"png_write_initialize: fail to call png_create_write_struct()");
+         _info_ptr = png_create_info_struct(_png_ptr);
+         if (!_info_ptr) {
+-            png_destroy_write_struct(&_png_ptr,png_infopp_NULL);
++			png_destroy_write_struct(&_png_ptr,NULL);
+             io_error("png_write_initialize: fail to call png_create_info_struct()");
+         }
+         if (setjmp(png_jmpbuf(_png_ptr))) {

From 94205f5f21c4d9942bb4205c06229438051b6853 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 31 Aug 2014 12:58:37 +0400
Subject: [PATCH 0922/1453] Revert "Merge pull request #2449 from
 wkennington/master.grub"

This reverts commit 469f22d717e53c48d13a66ca862942e8098accc5, reversing
changes made to 0078bc5d8f87512104902eab00c8a44bef286067.

Conflicts:
	nixos/modules/installer/tools/nixos-generate-config.pl
	nixos/modules/system/boot/loader/grub/install-grub.pl
	nixos/release.nix
	nixos/tests/installer.nix

I tried to keep apparently-safe code in conflicts.
---
 .../installer/tools/nixos-generate-config.pl  |  21 ---
 nixos/modules/installer/tools/tools.nix       |   1 -
 nixos/modules/installer/virtualbox-demo.nix   |   3 -
 .../modules/system/boot/loader/grub/grub.nix  |  37 ++---
 .../system/boot/loader/grub/install-grub.pl   | 136 +++---------------
 nixos/modules/tasks/filesystems/zfs.nix       |   6 +-
 nixos/release-combined.nix                    |   4 -
 nixos/release.nix                             |   2 +-
 nixos/tests/installer.nix                     |  13 +-
 pkgs/tools/misc/grub/2.0x.nix                 |  60 ++++----
 pkgs/top-level/all-packages.nix               |   6 +-
 11 files changed, 68 insertions(+), 221 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index 73dd87cef5cf..66a8152a3a6c 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -20,13 +20,6 @@ sub uniq {
     return @res;
 }
 
-sub runCommand {
-    my ($cmd) = @_;
-    open FILE, "$cmd 2>/dev/null |" or die "Failed to execute: $cmd\n";
-    my @ret = <FILE>;
-    close FILE;
-    return ($?, @ret);
-}
 
 # Process the command line.
 my $outDir = "/etc/nixos";
@@ -344,20 +337,6 @@ EOF
         }
     }
 
-    # Is this a btrfs filesystem?
-    if ($fsType eq "btrfs") {
-        my ($status, @info) = runCommand("btrfs subvol show $rootDir$mountPoint");
-        if ($status != 0) {
-            die "Failed to retreive subvolume info for $mountPoint";
-        }
-        my @subvols = join("", @info) =~ m/Name:[ \t\n]*([^ \t\n]*)/;
-        if ($#subvols > 0) {
-            die "Btrfs subvol name for $mountPoint listed multiple times in mount\n"
-        } elsif ($#subvols == 0) {
-            push @extraOptions, "subvol=$subvols[0]";
-        }
-    }
-
     # Emit the filesystem.
     $fileSystems .= <<EOF;
   fileSystems.\"$mountPoint\" =
diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix
index 91a30695a7a5..39da2f1f0be6 100644
--- a/nixos/modules/installer/tools/tools.nix
+++ b/nixos/modules/installer/tools/tools.nix
@@ -38,7 +38,6 @@ let
   nixos-generate-config = makeProg {
     name = "nixos-generate-config";
     src = ./nixos-generate-config.pl;
-    path = [ pkgs.btrfsProgs ];
     perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl";
   };
 
diff --git a/nixos/modules/installer/virtualbox-demo.nix b/nixos/modules/installer/virtualbox-demo.nix
index 49ec08996104..f68f8dc40aa8 100644
--- a/nixos/modules/installer/virtualbox-demo.nix
+++ b/nixos/modules/installer/virtualbox-demo.nix
@@ -10,9 +10,6 @@ with lib;
       ../profiles/clone-config.nix
     ];
 
-  # FIXME: UUID detection is currently broken
-  boot.loader.grub.fsIdentifier = "provided";
-
   # Allow mounting of shared folders.
   users.extraUsers.demo.extraGroups = [ "vboxsf" ];
 
diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index bc9a155ac95b..0cc060db8f90 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -6,8 +6,7 @@ let
 
   cfg = config.boot.loader.grub;
 
-  realGrub = if cfg.version == 1 then pkgs.grub
-    else pkgs.grub2.override { zfsSupport = cfg.zfsSupport; };
+  realGrub = if cfg.version == 1 then pkgs.grub else pkgs.grub2;
 
   grub =
     # Don't include GRUB if we're only generating a GRUB menu (e.g.,
@@ -26,12 +25,11 @@ let
       inherit (cfg)
         version extraConfig extraPerEntryConfig extraEntries
         extraEntriesBeforeNixOS extraPrepareConfig configurationLimit copyKernels timeout
-        default devices fsIdentifier;
+        default devices explicitBootRoot;
       path = (makeSearchPath "bin" [
-        pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.findutils pkgs.diffutils pkgs.btrfsProgs
-        pkgs.utillinux
+        pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.findutils pkgs.diffutils
       ]) + ":" + (makeSearchPath "sbin" [
-        pkgs.mdadm pkgs.utillinux
+        pkgs.mdadm
       ]);
     });
 
@@ -211,26 +209,12 @@ in
         '';
       };
 
-      fsIdentifier = mkOption {
-        default = "uuid";
-        type = types.addCheck types.str
-          (type: type == "uuid" || type == "label" || type == "provided");
+      explicitBootRoot = mkOption {
+        default = "";
+        type = types.str;
         description = ''
-          Determines how grub will identify devices when generating the
-          configuration file. A value of uuid / label signifies that grub
-          will always resolve the uuid or label of the device before using
-          it in the configuration. A value of provided means that grub will
-          use the device name as show in <command>df</command> or
-          <command>mount</command>. Note, zfs zpools / datasets are ignored
-          and will always be mounted using their labels.
-        '';
-      };
-
-      zfsSupport = mkOption {
-        default = false;
-        type = types.bool;
-        description = ''
-          Whether grub should be build against libzfs.
+          The relative path of /boot within the parent volume. Leave empty
+          if /boot is not a btrfs subvolume.
         '';
       };
 
@@ -276,9 +260,6 @@ in
           ${pkgs.coreutils}/bin/cp -pf "${v}" "/boot/${n}"
         '') config.boot.loader.grub.extraFiles);
 
-    assertions = [{ assertion = !cfg.zfsSupport || cfg.version == 2;
-                    message = "Only grub version 2 provides zfs support";}];
-
     })
 
   ];
diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index 7ced51f57e16..2fb771b5edf4 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -1,6 +1,5 @@
 use strict;
 use warnings;
-use Class::Struct;
 use XML::LibXML;
 use File::Basename;
 use File::Path;
@@ -28,14 +27,6 @@ sub writeFile {
     close FILE or die;
 }
 
-sub runCommand {
-    my ($cmd) = @_;
-    open FILE, "$cmd 2>/dev/null |" or die "Failed to execute: $cmd\n";
-    my @ret = <FILE>;
-    close FILE;
-    return ($?, @ret);
-}
-
 my $grub = get("grub");
 my $grubVersion = int(get("version"));
 my $extraConfig = get("extraConfig");
@@ -48,7 +39,7 @@ my $configurationLimit = int(get("configurationLimit"));
 my $copyKernels = get("copyKernels") eq "true";
 my $timeout = int(get("timeout"));
 my $defaultEntry = int(get("default"));
-my $fsIdentifier = get("fsIdentifier");
+my $explicitBootRoot = get("explicitBootRoot");
 $ENV{'PATH'} = get("path");
 
 die "unsupported GRUB version\n" if $grubVersion != 1 && $grubVersion != 2;
@@ -57,108 +48,22 @@ print STDERR "updating GRUB $grubVersion menu...\n";
 
 mkpath("/boot/grub", 0, 0700);
 
+
 # Discover whether /boot is on the same filesystem as / and
 # /nix/store.  If not, then all kernels and initrds must be copied to
-# /boot.
-if (stat("/boot")->dev != stat("/nix/store")->dev) {
+# /boot, and all paths in the GRUB config file must be relative to the
+# root of the /boot filesystem.  `$bootRoot' is the path to be
+# prepended to paths under /boot.
+my $bootRoot = "/boot";
+if (stat("/")->dev != stat("/boot")->dev) {
+    $bootRoot = "";
+    $copyKernels = 1;
+} elsif (stat("/boot")->dev != stat("/nix/store")->dev) {
     $copyKernels = 1;
 }
 
-# Discover information about the location of /boot
-struct(Fs => {
-    device => '$',
-    type => '$',
-    mount => '$',
-});
-sub GetFs {
-    my ($dir) = @_;
-    my ($status, @dfOut) = runCommand("df -T $dir");
-    if ($status != 0 || $#dfOut != 1) {
-        die "Failed to retrieve output about $dir from `df`";
-    }
-    my @boot = split(/[ \n\t]+/, $dfOut[1]);
-    return Fs->new(device => $boot[0], type => $boot[1], mount => $boot[6]);
-}
-struct (Grub => {
-    path => '$',
-    search => '$',
-});
-my $driveid = 1;
-sub GrubFs {
-    my ($dir) = @_;
-    my $fs = GetFs($dir);
-    my $path = "/" . substr($dir, length($fs->mount));
-    my $search = "";
-
-    if ($grubVersion > 1) {
-        # ZFS is completely separate logic as zpools are always identified by a label
-        # or custom UUID
-        if ($fs->type eq 'zfs') {
-            my $sid = index($fs->device, '/');
-
-            if ($sid < 0) {
-                $search = '--label ' . $fs->device;
-                $path = '/@' . $path;
-            } else {
-                $search = '--label ' . substr($fs->device, 0, $sid);
-                $path = '/' . substr($fs->device, $sid) . '/@' . $path;
-            }
-        } else {
-            my %types = ('uuid' => '--fs-uuid', 'label' => '--label');
-
-            if ($fsIdentifier eq 'provided') {
-                # If the provided dev is identifying the partition using a label or uuid,
-                # we should get the label / uuid and do a proper search
-                my @matches = $fs->device =~ m/\/dev\/disk\/by-(label|uuid)\/(.*)/;
-                if ($#matches > 1) {
-                    die "Too many matched devices"
-                } elsif ($#matches == 1) {
-                    $search = "$types{$matches[0]} $matches[1]"
-                }
-            } else {
-                # Determine the identifying type
-                $search = $types{$fsIdentifier} . ' ';
-
-                # Based on the type pull in the identifier from the system
-                my ($status, @devInfo) = runCommand("blkid -o export @{[$fs->device]}");
-                if ($status != 0) {
-                    die "Failed to get blkid info for @{[$fs->device]}";
-                }
-                my @matches = join("", @devInfo) =~ m/@{[uc $fsIdentifier]}=([^\n]*)/;
-                if ($#matches != 0) {
-                    die "Couldn't find a $types{$fsIdentifier} for @{[$fs->device]}\n"
-                }
-                $search .= $matches[0];
-            }
-
-            # BTRFS is a special case in that we need to fix the referrenced path based on subvolumes
-            if ($fs->type eq 'btrfs') {
-                my ($status, @info) = runCommand("btrfs subvol show @{[$fs->mount]}");
-                if ($status != 0) {
-                    die "Failed to retreive subvolume info for @{[$fs->mount]}";
-                }
-                my @subvols = join("", @info) =~ m/Name:[ \t\n]*([^ \t\n]*)/;
-                if ($#subvols > 0) {
-                    die "Btrfs subvol name for @{[$fs->device]} listed multiple times in mount\n"
-                } elsif ($#subvols == 0) {
-                    $path = "/$subvols[0]$path";
-                }
-            }
-        }
-        if (not $search eq "") {
-            $search = "search --set=drive$driveid " . $search;
-            $path = "(\$drive$driveid)$path";
-            $driveid += 1;
-        }
-    }
-    return Grub->new(path => $path, search => $search);
-}
-my $grubBoot = GrubFs("/boot");
-my $grubStore = GrubFs("/nix");
-
-# We don't need to copy if we can read the kernels directly
-if ($grubStore->search ne "") {
-    $copyKernels = 0;
+if ($explicitBootRoot ne "") {
+    $bootRoot = $explicitBootRoot;
 }
 
 # Generate the header.
@@ -171,14 +76,12 @@ if ($grubVersion == 1) {
     ";
     if ($splashImage) {
         copy $splashImage, "/boot/background.xpm.gz" or die "cannot copy $splashImage to /boot\n";
-        $conf .= "splashimage " . $grubBoot->path . "/background.xpm.gz\n";
+        $conf .= "splashimage $bootRoot/background.xpm.gz\n";
     }
 }
 
 else {
     $conf .= "
-        " . $grubBoot->search . "
-        " . $grubStore->search . "
         if [ -s \$prefix/grubenv ]; then
           load_env
         fi
@@ -199,7 +102,7 @@ else {
           set timeout=$timeout
         fi
 
-        if loadfont " . $grubBoot->path . "/grub/fonts/unicode.pf2; then
+        if loadfont $bootRoot/grub/fonts/unicode.pf2; then
           set gfxmode=640x480
           insmod gfxterm
           insmod vbe
@@ -213,7 +116,7 @@ else {
         copy $splashImage, "/boot/background.png" or die "cannot copy $splashImage to /boot\n";
         $conf .= "
             insmod png
-            if background_image " . $grubBoot->path . "/background.png; then
+            if background_image $bootRoot/background.png; then
               set color_normal=white/black
               set color_highlight=black/white
             else
@@ -235,7 +138,7 @@ mkpath("/boot/kernels", 0, 0755) if $copyKernels;
 
 sub copyToKernelsDir {
     my ($path) = @_;
-    return $grubStore->path . substr($path, length("/nix")) unless $copyKernels;
+    return $path unless $copyKernels;
     $path =~ /\/nix\/store\/(.*)/ or die;
     my $name = $1; $name =~ s/\//-/g;
     my $dst = "/boot/kernels/$name";
@@ -248,7 +151,7 @@ sub copyToKernelsDir {
         rename $tmp, $dst or die "cannot rename $tmp to $dst\n";
     }
     $copied{$dst} = 1;
-    return $grubBoot->path . "/kernels/$name";
+    return "$bootRoot/kernels/$name";
 }
 
 sub addEntry {
@@ -275,8 +178,11 @@ sub addEntry {
         $conf .= "  " . ($xen ? "module" : "initrd") . " $initrd\n\n";
     } else {
         $conf .= "menuentry \"$name\" {\n";
+<<<<<<< HEAD
         $conf .= $grubBoot->search . "\n";
         $conf .= $grubStore->search . "\n";
+=======
+>>>>>>> parent of 469f22d... Merge pull request #2449 from wkennington/master.grub
         $conf .= "  $extraPerEntryConfig\n" if $extraPerEntryConfig;
         $conf .= "  multiboot $xen $xenParams\n" if $xen;
         $conf .= "  " . ($xen ? "module" : "linux") . " $kernel $kernelParams\n";
@@ -294,7 +200,7 @@ addEntry("NixOS - Default", $defaultConfig);
 $conf .= "$extraEntries\n" unless $extraEntriesBeforeNixOS;
 
 # extraEntries could refer to @bootRoot@, which we have to substitute
-$conf =~ s/\@bootRoot\@/$grubBoot->path/g;
+$conf =~ s/\@bootRoot\@/$bootRoot/g;
 
 # Emit submenus for all system profiles.
 sub addProfile {
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index 1c4bbc16b499..d7deb44c407c 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -133,7 +133,7 @@ in
       };
 
       boot.initrd = mkIf inInitrd {
-        kernelModules = [ "spl" "zfs" ];
+        kernelModules = [ "spl" "zfs" ] ;
         extraUtilsCommands =
           ''
             cp -v ${zfsPkg}/sbin/zfs $out/bin
@@ -148,10 +148,6 @@ in
           '';
       };
 
-      boot.loader.grub = mkIf inInitrd {
-        zfsSupport = true;
-      };
-
       systemd.services."zpool-import" = {
         description = "Import zpools";
         after = [ "systemd-udev-settle.service" ];
diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 23348e1d089e..dae3b9210a86 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -52,10 +52,6 @@ in rec {
         (all nixos.tests.installer.lvm)
         (all nixos.tests.installer.separateBoot)
         (all nixos.tests.installer.simple)
-        (all nixos.tests.installer.simpleLabels)
-        (all nixos.tests.installer.simpleProvided)
-        (all nixos.tests.installer.btrfsSimple)
-        (all nixos.tests.installer.btrfsSubvols)
         (all nixos.tests.ipv6)
         (all nixos.tests.kde4)
         (all nixos.tests.login)
diff --git a/nixos/release.nix b/nixos/release.nix
index f78ecb4383d0..e2b93640f917 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -231,7 +231,7 @@ in rec {
   tests.installer.simpleLabels = forAllSystems (system: (import tests/installer.nix { inherit system; }).simpleLabels.test);
   tests.installer.simpleProvided = forAllSystems (system: (import tests/installer.nix { inherit system; }).simpleProvided.test);
   tests.installer.btrfsSimple = forAllSystems (system: (import tests/installer.nix { inherit system; }).btrfsSimple.test);
-  tests.installer.btrfsSubvols = forAllSystems (system: (import tests/installer.nix { inherit system; }).btrfsSubvols.test);
+  #tests.installer.btrfsSubvols = forAllSystems (system: (import tests/installer.nix { inherit system; }).btrfsSubvols.test);
   tests.influxdb = callTest tests/influxdb.nix {};
   tests.ipv6 = callTest tests/ipv6.nix {};
   tests.jenkins = callTest tests/jenkins.nix {};
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 154f3323d294..6ee52fd63d8b 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -35,8 +35,8 @@ let
 
 
   # The configuration to install.
-  makeConfig = { testChannel, useEFI, grubVersion, grubDevice, grubIdentifier }:
-    pkgs.writeText "configuration.nix" ''
+  makeConfig = { testChannel, useEFI, grubVersion, grubDevice }: pkgs.writeText "configuration.nix"
+    ''
       { config, pkgs, modulesPath, ... }:
 
       { imports =
@@ -54,7 +54,6 @@ let
           ''}
           boot.loader.grub.device = "${grubDevice}";
           boot.loader.grub.extraConfig = "serial; terminal_output.serial";
-          boot.loader.grub.fsIdentifier = "${grubIdentifier}";
         ''}
 
         environment.systemPackages = [ ${optionalString testChannel "pkgs.rlwrap"} ];
@@ -94,7 +93,7 @@ let
   # disk, and then reboot from the hard disk.  It's parameterized with
   # a test script fragment `createPartitions', which must create
   # partitions and filesystems.
-  testScriptFun = { createPartitions, testChannel, useEFI, grubVersion, grubDevice, grubIdentifier }:
+  testScriptFun = { createPartitions, testChannel, useEFI, grubVersion, grubDevice }:
     let
       # FIXME: OVMF doesn't boot from virtio http://www.mail-archive.com/edk2-devel@lists.sourceforge.net/msg01501.html
       iface = if useEFI || grubVersion == 1 then "scsi" else "virtio";
@@ -162,7 +161,7 @@ let
       $machine->succeed("cat /mnt/etc/nixos/hardware-configuration.nix >&2");
 
       $machine->copyFileFromHost(
-          "${ makeConfig { inherit testChannel useEFI grubVersion grubDevice grubIdentifier; } }",
+          "${ makeConfig { inherit testChannel useEFI grubVersion grubDevice; } }",
           "/mnt/etc/nixos/configuration.nix");
 
       # Perform the installation.
@@ -217,13 +216,13 @@ let
 
 
   makeInstallerTest = name:
-    { createPartitions, testChannel ? false, useEFI ? false, grubVersion ? 2, grubDevice ? "/dev/vda", grubIdentifier ? "uuid" }:
+    { createPartitions, testChannel ? false, useEFI ? false, grubVersion ? 2, grubDevice ? "/dev/vda" }:
     makeTest {
       inherit iso;
       name = "installer-" + name;
       nodes = if testChannel then { inherit webserver; } else { };
       testScript = testScriptFun {
-        inherit createPartitions testChannel useEFI grubVersion grubDevice grubIdentifier;
+        inherit createPartitions testChannel useEFI grubVersion grubDevice;
       };
     };
 
diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix
index e3c07af759c9..b1877bdcf98c 100644
--- a/pkgs/tools/misc/grub/2.0x.nix
+++ b/pkgs/tools/misc/grub/2.0x.nix
@@ -1,45 +1,30 @@
-{ stdenv, fetchurl, autogen, flex, bison, python, autoconf, automake
-, gettext, ncurses, libusb, freetype, qemu, devicemapper
-, linuxPackages ? null
-, efiSupport ? false
-, zfsSupport ? false
-}:
+{ fetchurl, stdenv, flex, bison, gettext, ncurses, libusb, freetype, qemu
+, devicemapper, EFIsupport ? false }:
 
-with stdenv.lib;
 let
-  efiSystems = {
-    "i686-linux".target = "i386";
-    "x86_64-linux".target = "x86_64";
-  };
 
-  canEfi = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) efiSystems);
+  prefix = "grub${if EFIsupport then "-efi" else ""}";
 
-  prefix = "grub${if efiSupport then "-efi" else ""}";
-
-  version = "2.02-beta2";
+  version = "2.00";
 
   unifont_bdf = fetchurl {
     url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz";
     sha256 = "0s0qfff6n6282q28nwwblp5x295zd6n71kl43xj40vgvdqxv0fxx";
   };
-in (
 
-assert efiSupport -> canEfi;
-assert zfsSupport -> linuxPackages != null && linuxPackages.zfs != null;
+in
 
 stdenv.mkDerivation rec {
   name = "${prefix}-${version}";
 
   src = fetchurl {
-    name = "grub-2.02-beta2.tar.xz";
-    url = "http://alpha.gnu.org/gnu/grub/grub-2.02~beta2.tar.xz";
-    sha256 = "13a13fhc0wf473dn73zhga15mjvkg6vqp4h25dxg4n7am2r05izn";
+    url = "mirror://gnu/grub/grub-${version}.tar.xz";
+    sha256 = "0n64hpmsccvicagvr0c6v0kgp2yw0kgnd3jvsyd26cnwgs7c6kkq";
   };
 
-  nativeBuildInputs = [ autogen flex bison python autoconf automake ];
+  nativeBuildInputs = [ flex bison ];
   buildInputs = [ ncurses libusb freetype gettext devicemapper ]
-    ++ optional doCheck qemu
-    ++ optional zfsSupport linuxPackages.zfs;
+    ++ stdenv.lib.optional doCheck qemu;
 
   preConfigure =
     '' for i in "tests/util/"*.in
@@ -58,19 +43,27 @@ stdenv.mkDerivation rec {
        # See <http://www.mail-archive.com/qemu-devel@nongnu.org/msg22775.html>.
        sed -i "tests/util/grub-shell.in" \
            -e's/qemu-system-i386/qemu-system-x86_64 -nodefaults/g'
+
+       # Fix for building on Glibc 2.16.  Won't be needed once the
+       # gnulib in grub is updated.
+       sed -i '/gets is a security hole/d' grub-core/gnulib/stdio.in.h
     '';
 
   prePatch =
-    '' sh autogen.sh
-       gunzip < "${unifont_bdf}" > "unifont.bdf"
+    '' gunzip < "${unifont_bdf}" > "unifont.bdf"
        sed -i "configure" \
            -e "s|/usr/src/unifont.bdf|$PWD/unifont.bdf|g"
     '';
 
   patches = [ ./fix-bash-completion.patch ];
 
-  configureFlags = optional zfsSupport "--enable-libzfs"
-    ++ optionals efiSupport [ "--with-platform=efi" "--target=${efiSystems.${stdenv.system}.target}" "--program-prefix=" ];
+  configureFlags =
+    let arch = if stdenv.system == "i686-linux" then "i386"
+               else if stdenv.system == "x86_64-linux" then "x86_64"
+               else throw "unsupported EFI firmware architecture";
+    in
+      stdenv.lib.optionals EFIsupport
+        [ "--with-platform=efi" "--target=${arch}" "--program-prefix=" ];
 
   doCheck = false;
   enableParallelBuilding = true;
@@ -79,7 +72,7 @@ stdenv.mkDerivation rec {
     paxmark pms $out/sbin/grub-{probe,bios-setup}
   '';
 
-  meta = with stdenv.lib; {
+  meta = {
     description = "GNU GRUB, the Grand Unified Boot Loader (2.x beta)";
 
     longDescription =
@@ -96,8 +89,11 @@ stdenv.mkDerivation rec {
 
     homepage = http://www.gnu.org/software/grub/;
 
-    license = licenses.gpl3Plus;
+    license = stdenv.lib.licenses.gpl3Plus;
 
-    platforms = platforms.gnu;
+    platforms = if EFIsupport then
+      [ "i686-linux" "x86_64-linux" ]
+    else
+      stdenv.lib.platforms.gnu;
   };
-})
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e0e97c0fe3da..6ceca8e0c20b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1226,11 +1226,9 @@ let
     buggyBiosCDSupport = config.grub.buggyBiosCDSupport or true;
   };
 
-  grub2 = callPackage ../tools/misc/grub/2.0x.nix { };
+  grub2 = callPackage ../tools/misc/grub/2.0x.nix { libusb = libusb1; flex = flex_2_5_35; };
 
-  grub2_efi = grub2.override { efiSupport = true; };
-
-  grub2_zfs = grub2.override { zfsSupport = true; };
+  grub2_efi = grub2.override { EFIsupport = true; };
 
   gssdp = callPackage ../development/libraries/gssdp {
     inherit (gnome) libsoup;

From 2f697bf6931b24cdd428e22effbf6427a85afd42 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Sun, 31 Aug 2014 10:58:50 +0200
Subject: [PATCH 0923/1453] Revert "Fix syntax error in
 nixos/lib/build-vms.nix, introduced by 86c0f8c"

This reverts commit 704e91bab005eabe968a3b140222fb0cf7afd4db.
---
 nixos/lib/build-vms.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix
index 50b3b424166b..ba1895554096 100644
--- a/nixos/lib/build-vms.nix
+++ b/nixos/lib/build-vms.nix
@@ -52,7 +52,7 @@ rec {
                   [ { address = "192.168.${toString first}.${toString m.second}";
                       prefixLength = 24;
                   } ];
-                });
+                }
             in
             { key = "ip-address";
               config =

From ea8910652fcecbcd4f21aa1c66b1a0a239408b04 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Sun, 31 Aug 2014 10:58:54 +0200
Subject: [PATCH 0924/1453] Revert "Merge pull request #3182 from
 wkennington/master.ipv6"

This reverts commit b23fd6585481a42937e105d5fce630a549900e86, reversing
changes made to 43654cba2c280ce17b81db44993d1c1bcae3a9c6.
---
 .../doc/manual/configuration/ipv4-config.xml  |   5 +-
 nixos/lib/build-vms.nix                       |  11 +-
 nixos/modules/programs/virtualbox.nix         |   2 +-
 nixos/modules/services/networking/dhcpcd.nix  |   2 +-
 nixos/modules/tasks/network-interfaces.nix    | 151 +++++-------------
 nixos/tests/bittorrent.nix                    |   6 +-
 nixos/tests/nat.nix                           |   2 +-
 7 files changed, 59 insertions(+), 120 deletions(-)

diff --git a/nixos/doc/manual/configuration/ipv4-config.xml b/nixos/doc/manual/configuration/ipv4-config.xml
index 053501b1736d..e2c51518349d 100644
--- a/nixos/doc/manual/configuration/ipv4-config.xml
+++ b/nixos/doc/manual/configuration/ipv4-config.xml
@@ -12,9 +12,12 @@ interfaces.  However, you can configure an interface manually as
 follows:
 
 <programlisting>
-networking.interfaces.eth0.ip4 = [ { address = "192.168.1.2"; prefixLength = 24; } ];
+networking.interfaces.eth0 = { ipAddress = "192.168.1.2"; prefixLength = 24; };
 </programlisting>
 
+(The network prefix can also be specified using the option
+<literal>subnetMask</literal>,
+e.g. <literal>"255.255.255.0"</literal>, but this is deprecated.)
 Typically you’ll also want to set a default gateway and set of name
 servers:
 
diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix
index ba1895554096..498c0a377836 100644
--- a/nixos/lib/build-vms.nix
+++ b/nixos/lib/build-vms.nix
@@ -48,11 +48,10 @@ rec {
             let
               interfacesNumbered = zipTwoLists config.virtualisation.vlans (range 1 255);
               interfaces = flip map interfacesNumbered ({ first, second }:
-                nameValuePair "eth${toString second}" { ip4 =
-                  [ { address = "192.168.${toString first}.${toString m.second}";
-                      prefixLength = 24;
-                  } ];
-                }
+                nameValuePair "eth${toString second}"
+                  { ipAddress = "192.168.${toString first}.${toString m.second}";
+                    subnetMask = "255.255.255.0";
+                  });
             in
             { key = "ip-address";
               config =
@@ -61,7 +60,7 @@ rec {
                   networking.interfaces = listToAttrs interfaces;
 
                   networking.primaryIPAddress =
-                    optionalString (interfaces != []) (head (head interfaces).value.ip4).address;
+                    optionalString (interfaces != []) (head interfaces).value.ipAddress;
 
                   # Put the IP addresses of all VMs in this machine's
                   # /etc/hosts file.  If a machine has multiple
diff --git a/nixos/modules/programs/virtualbox.nix b/nixos/modules/programs/virtualbox.nix
index fec1a7b61f32..e2dd76219eb0 100644
--- a/nixos/modules/programs/virtualbox.nix
+++ b/nixos/modules/programs/virtualbox.nix
@@ -44,5 +44,5 @@ let virtualbox = config.boot.kernelPackages.virtualbox; in
         '';
     };
 
-  networking.interfaces.vboxnet0.ip4 = [ { address = "192.168.56.1"; prefixLength = 24; } ];
+  networking.interfaces.vboxnet0 = { ipAddress = "192.168.56.1"; prefixLength = 24; };
 }
diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix
index 7e0b00a3d7b5..89aa9bdb6b68 100644
--- a/nixos/modules/services/networking/dhcpcd.nix
+++ b/nixos/modules/services/networking/dhcpcd.nix
@@ -11,7 +11,7 @@ let
   # Don't start dhcpcd on explicitly configured interfaces or on
   # interfaces that are part of a bridge, bond or sit device.
   ignoredInterfaces =
-    map (i: i.name) (filter (i: i.ip4 != [ ] || i.ipAddress != null) (attrValues config.networking.interfaces))
+    map (i: i.name) (filter (i: i.ipAddress != null) (attrValues config.networking.interfaces))
     ++ mapAttrsToList (i: _: i) config.networking.sits
     ++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.bridges))
     ++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.bonds))
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index ac3a55332e4e..7dabe70f00c4 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -10,26 +10,6 @@ let
   hasSits = cfg.sits != { };
   hasBonds = cfg.bonds != { };
 
-  addrOpts = v:
-    assert v == 4 || v == 6;
-    {
-      address = mkOption {
-        type = types.str;
-        description = ''
-          IPv${toString v} address of the interface.  Leave empty to configure the
-          interface using DHCP.
-        '';
-      };
-
-      prefixLength = mkOption {
-        type = types.addCheck types.int (n: n >= 0 && n <= (if v == 4 then 32 else 128));
-        description = ''
-          Subnet mask of the interface, specified as the number of
-          bits in the prefix (<literal>${if v == 4 then "24" else "64"}</literal>).
-        '';
-      };
-    };
-
   interfaceOpts = { name, ... }: {
 
     options = {
@@ -40,36 +20,10 @@ let
         description = "Name of the interface.";
       };
 
-      ip4 = mkOption {
-        default = [ ];
-        example = [
-          { address = "10.0.0.1"; prefixLength = 16; }
-          { address = "192.168.1.1"; prefixLength = 24; }
-        ];
-        type = types.listOf types.optionSet;
-        options = addrOpts 4;
-        description = ''
-          List of IPv4 addresses that will be statically assigned to the interface.
-        '';
-      };
-
-      ip6 = mkOption {
-        default = [ ];
-        example = [
-          { address = "fdfd:b3f0:482::1"; prefixLength = 48; }
-          { address = "2001:1470:fffd:2098::e006"; prefixLength = 64; }
-        ];
-        type = types.listOf types.optionSet;
-        options = addrOpts 6;
-        description = ''
-          List of IPv6 addresses that will be statically assigned to the interface.
-        '';
-      };
-
       ipAddress = mkOption {
         default = null;
         example = "10.0.0.1";
-        type = types.nullOr types.str;
+        type = types.nullOr (types.str);
         description = ''
           IP address of the interface.  Leave empty to configure the
           interface using DHCP.
@@ -87,16 +41,20 @@ let
       };
 
       subnetMask = mkOption {
-        default = null;
+        default = "";
+        example = "255.255.255.0";
+        type = types.str;
         description = ''
-          Defunct, supply the prefix length instead.
+          Subnet mask of the interface, specified as a bitmask.
+          This is deprecated; use <option>prefixLength</option>
+          instead.
         '';
       };
 
       ipv6Address = mkOption {
         default = null;
         example = "2001:1470:fffd:2098::e006";
-        type = types.nullOr types.str;
+        type = types.nullOr types.string;
         description = ''
           IPv6 address of the interface.  Leave empty to configure the
           interface using NDP.
@@ -266,10 +224,10 @@ in
     networking.interfaces = mkOption {
       default = {};
       example =
-        { eth0.ip4 = [ {
-            address = "131.211.84.78";
-            prefixLength = 25;
-          } ];
+        { eth0 = {
+            ipAddress = "131.211.84.78";
+            subnetMask = "255.255.255.128";
+          };
         };
       description = ''
         The configuration for each network interface.  If
@@ -480,12 +438,6 @@ in
 
   config = {
 
-    assertions =
-      flip map interfaces (i: {
-        assertion = i.subnetMask == null;
-        message = "The networking.interfaces.${i.name}.subnetMask option is defunct. Use prefixLength instead.";
-      });
-
     boot.kernelModules = [ ]
       ++ optional cfg.enableIPv6 "ipv6"
       ++ optional hasVirtuals "tun"
@@ -582,18 +534,12 @@ in
         # network device, so it only gets started after the interface
         # has appeared, and it's stopped when the interface
         # disappears.
-        configureInterface = i:
-          let
-            ips = i.ip4 ++ optionals cfg.enableIPv6 i.ip6
-              ++ optional (i.ipAddress != null) {
-                ipAddress = i.ipAddress;
-                prefixLength = i.prefixLength;
-              } ++ optional (cfg.enableIPv6 && i.ipv6Address != null) {
-                ipAddress = i.ipv6Address;
-                prefixLength = i.ipv6PrefixLength;
-              };
+        configureInterface = i: nameValuePair "${i.name}-cfg"
+          (let mask =
+                if i.prefixLength != null then toString i.prefixLength else
+                if i.subnetMask != "" then i.subnetMask else "32";
+               staticIPv6 = cfg.enableIPv6 && i.ipv6Address != null;
           in
-          nameValuePair "${i.name}-cfg"
           { description = "Configuration of ${i.name}";
             wantedBy = [ "network-interfaces.target" ];
             bindsTo = [ "sys-subsystem-net-devices-${i.name}.device" ];
@@ -616,32 +562,36 @@ in
                   echo "setting MTU to ${toString i.mtu}..."
                   ip link set "${i.name}" mtu "${toString i.mtu}"
                 ''
-
-              # Ip Setup
-              +
+              + optionalString (i.ipAddress != null)
                 ''
-                  curIps=$(ip -o a show dev "${i.name}" | awk '{print $4}')
-                  # Only do an add if it's necessary.  This is
+                  cur=$(ip -4 -o a show dev "${i.name}" | awk '{print $4}')
+                  # Only do a flush/add if it's necessary.  This is
                   # useful when the Nix store is accessed via this
                   # interface (e.g. in a QEMU VM test).
-                ''
-              + flip concatMapStrings (ips) (ip:
-                let
-                  address = "${ip.address}/${toString ip.prefixLength}";
-                in
-                ''
-                  echo "checking ip ${address}..."
-                  if ! echo "$curIps" | grep "${address}" >/dev/null 2>&1; then
-                    if out=$(ip addr add "${address}" dev "${i.name}" 2>&1); then
-                      echo "added ip ${address}..."
-                      restart_network_setup=true
-                    elif ! echo "$out" | grep "File exists" >/dev/null 2>&1; then
-                      echo "failed to add ${address}"
-                      exit 1
-                    fi
+                  if [ "$cur" != "${i.ipAddress}/${mask}" ]; then
+                    echo "configuring interface..."
+                    ip -4 addr flush dev "${i.name}"
+                    ip -4 addr add "${i.ipAddress}/${mask}" dev "${i.name}"
+                    restart_network_setup=true
+                  else
+                    echo "skipping configuring interface"
                   fi
-                '')
-              + optionalString (ips != [ ])
+                ''
+              + optionalString (staticIPv6)
+                ''
+                  # Only do a flush/add if it's necessary.  This is
+                  # useful when the Nix store is accessed via this
+                  # interface (e.g. in a QEMU VM test).
+                  if ! ip -6 -o a show dev "${i.name}" | grep "${i.ipv6Address}/${toString i.ipv6prefixLength}"; then
+                    echo "configuring interface..."
+                    ip -6 addr flush dev "${i.name}"
+                    ip -6 addr add "${i.ipv6Address}/${toString i.ipv6prefixLength}" dev "${i.name}"
+                    restart_network_setup=true
+                  else
+                    echo "skipping configuring interface"
+                  fi
+                ''
+              + optionalString (i.ipAddress != null || staticIPv6)
                 ''
                   if [ restart_network_setup = true ]; then
                     # Ensure that the default gateway remains set.
@@ -658,20 +608,7 @@ in
                 ''
                   echo 1 > /proc/sys/net/ipv6/conf/${i.name}/proxy_ndp
                 '';
-            preStop =
-              ''
-                echo "releasing configured ip's..."
-              ''
-              + flip concatMapStrings (ips) (ip:
-                let
-                  address = "${ip.address}/${toString ip.prefixLength}";
-                in
-                ''
-                  echo -n "Deleting ${address}..."
-                  ip addr del "${address}" dev "${i.name}" >/dev/null 2>&1 || echo -n " Failed"
-                  echo ""
-                '');
-          };
+          });
 
         createTunDevice = i: nameValuePair "${i.name}"
           { description = "Virtual Network Interface ${i.name}";
diff --git a/nixos/tests/bittorrent.nix b/nixos/tests/bittorrent.nix
index 7eb9c215ee1c..002e012f65f0 100644
--- a/nixos/tests/bittorrent.nix
+++ b/nixos/tests/bittorrent.nix
@@ -16,7 +16,7 @@ let
   miniupnpdConf = nodes: pkgs.writeText "miniupnpd.conf"
     ''
       ext_ifname=eth1
-      listening_ip=${(head nodes.router.config.networking.interfaces.eth2.ip4).address}/24
+      listening_ip=${nodes.router.config.networking.interfaces.eth2.ipAddress}/24
       allow 1024-65535 192.168.2.0/24 1024-65535
     '';
 
@@ -53,7 +53,7 @@ in
         { environment.systemPackages = [ pkgs.transmission ];
           virtualisation.vlans = [ 2 ];
           networking.defaultGateway =
-            (head nodes.router.config.networking.interfaces.eth2.ip4).address;
+            nodes.router.config.networking.interfaces.eth2.ipAddress;
           networking.firewall.enable = false;
         };
 
@@ -81,7 +81,7 @@ in
       # Create the torrent.
       $tracker->succeed("mkdir /tmp/data");
       $tracker->succeed("cp ${file} /tmp/data/test.tar.bz2");
-      $tracker->succeed("transmission-create /tmp/data/test.tar.bz2 -t http://${(head nodes.tracker.config.networking.interfaces.eth1.ip4).address}:6969/announce -o /tmp/test.torrent");
+      $tracker->succeed("transmission-create /tmp/data/test.tar.bz2 -t http://${nodes.tracker.config.networking.interfaces.eth1.ipAddress}:6969/announce -o /tmp/test.torrent");
       $tracker->succeed("chmod 644 /tmp/test.torrent");
 
       # Start the tracker.  !!! use a less crappy tracker
diff --git a/nixos/tests/nat.nix b/nixos/tests/nat.nix
index 5a57cce6b678..5fdcc0e97ca9 100644
--- a/nixos/tests/nat.nix
+++ b/nixos/tests/nat.nix
@@ -13,7 +13,7 @@ import ./make-test.nix {
         { virtualisation.vlans = [ 1 ];
           networking.firewall.allowPing = true;
           networking.defaultGateway =
-            (head nodes.router.config.networking.interfaces.eth2.ip4).address;
+            nodes.router.config.networking.interfaces.eth2.ipAddress;
         };
 
       router =

From dba5fed12b4c7502f6dc6a541483f91193a081d4 Mon Sep 17 00:00:00 2001
From: Danyil Bohdan <danyil.bohdan@gmail.com>
Date: Sun, 31 Aug 2014 11:48:51 +0300
Subject: [PATCH 0925/1453] add game 'tcl2048'

---
 pkgs/games/tcl2048/builder.sh   |  5 +++++
 pkgs/games/tcl2048/default.nix  | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix |  4 +++-
 3 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/games/tcl2048/builder.sh
 create mode 100644 pkgs/games/tcl2048/default.nix

diff --git a/pkgs/games/tcl2048/builder.sh b/pkgs/games/tcl2048/builder.sh
new file mode 100644
index 000000000000..b34441cdc996
--- /dev/null
+++ b/pkgs/games/tcl2048/builder.sh
@@ -0,0 +1,5 @@
+source $stdenv/setup
+
+mkdir -p $out/bin
+cp $src $out/bin/2048
+chmod +x $out/bin/2048
diff --git a/pkgs/games/tcl2048/default.nix b/pkgs/games/tcl2048/default.nix
new file mode 100644
index 000000000000..4f8818ac39a8
--- /dev/null
+++ b/pkgs/games/tcl2048/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, tcl, tcllib }:
+
+stdenv.mkDerivation {
+  name = "tcl2048-0.2.5";
+
+  src = fetchurl {
+    url = https://raw.githubusercontent.com/dbohdan/2048-tcl/v0.2.5/2048.tcl;
+    sha256 = "b0d6e8a31dce8c1ca8dbbb8c513b50fbfb9cd6a313201941fa15531165bf68ce";
+  };
+
+  builder = ./builder.sh;
+
+  meta = {
+    homepage = https://github.com/dbohdan/2048-tcl;
+    description = "The game of 2048 implemented in Tcl.";
+    license = stdenv.lib.licenses.mit;
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e0e97c0fe3da..fb08876f831b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2211,6 +2211,8 @@ let
 
   tboot = callPackage ../tools/security/tboot { };
 
+  tcl2048 = callPackage ../games/tcl2048 { };
+
   tcpdump = callPackage ../tools/networking/tcpdump { };
 
   tcpflow = callPackage ../tools/networking/tcpflow { };
@@ -9215,7 +9217,7 @@ let
   lynx = callPackage ../applications/networking/browsers/lynx { };
 
   lyx = callPackage ../applications/misc/lyx { };
-  
+
   makeself = callPackage ../applications/misc/makeself { };
 
   matchbox = callPackage ../applications/window-managers/matchbox { };

From 327cab298eae1928d4ec0662e570002244ea5846 Mon Sep 17 00:00:00 2001
From: Danyil Bohdan <danyil.bohdan@gmail.com>
Date: Sun, 31 Aug 2014 12:32:14 +0300
Subject: [PATCH 0926/1453] tcl2048: update to 0.2.6

---
 pkgs/games/tcl2048/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/tcl2048/default.nix b/pkgs/games/tcl2048/default.nix
index 4f8818ac39a8..7678242f4330 100644
--- a/pkgs/games/tcl2048/default.nix
+++ b/pkgs/games/tcl2048/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, tcl, tcllib }:
 
 stdenv.mkDerivation {
-  name = "tcl2048-0.2.5";
+  name = "tcl2048-0.2.6";
 
   src = fetchurl {
-    url = https://raw.githubusercontent.com/dbohdan/2048-tcl/v0.2.5/2048.tcl;
-    sha256 = "b0d6e8a31dce8c1ca8dbbb8c513b50fbfb9cd6a313201941fa15531165bf68ce";
+    url = https://raw.githubusercontent.com/dbohdan/2048-tcl/v0.2.6/2048.tcl;
+    sha256 = "3a6466a214c538daec8e2d08e0c1467f10f770c74e5897bea642134e22016730";
   };
 
   builder = ./builder.sh;

From 68917916eeecd9f01714784b2709a2110fe9f912 Mon Sep 17 00:00:00 2001
From: Danyil Bohdan <danyil.bohdan@gmail.com>
Date: Sun, 31 Aug 2014 12:40:05 +0300
Subject: [PATCH 0927/1453] tcl2048: wrong sha256sum.

---
 pkgs/games/tcl2048/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/tcl2048/default.nix b/pkgs/games/tcl2048/default.nix
index 7678242f4330..01ffd27d5bb4 100644
--- a/pkgs/games/tcl2048/default.nix
+++ b/pkgs/games/tcl2048/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = https://raw.githubusercontent.com/dbohdan/2048-tcl/v0.2.6/2048.tcl;
-    sha256 = "3a6466a214c538daec8e2d08e0c1467f10f770c74e5897bea642134e22016730";
+    sha256 = "481eac7cccc37d1122c3069da6186f584906bd27b86b8d4ae1a2d7e355c1b6b2";
   };
 
   builder = ./builder.sh;

From 196c6260be03f41748c0599892718d2ec5a39b95 Mon Sep 17 00:00:00 2001
From: Longrin Wischnewski <robberer@freakmail.de>
Date: Sun, 31 Aug 2014 12:29:13 +0200
Subject: [PATCH 0928/1453] grub: fix grub merge error

---
 nixos/modules/system/boot/loader/grub/install-grub.pl | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index 2fb771b5edf4..b4900358a5dc 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -178,11 +178,6 @@ sub addEntry {
         $conf .= "  " . ($xen ? "module" : "initrd") . " $initrd\n\n";
     } else {
         $conf .= "menuentry \"$name\" {\n";
-<<<<<<< HEAD
-        $conf .= $grubBoot->search . "\n";
-        $conf .= $grubStore->search . "\n";
-=======
->>>>>>> parent of 469f22d... Merge pull request #2449 from wkennington/master.grub
         $conf .= "  $extraPerEntryConfig\n" if $extraPerEntryConfig;
         $conf .= "  multiboot $xen $xenParams\n" if $xen;
         $conf .= "  " . ($xen ? "module" : "linux") . " $kernel $kernelParams\n";

From a555193ee934ef2921983b901857d29a8d9e70b0 Mon Sep 17 00:00:00 2001
From: Longrin Wischnewski <robberer@freakmail.de>
Date: Sun, 31 Aug 2014 12:44:29 +0200
Subject: [PATCH 0929/1453] gource: update to version 0.42

---
 pkgs/applications/version-management/gource/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix
index 13c554767743..afe0ac71ea49 100644
--- a/pkgs/applications/version-management/gource/default.nix
+++ b/pkgs/applications/version-management/gource/default.nix
@@ -3,11 +3,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gource-0.40";
+  version = "0.42";
+  name = "gource-${version}";
 
   src = fetchurl {
-    url = "http://gource.googlecode.com/files/${name}.tar.gz";
-    sha256 = "04nirh07xjslqsph557as4s50nlf91bi6v2l7vmbifmkdf90m2cw";
+    url = "https://github.com/acaudwell/Gource/releases/download/${name}/${name}.tar.gz";
+    sha256 = "08ab57z44y8b5wxg1193j6hiy50njbpi6dwafjh6nb0apcq8ziz5";
   };
 
   buildInputs = [

From a5a92fdd53ca36b85010ca26e239db30884ec22b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Sun, 31 Aug 2014 11:50:35 +0100
Subject: [PATCH 0930/1453] emulationstation: 1.0.2 -> 2.0.0-rc1

---
 .../emulators/emulationstation/default.nix    | 25 ++++++++-----------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/pkgs/misc/emulators/emulationstation/default.nix b/pkgs/misc/emulators/emulationstation/default.nix
index 5767786e814a..6ff0a21135a2 100644
--- a/pkgs/misc/emulators/emulationstation/default.nix
+++ b/pkgs/misc/emulators/emulationstation/default.nix
@@ -1,25 +1,22 @@
-{ stdenv, fetchurl, pkgconfig, cmake, boost, eigen, freeimage, freetype
-, mesa, SDL, dejavu_fonts }:
+{ stdenv, fetchFromGitHub, pkgconfig, cmake, curl, boost, eigen
+, freeimage, freetype, mesa, SDL2, alsaLib, libarchive }:
 
 stdenv.mkDerivation rec {
   name = "emulationstation-${version}";
-  version = "1.0.2";
-  src = fetchurl {
-    url = "https://github.com/Aloshi/EmulationStation/archive/v${version}.tar.gz";
-    sha256 = "809d67aaa727809c1426fb543e36bb788ca6a3404f8c46dd1917088b57ab5f50";
+  version = "2.0.0-rc1";
+
+  src = fetchFromGitHub {
+    owner = "Aloshi";
+    repo = "EmulationStation";
+    rev = "8739519e1591819cab85e1d2056804d20c197dac";
+    sha256 = "1psq5cqyq2yy1lqxrcj7pfp8szfmzhamxf3111l97w2h2zzcgvq9";
   };
 
-  buildInputs = [ pkgconfig cmake boost eigen freeimage freetype mesa SDL ];
-
-  prePatch = ''
-    sed -i \
-      -e 's,/usr\(.*\)/ttf-dejavu\(.*\),${dejavu_fonts}\1\2,' src/Font.cpp
-  '';
+  buildInputs = [ pkgconfig cmake alsaLib boost curl eigen freeimage freetype libarchive mesa SDL2 ];
 
   buildPhase = "cmake . && make";
   installPhase = ''
-    mkdir -p $out/bin
-    mv ../emulationstation $out/bin/.
+    install -D ../emulationstation $out/bin/emulationstation
   '';
 
   meta = {

From 59ed27db2da3867339befaa6da17778da862973b Mon Sep 17 00:00:00 2001
From: Dmitry Malikov <malikov.d.y@gmail.com>
Date: Sun, 31 Aug 2014 13:16:48 +0200
Subject: [PATCH 0931/1453] haskell-xml-html-conduit-lens 0.3.2.0 -> 0.3.2.1

---
 .../libraries/haskell/xml-html-conduit-lens/default.nix     | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/xml-html-conduit-lens/default.nix b/pkgs/development/libraries/haskell/xml-html-conduit-lens/default.nix
index 3dded2dcb447..7a53fb456f75 100644
--- a/pkgs/development/libraries/haskell/xml-html-conduit-lens/default.nix
+++ b/pkgs/development/libraries/haskell/xml-html-conduit-lens/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "xml-html-conduit-lens";
-  version = "0.3.2.0";
-  sha256 = "150b772wkl2k8xcrcbqj3qhndjkl35qzwqdjbgs9mxp867aihiv0";
+  version = "0.3.2.1";
+  sha256 = "0iy58nq5b6ixdky2xr4r8xxk3c8wqp1y3jbpsk3dr1qawzjbzp12";
   buildDepends = [ htmlConduit lens text xmlConduit ];
   testDepends = [
     doctest hspec hspecExpectationsLens lens xmlConduit
@@ -17,7 +17,5 @@ cabal.mkDerivation (self: {
     description = "Optics for xml-conduit and html-conduit";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
   };
 })

From 9103b8b512d634f53873fa7c652e870b5eaa3795 Mon Sep 17 00:00:00 2001
From: Aycan iRiCAN <iricanaycan@gmail.com>
Date: Sun, 31 Aug 2014 14:27:15 +0300
Subject: [PATCH 0932/1453] Bump snort and daq

---
 pkgs/applications/networking/ids/daq/default.nix   | 6 +++---
 pkgs/applications/networking/ids/snort/default.nix | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/ids/daq/default.nix b/pkgs/applications/networking/ids/daq/default.nix
index 36571809a370..c80d55f94128 100644
--- a/pkgs/applications/networking/ids/daq/default.nix
+++ b/pkgs/applications/networking/ids/daq/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl, flex, bison, libpcap}:
 
 stdenv.mkDerivation rec {
-  name = "daq-2.0.0";
+  name = "daq-2.0.2";
   
   src = fetchurl {
     name = "${name}.tar.gz";
-    url = http://www.snort.org/downloads/2311;
-    sha256 = "0f0w5jfmx0n2sms4f2mfg984a27r7qh927vkd7fclvx9cbiwibzv";
+    url = "http://www.snort.org/downloads/snort/${name}.tar.gz";
+    sha256 = "1a39qbm9nc05yr8llawl7mz0ny1fci4acj9c2k1h4klrqikiwpfn";
   };
   
   buildInputs = [ flex bison libpcap ];
diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix
index 580591c18ade..65e46176fcb4 100644
--- a/pkgs/applications/networking/ids/snort/default.nix
+++ b/pkgs/applications/networking/ids/snort/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl, libpcap, pcre, libdnet, daq, zlib, flex, bison}:
 
 stdenv.mkDerivation rec {
-  name = "snort-2.9.4.6";
+  name = "snort-2.9.6.2";
   
   src = fetchurl {
     name = "${name}.tar.gz";
-    url = http://www.snort.org/downloads/2320;
-    sha256 = "1g5kn36l67a5m95h2shqwqbbjb6rgl3sf1bciakal2l4n6857ang";
+    url = "http://www.snort.org/downloads/snort/${name}.tar.gz";
+    sha256 = "0xsxbd5h701ncnhn9sf7zkmzravlqhn1182whinphfjjw72py7cf";
   };
   
   buildInputs = [ libpcap pcre libdnet daq zlib flex bison ];

From 66f525c8d6b5c00401044d800f50ade40fa45a79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 31 Aug 2014 13:33:04 +0200
Subject: [PATCH 0933/1453] pypyPackages.pycryptopp: mark as not supported on
 pypy

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2ee854bdc9cf..095d5eb3c062 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6089,6 +6089,7 @@ rec {
 
   pycryptopp = buildPythonPackage (rec {
     name = "pycryptopp-0.6.0.1206569328141510525648634803928199668821045408958";
+    disabled = isPy3k || isPyPy;  # see https://bitbucket.org/pypy/pypy/issue/1190/
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/p/pycryptopp/${name}.tar.gz";

From b497011da9bcf4c7791565d81b26c919aeb2b03d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 31 Aug 2014 13:33:18 +0200
Subject: [PATCH 0934/1453] pythonPackages.cffi: 0.7.2 -> 0.8.6

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 095d5eb3c062..55944225a188 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1521,11 +1521,11 @@ rec {
   };
 
   cffi = buildPythonPackage rec {
-    name = "cffi-0.8.6";
+    name = "cffi-0.7.2";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/c/cffi/${name}.tar.gz";
-      md5 = "474b5a68299a6f05009171de1dc91be6";
+      md5 = "d329f5cb2053fd31dafc02e2c9ef0299";
     };
 
     propagatedBuildInputs = [ pkgs.libffi pycparser ];

From 7327e3f808a5e2fa2eb239947580c5892f5f75e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 31 Aug 2014 13:41:27 +0200
Subject: [PATCH 0935/1453] PyPy ships with cffi, so don't use external cffi
 for packages

---
 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 55944225a188..31c30678ec00 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -730,7 +730,8 @@ rec {
     };
 
     buildInputs = [ pkgs.btrfsProgs ];
-    propagatedBuildInputs = with pkgs; [ contextlib2 sqlalchemy9 pyxdg pycparser cffi alembic ];
+    propagatedBuildInputs = with pkgs; [ contextlib2 sqlalchemy9 pyxdg pycparser alembic ]
+      ++ optionals (!isPyPy) [ cffi ];
 
     meta = {
       description = "Deduplication for Btrfs";
@@ -1513,7 +1514,7 @@ rec {
       md5 = "c5df008669d17dd6eeb5e2042d5e136f";
     };
 
-    buildInputs = [ cffi pycparser mock pytest py ];
+    buildInputs = [ pycparser mock pytest py ] ++ optionals (!isPyPy) [ cffi ];
 
     meta = {
       maintainers = [ stdenv.lib.maintainers.iElectric ];
@@ -5998,7 +5999,7 @@ rec {
       export DYLD_LIBRARY_PATH="${pkgs.libgit2}/lib"
     '' else "" );
 
-    propagatedBuildInputs = [ pkgs.libgit2 cffi ];
+    propagatedBuildInputs = [ pkgs.libgit2 ] ++ optionals (!isPyPy) [ cffi ];
 
     preCheck = ''
       # disable tests that require networking

From 47ebc25c627d2e03826dadb804b099be0199f89f Mon Sep 17 00:00:00 2001
From: Longrin Wischnewski <robberer@freakmail.de>
Date: Sun, 31 Aug 2014 13:43:24 +0200
Subject: [PATCH 0936/1453] audacious: update to version 3.5.1

---
 pkgs/applications/audio/audacious/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix
index 409a831727bb..49b02f46e9b4 100644
--- a/pkgs/applications/audio/audacious/default.nix
+++ b/pkgs/applications/audio/audacious/default.nix
@@ -1,28 +1,29 @@
 { stdenv, fetchurl, pkgconfig, glib, gtk3, libmowgli, libmcs
 , gettext, dbus_glib, libxml2, libmad, xlibs, alsaLib, libogg
 , libvorbis, libcdio, libcddb, flac, ffmpeg, makeWrapper
+, mpg123, neon, faad2
 }:
 
 let
-  version = "3.4.3";
+  version = "3.5.1";
 in
 stdenv.mkDerivation {
   name = "audacious-${version}";
 
   src = fetchurl {
     url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2";
-    sha256 = "04lzwdr1lx6ghbfxzygvnbmdl420w6rm453ds5lyb0hlvzs58d0q";
+    sha256 = "01wmlvpp540gdjw759wif3byh98h3b3q6f5wawzp0b0ivqd0wf6z";
   };
 
   pluginsSrc = fetchurl {
     url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2";
-    sha256 = "00r88q9fs9a0gicdmk2svcans7igcqgacrw303a5bn44is7pmrmy";
+    sha256 = "09lyvi15hbn3pvb2izyz2bm4021917mhcdrwxrn3q3sjvx337np6";
   };
 
   buildInputs =
     [ gettext pkgconfig glib gtk3 libmowgli libmcs libxml2 dbus_glib
       libmad xlibs.libXcomposite libogg libvorbis flac alsaLib libcdio
-      libcddb ffmpeg makeWrapper
+      libcddb ffmpeg makeWrapper mpg123 neon faad2
     ];
 
   # Here we build bouth audacious and audacious-plugins in one

From 6ad299460caccd4c4ab928d7988f7a1f0460fea8 Mon Sep 17 00:00:00 2001
From: Longrin Wischnewski <robberer@freakmail.de>
Date: Sun, 31 Aug 2014 13:59:29 +0200
Subject: [PATCH 0937/1453] rdesktop: update to version 1.8.2

rdesktop: add meta fields
---
 pkgs/applications/networking/remote/rdesktop/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/remote/rdesktop/default.nix b/pkgs/applications/networking/remote/rdesktop/default.nix
index 09c20618d668..7d2b7990d3f9 100644
--- a/pkgs/applications/networking/remote/rdesktop/default.nix
+++ b/pkgs/applications/networking/remote/rdesktop/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation (rec {
   pname = "rdesktop";
-  version = "1.8.1";
+  version = "1.8.2";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/${name}.tar.gz";
-    sha256 = "0il248cdsxvwjsl4bswf27ld9r1a7d48jf6bycr86kf3i55q7k3n";
+    sha256 = "0y0s0qjfsflp4drcn75ykx6as7mn13092bcvlp2ibhilkpa27gzv";
   };
 
   buildInputs = [openssl libX11];
@@ -20,5 +20,8 @@ stdenv.mkDerivation (rec {
 
   meta = {
     description = "Open source client for Windows Terminal Services";
+    homepage = http://www.rdesktop.org/;
+    platforms = stdenv.lib.platforms.linux;
+    license     = stdenv.lib.licenses.gpl2;
   };
 })

From 57b667fe65ecd06a788f2b1d7e659747248d7e8b Mon Sep 17 00:00:00 2001
From: Michael Fellinger <m.fellinger@gmail.com>
Date: Sat, 30 Aug 2014 13:01:02 +0200
Subject: [PATCH 0938/1453] ruby: add version 2.1.2

---
 .../interpreters/ruby/ruby-2.1.2.nix          | 72 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 73 insertions(+)
 create mode 100644 pkgs/development/interpreters/ruby/ruby-2.1.2.nix

diff --git a/pkgs/development/interpreters/ruby/ruby-2.1.2.nix b/pkgs/development/interpreters/ruby/ruby-2.1.2.nix
new file mode 100644
index 000000000000..430bf4f16651
--- /dev/null
+++ b/pkgs/development/interpreters/ruby/ruby-2.1.2.nix
@@ -0,0 +1,72 @@
+{ stdenv, fetchurl
+, zlib, zlibSupport ? true
+, openssl, opensslSupport ? true
+, gdbm, gdbmSupport ? true
+, ncurses, readline, cursesSupport ? false
+, groff, docSupport ? false
+, libyaml, yamlSupport ? true
+}:
+
+let
+  op = stdenv.lib.optional;
+  ops = stdenv.lib.optionals;
+in
+
+stdenv.mkDerivation rec {
+  name = "ruby-2.1.2";
+  src = fetchurl {
+    url = "http://cache.ruby-lang.org/pub/ruby/2.1/${name}.tar.bz2";
+    sha256 = "6948b02570cdfb89a8313675d4aa665405900e27423db408401473f30fc6e901";
+  };
+
+  # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
+  NROFF = "${groff}/bin/nroff";
+
+  buildInputs = (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;
+
+  configureFlags = ["--enable-shared" ]
+    # 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
+  '';
+
+  meta = {
+    license = "Ruby";
+    homepage = "http://www.ruby-lang.org/en/";
+    description = "The Ruby language";
+    platforms = stdenv.lib.platforms.all;
+  };
+
+  passthru = rec {
+    majorVersion = "2.1";
+    minorVersion = "2";
+    libPath = "lib/ruby/${majorVersion}";
+    gemPath = "lib/ruby/gems/${majorVersion}";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8c2961e1a618..ec8f9c00b2c8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3716,6 +3716,7 @@ let
   ruby18 = callPackage ../development/interpreters/ruby/ruby-18.nix { };
   ruby19 = callPackage ../development/interpreters/ruby/ruby-19.nix { };
   ruby2 = lowPrio (callPackage ../development/interpreters/ruby/ruby-2.0.nix { });
+  ruby21 = callPackage ../development/interpreters/ruby/ruby-2.1.2.nix { };
 
   ruby = ruby19;
 

From 23b4635e181a5636632d8957a496dcaf301f363f Mon Sep 17 00:00:00 2001
From: Longrin Wischnewski <robberer@freakmail.de>
Date: Sun, 31 Aug 2014 14:31:02 +0200
Subject: [PATCH 0939/1453] deluge: update to version 1.3.7

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2ee854bdc9cf..56e8ffbbd8ed 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2948,11 +2948,11 @@ rec {
   };
 
   deluge = buildPythonPackage rec {
-    name = "deluge-1.3.6";
+    name = "deluge-1.3.7";
 
     src = fetchurl {
-      url = "http://download.deluge-torrent.org/source/${name}.tar.gz";
-      md5 = "33557678bf2f320de670ddaefaea009d";
+      url = "http://download.deluge-torrent.org/source/${name}.tar.bz2";
+      sha256 = "07m5lgkqymlh0810bk2f5l0k83n51xb3gszj11sr509jgbnxjnmm";
     };
 
     propagatedBuildInputs = with pkgs; [

From f5f4bf1a25464e03441c852c791f7ee8780536a1 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Sun, 31 Aug 2014 09:45:44 -0300
Subject: [PATCH 0940/1453] Higan: Updating builder.sh script

Now builder.sh will install a higan-config.sh script
to write auxiliary stuff on $HOME/.config/higan directory.
That way, higan searches locally and runs cleanly.

Obviously it's a hack, but the only other way is to do a huge patch on
upstream sources; personally I think it is better to work that type of
thing directly on higan sources.
---
 pkgs/misc/emulators/higan/builder.sh | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/pkgs/misc/emulators/higan/builder.sh b/pkgs/misc/emulators/higan/builder.sh
index a99ccf26dbbd..0d01f7dc971f 100644
--- a/pkgs/misc/emulators/higan/builder.sh
+++ b/pkgs/misc/emulators/higan/builder.sh
@@ -20,23 +20,16 @@ oldRPath=$(patchelf --print-rpath $out/bin/higan)
 patchelf --set-rpath $oldRPath:$out/lib $out/bin/higan
 
 # A dirty workaround, suggested by @cpages:
-# we create a wrapper script to set up
-# $HOME local configuration before higan runs
+# we create a first-run script to populate
+# the local $HOME with all the auxiliary
+# stuff needed by higan at runtime
 
-mv $out/bin/higan $out/bin/.higan-wrapped
-cat <<EOF > $out/bin/higan 
+cat <<EOF > $out/bin/higan-config.sh
+#!${shell}
 
-#!/bin/bash
-if [ ! -e \$HOME/.config/higan/.was_configured ]
-then
-    cp --update --recursive $out/share/higan \$HOME/.config
-    chmod --recursive u+w \$HOME/.config/higan
-    touch \$HOME/.config/higan/.was_configured
-fi
-# LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:$out/lib
-$out/bin/.higan-wrapped "\$@"
+cp --update --recursive $out/share/higan \$HOME/.config
+chmod --recursive u+w \$HOME/.config/higan
 
 EOF
 
-patchShebangs $out/bin/higan
-chmod +x $out/bin/higan
+chmod +x $out/bin/higan-config.sh

From d4de312452c60bb1f60b31ac9d9aafa90bb8bdfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 31 Aug 2014 15:07:01 +0200
Subject: [PATCH 0941/1453] pypyPackages: use pypy internal greenlet module

---
 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 7632af13c655..dc8f70d936cc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3324,7 +3324,7 @@ rec {
 
     buildInputs = [ nose httplib2  ];
 
-    propagatedBuildInputs = [ greenlet ];
+    propagatedBuildInputs = optionals (!isPyPy) [ greenlet ];
 
     PYTHON_EGG_CACHE = "`pwd`/.egg-cache";
 
@@ -3615,7 +3615,7 @@ rec {
 
   gevent = buildPythonPackage rec {
     name = "gevent-1.0.1";
-    disabled = isPy3k;
+    disabled = isPy3k || isPyPy;  # see https://github.com/surfly/gevent/issues/248
 
     src = fetchurl {
       url = "https://pypi.python.org/packages/source/g/gevent/${name}.tar.gz";
@@ -3623,7 +3623,7 @@ rec {
     };
 
     buildInputs = [ pkgs.libev ];
-    propagatedBuildInputs = [ greenlet ];
+    propagatedBuildInputs = optionals (!isPyPy) [ greenlet ];
 
     meta = with stdenv.lib; {
       description = "Coroutine-based networking library";
@@ -8699,6 +8699,7 @@ rec {
 
   pyuv = buildPythonPackage rec {
     name = "pyuv-0.11.5";
+    disabled = isPyPy;  # see https://github.com/saghul/pyuv/issues/49
 
     src = fetchurl {
       url = "https://github.com/saghul/pyuv/archive/${name}.tar.gz";

From b63496ba6b03080f99fb56671ec6ef60b340e6a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 31 Aug 2014 15:12:17 +0200
Subject: [PATCH 0942/1453] Revert "h5py: New package, version 2.3.1"

This reverts commit 3c6afb34967a241e2c2e106cb02bad55b5389b94.

Doesn't build.
---
 .../python-modules/h5py/default.nix           | 43 -------------------
 pkgs/top-level/python-packages.nix            | 13 ------
 2 files changed, 56 deletions(-)
 delete mode 100644 pkgs/development/python-modules/h5py/default.nix

diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix
deleted file mode 100644
index 9ab68ac4cd2b..000000000000
--- a/pkgs/development/python-modules/h5py/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ stdenv, fetchurl, python, buildPythonPackage
-, numpy, hdf5, cython
-, mpiSupport ? false, mpi4py ? null, mpi ? null }:
-
-assert mpiSupport == hdf5.mpiSupport;
-assert mpiSupport -> mpi != null
-  && mpi4py != null
-  && mpi == mpi4py.mpi
-  && mpi == hdf5.mpi
-  ;
-
-with stdenv.lib;
-
-buildPythonPackage rec {
-  name = "h5py-2.3.1";
-
-  src = fetchurl {
-    url = "https://pypi.python.org/packages/source/h/h5py/${name}.tar.gz";
-    md5 = "8f32f96d653e904d20f9f910c6d9dd91";
-  };
-
-  setupPyBuildFlags = [ "--hdf5=${hdf5}" ]
-    ++ optional mpiSupport "--mpi"
-    ;
-  setupPyInstallFlags = setupPyBuildFlags;
-
-  preBuild = if mpiSupport then "export CC=${mpi}/bin/mpicc" else "";
-
-  buildInputs = [ hdf5 cython ]
-    ++ optional mpiSupport mpi
-    ;
-  propagatedBuildInputs = [ numpy ]
-    ++ optional mpiSupport mpi4py
-    ;
-
-  meta = {
-    description = "
-      The h5py package is a Pythonic interface to the HDF5 binary data format.
-    ";
-    homepage = "http://www.h5py.org/";
-    license = stdenv.lib.licenses.bsd2;
-  };
-}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index dc8f70d936cc..dad9da5324d7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -90,19 +90,6 @@ rec {
     '';
   };
 
-  h5py = callPackage ../development/python-modules/h5py {
-    inherit (pkgs) stdenv fetchurl;
-    inherit python buildPythonPackage cython numpy;
-    hdf5 = pkgs.hdf5.override { mpi = null; };
-  };
-
-  h5py-mpi = h5py.override {
-    mpiSupport = true;
-    mpi = pkgs.openmpi;
-    hdf5 = pkgs.hdf5.override { mpi = pkgs.openmpi; enableShared = true; };
-    inherit mpi4py;
-  };
-
   ipython = import ../shells/ipython {
     inherit (pkgs) stdenv fetchurl sip pyqt4;
     inherit buildPythonPackage pythonPackages;

From 7e91d1c8a1a4c822562dd058e0efebbc99aca2d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 31 Aug 2014 15:12:34 +0200
Subject: [PATCH 0943/1453] Revert "mpi4py: New package, version 1.3.1"

This reverts commit 63c062947eb765e4a02bc892e1891da7057fdfec.

Doesn't build.
---
 .../python-modules/mpi4py/default.nix         | 45 -------------------
 pkgs/top-level/python-packages.nix            |  6 ---
 2 files changed, 51 deletions(-)
 delete mode 100644 pkgs/development/python-modules/mpi4py/default.nix

diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix
deleted file mode 100644
index 74d46def9074..000000000000
--- a/pkgs/development/python-modules/mpi4py/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ stdenv, fetchurl, python, buildPythonPackage, mpi, openssh }:
-
-buildPythonPackage rec {
-  name = "mpi4py-1.3.1";
-
-  src = fetchurl {
-    url = "https://bitbucket.org/mpi4py/mpi4py/downloads/${name}.tar.gz";
-    sha256 = "e7bd2044aaac5a6ea87a87b2ecc73b310bb6efe5026031e33067ea3c2efc3507";
-  };
-
-  passthru = {
-    inherit mpi;
-  };
-
-  configurePhase = "";
-
-  installPhase = ''
-    mkdir -p "$out/lib/${python.libPrefix}/site-packages"
-    export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH"
-
-    ${python}/bin/${python.executable} setup.py install \
-      --install-lib=$out/lib/${python.libPrefix}/site-packages \
-      --prefix="$out"
-
-    # --install-lib:
-    # sometimes packages specify where files should be installed outside the usual
-    # python lib prefix, we override that back so all infrastructure (setup hooks)
-    # work as expected
-  '';
-
-  setupPyBuildFlags = ["--mpicc=${mpi}/bin/mpicc"];
-
-  buildInputs = [ mpi ];
-  # Requires openssh for tests. Tests of dependent packages will also fail,
-  # if openssh is not present. E.g. h5py with mpi support.
-  propagatedBuildInputs = [ openssh ];
-
-  meta = {
-    description = "
-      Provides Python bindings for the Message Passing Interface standard.
-    ";
-    homepage = "http://code.google.com/p/mpi4py/";
-    license = stdenv.lib.licenses.bsd3;
-  };
-}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index dad9da5324d7..6ec68d5537e8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -106,12 +106,6 @@ rec {
     pylabQtSupport = false;
   });
 
-  mpi4py = callPackage ../development/python-modules/mpi4py {
-    inherit (pkgs) stdenv fetchurl openssh;
-    inherit python buildPythonPackage;
-    mpi = pkgs.openmpi;
-  };
-
   nixpart = callPackage ../tools/filesystems/nixpart { };
 
   # This is used for NixOps to make sure we won't break it with the next major

From 9447a855f2996d9e462665c9985343aadc0fdcaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sun, 31 Aug 2014 12:11:15 +0200
Subject: [PATCH 0944/1453] lv2: update from 1.8.0 to 1.10.0

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

diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/development/libraries/audio/lv2/default.nix
index 25d19d089a57..f03f6b3d3710 100644
--- a/pkgs/development/libraries/audio/lv2/default.nix
+++ b/pkgs/development/libraries/audio/lv2/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "lv2-${version}";
-  version = "1.8.0";
+  version = "1.10.0";
 
   src = fetchurl {
     url = "http://lv2plug.in/spec/${name}.tar.bz2";
-    sha256 = "1mxkp7gajh1alw6s358cqwf3qkpr1ld9wfxwswnqrxcd9a7hxjd4";
+    sha256 = "1md41x9snrp4mcfyli7lyfpvcfa78nfy6xkdy84kppnl8m5qw378";
   };
 
   buildInputs = [ gtk libsndfile pkgconfig python ];

From b820c284d7f1fb4f298e60395659dedb4f351e60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sun, 31 Aug 2014 12:11:36 +0200
Subject: [PATCH 0945/1453] sratom: update from 0.4.4 to 0.4.6

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

diff --git a/pkgs/development/libraries/audio/sratom/default.nix b/pkgs/development/libraries/audio/sratom/default.nix
index ac0b9d233fa8..a4ba4c16c872 100644
--- a/pkgs/development/libraries/audio/sratom/default.nix
+++ b/pkgs/development/libraries/audio/sratom/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "sratom-${version}";
-  version = "0.4.4";
+  version = "0.4.6";
 
   src = fetchurl {
     url = "http://download.drobilla.net/${name}.tar.bz2";
-    sha256 = "1q4044md8nmqah8ay5mf4lgdl6x0sfa4cjqyqk9da8nqzvs2j37s";
+    sha256 = "080jjiyxjnj7hf25844hd9rb01grvzz1rk8mxcdnakywmspbxfd4";
   };
 
   buildInputs = [ lv2 pkgconfig python serd sord ];

From dcbfff28f31b354ecb033c43b9fef3c84ddd9e44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sun, 31 Aug 2014 12:13:25 +0200
Subject: [PATCH 0946/1453] jalv: update from 1.4.4 to 1.4.6

---
 pkgs/applications/audio/jalv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/jalv/default.nix b/pkgs/applications/audio/jalv/default.nix
index 70ef5bdec5cb..bf01fe1a9352 100644
--- a/pkgs/applications/audio/jalv/default.nix
+++ b/pkgs/applications/audio/jalv/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation  rec {
   name = "jalv-${version}";
-  version = "1.4.4";
+  version = "1.4.6";
 
   src = fetchurl {
     url = "http://download.drobilla.net/${name}.tar.bz2";
-    sha256 = "1iql1r52rmf87q6jkxhcxa3lpq7idzzg55ma91wphywyvh29q7lf";
+    sha256 = "1f1hcq74n3ziw8bk97mn5a1vgw028dxikv3fchaxd430pbbhqgl9";
   };
 
   buildInputs = [

From 2bfe0a5d38ad56b20e99342c3cf546b7fa3c7884 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sun, 31 Aug 2014 15:22:05 +0200
Subject: [PATCH 0947/1453] guitarix: update from 0.28.3 to 0.30.0

---
 pkgs/applications/audio/guitarix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix
index 777c0ddb2e35..46237a6c1c78 100644
--- a/pkgs/applications/audio/guitarix/default.nix
+++ b/pkgs/applications/audio/guitarix/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "guitarix-${version}";
-  version = "0.28.3";
+  version = "0.30.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.bz2";
-    sha256 = "0ks5avylyicqfj9l1wf4gj62i8m6is2jmp0h11h5l2wbg3xiwxjd";
+    sha256 = "0fbapd1pcixzlqxgzb2s2q1c64g9z9lf4hz3vy73z55cnpk72vdx";
   };
 
   buildInputs = [

From 80da458388154a64279b0e4992c3f4058a6246fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sun, 31 Aug 2014 15:44:44 +0200
Subject: [PATCH 0948/1453] guitarix: fix 0.30.0 build by adding new
 dependencies

---
 pkgs/applications/audio/guitarix/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix
index 46237a6c1c78..e593ddf41e6f 100644
--- a/pkgs/applications/audio/guitarix/default.nix
+++ b/pkgs/applications/audio/guitarix/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, avahi, boost, fftw, gettext, glib, glibmm, gtk
-, gtkmm, intltool, jack2, ladspaH, librdf, libsndfile, lv2
-, pkgconfig, python }:
+{ stdenv, fetchurl, avahi, boost, eigen, fftw, gettext, glib, glibmm, gtk
+, gtkmm, intltool, jack2, ladspaH, librdf, libsndfile, lilv, lv2
+, pkgconfig, python, serd, sord, sratom }:
 
 stdenv.mkDerivation rec {
   name = "guitarix-${version}";
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    avahi boost fftw gettext glib glibmm gtk gtkmm intltool jack2
-    ladspaH librdf libsndfile lv2 pkgconfig python
+    avahi boost eigen fftw gettext glib glibmm gtk gtkmm intltool jack2
+    ladspaH librdf libsndfile lilv lv2 pkgconfig python serd sord sratom
   ];
 
   configurePhase = "python waf configure --prefix=$out";

From cdb3e6fa2fcc988b61251e5db714dad361db70e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 31 Aug 2014 15:51:54 +0200
Subject: [PATCH 0949/1453] python33Packages.sqlalchemy(8): fix build

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6ec68d5537e8..7b39b083eea6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8027,6 +8027,9 @@ rec {
       # waiting for 0.7.11 release
       ../development/python-modules/sqlalchemy-0.7.10-test-failures.patch
     ];
+    preConfigure = optionalString isPy3k ''
+      python3 sa2to3.py --no-diffs -w lib test examples
+    '';
   });
 
   sqlalchemy8 = pkgs.lib.overrideDerivation sqlalchemy9 (args: rec {
@@ -8035,6 +8038,9 @@ rec {
       url = "https://pypi.python.org/packages/source/S/SQLAlchemy/${name}.tar.gz";
       md5 = "4f3377306309e46739696721b1785335";
     };
+    preConfigure = optionalString isPy3k ''
+      python3 sa2to3.py --no-diffs -w lib test examples
+    '';
   });
 
   sqlalchemy9 = buildPythonPackage rec {

From 933bca648fca37bf8516c34a81cfbec1d81dd040 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sun, 31 Aug 2014 16:09:08 +0200
Subject: [PATCH 0950/1453] hydrogen: 0.9.5.1 -> 0.9.6

---
 pkgs/applications/audio/hydrogen/default.nix  | 28 ++++---------------
 .../audio/hydrogen/scons-env.patch            | 28 -------------------
 2 files changed, 6 insertions(+), 50 deletions(-)
 delete mode 100644 pkgs/applications/audio/hydrogen/scons-env.patch

diff --git a/pkgs/applications/audio/hydrogen/default.nix b/pkgs/applications/audio/hydrogen/default.nix
index 10f15f5882cb..72e546246d50 100644
--- a/pkgs/applications/audio/hydrogen/default.nix
+++ b/pkgs/applications/audio/hydrogen/default.nix
@@ -1,35 +1,19 @@
-{ stdenv, fetchurl, alsaLib, boost, glib, jack2, ladspaPlugins
-, libarchive, liblrdf , libsndfile, pkgconfig, qt4, scons, subversion }:
+{ stdenv, fetchurl, alsaLib, boost, cmake, glib, jack2, libarchive
+, liblrdf, libsndfile, pkgconfig, qt4 }:
 
 stdenv.mkDerivation rec {
-  version = "0.9.5.1";
+  version = "0.9.6";
   name = "hydrogen-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/hydrogen/hydrogen-${version}.tar.gz";
-    sha256 = "1fvyp6gfzcqcc90dmaqbm11p272zczz5pfz1z4lj33nfr7z0bqgb";
+    url = "https://github.com/hydrogen-music/hydrogen/archive/${version}.tar.gz";
+    sha256 = "1z7j8aq158mp41iv78j0w6fyx98y1y51z592b4x5hkvicabgck5w";
   };
 
   buildInputs = [ 
-    alsaLib boost glib jack2 ladspaPlugins libarchive liblrdf
-    libsndfile pkgconfig qt4 scons subversion
+    alsaLib boost cmake glib jack2 libarchive liblrdf libsndfile pkgconfig qt4
   ];
 
-  patches = [ ./scons-env.patch ];
-
-  postPatch = ''
-    sed -e 's#/usr/lib/ladspa#${ladspaPlugins}/lib/ladspa#' -i libs/hydrogen/src/preferences.cpp
-    sed '/\/usr/d' -i libs/hydrogen/src/preferences.cpp
-    sed "s#pkg_ver.rstrip().split('.')#pkg_ver.rstrip().split('.')[:3]#" -i Sconstruct
-  '';
-
-  # why doesn't scons find librdf?
-  buildPhase = ''
-    scons prefix=$out libarchive=1 lrdf=0 install
-  '';
-
-  installPhase = ":";
-
   meta = with stdenv.lib; {
     description = "Advanced drum machine";
     homepage = http://www.hydrogen-music.org;
diff --git a/pkgs/applications/audio/hydrogen/scons-env.patch b/pkgs/applications/audio/hydrogen/scons-env.patch
deleted file mode 100644
index ebc17f67872f..000000000000
--- a/pkgs/applications/audio/hydrogen/scons-env.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- hydrogen-0.9.5/Sconstruct	2011-03-15 13:22:35.000000000 +0100
-+++ hydrogen-0.9.5/Sconstruct	2011-04-17 16:06:54.000000000 +0200
-@@ -178,7 +178,7 @@
- 
- 	includes.append( "libs/hydrogen/include" )
- 	
--	env = Environment( options = opts ) 
-+	env = Environment( options = opts, ENV = os.environ ) 
- 
- 
- 	#location of qt4.py
-@@ -298,7 +298,6 @@
- 
-         for N in glob.glob('./data/i18n/hydrogen.*'):
-             env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data/i18n', source=N))
--	env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data', source="./data/img"))
- 
- 	#add every img in ./data/img to the install list. 
- 	os.path.walk("./data/img/",install_images,env) 
-@@ -379,7 +379,7 @@
- 
- includes, a , b = get_platform_flags( opts )
- 
--env = Environment(options = opts, CPPPATH = includes)
-+env = Environment(options = opts, ENV = os.environ)
- 
- 
- Help(opts.GenerateHelpText(env))

From 9785c31c9800a821bc2c92a04d2c532cc71c40f1 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 31 Aug 2014 17:18:35 +0400
Subject: [PATCH 0951/1453] Update ASDF

---
 pkgs/development/lisp-modules/asdf/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/lisp-modules/asdf/default.nix b/pkgs/development/lisp-modules/asdf/default.nix
index 97e1661544ba..100577b3a7ff 100644
--- a/pkgs/development/lisp-modules/asdf/default.nix
+++ b/pkgs/development/lisp-modules/asdf/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="asdf";
-    version="3.1.2";
+    version="3.1.3";
     name="${baseName}-${version}";
-    hash="0d427908q4hcspmdhc5ps38dbvz113hy6687l9ypmfl79qfb2qki";
-    url="http://common-lisp.net/project/asdf/archives/asdf-3.1.2.tar.gz";
-    sha256="0d427908q4hcspmdhc5ps38dbvz113hy6687l9ypmfl79qfb2qki";
+    hash="11jgbl2ys98i7lir0z76g0msm89zmz1b91gwkdz0gnxr6gavj6cn";
+    url="http://common-lisp.net/project/asdf/archives/asdf-3.1.3.tar.gz";
+    sha256="11jgbl2ys98i7lir0z76g0msm89zmz1b91gwkdz0gnxr6gavj6cn";
   };
   buildInputs = [
     texinfo texLive
@@ -29,7 +29,6 @@ stdenv.mkDerivation {
     cp -r ./* "$out"/lib/common-lisp/asdf/
     cp -r doc/* "$out"/share/doc/asdf/
   '';
-  sourceRoot=".";
   meta = {
     inherit (s) version;
     description = ''Standard software-system definition library for Common Lisp'';

From fe549d89be7df890d9403c2ad77fabc28950e292 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 31 Aug 2014 17:22:23 +0400
Subject: [PATCH 0952/1453] Update CL-Launch

---
 pkgs/development/tools/misc/cl-launch/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/misc/cl-launch/default.nix b/pkgs/development/tools/misc/cl-launch/default.nix
index d66ca9868f57..085af9df3a39 100644
--- a/pkgs/development/tools/misc/cl-launch/default.nix
+++ b/pkgs/development/tools/misc/cl-launch/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="cl-launch";
-    version="4.0.5";
+    version="4.1";
     name="${baseName}-${version}";
-    hash="00i11pkwsb9r9cjzxjmj0dsp369i0gpz04f447xss9a9v192dhlj";
-    url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-4.0.5.tar.gz";
-    sha256="00i11pkwsb9r9cjzxjmj0dsp369i0gpz04f447xss9a9v192dhlj";
+    hash="0fmxa8013sgxmbfmh1wqffywg72zynzlw5yyrdvy9qpx1my36pwb";
+    url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-4.1.tar.gz";
+    sha256="0fmxa8013sgxmbfmh1wqffywg72zynzlw5yyrdvy9qpx1my36pwb";
   };
   buildInputs = [
   ];

From b28d7974fb5e8e3a117ee81c066d5632bcdf030e Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 31 Aug 2014 17:27:03 +0400
Subject: [PATCH 0953/1453] Update SysDig

---
 pkgs/os-specific/linux/sysdig/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix
index d5e2ed3ff940..4abbb4c45b43 100644
--- a/pkgs/os-specific/linux/sysdig/default.nix
+++ b/pkgs/os-specific/linux/sysdig/default.nix
@@ -3,10 +3,10 @@ let
   inherit (stdenv.lib) optional optionalString;
   s = rec {
     baseName="sysdig";
-    version="0.1.87";
+    version = "0.1.88";
     name="${baseName}-${version}";
     url="https://github.com/draios/sysdig/archive/${version}.tar.gz";
-    sha256="0xfildaj8kzbngpza47zqm363i6q87m97a18qlmdisrxmz11s32b";
+    sha256 = "1a4ij3qpk1h7xnyhic6p21jp46p9lpnagfl46ky46snflld4bz96";
   };
   buildInputs = [
     cmake zlib luajit

From bddcee774715efe189857c19228d18639fa04952 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 31 Aug 2014 17:28:05 +0400
Subject: [PATCH 0954/1453] Update Firejail

---
 pkgs/os-specific/linux/firejail/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix
index c1fa2c26205a..d7f3d293c489 100644
--- a/pkgs/os-specific/linux/firejail/default.nix
+++ b/pkgs/os-specific/linux/firejail/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="firejail";
-    version="0.9.8.1";
+    version="0.9.10";
     name="${baseName}-${version}";
-    hash="0wjanz42k301zdwv06ylnzqrabxy424j0k9dh4i4aqhvihvxr83x";
-    url="mirror://sourceforge/project/firejail/firejail/firejail-0.9.8.1.tar.bz2";
-    sha256="0wjanz42k301zdwv06ylnzqrabxy424j0k9dh4i4aqhvihvxr83x";
+    hash="0pjzs77r86nnhddpfm39f0a4lrzahq0cwi8d2wsg35gxvb19w1jg";
+    url="mirror://sourceforge/project/firejail/firejail/firejail-0.9.10.tar.bz2";
+    sha256="0pjzs77r86nnhddpfm39f0a4lrzahq0cwi8d2wsg35gxvb19w1jg";
   };
   buildInputs = [
   ];

From 3bbf64b6d08bd0b3cf3ac8564f8f79c5d51b22eb Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 31 Aug 2014 17:40:20 +0400
Subject: [PATCH 0955/1453] Update unstable Wine

---
 pkgs/misc/emulators/wine/unstable.nix      | 4 ++--
 pkgs/misc/emulators/wine/unstable.upstream | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/emulators/wine/unstable.nix b/pkgs/misc/emulators/wine/unstable.nix
index cd5c5a8b4790..a7d52f2bca4f 100644
--- a/pkgs/misc/emulators/wine/unstable.nix
+++ b/pkgs/misc/emulators/wine/unstable.nix
@@ -7,12 +7,12 @@ assert stdenv.isLinux;
 assert stdenv.gcc.gcc != null;
 
 let
-    version = "1.7.23";
+    version = "1.7.25";
     name = "wine-${version}";
 
     src = fetchurl {
       url = "mirror://sourceforge/wine/${name}.tar.bz2";
-      sha256 = "012ww1yifayakw9n2m23sx83dc3i2xiq3bn5n9iprppdhwxpp76v";
+      sha256 = "0h7mijxv5nhn0nn5knr8arq9bl7chi3diaa668yyhjbxwn15xqzm";
     };
 
     gecko = fetchurl {
diff --git a/pkgs/misc/emulators/wine/unstable.upstream b/pkgs/misc/emulators/wine/unstable.upstream
index e3616df76802..fa78360c76af 100644
--- a/pkgs/misc/emulators/wine/unstable.upstream
+++ b/pkgs/misc/emulators/wine/unstable.upstream
@@ -1,5 +1,5 @@
 url http://sourceforge.net/projects/wine/files/Source/
-attribute_name wine_unstable
+attribute_name wineUnstable
 version_link '[.]tar[.][^./]+/download$'
 SF_redirect
 do_overwrite () {

From 27ffa4093da85274cd7efe63db86ebaac2c5ca63 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 31 Aug 2014 17:42:14 +0400
Subject: [PATCH 0956/1453] Update libgphoto2

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

diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix
index ca8073fbe306..dc041490f78a 100644
--- a/pkgs/development/libraries/libgphoto2/default.nix
+++ b/pkgs/development/libraries/libgphoto2/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
-    sha256 = "1h0bwrbc69yq561pw4fjyclwvk0g6rrj3pw6zrdx33isipi15d2z";
+    sha256 = "1w2bfy6619fgrigasgmx3lnill8c99lq7blmy2bpp0qqqqwdb93d";
   };
   
   nativeBuildInputs = [ pkgconfig gettext ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
       MTP, and other vendor specific protocols for controlling and transferring data
       from digital cameras. 
     '';
-    version = "2.5.4";
+    version = "2.5.5";
     # XXX: the homepage claims LGPL, but several src files are lgpl21Plus
     license = stdenv.lib.licenses.lgpl21Plus; 
     platforms = with stdenv.lib.platforms; unix;

From 7b4f0e2265a098a452bd7c74d95c7789cbd8c702 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 31 Aug 2014 17:43:52 +0400
Subject: [PATCH 0957/1453] Update Sodiuum library

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

diff --git a/pkgs/development/libraries/sodium/default.nix b/pkgs/development/libraries/sodium/default.nix
index be52725f2c8f..266675614cee 100644
--- a/pkgs/development/libraries/sodium/default.nix
+++ b/pkgs/development/libraries/sodium/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="sodium";
-    version="0.6.1";
+    version="0.7.0";
     name="${baseName}-${version}";
-    hash="151nril3kzkpmy6khvqphk4zk15ri0dqv0isyyhz6n9nsbmzxk04";
-    url="http://download.dnscrypt.org/libsodium/releases/libsodium-0.6.1.tar.gz";
-    sha256="151nril3kzkpmy6khvqphk4zk15ri0dqv0isyyhz6n9nsbmzxk04";
+    hash="0s4iis5h7yh27kamwic3rddyp5ra941bcqcawa37grjvl78zzjjc";
+    url="http://download.dnscrypt.org/libsodium/releases/libsodium-0.7.0.tar.gz";
+    sha256="0s4iis5h7yh27kamwic3rddyp5ra941bcqcawa37grjvl78zzjjc";
   };
   buildInputs = [
   ];

From 7a998aca73423bee82b983e8fd34ce1da6e076f6 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 31 Aug 2014 17:44:47 +0400
Subject: [PATCH 0958/1453] Update SlimerJS

---
 pkgs/development/tools/slimerjs/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/slimerjs/default.nix b/pkgs/development/tools/slimerjs/default.nix
index 9741b0930d22..23b7d9e692cf 100644
--- a/pkgs/development/tools/slimerjs/default.nix
+++ b/pkgs/development/tools/slimerjs/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="slimerjs";
-    version="0.9.1";
+    version="0.9.2";
     name="${baseName}-${version}";
-    hash="1ss69z2794mv40nfa5bfjd8h78jzcjq5xm63hzay1iyvp5rjbl7k";
-    url="http://download.slimerjs.org/v0.9/0.9.1/slimerjs-0.9.1.zip";
-    sha256="1ss69z2794mv40nfa5bfjd8h78jzcjq5xm63hzay1iyvp5rjbl7k";
+    hash="0817f3aq0gn04q4hq43xk4av02d86s2001lg5s5p38phd2jvh703";
+    url="http://download.slimerjs.org/releases/0.9.2/slimerjs-0.9.2.zip";
+    sha256="0817f3aq0gn04q4hq43xk4av02d86s2001lg5s5p38phd2jvh703";
   };
   buildInputs = [
     unzip zip

From 1bfcc7b4774bb58ceb05e0536b5b86a4a7977607 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 31 Aug 2014 17:47:03 +0400
Subject: [PATCH 0959/1453] Update SCons

---
 pkgs/development/tools/build-managers/scons/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix
index 93f7699481c8..e173f8276648 100644
--- a/pkgs/development/tools/build-managers/scons/default.nix
+++ b/pkgs/development/tools/build-managers/scons/default.nix
@@ -2,7 +2,7 @@
 
 let
   name = "scons";
-  version = "2.3.2";
+  version = "2.3.3";
 in
 
 stdenv.mkDerivation {
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://sourceforge/scons/${name}-${version}.tar.gz";
-    sha256 = "1m29lhwz7p6k4f8wc8qjpwa89058lzq3vrycgxbfc5cmbq6354zr";
+    sha256 = "1qn0gk4k796a6vwsq62w80d6w96r9xh6kz7aa14xb6md2884x9v3";
   };
 
   buildInputs = [python makeWrapper];

From 5fc69283f51daae7811755f24073b18c995e3efb Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 31 Aug 2014 17:52:07 +0400
Subject: [PATCH 0960/1453] Update SBCL

---
 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 d3892d43d15e..535f2697fea6 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.0";
+  version = "1.2.3";
 
   src = fetchurl {
     url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
-    sha256 = "13k20sys1v4lvgis8cnbczww6zs93rw176vz07g4jx06418k53x2";
+    sha256 = "0lz2a79dlxxyw05s14l6xp35zjsazgbp1dmqygqi0cmd8dc5vj6j";
   };
 
   buildInputs = [ ]

From 8bc60391c65bd7e37c9bb1b5206b76ac67a4f55a Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 31 Aug 2014 18:24:41 +0400
Subject: [PATCH 0961/1453] Remove old version of LibreOffice dependencies: we
 now have fresh LibreOffice, the old versions of deps are not used otherwise,
 and they require old versions of more packages

---
 pkgs/development/libraries/libe-book/0.0.nix  | 30 -------------------
 .../libraries/libe-book/0.0.upstream          |  4 ---
 pkgs/development/libraries/libmwaw/0.2.nix    | 29 ------------------
 .../libraries/libmwaw/0.2.upstream            |  4 ---
 pkgs/top-level/all-packages.nix               |  2 --
 5 files changed, 69 deletions(-)
 delete mode 100644 pkgs/development/libraries/libe-book/0.0.nix
 delete mode 100644 pkgs/development/libraries/libe-book/0.0.upstream
 delete mode 100644 pkgs/development/libraries/libmwaw/0.2.nix
 delete mode 100644 pkgs/development/libraries/libmwaw/0.2.upstream

diff --git a/pkgs/development/libraries/libe-book/0.0.nix b/pkgs/development/libraries/libe-book/0.0.nix
deleted file mode 100644
index 2dc8de670397..000000000000
--- a/pkgs/development/libraries/libe-book/0.0.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{stdenv, fetchurl, gperf, pkgconfig, librevenge, libxml2, boost, icu, cppunit
-, libwpd}:
-let
-  s = # Generated upstream information
-  rec {
-    baseName="libe-book";
-    version="0.0.3";
-    name="${baseName}-${version}";
-    hash="06xhg319wbqrkj8914npasv5lr7k2904mmy7wa78063mkh31365i";
-    url="mirror://sourceforge/project/libebook/libe-book-0.0.3/libe-book-0.0.3.tar.xz";
-    sha256="06xhg319wbqrkj8914npasv5lr7k2904mmy7wa78063mkh31365i";
-  };
-  buildInputs = [
-    gperf pkgconfig librevenge libxml2 boost icu cppunit libwpd
-  ];
-in
-stdenv.mkDerivation {
-  inherit (s) name version;
-  inherit buildInputs;
-  src = fetchurl {
-    inherit (s) url sha256;
-  };
-  meta = {
-    inherit (s) version;
-    description = ''Library for import of reflowable e-book formats'';
-    license = stdenv.lib.licenses.lgpl21Plus ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/development/libraries/libe-book/0.0.upstream b/pkgs/development/libraries/libe-book/0.0.upstream
deleted file mode 100644
index e2994f526914..000000000000
--- a/pkgs/development/libraries/libe-book/0.0.upstream
+++ /dev/null
@@ -1,4 +0,0 @@
-url http://sourceforge.net/projects/libebook/files/
-SF_version_dir libe-book-0.0.
-version_link '[.]tar.xz/download$'
-SF_redirect
diff --git a/pkgs/development/libraries/libmwaw/0.2.nix b/pkgs/development/libraries/libmwaw/0.2.nix
deleted file mode 100644
index d66414b68142..000000000000
--- a/pkgs/development/libraries/libmwaw/0.2.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{stdenv, fetchurl, boost, pkgconfig, cppunit, zlib, libwpg, libwpd, librevenge}:
-let
-  s = # Generated upstream information
-  rec {
-    baseName="libmwaw";
-    version="0.2.1";
-    name="${baseName}-${version}";
-    hash="1fil1ll84pq0k3g6rcc2xfg1yrigkljp4ay5p2wpwd9qlmfvvvqn";
-    url="mirror://sourceforge/project/libmwaw/libmwaw/libmwaw-0.2.1/libmwaw-0.2.1.tar.xz";
-    sha256="1fil1ll84pq0k3g6rcc2xfg1yrigkljp4ay5p2wpwd9qlmfvvvqn";
-  };
-  buildInputs = [
-    boost pkgconfig cppunit zlib libwpg libwpd librevenge
-  ];
-in
-stdenv.mkDerivation {
-  inherit (s) name version;
-  inherit buildInputs;
-  src = fetchurl {
-    inherit (s) url sha256;
-  };
-  meta = {
-    inherit (s) version;
-    description = ''Import library for some old mac text documents'';
-    license = stdenv.lib.licenses.mpl20 ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/development/libraries/libmwaw/0.2.upstream b/pkgs/development/libraries/libmwaw/0.2.upstream
deleted file mode 100644
index 8ce00ecf7675..000000000000
--- a/pkgs/development/libraries/libmwaw/0.2.upstream
+++ /dev/null
@@ -1,4 +0,0 @@
-url http://sourceforge.net/projects/libmwaw/files/libmwaw/
-SF_version_dir libmwaw-0.2.
-version_link '[.]tar.xz/download$'
-SF_redirect
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ec8f9c00b2c8..2478d881182b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5235,7 +5235,6 @@ let
   liblscp = callPackage ../development/libraries/liblscp { };
 
   libe-book = callPackage ../development/libraries/libe-book {};
-  libe-book_00 = callPackage ../development/libraries/libe-book/0.0.nix {};
 
   libev = builderDefsPackage ../development/libraries/libev { };
 
@@ -5452,7 +5451,6 @@ let
   libmusicbrainz = libmusicbrainz3;
 
   libmwaw = callPackage ../development/libraries/libmwaw { };
-  libmwaw_02 = callPackage ../development/libraries/libmwaw/0.2.nix { };
 
   libmx = callPackage ../development/libraries/libmx { };
 

From a3d0fcda139d42f0cd72e00bef90d3d94f77ccb6 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 31 Aug 2014 18:36:07 +0400
Subject: [PATCH 0962/1453] Update serf

---
 pkgs/development/libraries/serf/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix
index 409b5db01049..873f59dba3ab 100644
--- a/pkgs/development/libraries/serf/default.nix
+++ b/pkgs/development/libraries/serf/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, krb5, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "serf-1.3.6";
+  version = "1.3.7";
+  name = "serf-${version}";
 
   src = fetchurl {
     url = "http://serf.googlecode.com/svn/src_releases/${name}.tar.bz2";
-    sha256 = "1wk3cplazs8jznjc9ylpd63rrk9k2y05xa7zqx7psycr0gmpnqya";
+    sha256 = "1bphz616dv1svc50kkm8xbgyszhg3ni2dqbij99sfvjycr7bgk7c";
   };
 
   buildInputs = [ apr scons openssl aprutil zlib krb5 pkgconfig ];
@@ -30,5 +31,8 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.asl20 ;
     maintainers = [stdenv.lib.maintainers.raskin];
     hydraPlatforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    inherit version;
+    downloadPage = "http://serf.googlecode.com/svn/src_releases/";
+    updateWalker = true;
   };
 }

From f70acd25847e1d18012acecb0923a024e7ff45d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 31 Aug 2014 16:53:29 +0200
Subject: [PATCH 0963/1453] munin: fix test

---
 pkgs/servers/monitoring/munin/default.nix | 2 +-
 pkgs/tools/misc/rrdtool/default.nix       | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix
index 245c838607f3..0ce58e640158 100644
--- a/pkgs/servers/monitoring/munin/default.nix
+++ b/pkgs/servers/monitoring/munin/default.nix
@@ -105,7 +105,7 @@ stdenv.mkDerivation rec {
             *.jar) continue;;
         esac
         wrapProgram "$file" \
-          --set PERL5LIB "$out/lib/perl5/site_perl:${with perlPackages; stdenv.lib.makePerlPath [
+          --set PERL5LIB "$out/lib/perl5/site_perl:${rrdtool}/lib/perl:${with perlPackages; stdenv.lib.makePerlPath [
                 Log4Perl IOSocketInet6 Socket6 URI DBFile DateManip
                 HTMLTemplate FileCopyRecursive FCGI NetSNMP NetServer
                 ListMoreUtils TimeHiRes DBDPg LWPUserAgent
diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix
index aa14087dfc85..29d98284ccf1 100644
--- a/pkgs/tools/misc/rrdtool/default.nix
+++ b/pkgs/tools/misc/rrdtool/default.nix
@@ -7,6 +7,11 @@ stdenv.mkDerivation {
     sha256 = "07fgn0y4yj7p2vh6a37q273hf98gkfw2sdam5r1ldn1k0m1ayrqj";
   };
   buildInputs = [ gettext perl pkgconfig libxml2 pango cairo ];
+  
+  postInstall = ''
+    # for munin support
+    mv $out/lib/perl/5*/*/*.pm $out/lib/perl/5*/
+  '';
 
   meta = {
     homepage = http://oss.oetiker.ch/rrdtool/;

From 979f0e1d6731d915141d8bda628420cd3aec9d63 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 31 Aug 2014 19:25:23 +0400
Subject: [PATCH 0964/1453] Update TPTP

---
 pkgs/applications/science/logic/tptp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/logic/tptp/default.nix b/pkgs/applications/science/logic/tptp/default.nix
index ef00b135c271..d4c628587535 100644
--- a/pkgs/applications/science/logic/tptp/default.nix
+++ b/pkgs/applications/science/logic/tptp/default.nix
@@ -11,14 +11,14 @@ let
     (builtins.attrNames (builtins.removeAttrs x helperArgNames));
   sourceInfo = rec {
     baseName="TPTP";
-    version="6.0.0";
+    version="6.1.0";
     name="${baseName}-${version}";
     urls=
     [
     "http://www.cs.miami.edu/~tptp/TPTP/Distribution/TPTP-v${version}.tgz"
     "http://www.cs.miami.edu/~tptp/TPTP/Archive/TPTP-v${version}/TPTP-v${version}.tgz"
     ];
-    hash="0jnjkqdz937c7mkxvh9wc3byw5h1k19jss058fbzdxxc2hkwq1af";
+    hash="054p0kx9qh619ixslxpb4qcwvcqr4kan154b3a87b546b78k7kv4";
   };
 in
 rec {

From 92ad86bb5e42c93430e82fc5d3f6b341896fd297 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 31 Aug 2014 19:32:21 +0400
Subject: [PATCH 0965/1453] Allow search for updates for GNU Barcode

---
 pkgs/tools/graphics/barcode/default.nix | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/graphics/barcode/default.nix b/pkgs/tools/graphics/barcode/default.nix
index 60dc5a285da3..052dc8f9cb22 100644
--- a/pkgs/tools/graphics/barcode/default.nix
+++ b/pkgs/tools/graphics/barcode/default.nix
@@ -9,17 +9,16 @@ let
   buildInputs = map (n: builtins.getAttr n x)
     (builtins.attrNames (builtins.removeAttrs x helperArgNames));
   sourceInfo = rec {
-    version="0.99";
+    version = "0.99";
     baseName="barcode";
     name="${baseName}-${version}";
     url="mirror://gnu/${baseName}/${name}.tar.gz";
-    hash="0r2b2lwg7a9i9ic5spkbnavy1ynrppmrldv46vsl44l1xgriq0vw";
   };
 in
 rec {
   src = a.fetchurl {
     url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+    sha256 = "1indapql5fjz0bysyc88cmc54y8phqrbi7c76p71fgjp45jcyzp8";
   };
 
   inherit (sourceInfo) name version;
@@ -35,11 +34,9 @@ rec {
       raskin
     ];
     platforms = with a.lib.platforms; allBut darwin;
-  };
-  passthru = {
-    updateInfo = {
-      downloadPage = "ftp://ftp.gnu.org/gnu/barcode/";
-    };
+    downloadPage = "http://ftp.gnu.org/gnu/barcode/";
+    updateWalker = true;
+    inherit version;
   };
 }) x
 

From 965cf1b9fbc735c2903ecf6b23236d7e34194802 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 31 Aug 2014 19:59:14 +0400
Subject: [PATCH 0966/1453] Update CGAL; NB: updating requires going through a
 formto get the fresh links

---
 pkgs/development/libraries/CGAL/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix
index 12273f845668..4c2739d00ecf 100644
--- a/pkgs/development/libraries/CGAL/default.nix
+++ b/pkgs/development/libraries/CGAL/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, cmake, boost, gmp, mpfr }:
 
 stdenv.mkDerivation rec {
-  version = "4.3";
+  version = "4.4";
 
   name = "cgal-${version}";
 
   src = fetchurl {
-    url = "https://gforge.inria.fr/frs/download.php/32995/CGAL-${version}.tar.xz";
-    sha256 = "015vw57dmy43bf63mg3916cgcsbv9dahwv24bnmiajyanj2mhiyc";
+    url = "https://gforge.inria.fr/frs/download.php/33526/CGAL-${version}.tar.xz";
+    sha256 = "1s0ylyrx74vgw6vsg6xxk4b07jrxh8pqcmxcbkx46v01nczv3ixj";
   };
 
   buildInputs = [ cmake boost gmp mpfr ];

From 242ae9c38c8f4a44692fed6ed64d57ae866b901f Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien.cassou@gmail.com>
Date: Sun, 31 Aug 2014 18:04:51 +0200
Subject: [PATCH 0967/1453] backintime: Definition improvement

---
 .../networking/sync/backintime/common.nix     | 46 +++++++++++
 .../networking/sync/backintime/default.nix    | 78 -------------------
 .../networking/sync/backintime/gnome.nix      | 37 +++++++++
 pkgs/top-level/all-packages.nix               |  6 +-
 4 files changed, 88 insertions(+), 79 deletions(-)
 create mode 100644 pkgs/applications/networking/sync/backintime/common.nix
 delete mode 100644 pkgs/applications/networking/sync/backintime/default.nix
 create mode 100644 pkgs/applications/networking/sync/backintime/gnome.nix

diff --git a/pkgs/applications/networking/sync/backintime/common.nix b/pkgs/applications/networking/sync/backintime/common.nix
new file mode 100644
index 000000000000..fa722747e5fb
--- /dev/null
+++ b/pkgs/applications/networking/sync/backintime/common.nix
@@ -0,0 +1,46 @@
+{stdenv, fetchurl, makeWrapper, gettext, python2, python2Packages }:
+
+stdenv.mkDerivation rec {
+  version = "1.0.36";
+
+  name = "backintime-common-${version}";
+
+  src = fetchurl {
+    url = "https://launchpad.net/backintime/1.0/${version}/+download/backintime-${version}.tar.gz";
+    md5 = "28630bc7bd5f663ba8fcfb9ca6a742d8";
+  };
+
+  # because upstream tarball has no top-level directory.
+  # https://bugs.launchpad.net/backintime/+bug/1359076
+  sourceRoot = ".";
+
+  buildInputs = [ makeWrapper gettext python2 python2Packages.dbus ];
+
+  installFlags = [ "DEST=$(out)" ];
+
+  preConfigure = "cd common";
+
+  dontAddPrefix = true;
+
+  preFixup =
+    ''
+    substituteInPlace "$out/bin/backintime" \
+      --replace "=\"/usr/share" "=\"$prefix/share"
+    wrapProgram "$out/bin/backintime" \
+      --prefix PYTHONPATH : "$PYTHONPATH" \
+      --prefix PATH : "$prefix/bin:$PATH"
+    '';
+
+  meta = {
+    homepage = https://launchpad.net/backintime;
+    description = "Simple backup tool for Linux";
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.DamienCassou ];
+    platforms = stdenv.lib.platforms.all;
+    longDescription = ''
+      Back In Time is a simple backup tool (on top of rsync) for Linux
+      inspired from “flyback project” and “TimeVault”. The backup is
+      done by taking snapshots of a specified set of directories.
+    '';
+  };
+}
\ No newline at end of file
diff --git a/pkgs/applications/networking/sync/backintime/default.nix b/pkgs/applications/networking/sync/backintime/default.nix
deleted file mode 100644
index 9b9e355f8281..000000000000
--- a/pkgs/applications/networking/sync/backintime/default.nix
+++ /dev/null
@@ -1,78 +0,0 @@
-{stdenv, fetchurl, makeWrapper, gettext, python2, python2Packages, gnome2, pkgconfig, pygobject, glib, libtool }:
-
-let
-  version = "1.0.36";
-
-  src = fetchurl {
-    url = "https://launchpad.net/backintime/1.0/${version}/+download/backintime-${version}.tar.gz";
-    md5 = "28630bc7bd5f663ba8fcfb9ca6a742d8";
-  };
-
-  # because upstream tarball has no top-level directory.
-  # https://bugs.launchpad.net/backintime/+bug/1359076
-  sourceRoot = ".";
-
-  genericBuildInputs = [ makeWrapper gettext python2 python2Packages.dbus ];
-
-  installFlagsArray = [ "DEST=$(out)" ];
-
-  meta = {
-    homepage = https://launchpad.net/backintime;
-    description = "Simple backup tool for Linux";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.DamienCassou ];
-    platforms = stdenv.lib.platforms.linux;
-    longDescription = ''
-      Back In Time is a simple backup tool (on top of rsync) for Linux
-      inspired from “flyback project” and “TimeVault”. The backup is
-      done by taking snapshots of a specified set of directories.
-    '';
-  };
-
-  common = stdenv.mkDerivation rec {
-    inherit version src sourceRoot installFlagsArray meta;
-
-    name = "backintime-common-${version}";
-
-    buildInputs = genericBuildInputs;
-
-    preConfigure = "cd common";
-
-    dontAddPrefix = true;
-
-    preFixup =
-      ''
-      substituteInPlace "$out/bin/backintime" \
-        --replace "=\"/usr/share" "=\"$prefix/share"
-      wrapProgram "$out/bin/backintime" \
-        --prefix PYTHONPATH : "$PYTHONPATH"
-    '';
-  };
-
-in
-stdenv.mkDerivation rec {
-  inherit version src sourceRoot installFlagsArray meta;
-
-  name = "backintime-gnome-${version}";
-
-  buildInputs = genericBuildInputs ++ [ common python2Packages.pygtk python2Packages.notify gnome2.gnome_python ];
-
-  preConfigure = "cd gnome";
-  configureFlagsArray = [ "--no-check" ];
-
-  preFixup =
-      ''
-      substituteInPlace "$out/share/backintime/gnome/app.py" \
-         --replace "glade_file = os.path.join(self.config.get_app_path()," \
-                   "glade_file = os.path.join('$prefix/share/backintime',"
-      substituteInPlace "$out/share/backintime/gnome/settingsdialog.py" \
-        --replace "glade_file = os.path.join(self.config.get_app_path()," \
-                  "glade_file = os.path.join('$prefix/share/backintime',"
-      substituteInPlace "$out/bin/backintime-gnome" \
-        --replace "=\"/usr/share" "=\"$prefix/share"
-      wrapProgram "$out/bin/backintime-gnome" \
-        --prefix PYTHONPATH : "${gnome2.gnome_python}/lib/python2.7/site-packages/gtk-2.0:${common}/share/backintime/common:$PYTHONPATH" \
-        --prefix PATH : "$PATH"
-    '';
-
-}
diff --git a/pkgs/applications/networking/sync/backintime/gnome.nix b/pkgs/applications/networking/sync/backintime/gnome.nix
new file mode 100644
index 000000000000..56d0f6c5481b
--- /dev/null
+++ b/pkgs/applications/networking/sync/backintime/gnome.nix
@@ -0,0 +1,37 @@
+{stdenv, fetchurl, makeWrapper, gettext, python2, python2Packages, gnome2, pkgconfig, pygobject, glib, libtool, backintime-common }:
+
+stdenv.mkDerivation rec {
+  inherit (backintime-common) version src sourceRoot installFlags meta;
+
+  name = "backintime-gnome-${version}";
+
+  buildInputs = [ makeWrapper gettext python2 python2Packages.dbus backintime-common python2Packages.pygtk python2Packages.notify gnome2.gnome_python ];
+
+  preConfigure = "cd gnome";
+  configureFlags = [ "--no-check" ];
+
+  preFixup =
+      ''
+      # Make sure all Python files refer to $prefix/share/backintime
+      # instead of config.get_app_path() which returns the path of the
+      # 'common' module, not the path of the 'gnome' module.
+      filelist=$(mktemp)
+      find "$out/share/backintime/gnome" -name "*.py" -print0 > $filelist
+      while IFS="" read -r -d "" file <&9; do
+      substituteInPlace "$file" \
+         --replace "glade_file = os.path.join(config.get_app_path()," \
+                   "glade_file = os.path.join('$prefix/share/backintime'," \
+         --replace "glade_file = os.path.join(self.config.get_app_path()," \
+                   "glade_file = os.path.join('$prefix/share/backintime',"
+      done 9< "$filelist"
+      rm "$filelist"
+
+      substituteInPlace "$out/bin/backintime-gnome" \
+        --replace "=\"/usr/share" "=\"$prefix/share"
+
+      wrapProgram "$out/bin/backintime-gnome" \
+        --prefix PYTHONPATH : "${gnome2.gnome_python}/lib/python2.7/site-packages/gtk-2.0:${backintime-common}/share/backintime/common:$PYTHONPATH" \
+        --prefix PATH : "${backintime-common}/bin:$PATH"
+    '';
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8c2961e1a618..7bef44f15bf0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8264,7 +8264,11 @@ let
 
   inherit (gnome3) baobab;
 
-  backintime = callPackage ../applications/networking/sync/backintime { };
+  backintime-common = callPackage ../applications/networking/sync/backintime/common.nix { };
+
+  backintime-gnome = callPackage ../applications/networking/sync/backintime/gnome.nix { };
+
+  backintime = backintime-gnome;
 
   bar = callPackage ../applications/window-managers/bar { };
 

From 5599a2959ea1bd26111ec2efdf6afb5dee4f8994 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 31 Aug 2014 20:11:55 +0400
Subject: [PATCH 0968/1453] Update CM-Unicode font; note its migration to
 SF.net

---
 pkgs/data/fonts/cm-unicode/default.nix      | 14 +++++---------
 pkgs/data/fonts/cm-unicode/default.upstream |  7 +++++++
 2 files changed, 12 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/data/fonts/cm-unicode/default.upstream

diff --git a/pkgs/data/fonts/cm-unicode/default.nix b/pkgs/data/fonts/cm-unicode/default.nix
index b8f7f7c6d3ef..d8f6f7f83517 100644
--- a/pkgs/data/fonts/cm-unicode/default.nix
+++ b/pkgs/data/fonts/cm-unicode/default.nix
@@ -9,17 +9,16 @@ let
   buildInputs = map (n: builtins.getAttr n x)
     (builtins.attrNames (builtins.removeAttrs x helperArgNames));
   sourceInfo = rec {
-    version="0.6.3a";
+    version = "0.7.0";
     baseName="cm-unicode";
     name="${baseName}-${version}";
-    url="ftp://canopus.iacp.dvo.ru/pub/Font/cm_unicode/${name}-otf.tar.gz";
-    hash="1018gmvh7wl7sm6f3fqd917syd1yy0gz3pxmrc9lkxckcr7wz0zp";
+    url="mirror://sourceforge/${baseName}/${baseName}/${version}/${name}-otf.tar.xz";
   };
 in
 rec {
   src = a.fetchurl {
     url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+    sha256 = "0a0w9qm9g8qz2xh3lr61bj1ymqslqsvk4w2ybc3v2qa89nz7x2jl";
   };
 
   inherit (sourceInfo) name version;
@@ -34,11 +33,8 @@ rec {
     ];
     platforms = with a.lib.platforms;
       all;
-  };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://canopus.iacp.dvo.ru/~panov/cm-unicode/download.html";
-    };
+    downloadPage = "http://sourceforge.net/projects/cm-unicode/files/cm-unicode/";
+    inherit version;
   };
 }) x
 
diff --git a/pkgs/data/fonts/cm-unicode/default.upstream b/pkgs/data/fonts/cm-unicode/default.upstream
new file mode 100644
index 000000000000..bc24cd919b23
--- /dev/null
+++ b/pkgs/data/fonts/cm-unicode/default.upstream
@@ -0,0 +1,7 @@
+attribute_name cm_unicode
+url http://sourceforge.net/projects/cm-unicode/files/cm-unicode/
+SF_version_dir
+version_link '[-]otf[.]tar[.][a-z0-9]+/download$'
+SF_redirect
+ensure_hash
+do_overwrite() { do_overwrite_just_version; }

From 8fe8cb204e054da2848fd3ef0f8d9f786b3103b6 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 31 Aug 2014 20:18:53 +0400
Subject: [PATCH 0969/1453] Update conspy; note the project move to SF.net

---
 pkgs/os-specific/linux/conspy/default.nix      | 8 ++++----
 pkgs/os-specific/linux/conspy/default.upstream | 6 +++++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/conspy/default.nix b/pkgs/os-specific/linux/conspy/default.nix
index d252d9ce1621..78d403a3afcf 100644
--- a/pkgs/os-specific/linux/conspy/default.nix
+++ b/pkgs/os-specific/linux/conspy/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="conspy";
-    version="1.9";
+    version="1.10";
     name="${baseName}-${version}";
-    hash="1ndwdx8x5lnjl6cddy1d8g8m7ndxyj3wrs100w2bp9gnvbxbb8vv";
-    url="http://ace-host.stuart.id.au/russell/files/conspy/conspy-1.9.tar.gz";
-    sha256="1ndwdx8x5lnjl6cddy1d8g8m7ndxyj3wrs100w2bp9gnvbxbb8vv";
+    hash="1vnph4xa1qp4sr52jc9zldmbdpkr6z5j7hk2vgyhfn7m1vc5g0qw";
+    url="mirror://sourceforge/project/conspy/conspy-1.10-1/conspy-1.10.tar.gz";
+    sha256="1vnph4xa1qp4sr52jc9zldmbdpkr6z5j7hk2vgyhfn7m1vc5g0qw";
   };
   buildInputs = [
     autoconf automake ncurses
diff --git a/pkgs/os-specific/linux/conspy/default.upstream b/pkgs/os-specific/linux/conspy/default.upstream
index db0c0fd96802..3eeacf34694e 100644
--- a/pkgs/os-specific/linux/conspy/default.upstream
+++ b/pkgs/os-specific/linux/conspy/default.upstream
@@ -1 +1,5 @@
-url http://ace-host.stuart.id.au/russell/files/conspy/
+url http://sourceforge.net/projects/conspy/files/
+version_link 'conspy-[-0-9.]+/$'
+version_link '[-0-9.]+[.]tar[.][a-z0-9]+/download$'
+SF_redirect
+version '.*-([-0-9.]+)[.]tar[.].*' '\1'

From b259dde85374342321a6e0b21ee251cc3dcfba36 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 31 Aug 2014 13:12:52 +0200
Subject: [PATCH 0970/1453] haskell-codex: update to version 0.1.0.4

---
 pkgs/development/tools/haskell/codex/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/haskell/codex/default.nix b/pkgs/development/tools/haskell/codex/default.nix
index fac145b14c20..a2f9c1197006 100644
--- a/pkgs/development/tools/haskell/codex/default.nix
+++ b/pkgs/development/tools/haskell/codex/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "codex";
-  version = "0.1.0.3";
-  sha256 = "0sbkri6y9f4wws120kbb93sv1z0z75hjw9pw5r3wadmmd0lygsn9";
+  version = "0.1.0.4";
+  sha256 = "1wnrjmf2iypnmdsmjxbjg7kqn8802yhd9vbdc4vg19pqspir87wz";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From c04507ea3eb200ae019216e7981541111ed09402 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 31 Aug 2014 13:12:57 +0200
Subject: [PATCH 0971/1453] haskell-idris: update to version 0.9.14.2

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

diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix
index f0b07f9d0fa3..0761f189bc82 100644
--- a/pkgs/development/compilers/idris/default.nix
+++ b/pkgs/development/compilers/idris/default.nix
@@ -11,8 +11,8 @@
 
 cabal.mkDerivation (self: {
   pname = "idris";
-  version = "0.9.14.1";
-  sha256 = "11x4f0hvd51m9rlf9r0i5xsjmc73kjsayny4xyv0wgb88v9v737b";
+  version = "0.9.14.2";
+  sha256 = "0j64kx357l16z9y9j20i7mvxgqff94bfssbhh1shb13c0pk5lmi6";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 5f46cfdfcd374beb9f61351a2d801659349fc59d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 31 Aug 2014 13:12:59 +0200
Subject: [PATCH 0972/1453] haskell-IntervalMap: update to version 0.4.0.1

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

diff --git a/pkgs/development/libraries/haskell/IntervalMap/default.nix b/pkgs/development/libraries/haskell/IntervalMap/default.nix
index 774cbd8a19ea..65b53d91b52d 100644
--- a/pkgs/development/libraries/haskell/IntervalMap/default.nix
+++ b/pkgs/development/libraries/haskell/IntervalMap/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "IntervalMap";
-  version = "0.3.0.3";
-  sha256 = "11lxsjq9nw9mmj5ga0x03d8rgcx2s85kzi17d9cm7m28mq4dqdag";
+  version = "0.4.0.1";
+  sha256 = "0cq0dmmawrss4jjkz3br0lhp37d4k7rd3cinbcyf0bf39dfk6mrf";
   buildDepends = [ deepseq ];
   testDepends = [ Cabal deepseq QuickCheck ];
   meta = {

From b0c34028ba75f0b3f48c1fc78711edf0910d625f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 31 Aug 2014 13:13:00 +0200
Subject: [PATCH 0973/1453] haskell-JuicyPixels: update to version 3.1.7.1

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

diff --git a/pkgs/development/libraries/haskell/JuicyPixels/default.nix b/pkgs/development/libraries/haskell/JuicyPixels/default.nix
index fcd2689c5487..2305756f93b5 100644
--- a/pkgs/development/libraries/haskell/JuicyPixels/default.nix
+++ b/pkgs/development/libraries/haskell/JuicyPixels/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "JuicyPixels";
-  version = "3.1.6.1";
-  sha256 = "1v560y0l1zpznbpw8zgb2j6zlcwi8i207xgzggzzd3p0v2m8955c";
+  version = "3.1.7.1";
+  sha256 = "0mhsknqdrhxnm622mgrswvj4kvksh87x18s5ddgk4ylf0s2fjlap";
   buildDepends = [
     binary deepseq mtl primitive transformers vector zlib
   ];

From 7c5c6d0750f1e5eb082ee6a92b5e036b18d2988e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 31 Aug 2014 13:13:02 +0200
Subject: [PATCH 0974/1453] haskell-MFlow: update to version 0.4.5.8

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

diff --git a/pkgs/development/libraries/haskell/MFlow/default.nix b/pkgs/development/libraries/haskell/MFlow/default.nix
index a0e4b787ec99..f5e088a4238b 100644
--- a/pkgs/development/libraries/haskell/MFlow/default.nix
+++ b/pkgs/development/libraries/haskell/MFlow/default.nix
@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "MFlow";
-  version = "0.4.5.7";
-  sha256 = "0faw082z8yyzf0k1vrgpqa8kvwb2zwmasy1p1vvj3a7lhhnlr20s";
+  version = "0.4.5.8";
+  sha256 = "1gfv5ky68dyn8gjjg60c5s9x3dl9xn6j9q43w7vaj9sd1q12wk3c";
   buildDepends = [
     blazeHtml blazeMarkup caseInsensitive clientsession conduit
     conduitExtra extensibleExceptions httpTypes monadloc mtl parsec

From fe2cc9870a4204396a052f5afdeb7a8a91313359 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 31 Aug 2014 13:13:03 +0200
Subject: [PATCH 0975/1453] haskell-Yampa: update to version 0.9.6

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

diff --git a/pkgs/development/libraries/haskell/Yampa/default.nix b/pkgs/development/libraries/haskell/Yampa/default.nix
index a4d1ea666a2d..5ae451f81634 100644
--- a/pkgs/development/libraries/haskell/Yampa/default.nix
+++ b/pkgs/development/libraries/haskell/Yampa/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "Yampa";
-  version = "0.9.5";
-  sha256 = "0r6fm2ccls7gbc5s0vbrzrqv6marnzlzc7zr4afkgfk9jsqfmqjh";
+  version = "0.9.6";
+  sha256 = "0a1m0sb0i3kkxbp10vpqd6iw83ksm4alavrg04arzrv71p3skyg0";
   buildDepends = [ random ];
   meta = {
     homepage = "http://www.haskell.org/haskellwiki/Yampa";

From 86264d9b52f81c82551800ec743dfcf9a3ce870e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 31 Aug 2014 13:13:05 +0200
Subject: [PATCH 0976/1453] haskell-cabal-cargs: update to version 0.7.2

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

diff --git a/pkgs/development/libraries/haskell/cabal-cargs/default.nix b/pkgs/development/libraries/haskell/cabal-cargs/default.nix
index a74e54f7e438..2f2b59b597a6 100644
--- a/pkgs/development/libraries/haskell/cabal-cargs/default.nix
+++ b/pkgs/development/libraries/haskell/cabal-cargs/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cabal-cargs";
-  version = "0.7.1";
-  sha256 = "0y6v663mw4giwypdv34qr2l2fy1q7zdjvgw39m16sjna5lbwvm1n";
+  version = "0.7.2";
+  sha256 = "03095w08ff3g57qzx9dziv61q9x1rvqyph4lvxkccd1is2g1wywb";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 0c817d5bcf2ab7f7ac92b2c0255fcff8e1ff6478 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 31 Aug 2014 13:13:07 +0200
Subject: [PATCH 0977/1453] haskell-cabal-lenses: update to version 0.4

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

diff --git a/pkgs/development/libraries/haskell/cabal-lenses/default.nix b/pkgs/development/libraries/haskell/cabal-lenses/default.nix
index b5427b3b7472..8bf0148ba6bf 100644
--- a/pkgs/development/libraries/haskell/cabal-lenses/default.nix
+++ b/pkgs/development/libraries/haskell/cabal-lenses/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cabal-lenses";
-  version = "0.3.1";
-  sha256 = "17piwqyzd33shp12qa6j4s579rrs34l44x19p2nzz69anhc4g1j7";
+  version = "0.4";
+  sha256 = "19ryd1qvsc301kdpk0zvw89aqhvk26ccbrgddm9j5m31mn62jl2d";
   buildDepends = [ Cabal lens unorderedContainers ];
   meta = {
     description = "Lenses and traversals for the Cabal library";

From 0b537d24cff62f19fccc2510a289f1dce78680f4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 31 Aug 2014 13:13:15 +0200
Subject: [PATCH 0978/1453] haskell-either: update to version 4.3.0.2

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

diff --git a/pkgs/development/libraries/haskell/either/default.nix b/pkgs/development/libraries/haskell/either/default.nix
index 6d55afd41d6f..72f3bff14df1 100644
--- a/pkgs/development/libraries/haskell/either/default.nix
+++ b/pkgs/development/libraries/haskell/either/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "either";
-  version = "4.3.0.1";
-  sha256 = "1ib6288gxzqfm2y198dzhhq588mlwqxm07pcrj4h66g1mcy54q1f";
+  version = "4.3.0.2";
+  sha256 = "01n4jkf6py00841cyf3fiwiay736dpbhda8ia2qgm26q4r4h58gd";
   buildDepends = [
     exceptions free monadControl MonadRandom mtl semigroupoids
     semigroups transformers transformersBase

From 3ab26e53a56dee567c1d596414a079273439bba6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 31 Aug 2014 13:13:17 +0200
Subject: [PATCH 0979/1453] haskell-haste-compiler: update to version 0.4.1

---
 .../haskell/haste-compiler/default.nix          | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/haskell/haste-compiler/default.nix b/pkgs/development/libraries/haskell/haste-compiler/default.nix
index 0b5f4875a75d..962bf758a1e6 100644
--- a/pkgs/development/libraries/haskell/haste-compiler/default.nix
+++ b/pkgs/development/libraries/haskell/haste-compiler/default.nix
@@ -1,22 +1,21 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, binary, blazeBuilder, bzlib, dataBinaryIeee754
-, dataDefault, executablePath, filepath, ghcPaths, HTTP, monadsTf
-, mtl, network, random, shellmate, systemFileio, tar, temporary
-, time, transformers, utf8String, websockets, zipArchive
+, dataDefault, either, filepath, ghcPaths, HTTP, monadsTf, mtl
+, network, random, shellmate, systemFileio, tar, transformers
+, utf8String, websockets
 }:
 
 cabal.mkDerivation (self: {
   pname = "haste-compiler";
-  version = "0.3";
-  sha256 = "0a0hyra1h484c404d95d411l7gddaazy1ikwzlgkgzaqzd7j7dbd";
+  version = "0.4.1";
+  sha256 = "15v4c6rxz4n0wmiys6mam8xprcdq8kxnhpwcqnljshr8wlyihn8b";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    binary blazeBuilder bzlib dataBinaryIeee754 dataDefault
-    executablePath filepath ghcPaths HTTP monadsTf mtl network random
-    shellmate systemFileio tar temporary time transformers utf8String
-    websockets zipArchive
+    binary blazeBuilder bzlib dataBinaryIeee754 dataDefault either
+    filepath ghcPaths HTTP monadsTf mtl network random shellmate
+    systemFileio tar transformers utf8String websockets
   ];
   meta = {
     homepage = "http://github.com/valderman/haste-compiler";

From ba190e40a1b759a2af0b40cd12dc6152aae65919 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 31 Aug 2014 13:13:18 +0200
Subject: [PATCH 0980/1453] haskell-hsimport: update to version 0.5.2

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

diff --git a/pkgs/development/libraries/haskell/hsimport/default.nix b/pkgs/development/libraries/haskell/hsimport/default.nix
index 96bcecddc30c..3093cbb2038d 100644
--- a/pkgs/development/libraries/haskell/hsimport/default.nix
+++ b/pkgs/development/libraries/haskell/hsimport/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hsimport";
-  version = "0.5.1";
-  sha256 = "17yzfikfl8qvm6vp3d472l6p0kzzw694ng19xn3fmrb43qvki4jj";
+  version = "0.5.2";
+  sha256 = "00kzc7hiwsidwvjnbvc01yh6c8n135ypwsiyvcnf2g179pwmnzkc";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 4a04820bcf8855ae0b2126a186055b9c79c54c43 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 31 Aug 2014 13:13:20 +0200
Subject: [PATCH 0981/1453] haskell-hspec-wai: update to version 0.3.0.2

---
 .../libraries/haskell/hspec-wai/default.nix        | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hspec-wai/default.nix b/pkgs/development/libraries/haskell/hspec-wai/default.nix
index 8bc6776fd84e..5937b0a417cc 100644
--- a/pkgs/development/libraries/haskell/hspec-wai/default.nix
+++ b/pkgs/development/libraries/haskell/hspec-wai/default.nix
@@ -1,21 +1,21 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, aeson, aesonQq, caseInsensitive, doctest, hspec2
-, hspecMeta, httpTypes, markdownUnlit, scotty, text, transformers
-, wai, waiExtra
+{ cabal, aeson, aesonQq, caseInsensitive, hspec2, hspecMeta
+, httpTypes, markdownUnlit, scotty, text, transformers, wai
+, waiExtra
 }:
 
 cabal.mkDerivation (self: {
   pname = "hspec-wai";
-  version = "0.3.0.1";
-  sha256 = "0c04gh32xnvyz0679n7jhp1kdcn7lbkb7248j6lh28irsh84dvp8";
+  version = "0.3.0.2";
+  sha256 = "13jf8vw1mx5zg8diklbc4hbil9mkjdbg2azdsdfxp286wh718mna";
   buildDepends = [
     aeson aesonQq caseInsensitive hspec2 httpTypes text transformers
     wai waiExtra
   ];
   testDepends = [
-    aeson caseInsensitive doctest hspec2 hspecMeta httpTypes
-    markdownUnlit scotty text transformers wai waiExtra
+    aeson caseInsensitive hspec2 hspecMeta httpTypes markdownUnlit
+    scotty text transformers wai waiExtra
   ];
   meta = {
     description = "Experimental Hspec support for testing WAI applications (depends on hspec2!)";

From 536fd769bf8afb6615206e18a0ef4a082fed1061 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 31 Aug 2014 13:13:23 +0200
Subject: [PATCH 0982/1453] haskell-http-client: update to version 0.3.8

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

diff --git a/pkgs/development/libraries/haskell/http-client/default.nix b/pkgs/development/libraries/haskell/http-client/default.nix
index 7f032c3f675a..7015c9446e85 100644
--- a/pkgs/development/libraries/haskell/http-client/default.nix
+++ b/pkgs/development/libraries/haskell/http-client/default.nix
@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-client";
-  version = "0.3.7.2";
-  sha256 = "1llrf2bfbh5z01pwg40zdgmz93h45h60mg2pv1k6b8pmzlwr6aaz";
+  version = "0.3.8";
+  sha256 = "0v5j6fcigjpksj1m0n15g3j680k7qkms3cqd0b1w0ma7k63kcibc";
   buildDepends = [
     base64Bytestring blazeBuilder caseInsensitive cookie
     dataDefaultClass deepseq exceptions filepath httpTypes mimeTypes

From 9733b5660955d5000ff0688b90c59422a5b24f2d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 31 Aug 2014 13:13:27 +0200
Subject: [PATCH 0983/1453] haskell-cabal-bounds: update to version 0.8.6

---
 pkgs/development/tools/haskell/cabal-bounds/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/haskell/cabal-bounds/default.nix b/pkgs/development/tools/haskell/cabal-bounds/default.nix
index 97dac34af3be..368c421221bd 100644
--- a/pkgs/development/tools/haskell/cabal-bounds/default.nix
+++ b/pkgs/development/tools/haskell/cabal-bounds/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cabal-bounds";
-  version = "0.8.5";
-  sha256 = "19lai2gdxs76mrvcz77sjsx7hh87cf1f4qmy7z1zcd130z11q04a";
+  version = "0.8.6";
+  sha256 = "0q7fpblhxba4np5a9igwmcvmkkvka9f85nccxw0m2lvwbjrs51xq";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 6059abeea7e02b534c3b6fb5a00cc36f299c1917 Mon Sep 17 00:00:00 2001
From: Dmitry Malikov <malikov.d.y@gmail.com>
Date: Sun, 31 Aug 2014 00:23:50 +0200
Subject: [PATCH 0984/1453] Add haskell-meep package

---
 .../libraries/haskell/meep/default.nix        | 21 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/meep/default.nix

diff --git a/pkgs/development/libraries/haskell/meep/default.nix b/pkgs/development/libraries/haskell/meep/default.nix
new file mode 100644
index 000000000000..f8ad537938c9
--- /dev/null
+++ b/pkgs/development/libraries/haskell/meep/default.nix
@@ -0,0 +1,21 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, bifunctors, doctest, hspec, hspecExpectationsLens, lens
+, QuickCheck, semigroups
+}:
+
+cabal.mkDerivation (self: {
+  pname = "meep";
+  version = "0.1.1.0";
+  sha256 = "1rk5mrvmk07m5zdayfvxirak58d1bxwb04sgg0gcx07w8q8k4yyq";
+  buildDepends = [ bifunctors lens semigroups ];
+  testDepends = [
+    bifunctors doctest hspec hspecExpectationsLens lens QuickCheck
+    semigroups
+  ];
+  meta = {
+    description = "A silly container";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 7c88f1cee5fe..884f3f5bb05b 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1557,6 +1557,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   MaybeT = callPackage ../development/libraries/haskell/MaybeT {};
 
+  meep = callPackage ../development/libraries/haskell/meep {};
+
   MemoTrie = callPackage ../development/libraries/haskell/MemoTrie {};
 
   mersenneRandomPure64 = callPackage ../development/libraries/haskell/mersenne-random-pure64 {};

From e4555d80c8facbc419ab9ad495097cfcfbe91950 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 31 Aug 2014 13:17:18 +0200
Subject: [PATCH 0985/1453] haskell-Rasterific: re-generate with cabal2nix

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

diff --git a/pkgs/development/libraries/haskell/Rasterific/default.nix b/pkgs/development/libraries/haskell/Rasterific/default.nix
index f8f843236a68..c53e9f728580 100644
--- a/pkgs/development/libraries/haskell/Rasterific/default.nix
+++ b/pkgs/development/libraries/haskell/Rasterific/default.nix
@@ -12,15 +12,15 @@ cabal.mkDerivation (self: {
   buildDepends = [
     dlist FontyFruity free JuicyPixels mtl vector vectorAlgorithms
   ];
-  doCheck = false; # depends on criterion < 0.9
   testDepends = [
     binary criterion deepseq filepath FontyFruity JuicyPixels
     QuickCheck statistics vector
   ];
+  doCheck = false;
   meta = {
     description = "A pure haskell drawing engine";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.bergey ];
+    maintainers = with self.stdenv.lib.maintainers; [ bergey ];
   };
 })

From f5527b2594045dec1c2be8a8faeb399ade55ba40 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 31 Aug 2014 13:17:42 +0200
Subject: [PATCH 0986/1453] haskell-FontyFruity: update to version 0.3

---
 pkgs/development/libraries/haskell/FontyFruity/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/FontyFruity/default.nix b/pkgs/development/libraries/haskell/FontyFruity/default.nix
index eaa8a5f38246..1a613492f430 100644
--- a/pkgs/development/libraries/haskell/FontyFruity/default.nix
+++ b/pkgs/development/libraries/haskell/FontyFruity/default.nix
@@ -11,6 +11,6 @@ cabal.mkDerivation (self: {
     description = "A true type file format loader";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.bergey ];
+    maintainers = with self.stdenv.lib.maintainers; [ bergey ];
   };
 })

From 8e307572d25260f98afe28a1514fc68218b985b1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 31 Aug 2014 13:17:44 +0200
Subject: [PATCH 0987/1453] haskell-diagrams-rasterific: update to version
 0.1.0.1

---
 pkgs/development/libraries/haskell/diagrams/rasterific.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/diagrams/rasterific.nix b/pkgs/development/libraries/haskell/diagrams/rasterific.nix
index a49c98f988aa..c2e85058a906 100644
--- a/pkgs/development/libraries/haskell/diagrams/rasterific.nix
+++ b/pkgs/development/libraries/haskell/diagrams/rasterific.nix
@@ -19,6 +19,6 @@ cabal.mkDerivation (self: {
     description = "Rasterific backend for diagrams";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.bergey ];
+    maintainers = with self.stdenv.lib.maintainers; [ bergey ];
   };
 })

From dfcf682c215937963bc0fc9d3680ef6f2c347376 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 31 Aug 2014 13:17:45 +0200
Subject: [PATCH 0988/1453] haskell-monad-journal: update to version 0.2.3.1

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

diff --git a/pkgs/development/libraries/haskell/monad-journal/default.nix b/pkgs/development/libraries/haskell/monad-journal/default.nix
index 3afce21810c5..5cbfed976d14 100644
--- a/pkgs/development/libraries/haskell/monad-journal/default.nix
+++ b/pkgs/development/libraries/haskell/monad-journal/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "monad-journal";
-  version = "0.2.3.0";
-  sha256 = "1k0da0fwk05k8530rlys3n2s1z8glnfdivx93isy6cjr8amndc6b";
+  version = "0.2.3.1";
+  sha256 = "11p7qdga26wz82x6a1fl57iij4swsr1d1aly76sjrlvl8maqlf7d";
   buildDepends = [
     either monadControl mtl transformers transformersBase
   ];

From b253792e06da0274fb1eebfcfaca49e989e1d77a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 31 Aug 2014 13:17:47 +0200
Subject: [PATCH 0989/1453] haskell-pandoc-citeproc: update to version 0.5

---
 .../development/libraries/haskell/pandoc-citeproc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix b/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix
index e567bd82059b..76ab2fc41b42 100644
--- a/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix
+++ b/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pandoc-citeproc";
-  version = "0.4.0.1";
-  sha256 = "1z21mdxa2hrwqdclriyn3s1qqij3ccbkg7hb0acxrk3pzgidcinx";
+  version = "0.5";
+  sha256 = "00azhpll0xnb9nnkh7c3hbfk0fzmvh5cgdxlgx7jvaglrmsnvzw3";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From fd4927d25e4c19176860d642d39bcd6a60b51601 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 31 Aug 2014 13:17:49 +0200
Subject: [PATCH 0990/1453] haskell-pandoc: update to version 1.13.1

---
 .../libraries/haskell/pandoc/default.nix      | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix
index 1b2571563c38..c8ef8ba2271d 100644
--- a/pkgs/development/libraries/haskell/pandoc/default.nix
+++ b/pkgs/development/libraries/haskell/pandoc/default.nix
@@ -4,26 +4,27 @@
 , blazeHtml, blazeMarkup, dataDefault, deepseqGenerics, Diff
 , executablePath, extensibleExceptions, filepath, haddockLibrary
 , happy, highlightingKate, hslua, HTTP, httpClient, httpClientTls
-, httpTypes, HUnit, JuicyPixels, mtl, network, pandocTypes, parsec
-, QuickCheck, random, scientific, SHA, syb, tagsoup, temporary
-, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
-, texmath, text, time, unorderedContainers, vector, wai, waiExtra
-, xml, yaml, zipArchive, zlib
+, httpTypes, HUnit, JuicyPixels, mtl, network, networkUri
+, pandocTypes, parsec, QuickCheck, random, scientific, SHA, syb
+, tagsoup, temporary, testFramework, testFrameworkHunit
+, testFrameworkQuickcheck2, texmath, text, time
+, unorderedContainers, vector, xml, yaml, zipArchive, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "pandoc";
-  version = "1.13.0.1";
-  sha256 = "0pjyxsr93gv0vrdxlr5i0c56mg6rf21qxf1141cb8l0hl0b416d6";
+  version = "1.13.1";
+  sha256 = "0vvysa70xp4pskxrvslmddwdsalc479zb8wn6z1vmpvfssvvj6vv";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     aeson alex base64Bytestring binary blazeHtml blazeMarkup
     dataDefault deepseqGenerics extensibleExceptions filepath
     haddockLibrary happy highlightingKate hslua HTTP httpClient
-    httpClientTls httpTypes JuicyPixels mtl network pandocTypes parsec
-    random scientific SHA syb tagsoup temporary texmath text time
-    unorderedContainers vector wai waiExtra xml yaml zipArchive zlib
+    httpClientTls httpTypes JuicyPixels mtl network networkUri
+    pandocTypes parsec random scientific SHA syb tagsoup temporary
+    texmath text time unorderedContainers vector xml yaml zipArchive
+    zlib
   ];
   testDepends = [
     ansiTerminal Diff executablePath filepath highlightingKate HUnit

From 2f25d295b95b18eafc0c610d5f67afffbd7f9793 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 31 Aug 2014 13:17:59 +0200
Subject: [PATCH 0991/1453] haskell-robots-txt: update to version 0.4.1.1

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

diff --git a/pkgs/development/libraries/haskell/robots-txt/default.nix b/pkgs/development/libraries/haskell/robots-txt/default.nix
index c6534ff0cf40..0ebf6dac3018 100644
--- a/pkgs/development/libraries/haskell/robots-txt/default.nix
+++ b/pkgs/development/libraries/haskell/robots-txt/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "robots-txt";
-  version = "0.4.1.0";
-  sha256 = "1q18pgilrwppmd8d7pby3p6qgk47alzmd8izqspk7n4h4agrscn4";
+  version = "0.4.1.1";
+  sha256 = "16r6j96iay1r6435ym34dp9iggwlfigmzmqq5k5f5ss5bljfc72f";
   buildDepends = [ attoparsec time ];
   testDepends = [ attoparsec heredoc hspec QuickCheck transformers ];
   meta = {

From 6e8fd49909e932b638b041390e44012803880134 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 31 Aug 2014 13:18:01 +0200
Subject: [PATCH 0992/1453] haskell-simple-sendfile: update to version 0.2.17

---
 .../libraries/haskell/simple-sendfile/default.nix      | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/simple-sendfile/default.nix b/pkgs/development/libraries/haskell/simple-sendfile/default.nix
index 3e8381bf34bc..fc41353d3575 100644
--- a/pkgs/development/libraries/haskell/simple-sendfile/default.nix
+++ b/pkgs/development/libraries/haskell/simple-sendfile/default.nix
@@ -1,16 +1,14 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, conduit, conduitExtra, hspec, HUnit, network
-, networkConduit, resourcet
-}:
+{ cabal, conduit, conduitExtra, hspec, HUnit, network, resourcet }:
 
 cabal.mkDerivation (self: {
   pname = "simple-sendfile";
-  version = "0.2.15";
-  sha256 = "1fa20h2zcvxwdb5j5a0nnhl38bry1p5ckya1l7lrxx9r2bvjkyj9";
+  version = "0.2.17";
+  sha256 = "1xxzw916v5zwn8i5i61z6p1wa2rm95sa6ry9z3yg2b2ybpyagw5g";
   buildDepends = [ network resourcet ];
   testDepends = [
-    conduit conduitExtra hspec HUnit network networkConduit resourcet
+    conduit conduitExtra hspec HUnit network resourcet
   ];
   doCheck = false;
   meta = {

From 6641887a7c44a271e7dd50fc4865b1546b17cabd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 31 Aug 2014 13:18:25 +0200
Subject: [PATCH 0993/1453] haskell-zeromq4-haskell: update to version 0.6.1

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

diff --git a/pkgs/development/libraries/haskell/zeromq4-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq4-haskell/default.nix
index 0e2cf67a19f9..e4519c473585 100644
--- a/pkgs/development/libraries/haskell/zeromq4-haskell/default.nix
+++ b/pkgs/development/libraries/haskell/zeromq4-haskell/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "zeromq4-haskell";
-  version = "0.6";
-  sha256 = "1n8vvlwnmvi2hlqhkmzsqgpbpxnhdcs8jy3rj1srsg729m2aqc8y";
+  version = "0.6.1";
+  sha256 = "14ai6sp39qv6kmj33basnvvfqhzbiqxskv3crjwfdaxbijh23mif";
   buildDepends = [ async exceptions semigroups transformers ];
   testDepends = [
     async QuickCheck tasty tastyHunit tastyQuickcheck

From 8aa476f4ff2dbaf2301be1c85ee9c4db8760d898 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 31 Aug 2014 13:19:13 +0200
Subject: [PATCH 0994/1453] haskell-vcsgui: update to version 0.1.0.0

---
 pkgs/development/libraries/haskell/vcsgui/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/vcsgui/default.nix b/pkgs/development/libraries/haskell/vcsgui/default.nix
index 318f369fc3e2..08605391fc25 100644
--- a/pkgs/development/libraries/haskell/vcsgui/default.nix
+++ b/pkgs/development/libraries/haskell/vcsgui/default.nix
@@ -1,20 +1,18 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, filepath, gtk3, mtl, vcswrapper }:
+{ cabal, filepath, gtk3, mtl, text, vcswrapper }:
 
 cabal.mkDerivation (self: {
   pname = "vcsgui";
-  version = "0.0.4";
-  sha256 = "12hfdhnv3xc2dyqk76lyx5ggiygyap4hm50sd6qmwfjj3f2w6b98";
+  version = "0.1.0.0";
+  sha256 = "0wxalzil8ypvwp0z754m7g3848963znwwrjysdxp5q33imzbp60z";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ filepath gtk3 mtl vcswrapper ];
+  buildDepends = [ filepath gtk3 mtl text vcswrapper ];
   meta = {
     homepage = "https://github.com/forste/haskellVCSGUI";
     description = "GUI library for source code management systems";
     license = "GPL";
     platforms = self.stdenv.lib.platforms.linux;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
   };
 })

From 7eac7c3d572cf72104a01496b680790f40bdaf3b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 31 Aug 2014 13:20:28 +0200
Subject: [PATCH 0995/1453] haskell-fay: update to version 0.20.1.3

---
 .../libraries/haskell/fay/default.nix         | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/haskell/fay/default.nix b/pkgs/development/libraries/haskell/fay/default.nix
index edbf19bda62e..c00b009c51d7 100644
--- a/pkgs/development/libraries/haskell/fay/default.nix
+++ b/pkgs/development/libraries/haskell/fay/default.nix
@@ -1,24 +1,23 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, aeson, attoparsec, dataDefault, filepath, ghcPaths, groom
-, haskellNames, haskellPackages, haskellSrcExts, languageEcmascript
-, mtl, optparseApplicative, safe, sourcemap, split, spoon, syb
-, tasty, tastyHunit, tastyTh, text, time, transformers, uniplate
-, unorderedContainers, utf8String, vector
+{ cabal, aeson, dataDefault, filepath, ghcPaths, haskellNames
+, haskellPackages, haskellSrcExts, languageEcmascript, mtl
+, optparseApplicative, safe, sourcemap, split, spoon, syb, text
+, time, transformers, uniplate, unorderedContainers, utf8String
+, vector
 }:
 
 cabal.mkDerivation (self: {
   pname = "fay";
-  version = "0.20.1.2";
-  sha256 = "1ssii9wkml8jn8kcdq8h6sxrq4gap4asyglakvif2zawl3sqrdji";
+  version = "0.20.1.3";
+  sha256 = "1r9a1my8wydxx92xg04kacw90s1r4bms84fvs1w52r73knp5kb6r";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    aeson attoparsec dataDefault filepath ghcPaths groom haskellNames
-    haskellPackages haskellSrcExts languageEcmascript mtl
-    optparseApplicative safe sourcemap split spoon syb tasty tastyHunit
-    tastyTh text time transformers uniplate unorderedContainers
-    utf8String vector
+    aeson dataDefault filepath ghcPaths haskellNames haskellPackages
+    haskellSrcExts languageEcmascript mtl optparseApplicative safe
+    sourcemap split spoon syb text time transformers uniplate
+    unorderedContainers utf8String vector
   ];
   meta = {
     homepage = "https://github.com/faylang/fay/wiki";

From 2f6b3ed7efd3052f1f6acf1c4a23536d774add90 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 31 Aug 2014 13:20:30 +0200
Subject: [PATCH 0996/1453] haskell-vcswrapper: update to version 0.1.0

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

diff --git a/pkgs/development/libraries/haskell/vcswrapper/default.nix b/pkgs/development/libraries/haskell/vcswrapper/default.nix
index 75336ef88169..8c2653c66f5a 100644
--- a/pkgs/development/libraries/haskell/vcswrapper/default.nix
+++ b/pkgs/development/libraries/haskell/vcswrapper/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "vcswrapper";
-  version = "0.0.4";
-  sha256 = "130pmzxdsqv703k2g197vd5rl60fwkqqv2xck66ygb932wsq3fnk";
+  version = "0.1.0";
+  sha256 = "058xbfgxsp3g4x4rwbp57dqgr9mwnmj623js39dbmiqkixsda31a";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ filepath hxt mtl parsec split text ];

From 6ea21ad737cf4dffdc0cbaaf1d7539c05ef7cfd3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 31 Aug 2014 13:22:23 +0200
Subject: [PATCH 0997/1453] haskell-Agda: update to version 2.4.2

I had to disable the Haddock phase because of lots of errors:

  http://hydra.cryp.to/build/181564/nixlog/1/raw
---
 pkgs/development/compilers/agda/default.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/agda/default.nix b/pkgs/development/compilers/agda/default.nix
index 6705419add9b..db160c652cfb 100644
--- a/pkgs/development/compilers/agda/default.nix
+++ b/pkgs/development/compilers/agda/default.nix
@@ -1,15 +1,16 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, alex, binary, boxes, dataHash, deepseq, emacs, equivalence
-, filepath, geniplate, happy, hashable, hashtables, haskeline
-, haskellSrcExts, mtl, parallel, QuickCheck, STMonadTrans, strict
-, text, time, transformers, unorderedContainers, xhtml, zlib
+{ cabal, alex, binary, boxes, cpphs, dataHash, deepseq, emacs
+, equivalence, filepath, geniplate, happy, hashable, hashtables
+, haskeline, haskellSrcExts, mtl, parallel, QuickCheck
+, STMonadTrans, strict, text, time, transformers
+, unorderedContainers, xhtml, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "Agda";
-  version = "2.4.0.2";
-  sha256 = "13c4ipscnlnbv94k93yajrp32mwzikqa8rhc95h8pmqzhjgwyh8b";
+  version = "2.4.2";
+  sha256 = "0pgwx79y02a08xn5f6lghw7fsc6wilab5q2gdm9r51yi9gm32aw5";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -18,7 +19,8 @@ cabal.mkDerivation (self: {
     QuickCheck STMonadTrans strict text time transformers
     unorderedContainers xhtml zlib
   ];
-  buildTools = [ alex emacs happy ];
+  buildTools = [ alex cpphs emacs happy ];
+  noHaddock = true;
   postInstall = ''
     $out/bin/agda -c --no-main $(find $out/share -name Primitive.agda)
     $out/bin/agda-mode compile

From e81977172a5f1fc1e9578a943f54732714d2d229 Mon Sep 17 00:00:00 2001
From: Dmitry Malikov <malikov.d.y@gmail.com>
Date: Sun, 31 Aug 2014 00:03:49 +0200
Subject: [PATCH 0998/1453] Add haskell-directory-layout 0.7.4

---
 .../haskell/directory-layout/default.nix      | 25 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/directory-layout/default.nix

diff --git a/pkgs/development/libraries/haskell/directory-layout/default.nix b/pkgs/development/libraries/haskell/directory-layout/default.nix
new file mode 100644
index 000000000000..44f5a7635f6a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/directory-layout/default.nix
@@ -0,0 +1,25 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, commandQq, doctest, filepath, free, hspec, lens
+, semigroups, temporary, text, transformers, unorderedContainers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "directory-layout";
+  version = "0.7.4";
+  sha256 = "1nrbv9mzl817d6c494sxd4jg15winpp9624n84av9vdxb8x1n14d";
+  buildDepends = [
+    commandQq filepath free hspec lens semigroups text transformers
+    unorderedContainers
+  ];
+  testDepends = [
+    commandQq doctest filepath free hspec lens semigroups temporary
+    text transformers unorderedContainers
+  ];
+  meta = {
+    description = "Directory layout DSL";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+  doCheck = false; # issue https://github.com/supki/directory-layout/issues/8
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 884f3f5bb05b..c4798a6cbae0 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -670,6 +670,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   directSqlite = callPackage ../development/libraries/haskell/direct-sqlite {};
 
+  directoryLayout = callPackage ../development/libraries/haskell/directory-layout {};
+
   directoryTree = callPackage ../development/libraries/haskell/directory-tree {};
 
   distributedStatic = callPackage ../development/libraries/haskell/distributed-static {};

From 903e273afb5718fff3974b4b39ac06b109b7b55d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 31 Aug 2014 13:24:18 +0200
Subject: [PATCH 0999/1453] haskell-scotty: update to version 0.9.0

---
 .../development/libraries/haskell/scotty/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/scotty/default.nix b/pkgs/development/libraries/haskell/scotty/default.nix
index 91876f7e3187..6dfbb25def7a 100644
--- a/pkgs/development/libraries/haskell/scotty/default.nix
+++ b/pkgs/development/libraries/haskell/scotty/default.nix
@@ -1,20 +1,20 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, aeson, blazeBuilder, caseInsensitive, conduit, dataDefault
-, hspec, httpTypes, liftedBase, monadControl, mtl, regexCompat
+{ cabal, aeson, blazeBuilder, caseInsensitive, dataDefault, hspec2
+, hspecWai, httpTypes, liftedBase, monadControl, mtl, regexCompat
 , text, transformers, transformersBase, wai, waiExtra, warp
 }:
 
 cabal.mkDerivation (self: {
   pname = "scotty";
-  version = "0.8.2";
-  sha256 = "07vjdj26380inlyi350mdifm7v1dpbc56041vi2czf5zzhx97qb0";
+  version = "0.9.0";
+  sha256 = "0gx00k5w4cs68bh3ciplkwhzh2412y6wqg0qdsslnnsb41l5kb1d";
   buildDepends = [
-    aeson blazeBuilder caseInsensitive conduit dataDefault httpTypes
+    aeson blazeBuilder caseInsensitive dataDefault httpTypes
     monadControl mtl regexCompat text transformers transformersBase wai
     waiExtra warp
   ];
-  testDepends = [ hspec httpTypes liftedBase wai waiExtra ];
+  testDepends = [ hspec2 hspecWai httpTypes liftedBase text wai ];
   jailbreak = true;
   meta = {
     homepage = "https://github.com/scotty-web/scotty";

From 7910aef42c9652d5c53c20c284cf13a3a06f80a7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 31 Aug 2014 13:29:39 +0200
Subject: [PATCH 1000/1453] haskell-llvm-general: update to version 3.4.4.x

---
 .../llvm-general-pure/{3.4.2.2.nix => 3.4.4.0.nix}     |  4 ++--
 .../haskell/llvm-general/{3.4.2.2.nix => 3.4.4.0.nix}  |  4 ++--
 pkgs/top-level/haskell-packages.nix                    | 10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)
 rename pkgs/development/libraries/haskell/llvm-general-pure/{3.4.2.2.nix => 3.4.4.0.nix} (87%)
 rename pkgs/development/libraries/haskell/llvm-general/{3.4.2.2.nix => 3.4.4.0.nix} (89%)

diff --git a/pkgs/development/libraries/haskell/llvm-general-pure/3.4.2.2.nix b/pkgs/development/libraries/haskell/llvm-general-pure/3.4.4.0.nix
similarity index 87%
rename from pkgs/development/libraries/haskell/llvm-general-pure/3.4.2.2.nix
rename to pkgs/development/libraries/haskell/llvm-general-pure/3.4.4.0.nix
index c8601d844ca1..cd92b67b16aa 100644
--- a/pkgs/development/libraries/haskell/llvm-general-pure/3.4.2.2.nix
+++ b/pkgs/development/libraries/haskell/llvm-general-pure/3.4.4.0.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "llvm-general-pure";
-  version = "3.4.2.2";
-  sha256 = "0grbw0lamp0w4jzxg97jccl3jqdgqfgldpb4llvhr1l70591b0s8";
+  version = "3.4.4.0";
+  sha256 = "0x43yfcss3f5v5mlzyv7d13fvajbdgv4cmkx5yx1904xsiddg27v";
   buildDepends = [ mtl parsec setenv transformers ];
   testDepends = [
     HUnit mtl QuickCheck testFramework testFrameworkHunit
diff --git a/pkgs/development/libraries/haskell/llvm-general/3.4.2.2.nix b/pkgs/development/libraries/haskell/llvm-general/3.4.4.0.nix
similarity index 89%
rename from pkgs/development/libraries/haskell/llvm-general/3.4.2.2.nix
rename to pkgs/development/libraries/haskell/llvm-general/3.4.4.0.nix
index 25993bb9fd00..aec66b12723b 100644
--- a/pkgs/development/libraries/haskell/llvm-general/3.4.2.2.nix
+++ b/pkgs/development/libraries/haskell/llvm-general/3.4.4.0.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "llvm-general";
-  version = "3.4.2.2";
-  sha256 = "1dqdvv8pslblavyi14xy0bgrr1ca8d1jqp60x16zgbzkk3f2jx6a";
+  version = "3.4.4.0";
+  sha256 = "10x7qb2svw0gz0sqf4vn14hpzks3rk29g4i2pzfdi5qk11j8jd9b";
   buildDepends = [
     llvmGeneralPure mtl parsec setenv transformers utf8String
   ];
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index c4798a6cbae0..2fe4a7ee829b 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1512,14 +1512,14 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
     llvmConfig = pkgs.llvm_33;
     llvmGeneralPure = self.llvmGeneralPure_3_3_8_2;
   };
-  llvmGeneral_3_4_2_2 = callPackage ../development/libraries/haskell/llvm-general/3.4.2.2.nix {
+  llvmGeneral_3_4_4_0 = callPackage ../development/libraries/haskell/llvm-general/3.4.4.0.nix {
     llvmConfig = pkgs.llvm;
   };
-  llvmGeneral = self.llvmGeneral_3_4_2_2;
+  llvmGeneral = self.llvmGeneral_3_4_4_0;
 
-  llvmGeneralPure_3_3_8_2 = callPackage ../development/libraries/haskell/llvm-general-pure/3.3.8.2.nix { };
-  llvmGeneralPure_3_4_2_2 = callPackage ../development/libraries/haskell/llvm-general-pure/3.4.2.2.nix {};
-  llvmGeneralPure = self.llvmGeneralPure_3_4_2_2;
+  llvmGeneralPure_3_3_8_2 = callPackage ../development/libraries/haskell/llvm-general-pure/3.3.8.2.nix {};
+  llvmGeneralPure_3_4_4_0 = callPackage ../development/libraries/haskell/llvm-general-pure/3.4.4.0.nix {};
+  llvmGeneralPure = self.llvmGeneralPure_3_4_4_0;
 
   lrucache = callPackage ../development/libraries/haskell/lrucache {};
 

From 544eceebf491fe00bbaabe20fb0c616653acc2bf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 31 Aug 2014 13:29:48 +0200
Subject: [PATCH 1001/1453] haskell-packages.nix: cosmetic

---
 pkgs/top-level/haskell-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 2fe4a7ee829b..50ca0b97637f 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -775,7 +775,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   eventList = callPackage ../development/libraries/haskell/event-list {};
 
-  exPool = callPackage ../development/libraries/haskell/ex-pool { };
+  exPool = callPackage ../development/libraries/haskell/ex-pool {};
 
   exceptionMtl = callPackage ../development/libraries/haskell/exception-mtl {};
 
@@ -1737,7 +1737,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   networkProtocolXmpp = callPackage ../development/libraries/haskell/network-protocol-xmpp {};
 
-  networkSimple = callPackage ../development/libraries/haskell/network-simple { };
+  networkSimple = callPackage ../development/libraries/haskell/network-simple {};
 
   networkTransport = callPackage ../development/libraries/haskell/network-transport {};
 
@@ -2971,7 +2971,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   pointful = callPackage ../development/tools/haskell/pointful {};
 
-  ShellCheck = callPackage ../development/tools/misc/ShellCheck { };
+  ShellCheck = callPackage ../development/tools/misc/ShellCheck {};
 
   SourceGraph = callPackage ../development/tools/haskell/SourceGraph {};
 

From fb16c61577aa86d59299253e90e758f805a8502d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 31 Aug 2014 13:37:13 +0200
Subject: [PATCH 1002/1453] haskell-scotty: disable test suite to break
 infinite recursion with hspec-wai

---
 pkgs/development/libraries/haskell/scotty/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/scotty/default.nix b/pkgs/development/libraries/haskell/scotty/default.nix
index 6dfbb25def7a..4985f09b38ee 100644
--- a/pkgs/development/libraries/haskell/scotty/default.nix
+++ b/pkgs/development/libraries/haskell/scotty/default.nix
@@ -16,6 +16,7 @@ cabal.mkDerivation (self: {
   ];
   testDepends = [ hspec2 hspecWai httpTypes liftedBase text wai ];
   jailbreak = true;
+  doCheck = false;
   meta = {
     homepage = "https://github.com/scotty-web/scotty";
     description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp";

From 807e68c8c0af6361676b1868c85e2ada56593478 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 31 Aug 2014 13:44:55 +0200
Subject: [PATCH 1003/1453] haskell-binary-conduit: jailbreak to fix build with
 conduit 1.2.x

---
 pkgs/development/libraries/haskell/binary-conduit/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/binary-conduit/default.nix b/pkgs/development/libraries/haskell/binary-conduit/default.nix
index 37774c1a16af..848004ca6afd 100644
--- a/pkgs/development/libraries/haskell/binary-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/binary-conduit/default.nix
@@ -12,6 +12,7 @@ cabal.mkDerivation (self: {
   testDepends = [
     binary conduit hspec QuickCheck quickcheckAssertions resourcet
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://github.com/qnikst/binary-conduit";
     description = "data serialization/deserialization conduit library";

From c3c03a0cdb4ec707756c1b64c0538d20d605faf7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 31 Aug 2014 18:16:39 +0200
Subject: [PATCH 1004/1453] haskell-hakyll: jailbreak to fix build with
 pandoc-citeproc 0.5

---
 pkgs/development/libraries/haskell/hakyll/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix
index e38eadad0575..7ebc0de734a3 100644
--- a/pkgs/development/libraries/haskell/hakyll/default.nix
+++ b/pkgs/development/libraries/haskell/hakyll/default.nix
@@ -27,6 +27,9 @@ cabal.mkDerivation (self: {
     snapCore snapServer systemFilepath tagsoup testFramework
     testFrameworkHunit testFrameworkQuickcheck2 text time utillinux
   ];
+  patchPhase = ''
+    sed -i -e 's|pandoc-citeproc .*,|pandoc-citeproc,|' hakyll.cabal
+  '';
   meta = {
     homepage = "http://jaspervdj.be/hakyll";
     description = "A static website compiler library";

From a1814ea2b093f9d6579dd43ace5549e61c035fa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 31 Aug 2014 18:33:31 +0200
Subject: [PATCH 1005/1453] pinfo: resurrect, update, add meta

---
 pkgs/applications/misc/pinfo/default.nix | 27 +++++++++++++++++-------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/misc/pinfo/default.nix b/pkgs/applications/misc/pinfo/default.nix
index d8dba39ccb56..658ff410d379 100644
--- a/pkgs/applications/misc/pinfo/default.nix
+++ b/pkgs/applications/misc/pinfo/default.nix
@@ -1,12 +1,23 @@
-{stdenv, fetchurl, ncurses, readline}:
+{ stdenv, fetchurl, autoreconfHook, gettext, texinfo, ncurses, readline }:
 
 stdenv.mkDerivation {
-  name = "pinfo-0.6.9";
-  src = fetchurl {
-    url = https://alioth.debian.org/frs/download.php/1498/pinfo-0.6.9.tar.bz2;
-    sha256 = "1rbsz1y7nyz6ax9xfkw5wk6pnrhvwz2xcm0wnfnk4sb2wwq760q3";
-  };
-  buildInputs = [ncurses readline];
+  name = "pinfo-0.6.10";
 
-  configureFlags = "--with-curses=${ncurses} --with-readline=${readline}";
+  src = fetchurl {
+    # homepage needed you to login to download the tarball
+    url = "http://pkgs.fedoraproject.org/repo/pkgs/pinfo/pinfo-0.6.10.tar.bz2"
+      + "/fe3d3da50371b1773dfe29bf870dbc5b/pinfo-0.6.10.tar.bz2";
+    sha256 = "0p8wyrpz9npjcbx6c973jspm4c3xz4zxx939nngbq49xqah8088j";
+  };
+
+  buildInputs = [ autoreconfHook gettext texinfo ncurses readline ];
+
+  configureFlags = [ "--with-curses=${ncurses}" "--with-readline=${readline}" ];
+
+  meta = with stdenv.lib; {
+    description = "A viewer for info files";
+    homepage = https://alioth.debian.org/projects/pinfo/;
+    license = licenses.gpl2Plus;
+  };
 }
+

From 8152e66da54cd99e45ae4aa0001e879357677214 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 31 Aug 2014 20:21:45 +0400
Subject: [PATCH 1006/1453] update dd_rescue

---
 pkgs/tools/system/dd_rescue/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/dd_rescue/default.nix b/pkgs/tools/system/dd_rescue/default.nix
index 9c7f04134210..7b3e62a1bc03 100644
--- a/pkgs/tools/system/dd_rescue/default.nix
+++ b/pkgs/tools/system/dd_rescue/default.nix
@@ -1,10 +1,11 @@
 { stdenv, fetchurl, autoconf }:
 
 stdenv.mkDerivation rec {
-  name = "dd_rescue-1.42.1";
+  version = "1.46";
+  name = "dd_rescue-${version}";
 
   src = fetchurl {
-    sha256 = "0g2d292m1cnp8syy19hh5jvly3zy7lcvcj563wgjnf20ppm2diaq";
+    sha256 = "1fhs4jl5pkyn4aq75fxczrgnsj2m0kz9hfa7dhxy93vp7xcba2cy";
     url="http://www.garloff.de/kurt/linux/ddrescue/${name}.tar.gz";
   };
 
@@ -33,5 +34,8 @@ stdenv.mkDerivation rec {
     description = "A tool to copy data from a damaged block device";
     maintainers = with maintainers; [ raskin iElectric ];
     platforms = with platforms; linux;
+    downloadPage = "http://www.garloff.de/kurt/linux/ddrescue/";
+    inherit version;
+    updateWalker = true;
   };
 }

From c5168debe863a923d85fe156f535ef37b0841833 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 31 Aug 2014 20:42:00 +0400
Subject: [PATCH 1007/1453] Update eigen

---
 pkgs/development/libraries/eigen/default.nix      | 11 ++++++-----
 pkgs/development/libraries/eigen/default.upstream |  4 ++++
 2 files changed, 10 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/development/libraries/eigen/default.upstream

diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix
index 72a140ed3711..c66509284582 100644
--- a/pkgs/development/libraries/eigen/default.nix
+++ b/pkgs/development/libraries/eigen/default.nix
@@ -1,15 +1,15 @@
 {stdenv, fetchurl, cmake}:
 
 let
-  v = "3.2.1";
+  version = "3.2.2";
 in
 stdenv.mkDerivation {
-  name = "eigen-${v}";
+  name = "eigen-${version}";
   
   src = fetchurl {
-    url = "http://bitbucket.org/eigen/eigen/get/${v}.tar.bz2";
-    name = "eigen-${v}.tar.bz2";
-    sha256 = "12ljdirih9n3cf8hy00in285c2ccah7mgalmmr8gc3ldwznz5rk6";
+    url = "http://bitbucket.org/eigen/eigen/get/${version}.tar.bz2";
+    name = "eigen-${version}.tar.bz2";
+    sha256 = "0pwykjkz5n8wfyg9cjj7smgs54a9zc80m9gi106w43n2m72ni39i";
   };
   
   nativeBuildInputs = [ cmake ];
@@ -19,5 +19,6 @@ stdenv.mkDerivation {
     license = licenses.lgpl3Plus;
     homepage = http://eigen.tuxfamily.org ;
     maintainers = with stdenv.lib.maintainers; [ sander urkud raskin ];
+    inherit version;
   };
 }
diff --git a/pkgs/development/libraries/eigen/default.upstream b/pkgs/development/libraries/eigen/default.upstream
new file mode 100644
index 000000000000..c0c05efc466c
--- /dev/null
+++ b/pkgs/development/libraries/eigen/default.upstream
@@ -0,0 +1,4 @@
+url http://eigen.tuxfamily.org/
+ensure_choice
+version '.*/([-0-9.]+)[.]tar[.].*' '\1'
+do_overwrite() { do_overwrite_just_version; }

From 0667d67c9540604738c8d5c5a5c872e70bcf2b3b Mon Sep 17 00:00:00 2001
From: Sam Griffin <sam.griffin@gmail.com>
Date: Wed, 20 Aug 2014 22:57:41 -0400
Subject: [PATCH 1008/1453] Adding vpnc configuration module

---
 nixos/modules/config/vpnc.nix | 41 +++++++++++++++++++++++++++++++++++
 nixos/modules/module-list.nix |  1 +
 2 files changed, 42 insertions(+)
 create mode 100644 nixos/modules/config/vpnc.nix

diff --git a/nixos/modules/config/vpnc.nix b/nixos/modules/config/vpnc.nix
new file mode 100644
index 000000000000..956a4c7d3fdb
--- /dev/null
+++ b/nixos/modules/config/vpnc.nix
@@ -0,0 +1,41 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.networking.vpnc;
+  mkServiceDef = name: value:
+    {
+      source = builtins.toFile "${name}.conf" value;
+      target = "vpnc/${name}.conf";
+    };
+
+in
+{
+  options = {
+    networking.vpnc = {
+      services = mkOption {
+       type = types.attrsOf types.str;
+       default = [];
+       example = {
+         test = 
+          ''
+           IPSec gateway 192.168.1.1 
+           IPSec ID someID
+           IPSec secret secretKey
+           Xauth username name
+           Xauth password pass
+          '';
+       };
+       description = 
+         ''
+           The names of cisco VPNs and their associated definitions
+         '';
+      };
+    };
+  };
+
+  config.environment.etc = mapAttrsToList mkServiceDef cfg.services;
+}
+
+
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 6754c8a4f1a6..297ca0d1be44 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -21,6 +21,7 @@
   ./config/system-environment.nix
   ./config/system-path.nix
   ./config/timezone.nix
+  ./config/vpnc.nix
   ./config/unix-odbc-drivers.nix
   ./config/users-groups.nix
   ./config/zram.nix

From 655e5c01b4754c73d323cd8ad1b7671875e6d4f0 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 31 Aug 2014 20:44:17 +0400
Subject: [PATCH 1009/1453] Oops; a mistake with src

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

diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix
index c66509284582..14308dc0eb05 100644
--- a/pkgs/development/libraries/eigen/default.nix
+++ b/pkgs/development/libraries/eigen/default.nix
@@ -7,8 +7,8 @@ stdenv.mkDerivation {
   name = "eigen-${version}";
   
   src = fetchurl {
-    url = "http://bitbucket.org/eigen/eigen/get/${version}.tar.bz2";
-    name = "eigen-${version}.tar.bz2";
+    url = "http://bitbucket.org/eigen/eigen/get/${version}.tar.gz";
+    name = "eigen-${version}.tar.gz";
     sha256 = "0pwykjkz5n8wfyg9cjj7smgs54a9zc80m9gi106w43n2m72ni39i";
   };
   

From 3d037ebb94f7c28dc7019a3332bf5d27f2cd9ebb Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 31 Aug 2014 09:46:16 -0700
Subject: [PATCH 1010/1453] Revert "Revert "Merge pull request #3182 from
 wkennington/master.ipv6""

This reverts commit ea8910652fcecbcd4f21aa1c66b1a0a239408b04.
---
 .../doc/manual/configuration/ipv4-config.xml  |   5 +-
 nixos/lib/build-vms.nix                       |  11 +-
 nixos/modules/programs/virtualbox.nix         |   2 +-
 nixos/modules/services/networking/dhcpcd.nix  |   2 +-
 nixos/modules/tasks/network-interfaces.nix    | 151 +++++++++++++-----
 nixos/tests/bittorrent.nix                    |   6 +-
 nixos/tests/nat.nix                           |   2 +-
 7 files changed, 120 insertions(+), 59 deletions(-)

diff --git a/nixos/doc/manual/configuration/ipv4-config.xml b/nixos/doc/manual/configuration/ipv4-config.xml
index e2c51518349d..053501b1736d 100644
--- a/nixos/doc/manual/configuration/ipv4-config.xml
+++ b/nixos/doc/manual/configuration/ipv4-config.xml
@@ -12,12 +12,9 @@ interfaces.  However, you can configure an interface manually as
 follows:
 
 <programlisting>
-networking.interfaces.eth0 = { ipAddress = "192.168.1.2"; prefixLength = 24; };
+networking.interfaces.eth0.ip4 = [ { address = "192.168.1.2"; prefixLength = 24; } ];
 </programlisting>
 
-(The network prefix can also be specified using the option
-<literal>subnetMask</literal>,
-e.g. <literal>"255.255.255.0"</literal>, but this is deprecated.)
 Typically you’ll also want to set a default gateway and set of name
 servers:
 
diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix
index 498c0a377836..ba1895554096 100644
--- a/nixos/lib/build-vms.nix
+++ b/nixos/lib/build-vms.nix
@@ -48,10 +48,11 @@ rec {
             let
               interfacesNumbered = zipTwoLists config.virtualisation.vlans (range 1 255);
               interfaces = flip map interfacesNumbered ({ first, second }:
-                nameValuePair "eth${toString second}"
-                  { ipAddress = "192.168.${toString first}.${toString m.second}";
-                    subnetMask = "255.255.255.0";
-                  });
+                nameValuePair "eth${toString second}" { ip4 =
+                  [ { address = "192.168.${toString first}.${toString m.second}";
+                      prefixLength = 24;
+                  } ];
+                }
             in
             { key = "ip-address";
               config =
@@ -60,7 +61,7 @@ rec {
                   networking.interfaces = listToAttrs interfaces;
 
                   networking.primaryIPAddress =
-                    optionalString (interfaces != []) (head interfaces).value.ipAddress;
+                    optionalString (interfaces != []) (head (head interfaces).value.ip4).address;
 
                   # Put the IP addresses of all VMs in this machine's
                   # /etc/hosts file.  If a machine has multiple
diff --git a/nixos/modules/programs/virtualbox.nix b/nixos/modules/programs/virtualbox.nix
index e2dd76219eb0..fec1a7b61f32 100644
--- a/nixos/modules/programs/virtualbox.nix
+++ b/nixos/modules/programs/virtualbox.nix
@@ -44,5 +44,5 @@ let virtualbox = config.boot.kernelPackages.virtualbox; in
         '';
     };
 
-  networking.interfaces.vboxnet0 = { ipAddress = "192.168.56.1"; prefixLength = 24; };
+  networking.interfaces.vboxnet0.ip4 = [ { address = "192.168.56.1"; prefixLength = 24; } ];
 }
diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix
index 89aa9bdb6b68..7e0b00a3d7b5 100644
--- a/nixos/modules/services/networking/dhcpcd.nix
+++ b/nixos/modules/services/networking/dhcpcd.nix
@@ -11,7 +11,7 @@ let
   # Don't start dhcpcd on explicitly configured interfaces or on
   # interfaces that are part of a bridge, bond or sit device.
   ignoredInterfaces =
-    map (i: i.name) (filter (i: i.ipAddress != null) (attrValues config.networking.interfaces))
+    map (i: i.name) (filter (i: i.ip4 != [ ] || i.ipAddress != null) (attrValues config.networking.interfaces))
     ++ mapAttrsToList (i: _: i) config.networking.sits
     ++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.bridges))
     ++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.bonds))
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 7dabe70f00c4..ac3a55332e4e 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -10,6 +10,26 @@ let
   hasSits = cfg.sits != { };
   hasBonds = cfg.bonds != { };
 
+  addrOpts = v:
+    assert v == 4 || v == 6;
+    {
+      address = mkOption {
+        type = types.str;
+        description = ''
+          IPv${toString v} address of the interface.  Leave empty to configure the
+          interface using DHCP.
+        '';
+      };
+
+      prefixLength = mkOption {
+        type = types.addCheck types.int (n: n >= 0 && n <= (if v == 4 then 32 else 128));
+        description = ''
+          Subnet mask of the interface, specified as the number of
+          bits in the prefix (<literal>${if v == 4 then "24" else "64"}</literal>).
+        '';
+      };
+    };
+
   interfaceOpts = { name, ... }: {
 
     options = {
@@ -20,10 +40,36 @@ let
         description = "Name of the interface.";
       };
 
+      ip4 = mkOption {
+        default = [ ];
+        example = [
+          { address = "10.0.0.1"; prefixLength = 16; }
+          { address = "192.168.1.1"; prefixLength = 24; }
+        ];
+        type = types.listOf types.optionSet;
+        options = addrOpts 4;
+        description = ''
+          List of IPv4 addresses that will be statically assigned to the interface.
+        '';
+      };
+
+      ip6 = mkOption {
+        default = [ ];
+        example = [
+          { address = "fdfd:b3f0:482::1"; prefixLength = 48; }
+          { address = "2001:1470:fffd:2098::e006"; prefixLength = 64; }
+        ];
+        type = types.listOf types.optionSet;
+        options = addrOpts 6;
+        description = ''
+          List of IPv6 addresses that will be statically assigned to the interface.
+        '';
+      };
+
       ipAddress = mkOption {
         default = null;
         example = "10.0.0.1";
-        type = types.nullOr (types.str);
+        type = types.nullOr types.str;
         description = ''
           IP address of the interface.  Leave empty to configure the
           interface using DHCP.
@@ -41,20 +87,16 @@ let
       };
 
       subnetMask = mkOption {
-        default = "";
-        example = "255.255.255.0";
-        type = types.str;
+        default = null;
         description = ''
-          Subnet mask of the interface, specified as a bitmask.
-          This is deprecated; use <option>prefixLength</option>
-          instead.
+          Defunct, supply the prefix length instead.
         '';
       };
 
       ipv6Address = mkOption {
         default = null;
         example = "2001:1470:fffd:2098::e006";
-        type = types.nullOr types.string;
+        type = types.nullOr types.str;
         description = ''
           IPv6 address of the interface.  Leave empty to configure the
           interface using NDP.
@@ -224,10 +266,10 @@ in
     networking.interfaces = mkOption {
       default = {};
       example =
-        { eth0 = {
-            ipAddress = "131.211.84.78";
-            subnetMask = "255.255.255.128";
-          };
+        { eth0.ip4 = [ {
+            address = "131.211.84.78";
+            prefixLength = 25;
+          } ];
         };
       description = ''
         The configuration for each network interface.  If
@@ -438,6 +480,12 @@ in
 
   config = {
 
+    assertions =
+      flip map interfaces (i: {
+        assertion = i.subnetMask == null;
+        message = "The networking.interfaces.${i.name}.subnetMask option is defunct. Use prefixLength instead.";
+      });
+
     boot.kernelModules = [ ]
       ++ optional cfg.enableIPv6 "ipv6"
       ++ optional hasVirtuals "tun"
@@ -534,12 +582,18 @@ in
         # network device, so it only gets started after the interface
         # has appeared, and it's stopped when the interface
         # disappears.
-        configureInterface = i: nameValuePair "${i.name}-cfg"
-          (let mask =
-                if i.prefixLength != null then toString i.prefixLength else
-                if i.subnetMask != "" then i.subnetMask else "32";
-               staticIPv6 = cfg.enableIPv6 && i.ipv6Address != null;
+        configureInterface = i:
+          let
+            ips = i.ip4 ++ optionals cfg.enableIPv6 i.ip6
+              ++ optional (i.ipAddress != null) {
+                ipAddress = i.ipAddress;
+                prefixLength = i.prefixLength;
+              } ++ optional (cfg.enableIPv6 && i.ipv6Address != null) {
+                ipAddress = i.ipv6Address;
+                prefixLength = i.ipv6PrefixLength;
+              };
           in
+          nameValuePair "${i.name}-cfg"
           { description = "Configuration of ${i.name}";
             wantedBy = [ "network-interfaces.target" ];
             bindsTo = [ "sys-subsystem-net-devices-${i.name}.device" ];
@@ -562,36 +616,32 @@ in
                   echo "setting MTU to ${toString i.mtu}..."
                   ip link set "${i.name}" mtu "${toString i.mtu}"
                 ''
-              + optionalString (i.ipAddress != null)
+
+              # Ip Setup
+              +
                 ''
-                  cur=$(ip -4 -o a show dev "${i.name}" | awk '{print $4}')
-                  # Only do a flush/add if it's necessary.  This is
+                  curIps=$(ip -o a show dev "${i.name}" | awk '{print $4}')
+                  # Only do an add if it's necessary.  This is
                   # useful when the Nix store is accessed via this
                   # interface (e.g. in a QEMU VM test).
-                  if [ "$cur" != "${i.ipAddress}/${mask}" ]; then
-                    echo "configuring interface..."
-                    ip -4 addr flush dev "${i.name}"
-                    ip -4 addr add "${i.ipAddress}/${mask}" dev "${i.name}"
-                    restart_network_setup=true
-                  else
-                    echo "skipping configuring interface"
+                ''
+              + flip concatMapStrings (ips) (ip:
+                let
+                  address = "${ip.address}/${toString ip.prefixLength}";
+                in
+                ''
+                  echo "checking ip ${address}..."
+                  if ! echo "$curIps" | grep "${address}" >/dev/null 2>&1; then
+                    if out=$(ip addr add "${address}" dev "${i.name}" 2>&1); then
+                      echo "added ip ${address}..."
+                      restart_network_setup=true
+                    elif ! echo "$out" | grep "File exists" >/dev/null 2>&1; then
+                      echo "failed to add ${address}"
+                      exit 1
+                    fi
                   fi
-                ''
-              + optionalString (staticIPv6)
-                ''
-                  # Only do a flush/add if it's necessary.  This is
-                  # useful when the Nix store is accessed via this
-                  # interface (e.g. in a QEMU VM test).
-                  if ! ip -6 -o a show dev "${i.name}" | grep "${i.ipv6Address}/${toString i.ipv6prefixLength}"; then
-                    echo "configuring interface..."
-                    ip -6 addr flush dev "${i.name}"
-                    ip -6 addr add "${i.ipv6Address}/${toString i.ipv6prefixLength}" dev "${i.name}"
-                    restart_network_setup=true
-                  else
-                    echo "skipping configuring interface"
-                  fi
-                ''
-              + optionalString (i.ipAddress != null || staticIPv6)
+                '')
+              + optionalString (ips != [ ])
                 ''
                   if [ restart_network_setup = true ]; then
                     # Ensure that the default gateway remains set.
@@ -608,7 +658,20 @@ in
                 ''
                   echo 1 > /proc/sys/net/ipv6/conf/${i.name}/proxy_ndp
                 '';
-          });
+            preStop =
+              ''
+                echo "releasing configured ip's..."
+              ''
+              + flip concatMapStrings (ips) (ip:
+                let
+                  address = "${ip.address}/${toString ip.prefixLength}";
+                in
+                ''
+                  echo -n "Deleting ${address}..."
+                  ip addr del "${address}" dev "${i.name}" >/dev/null 2>&1 || echo -n " Failed"
+                  echo ""
+                '');
+          };
 
         createTunDevice = i: nameValuePair "${i.name}"
           { description = "Virtual Network Interface ${i.name}";
diff --git a/nixos/tests/bittorrent.nix b/nixos/tests/bittorrent.nix
index 002e012f65f0..7eb9c215ee1c 100644
--- a/nixos/tests/bittorrent.nix
+++ b/nixos/tests/bittorrent.nix
@@ -16,7 +16,7 @@ let
   miniupnpdConf = nodes: pkgs.writeText "miniupnpd.conf"
     ''
       ext_ifname=eth1
-      listening_ip=${nodes.router.config.networking.interfaces.eth2.ipAddress}/24
+      listening_ip=${(head nodes.router.config.networking.interfaces.eth2.ip4).address}/24
       allow 1024-65535 192.168.2.0/24 1024-65535
     '';
 
@@ -53,7 +53,7 @@ in
         { environment.systemPackages = [ pkgs.transmission ];
           virtualisation.vlans = [ 2 ];
           networking.defaultGateway =
-            nodes.router.config.networking.interfaces.eth2.ipAddress;
+            (head nodes.router.config.networking.interfaces.eth2.ip4).address;
           networking.firewall.enable = false;
         };
 
@@ -81,7 +81,7 @@ in
       # Create the torrent.
       $tracker->succeed("mkdir /tmp/data");
       $tracker->succeed("cp ${file} /tmp/data/test.tar.bz2");
-      $tracker->succeed("transmission-create /tmp/data/test.tar.bz2 -t http://${nodes.tracker.config.networking.interfaces.eth1.ipAddress}:6969/announce -o /tmp/test.torrent");
+      $tracker->succeed("transmission-create /tmp/data/test.tar.bz2 -t http://${(head nodes.tracker.config.networking.interfaces.eth1.ip4).address}:6969/announce -o /tmp/test.torrent");
       $tracker->succeed("chmod 644 /tmp/test.torrent");
 
       # Start the tracker.  !!! use a less crappy tracker
diff --git a/nixos/tests/nat.nix b/nixos/tests/nat.nix
index 5fdcc0e97ca9..5a57cce6b678 100644
--- a/nixos/tests/nat.nix
+++ b/nixos/tests/nat.nix
@@ -13,7 +13,7 @@ import ./make-test.nix {
         { virtualisation.vlans = [ 1 ];
           networking.firewall.allowPing = true;
           networking.defaultGateway =
-            nodes.router.config.networking.interfaces.eth2.ipAddress;
+            (head nodes.router.config.networking.interfaces.eth2.ip4).address;
         };
 
       router =

From 9a697d775adae3524a5ee214644c637c272ffc41 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 31 Aug 2014 09:46:26 -0700
Subject: [PATCH 1011/1453] Revert "Revert "Fix syntax error in
 nixos/lib/build-vms.nix, introduced by 86c0f8c""

This reverts commit 2f697bf6931b24cdd428e22effbf6427a85afd42.
---
 nixos/lib/build-vms.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix
index ba1895554096..50b3b424166b 100644
--- a/nixos/lib/build-vms.nix
+++ b/nixos/lib/build-vms.nix
@@ -52,7 +52,7 @@ rec {
                   [ { address = "192.168.${toString first}.${toString m.second}";
                       prefixLength = 24;
                   } ];
-                }
+                });
             in
             { key = "ip-address";
               config =

From 02ecc98e87dd35afe5a07299a9d0674ed1533ace Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 31 Aug 2014 09:47:18 -0700
Subject: [PATCH 1012/1453] nixos/network-interfaces: Fix bug in converting old
 ipAddresses

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

diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index ac3a55332e4e..2adb4bcfabab 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -586,10 +586,10 @@ in
           let
             ips = i.ip4 ++ optionals cfg.enableIPv6 i.ip6
               ++ optional (i.ipAddress != null) {
-                ipAddress = i.ipAddress;
+                address = i.ipAddress;
                 prefixLength = i.prefixLength;
               } ++ optional (cfg.enableIPv6 && i.ipv6Address != null) {
-                ipAddress = i.ipv6Address;
+                address = i.ipv6Address;
                 prefixLength = i.ipv6PrefixLength;
               };
           in

From ec8e4d23f11132e2433fcb4d976f646b3164bf61 Mon Sep 17 00:00:00 2001
From: Sam Griffin <sam.griffin@gmail.com>
Date: Sun, 31 Aug 2014 13:00:54 -0400
Subject: [PATCH 1013/1453] cleanup per Lethalman's suggestions

---
 nixos/modules/config/vpnc.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/config/vpnc.nix b/nixos/modules/config/vpnc.nix
index 956a4c7d3fdb..e79e4d1c20f8 100644
--- a/nixos/modules/config/vpnc.nix
+++ b/nixos/modules/config/vpnc.nix
@@ -6,8 +6,8 @@ let
   cfg = config.networking.vpnc;
   mkServiceDef = name: value:
     {
-      source = builtins.toFile "${name}.conf" value;
-      target = "vpnc/${name}.conf";
+      name = "vpnc/${name}.conf";
+      value = { text = value; };
     };
 
 in
@@ -35,7 +35,7 @@ in
     };
   };
 
-  config.environment.etc = mapAttrsToList mkServiceDef cfg.services;
+  config.environment.etc = mapAttrs' mkServiceDef cfg.services;
 }
 
 

From eb66d3654fe5b3aa2696fe8e9862e1a382069d84 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 31 Aug 2014 21:08:56 +0400
Subject: [PATCH 1014/1453] Update and adopt LVM2.

---
 pkgs/os-specific/linux/lvm2/default.nix      | 11 +++++++----
 pkgs/os-specific/linux/lvm2/default.upstream |  4 ++++
 2 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/os-specific/linux/lvm2/default.upstream

diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix
index 9e2b0c900794..96f8dbf57841 100644
--- a/pkgs/os-specific/linux/lvm2/default.nix
+++ b/pkgs/os-specific/linux/lvm2/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl, pkgconfig, udev, utillinux, coreutils }:
 
 let
-  v = "2.02.106";
+  version = "2.02.110";
 in
 
 stdenv.mkDerivation {
-  name = "lvm2-${v}";
+  name = "lvm2-${version}";
 
   src = fetchurl {
-    url = "ftp://sources.redhat.com/pub/lvm2/releases/LVM2.${v}.tgz";
-    sha256 = "0nr833bl0q4zq52drjxmmpf7bs6kqxwa5kahwwxm9411khkxz0vc";
+    url = "ftp://sources.redhat.com/pub/lvm2/releases/LVM2.${version}.tgz";
+    sha256 = "04fdzvv5431d1i4p701zkm9kc50087q56k7l2l5l5f3i9ah1mb9x";
   };
 
   configureFlags =
@@ -54,5 +54,8 @@ stdenv.mkDerivation {
     homepage = http://sourceware.org/lvm2/;
     descriptions = "Tools to support Logical Volume Management (LVM) on Linux";
     platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [raskin];
+    inherit version;
+    downloadPage = "ftp://sources.redhat.com/pub/lvm2/";
   };
 }
diff --git a/pkgs/os-specific/linux/lvm2/default.upstream b/pkgs/os-specific/linux/lvm2/default.upstream
new file mode 100644
index 000000000000..1e5aaf5ab5cf
--- /dev/null
+++ b/pkgs/os-specific/linux/lvm2/default.upstream
@@ -0,0 +1,4 @@
+url ftp://sources.redhat.com/pub/lvm2/
+version_link '[.]tgz$'
+version '.*[^0-9.][^.]*[.]([0-9.]+)[.].*' '\1'
+do_overwrite () { do_overwrite_just_version; }

From 7c40939c3a15180926ae6d8be060c9adc5ef405d Mon Sep 17 00:00:00 2001
From: Dmitry Malikov <malikov.d.y@gmail.com>
Date: Sun, 31 Aug 2014 19:09:44 +0200
Subject: [PATCH 1015/1453] haskell-directory-layout: 0.7.4 -> 0.7.4.1, doCheck
 = true

---
 .../libraries/haskell/directory-layout/default.nix           | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/directory-layout/default.nix b/pkgs/development/libraries/haskell/directory-layout/default.nix
index 44f5a7635f6a..610b1a5ec63e 100644
--- a/pkgs/development/libraries/haskell/directory-layout/default.nix
+++ b/pkgs/development/libraries/haskell/directory-layout/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "directory-layout";
-  version = "0.7.4";
-  sha256 = "1nrbv9mzl817d6c494sxd4jg15winpp9624n84av9vdxb8x1n14d";
+  version = "0.7.4.1";
+  sha256 = "0hj7dfv5i2s1dk0rws2fg84crpxz1kgvrq68f373a6hwkbfhv89b";
   buildDepends = [
     commandQq filepath free hspec lens semigroups text transformers
     unorderedContainers
@@ -21,5 +21,4 @@ cabal.mkDerivation (self: {
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
   };
-  doCheck = false; # issue https://github.com/supki/directory-layout/issues/8
 })

From eecfa6d657380ec52d34017da0fde37332a182a8 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 31 Aug 2014 21:15:57 +0400
Subject: [PATCH 1016/1453] Enable dmeventd

---
 pkgs/os-specific/linux/lvm2/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix
index 96f8dbf57841..739b47bf91d0 100644
--- a/pkgs/os-specific/linux/lvm2/default.nix
+++ b/pkgs/os-specific/linux/lvm2/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   };
 
   configureFlags =
-    "--disable-readline --enable-udev_rules --enable-udev_sync --enable-pkgconfig --enable-applib";
+    "--disable-readline --enable-udev_rules --enable-udev_sync --enable-pkgconfig --enable-applib --enable-dmeventd --enable-cmdlib";
 
   buildInputs = [ pkgconfig udev ];
 

From 5f22bc48cdbe8e4e42f0f2cecfc3ea15b0742421 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 31 Aug 2014 21:16:07 +0400
Subject: [PATCH 1017/1453] Update dmraid

---
 pkgs/os-specific/linux/dmraid/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/dmraid/default.nix b/pkgs/os-specific/linux/dmraid/default.nix
index 35efa8533ab1..ec4621e69570 100644
--- a/pkgs/os-specific/linux/dmraid/default.nix
+++ b/pkgs/os-specific/linux/dmraid/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, devicemapper }:
 
 stdenv.mkDerivation rec {
-  name = "dmraid-1.0.0.rc15";
+  name = "dmraid-1.0.0.rc16";
 
   src = fetchurl {
     url = "http://people.redhat.com/~heinzm/sw/dmraid/src/old/${name}.tar.bz2";
-    sha256 = "01bcaq0sc329ghgj7f182xws7jgjpdc41bvris8fsiprnxc7511h";
+    sha256 = "0m92971gyqp61darxbiri6a48jz3wq3gkp8r2k39320z0i6w8jgq";
   };
 
   preConfigure = "cd */";

From 44d772d1e03dbfbd2d0125e9b574ce813819f3d2 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Sun, 31 Aug 2014 14:25:39 -0300
Subject: [PATCH 1018/1453] Stella 4.0: New Package

Stella is an Atari 2600 VCS emulator
---
 pkgs/misc/emulators/stella/default.nix | 37 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/misc/emulators/stella/default.nix

diff --git a/pkgs/misc/emulators/stella/default.nix b/pkgs/misc/emulators/stella/default.nix
new file mode 100644
index 000000000000..154a5d02a80a
--- /dev/null
+++ b/pkgs/misc/emulators/stella/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl
+, pkgconfig, SDL2
+}:
+
+stdenv.mkDerivation rec {
+
+  name = "stella-${version}";
+  version = "4.0";
+
+  src = fetchurl {
+    url = "http://downloads.sourceforge.net/project/stella/stella/${version}/${name}-src.tar.gz";
+    sha256 = "1j96sj2qflq3agb7fvb08ih3pxy8nsvlkwj40q3n00q9k884ad5w";
+  };
+
+  buildInputs = with stdenv.lib;
+  [ pkgconfig SDL2 ];
+
+  configureFlags = ''
+  '';
+
+  NIX_CFLAGS_COMPILE="";
+	
+  meta = with stdenv.lib; {
+    description = "An open-source Atari 2600 VCS emulator";
+    longDescription = ''
+    Stella is a multi-platform Atari 2600 VCS emulator released under
+    the GNU General Public License (GPL). Stella was originally
+    developed for Linux by Bradford W. Mott, and is currently
+    maintained by Stephen Anthony.
+    As of its 3.5 release, Stella is officialy donationware. 
+    '';
+    homepage = http://stella.sourceforge.net/;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.AndersonTorres ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2478d881182b..5ef7987a4762 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9709,6 +9709,8 @@ let
     conf = config.st.conf or null;
   };
 
+  stella = callPackage ../misc/emulators/stella { };
+  
   linuxstopmotion = callPackage ../applications/video/linuxstopmotion { };
 
   sweethome3d = recurseIntoAttrs (  (callPackage ../applications/misc/sweethome3d { })

From 14f417ce9b114da2507f792e92b05840fc605583 Mon Sep 17 00:00:00 2001
From: Dmitry Malikov <malikov.d.y@gmail.com>
Date: Sun, 31 Aug 2014 19:54:02 +0200
Subject: [PATCH 1019/1453] haskell-wordexp: add 0.2.0.0

---
 .../libraries/haskell/wordexp/default.nix        | 16 ++++++++++++++++
 pkgs/top-level/haskell-packages.nix              |  2 ++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/wordexp/default.nix

diff --git a/pkgs/development/libraries/haskell/wordexp/default.nix b/pkgs/development/libraries/haskell/wordexp/default.nix
new file mode 100644
index 000000000000..7d03b1adea54
--- /dev/null
+++ b/pkgs/development/libraries/haskell/wordexp/default.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, c2hs, semigroups }:
+
+cabal.mkDerivation (self: {
+  pname = "wordexp";
+  version = "0.2.0.0";
+  sha256 = "1hfpvzbyyh47ai166xyrhmhvg2shrqcswsfalwa16wab6hcg32ki";
+  buildDepends = [ semigroups ];
+  buildTools = [ c2hs ];
+  meta = {
+    description = "wordexp(3) wrappers";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 50ca0b97637f..b074a6ab48dd 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2753,6 +2753,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   word8 = callPackage ../development/libraries/haskell/word8 {};
 
+  wordexp = callPackage ../development/libraries/haskell/wordexp {};
+
   Workflow = callPackage ../development/libraries/haskell/Workflow {};
 
   wreq = callPackage ../development/libraries/haskell/wreq {};

From d1a8a8d76d16f756920fc2b84b64c0e1efba07e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 31 Aug 2014 20:02:41 +0200
Subject: [PATCH 1020/1453] pythonPackages.rainbowstream: 0.9.3 -> 0.9.5, fix
 build on py3k

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7b39b083eea6..57032cf2ec4d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4590,25 +4590,25 @@ rec {
 
   rainbowstream = buildPythonPackage rec {
     name = "rainbowstream-${version}";
-    version = "0.9.3";
+    version = "0.9.5";
 
     src = fetchurl {
       url    = "https://pypi.python.org/packages/source/r/rainbowstream/${name}.tar.gz";
-      sha256 = "1xgfxk3qwbfdl2fwabcppi43dxmv8pik0wb9jsbszwxz9xv3fcpk";
+      sha256 = "0v79xiihgsfjipxkzzi92l8y1f8vxxachpv71gyzyhxdsl2zfj57";
     };
 
     doCheck = false;
 
+    preBuild = ''
+      export LOCALE_ARCHIVE=${pkgs.glibcLocales}/lib/locale/locale-archive
+      export LC_ALL="en_US.UTF-8"
+    '';
+
     buildInputs = [
       pkgs.libjpeg pkgs.freetype pkgs.zlib
       pillow twitter pyfiglet requests arrow dateutil modules.readline
     ];
 
-    postInstall = ''
-      wrapProgram "$out/bin/rainbowstream" \
-        --prefix PYTHONPATH : "$PYTHONPATH"
-    '';
-
     meta = {
       description = "Streaming command-line twitter client";
       homepage    = "http://www.rainbowstream.org/";

From b1e388cefbf30872a9d9e567da0598c24e61027a Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Sun, 31 Aug 2014 19:26:05 +0100
Subject: [PATCH 1021/1453] agda-stdlib: update to 0.8.1

This is necessary after the Agda-2.4.2 bump
---
 pkgs/development/compilers/agda/stdlib.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/agda/stdlib.nix b/pkgs/development/compilers/agda/stdlib.nix
index 913ae5cd90fc..d0ae1394f894 100644
--- a/pkgs/development/compilers/agda/stdlib.nix
+++ b/pkgs/development/compilers/agda/stdlib.nix
@@ -2,11 +2,11 @@
 
 cabal.mkDerivation (self: rec {
   pname = "Agda-stdlib";
-  version = "0.8";
+  version = "0.8.1";
 
   src = fetchurl {
     url = "https://github.com/agda/agda-stdlib/archive/v${version}.tar.gz";
-    sha256 = "03gdcy2gar46qlmd6w91y05cm1x304ig6bda90ryww9qn05kif78";
+    sha256 = "0ij4rg4lk0pq01ing285gbmnn23dcf2rhihdcs8bbdpjg52vl4gf";
   };
 
   buildDepends = [ filemanip Agda ];

From 6b962e6e9e47f20f9dc4d3b2dc456aa8e82d8b6b Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 31 Aug 2014 22:47:28 +0400
Subject: [PATCH 1022/1453] Update FPC binary expression

---
 pkgs/development/compilers/fpc/binary-builder.sh |  1 +
 pkgs/development/compilers/fpc/binary.nix        | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/fpc/binary-builder.sh b/pkgs/development/compilers/fpc/binary-builder.sh
index 8be36dec73e4..4308c1ed211a 100755
--- a/pkgs/development/compilers/fpc/binary-builder.sh
+++ b/pkgs/development/compilers/fpc/binary-builder.sh
@@ -1,6 +1,7 @@
 source $stdenv/setup
 
 tar xf $src
+cd */
 tarballdir=$(pwd)
 for i in *.tar; do tar xvf $i; done
 echo "Deploying binaries.."
diff --git a/pkgs/development/compilers/fpc/binary.nix b/pkgs/development/compilers/fpc/binary.nix
index 88f0ab910672..57e670750db7 100644
--- a/pkgs/development/compilers/fpc/binary.nix
+++ b/pkgs/development/compilers/fpc/binary.nix
@@ -1,18 +1,18 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation {
-  name = "fpc-2.4.0-binary";
+  name = "fpc-2.6.0-binary";
 
   src =
     if stdenv.system == "i686-linux" then
       fetchurl {
-        url = "ftp://ftp.chg.ru/pub/lang/pascal/fpc/dist/2.4.0/i386-linux/fpc-2.4.0.i386-linux.tar";
-        sha256 = "1zas9kp0b36zxqvb9i4idh2l0nb6qpmgah038l77w6las7ghh0dv";
+        url = "http://sourceforge.net/projects/freepascal/files/Linux/2.6.0/fpc-2.6.0.i386-linux.tar";
+        sha256 = "08yklvrfxvk59bxsd4rh1i6s3cjn0q06dzjs94h9fbq3n1qd5zdf";
       }
     else if stdenv.system == "x86_64-linux" then
       fetchurl {
-        url = "ftp://ftp.chg.ru/pub/lang/pascal/fpc/dist/2.4.0/x86_64-linux/fpc-2.4.0.x86_64-linux.tar";
-        sha256 = "111d11g5ra55hjywx64ldwwflpimsy8zryvap68v0309nyd23f0z";
+        url = "http://sourceforge.net/projects/freepascal/files/Linux/2.6.0/fpc-2.6.0.x86_64-linux.tar";
+        sha256 = "0k9vi75k39y735fng4jc2vppdywp82j4qhzn7x4r6qjkad64d8lx";
       }
     else throw "Not supported on ${stdenv.system}.";
 

From 2406a892196695a5faf15fb4c27745a9cf53f962 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 31 Aug 2014 22:47:45 +0400
Subject: [PATCH 1023/1453] Update FPC to 2.6.4

---
 pkgs/development/compilers/fpc/default.nix      | 11 ++++++++---
 pkgs/development/compilers/fpc/default.upstream |  6 ++++++
 2 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/compilers/fpc/default.upstream

diff --git a/pkgs/development/compilers/fpc/default.nix b/pkgs/development/compilers/fpc/default.nix
index 6be976783bcd..b34b5e8a4465 100644
--- a/pkgs/development/compilers/fpc/default.nix
+++ b/pkgs/development/compilers/fpc/default.nix
@@ -3,12 +3,12 @@
 let startFPC = import ./binary.nix { inherit stdenv fetchurl; }; in
 
 stdenv.mkDerivation rec {
-  version = "2.6.0";
+  version = "2.6.4";
   name = "fpc-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/freepascal/fpcbuild-${version}.tar.gz";
-    sha256 = "1vxy2y8pm0ribhpdhqlwwz696ncnz4rk2dafbn1mjgipm97qb26p";
+    sha256 = "1akdlp4n9ai1gnn4yq236i5rx03rs5sjfgk60myb7nb9lk7kp74d";
   };
 
   buildInputs = [ startFPC gawk ];
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
       sed -e "s@'/lib64/ld-linux[^']*'@'''@" -i fpcsrc/compiler/systems/t_linux.pas
     '' else "";
 
-  makeFlags = "NOGDB=1";
+  makeFlags = "NOGDB=1 FPC=${startFPC}/bin/fpc";
 
   installFlags = "INSTALL_PREFIX=\${out}";
   
@@ -31,9 +31,14 @@ stdenv.mkDerivation rec {
     $out/lib/fpc/*/samplecfg $out/lib/fpc/${version} $out/lib/fpc/etc/
   '';
 
+  passthru = {
+    bootstrap = startFPC;
+  };
+
   meta = {
     description = "Free Pascal Compiler from a source distribution";
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
+    inherit version;
   };
 }
diff --git a/pkgs/development/compilers/fpc/default.upstream b/pkgs/development/compilers/fpc/default.upstream
new file mode 100644
index 000000000000..7c11fb4761e1
--- /dev/null
+++ b/pkgs/development/compilers/fpc/default.upstream
@@ -0,0 +1,6 @@
+url http://sourceforge.net/projects/freepascal/files/Source/
+SF_version_dir
+version_link 'fpcbuild-[0-9.]+[.]tar[.]gz/download$'
+SF_redirect
+version '.*-([0-9.]+)[.]tar[.]gz' '\1'
+do_overwrite () { do_overwrite_just_version; }

From fc83dfbc49cb3b1d1430eaa4d6fe787ed3f65952 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 31 Aug 2014 22:54:37 +0400
Subject: [PATCH 1024/1453] Update smbnetfs

---
 pkgs/tools/filesystems/smbnetfs/default.nix      | 13 +++++--------
 pkgs/tools/filesystems/smbnetfs/default.upstream |  6 ++++++
 2 files changed, 11 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/tools/filesystems/smbnetfs/default.upstream

diff --git a/pkgs/tools/filesystems/smbnetfs/default.nix b/pkgs/tools/filesystems/smbnetfs/default.nix
index 616f61e6c84c..e9d9b27d751b 100644
--- a/pkgs/tools/filesystems/smbnetfs/default.nix
+++ b/pkgs/tools/filesystems/smbnetfs/default.nix
@@ -12,17 +12,16 @@ let
   sourceInfo = rec {
     baseName="smbnetfs";
     dirBaseName="SMBNetFS";
-    version="0.5.3a";
+    version = "0.5.3b";
     name="${baseName}-${version}";
     project="${baseName}";
     url="mirror://sourceforge/project/${project}/${baseName}/${dirBaseName}-${version}/${name}.tar.bz2";
-    hash="0fzlw11y2vkxmjzz3qcypqlvz074v6a3pl4pyffbniqal64qgrsw";
   };
 in
 rec {
   src = a.fetchurl {
     url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+    sha256 = "1j9b30kh4ymv4nr8c1qc7hfg6pscgyj75ib16pqa0zljjk1klx18";
   };
 
   inherit (sourceInfo) name version;
@@ -40,11 +39,9 @@ rec {
     platforms = with a.lib.platforms;
       linux;
     license = a.lib.licenses.gpl2;
-  };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://sourceforge.net/projects/smbnetfs/files/smbnetfs";
-    };
+    downloadPage = "http://sourceforge.net/projects/smbnetfs/files/smbnetfs";
+    updateWalker = true;
+    inherit version;
   };
 }) x
 
diff --git a/pkgs/tools/filesystems/smbnetfs/default.upstream b/pkgs/tools/filesystems/smbnetfs/default.upstream
new file mode 100644
index 000000000000..9e2ba2bd59bb
--- /dev/null
+++ b/pkgs/tools/filesystems/smbnetfs/default.upstream
@@ -0,0 +1,6 @@
+url http://sourceforge.net/projects/smbnetfs/files/smbnetfs/
+version_link '[-][0-9.]+[a-z]*/$'
+version_link '[.]tar[.][a-z0-9]+/download$'
+SF_redirect
+version '.*[-]([0-9.]+[a-z]*)[.]tar[.].*' '\1'
+do_overwrite () { do_overwrite_just_version; }

From 3da42c811ffd082f92a82fb8f2f0ce0016e31fd7 Mon Sep 17 00:00:00 2001
From: Philip Horger <campadrenalin@gmail.com>
Date: Sat, 30 Aug 2014 23:41:46 -0700
Subject: [PATCH 1025/1453] hawkthorne: Initial commit, license issue still
 unresolved

---
 pkgs/games/hawkthorne/default.nix    | 38 ++++++++++++++++++++++++++++
 pkgs/games/hawkthorne/makefile.patch | 33 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 3 files changed, 73 insertions(+)
 create mode 100644 pkgs/games/hawkthorne/default.nix
 create mode 100644 pkgs/games/hawkthorne/makefile.patch

diff --git a/pkgs/games/hawkthorne/default.nix b/pkgs/games/hawkthorne/default.nix
new file mode 100644
index 000000000000..4a99ec447640
--- /dev/null
+++ b/pkgs/games/hawkthorne/default.nix
@@ -0,0 +1,38 @@
+{ fetchgit, stdenv, love, curl, zip }:
+
+stdenv.mkDerivation rec {
+  version = "0.9.1";
+  name = "hawkthorne-${version}";
+
+  src = fetchgit {
+    url = "https://github.com/hawkthorne/hawkthorne-journey.git";
+    rev = "e48b5eef0058f63bb8ee746bc00b47b3e03f0854";
+    sha256 = "0rvcpv8fsi450xs2cglv4w6m5iqbhsr2n09pcvhh0krhg7xay538";
+  };
+
+  buildInputs = [
+    love curl zip
+  ];
+
+  patches = [
+    ./makefile.patch
+  ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "Journey to the Center of Hawkthorne - A fan-made retro-style game based on the show Community";
+    longDescription = ''
+      Journey to the Center of Hawkthorne is an open source game written in Love2D.
+      It's based on the show Community, starring Jim Rash and Joel McHale as
+      the primary will-they-or-won't-they relationship.
+
+      This game has been entirely developed by fans of the show, who were inspired
+      to bring to life the video game used to determine the winner of Pierce
+      Hawthorne's inheritance.
+    '';
+    homepage = "http://www.reddit.com/r/hawkthorne";
+    license = stdenv.lib.licenses.mit;
+    maintainers = with stdenv.lib.maintainers; [ campadrenalin ];
+  };
+}
diff --git a/pkgs/games/hawkthorne/makefile.patch b/pkgs/games/hawkthorne/makefile.patch
new file mode 100644
index 000000000000..16a79683149d
--- /dev/null
+++ b/pkgs/games/hawkthorne/makefile.patch
@@ -0,0 +1,33 @@
+diff --git a/Makefile b/Makefile
+index 55eb817..f3406aa 100644
+--- a/Makefile
++++ b/Makefile
+@@ -18,10 +18,14 @@ endif
+
+ tilemaps := $(patsubst %.tmx,%.lua,$(wildcard src/maps/*.tmx))
+
+-maps: $(tilemaps)
+-
+ love: build/hawkthorne.love
+
++shebang: build/hawkthorne.love
++	cat <(echo '#!/usr/bin/env love') build/hawkthorne.love > build/hawkthorne
++	chmod +x build/hawkthorne
++
++maps: $(tilemaps)
++
+ build/hawkthorne.love: $(tilemaps) src/*
+ 	mkdir -p build
+ 	cd src && zip --symlinks -q -r ../build/hawkthorne.love . -x ".*" \
+@@ -30,6 +34,12 @@ build/hawkthorne.love: $(tilemaps) src/*
+ run: $(tilemaps) $(LOVE)
+ 	$(LOVE) src
+
++check: test
++
++install: shebang
++	mkdir -p $(out)/bin
++	cp build/hawkthorne $(out)/bin
++
+ src/maps/%.lua: src/maps/%.tmx bin/tmx2lua
+ 	bin/tmx2lua $<
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2478d881182b..4a63b75bb54e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1278,6 +1278,8 @@ let
 
   haveged = callPackage ../tools/security/haveged { };
 
+  hawkthorne = callPackage ../games/hawkthorne { love = love_0_9; };
+
   hardlink = callPackage ../tools/system/hardlink { };
 
   hashcat = callPackage ../tools/security/hashcat { };

From 5588ad472b2ce83ba6f0854b1a6491569ec51509 Mon Sep 17 00:00:00 2001
From: Vladimir Still <xstill@mail.muni.cz>
Date: Sun, 31 Aug 2014 21:12:15 +0200
Subject: [PATCH 1026/1453] vpnc: Fix building of system config.

---
 nixos/modules/config/vpnc.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/config/vpnc.nix b/nixos/modules/config/vpnc.nix
index e79e4d1c20f8..68d755232ebe 100644
--- a/nixos/modules/config/vpnc.nix
+++ b/nixos/modules/config/vpnc.nix
@@ -16,7 +16,7 @@ in
     networking.vpnc = {
       services = mkOption {
        type = types.attrsOf types.str;
-       default = [];
+       default = {};
        example = {
          test = 
           ''

From 3c8ddf78816d25fd057f0c0f03e7e63c9af35c86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sun, 31 Aug 2014 21:51:49 +0200
Subject: [PATCH 1027/1453] lmms: 0.4.15 -> 1.0.3, fix ogg vorbis and
 fluidsynth support

---
 pkgs/applications/audio/lmms/default.nix | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix
index dd0649811bbb..ee47d607c2bf 100644
--- a/pkgs/applications/audio/lmms/default.nix
+++ b/pkgs/applications/audio/lmms/default.nix
@@ -1,24 +1,22 @@
-{ stdenv, fetchurl, SDL, alsaLib, cmake, fftwSinglePrec, jack2, libogg
-, libsamplerate, libsndfile, pkgconfig, pulseaudio, qt4, freetype
+{ stdenv, fetchurl, SDL, alsaLib, cmake, fftwSinglePrec, fluidsynth
+, fltk13, jack2, libvorbis , libsamplerate, libsndfile, pkgconfig
+, pulseaudio, qt4, freetype
 }:
 
 stdenv.mkDerivation  rec {
   name = "lmms-${version}";
-  version = "0.4.15";
+  version = "1.0.3";
 
   src = fetchurl {
-    url = "mirror://sourceforge/lmms/${name}.tar.bz2";
-    sha256 = "02q2gbsqwk3hf9kvzz58a5bxmlb4cfr2mzy41wdvbxxdm2pcl101";
+    url = "https://github.com/LMMS/lmms/archive/v${version}.tar.gz";
+    sha256 = "191mfld3gspnxlgwcszp9kls58kdwrplj0rfw4zqsz90zdbsjnx3";
   };
 
   buildInputs = [
-    SDL alsaLib cmake fftwSinglePrec jack2 libogg libsamplerate
-    libsndfile pkgconfig pulseaudio qt4
+    SDL alsaLib cmake fftwSinglePrec fltk13 fluidsynth jack2
+    libsamplerate libsndfile libvorbis pkgconfig pulseaudio qt4
   ];
 
-  # work around broken build system of 0.4.*
-  NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2";
-
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {

From a735c308b69f4809eada30622279ae9fff03b016 Mon Sep 17 00:00:00 2001
From: Vladimir Still <vl.still@gmail.com>
Date: Wed, 30 Jul 2014 23:47:52 +0200
Subject: [PATCH 1028/1453] nfsd: Make it possible to fix
 rpc.{mountd,statd,lockd} ports.

---
 .../services/network-filesystems/nfsd.nix     | 13 ++++++-
 nixos/modules/tasks/filesystems/nfs.nix       | 37 +++++++++++++++++--
 2 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/network-filesystems/nfsd.nix b/nixos/modules/services/network-filesystems/nfsd.nix
index 2217fec3b0f7..57d56cd72877 100644
--- a/nixos/modules/services/network-filesystems/nfsd.nix
+++ b/nixos/modules/services/network-filesystems/nfsd.nix
@@ -56,6 +56,14 @@ in
           default = false;
           description = "Whether to create the mount points in the exports file at startup time.";
         };
+
+        mountdPort = mkOption {
+          default = null;
+          example = 4002;
+          description = ''
+            Use fixed port for rpc.mountd, usefull if server is behind firewall.
+          '';
+        };
       };
 
     };
@@ -138,7 +146,10 @@ in
         restartTriggers = [ exports ];
 
         serviceConfig.Type = "forking";
-        serviceConfig.ExecStart = "@${pkgs.nfsUtils}/sbin/rpc.mountd rpc.mountd";
+        serviceConfig.ExecStart = ''
+          @${pkgs.nfsUtils}/sbin/rpc.mountd rpc.mountd \
+              ${if cfg.mountdPort != null then "-p ${toString cfg.mountdPort}" else ""}
+        '';
         serviceConfig.Restart = "always";
       };
 
diff --git a/nixos/modules/tasks/filesystems/nfs.nix b/nixos/modules/tasks/filesystems/nfs.nix
index e8c3d8ab56d5..c902b9e07905 100644
--- a/nixos/modules/tasks/filesystems/nfs.nix
+++ b/nixos/modules/tasks/filesystems/nfs.nix
@@ -24,13 +24,37 @@ let
     Method = nsswitch
   '';
 
+  cfg = config.services.nfs;
+
 in
 
 {
+  ###### interface
+
+  options = {
+
+    services.nfs = {
+      statdPort = mkOption {
+        default = null;
+        example = 4000;
+        description = ''
+          Use fixed port for rpc.statd, usefull if NFS server is behind firewall.
+        '';
+      };
+      lockdPort = mkOption {
+        default = null;
+        example = 4001;
+        description = ''
+          Use fixed port for NFS lock manager kernel module (lockd/nlockmgr),
+          usefull if NFS server is behind firewall.
+        '';
+      };
+    };
+  };
 
   ###### implementation
 
-  config = mkIf (any (fs: fs == "nfs" || fs == "nfs4") config.boot.supportedFilesystems) {
+  config = mkIf (any (fs: fs == "nfs" || fs == "nfs4") config.boot.supportedFilesystems) ({
 
     services.rpcbind.enable = true;
 
@@ -60,7 +84,10 @@ in
           '';
 
         serviceConfig.Type = "forking";
-        serviceConfig.ExecStart = "@${pkgs.nfsUtils}/sbin/rpc.statd rpc.statd --no-notify";
+        serviceConfig.ExecStart = ''
+          @${pkgs.nfsUtils}/sbin/rpc.statd rpc.statd --no-notify \
+              ${if cfg.statdPort != null then "-p ${toString statdPort}" else ""}
+        '';
         serviceConfig.Restart = "always";
       };
 
@@ -90,5 +117,9 @@ in
         serviceConfig.Restart = "always";
       };
 
-  };
+  } // mkIf (cfg.lockdPort != null) {
+    boot.extraModprobeConfig = ''
+      options lockd nlm_udpport=${toString cfg.lockdPort} nlm_tcpport=${toString cfg.lockdPort}
+    '';
+  });
 }

From ba13808259753206c8c329676710b3c0d08b78ec Mon Sep 17 00:00:00 2001
From: Daniel Peebles <pumpkin@me.com>
Date: Sun, 31 Aug 2014 16:00:51 -0400
Subject: [PATCH 1029/1453] Fix byacc

---
 pkgs/development/tools/parsing/byacc/default.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix
index ec3026110531..f3ec8225f1ca 100644
--- a/pkgs/development/tools/parsing/byacc/default.nix
+++ b/pkgs/development/tools/parsing/byacc/default.nix
@@ -4,15 +4,10 @@ stdenv.mkDerivation {
   name = "byacc-1.9";
 
   src = fetchurl {
-    url = http://www.isc.org/sources/devel/tools/byacc-1.9.tar.gz;
-    sha256 = "d61a15ac4ac007c188d0c0e99365f016f8d327755f43032b58e400754846f736";
+    url = http://invisible-island.net/datafiles/release/byacc.tar.gz;
+    sha256 = "1rbzx5ipkvih9rjfdfv6310wcr6mxjbdlsh9zcv5aaz6yxxxil7c";
   };
 
-  preConfigure =
-    ''mkdir -p $out/bin
-      sed -i "s@^DEST.*\$@DEST = $out/bin/yacc@" Makefile
-    '';
-
   meta = { 
     description = "Berkeley YACC";
     homepage = http://dickey.his.com/byacc/byacc.html;

From e728e7cb6dce9ceede36215c312b603a6610bd91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sun, 31 Aug 2014 22:03:48 +0200
Subject: [PATCH 1030/1453] petri-foo: use released version 0.1.87

---
 pkgs/applications/audio/petrifoo/default.nix | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/audio/petrifoo/default.nix b/pkgs/applications/audio/petrifoo/default.nix
index 152ee442761e..197a0aa1bbe2 100644
--- a/pkgs/applications/audio/petrifoo/default.nix
+++ b/pkgs/applications/audio/petrifoo/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchgit, alsaLib, cmake, gtk, jack2, libgnomecanvas
+{ stdenv, fetchurl, alsaLib, cmake, gtk, jack2, libgnomecanvas
 , libpthreadstubs, libsamplerate, libsndfile, libtool, libxml2
 , pkgconfig }:
 
 stdenv.mkDerivation  rec {
-  name = "petri-foo";
+  name = "petri-foo-${version}";
+  version = "0.1.87";
 
-  src = fetchgit {
-    url = https://github.com/licnep/Petri-Foo.git;
-    rev = "eef3b6efebe842d2fa18ed32b881fea4562b84e0";
-    sha256 = "a20c3f1a633500a65c099c528c7dc2405daa60738b64d881bb8f2036ae59913c";
+  src = fetchurl {
+    url =  "mirror://sourceforge/petri-foo/${name}.tar.bz2";
+    sha256 = "0b25iicgn8c42487fdw32ycfrll1pm2zjgy5djvgw6mfcaa4gizh";
   };
 
   buildInputs =
@@ -16,8 +16,6 @@ stdenv.mkDerivation  rec {
      libsamplerate libsndfile libtool libxml2 pkgconfig
    ];
 
-  dontUseCmakeBuildDir=true;
-
   meta = with stdenv.lib; {
     description = "MIDI controllable audio sampler";
     longDescription = "a fork of Specimen";

From edbaf9497ba278e5e4cd20efc11f59f304ff9a0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sun, 31 Aug 2014 22:19:04 +0200
Subject: [PATCH 1031/1453] zynaddsubfx: 2.4.3 -> 2.4.4

---
 pkgs/applications/audio/zynaddsubfx/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix
index a5aa7d5c8d95..3a89b4067427 100644
--- a/pkgs/applications/audio/zynaddsubfx/default.nix
+++ b/pkgs/applications/audio/zynaddsubfx/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchurl, alsaLib, cmake, jack2, fftw, fltk13, minixml
-, pkgconfig, zlib
+{ stdenv, fetchurl, alsaLib, cmake, jack2, fftw, fltk13, libjpeg
+, minixml, pkgconfig, zlib
 }:
 
 stdenv.mkDerivation  rec {
   name = "zynaddsubfx-${version}";
-  version = "2.4.3";
+  version = "2.4.4";
 
   src = fetchurl {
-    url = "mirror://sourceforge/zynaddsubfx/ZynAddSubFX-${version}.tar.bz2";
-    sha256 = "0kgmwyh4rhyqdfrdzhbzjjk2hzggkp9c4aac6sy3xv6cc1b5jjxq";
+    url = "mirror://sourceforge/zynaddsubfx/zynaddsubfx-${version}.tar.xz";
+    sha256 = "15byz08p5maf3v8l1zz11xan6s0qcfasjf1b81xc8rffh13x5f53";
   };
 
-  buildInputs = [ alsaLib jack2 fftw fltk13 minixml zlib ];
+  buildInputs = [ alsaLib jack2 fftw fltk13 libjpeg minixml zlib ];
   nativeBuildInputs = [ cmake pkgconfig ];
 
   meta = with stdenv.lib; {

From 60d4216d01ce588372a0504266b2e09fd1a10032 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 31 Aug 2014 23:54:14 +0400
Subject: [PATCH 1032/1453] Update Graphviz

---
 pkgs/tools/graphics/graphviz/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix
index 27883ca60376..e9a552e33001 100644
--- a/pkgs/tools/graphics/graphviz/default.nix
+++ b/pkgs/tools/graphics/graphviz/default.nix
@@ -3,11 +3,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "graphviz-2.36.0";
+  version = "2.38.0";
+  name = "graphviz-${version}";
 
   src = fetchurl {
     url = "http://www.graphviz.org/pub/graphviz/ARCHIVE/${name}.tar.gz";
-    sha256 = "0qb30z5sxlbjni732ndad3j4x7l36vsxpxn4fmf5fn7ivvc6dz9p";
+    sha256 = "17l5czpvv5ilmg17frg0w4qwf89jzh2aglm9fgx0l0aakn6j7al1";
   };
 
   buildInputs =
@@ -52,6 +53,9 @@ stdenv.mkDerivation rec {
     '';
 
     hydraPlatforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
-    maintainers = with stdenv.lib.maintainers; [ simons bjornfor ];
+    maintainers = with stdenv.lib.maintainers; [ simons bjornfor raskin ];
+    downloadPage = "http://www.graphviz.org/pub/graphviz/ARCHIVE/";
+    inherit version;
+    updateWalker = true;
   };
 }

From 08131bd5d5f627f03625cf28ca8afbd7eb83e7fa Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 1 Sep 2014 00:37:57 +0400
Subject: [PATCH 1033/1453] Update guitone

---
 .../version-management/guitone/default.nix    |  8 +--
 pkgs/tools/graphics/graphviz/2.32.nix         | 61 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               | 12 +++-
 3 files changed, 75 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/tools/graphics/graphviz/2.32.nix

diff --git a/pkgs/applications/version-management/guitone/default.nix b/pkgs/applications/version-management/guitone/default.nix
index a396765e9186..135e7c7e1efd 100644
--- a/pkgs/applications/version-management/guitone/default.nix
+++ b/pkgs/applications/version-management/guitone/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchmtn, qt4 }:
+{ stdenv, fetchurl, fetchmtn, qt4, pkgconfig, graphviz }:
 
 let version = "1.0-mtn-head"; in
 stdenv.mkDerivation rec {
@@ -11,12 +11,12 @@ stdenv.mkDerivation rec {
 
   src = fetchmtn {
     dbs = ["mtn://code.monotone.ca/guitone"];
-    selector = "2777cdef424c65df93fa1ff181f02ee30d4901ab";
-    sha256 = "918d36a83060b84efa0ee0fe0fd058f1c871c91156d91366e2e979c886ff4271";
+    selector = "3a728afdbd3943b1d86c2a249b1e2ede7bf64c27";
+    sha256 = "01vs8m00phs5pl75mjkpdarynfpkqrg0qf4rsn95czi3q6nxiaq5";
     branch = "net.venge.monotone.guitone";
   };
 
-  buildInputs = [ qt4 ];
+  buildInputs = [ qt4 pkgconfig graphviz ];
 
   prefixKey="PREFIX=";
   configureScript = "qmake guitone.pro";
diff --git a/pkgs/tools/graphics/graphviz/2.32.nix b/pkgs/tools/graphics/graphviz/2.32.nix
new file mode 100644
index 000000000000..0a86a8924174
--- /dev/null
+++ b/pkgs/tools/graphics/graphviz/2.32.nix
@@ -0,0 +1,61 @@
+{ stdenv, fetchurl, pkgconfig, libpng, libjpeg, expat, libXaw
+, yacc, libtool, fontconfig, pango, gd, xlibs, gts, gettext, cairo
+}:
+
+stdenv.mkDerivation rec {
+  version = "2.32.0";
+  name = "graphviz-${version}";
+
+  src = fetchurl {
+    url = "http://www.graphviz.org/pub/graphviz/ARCHIVE/${name}.tar.gz";
+    sha256 = "0ym7lw3xnkcgbk32vfmm3329xymca60gzn90rq6dv8887qqv4lyq";
+  };
+
+  buildInputs =
+    [ pkgconfig libpng libjpeg expat libXaw yacc libtool fontconfig
+      pango gd gts
+    ] ++ stdenv.lib.optionals (xlibs != null) [ xlibs.xlibs xlibs.libXrender ]
+    ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext;
+
+  CPPFLAGS = stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") "-I${cairo}/include/cairo";
+
+  configureFlags =
+    [ "--with-pngincludedir=${libpng}/include"
+      "--with-pnglibdir=${libpng}/lib"
+      "--with-jpegincludedir=${libjpeg}/include"
+      "--with-jpeglibdir=${libjpeg}/lib"
+      "--with-expatincludedir=${expat}/include"
+      "--with-expatlibdir=${expat}/lib"
+      "--with-cgraph=no"
+      "--with-sparse=no"
+    ]
+    ++ stdenv.lib.optional (xlibs == null) "--without-x";
+
+  preBuild = ''
+    sed -e 's@am__append_5 *=.*@am_append_5 =@' -i lib/gvc/Makefile
+  '';
+
+  # "command -v" is POSIX, "which" is not
+  postInstall = ''
+    sed -i 's|`which lefty`|"'$out'/bin/lefty"|' $out/bin/dotty
+    sed -i 's|which|command -v|' $out/bin/vimdot
+  '';
+
+  meta = {
+    homepage = "http://www.graphviz.org/";
+    description = "Open source graph visualization software";
+
+    longDescription = ''
+      Graphviz is open source graph visualization software. Graph
+      visualization is a way of representing structural information as
+      diagrams of abstract graphs and networks. It has important
+      applications in networking, bioinformatics, software engineering,
+      database and web design, machine learning, and in visual
+      interfaces for other technical domains.
+    '';
+
+    hydraPlatforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    maintainers = with stdenv.lib.maintainers; [ simons bjornfor raskin ];
+    inherit version;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4a63b75bb54e..d0b12a1e24fa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1210,9 +1210,15 @@ let
 
   /* Readded by Michael Raskin. There are programs in the wild
    * that do want 2.0 but not 2.22. Please give a day's notice for
-   * objections before removal.
+   * objections before removal. The feature is integer coordinates
    */
   graphviz_2_0 = callPackage ../tools/graphics/graphviz/2.0.nix { };
+  
+  /* Readded by Michael Raskin. There are programs in the wild
+   * that do want 2.32 but not 2.0 or 2.36. Please give a day's notice for
+   * objections before removal. The feature is libgraph.
+   */
+  graphviz_2_32 = callPackage ../tools/graphics/graphviz/2.32.nix { };
 
   grive = callPackage ../tools/filesystems/grive {
     json_c = json-c-0-11; # won't configure with 0.12; others are vulnerable
@@ -8984,7 +8990,9 @@ let
 
   gpsd = callPackage ../servers/gpsd { };
 
-  guitone = callPackage ../applications/version-management/guitone { };
+  guitone = callPackage ../applications/version-management/guitone {
+    graphviz = graphviz_2_32;
+  };
 
   gv = callPackage ../applications/misc/gv { };
 

From 622bdca26c55872ef8870ff3316360fade96f056 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sun, 31 Aug 2014 22:45:37 +0200
Subject: [PATCH 1034/1453] processing: keep processing-java and patch it to
 make it work

---
 pkgs/applications/graphics/processing/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/processing/default.nix b/pkgs/applications/graphics/processing/default.nix
index ce3d639d1a30..7d0595134e99 100644
--- a/pkgs/applications/graphics/processing/default.nix
+++ b/pkgs/applications/graphics/processing/default.nix
@@ -19,10 +19,11 @@ stdenv.mkDerivation rec {
   installPhase = ''
     mkdir -p $out/bin
     cp -r linux/work/* $out/
-    rm $out/processing-java
     sed -e "s#APPDIR=\`dirname \"\$APPDIR\"\`#APPDIR=$out#" -i $out/processing
-    mv $out/processing $out/bin/
+    sed -e "s#APPDIR=\`dirname \"\$APPDIR\"\`#APPDIR=$out#" -i $out/processing-java
+    mv $out/processing{,-java} $out/bin/
     wrapProgram $out/bin/processing --prefix PATH : ${jre}/bin --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib
+    wrapProgram $out/bin/processing-java --prefix PATH : ${jre}/bin --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib
     mkdir $out/java
     ln -s ${jre}/bin $out/java/
   '';

From d9b13c1eb1b6834461c43f378c0b9ba9318c0225 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 1 Sep 2014 02:06:41 +0400
Subject: [PATCH 1035/1453] Make dmeventd support in lvm2 optional; use it for
 dmraid

---
 pkgs/os-specific/linux/lvm2/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix         | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix
index 739b47bf91d0..ee6165bfc9a5 100644
--- a/pkgs/os-specific/linux/lvm2/default.nix
+++ b/pkgs/os-specific/linux/lvm2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, udev, utillinux, coreutils }:
+{ stdenv, fetchurl, pkgconfig, udev, utillinux, coreutils, enable_dmeventd ? false }:
 
 let
   version = "2.02.110";
@@ -13,7 +13,9 @@ stdenv.mkDerivation {
   };
 
   configureFlags =
-    "--disable-readline --enable-udev_rules --enable-udev_sync --enable-pkgconfig --enable-applib --enable-dmeventd --enable-cmdlib";
+    "--disable-readline --enable-udev_rules --enable-udev_sync --enable-pkgconfig --enable-applib --enable-cmdlib"
+      + (stdenv.lib.optionalString enable_dmeventd " --enable-dmeventd")
+      ;
 
   buildInputs = [ pkgconfig udev ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d0b12a1e24fa..cfc93a8cf45b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7259,7 +7259,9 @@ let
     inherit (xlibs) xproto;
   };
 
-  dmraid = callPackage ../os-specific/linux/dmraid { };
+  dmraid = callPackage ../os-specific/linux/dmraid {
+    devicemapper = devicemapper.override {enable_dmeventd = true;};
+  };
 
   drbd = callPackage ../os-specific/linux/drbd { };
 

From f60ac82cac0c4c94da76d294114955c8185752ff Mon Sep 17 00:00:00 2001
From: Emery Hemingway <emery@vfemail.net>
Date: Sun, 31 Aug 2014 15:42:38 -0400
Subject: [PATCH 1036/1453] cjdns: new declarative service expression

systemd service wants network-interfaces.target rather than network.target
assertion on config.networking.enableIPv6
---
 nixos/modules/services/networking/cjdns.nix | 314 +++++++++++---------
 1 file changed, 166 insertions(+), 148 deletions(-)

diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix
index 9306ffd5a18a..0519172db914 100644
--- a/nixos/modules/services/networking/cjdns.nix
+++ b/nixos/modules/services/networking/cjdns.nix
@@ -1,13 +1,3 @@
-# You may notice the commented out sections in this file,
-# it would be great to configure cjdns from nix, but cjdns 
-# reads its configuration from stdin, including the private
-# key and admin password, all nested in a JSON structure.
-#
-# Until a good method of storing the keys outside the nix 
-# store and mixing them back into a string is devised
-# (without too much shell hackery), a skeleton of the
-# configuration building lies commented out.
-
 { config, lib, pkgs, ... }:
 
 with lib;
@@ -16,41 +6,35 @@ let
 
   cfg = config.services.cjdns;
 
-  /*
-  # can't keep keys and passwords in the nix store,
-  # but don't want to deal with this stdin quagmire.
+  # would be nice to  merge 'cfg' with a //,
+  # but the json nesting is wacky.
+  cjdrouteConf = builtins.toJSON ( {
+    admin = {
+      bind = cfg.admin.bind;
+      password = "@CJDNS_ADMIN_PASSWORD@";
+    };
+    authorizedPasswords = map (p: { password = p; }) cfg.authorizedPasswords;
+    interfaces = {
+      ETHInterface = if (cfg.ETHInterface.bind != "") then [ cfg.ETHInterface ] else [ ];
+      UDPInterface = if (cfg.UDPInterface.bind != "") then [ cfg.UDPInterface ] else [ ];
+    };
 
-  cjdrouteConf = '' {
-    "admin": {"bind": "${cfg.admin.bind}", "password": "\${CJDNS_ADMIN}" },
-    "privateKey": "\${CJDNS_KEY}",
+    privateKey = "@CJDNS_PRIVATE_KEY@";
 
-    "interfaces": {
-    ''
+    resetAfterInactivitySeconds = 100;
 
-    + optionalString (cfg.interfaces.udp.bind.address != null) ''
-      "UDPInterface": [ {
-        "bind": "${cfg.interfaces.udp.bind.address}:"''
-	   ${if cfg.interfaces.upd.bind.port != null
-             then ${toString cfg.interfaces.udp.bind.port}
-	     else ${RANDOM}
-	   fi)
-      + '' } ]''
+    router = {
+      interface = { type = "TUNInterface"; };
+      ipTunnel = {
+        allowedConnections = [];
+        outgoingConnections = [];
+      };
+    };
 
-    + (if cfg.interfaces.eth.bind != null then ''
-      "ETHInterface": [ {
-        "bind": "${cfg.interfaces.eth.bind}",
-        "beacon": ${toString cfg.interfaces.eth.beacon}
-      } ]
-    '' fi )
-    + ''
-    },
-    "router": { "interface": { "type": "TUNInterface" }, },
-    "security": [ { "setuser": "nobody" } ]
-    }
-    '';   
+    security = [ { exemptAngel = 1; setuser = "nobody"; } ];
+
+  });
 
-    cjdrouteConfFile = pkgs.writeText "cjdroute.conf" cjdrouteConf
-    */
 in
 
 {
@@ -62,146 +46,180 @@ in
         type = types.bool;
 	default = false;
         description = ''
-          Enable this option to start a instance of the 
-          cjdns network encryption and and routing engine.
-          Configuration will be read from <literal>confFile</literal>.
+          Whether to enable the cjdns network encryption
+          and routing engine. A file at /etc/cjdns.keys will
+          be created if it does not exist to contain a random
+          secret key that your IPv6 address will be derived from.
         '';
       };
 
-      confFile = mkOption {
-	default = "/etc/cjdroute.conf";
-        description = ''
-          Configuration file to pipe to cjdroute.
+      authorizedPasswords = mkOption {
+        type = types.listOf types.str;
+	default = [ ];
+	example = [
+          "snyrfgkqsc98qh1y4s5hbu0j57xw5s0"
+	  "z9md3t4p45mfrjzdjurxn4wuj0d8swv"
+	  "49275fut6tmzu354pq70sr5b95qq0vj"
+        ];
+	description = ''
+	  Any remote cjdns nodes that offer these passwords on 
+	  connection will be allowed to route through this node.
         '';
       };
-
-      /*
+    
       admin = {
         bind = mkOption {
+          type = types.string;
 	  default = "127.0.0.1:11234";
 	  description = ''
             Bind the administration port to this address and port.
 	  '';
         };
+      };
 
-	passwordFile = mkOption {
-	  example = "/root/cjdns.adminPassword";
+      UDPInterface = {
+        bind = mkOption {
+          type = types.string;
+	  default = "";
+          example = "192.168.1.32:43211";
+          description = ''
+	    Address and port to bind UDP tunnels to.
+	  '';
+ 	};
+        connectTo = mkOption {
+          type = types.attrsOf ( types.submodule (
+	    { options, ... }:
+            { options = {
+                # TODO make host an option, and add it to networking.extraHosts
+                password = mkOption {
+                  type = types.str;
+                  description = "Authorized password to the opposite end of the tunnel.";
+                };
+                publicKey = mkOption {
+                  type = types.str;
+                  description = "Public key at the opposite end of the tunnel.";
+                };
+              };
+            }
+          ));
+	  default = { };
+          example = {
+            "192.168.1.1:27313" = {
+	      password = "5kG15EfpdcKNX3f2GSQ0H1HC7yIfxoCoImnO5FHM";
+              publicKey = "371zpkgs8ss387tmr81q04mp0hg1skb51hw34vk1cq644mjqhup0.k";
+            };
+          };
+          description = ''
+	    Credentials for making UDP tunnels.
+	  '';
+	};
+      };
+
+      ETHInterface = {
+        bind = mkOption {
+	  default = "";
+	  example = "eth0";
 	  description = ''
-	    File containing a password to the administration port.
+	    Bind to this device for native ethernet operation.
 	  '';
-	};
-      };
-
-      keyFile = mkOption {
-        type = types.str;
-	example = "/root/cjdns.key";
-	description = ''
-	  Path to a file containing a cjdns private key on a single line.
-	'';
-      };
-      
-      passwordsFile = mkOption {
-        type = types.str;
-	default = null;
-	example = "/root/cjdns.authorizedPasswords";
-	description = ''
-	  A file containing a list of json dictionaries with passwords.
-	  For example:
-	    {"password": "s8xf5z7znl4jt05g922n3wpk75wkypk"},
-	    { "name": "nice guy",
-	      "password": "xhthk1mglz8tpjrbbvdlhyc092rhpx5"},
-	    {"password": "3qfxyhmrht7uwzq29pmhbdm9w4bnc8w"}
-	  '';
-	};
-
-      interfaces = {
-        udp = {
-	  bind = { 
-            address = mkOption {
-	      default = "0.0.0.0";
-	      description = ''
-	        Address to bind UDP tunnels to; disable by setting to null;
-	      '';
- 	    };
-	    port = mkOption {
-	      type = types.int;
-	      default = null;
-	      description = ''
-	        Port to bind UDP tunnels to.
-	        A port will be choosen at random if this is not set.
-	        This option is required to act as the server end of 
-	        a tunnel.
-	      '';
- 	    };
-	  };
-	};
-
-	eth = {
-	  bind = mkOption {
-	    default = null;
-	    example = "eth0";
-	    description = ''
-	      Bind to this device and operate with native wire format.
-	    '';
-	  };
-
-	  beacon = mkOption {
-	    default = 2;
-	    description = ''
-	      Auto-connect to other cjdns nodes on the same network.
-	      Options:
-	        0 -- Disabled.
-
-                1 -- Accept beacons, this will cause cjdns to accept incoming
-		     beacon messages and try connecting to the sender.
-
-		2 -- Accept and send beacons, this will cause cjdns to broadcast
-		     messages on the local network which contain a randomly
-		     generated per-session password, other nodes which have this
-                     set to 1 or 2 will hear the beacon messages and connect
-                     automatically.
-            '';
-	  };
-	  
-	  connectTo = mkOption {
-	    type = types.listOf types.str;
-	    default = [];
-	    description = ''
-	      Credentials for connecting look similar to UDP credientials
-              except they begin with the mac address, for example:
-              "01:02:03:04:05:06":{"password":"a","publicKey":"b"}
-	    '';
-	  };
         };
+
+        beacon = mkOption {
+	  type = types.int;
+          default = 2;
+          description = ''
+            Auto-connect to other cjdns nodes on the same network.
+            Options:
+	      0: Disabled.
+              1: Accept beacons, this will cause cjdns to accept incoming
+                 beacon messages and try connecting to the sender.
+              2: Accept and send beacons, this will cause cjdns to broadcast
+                 messages on the local network which contain a randomly
+                 generated per-session password, other nodes which have this
+                 set to 1 or 2 will hear the beacon messages and connect
+                 automatically.
+          '';
+        };
+
+        connectTo = mkOption {
+          type = types.attrsOf ( types.submodule (
+	    { options, ... }:
+            { options = {
+                password = mkOption {
+                  type = types.str;
+                  description = "Authorized password to the opposite end of the tunnel.";
+                };
+                publicKey = mkOption {
+                  type = types.str;
+                  description = "Public key at the opposite end of the tunnel.";
+                };
+              };
+            }
+          ));
+	  default = { };
+          example = {
+            "01:02:03:04:05:06" = {
+	      password = "5kG15EfpdcKNX3f2GSQ0H1HC7yIfxoCoImnO5FHM";
+              publicKey = "371zpkgs8ss387tmr81q04mp0hg1skb51hw34vk1cq644mjqhup0.k";
+            };
+          };
+	  description = ''
+	    Credentials for connecting look similar to UDP credientials
+            except they begin with the mac address.
+	  '';
+	};
       };
-      */
+
     };
+
   };
 
   config = mkIf config.services.cjdns.enable {
 
     boot.kernelModules = [ "tun" ];
 
-    /*
-    networking.firewall.allowedUDPPorts = mkIf (cfg.udp.bind.port != null) [
-      cfg.udp.bind.port
-    ];
-    */
+    # networking.firewall.allowedUDPPorts = ...
 
     systemd.services.cjdns = {
       description = "encrypted networking for everybody";
       wantedBy = [ "multi-user.target" ];
-      wants = [ "network.target" ];
-      before = [ "network.target" ];
-      path = [ pkgs.cjdns ];
+      after = [ "network-interfaces.target" ];
+
+      script = ''
+        source /etc/cjdns.keys
+        echo '${cjdrouteConf}' | sed \
+	  -e "s/@CJDNS_ADMIN_PASSWORD@/$CJDNS_ADMIN_PASSWORD/g" \
+          -e "s/@CJDNS_PRIVATE_KEY@/$CJDNS_PRIVATE_KEY/g" \
+            | ${pkgs.cjdns}/sbin/cjdroute
+      '';
 
       serviceConfig = {
         Type = "forking";
-	ExecStart = ''
-          ${pkgs.stdenv.shell} -c "${pkgs.cjdns}/sbin/cjdroute < ${cfg.confFile}"
-	'';
 	Restart = "on-failure";
       };
     };
+
+    system.activationScripts.cjdns = ''
+      grep -q "CJDNS_PRIVATE_KEY=" /etc/cjdns.keys || \
+        echo "CJDNS_PRIVATE_KEY=$(${pkgs.cjdns}/sbin/makekey)" \
+	  >> /etc/cjdns.keys
+
+      grep -q "CJDNS_ADMIN_PASSWORD=" /etc/cjdns.keys || \
+        echo "CJDNS_ADMIN_PASSWORD=$(${pkgs.coreutils}/bin/head -c 96 /dev/urandom | ${pkgs.coreutils}/bin/tr -dc A-Za-z0-9)" \
+	  >> /etc/cjdns.keys
+
+      chmod 600 /etc/cjdns.keys
+    '';
+
+    assertions = [
+      { assertion = ( cfg.ETHInterface.bind != "" || cfg.UDPInterface.bind != "" );
+        message = "Neither cjdns.ETHInterface.bind nor cjdns.UDPInterface.bind defined.";
+      }
+      { assertion = config.networking.enableIPv6;
+        message = "networking.enableIPv6 must be enabled for CJDNS to work";
+      }
+    ];
+
   };
-}
+
+}
\ No newline at end of file

From fc6ccd1080918a433d03f9e0762296b0e486aef8 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <emery@vfemail.net>
Date: Sun, 31 Aug 2014 15:44:42 -0400
Subject: [PATCH 1037/1453] cjdns: package update from 20140303 to 20140829

---
 pkgs/tools/networking/cjdns/default.nix   | 16 ++++--
 pkgs/tools/networking/cjdns/makekey.patch | 64 +++++++++++++++++++++++
 2 files changed, 75 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/tools/networking/cjdns/makekey.patch

diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix
index 48e21f4507e5..be107dfa81e7 100644
--- a/pkgs/tools/networking/cjdns/default.nix
+++ b/pkgs/tools/networking/cjdns/default.nix
@@ -1,21 +1,27 @@
 { stdenv, fetchgit, nodejs, which, python27 }:
 
 let
-  date = "20140303";
-  rev = "f11ce1fd4795b0173ac0ef18c8a6f752aa824adb";
+  date = "20140829";
+  rev = "9595d67f9edd759054c5bd3aaee0968ff55e361a";
 in
 stdenv.mkDerivation {
   name = "cjdns-${date}-${stdenv.lib.strings.substring 0 7 rev}";
 
   src = fetchgit {
-    url = "git://github.com/cjdelisle/cjdns.git";
+    url = "https://github.com/cjdelisle/cjdns.git";
     inherit rev;
-    sha256 = "1bxhf9f1v0slf9mz3ll6jf45mkwvwxlf3yqxx9k23kjyr1nsc8s8";
+    sha256 = "519c549c42ae26c5359ae13a4548c44b51e36db403964b4d9f78c19b749dfb83";
   };
 
   buildInputs = [ which python27 nodejs];
 
-  builder = ./builder.sh;
+  patches = [ ./makekey.patch ];
+
+  buildPhase = "bash do";
+  installPhase = ''
+    mkdir -p $out/sbin
+    cp cjdroute makekey $out/sbin
+  '';
 
   meta = {
     homepage = https://github.com/cjdelisle/cjdns;
diff --git a/pkgs/tools/networking/cjdns/makekey.patch b/pkgs/tools/networking/cjdns/makekey.patch
new file mode 100644
index 000000000000..fcce5e3e728e
--- /dev/null
+++ b/pkgs/tools/networking/cjdns/makekey.patch
@@ -0,0 +1,64 @@
+diff --git a/contrib/c/makekey.c b/contrib/c/makekey.c
+new file mode 100644
+index 0000000..c7184e5
+--- /dev/null
++++ b/contrib/c/makekey.c
+@@ -0,0 +1,46 @@
++/* vim: set expandtab ts=4 sw=4: */
++/*
++ * You may redistribute this program and/or modify it under the terms of
++ * the GNU General Public License as published by the Free Software Foundation,
++ * either version 3 of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++#include "crypto/random/Random.h"
++#include "memory/MallocAllocator.h"
++#include "crypto/AddressCalc.h"
++#include "util/AddrTools.h"
++#include "util/Hex.h"
++
++#include "crypto_scalarmult_curve25519.h"
++
++#include <stdio.h>
++
++int main(int argc, char** argv)
++{
++    struct Allocator* alloc = MallocAllocator_new(1<<22);
++    struct Random* rand = Random_new(alloc, NULL, NULL);
++
++    uint8_t privateKey[32];
++    uint8_t publicKey[32];
++    uint8_t ip[16];
++    uint8_t hexPrivateKey[65];
++
++    for (;;) {
++        Random_bytes(rand, privateKey, 32);
++        crypto_scalarmult_curve25519_base(publicKey, privateKey);
++        if (AddressCalc_addressForPublicKey(ip, publicKey)) {
++            Hex_encode(hexPrivateKey, 65, privateKey, 32);
++            printf(hexPrivateKey);
++            return 0;
++        }
++    }
++    return 0;
++}
++
+diff --git a/node_build/make.js b/node_build/make.js
+index 5e51645..11465e3 100644
+--- a/node_build/make.js
++++ b/node_build/make.js
+@@ -339,6 +339,7 @@ Builder.configure({
+     builder.buildExecutable('contrib/c/privatetopublic.c');
+     builder.buildExecutable('contrib/c/sybilsim.c');
+     builder.buildExecutable('contrib/c/makekeys.c');
++    builder.buildExecutable('contrib/c/makekey.c');
+ 
+     builder.buildExecutable('crypto/random/randombytes.c');
+ 

From d54b62ca6073efd99f1018c768214a2b9483f61e Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Sun, 31 Aug 2014 18:40:11 +0100
Subject: [PATCH 1038/1453] Add a builder for Agda packages.

---
 pkgs/build-support/agda/default.nix | 95 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  8 +++
 2 files changed, 103 insertions(+)
 create mode 100644 pkgs/build-support/agda/default.nix

diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix
new file mode 100644
index 000000000000..f8130b423a20
--- /dev/null
+++ b/pkgs/build-support/agda/default.nix
@@ -0,0 +1,95 @@
+# Builder for Agda packages. Mostly inspired by the cabal builder.
+#
+# Contact: stdenv.lib.maintainers.fuuzetsu
+
+{ stdenv, Agda, glibcLocales
+, writeScriptBin
+, extension ? (self: super: {})
+}:
+
+let
+  optionalString = stdenv.lib.optionalString;
+  filter = stdenv.lib.filter;
+  concatMapStringsSep = stdenv.lib.strings.concatMapStringsSep;
+  concatMapStrings = stdenv.lib.strings.concatMapStrings;
+  unwords = stdenv.lib.strings.concatStringsSep " ";
+  mapInside = xs: unwords (map (x: x + "/*") xs);
+in
+{ mkDerivation = args:
+    let
+      postprocess = x: x // {
+        sourceDirectories = filter (y: !(y == null)) x.sourceDirectories;
+        propagatedBuildInputs = filter (y : ! (y == null)) x.propagatedBuildInputs;
+        propagatedUserEnvPkgs = filter (y : ! (y == null)) x.propagatedUserEnvPkgs;
+        extraBuildFlags = filter (y : ! (y == null)) x.extraBuildFlags;
+        everythingFile = if x.everythingFile == "" then "Everything.agda" else x.everythingFile;
+      };
+
+      defaults = self : {
+        # There is no Hackage for Agda so we require src.
+        inherit (self) src name;
+
+        buildInputs = [ Agda ] ++ self.buildDepends;
+        buildDepends = [];
+        # Not much choice here ;)
+        LANG = "en_US.UTF-8";
+        LOCALE_ARCHIVE = optionalString stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive";
+
+        everythingFile = "Everything.agda";
+
+        propagatedBuildInputs = self.buildDepends ++ self.buildTools;
+        propagatedUserEnvPkgs = self.buildDepends;
+
+        # Immediate source directories under which modules can be found.
+        sourceDirectories = [ ];
+
+        # This is used if we have a top-level element that only serves
+        # as the container for the source and we only care about its
+        # contents. The directories put here will have their
+        # *contents* copied over as opposed to sourceDirectories which
+        # would make a direct copy of the whole thing.
+        topSourceDirectories = [ "src" ];
+
+        buildTools = [];
+
+        # Extra stuff to pass to the Agda binary.
+        extraBuildFlags = [ "-i ." ];
+        buildFlags = let r = map (x: "-i " + x + "/share/agda") self.buildDepends;
+                         d = map (x : "-i " + x) (self.sourceDirectories ++ self.topSourceDirectories);
+                     in unwords (r ++ d ++ self.extraBuildFlags);
+
+        # We expose this as a mere convenience for any tools.
+        AGDA_PACKAGE_PATH = concatMapStrings (x: x + ":") self.buildDepends;
+
+        # Makes a wrapper available to the user. Very useful in
+        # nix-shell where all dependencies are -i'd.
+        agdaWrapper = writeScriptBin "agda" ''
+          ${Agda}/bin/agda ${self.buildFlags} "$@"
+        '';
+
+        # configurePhase is idempotent
+        configurePhase = ''
+          eval "$preConfigure"
+          export AGDA_PACKAGE_PATH=${self.AGDA_PACKAGE_PATH};
+          export PATH="${self.agdaWrapper}/bin:$PATH"
+          eval "$postConfigure"
+        '';
+
+        buildPhase = ''
+          eval "$preBuild"
+          ${Agda}/bin/agda ${self.buildFlags} ${self.everythingFile}
+          eval "$postBuild"
+        '';
+
+        installPhase = ''
+          eval "$preInstall"
+          mkdir -p $out/share/agda
+          cp -pR ${unwords self.sourceDirectories} ${mapInside self.topSourceDirectories} $out/share/agda
+          eval "$postInstall"
+        '';
+      };
+    in stdenv.mkDerivation
+         (postprocess (let super = defaults self // args self;
+                           self  = super // extension self super;
+                       in self));
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cfc93a8cf45b..9770b178e443 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6526,6 +6526,14 @@ let
 
   zziplib = callPackage ../development/libraries/zziplib { };
 
+  ### DEVELOPMENT / LIBRARIES / AGDA
+
+  agda = callPackage ../build-support/agda {
+    glibcLocales = if pkgs.stdenv.isLinux then pkgs.glibcLocales else null;
+    extension = self : super : {};
+    Agda = haskellPackages.Agda;
+    inherit writeScriptBin;
+  };
 
   ### DEVELOPMENT / LIBRARIES / JAVA
 

From 61c17e326f9c0f6fd742889c1b8743df83b79c0f Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Mon, 1 Sep 2014 01:31:17 +0100
Subject: [PATCH 1039/1453] Use agda builder for stdlib. mv to all-packages

---
 pkgs/development/compilers/agda/stdlib.nix | 26 +++++++++-------------
 pkgs/top-level/all-packages.nix            |  4 ++++
 pkgs/top-level/haskell-packages.nix        |  1 -
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/compilers/agda/stdlib.nix b/pkgs/development/compilers/agda/stdlib.nix
index d0ae1394f894..2857a7d3d71b 100644
--- a/pkgs/development/compilers/agda/stdlib.nix
+++ b/pkgs/development/compilers/agda/stdlib.nix
@@ -1,7 +1,10 @@
-{ cabal, fetchurl, filemanip, Agda }:
+{ stdenv, agda, fetchurl, ghcWithPackages }:
 
-cabal.mkDerivation (self: rec {
-  pname = "Agda-stdlib";
+let
+  ghc = ghcWithPackages (s: [ s.filemanip ]);
+in
+agda.mkDerivation (self: rec {
+  name = "Agda-stdlib";
   version = "0.8.1";
 
   src = fetchurl {
@@ -9,23 +12,16 @@ cabal.mkDerivation (self: rec {
     sha256 = "0ij4rg4lk0pq01ing285gbmnn23dcf2rhihdcs8bbdpjg52vl4gf";
   };
 
-  buildDepends = [ filemanip Agda ];
-
-  preConfigure = "cd ffi";
-
-  postInstall = ''
-      mkdir -p $out/share
-      cd ..
-      ${self.ghc.ghc}/bin/runhaskell GenerateEverything
-      ${Agda}/bin/agda -i . -i src Everything.agda
-      cp -pR src $out/share/agda
+  preConfigure = ''
+    ${ghc}/bin/runhaskell GenerateEverything.hs
   '';
 
+  topSourceDirectories = [ "src" ];
+
   meta = {
     homepage = "http://wiki.portal.chalmers.se/agda/pmwiki.php?n=Libraries.StandardLibrary";
     description = "A standard library for use with the Agda compiler.";
     license = "unknown";
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.jwiegley ];
+    maintainers = with stdenv.lib.maintaianers; [ jwiegley ];
   };
 })
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9770b178e443..6a0fd08cca7e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6535,6 +6535,10 @@ let
     inherit writeScriptBin;
   };
 
+  AgdaStdlib = callPackage ../development/compilers/agda/stdlib.nix {
+    ghcWithPackages = haskellPackages.ghcWithPackages;
+  };
+
   ### DEVELOPMENT / LIBRARIES / JAVA
 
   atermjava = callPackage ../development/libraries/java/aterm {
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index b074a6ab48dd..9afe4b715aa3 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2888,7 +2888,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   # Compilers.
 
   Agda = callPackage ../development/compilers/agda {};
-  AgdaStdlib = callPackage ../development/compilers/agda/stdlib.nix {};
 
   uhc = callPackage ../development/compilers/uhc {};
 

From a20b4cbbbae652153764697252b4904edb7ec6e4 Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Mon, 1 Sep 2014 13:55:46 +1000
Subject: [PATCH 1040/1453] openldap: fix build on darwin

---
 pkgs/development/libraries/openldap/default.nix | 7 ++++---
 pkgs/top-level/all-packages.nix                 | 6 +++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix
index cfbbce2f5591..01a4e2e21daf 100644
--- a/pkgs/development/libraries/openldap/default.nix
+++ b/pkgs/development/libraries/openldap/default.nix
@@ -18,9 +18,10 @@ stdenv.mkDerivation rec {
 
   dontPatchELF = 1; # !!!
 
-  meta = {
-    homepage = "http://www.openldap.org/";
+  meta = with stdenv.lib; {
+    homepage    = http://www.openldap.org/;
     description = "An open source implementation of the Lightweight Directory Access Protocol";
-    maintainers = stdenv.lib.maintainers.mornfall;
+    maintainers = with maintainers; [ lovek323 mornfall ];
+    platforms   = platforms.unix;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d1f9487ab4aa..8baa450f8057 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5899,7 +5899,11 @@ let
 
   openexr = callPackage ../development/libraries/openexr { };
 
-  openldap = callPackage ../development/libraries/openldap { };
+  openldap = callPackage ../development/libraries/openldap {
+    stdenv = if stdenv.isDarwin
+      then clangStdenv
+      else stdenv;
+  };
 
   openlierox = callPackage ../games/openlierox { };
 

From 24b4105ed7747bf19f129a988206858c9c81a0cb Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 1 Sep 2014 08:56:37 +0400
Subject: [PATCH 1041/1453] Remove fpc 2.4.0: lazarus doesn't need it and it
 doesn't like .2.6.0 as bootstrap compiler

---
 pkgs/development/compilers/fpc/2.4.0.nix | 39 ------------------------
 pkgs/top-level/all-packages.nix          |  1 -
 2 files changed, 40 deletions(-)
 delete mode 100644 pkgs/development/compilers/fpc/2.4.0.nix

diff --git a/pkgs/development/compilers/fpc/2.4.0.nix b/pkgs/development/compilers/fpc/2.4.0.nix
deleted file mode 100644
index 30081c9d8050..000000000000
--- a/pkgs/development/compilers/fpc/2.4.0.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ stdenv, fetchurl, gawk }:
-
-let startFPC = import ./binary.nix { inherit stdenv fetchurl; }; in
-
-stdenv.mkDerivation rec {
-  version = "2.4.0";
-  name = "fpc-${version}";
-
-  src = fetchurl {
-    url = "http://downloads.sourceforge.net/sourceforge/freepascal/fpcbuild-${version}.tar.gz";
-    sha256 = "1m2g2bafjixbwl5b9lna5h7r56y1rcayfnbp8kyjfd1c1ymbxaxk";
-  };
-
-  buildInputs = [ startFPC gawk ];
-
-  preConfigure =
-    if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" then ''
-      sed -e "s@'/lib/ld-linux[^']*'@'''@" -i fpcsrc/compiler/systems/t_linux.pas
-      sed -e "s@'/lib64/ld-linux[^']*'@'''@" -i fpcsrc/compiler/systems/t_linux.pas
-    '' else "";
-
-  makeFlags = "NOGDB=1";
-
-  installFlags = "INSTALL_PREFIX=\${out}";
-  
-  postInstall = ''
-    for i in $out/lib/fpc/*/ppc*; do
-      ln -fs $i $out/bin/$(basename $i)
-    done
-    mkdir -p $out/lib/fpc/etc/
-    $out/lib/fpc/*/samplecfg $out/lib/fpc/${version} $out/lib/fpc/etc/
-  '';
-
-  meta = {
-    description = "Free Pascal Compiler from a source distribution";
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cfc93a8cf45b..e6809fc45c63 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2690,7 +2690,6 @@ let
   adobe_flex_sdk = callPackage ../development/compilers/adobe-flex-sdk { };
 
   fpc = callPackage ../development/compilers/fpc { };
-  fpc_2_4_0 = callPackage ../development/compilers/fpc/2.4.0.nix { };
 
   gambit = callPackage ../development/compilers/gambit { };
 

From a27e27c1f94c020e29ae72eca50de0d3ac7bbdc0 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 1 Sep 2014 09:07:54 +0400
Subject: [PATCH 1042/1453] Fix barcode src

---
 pkgs/tools/graphics/barcode/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/graphics/barcode/default.nix b/pkgs/tools/graphics/barcode/default.nix
index 052dc8f9cb22..23a2e6dd78fc 100644
--- a/pkgs/tools/graphics/barcode/default.nix
+++ b/pkgs/tools/graphics/barcode/default.nix
@@ -12,7 +12,7 @@ let
     version = "0.99";
     baseName="barcode";
     name="${baseName}-${version}";
-    url="mirror://gnu/${baseName}/${name}.tar.gz";
+    url="mirror://gnu/${baseName}/${name}.tar.xz";
   };
 in
 rec {

From ef22c5390577127cb2e243898a8187916d509db8 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 1 Sep 2014 09:11:32 +0400
Subject: [PATCH 1043/1453] Update ACL2

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

diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix
index 6d074ac9f279..568551bb5ba5 100644
--- a/pkgs/development/interpreters/acl2/default.nix
+++ b/pkgs/development/interpreters/acl2/default.nix
@@ -2,7 +2,7 @@ a :
 let 
   fetchurl = a.fetchurl;
 
-  version = a.lib.attrByPath ["version"] "v3-5" a; 
+  version = a.lib.attrByPath ["version"] "v6-5" a; 
   buildInputs = with a; [
     sbcl
   ];
@@ -10,7 +10,7 @@ in
 rec {
   src = fetchurl {
     url = "http://www.cs.utexas.edu/users/moore/acl2/${version}/distrib/acl2.tar.gz";
-    sha256 = "0zmh1njpp7n7azcyjlygr0h0k51d18s1jkj0dr1jn2bh7mpysajk";
+    sha256 = "19kfclgpdyms016s06pjf3icj3mx9jlcj8vfgpbx2ac4ls0ir36g";
     name = "acl2-${version}.tar.gz";
   };
 

From 8f50d803ef9c94fb82909e22b603982a0a522aea Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Tue, 15 Apr 2014 14:46:35 +0000
Subject: [PATCH 1044/1453] nixos: add support for mkhomedir in PAM

---
 nixos/modules/security/pam.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index b1b75a0068d4..2a1606e42f3d 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -126,6 +126,16 @@ let
         description = "Whether to show the message of the day.";
       };
 
+      makeHomeDir = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          Whether to try to create home directories for users
+          with <literal>$HOME</literal>s pointing to nonexistent
+          locations on session login.
+        '';
+      };
+
       updateWtmp = mkOption {
         default = false;
         type = types.bool;
@@ -192,6 +202,8 @@ let
               "session ${
                 if config.boot.isContainer then "optional" else "required"
               } pam_loginuid.so"}
+          ${optionalString cfg.makeHomeDir
+              "session required ${pkgs.pam}/lib/security/pam_mkhomedir.so silent skel=/etc/skel umask=0022"}
           ${optionalString cfg.updateWtmp
               "session required ${pkgs.pam}/lib/security/pam_lastlog.so silent"}
           ${optionalString config.users.ldap.enable

From 99243a5c514c888e09bbc13214a6ba23ea03d392 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Thu, 12 Jun 2014 05:36:16 +0000
Subject: [PATCH 1045/1453] nixos: add atftpd service

---
 nixos/modules/module-list.nix                |  1 +
 nixos/modules/services/networking/atftpd.nix | 51 ++++++++++++++++++++
 2 files changed, 52 insertions(+)
 create mode 100644 nixos/modules/services/networking/atftpd.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 297ca0d1be44..f7ab4a474b8f 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -192,6 +192,7 @@
   ./services/network-filesystems/rsyncd.nix
   ./services/network-filesystems/samba.nix
   ./services/networking/amuled.nix
+  ./services/networking/atftpd.nix
   ./services/networking/avahi-daemon.nix
   ./services/networking/bind.nix
   ./services/networking/bitlbee.nix
diff --git a/nixos/modules/services/networking/atftpd.nix b/nixos/modules/services/networking/atftpd.nix
new file mode 100644
index 000000000000..ab9f8650f0f8
--- /dev/null
+++ b/nixos/modules/services/networking/atftpd.nix
@@ -0,0 +1,51 @@
+# NixOS module for atftpd TFTP server
+
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  cfg = config.services.atftpd;
+
+in
+
+{
+
+  options = {
+
+    services.atftpd = {
+
+      enable = mkOption {
+        default = false;
+        type = types.uniq types.bool;
+        description = ''
+          Whenever to enable the atftpd TFTP server.
+        '';
+      };
+
+      root = mkOption {
+        default = "/var/empty";
+        type = types.uniq types.string;
+        description = ''
+          Document root directory for the atftpd.
+        '';
+      };
+
+    };
+
+  };
+
+  config = mkIf cfg.enable {
+
+    systemd.services.atftpd = {
+      description = "atftpd TFTP server";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      # runs as nobody
+      serviceConfig.ExecStart = "${pkgs.atftp}/sbin/atftpd --daemon --no-fork --bind-address 0.0.0.0 ${cfg.root}";
+    };
+
+  };
+
+}

From 8c9b6d932a7b8ce5feca240abbe8b2232c699b05 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Thu, 12 Jun 2014 23:34:40 +0000
Subject: [PATCH 1046/1453] nixos: add dhcpcd.persistent option

---
 nixos/modules/services/networking/dhcpcd.nix | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix
index 89aa9bdb6b68..09c271bfbfbb 100644
--- a/nixos/modules/services/networking/dhcpcd.nix
+++ b/nixos/modules/services/networking/dhcpcd.nix
@@ -64,7 +64,7 @@ let
       #    ${config.systemd.package}/bin/systemctl start ip-down.target
       #fi
 
-      ${config.networking.dhcpcd.runHook}
+      ${cfg.runHook}
     '';
 
 in
@@ -75,6 +75,18 @@ in
 
   options = {
 
+    networking.dhcpcd.persistent = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+          Whenever to leave interfaces configured on dhcpcd daemon
+          shutdown. Set to true if you have your root or store mounted
+          over the network or this machine accepts SSH connections
+          through DHCP interfaces and clients should be notified when
+          it shuts down.
+      '';
+    };
+
     networking.dhcpcd.denyInterfaces = mkOption {
       type = types.listOf types.str;
       default = [];
@@ -139,7 +151,7 @@ in
         serviceConfig =
           { Type = "forking";
             PIDFile = "/run/dhcpcd.pid";
-            ExecStart = "@${dhcpcd}/sbin/dhcpcd dhcpcd --quiet --config ${dhcpcdConf}";
+            ExecStart = "@${dhcpcd}/sbin/dhcpcd dhcpcd --quiet ${optionalString cfg.persistent "--persistent"} --config ${dhcpcdConf}";
             ExecReload = "${dhcpcd}/sbin/dhcpcd --rebind";
             Restart = "always";
           };

From 26a4001a98322ab903b8186b97f33c5b282828a5 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Thu, 12 Jun 2014 23:45:42 +0000
Subject: [PATCH 1047/1453] nixos: add setuid wrappers for some networked
 filesystems' helpers

So that `user` mount option would work allowing normal users to mount
and umount stuff marked with it in `fileSystems.<name>.options`.
---
 nixos/modules/security/setuid-wrappers.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/security/setuid-wrappers.nix b/nixos/modules/security/setuid-wrappers.nix
index 373afffd3fb5..22dbdf6a6bf4 100644
--- a/nixos/modules/security/setuid-wrappers.nix
+++ b/nixos/modules/security/setuid-wrappers.nix
@@ -77,7 +77,9 @@ in
   config = {
 
     security.setuidPrograms =
-      [ "fusermount" "wodim" "cdrdao" "growisofs" ];
+      [ "mount.nfs" "mount.nfs4" "mount.cifs"
+        "fusermount" "umount"
+        "wodim" "cdrdao" "growisofs" ];
 
     system.activationScripts.setuid =
       let

From a49caa77e7e5e861e5b8d0b614157fe9c42ac7e2 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 1 Sep 2014 10:53:00 +0400
Subject: [PATCH 1048/1453] Add IDs for uhub service

---
 nixos/modules/misc/ids.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 513da5d50a18..efd8b253cd4c 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -149,6 +149,7 @@
       radvd = 139;
       zookeeper = 140;
       dnsmasq = 141;
+      uhub = 142;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -268,6 +269,7 @@
       mlmmj = 135;
       riemann = 137;
       riemanndash = 138;
+      uhub = 142;
 
       # When adding a gid, make sure it doesn't match an existing uid. And don't use gids above 399!
 

From 9aa9345a5a5fda36ed0ce4dd1081494ea2391b3a Mon Sep 17 00:00:00 2001
From: Emery Hemingway <emery@vfemail.net>
Date: Fri, 18 Jul 2014 13:02:53 -0400
Subject: [PATCH 1049/1453] uhub: initial package for version 0.4.1

---
 pkgs/servers/uhub/default.nix      |  43 ++++++++
 pkgs/servers/uhub/plugin-dir.patch |  23 ++++
 pkgs/servers/uhub/systemd.patch    | 164 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |   2 +
 4 files changed, 232 insertions(+)
 create mode 100644 pkgs/servers/uhub/default.nix
 create mode 100644 pkgs/servers/uhub/plugin-dir.patch
 create mode 100644 pkgs/servers/uhub/systemd.patch

diff --git a/pkgs/servers/uhub/default.nix b/pkgs/servers/uhub/default.nix
new file mode 100644
index 000000000000..a6e0d474d897
--- /dev/null
+++ b/pkgs/servers/uhub/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchurl, cmake, openssl, sqlite, pkgconfig, systemd
+, tlsSupport ? false }:
+
+assert tlsSupport -> openssl != null;
+
+let version = "0.4.1"; in
+stdenv.mkDerivation {
+  name = "uhub-${version}";
+
+  src = fetchurl {
+    url = "http://www.extatic.org/downloads/uhub/uhub-${version}-src.tar.bz2";
+    sha256 = "1q0n74fb0h5w0k9fhfkznxb4r46qyfb8g2ss3wflivx4l0m1f9x2";
+  };
+
+  buildInputs = [ cmake sqlite pkgconfig systemd ] ++ stdenv.lib.optional tlsSupport openssl;
+
+  outputs = [ "out"
+    "mod_example"
+    "mod_welcome"
+    "mod_logging"
+    "mod_auth_simple"
+    "mod_auth_sqlite"
+    "mod_chat_history"
+    "mod_chat_only"
+    "mod_topic"
+    "mod_no_guest_downloads"
+  ];
+
+  patches = [ ./plugin-dir.patch ./systemd.patch ];
+
+  cmakeFlags = ''
+    -DSYSTEMD_SUPPORT=ON
+    ${if tlsSupport then "-DSSL_SUPPORT=ON" else "-DSSL_SUPPORT=OFF"}
+  '';
+
+  meta = with stdenv.lib; {
+    description = "High performance peer-to-peer hub for the ADC network";
+    homepage = https://www.uhub.org/;
+    license = licenses.gpl3;
+    maintainers = [ maintainers.emery ];
+    platforms = platforms.unix;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/servers/uhub/plugin-dir.patch b/pkgs/servers/uhub/plugin-dir.patch
new file mode 100644
index 000000000000..95ebfd6706ff
--- /dev/null
+++ b/pkgs/servers/uhub/plugin-dir.patch
@@ -0,0 +1,23 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 40e996e..d3b7e6d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -185,10 +185,16 @@ else()
+ 	# add_definitions(-DDEBUG)
+ endif()
+ 
++set( PLUGINS mod_example mod_welcome mod_logging mod_auth_simple mod_auth_sqlite mod_chat_history mod_chat_only mod_topic mod_no_guest_downloads )
++
+ if (UNIX)
+ 	install( TARGETS uhub RUNTIME DESTINATION bin )
+-	install( TARGETS mod_example mod_welcome mod_logging mod_auth_simple mod_auth_sqlite mod_chat_history mod_chat_only mod_topic mod_no_guest_downloads DESTINATION /usr/lib/uhub/ OPTIONAL )
+-	install( FILES ${CMAKE_SOURCE_DIR}/doc/uhub.conf ${CMAKE_SOURCE_DIR}/doc/plugins.conf ${CMAKE_SOURCE_DIR}/doc/rules.txt ${CMAKE_SOURCE_DIR}/doc/motd.txt DESTINATION /etc/uhub OPTIONAL )
++
++        foreach( PLUGIN ${PLUGINS} )
++		install( TARGETS ${PLUGIN} DESTINATION $ENV{${PLUGIN}} OPTIONAL )
++        endforeach( PLUGIN )
++
++	install( FILES ${CMAKE_SOURCE_DIR}/doc/uhub.conf ${CMAKE_SOURCE_DIR}/doc/plugins.conf ${CMAKE_SOURCE_DIR}/doc/rules.txt ${CMAKE_SOURCE_DIR}/doc/motd.txt DESTINATION doc/ OPTIONAL )
+ 
+ 	if (SQLITE_SUPPORT)
+ 		install( TARGETS uhub-passwd RUNTIME DESTINATION bin )
diff --git a/pkgs/servers/uhub/systemd.patch b/pkgs/servers/uhub/systemd.patch
new file mode 100644
index 000000000000..05e7571d18d5
--- /dev/null
+++ b/pkgs/servers/uhub/systemd.patch
@@ -0,0 +1,164 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 40e996e..fc4fb01 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -19,6 +19,7 @@ option(LINK_SUPPORT "Allow hub linking" OFF)
+ option(SSL_SUPPORT "Enable SSL support" ON)
+ option(USE_OPENSSL "Use OpenSSL's SSL support" ON )
+ option(SQLITE_SUPPORT "Enable SQLite support" ON)
++option(SYSTEMD_SUPPORT "Enable systemd notify and journal logging" OFF)
+ option(ADC_STRESS "Enable the stress tester client" OFF)
+ 
+ find_package(Git)
+@@ -34,6 +35,12 @@ if (SSL_SUPPORT)
+ 	endif()
+ endif()
+ 
++if (SYSTEMD_SUPPORT)
++        INCLUDE(FindPkgConfig)
++        pkg_search_module(SD_DAEMON REQUIRED libsystemd-daemon)
++        pkg_search_module(SD_JOURNAL REQUIRED libsystemd-journal)
++endif()
++
+ if (MSVC)
+ 	add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+ endif()
+@@ -175,6 +182,18 @@ if(SSL_SUPPORT)
+ 	endif()
+ endif()
+ 
++if (SYSTEMD_SUPPORT)
++        target_link_libraries(uhub ${SD_DAEMON_LIBRARIES})
++        target_link_libraries(uhub ${SD_JOURNAL_LIBRARIES})
++        target_link_libraries(test ${SD_DAEMON_LIBRARIES})
++        target_link_libraries(test ${SD_JOURNAL_LIBRARIES})
++        target_link_libraries(uhub-passwd ${SD_JOURNAL_LIBRARIES})
++        target_link_libraries(uhub-admin ${SD_JOURNAL_LIBRARIES})
++        include_directories(${SD_DAEMON_INCLUDE_DIRS})
++        include_directories(${SD_JOURNAL_INCLUDE_DIRS})
++        add_definitions(-DSYSTEMD)
++endif()
++
+ configure_file ("${PROJECT_SOURCE_DIR}/version.h.in" "${PROJECT_SOURCE_DIR}/version.h")
+ 
+ mark_as_advanced(FORCE CMAKE_BUILD_TYPE)
+diff --git a/src/core/main.c b/src/core/main.c
+index bb78672..ac2d2a8 100644
+--- a/src/core/main.c
++++ b/src/core/main.c
+@@ -19,6 +19,10 @@
+ 
+ #include "uhub.h"
+ 
++#ifdef SYSTEMD
++#include <systemd/sd-daemon.h>
++#endif
++
+ static int arg_verbose = 5;
+ static int arg_fork    = 0;
+ static int arg_check_config = 0;
+@@ -145,7 +149,16 @@ int main_loop()
+ 			}
+ #if !defined(WIN32)
+ 			setup_signal_handlers(hub);
+-#endif
++#ifdef SYSTEMD
++                        /* Notify the service manager that this daemon has 
++                         * been successfully initalized and shall enter the
++                         * main loop.
++                         */
++                        sd_notifyf(0, "READY=1\n"
++                                      "MAINPID=%lu", (unsigned long) getpid());
++#endif /* SYSTEMD */
++
++#endif /* ! WIN32 */
+ 		}
+ 
+ 		hub_set_variables(hub, &acl);
+@@ -216,13 +229,17 @@ void print_usage(char* program)
+ 		"   -q          Quiet mode - no output\n"
+ 		"   -f          Fork to background\n"
+ 		"   -l <file>   Log messages to given file (default: stderr)\n"
+-		"   -L          Log messages to syslog\n"
+ 		"   -c <file>   Specify configuration file (default: " SERVER_CONFIG ")\n"
+ 		"   -C          Check configuration and return\n"
+ 		"   -s          Show configuration parameters\n"
+ 		"   -S          Show configuration parameters, but ignore defaults\n"
+ 		"   -h          This message\n"
+ #ifndef WIN32
++#ifdef SYSTEMD
++		"   -L          Log messages to journal\n"
++#else
++		"   -L          Log messages to syslog\n"
++#endif
+ 		"   -u <user>   Run as given user\n"
+ 		"   -g <group>  Run with given group permissions\n"
+ 		"   -p <file>   Store pid in file (process id)\n"
+diff --git a/src/util/log.c b/src/util/log.c
+index 42badb3..2d97528 100644
+--- a/src/util/log.c
++++ b/src/util/log.c
+@@ -21,7 +21,15 @@
+ #include <locale.h>
+ 
+ #ifndef WIN32
++
++#ifdef SYSTEMD
++#define SD_JOURNAL_SUPPRESS_LOCATION
++#include <systemd/sd-journal.h>
++
++#else
+ #include <syslog.h>
++#endif
++
+ static int use_syslog = 0;
+ #endif
+ 
+@@ -83,7 +91,9 @@ void hub_log_initialize(const char* file, int syslog)
+ 	if (syslog)
+ 	{
+ 		use_syslog = 1;
++                #ifndef SYSTEMD
+ 		openlog("uhub", LOG_PID, LOG_USER);
++                #endif
+ 	}
+ #endif
+ 
+@@ -132,7 +142,9 @@ void hub_log_shutdown()
+ 	if (use_syslog)
+ 	{
+ 		use_syslog = 0;
++                #ifndef SYSTEMD
+ 		closelog();
++                #endif
+ 	}
+ #endif
+ }
+@@ -212,7 +224,12 @@ void hub_log(int log_verbosity, const char *format, ...)
+ 			case log_fatal:    level = LOG_CRIT; break;
+ 			case log_error:    level = LOG_ERR; break;
+ 			case log_warning:  level = LOG_WARNING; break;
+-			case log_user:     level = LOG_INFO | LOG_AUTH; break;
++                        #ifdef SYSTEMD
++                        case log_user:     level = LOG_INFO; break;
++
++                        #else
++                        case log_user:     level = LOG_INFO | LOG_AUTH; break;
++                        #endif
+ 			case log_info:     level = LOG_INFO; break;
+ 			case log_debug:    level = LOG_DEBUG; break;
+ 			
+@@ -224,8 +241,13 @@ void hub_log(int log_verbosity, const char *format, ...)
+ 		if (level == 0)
+ 			return;
+ 		
++                #ifdef SYSTEMD
++		sd_journal_print(level, "%s", logmsg);
++
++                #else
+ 		level |= (LOG_USER | LOG_DAEMON);
+ 		syslog(level, "%s", logmsg);
++                #endif
+ 	}
+ #endif
+ 	
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e6809fc45c63..965a7c45f87c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2407,6 +2407,8 @@ let
     inherit (pkgs.kde4) kdelibs;
   };
 
+  uhub = callPackage ../servers/uhub { };
+
   unclutter = callPackage ../tools/misc/unclutter { };
 
   unbound = callPackage ../tools/networking/unbound { };

From f5b4eacad609b43f5fcb4a88f0057ae8621d6c49 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <emery@vfemail.net>
Date: Fri, 18 Jul 2014 13:27:55 -0400
Subject: [PATCH 1050/1453] uhub: initial service expression

---
 nixos/modules/module-list.nix        |   1 +
 nixos/modules/services/misc/uhub.nix | 186 +++++++++++++++++++++++++++
 2 files changed, 187 insertions(+)
 create mode 100644 nixos/modules/services/misc/uhub.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index f7ab4a474b8f..a2862a6d609b 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -170,6 +170,7 @@
   ./services/misc/siproxd.nix
   ./services/misc/svnserve.nix
   ./services/misc/synergy.nix
+  ./services/misc/uhub.nix
   ./services/misc/zookeeper.nix
   ./services/monitoring/apcupsd.nix
   ./services/monitoring/dd-agent.nix
diff --git a/nixos/modules/services/misc/uhub.nix b/nixos/modules/services/misc/uhub.nix
new file mode 100644
index 000000000000..15071202b9c2
--- /dev/null
+++ b/nixos/modules/services/misc/uhub.nix
@@ -0,0 +1,186 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.uhub;
+
+  uhubPkg = pkgs.uhub.override { tlsSupport = cfg.enableTLS; };
+
+  pluginConfig = ""
+  + optionalString cfg.plugins.authSqlite.enable ''
+    plugin ${uhubPkg.mod_auth_sqlite}/mod_auth_sqlite.so "file=${cfg.plugins.authSqlite.file}"
+  ''
+  + optionalString cfg.plugins.logging.enable ''
+    plugin ${uhubPkg.mod_logging}/mod_logging.so ${if cfg.plugins.logging.syslog then "syslog=true" else "file=${cfg.plugins.logging.file}"}
+  ''
+  + optionalString cfg.plugins.welcome.enable ''
+    plugin ${uhubPkg.mod_welcome}/mod_welcome.so "motd=${pkgs.writeText "motd.txt"  cfg.plugins.welcome.motd} rules=${pkgs.writeText "rules.txt" cfg.plugins.welcome.rules}"
+  ''
+  + optionalString cfg.plugins.history.enable ''
+    plugin ${uhubPkg.mod_chat_history}/mod_chat_history.so "history_max=${toString cfg.plugins.history.max} history_default=${toString cfg.plugins.history.default} history_connect=${toString cfg.plugins.history.connect}"
+  '';
+
+  uhubConfigFile = pkgs.writeText "uhub.conf" ''
+    file_acl=${pkgs.writeText "users.conf" cfg.aclConfig}
+    file_plugins=${pkgs.writeText "plugins.conf" pluginConfig}
+    server_bind_addr=${cfg.address}
+    server_port=${toString cfg.port}
+    ${lib.optionalString cfg.enableTLS "tls_enable=yes"}
+    ${cfg.hubConfig}
+  '';
+
+in
+
+{
+  options = {
+
+    services.uhub = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+	description = "Whether to enable the uhub ADC hub.";
+      };
+
+      port = mkOption {
+        type = types.int;
+        default = 1511;
+	description = "TCP port to bind the hub to.";
+      };
+
+      address = mkOption {
+        type = types.string;
+        default = "any";
+	description = "Address to bind the hub to.";
+      };
+
+      enableTLS = mkOption {
+        type = types.bool;
+        default = false;
+	description = "Whether to enable TLS support.";
+      };
+
+      hubConfig = mkOption {
+        type = types.lines;
+        default = "";
+	description = "Contents of uhub configuration file.";
+      };
+
+      aclConfig = mkOption {
+        type = types.lines;
+        default = "";
+        description = "Contents of user ACL configuration file.";
+      };
+
+      plugins = {
+
+        authSqlite = {
+	  enable = mkOption {
+            type = types.bool;
+            default = false;
+            description = "Whether to enable the Sqlite authentication database plugin";
+	  };
+          file = mkOption {
+            type = types.string;
+            example = "/var/db/uhub-users";
+            description = "Path to user database. Use the uhub-passwd utility to create the database and add/remove users.";
+          };
+        };
+
+        logging = {
+          enable = mkOption {
+            type = types.bool;
+            default = false;
+            description = "Whether to enable the logging plugin.";
+          };
+          file = mkOption {
+            type = types.string;
+            default = "";
+            description = "Path of log file.";
+          };
+          syslog = mkOption {
+            type = types.bool;
+            default = false;
+            description = "If true then the system log is used instead of writing to file.";
+          };
+        };
+
+        welcome = {
+          enable = mkOption {
+            type = types.bool;
+            default = false;
+            description = "Whether to enable the welcome plugin.";
+          };
+          motd = mkOption {
+            default = "";
+            type = types.lines;
+            description = ''
+              Welcome message displayed to clients after connecting 
+              and with the <literal>!motd</literal> command.
+            '';
+          };
+          rules = mkOption {
+            default = "";
+            type = types.lines;
+            description = ''
+              Rules message, displayed to clients with the <literal>!rules</literal> command.
+            '';
+          };
+        };
+
+        history = {
+          enable = mkOption {
+            type = types.bool;
+            default = false;
+            description = "Whether to enable the history plugin.";
+          };
+          max = mkOption {
+            type = types.int;
+            default = 200;
+            description = "The maximum number of messages to keep in history";
+          };
+          default = mkOption {
+            type = types.int;
+            default = 10;
+            description = "When !history is provided without arguments, then this default number of messages are returned.";
+          };
+          connect = mkOption {
+            type = types.int;
+            default = 5;
+            description = "The number of chat history messages to send when users connect (0 = do not send any history).";
+          };
+        };
+
+      };
+    };
+
+  };
+
+  config = mkIf cfg.enable {
+
+    users = {
+      extraUsers = singleton {
+        name = "uhub";
+        uid = config.ids.uids.uhub;
+      };
+      extraGroups = singleton {
+        name = "uhub";
+        gid = config.ids.gids.uhub;
+      };
+    };
+
+    systemd.services.uhub = {
+      description = "high performance peer-to-peer hub for the ADC network";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = {
+        Type = "notify";
+        ExecStart  = "${uhubPkg}/bin/uhub -c ${uhubConfigFile} -u uhub -g uhub -L";
+        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+      };
+    };
+  };
+
+}
\ No newline at end of file

From 28fd7ea19019685b1330dac5118ab412ff25bdc2 Mon Sep 17 00:00:00 2001
From: Longrin Wischnewski <robberer@freakmail.de>
Date: Mon, 1 Sep 2014 09:41:19 +0200
Subject: [PATCH 1051/1453] clamav: run freshclam in daemon mode

---
 nixos/modules/services/security/clamav.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/security/clamav.nix b/nixos/modules/services/security/clamav.nix
index 057891a60475..a4d54301fc17 100644
--- a/nixos/modules/services/security/clamav.nix
+++ b/nixos/modules/services/security/clamav.nix
@@ -71,10 +71,10 @@ in
             mkdir -m 0755 -p ${stateDir}
             chown ${clamavUser}:${clamavGroup} ${stateDir}
           '';
-          exec = "${pkgs.clamav}/bin/freshclam --config-file=${pkgs.writeText "freshclam.conf" cfg.updater.config}";
+          exec = "${pkgs.clamav}/bin/freshclam --daemon --config-file=${pkgs.writeText "freshclam.conf" cfg.updater.config}";
       }; 
     };
 
   };
 
-}
\ No newline at end of file
+}

From 38f2c19324436878ee69f913881df83704df438b Mon Sep 17 00:00:00 2001
From: Longrin Wischnewski <robberer@freakmail.de>
Date: Mon, 1 Sep 2014 09:44:00 +0200
Subject: [PATCH 1052/1453] clamav: update to version 0.98.4

---
 pkgs/tools/security/clamav/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix
index fc43f01b344f..f5c4a4e9b4e6 100644
--- a/pkgs/tools/security/clamav/default.nix
+++ b/pkgs/tools/security/clamav/default.nix
@@ -1,19 +1,23 @@
-{ stdenv, fetchurl, zlib, bzip2, libiconv }:
+{ stdenv, fetchurl, zlib, bzip2, libiconv, libxml2, openssl, ncurses, curl }:
 stdenv.mkDerivation rec {
   name = "clamav-${version}";
-  version = "0.98.1";
+  version = "0.98.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/clamav/clamav-${version}.tar.gz";
-    sha256 = "1p13n8g3b88cxwxj07if9z1d2cav1ib94v6cq4r4bpacfd6yix9m";
+    sha256 = "071yzamalj3rf7kl2jvc35ipnk1imdkq5ylbb8whyxfgmd3nf06k";
   };
 
-  buildInputs = [ zlib bzip2 libiconv ];
+  buildInputs = [ zlib bzip2 libiconv libxml2 openssl ncurses curl ];
 
   configureFlags = [
     "--with-zlib=${zlib}"
     "--with-libbz2-prefix=${bzip2}"
     "--with-iconv-dir=${libiconv}"
+    "--with-xml=${libxml2}"
+    "--with-openssl=${openssl}"
+    "--with-libncurses-prefix=${ncurses}"
+    "--with-libcurl=${curl}"
     "--disable-clamav" ];
 
   meta = with stdenv.lib; {

From bc7f1b058ab54889ea162153c150f1661cf63cf3 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 1 Sep 2014 00:47:42 -0700
Subject: [PATCH 1053/1453] spice-protocol: 0.12.6 -> 0.12.7

---
 .../libraries/spice-protocol/default.nix            | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/spice-protocol/default.nix b/pkgs/development/libraries/spice-protocol/default.nix
index 162a832c93af..79fe47ff476b 100644
--- a/pkgs/development/libraries/spice-protocol/default.nix
+++ b/pkgs/development/libraries/spice-protocol/default.nix
@@ -1,19 +1,18 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "spice-protocol-0.12.6";
+  name = "spice-protocol-0.12.7";
 
   src = fetchurl {
     url = "http://www.spice-space.org/download/releases/${name}.tar.bz2";
-    sha256 = "16r5x2sppiaa6pzawkrvk5q4hmw7ynmlp2xr38f1vaxj5rh4aiwx";
+    sha256 = "1hhn94bw2l76h09sy05a15bs6zalsijnylyqpwcys5hq6rrwpiln";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Protocol headers for the SPICE protocol";
     homepage = http://www.spice-space.org;
-    license = stdenv.lib.licenses.bsd3;
-
-    maintainers = [ stdenv.lib.maintainers.bluescreen303 ];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ bluescreen303 ];
+    platforms = platforms.linux;
   };
 }

From b0d13c5400c31e12737d387e54bd4414e19267b4 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 1 Sep 2014 00:53:30 -0700
Subject: [PATCH 1054/1453] spice: 0.12.4 -> 0.12.5

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

diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix
index 2af9565e0b4f..2353eec73485 100644
--- a/pkgs/development/libraries/spice/default.nix
+++ b/pkgs/development/libraries/spice/default.nix
@@ -5,11 +5,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "spice-0.12.4";
+  name = "spice-0.12.5";
 
   src = fetchurl {
     url = "http://www.spice-space.org/download/releases/${name}.tar.bz2";
-    sha256 = "11xkdz26b39syynxm3iyjsr8q7x0v09zdli9an1ilcrfyiykw1ng";
+    sha256 = "10gmqaanfg929aamf11n4si4r3d1g7z9qjdclsl9kjv7iw6s42a2";
   };
 
   buildInputs = [ pixman celt alsaLib openssl libjpeg zlib

From 3a663f679f0ecad309abe2b78720ec02d3c6a2b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Mon, 1 Sep 2014 11:34:19 +0200
Subject: [PATCH 1055/1453] duplicity: update to 0.6.24.

---
 pkgs/tools/backup/duplicity/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix
index 45d6cb83739a..0f8c46e2dc31 100644
--- a/pkgs/tools/backup/duplicity/default.nix
+++ b/pkgs/tools/backup/duplicity/default.nix
@@ -1,14 +1,15 @@
-{ stdenv, fetchurl, python, librsync, ncftp, gnupg, boto, makeWrapper, lockfile }:
+{ stdenv, fetchurl, python, librsync, ncftp, gnupg, boto, makeWrapper
+, lockfile, setuptools }:
 
 let
-  version = "0.6.23";
+  version = "0.6.24";
 in
 stdenv.mkDerivation {
   name = "duplicity-${version}";
 
   src = fetchurl {
     url = "http://code.launchpad.net/duplicity/0.6-series/${version}/+download/duplicity-${version}.tar.gz";
-    sha256 = "0q0ckkmyq9z7xfbb1jajflmbzjwxpcjkkiab43rxrplm0ghz25vs";
+    sha256 = "0l14nrhbgkyjgvh339bbhnm6hrdwrjadphq1jmpi0mcgcdbdfh8x";
   };
 
   installPhase = ''
@@ -20,7 +21,7 @@ stdenv.mkDerivation {
       --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${boto}):$(toPythonPath ${lockfile})" \
   '';
 
-  buildInputs = [ python librsync makeWrapper ];
+  buildInputs = [ python librsync makeWrapper setuptools ];
 
   meta = {
     description = "Encrypted bandwidth-efficient backup using the rsync algorithm";

From b2887c0b5ea3943a8dd5d99ddba6123428c8bfde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 1 Sep 2014 11:33:48 +0200
Subject: [PATCH 1056/1453] readline5: recover, as it was still used

Partial revert of 30fef8a3cffbc1.
I probably confused that with unused readline62.
---
 pkgs/development/libraries/readline/readline5.nix | 15 +++++++++++++++
 .../libraries/readline/shobj-darwin.patch         | 11 +++++++++++
 pkgs/top-level/all-packages.nix                   |  2 ++
 3 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/libraries/readline/readline5.nix
 create mode 100644 pkgs/development/libraries/readline/shobj-darwin.patch

diff --git a/pkgs/development/libraries/readline/readline5.nix b/pkgs/development/libraries/readline/readline5.nix
new file mode 100644
index 000000000000..ad9860d855ef
--- /dev/null
+++ b/pkgs/development/libraries/readline/readline5.nix
@@ -0,0 +1,15 @@
+{ stdenv, fetchurl, ncurses }:
+
+stdenv.mkDerivation {
+  name = "readline-5.2";
+
+  src = fetchurl {
+    url = mirror://gnu/readline/readline-5.2.tar.gz;
+    sha256 = "0icz4hqqq8mlkwrpczyaha94kns0am9z0mh3a2913kg2msb8vs0j";
+  };
+
+  propagatedBuildInputs = [ncurses];
+
+  patches = stdenv.lib.optional stdenv.isDarwin ./shobj-darwin.patch;
+}
+
diff --git a/pkgs/development/libraries/readline/shobj-darwin.patch b/pkgs/development/libraries/readline/shobj-darwin.patch
new file mode 100644
index 000000000000..a9199ca3e89a
--- /dev/null
+++ b/pkgs/development/libraries/readline/shobj-darwin.patch
@@ -0,0 +1,11 @@
+--- a/support/shobj-conf.orig	2006-04-11 06:15:43.000000000 -0700
++++ b/support/shobj-conf	2007-11-08 01:15:43.000000000 -0800
+@@ -171,7 +171,7 @@
+ 	SHLIB_LIBSUFF='dylib'
+ 
+ 	case "${host_os}" in
+-	darwin[78]*)	SHOBJ_LDFLAGS=''
++	darwin[789]*)	SHOBJ_LDFLAGS=''
+ 			SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
+ 			;;
+ 	*)		SHOBJ_LDFLAGS='-dynamic'
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 48a4f8b1ba90..7d89e4b4292a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6104,6 +6104,8 @@ let
   readline = readline6;
   readline6 = readline63;
 
+  readline5 = callPackage ../development/libraries/readline/readline5.nix { };
+
   readline62 = callPackage ../development/libraries/readline/readline6.nix { };
 
   readline63 = callPackage ../development/libraries/readline/readline6.3.nix { };

From 624e98e78e011014ba204ed414314836f15a1415 Mon Sep 17 00:00:00 2001
From: vbgl <Vincent.Laporte@gmail.com>
Date: Mon, 1 Sep 2014 11:59:16 +0200
Subject: [PATCH 1057/1453] ocaml-javalib, ocaml-sawja: removes wrong path to
 bash in configure scripts

---
 pkgs/development/ocaml-modules/javalib/configure.sh.patch | 6 ++++++
 pkgs/development/ocaml-modules/sawja/configure.sh.patch   | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/pkgs/development/ocaml-modules/javalib/configure.sh.patch b/pkgs/development/ocaml-modules/javalib/configure.sh.patch
index 67e019b277af..77a2a5ba4ae5 100644
--- a/pkgs/development/ocaml-modules/javalib/configure.sh.patch
+++ b/pkgs/development/ocaml-modules/javalib/configure.sh.patch
@@ -1,5 +1,11 @@
 --- javalib-2.3-orig/configure.sh	2013-10-30 08:35:30.000000000 +0100
 +++ javalib-2.3/configure.sh	2014-07-06 17:28:39.025066199 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+
+ ###
+ ### A configuration script for Javalib
 @@ -44,7 +44,7 @@
  DESTDIR=
  # The ocamlpath variable for the compiler to locate the locally-installed
diff --git a/pkgs/development/ocaml-modules/sawja/configure.sh.patch b/pkgs/development/ocaml-modules/sawja/configure.sh.patch
index 8165de242f57..e01df32bbded 100644
--- a/pkgs/development/ocaml-modules/sawja/configure.sh.patch
+++ b/pkgs/development/ocaml-modules/sawja/configure.sh.patch
@@ -1,5 +1,11 @@
 --- sawja-1.5-orig/configure.sh	2013-10-30 08:35:29.000000000 +0100
 +++ sawja-1.5/configure.sh	2014-07-05 18:50:26.833798254 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+
+ ###
+ ### A configuration script for Sawja
 @@ -39,7 +39,7 @@
  DESTDIR=
  # The ocamlpath variable for the compiler to locate the locally-installed

From ba0c5e7b9eb20325a086ae594a4622fac807b690 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Mon, 1 Sep 2014 12:59:34 +0200
Subject: [PATCH 1058/1453] Updating homebank to 4.6.3.

---
 pkgs/applications/office/homebank/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix
index 007e093378da..0fbd2e398121 100644
--- a/pkgs/applications/office/homebank/default.nix
+++ b/pkgs/applications/office/homebank/default.nix
@@ -2,7 +2,7 @@
 
 let
    download_root = "http://homebank.free.fr/public/";
-   name = "homebank-4.5.5";
+   name = "homebank-4.6.3";
    lastrelease = download_root + name + ".tar.gz";
    oldrelease = download_root + "old/" + name + ".tar.gz";
 in
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     urls = [ lastrelease oldrelease ];
-    sha256 = "05k4497qsb6fzr662h9yxz1amsavd287wh0sabrpr9jdbh3jcfkg";
+    sha256 = "0j39788xz9m7ic277phffznbl35c1dm1g7dgq83va9nni6vipqzn";
   };
 
   buildInputs = [ pkgconfig gtk libofx intltool ];

From 3e834e17839a0e0c79050ad6cb4269d636077674 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 1 Sep 2014 04:39:45 -0700
Subject: [PATCH 1059/1453] nixos/tests: Fix usage of head function without
 pkgs.lib

---
 nixos/tests/bittorrent.nix | 6 +++---
 nixos/tests/nat.nix        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/tests/bittorrent.nix b/nixos/tests/bittorrent.nix
index 7eb9c215ee1c..b12a861f723a 100644
--- a/nixos/tests/bittorrent.nix
+++ b/nixos/tests/bittorrent.nix
@@ -16,7 +16,7 @@ let
   miniupnpdConf = nodes: pkgs.writeText "miniupnpd.conf"
     ''
       ext_ifname=eth1
-      listening_ip=${(head nodes.router.config.networking.interfaces.eth2.ip4).address}/24
+      listening_ip=${(pkgs.lib.head nodes.router.config.networking.interfaces.eth2.ip4).address}/24
       allow 1024-65535 192.168.2.0/24 1024-65535
     '';
 
@@ -53,7 +53,7 @@ in
         { environment.systemPackages = [ pkgs.transmission ];
           virtualisation.vlans = [ 2 ];
           networking.defaultGateway =
-            (head nodes.router.config.networking.interfaces.eth2.ip4).address;
+            (pkgs.lib.head nodes.router.config.networking.interfaces.eth2.ip4).address;
           networking.firewall.enable = false;
         };
 
@@ -81,7 +81,7 @@ in
       # Create the torrent.
       $tracker->succeed("mkdir /tmp/data");
       $tracker->succeed("cp ${file} /tmp/data/test.tar.bz2");
-      $tracker->succeed("transmission-create /tmp/data/test.tar.bz2 -t http://${(head nodes.tracker.config.networking.interfaces.eth1.ip4).address}:6969/announce -o /tmp/test.torrent");
+      $tracker->succeed("transmission-create /tmp/data/test.tar.bz2 -t http://${(pkgs.lib.head nodes.tracker.config.networking.interfaces.eth1.ip4).address}:6969/announce -o /tmp/test.torrent");
       $tracker->succeed("chmod 644 /tmp/test.torrent");
 
       # Start the tracker.  !!! use a less crappy tracker
diff --git a/nixos/tests/nat.nix b/nixos/tests/nat.nix
index 5a57cce6b678..87ed974edad3 100644
--- a/nixos/tests/nat.nix
+++ b/nixos/tests/nat.nix
@@ -13,7 +13,7 @@ import ./make-test.nix {
         { virtualisation.vlans = [ 1 ];
           networking.firewall.allowPing = true;
           networking.defaultGateway =
-            (head nodes.router.config.networking.interfaces.eth2.ip4).address;
+            (pkgs.lib.head nodes.router.config.networking.interfaces.eth2.ip4).address;
         };
 
       router =

From cfed33ce2b8678fe7683992b3d56093b0eff85c7 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Sat, 30 Aug 2014 19:31:42 +0200
Subject: [PATCH 1060/1453] flashplayer: Update from 11.2.202.394 ->
 11.2.202.400

---
 .../browsers/mozilla-plugins/flashplayer-11/default.nix     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
index d39dfe3582e9..55521a13f9cb 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
@@ -36,7 +36,7 @@
 
 let
   # -> http://get.adobe.com/flashplayer/
-  version = "11.2.202.394";
+  version = "11.2.202.400";
 
   src =
     if stdenv.system == "x86_64-linux" then
@@ -47,7 +47,7 @@ let
       else rec {
         inherit version;
         url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz";
-        sha256 = "1w82kmda91xdsrqpkrbcbrzswnbfszy0x9hvf9wf2h14isimdknx";
+        sha256 = "043bzjcqxjkjk68kba5nk77m59k6g71h32bypjpnwaigdgbhafyl";
       }
     else if stdenv.system == "i686-linux" then
       if debug then {
@@ -58,7 +58,7 @@ let
       } else rec {
         inherit version;
         url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz";
-        sha256 = "0c8wp4qn6k224krihxb08g7727wlklk9bl4h7nqp3cpp85x9hg97";
+        sha256 = "1xvfzm926rj0l2mq2kybrvykrv7bjfl3m7p5mvhj1586a3x1gb6h";
       }
     else throw "Flash Player is not supported on this platform";
 

From f9e63ca20dfeeaf95837b22f7baa1ca8904338af Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Sun, 31 Aug 2014 14:46:24 +0200
Subject: [PATCH 1061/1453] inotify-tools: Fix hash

The hash wasn't updated when the version was bumped.
---
 pkgs/development/tools/misc/inotify-tools/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/inotify-tools/default.nix b/pkgs/development/tools/misc/inotify-tools/default.nix
index 3402c2060e7f..4c1cd5bd7bdf 100644
--- a/pkgs/development/tools/misc/inotify-tools/default.nix
+++ b/pkgs/development/tools/misc/inotify-tools/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://github.com/downloads/rvoicilas/inotify-tools/inotify-tools-${version}.tar.gz";
-    sha256 = "0icl4bx041axd5dvhg89kilfkysjj86hjakc7bk8n49cxjn4cha6";
+    sha256 = "0by9frv1k59f76cx08sn06sk6lmdxsfb6zr0rshzhyrxi6lcqar2";
   };
 
   meta = with stdenv.lib; {

From 3fbb9f05026900ec2d760574f15de16ba3ac536e Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 1 Sep 2014 14:51:50 +0200
Subject: [PATCH 1062/1453] Add new openntpd package in version 20080406p-10.

It's actually a fork from Debian who are providing cross-platform
compatibility fixes for it. A big advantage is that it is far more
minimal than the ntpd reference implementation and especially useful if
you don't want to run an NTP service.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/tools/networking/openntpd/default.nix | 32 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/tools/networking/openntpd/default.nix

diff --git a/pkgs/tools/networking/openntpd/default.nix b/pkgs/tools/networking/openntpd/default.nix
new file mode 100644
index 000000000000..c90582a75474
--- /dev/null
+++ b/pkgs/tools/networking/openntpd/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchgit, openssl
+, privsepPath ? "/var/empty"
+, privsepUser ? "ntp"
+}:
+
+stdenv.mkDerivation rec {
+  name = "openntpd-${version}";
+  version = "20080406p-10";
+
+  src = fetchgit {
+    url = "git://git.debian.org/collab-maint/openntpd.git";
+    rev = "refs/tags/debian/${version}";
+    sha256 = "0gd6j4sw4x4adlz0jzbp6lblx5vlnk6l1034hzbj2xd95k8hjhh8";
+  };
+
+  postPatch = ''
+    sed -i -e '/^install:/,/^$/{/@if.*PRIVSEP_PATH/,/^$/d}' Makefile.in
+  '';
+
+  configureFlags = [
+    "--with-privsep-path=${privsepPath}"
+    "--with-privsep-user=${privsepUser}"
+  ];
+
+  buildInputs = [ openssl ];
+
+  meta = {
+    homepage = "http://www.openntpd.org/";
+    license = stdenv.lib.licenses.bsd3;
+    description = "OpenBSD NTP daemon (Debian port)";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 965a7c45f87c..b58114113bb5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1752,6 +1752,8 @@ let
 
   openjade = callPackage ../tools/text/sgml/openjade { };
 
+  openntpd = callPackage ../tools/networking/openntpd { };
+
   openobex = callPackage ../tools/bluetooth/openobex { };
 
   openopc = callPackage ../tools/misc/openopc {

From 29f46422844b8f18f4905fc3f730abe0b5b494da Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 1 Sep 2014 15:14:00 +0200
Subject: [PATCH 1063/1453] nixos: Add new service for OpenNTPd.

This conflicts with the existing reference NTP daemon, so we're using
services.ntp.enable = mkForce false here to make sure both services
aren't enabled in par.

I was already trying to merge the module with services.ntp, but it would
have been quite a mess with a bunch of conditions on the package name.
They both have a bit in common if it comes to the configuration files,
but differ in handling of the state dir (for example, OpenNTPd doesn't
allow it to be owned by anything other than root).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/modules/module-list.nix                 |  1 +
 .../modules/services/networking/openntpd.nix  | 49 +++++++++++++++++++
 2 files changed, 50 insertions(+)
 create mode 100644 nixos/modules/services/networking/openntpd.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index a2862a6d609b..045eb469de94 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -231,6 +231,7 @@
   ./services/networking/ntpd.nix
   ./services/networking/oidentd.nix
   ./services/networking/openfire.nix
+  ./services/networking/openntpd.nix
   ./services/networking/openvpn.nix
   ./services/networking/polipo.nix
   ./services/networking/prayer.nix
diff --git a/nixos/modules/services/networking/openntpd.nix b/nixos/modules/services/networking/openntpd.nix
new file mode 100644
index 000000000000..bd8a7a04a2af
--- /dev/null
+++ b/nixos/modules/services/networking/openntpd.nix
@@ -0,0 +1,49 @@
+{ pkgs, lib, config, options, ... }:
+
+with lib;
+
+let
+  cfg = config.services.openntpd;
+
+  package = pkgs.openntpd.override {
+    privsepUser = "ntp";
+    privsepPath = "/var/empty";
+  };
+
+  cfgFile = pkgs.writeText "openntpd.conf" ''
+    ${concatStringsSep "\n" (map (s: "server ${s}") cfg.servers)}
+  '';
+in
+{
+  ###### interface
+
+  options.services.openntpd = {
+    enable = mkEnableOption "OpenNTP time synchronization server";
+
+    servers = mkOption {
+      default = config.services.ntp.servers;
+      type = types.listOf types.str;
+      inherit (options.services.ntp.servers) description;
+    };
+  };
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+    services.ntp.enable = mkForce false;
+
+    users.extraUsers = singleton {
+      name = "ntp";
+      uid = config.ids.uids.ntp;
+      description = "OpenNTP daemon user";
+      home = "/var/empty";
+    };
+
+    systemd.services.openntpd = {
+      description = "OpenNTP Server";
+      wantedBy = [ "ip-up.target" ];
+      partOf = [ "ip-up.target" ];
+      serviceConfig.ExecStart = "${package}/sbin/ntpd -d -f ${cfgFile}";
+    };
+  };
+}

From 31b7cae0188a569867626068580d96dfbf3b3219 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Mon, 1 Sep 2014 16:08:44 +0200
Subject: [PATCH 1064/1453] nixos/znc: fix immutable config.

Fix references to coreutils echo and rm.
Make config writable even if immutable because of
https://github.com/znc/znc/blob/master/src/znc.cpp#L964 .
---
 nixos/modules/services/networking/znc.nix | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/services/networking/znc.nix b/nixos/modules/services/networking/znc.nix
index 5aed20ee3e0b..9b26b2b32448 100644
--- a/nixos/modules/services/networking/znc.nix
+++ b/nixos/modules/services/networking/znc.nix
@@ -274,20 +274,16 @@ in
 
         # If mutable, regenerate conf file every time.
         ${optionalString (!cfg.mutable) ''
-          ${pkgs.coreutils}/echo "znc is set to be system-managed. Now deleting old znc.conf file to be regenerated."
-          ${pkgs.coreutils}/rm -f ${cfg.dataDir}/configs/znc.conf
+          ${pkgs.coreutils}/bin/echo "znc is set to be system-managed. Now deleting old znc.conf file to be regenerated."
+          ${pkgs.coreutils}/bin/rm -f ${cfg.dataDir}/configs/znc.conf
         ''}
 
         # Ensure essential files exist.
         if [[ ! -f ${cfg.dataDir}/configs/znc.conf ]]; then
-          ${pkgs.coreutils}/bin/echo "No znc.conf file found in ${cfg.dataDir}. Creating one now."
-          ${if (!cfg.mutable)
-            then "${pkgs.coreutils}/bin/ln --force -s ${zncConfFile} ${cfg.dataDir}/.znc/configs/znc.conf"
-            else ''
-              ${pkgs.coreutils}/bin/cp --no-clobber ${zncConfFile} ${cfg.dataDir}/configs/znc.conf
-              ${pkgs.coreutils}/bin/chmod u+rw ${cfg.dataDir}/configs/znc.conf
-              ${pkgs.coreutils}/bin/chown ${cfg.user} ${cfg.dataDir}/configs/znc.conf
-            ''}
+            ${pkgs.coreutils}/bin/echo "No znc.conf file found in ${cfg.dataDir}. Creating one now."
+            ${pkgs.coreutils}/bin/cp --no-clobber ${zncConfFile} ${cfg.dataDir}/configs/znc.conf
+            ${pkgs.coreutils}/bin/chmod u+rw ${cfg.dataDir}/configs/znc.conf
+            ${pkgs.coreutils}/bin/chown ${cfg.user} ${cfg.dataDir}/configs/znc.conf
         fi
 
         if [[ ! -f ${cfg.dataDir}/znc.pem ]]; then

From 41cd2d870ab7dc76913ba1cc2dc21e313732b4f1 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Mon, 1 Sep 2014 17:07:37 +0100
Subject: [PATCH 1065/1453] haskell-saltine: add 0.0.0.3

---
 .../libraries/haskell/saltine/default.nix     | 22 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/saltine/default.nix

diff --git a/pkgs/development/libraries/haskell/saltine/default.nix b/pkgs/development/libraries/haskell/saltine/default.nix
new file mode 100644
index 000000000000..acb4066fb2e3
--- /dev/null
+++ b/pkgs/development/libraries/haskell/saltine/default.nix
@@ -0,0 +1,22 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, libsodium, profunctors, QuickCheck, testFramework
+, testFrameworkQuickcheck2, vector
+}:
+
+cabal.mkDerivation (self: {
+  pname = "saltine";
+  version = "0.0.0.3";
+  sha256 = "1xjpjblxlpziyyz74ldaqh04shvy2qi34sc6b3232wpc0kyl5s8y";
+  buildDepends = [ profunctors ];
+  testDepends = [
+    QuickCheck testFramework testFrameworkQuickcheck2 vector
+  ];
+  extraLibraries = [ libsodium ];
+  meta = {
+    description = "Cryptography that's easy to digest (NaCl/libsodium bindings)";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index b074a6ab48dd..cfb06b0880d2 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2134,6 +2134,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   RSA = callPackage ../development/libraries/haskell/RSA {};
 
+  saltine = callPackage ../development/libraries/haskell/saltine {};
+
   sampleFrame = callPackage ../development/libraries/haskell/sample-frame {};
 
   safe = callPackage ../development/libraries/haskell/safe {};

From 933ac5e9f8cd1f09e649621200dc7053675fe4c1 Mon Sep 17 00:00:00 2001
From: Daniel Peebles <pumpkingod@gmail.com>
Date: Mon, 1 Sep 2014 14:23:43 -0400
Subject: [PATCH 1066/1453] Use a more permanent URL for the byacc version
 we're using

The other one is likely to change with every new release.
---
 pkgs/development/tools/parsing/byacc/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix
index f3ec8225f1ca..8842c8723b1e 100644
--- a/pkgs/development/tools/parsing/byacc/default.nix
+++ b/pkgs/development/tools/parsing/byacc/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "byacc-1.9";
 
   src = fetchurl {
-    url = http://invisible-island.net/datafiles/release/byacc.tar.gz;
+    url = ftp://invisible-island.net/byacc/byacc-20140715.tgz;
     sha256 = "1rbzx5ipkvih9rjfdfv6310wcr6mxjbdlsh9zcv5aaz6yxxxil7c";
   };
 

From e15aa51f2f419bf5e08d9afdfbcced8407733288 Mon Sep 17 00:00:00 2001
From: Vladimir Kirillov <proger@wilab.org.ua>
Date: Mon, 1 Sep 2014 21:28:14 +0300
Subject: [PATCH 1067/1453] sysdig: cheat nix into not capturing linux-dev as a
 runtime dependency

---
 pkgs/os-specific/linux/sysdig/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix
index 4abbb4c45b43..80677a52a32b 100644
--- a/pkgs/os-specific/linux/sysdig/default.nix
+++ b/pkgs/os-specific/linux/sysdig/default.nix
@@ -10,7 +10,7 @@ let
   };
   buildInputs = [
     cmake zlib luajit
-  ] ++ optional (kernel != null) kernel;
+  ];
 in
 stdenv.mkDerivation {
   inherit (s) name version;
@@ -30,6 +30,10 @@ stdenv.mkDerivation {
   '';
   postInstall = optionalString (kernel != null) ''
     make install_driver
+    kernel_dev=${kernel.dev}
+    kernel_dev=''${kernel_dev#/nix/store/}
+    kernel_dev=''${kernel_dev%%-linux*dev*}
+    sed -i "s#$kernel_dev#................................#g" $out/lib/modules/${kernel.modDirVersion}/extra/sysdig-probe.ko
   '';
 
   meta = with stdenv.lib; {

From b21ac6029041a5fb0feb9c8d2428c59f2923085b Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Mon, 1 Sep 2014 22:20:59 +0200
Subject: [PATCH 1068/1453] nixos/nat: add forwardPorts for external->internal
 DNAT

---
 nixos/modules/services/networking/nat.nix | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/nixos/modules/services/networking/nat.nix b/nixos/modules/services/networking/nat.nix
index e8d9d00cc0a2..b6fa3b79eb2f 100644
--- a/nixos/modules/services/networking/nat.nix
+++ b/nixos/modules/services/networking/nat.nix
@@ -75,6 +75,17 @@ in
         '';
     };
 
+    networking.nat.forwardPorts = mkOption {
+      type = types.listOf types.attrs;
+      default = [];
+      example = [ { sourcePort = 8080; destination = "10.0.0.1:80"; } ];
+      description =
+        ''
+          List of forwarded ports from the external interface to
+          internal destinations by using DNAT.
+        '';
+    };
+
   };
 
 
@@ -118,6 +129,14 @@ in
                 -s '${range}' -o ${cfg.externalInterface} ${dest}
             '') cfg.internalIPs}
 
+            # NAT from external ports to internal ports.
+            ${concatMapStrings (fwd: ''
+              iptables -w -t nat -A PREROUTING \
+                -i ${cfg.externalInterface} -p tcp \
+                --dport ${builtins.toString fwd.sourcePort} \
+                -j DNAT --to-destination ${fwd.destination}
+            '') cfg.forwardPorts}
+
             echo 1 > /proc/sys/net/ipv4/ip_forward
           '';
 

From 5b9110233d47d892bb6db759681c39da23420839 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 2 Sep 2014 00:55:54 +0400
Subject: [PATCH 1069/1453] Update atftp

---
 pkgs/tools/networking/atftp/default.nix | 57 ++++++++++++++-----------
 1 file changed, 32 insertions(+), 25 deletions(-)

diff --git a/pkgs/tools/networking/atftp/default.nix b/pkgs/tools/networking/atftp/default.nix
index acd71ea893df..b6bdfc7fabc6 100644
--- a/pkgs/tools/networking/atftp/default.nix
+++ b/pkgs/tools/networking/atftp/default.nix
@@ -1,27 +1,34 @@
-{ stdenv, fetchurl, pcre, readline }:
-
+{ lib, stdenv, fetchurl, readline, tcp_wrappers, pcre, makeWrapper }:
+assert stdenv.isLinux;
+assert stdenv.gcc.gcc != null;
+let
+version = "0.7";
+debianPatch = fetchurl {
+url = "mirror://debian/pool/main/a/atftp/atftp_${version}.dfsg-11.diff.gz";
+sha256 = "07g4qbmp0lnscg2dkj6nsj657jaghibvfysdm1cdxcn215n3zwqd";
+};
+in
 stdenv.mkDerivation {
-  name = "atftp-0.7.1";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/atftp/atftp-0.7.1.tar.gz";
-    sha256 = "0bgr31gbnr3qx4ixf8hz47l58sh3367xhcnfqd8233fvr84nyk5f";
-  };
-
-  buildInputs = [ pcre readline ];
-
-  NIX_LDFLAGS = "-lgcc_s"; # for pthread_cancel
-
-  configureFlags = [
-    "--enable-libreadline"
-    "--enable-libpcre"
-    "--enable-mtftp"
-  ];
-
-  meta = with stdenv.lib; {
-    description = "Advanced TFTP server and client";
-    homepage = http://sourceforge.net/projects/atftp/;
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-  };
+name = "atftp";
+inherit version;
+src = fetchurl {
+url = "mirror://debian/pool/main/a/atftp/atftp_${version}.dfsg.orig.tar.gz";
+sha256 = "0nd5dl14d6z5abgcbxcn41rfn3syza6s57bbgh4aq3r9cxdmz08q";
+};
+buildInputs = [ readline tcp_wrappers pcre makeWrapper ];
+patches = [ debianPatch ];
+postInstall = ''
+wrapProgram $out/sbin/atftpd --prefix LD_LIBRARY_PATH : ${stdenv.gcc.gcc}/lib${if stdenv.system == "x86_64-linux" then "64" else ""}
+'';
+meta = {
+description = "Advanced tftp tools";
+maintainers = lib.maintainers.raskin;
+platforms = lib.platforms.linux;
+license = lib.licenses.gpl2Plus;
+passthru = {
+updateInfo = {
+downloadPage = "http://packages.debian.org/source/wheezy/atftp";
+};
+};
+};
 }

From 038c71a11a6800b89dce123b074837f8033126ba Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 1 Sep 2014 22:50:14 +0200
Subject: [PATCH 1070/1453] boinc: update from 7.2.42 to 7.4.14 (fixes
 CVE-2013-2298)

---
 pkgs/applications/science/misc/boinc/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix
index 7020de0bca88..0898b458593e 100644
--- a/pkgs/applications/science/misc/boinc/default.nix
+++ b/pkgs/applications/science/misc/boinc/default.nix
@@ -3,12 +3,12 @@ mesa, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK, xcbutil,
 sqlite, gtk, patchelf, libXScrnSaver, libnotify, libX11, libxcb }:
 
 stdenv.mkDerivation rec {
-  name = "boinc-7.2.42";
+  name = "boinc-7.4.14";
 
   src = fetchgit {
     url = "git://boinc.berkeley.edu/boinc-v2.git";
-    rev = "dd0d630882547c123ca0f8fda7a62e058d60f6a9";
-    sha256 = "1zifpi3mjgaj68fba6kammp3x7z8n2x164zz6fj91xfiapnan56j";
+    rev = "fb31ab18f94f3b5141bea03e8537d76c606cd276";
+    sha256 = "1465zl8l87fm1ps5f2may6mcc3pp40mpd6wphpxnwwk1lmv48x96";
   };
 
   buildInputs = [ libtool automake autoconf m4 pkgconfig curl mesa libXmu libXi

From e12337156c35ed2bfd245a995e0e77a6192f94ee Mon Sep 17 00:00:00 2001
From: Vladimir Still <xstill@mail.muni.cz>
Date: Sun, 31 Aug 2014 13:15:39 +0200
Subject: [PATCH 1071/1453] sshd: Allow to specify ListenAddress.

---
 .../modules/services/networking/ssh/sshd.nix  | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index e4b29a0b9090..3eb646f07508 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -144,6 +144,33 @@ in
         '';
       };
 
+      listenAddresses = mkOption {
+        type = types.listOf types.optionSet;
+        default = [];
+        example = [ { addr = "192.168.3.1"; port = 22; } { addr = "0.0.0.0"; port = 64022; } ];
+        description = ''
+          List of addresses and ports to listen on (ListenAddress directive
+          in config). If port is not specified for address sshd will listen
+          on all ports specified by ports option.
+        '';
+        options = {
+          addr = mkOption {
+            type = types.nullOr types.str;
+            default = null;
+            description = ''
+              Host, IPv4 or IPv6 address to listen to.
+            '';
+          };
+          port = mkOption {
+            type = types.nullOr types.int;
+            default = null;
+            description = ''
+              Port to listen to.
+            '';
+          };
+        };
+      };
+
       passwordAuthentication = mkOption {
         type = types.bool;
         default = true;
@@ -349,6 +376,10 @@ in
           Port ${toString port}
         '') cfg.ports}
 
+        ${concatMapStrings ({ port, addr }: ''
+          ListenAddress ${addr}${if port != null then ":" + toString port else ""}
+        '') cfg.listenAddresses}
+
         ${optionalString cfgc.setXAuthLocation ''
             XAuthLocation ${pkgs.xorg.xauth}/bin/xauth
         ''}
@@ -383,6 +414,10 @@ in
         assertion = (data.publicKey == null && data.publicKeyFile != null) ||
                     (data.publicKey != null && data.publicKeyFile == null);
         message = "knownHost ${name} must contain either a publicKey or publicKeyFile";
+      })
+      ++ flip map cfg.listenAddresses ({ addr, port }: {
+        assertion = addr != null;
+        message = "addr must be spefied in each listenAddresses entry";
       });
 
   };

From ac39d839c3dccb2890b64a3fbe1a28d8aba1007f Mon Sep 17 00:00:00 2001
From: Vladimir Still <xstill@mail.muni.cz>
Date: Sun, 31 Aug 2014 17:21:14 +0200
Subject: [PATCH 1072/1453] sshd: Add note about firewall and listenAddresses.

---
 nixos/modules/services/networking/ssh/sshd.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index 3eb646f07508..9b2f56fa400a 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -152,6 +152,8 @@ in
           List of addresses and ports to listen on (ListenAddress directive
           in config). If port is not specified for address sshd will listen
           on all ports specified by ports option.
+          NOTE: setting this option won't automatically enable given ports
+          in firewall configuration.
         '';
         options = {
           addr = mkOption {

From a2394f09c7003efc238eb065afdd57221f6ba257 Mon Sep 17 00:00:00 2001
From: Vladimir Still <xstill@mail.muni.cz>
Date: Mon, 1 Sep 2014 13:02:39 +0200
Subject: [PATCH 1073/1453] sshd: Add note about listening on port 22 to
 listenAddresses.

---
 nixos/modules/services/networking/ssh/sshd.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index 9b2f56fa400a..956c31a8ba36 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -151,7 +151,8 @@ in
         description = ''
           List of addresses and ports to listen on (ListenAddress directive
           in config). If port is not specified for address sshd will listen
-          on all ports specified by ports option.
+          on all ports specified by <literal>ports</literal> option.
+          NOTE: this will override default listening on all local addresses and port 22.
           NOTE: setting this option won't automatically enable given ports
           in firewall configuration.
         '';

From 82ed86dd7675e19a496ef15da10af73d12867490 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 2 Sep 2014 01:03:39 +0400
Subject: [PATCH 1074/1453] Remove unneeded definitions

---
 pkgs/misc/emulators/stella/default.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/misc/emulators/stella/default.nix b/pkgs/misc/emulators/stella/default.nix
index 154a5d02a80a..3f10d7afb6e3 100644
--- a/pkgs/misc/emulators/stella/default.nix
+++ b/pkgs/misc/emulators/stella/default.nix
@@ -15,11 +15,6 @@ stdenv.mkDerivation rec {
   buildInputs = with stdenv.lib;
   [ pkgconfig SDL2 ];
 
-  configureFlags = ''
-  '';
-
-  NIX_CFLAGS_COMPILE="";
-	
   meta = with stdenv.lib; {
     description = "An open-source Atari 2600 VCS emulator";
     longDescription = ''

From f87c516a9135f6086b6c05d510a7ae8d3112bee7 Mon Sep 17 00:00:00 2001
From: "tv@shackspace.de" <tv@shackspace.de>
Date: Tue, 29 Jul 2014 22:13:47 +0200
Subject: [PATCH 1075/1453] urlwatch: add version 1.16

---
 pkgs/tools/networking/urlwatch/default.nix | 21 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/tools/networking/urlwatch/default.nix

diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix
new file mode 100644
index 000000000000..4843f07c8f22
--- /dev/null
+++ b/pkgs/tools/networking/urlwatch/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, python3Packages }:
+
+python3Packages.buildPythonPackage rec {
+  name = "urlwatch-1.16";
+
+  src = fetchurl {
+    url = "http://thp.io/2008/urlwatch/${name}.tar.gz";
+    sha256 = "0yf1m909awfm06z7xwn20qxbbgslb1vjwwb6rygp6bn7sq022f1f";
+  };
+
+  patchPhase = ''
+    ./convert-to-python3.sh
+  '';
+
+  meta = {
+    description = "A tool for monitoring webpages for updates";
+    homepage = https://thp.io/2008/urlwatch/;
+    license = stdenv.lib.licenses.bsd3;
+    maintainers = [ stdenv.lib.maintainers.tv ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fb5cab51b452..0905a6a951d5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2437,6 +2437,8 @@ let
 
   uptimed = callPackage ../tools/system/uptimed { };
 
+  urlwatch = callPackage ../tools/networking/urlwatch { };
+
   varnish = callPackage ../servers/varnish { };
 
   varnish2 = callPackage ../servers/varnish/2.1.nix { };

From a6dd9bd0cb3ef4896c41f70e37bc3a72d36aa569 Mon Sep 17 00:00:00 2001
From: "tv@shackspace.de" <tv@shackspace.de>
Date: Wed, 30 Jul 2014 19:44:21 +0200
Subject: [PATCH 1076/1453] python-wrapper: fix wrapped argv[0] w/o sed, maybe

---
 pkgs/build-support/setup-hooks/make-wrapper.sh  | 5 ++++-
 pkgs/development/python-modules/generic/wrap.sh | 6 ------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/make-wrapper.sh b/pkgs/build-support/setup-hooks/make-wrapper.sh
index 41f2a59246d1..95d1a5192137 100644
--- a/pkgs/build-support/setup-hooks/make-wrapper.sh
+++ b/pkgs/build-support/setup-hooks/make-wrapper.sh
@@ -96,7 +96,10 @@ filterExisting() {
 # Syntax: wrapProgram <PROGRAM> <MAKE-WRAPPER FLAGS...>
 wrapProgram() {
     local prog="$1"
-    local hidden="$(dirname "$prog")/.$(basename "$prog")"-wrapped
+    local progBasename=$(basename $prog)
+    local hiddenDir=$(dirname $prog)/.$progBasename-wrapped-bin
+    local hidden=$hiddenDir/$progBasename
+    mkdir $hiddenDir
     mv $prog $hidden
     makeWrapper $hidden $prog "$@"
 }
diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh
index 857f002cace9..282aeca9ed1c 100644
--- a/pkgs/development/python-modules/generic/wrap.sh
+++ b/pkgs/development/python-modules/generic/wrap.sh
@@ -26,12 +26,6 @@ wrapPythonProgramsIn() {
             # dont wrap EGG-INFO scripts since they are called from python
             if echo "$i" | grep -v EGG-INFO/scripts; then
                 echo "wrapping \`$i'..."
-                sed -i "$i" -re '1 {
-                    /^#!/!b; :r
-                    /\\$/{N;b r}
-                    /__future__|^ *(#.*)?$/{n;b r}
-                    /^ *[^# ]/i import sys; sys.argv[0] = '"'$(basename "$i")'"'
-                }'
                 wrapProgram "$i" \
                     --prefix PYTHONPATH ":" $program_PYTHONPATH \
                     --prefix PATH ":" $program_PATH

From 2a1a814e5356a93a5c477352a31b6239ae481492 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 2 Sep 2014 01:36:10 +0400
Subject: [PATCH 1077/1453] Make console-getty only used inside container by
 default

---
 nixos/modules/services/ttys/agetty.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/ttys/agetty.nix b/nixos/modules/services/ttys/agetty.nix
index 3878b02b1a84..3958be33df2c 100644
--- a/nixos/modules/services/ttys/agetty.nix
+++ b/nixos/modules/services/ttys/agetty.nix
@@ -70,6 +70,7 @@ with lib;
       { serviceConfig.ExecStart = "@${pkgs.utillinux}/sbin/agetty agetty --noclear --login-program ${pkgs.shadow}/bin/login --keep-baud console 115200,38400,9600 $TERM";
         serviceConfig.Restart = "always";
         restartIfChanged = false;
+	enable = mkDefault config.boot.isContainer;
       };
 
     environment.etc = singleton

From 9deb7f8aae431ed7725cfaa13edf8645d19d91f2 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 2 Sep 2014 01:45:15 +0400
Subject: [PATCH 1078/1453] Create wrapper directory outside of /bin/ for FHS
 chroots to be closer to FHS

---
 pkgs/build-support/setup-hooks/make-wrapper.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/make-wrapper.sh b/pkgs/build-support/setup-hooks/make-wrapper.sh
index 95d1a5192137..dd43068be279 100644
--- a/pkgs/build-support/setup-hooks/make-wrapper.sh
+++ b/pkgs/build-support/setup-hooks/make-wrapper.sh
@@ -97,9 +97,9 @@ filterExisting() {
 wrapProgram() {
     local prog="$1"
     local progBasename=$(basename $prog)
-    local hiddenDir=$(dirname $prog)/.$progBasename-wrapped-bin
-    local hidden=$hiddenDir/$progBasename
-    mkdir $hiddenDir
+    local hiddenDir="$(dirname $prog)/../wrapped-bin/.$progBasename-wrapped-bin"
+    mkdir -p $hiddenDir
+    local hidden="$(cd "$hiddenDir"; pwd)/$progBasename"
     mv $prog $hidden
     makeWrapper $hidden $prog "$@"
 }

From 8ef11bb0ee4567826d9a7509ea2c8f1e226bcebf Mon Sep 17 00:00:00 2001
From: Chris Farmiloe <chrisfarms@gmail.com>
Date: Thu, 12 Jun 2014 15:16:38 +0200
Subject: [PATCH 1079/1453] add openvswitch package + basic nixos module to
 enable it

---
 nixos/modules/module-list.nix                 |   1 +
 nixos/modules/virtualisation/libvirtd.nix     |  11 +-
 nixos/modules/virtualisation/openvswitch.nix  | 120 ++++++++++++++++++
 .../os-specific/linux/openvswitch/default.nix |  49 +++++++
 pkgs/top-level/all-packages.nix               |   2 +
 5 files changed, 180 insertions(+), 3 deletions(-)
 create mode 100644 nixos/modules/virtualisation/openvswitch.nix
 create mode 100644 pkgs/os-specific/linux/openvswitch/default.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 045eb469de94..76d1ed8a9d43 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -365,6 +365,7 @@
   ./virtualisation/docker.nix
   ./virtualisation/libvirtd.nix
   #./virtualisation/nova.nix
+  ./virtualisation/openvswitch.nix
   ./virtualisation/virtualbox-guest.nix
   #./virtualisation/xen-dom0.nix
 ]
diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix
index d7d700d88412..ed157bba8821 100644
--- a/nixos/modules/virtualisation/libvirtd.nix
+++ b/nixos/modules/virtualisation/libvirtd.nix
@@ -7,6 +7,7 @@ with lib;
 let
 
   cfg = config.virtualisation.libvirtd;
+  vswitch = config.virtualisation.vswitch;
   configFile = pkgs.writeText "libvirtd.conf" ''
     unix_sock_group = "libvirtd"
     unix_sock_rw_perms = "0770"
@@ -75,10 +76,14 @@ in
         wantedBy = [ "multi-user.target" ];
         after = [ "systemd-udev-settle.service" ];
 
-        path =
-          [ pkgs.bridge_utils pkgs.dmidecode pkgs.dnsmasq
+        path = [ 
+            pkgs.bridge_utils 
+            pkgs.dmidecode 
+            pkgs.dnsmasq
             pkgs.ebtables
-          ] ++ optional cfg.enableKVM pkgs.qemu_kvm;
+          ] 
+          ++ optional cfg.enableKVM pkgs.qemu_kvm
+          ++ optional vswitch.enable vswitch.package;
 
         preStart =
           ''
diff --git a/nixos/modules/virtualisation/openvswitch.nix b/nixos/modules/virtualisation/openvswitch.nix
new file mode 100644
index 000000000000..2070dd0f7839
--- /dev/null
+++ b/nixos/modules/virtualisation/openvswitch.nix
@@ -0,0 +1,120 @@
+# Systemd services for openvswitch
+
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+    cfg = config.virtualisation.vswitch;
+
+in
+
+{
+    # ------------------------------------------------------------
+
+    options = {
+
+        virtualisation.vswitch.enable = mkOption {
+            type = types.bool;
+            default = false;
+            description =
+                ''
+                Enable Open vSwitch. A configuration 
+                daemon (ovs-server) will be started.
+                '';
+        };
+
+
+        virtualisation.vswitch.package = mkOption {
+            type = types.package;
+            default = pkgs.openvswitch;
+            description =
+                ''
+                Open vSwitch package to use.
+                '';
+        };
+
+    };
+
+    # ------------------------------------------------------------
+
+    config = mkIf cfg.enable (let 
+
+        # Where the communication sockets live
+        runDir = "/var/run/openvswitch";
+
+        # Where the config database live (can't be in nix-store)
+        stateDir = "/var/db/openvswitch";
+
+        # The path to the an initialized version of the database 
+        db = pkgs.stdenv.mkDerivation {
+            name = "vswitch.db";
+            unpackPhase = "true";
+            buildPhase = "true";
+            buildInputs = with pkgs; [
+                cfg.package
+            ];
+            installPhase = 
+                ''
+                ensureDir $out/
+                '';
+        };
+
+    in {
+
+        environment.systemPackages = [ cfg.package ]; 
+
+        boot.kernelModules = [ "tun" "openvswitch" ];
+
+        boot.extraModulePackages = [ cfg.package ];
+
+        systemd.services.ovsdb = {
+            description = "Open_vSwitch Database Server";
+            wantedBy = [ "multi-user.target" ];
+            after = [ "systemd-udev-settle.service" ];
+            wants = [ "vswitchd.service" ];
+            path = [ cfg.package ];
+            restartTriggers = [ db cfg.package ];
+            # Create the config database
+            preStart = 
+                ''
+                mkdir -p ${runDir}
+                mkdir -p /var/db/openvswitch
+                chmod +w /var/db/openvswitch
+                if [[ ! -e /var/db/openvswitch/conf.db ]]; then
+                    ${cfg.package}/bin/ovsdb-tool create \
+                        "/var/db/openvswitch/conf.db" \
+                        "${cfg.package}/share/openvswitch/vswitch.ovsschema"
+                fi
+                chmod -R +w /var/db/openvswitch
+                '';
+            serviceConfig.ExecStart = 
+                ''
+                ${cfg.package}/bin/ovsdb-server \
+                    --remote=punix:${runDir}/db.sock \
+                    --private-key=db:Open_vSwitch,SSL,private_key \
+                    --certificate=db:Open_vSwitch,SSL,certificate \
+                    --bootstrap-ca-cert=db:Open_vSwitch,SSL,ca_cert \
+                    --unixctl=ovsdb.ctl.sock \
+                    /var/db/openvswitch/conf.db
+                '';                
+            serviceConfig.Restart = "always";
+            serviceConfig.RestartSec = 3;
+            postStart =
+                ''
+                ${cfg.package}/bin/ovs-vsctl --timeout 3 --retry --no-wait init
+                '';
+
+        };
+
+        systemd.services.vswitchd = {
+            description = "Open_vSwitch Daemon";
+            bindsTo = [ "ovsdb.service" ];
+            after = [ "ovsdb.service" ];
+            path = [ cfg.package ];
+            serviceConfig.ExecStart = ''${cfg.package}/bin/ovs-vswitchd'';
+        };
+
+    });
+
+}
diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix
new file mode 100644
index 000000000000..13b41ebe9c89
--- /dev/null
+++ b/pkgs/os-specific/linux/openvswitch/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchurl, openssl, python27, iproute, perl510, kernel ? null}:
+let
+
+    version = "2.1.2";
+
+    skipKernelMod = kernel == null;
+
+in
+stdenv.mkDerivation {
+    version = "2.1.2";
+    name = "openvswitch-${version}";
+    src = fetchurl {
+        url = "http://openvswitch.org/releases/openvswitch-2.1.2.tar.gz";
+        sha256 = "16q7faqrj2pfchhn0x5s9ggi5ckcg9n62f6bnqaih064aaq2jm47";
+    };
+    kernel = if skipKernelMod then null else kernel.dev;
+    buildInputs = [
+        openssl
+        python27
+        perl510
+    ];
+    configureFlags = [
+        "--localstatedir=/var"
+        "--sharedstatedir=/var"
+        "--sbindir=$(out)/bin"
+    ] ++ (if skipKernelMod then [] else ["--with-linux"]);
+    # Leave /var out of this!
+    installFlags = [
+        "LOGDIR=$(TMPDIR)/dummy"
+        "RUNDIR=$(TMPDIR)/dummy"
+        "PKIDIR=$(TMPDIR)/dummy"
+    ];
+    meta = {
+        platforms = stdenv.lib.platforms.linux;
+        description = "A multilayer virtual switch";
+        longDescription = ''
+            Open vSwitch is a production quality, multilayer virtual switch 
+            licensed under the open source Apache 2.0 license. It is 
+            designed to enable massive network automation through 
+            programmatic extension, while still supporting standard 
+            management interfaces and protocols (e.g. NetFlow, sFlow, SPAN, 
+            RSPAN, CLI, LACP, 802.1ag). In addition, it is designed to 
+            support distribution across multiple physical servers similar 
+            to VMware's vNetwork distributed vswitch or Cisco's Nexus 1000V.
+        '';
+        homepage = "http://openvswitch.org/";
+        licence = "Apache 2.0";
+    };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0905a6a951d5..9e94861e9f07 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1788,6 +1788,8 @@ let
 
   openvpn_learnaddress = callPackage ../tools/networking/openvpn/openvpn_learnaddress.nix { };
 
+  openvswitch = callPackage ../os-specific/linux/openvswitch { };
+
   optipng = callPackage ../tools/graphics/optipng {
     libpng = libpng12;
   };

From 76a4de68c17217e016043dc19b98a96ea5073b0f Mon Sep 17 00:00:00 2001
From: Chris Farmiloe <chrisfarms@gmail.com>
Date: Thu, 12 Jun 2014 16:08:49 +0200
Subject: [PATCH 1080/1453] formatting/retab

---
 nixos/modules/virtualisation/openvswitch.nix  | 195 +++++++++---------
 .../os-specific/linux/openvswitch/default.nix |  83 ++++----
 2 files changed, 138 insertions(+), 140 deletions(-)

diff --git a/nixos/modules/virtualisation/openvswitch.nix b/nixos/modules/virtualisation/openvswitch.nix
index 2070dd0f7839..c1579d94657c 100644
--- a/nixos/modules/virtualisation/openvswitch.nix
+++ b/nixos/modules/virtualisation/openvswitch.nix
@@ -5,116 +5,113 @@
 with lib;
 
 let
-    cfg = config.virtualisation.vswitch;
+  cfg = config.virtualisation.vswitch;
 
 in
 
 {
-    # ------------------------------------------------------------
 
-    options = {
+  options = {
 
-        virtualisation.vswitch.enable = mkOption {
-            type = types.bool;
-            default = false;
-            description =
-                ''
-                Enable Open vSwitch. A configuration 
-                daemon (ovs-server) will be started.
-                '';
-        };
+    virtualisation.vswitch.enable = mkOption {
+      type = types.bool;
+      default = false;
+      description =
+        ''
+        Enable Open vSwitch. A configuration 
+        daemon (ovs-server) will be started.
+        '';
+    };
 
 
-        virtualisation.vswitch.package = mkOption {
-            type = types.package;
-            default = pkgs.openvswitch;
-            description =
-                ''
-                Open vSwitch package to use.
-                '';
-        };
+    virtualisation.vswitch.package = mkOption {
+      type = types.package;
+      default = pkgs.openvswitch;
+      description =
+        ''
+        Open vSwitch package to use.
+        '';
+    };
+
+  };
+
+  config = mkIf cfg.enable (let 
+
+    # Where the communication sockets live
+    runDir = "/var/run/openvswitch";
+
+    # Where the config database live (can't be in nix-store)
+    stateDir = "/var/db/openvswitch";
+
+    # The path to the an initialized version of the database 
+    db = pkgs.stdenv.mkDerivation {
+      name = "vswitch.db";
+      unpackPhase = "true";
+      buildPhase = "true";
+      buildInputs = with pkgs; [
+        cfg.package
+      ];
+      installPhase = 
+        ''
+        ensureDir $out/
+        '';
+    };
+
+  in {
+
+    environment.systemPackages = [ cfg.package ]; 
+
+    boot.kernelModules = [ "tun" "openvswitch" ];
+
+    boot.extraModulePackages = [ cfg.package ];
+
+    systemd.services.ovsdb = {
+      description = "Open_vSwitch Database Server";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "systemd-udev-settle.service" ];
+      wants = [ "vswitchd.service" ];
+      path = [ cfg.package ];
+      restartTriggers = [ db cfg.package ];
+      # Create the config database
+      preStart = 
+        ''
+        mkdir -p ${runDir}
+        mkdir -p /var/db/openvswitch
+        chmod +w /var/db/openvswitch
+        if [[ ! -e /var/db/openvswitch/conf.db ]]; then
+          ${cfg.package}/bin/ovsdb-tool create \
+            "/var/db/openvswitch/conf.db" \
+            "${cfg.package}/share/openvswitch/vswitch.ovsschema"
+        fi
+        chmod -R +w /var/db/openvswitch
+        '';
+      serviceConfig.ExecStart = 
+        ''
+        ${cfg.package}/bin/ovsdb-server \
+          --remote=punix:${runDir}/db.sock \
+          --private-key=db:Open_vSwitch,SSL,private_key \
+          --certificate=db:Open_vSwitch,SSL,certificate \
+          --bootstrap-ca-cert=db:Open_vSwitch,SSL,ca_cert \
+          --unixctl=ovsdb.ctl.sock \
+          /var/db/openvswitch/conf.db
+        '';       
+      serviceConfig.Restart = "always";
+      serviceConfig.RestartSec = 3;
+      postStart =
+        ''
+        ${cfg.package}/bin/ovs-vsctl --timeout 3 --retry --no-wait init
+        '';
 
     };
 
-    # ------------------------------------------------------------
+    systemd.services.vswitchd = {
+      description = "Open_vSwitch Daemon";
+      bindsTo = [ "ovsdb.service" ];
+      after = [ "ovsdb.service" ];
+      path = [ cfg.package ];
+      serviceConfig.ExecStart = ''${cfg.package}/bin/ovs-vswitchd'';
+    };
 
-    config = mkIf cfg.enable (let 
-
-        # Where the communication sockets live
-        runDir = "/var/run/openvswitch";
-
-        # Where the config database live (can't be in nix-store)
-        stateDir = "/var/db/openvswitch";
-
-        # The path to the an initialized version of the database 
-        db = pkgs.stdenv.mkDerivation {
-            name = "vswitch.db";
-            unpackPhase = "true";
-            buildPhase = "true";
-            buildInputs = with pkgs; [
-                cfg.package
-            ];
-            installPhase = 
-                ''
-                ensureDir $out/
-                '';
-        };
-
-    in {
-
-        environment.systemPackages = [ cfg.package ]; 
-
-        boot.kernelModules = [ "tun" "openvswitch" ];
-
-        boot.extraModulePackages = [ cfg.package ];
-
-        systemd.services.ovsdb = {
-            description = "Open_vSwitch Database Server";
-            wantedBy = [ "multi-user.target" ];
-            after = [ "systemd-udev-settle.service" ];
-            wants = [ "vswitchd.service" ];
-            path = [ cfg.package ];
-            restartTriggers = [ db cfg.package ];
-            # Create the config database
-            preStart = 
-                ''
-                mkdir -p ${runDir}
-                mkdir -p /var/db/openvswitch
-                chmod +w /var/db/openvswitch
-                if [[ ! -e /var/db/openvswitch/conf.db ]]; then
-                    ${cfg.package}/bin/ovsdb-tool create \
-                        "/var/db/openvswitch/conf.db" \
-                        "${cfg.package}/share/openvswitch/vswitch.ovsschema"
-                fi
-                chmod -R +w /var/db/openvswitch
-                '';
-            serviceConfig.ExecStart = 
-                ''
-                ${cfg.package}/bin/ovsdb-server \
-                    --remote=punix:${runDir}/db.sock \
-                    --private-key=db:Open_vSwitch,SSL,private_key \
-                    --certificate=db:Open_vSwitch,SSL,certificate \
-                    --bootstrap-ca-cert=db:Open_vSwitch,SSL,ca_cert \
-                    --unixctl=ovsdb.ctl.sock \
-                    /var/db/openvswitch/conf.db
-                '';                
-            serviceConfig.Restart = "always";
-            serviceConfig.RestartSec = 3;
-            postStart =
-                ''
-                ${cfg.package}/bin/ovs-vsctl --timeout 3 --retry --no-wait init
-                '';
-
-        };
-
-        systemd.services.vswitchd = {
-            description = "Open_vSwitch Daemon";
-            bindsTo = [ "ovsdb.service" ];
-            after = [ "ovsdb.service" ];
-            path = [ cfg.package ];
-            serviceConfig.ExecStart = ''${cfg.package}/bin/ovs-vswitchd'';
-        };
-
-    });
+  });
 
 }
diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix
index 13b41ebe9c89..6b82cc5f9b69 100644
--- a/pkgs/os-specific/linux/openvswitch/default.nix
+++ b/pkgs/os-specific/linux/openvswitch/default.nix
@@ -1,49 +1,50 @@
 { stdenv, fetchurl, openssl, python27, iproute, perl510, kernel ? null}:
 let
 
-    version = "2.1.2";
+  version = "2.1.2";
 
-    skipKernelMod = kernel == null;
+  skipKernelMod = kernel == null;
 
 in
 stdenv.mkDerivation {
-    version = "2.1.2";
-    name = "openvswitch-${version}";
-    src = fetchurl {
-        url = "http://openvswitch.org/releases/openvswitch-2.1.2.tar.gz";
-        sha256 = "16q7faqrj2pfchhn0x5s9ggi5ckcg9n62f6bnqaih064aaq2jm47";
-    };
-    kernel = if skipKernelMod then null else kernel.dev;
-    buildInputs = [
-        openssl
-        python27
-        perl510
-    ];
-    configureFlags = [
-        "--localstatedir=/var"
-        "--sharedstatedir=/var"
-        "--sbindir=$(out)/bin"
-    ] ++ (if skipKernelMod then [] else ["--with-linux"]);
-    # Leave /var out of this!
-    installFlags = [
-        "LOGDIR=$(TMPDIR)/dummy"
-        "RUNDIR=$(TMPDIR)/dummy"
-        "PKIDIR=$(TMPDIR)/dummy"
-    ];
-    meta = {
-        platforms = stdenv.lib.platforms.linux;
-        description = "A multilayer virtual switch";
-        longDescription = ''
-            Open vSwitch is a production quality, multilayer virtual switch 
-            licensed under the open source Apache 2.0 license. It is 
-            designed to enable massive network automation through 
-            programmatic extension, while still supporting standard 
-            management interfaces and protocols (e.g. NetFlow, sFlow, SPAN, 
-            RSPAN, CLI, LACP, 802.1ag). In addition, it is designed to 
-            support distribution across multiple physical servers similar 
-            to VMware's vNetwork distributed vswitch or Cisco's Nexus 1000V.
-        '';
-        homepage = "http://openvswitch.org/";
-        licence = "Apache 2.0";
-    };
+  version = "2.1.2";
+  name = "openvswitch-${version}";
+  src = fetchurl {
+    url = "http://openvswitch.org/releases/openvswitch-2.1.2.tar.gz";
+    sha256 = "16q7faqrj2pfchhn0x5s9ggi5ckcg9n62f6bnqaih064aaq2jm47";
+  };
+  kernel = if skipKernelMod then null else kernel.dev;
+  buildInputs = [
+    openssl
+    python27
+    perl510
+  ];
+  configureFlags = [
+    "--localstatedir=/var"
+    "--sharedstatedir=/var"
+    "--sbindir=$(out)/bin"
+  ] ++ (if skipKernelMod then [] else ["--with-linux"]);
+  # Leave /var out of this!
+  installFlags = [
+    "LOGDIR=$(TMPDIR)/dummy"
+    "RUNDIR=$(TMPDIR)/dummy"
+    "PKIDIR=$(TMPDIR)/dummy"
+  ];
+  meta = {
+    platforms = stdenv.lib.platforms.linux;
+    description = "A multilayer virtual switch";
+    longDescription = 
+      ''
+      Open vSwitch is a production quality, multilayer virtual switch 
+      licensed under the open source Apache 2.0 license. It is 
+      designed to enable massive network automation through 
+      programmatic extension, while still supporting standard 
+      management interfaces and protocols (e.g. NetFlow, sFlow, SPAN, 
+      RSPAN, CLI, LACP, 802.1ag). In addition, it is designed to 
+      support distribution across multiple physical servers similar 
+      to VMware's vNetwork distributed vswitch or Cisco's Nexus 1000V.
+      '';
+    homepage = "http://openvswitch.org/";
+    licence = "Apache 2.0";
+  };
 }

From 08534000a4e845f0fc3c368f7195c3cebc0d5daf Mon Sep 17 00:00:00 2001
From: Chris Farmiloe <chrisfarms@gmail.com>
Date: Mon, 16 Jun 2014 16:45:08 +0200
Subject: [PATCH 1081/1453] Ensure libvirtd is started after vswitch and add
 ability to configure how libvirtd guests are shutdown

---
 nixos/modules/virtualisation/libvirtd.nix     | 24 +++++++++++++++++--
 .../development/libraries/libvirt/default.nix |  1 +
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix
index ed157bba8821..318460f4c2cf 100644
--- a/nixos/modules/virtualisation/libvirtd.nix
+++ b/nixos/modules/virtualisation/libvirtd.nix
@@ -57,6 +57,20 @@ in
           '';
       };
 
+    virtualisation.libvirtd.onShutdown =
+      mkOption {
+        type = types.enum ["shutdown" "suspend" ];
+        default = "suspend";
+        description =
+          ''
+            When shutting down / restarting the host what method should
+            be used to gracefully halt the guests. Setting to "shutdown"
+            will cause an ACPI shutdown of each guest. "suspend" will
+            attempt to save the state of the guests ready to restore on boot.
+          '';
+      };
+
+
   };
 
 
@@ -74,7 +88,8 @@ in
       { description = "Libvirt Virtual Machine Management Daemon";
 
         wantedBy = [ "multi-user.target" ];
-        after = [ "systemd-udev-settle.service" ];
+        after = [ "systemd-udev-settle.service" ]
+                ++ optional vswitch.enable "vswitchd.service";
 
         path = [ 
             pkgs.bridge_utils 
@@ -157,7 +172,12 @@ in
             ${pkgs.libvirt}/etc/rc.d/init.d/libvirt-guests start || true
           '';
 
-        postStop = "${pkgs.libvirt}/etc/rc.d/init.d/libvirt-guests stop";
+        postStop = 
+            ''
+            export PATH=${pkgs.gettext}/bin:$PATH
+            export ON_SHUTDOWN=${cfg.onShutdown}
+            ${pkgs.libvirt}/etc/rc.d/init.d/libvirt-guests stop
+            '';
 
         serviceConfig.Type = "oneshot";
         serviceConfig.RemainAfterExit = true;
diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index e2ff06fcd430..a4c8c167b39a 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -39,6 +39,7 @@ stdenv.mkDerivation rec {
   ];
 
   postInstall = ''
+    sed -i 's/ON_SHUTDOWN=suspend/ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}/' $out/libexec/libvirt-guests.sh
     substituteInPlace $out/libexec/libvirt-guests.sh \
       --replace "$out/bin" "${gettext}/bin"
     wrapProgram $out/sbin/libvirtd \

From a0ea30c613f61831054b43fd3c6c73f9e9d7f2b0 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 2 Sep 2014 01:53:42 +0400
Subject: [PATCH 1082/1453] Minor cleanup after merge

---
 pkgs/development/libraries/gmock/default.nix | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/gmock/default.nix b/pkgs/development/libraries/gmock/default.nix
index 33c6e00ef650..71ac281195b6 100644
--- a/pkgs/development/libraries/gmock/default.nix
+++ b/pkgs/development/libraries/gmock/default.nix
@@ -11,12 +11,6 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ unzip cmake ];
 
-  configurePhase = ''
-    mkdir build
-    cd build
-    cmake ../ -DCMAKE_INSTALL_PREFIX=$out
-  '';
-
   buildPhase = ''
     # avoid building gtest
     make gmock gmock_main
@@ -30,7 +24,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "Google mock: Google's framework for writing C++ mock classes.";
+    description = "Google mock: Google's framework for writing C++ mock classes";
     homepage = https://code.google.com/p/googlemock/;
     license = stdenv.lib.licenses.bsd3;
     maintainers = [ stdenv.lib.maintainers.auntie ];

From a1eefe1a949a8426150a12a7cd809c9f6b48da17 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Mon, 1 Sep 2014 23:55:21 +0200
Subject: [PATCH 1083/1453] Update: Haste-Compiler: 0.4.1 -> 0.4.2

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

diff --git a/pkgs/development/libraries/haskell/haste-compiler/default.nix b/pkgs/development/libraries/haskell/haste-compiler/default.nix
index 962bf758a1e6..dfedd812a20a 100644
--- a/pkgs/development/libraries/haskell/haste-compiler/default.nix
+++ b/pkgs/development/libraries/haskell/haste-compiler/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "haste-compiler";
-  version = "0.4.1";
-  sha256 = "15v4c6rxz4n0wmiys6mam8xprcdq8kxnhpwcqnljshr8wlyihn8b";
+  version = "0.4.2";
+  sha256 = "0agbd21c7mgzxyg6lwjl3n8w2r7xcrv3811y0x86rg7q1m7z730m";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From e743d1ca85c582d7f8b3c0d2588e68c485515c94 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 2 Sep 2014 02:04:59 +0400
Subject: [PATCH 1084/1453] Minor cleanup

---
 pkgs/applications/misc/namecoin/default.nix | 4 ++--
 pkgs/applications/misc/namecoin/qt.nix      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/namecoin/default.nix b/pkgs/applications/misc/namecoin/default.nix
index 1a26403e6f4f..b1bd401b2eb4 100644
--- a/pkgs/applications/misc/namecoin/default.nix
+++ b/pkgs/applications/misc/namecoin/default.nix
@@ -30,8 +30,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Decentralized open source information registration and transfer system based on the Bitcoin cryptocurrency";
     homepage = "http://namecoin.info";
-    license = "MIT";
-    maintainers = [ "Chris Double <chris.double@double.co.nz>" ];
+    license = stdenv.lib.licenses.mit;
+    maintainers = [ stdenv.lib.maintainers.doublec ];
     platforms = with stdenv.lib.platforms; linux;
   };
 }
diff --git a/pkgs/applications/misc/namecoin/qt.nix b/pkgs/applications/misc/namecoin/qt.nix
index 08dbee26f0b2..447a2b42b6b3 100644
--- a/pkgs/applications/misc/namecoin/qt.nix
+++ b/pkgs/applications/misc/namecoin/qt.nix
@@ -26,8 +26,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Decentralized open source information registration and transfer system based on the Bitcoin cryptocurrency";
     homepage = "http://namecoin.info";
-    license = "MIT";
-    maintainers = [ "Chris Double <chris.double@double.co.nz>" ];
+    license = stdenv.lib.licenses.mit;
+    maintainers = [ stdenv.lib.maintainers.doublec ];
     platforms = with stdenv.lib.platforms; linux;
   };
 }

From 4cf191a42530cce961b445b40243c3deb9fc4a7c Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 1 Sep 2014 23:58:43 +0200
Subject: [PATCH 1085/1453] miscfiles: update from 1.4.2 to 1.5 and adopt it

---
 pkgs/data/misc/miscfiles/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/data/misc/miscfiles/default.nix b/pkgs/data/misc/miscfiles/default.nix
index db4d13b890fd..a40856e59106 100644
--- a/pkgs/data/misc/miscfiles/default.nix
+++ b/pkgs/data/misc/miscfiles/default.nix
@@ -1,16 +1,17 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "miscfiles-1.4.2";
+  name = "miscfiles-1.5";
 
   src = fetchurl {
     url = "mirror://gnu/miscfiles/${name}.tar.gz";
-    sha256 = "1rh10y63asyrqyp5mlmxy7y4kdp6svk2inws3y7mfx8lsrhcm6dn";
+    sha256 = "005588vfrwx8ghsdv9p7zczj9lbc9a3r4m5aphcaqv8gif4siaka";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.gnu.org/software/miscfiles/;
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = licenses.gpl2Plus;
     description = "Collection of files not of crucial importance for sysadmins";
+    maintainers = with maintainers; [ pSub ];
   };
 }

From 7727a3fe1dad9293eb58f5a7bf49bfb2cdf0daa9 Mon Sep 17 00:00:00 2001
From: Raymond Gauthier <jraygauthier@gmail.com>
Date: Thu, 14 Aug 2014 07:00:00 +0200
Subject: [PATCH 1086/1453] Added support for minimal zim desktop wiki package.

---
 pkgs/applications/office/zim/default.nix | 82 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  4 ++
 2 files changed, 86 insertions(+)
 create mode 100644 pkgs/applications/office/zim/default.nix

diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix
new file mode 100644
index 000000000000..cca52be1a17f
--- /dev/null
+++ b/pkgs/applications/office/zim/default.nix
@@ -0,0 +1,82 @@
+{ stdenv, lib, fetchurl, buildPythonPackage, pythonPackages, pygtk, pygobject, python }:
+
+#
+# TODO: Declare configuration options for the following optional dependencies:
+#  -  File stores: hg, git, bzr
+#  -  Included plugins depenencies: dot, ditaa, dia, any other?
+#  -  pyxdg: Need to make it work first (see setupPyInstallFlags).
+#
+
+buildPythonPackage rec {
+  name = "zim-${version}";
+  version = "0.60";
+  namePrefix = "";
+  
+  src = fetchurl {
+    url = "http://zim-wiki.org/downloads/zim-0.61.tar.gz";
+    sha256 = "0jncxkf83bwra3022jbvjfwhk5w8az0jlwr8nsvm7wa1zfrajhsq";
+  };
+
+  propagatedBuildInputs = [ pythonPackages.sqlite3 pygtk /*pythonPackages.pyxdg*/ pygobject ];
+
+  preBuild = ''
+    mkdir -p $tmp/home
+    export HOME="$tmp/home"
+  '';
+  
+  setupPyInstallFlags = ["--skip-xdg-cmd"];
+  
+  #
+  # Exactly identical to buildPythonPackage's version but for the
+  # `--old-and-unmanagable`, which I removed. This was removed because
+  # this is a setuptools specific flag and as zim is overriding 
+  # the install step, setuptools could not perform its monkey
+  # patching trick for the command. Alternate solutions were to
+  #
+  #  -  Remove the custom install step (tested as working but
+  #	also remove the possibility of performing the xdg-cmd
+  #     stuff).
+  #  -  Explicitly replace distutils import(s) by their setuptools
+  #	equivalent (untested). 
+  #
+  # Both solutions were judged unsatisfactory as altering the code
+  # would be required.
+  #
+  # Note that a improved solution would be to expose the use of 
+  # the `--old-and-unmanagable` flag as an option of passed to the
+  # buildPythonPackage function.
+  #
+  # Also note that I stripped all comments.
+  #
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p "$out/lib/${python.libPrefix}/site-packages"
+
+    export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH"
+
+    ${python}/bin/${python.executable} setup.py install \
+      --install-lib=$out/lib/${python.libPrefix}/site-packages \
+      --prefix="$out" ${lib.concatStringsSep " " setupPyInstallFlags}
+
+    eapth="$out/lib/${python.libPrefix}"/site-packages/easy-install.pth
+    if [ -e "$eapth" ]; then
+	# move colliding easy_install.pth to specifically named one
+	mv "$eapth" $(dirname "$eapth")/${name}.pth
+    fi
+
+    rm -f "$out/lib/${python.libPrefix}"/site-packages/site.py*
+
+    runHook postInstall
+  '';
+  
+  # Testing fails.
+  doCheck = false;
+
+  meta = {
+      description = "A desktop wiki";
+      homepage = http://zim-wiki.org;
+      license = stdenv.lib.licenses.gpl2Plus;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4fd7fc950eac..dc04bb7f7f37 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10279,6 +10279,10 @@ let
 
   zgrviewer = callPackage ../applications/graphics/zgrviewer {};
 
+  zim = callPackage ../applications/office/zim {
+    pygtk = pyGtkGlade;
+  };
+  
   zotero = callPackage ../applications/office/zotero {
     xulrunner = xulrunner_30;
   };

From fa55a997015820ec54f9847f7d297c561e98629f Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 2 Sep 2014 02:12:46 +0400
Subject: [PATCH 1087/1453] Load EHCI befor OHCI and UHCI; from patch by
 Mathnerd314

---
 nixos/modules/system/boot/modprobe.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nixos/modules/system/boot/modprobe.nix b/nixos/modules/system/boot/modprobe.nix
index 652eb046f50a..eaf8cf1ecd6f 100644
--- a/nixos/modules/system/boot/modprobe.nix
+++ b/nixos/modules/system/boot/modprobe.nix
@@ -77,6 +77,11 @@ with lib;
         '')}
         ${config.boot.extraModprobeConfig}
       '';
+    environment.etc."modprobe.d/usb-load-ehci-first.conf".text =
+      ''
+        softdep uhci_hcd pre: ehci_hcd
+        softdep ohci_hcd pre: ehci_hcd
+      '';
 
     environment.systemPackages = [ config.system.sbin.modprobe pkgs.kmod ];
 

From d1db6465bbfdfc1b53d194da5783af5d77cd9025 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 2 Sep 2014 00:08:51 +0200
Subject: [PATCH 1088/1453] muparser: update from 2.2.2 to 2.2.3

---
 pkgs/development/libraries/muparser/default.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/muparser/default.nix b/pkgs/development/libraries/muparser/default.nix
index 9d9a524e86d0..b68f04f642fb 100644
--- a/pkgs/development/libraries/muparser/default.nix
+++ b/pkgs/development/libraries/muparser/default.nix
@@ -1,11 +1,14 @@
 {stdenv, fetchurl, unzip}:
 
-stdenv.mkDerivation {
-	name = "muparser-2.2.2";
-	src = fetchurl {
-		url = mirror://sourceforge/muparser/muparser_v2_2_2.zip;
-		sha256 = "0pncvjzzbwcadgpwnq5r7sl9v5r2y9gjgfnlw0mrs9wj206dbhx9";
-	};
+stdenv.mkDerivation rec {
+  name = "muparser-${version}";
+  version = "2.2.3";
+  url-version = stdenv.lib.replaceChars ["."] ["_"] version;
+
+  src = fetchurl {
+    url = "mirror://sourceforge/muparser/muparser_v${url-version}.zip";
+    sha256 = "00l92k231yb49wijzkspa2l58mapn6vh2dlxnlg0pawjjfv33s6z";
+  };
 
   buildInputs = [ unzip ];
 

From 416b20fbd5d44aea8ff76677ebf2e5ea36827724 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 2 Sep 2014 03:04:17 +0400
Subject: [PATCH 1089/1453] Don't specify Perl version

---
 pkgs/os-specific/linux/openvswitch/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix
index 6b82cc5f9b69..2e25c0383b7b 100644
--- a/pkgs/os-specific/linux/openvswitch/default.nix
+++ b/pkgs/os-specific/linux/openvswitch/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl, python27, iproute, perl510, kernel ? null}:
+{ stdenv, fetchurl, openssl, python27, iproute, perl, kernel ? null}:
 let
 
   version = "2.1.2";
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   buildInputs = [
     openssl
     python27
-    perl510
+    perl
   ];
   configureFlags = [
     "--localstatedir=/var"

From aaa7e89a93eb54babb8facfcd214263e907788d9 Mon Sep 17 00:00:00 2001
From: Ricky Elrod <ricky@elrod.me>
Date: Tue, 2 Sep 2014 02:51:24 -0400
Subject: [PATCH 1090/1453] [screenfetch] Bump to the stable release

Signed-off-by: Ricky Elrod <ricky@elrod.me>
---
 pkgs/tools/misc/screenfetch/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/screenfetch/default.nix b/pkgs/tools/misc/screenfetch/default.nix
index 0ebc712fcf0d..826f4e4d869f 100644
--- a/pkgs/tools/misc/screenfetch/default.nix
+++ b/pkgs/tools/misc/screenfetch/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, xdpyinfo, xprop }:
 
 let
-  version = "2014-05-27";
+  version = "3.6.2";
 in
 stdenv.mkDerivation {
   name = "screenFetch-${version}";
@@ -9,8 +9,8 @@ stdenv.mkDerivation {
 
   src = fetchgit {
     url = git://github.com/KittyKatt/screenFetch.git;
-    rev = "69c46cb94b5765dbcb36905c5a35c42eb8e6e470";
-    sha256 = "0479na831120bpyrg5nb3nb1jr8p8ahkixk1znwg730q3vdcjd6j";
+    rev = "dec1cd6c2471defe4459967fbc8ae15b55714338";
+    sha256 = "138a7g0za5dq27jx7x8gqg7gjkgyq0017v0nbcg68ys7dqlxsdl3";
   };
 
   installPhase = ''

From cc1866eacb1a19b1d57f4737123721e797c9d9b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Tue, 2 Sep 2014 00:25:18 +0200
Subject: [PATCH 1091/1453] processing: apply patch from IRC to make it work
 without the IDE too

---
 .../graphics/processing/default.nix           | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/graphics/processing/default.nix b/pkgs/applications/graphics/processing/default.nix
index 7d0595134e99..ecce0e260bb2 100644
--- a/pkgs/applications/graphics/processing/default.nix
+++ b/pkgs/applications/graphics/processing/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, ant, jre, makeWrapper, libXxf86vm }:
+{ fetchurl, stdenv, ant, jre, makeWrapper, libXxf86vm, which }:
 
 stdenv.mkDerivation rec {
   name = "processing-${version}";
@@ -12,20 +12,21 @@ stdenv.mkDerivation rec {
   # Stop it trying to download its own version of java
   patches = [ ./use-nixpkgs-jre.patch ];
 
-  buildInputs = [ ant jre makeWrapper libXxf86vm ];
+  buildInputs = [ ant jre makeWrapper libXxf86vm which ];
 
   buildPhase = "cd build && ant build";
 
   installPhase = ''
+    mkdir -p $out/${name}
     mkdir -p $out/bin
-    cp -r linux/work/* $out/
-    sed -e "s#APPDIR=\`dirname \"\$APPDIR\"\`#APPDIR=$out#" -i $out/processing
-    sed -e "s#APPDIR=\`dirname \"\$APPDIR\"\`#APPDIR=$out#" -i $out/processing-java
-    mv $out/processing{,-java} $out/bin/
-    wrapProgram $out/bin/processing --prefix PATH : ${jre}/bin --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib
-    wrapProgram $out/bin/processing-java --prefix PATH : ${jre}/bin --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib
-    mkdir $out/java
-    ln -s ${jre}/bin $out/java/
+   cp -r linux/work/* $out/${name}/
+   makeWrapper $out/${name}/processing $out/bin/processing \
+     --prefix PATH : "${jre}/bin:${which}/bin" \
+     --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib
+   makeWrapper $out/${name}/processing-java $out/bin/processing-java \
+     --prefix PATH : "${jre}/bin:${which}/bin" \
+     --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib
+   ln -s ${jre} $out/${name}/java
   '';
 
   meta = with stdenv.lib; {

From b56a348af7c08baa0ca46844e45d34ea67e5bfcf Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Tue, 2 Sep 2014 00:55:19 -0700
Subject: [PATCH 1092/1453] add retroarchMaster package

---
 pkgs/misc/emulators/retroarch/master.nix | 28 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  1 +
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/misc/emulators/retroarch/master.nix

diff --git a/pkgs/misc/emulators/retroarch/master.nix b/pkgs/misc/emulators/retroarch/master.nix
new file mode 100644
index 000000000000..44bd6649045c
--- /dev/null
+++ b/pkgs/misc/emulators/retroarch/master.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchgit, pkgconfig, ffmpeg, mesa, nvidia_cg_toolkit, freetype, libxml2, libv4l
+, coreutils, python34, which, udev, alsaLib, libX11, libXext, libXxf86vm, libXdmcp, SDL
+, pulseaudio ? null }:
+stdenv.mkDerivation rec {
+  name = "retroarch-20140902";
+  src = fetchgit {
+    url = git://github.com/libretro/RetroArch.git;
+    rev = "0856091296c2e47409f36e13007805d71db69483";
+    sha256 = "152dfp6jd7yzvasqrqw4ydjbdcwq4khisia2dax3gydvxkq87nl4";
+  };
+
+  buildInputs = [ pkgconfig ffmpeg mesa nvidia_cg_toolkit freetype libxml2 libv4l coreutils
+                  python34 which udev alsaLib libX11 libXext libXxf86vm libXdmcp SDL pulseaudio ];
+
+  patchPhase = ''
+    export GLOBAL_CONFIG_DIR=$out/etc
+    sed -e 's#/bin/true#${coreutils}/bin/true#' -i qb/qb.libs.sh
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = {
+    homepage = http://libretro.org/;
+    description = "Multi-platform emulator frontend for libretro cores";
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = with stdenv.lib.maintainers; [ MP2E ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 901c80dc6590..e20cd89b416a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11397,6 +11397,7 @@ let
   putty = callPackage ../applications/networking/remote/putty { };
 
   retroarch = callPackage ../misc/emulators/retroarch { };
+  retroarchMaster = callPackage ../misc/emulators/retroarch/master.nix { };
 
   rssglx = callPackage ../misc/screensavers/rss-glx { };
 

From 13bbce96c3fefa68cb81f36e171512bf5c84fc31 Mon Sep 17 00:00:00 2001
From: Vladimir Still <xstill@mail.muni.cz>
Date: Tue, 2 Sep 2014 10:06:04 +0200
Subject: [PATCH 1093/1453] sshd: Fix typo in assetion.

---
 nixos/modules/services/networking/ssh/sshd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index 956c31a8ba36..379dec2e92c1 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -420,7 +420,7 @@ in
       })
       ++ flip map cfg.listenAddresses ({ addr, port }: {
         assertion = addr != null;
-        message = "addr must be spefied in each listenAddresses entry";
+        message = "addr must be specified in each listenAddresses entry";
       });
 
   };

From 73439c605320d82be97aad276329777d3689e481 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Tue, 2 Sep 2014 01:19:44 -0700
Subject: [PATCH 1094/1453] add dolphinEmu and dolphinEmuMaster

Dolphin is a high quality, open source Gamecube/Wii/Triforce emulator for
Windows, Mac OS X and Linux
---
 pkgs/misc/emulators/dolphin-emu/default.nix | 33 ++++++++++++++++++++
 pkgs/misc/emulators/dolphin-emu/master.nix  | 34 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  3 ++
 3 files changed, 70 insertions(+)
 create mode 100644 pkgs/misc/emulators/dolphin-emu/default.nix
 create mode 100644 pkgs/misc/emulators/dolphin-emu/master.nix

diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/misc/emulators/dolphin-emu/default.nix
new file mode 100644
index 000000000000..ff7a57723d39
--- /dev/null
+++ b/pkgs/misc/emulators/dolphin-emu/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib
+, gettext, git, libpthreadstubs, libXrandr, libXext, readline
+, openal, libXdmcp, portaudio, SDL, wxGTK30, fetchurl
+, pulseaudio ? null }:
+
+stdenv.mkDerivation rec {
+  name = "dolphin-emu-4.0.2";
+  src = fetchurl {
+    url = https://github.com/dolphin-emu/dolphin/archive/4.0.2.tar.gz;
+    sha256 = "0a8ikcxdify9d7lqz8fn2axk2hq4q1nvbcsi1b8vb9z0mdrhzw89";
+  };
+
+  cmakeFlags = ''
+    -DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include
+    -DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2}/lib/gtk-2.0/include
+    -DGTK2_INCLUDE_DIRS=${gtk2}/include/gtk-2.0
+    -DCMAKE_BUILD_TYPE=Release
+    -DENABLE_LTO=True
+  '';
+
+  enableParallelBuilding = true;
+
+  buildInputs = [ stdenv pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib
+                  gettext libpthreadstubs libXrandr libXext readline openal
+                  git libXdmcp portaudio SDL wxGTK30 pulseaudio ];
+
+  meta = {
+    homepage = http://dolphin-emu.org/;
+    description = "Gamecube/Wii/Triforce emulator for x86_64 and ARM";
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = with stdenv.lib.maintainers; [ MP2E ];
+  };
+}
diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix
new file mode 100644
index 000000000000..4823d41d1ac2
--- /dev/null
+++ b/pkgs/misc/emulators/dolphin-emu/master.nix
@@ -0,0 +1,34 @@
+{ stdenv, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib
+, gettext, git, libpthreadstubs, libXrandr, libXext, readline
+, openal, libXdmcp, portaudio, SDL, wxGTK30, fetchgit
+, pulseaudio ? null }:
+
+stdenv.mkDerivation rec {
+  name = "dolphin-emu-20140902";
+  src = fetchgit {
+    url = git://github.com/dolphin-emu/dolphin.git;
+    rev = "cc6db8cf26c1508ae382912bc25e64aaf12e0543";
+    sha256 = "17pc4kk1v0p1llc12ifih02j2klfjz29qh8nhz5lapb0a1wr6lb3";
+  };
+
+  cmakeFlags = ''
+    -DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include
+    -DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2}/lib/gtk-2.0/include
+    -DGTK2_INCLUDE_DIRS=${gtk2}/include/gtk-2.0
+    -DCMAKE_BUILD_TYPE=Release
+    -DENABLE_LTO=True
+  '';
+
+  enableParallelBuilding = true;
+
+  buildInputs = [ stdenv pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib
+                  gettext libpthreadstubs libXrandr libXext readline openal
+                  git libXdmcp portaudio SDL wxGTK30 pulseaudio ];
+
+  meta = {
+    homepage = http://dolphin-emu.org/;
+    description = "Gamecube/Wii/Triforce emulator for x86_64 and ARM";
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = with stdenv.lib.maintainers; [ MP2E ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 901c80dc6590..d2d0f69132c4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -933,6 +933,9 @@ let
 
   dotnetfx40 = callPackage ../development/libraries/dotnetfx40 { };
 
+  dolphinEmu = callPackage ../misc/emulators/dolphin-emu { };
+  dolphinEmuMaster = callPackage ../misc/emulators/dolphin-emu/master.nix { };
+
   dropbear = callPackage ../tools/networking/dropbear { };
 
   dtach = callPackage ../tools/misc/dtach { };

From db64ebe167c653ef2b45bc253b6367b4e70666aa Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Tue, 2 Sep 2014 02:03:54 -0700
Subject: [PATCH 1095/1453] Add eternity engine, a Doom port by James Haley

Eternity Engine is a limit removing port descended from BOOM
---
 pkgs/games/eternity-engine/default.nix | 29 +++++++++++++++++++++++++
 pkgs/games/eternity-engine/master.nix  | 30 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  3 +++
 3 files changed, 62 insertions(+)
 create mode 100644 pkgs/games/eternity-engine/default.nix
 create mode 100644 pkgs/games/eternity-engine/master.nix

diff --git a/pkgs/games/eternity-engine/default.nix b/pkgs/games/eternity-engine/default.nix
new file mode 100644
index 000000000000..2e04c76a990c
--- /dev/null
+++ b/pkgs/games/eternity-engine/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, cmake, mesa, SDL, SDL_mixer, SDL_net, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "eternity-engine-3.40.46";
+  src = fetchurl {
+    url = https://github.com/team-eternity/eternity/archive/3.40.46.tar.gz;
+    sha256 = "0jq8q0agw7lgab9q2h8wcaakvg913l9j3a6ss0hn9661plkw2yb4";
+  };
+
+  cmakeFlags = ''
+    -DCMAKE_BUILD_TYPE=Release
+  '';
+
+  buildInputs = [ stdenv cmake mesa SDL SDL_mixer SDL_net ];
+
+  enableParallelBuilding = true;
+
+  installPhase = ''
+  mkdir -p $out/bin
+  cp source/eternity $out/bin
+  '';
+
+  meta = {
+    homepage = http://doomworld.com/eternity;
+    description = "New school Doom port by James Haley";
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = with stdenv.lib.maintainers; [ MP2E ];
+  };
+}
diff --git a/pkgs/games/eternity-engine/master.nix b/pkgs/games/eternity-engine/master.nix
new file mode 100644
index 000000000000..0d0f8e26b440
--- /dev/null
+++ b/pkgs/games/eternity-engine/master.nix
@@ -0,0 +1,30 @@
+{ stdenv, cmake, mesa, SDL, SDL_mixer, SDL_net, fetchgit }:
+
+stdenv.mkDerivation rec {
+  name = "eternity-engine-20140902";
+  src = fetchgit {
+    url = git://github.com/team-eternity/eternity.git;
+    rev = "db21379abb33f6d92dc0e1665e527e4d49acc722";
+    sha256 = "0k54yvxqxnd60az21b734ka3myxkqb7pjmdp3klrkfwp1kl02ysc";
+  };
+
+  cmakeFlags = ''
+    -DCMAKE_BUILD_TYPE=Release
+  '';
+
+  buildInputs = [ stdenv cmake mesa SDL SDL_mixer SDL_net ];
+
+  enableParallelBuilding = true;
+
+  installPhase = ''
+  mkdir -p $out/bin
+  cp source/eternity $out/bin
+  '';
+
+  meta = {
+    homepage = http://doomworld.com/eternity;
+    description = "New school Doom port by James Haley";
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = with stdenv.lib.maintainers; [ MP2E ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 901c80dc6590..30f43d300599 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -993,6 +993,9 @@ let
 
   ethtool = callPackage ../tools/misc/ethtool { };
 
+  eternity = callPackage ../games/eternity-engine { };
+  eternityMaster = callPackage ../games/eternity-engine/master.nix { };
+
   ettercap = callPackage ../applications/networking/sniffers/ettercap { };
 
   euca2ools = callPackage ../tools/virtualization/euca2ools { pythonPackages = python26Packages; };

From cc7fa316a4c3608cba955a4846fddcf21a2ff81b Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Tue, 2 Sep 2014 01:26:27 -0700
Subject: [PATCH 1096/1453] dolphinEmu doesn't need the git package

---
 pkgs/misc/emulators/dolphin-emu/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/misc/emulators/dolphin-emu/default.nix
index ff7a57723d39..812e20ebc064 100644
--- a/pkgs/misc/emulators/dolphin-emu/default.nix
+++ b/pkgs/misc/emulators/dolphin-emu/default.nix
@@ -1,5 +1,5 @@
 { stdenv, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib
-, gettext, git, libpthreadstubs, libXrandr, libXext, readline
+, gettext, libpthreadstubs, libXrandr, libXext, readline
 , openal, libXdmcp, portaudio, SDL, wxGTK30, fetchurl
 , pulseaudio ? null }:
 

From eaeee5748320ca07caad646de3e981ad9bfe8c58 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Tue, 2 Sep 2014 11:20:26 +0200
Subject: [PATCH 1097/1453] gnome-tweak-tool: update 3.10.1 -> 3.12.0

---
 .../desktops/gnome-3/3.12/misc/gnome-tweak-tool/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/default.nix
index 2eccb9a32cf9..e424ab3635ad 100644
--- a/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/default.nix
@@ -4,11 +4,11 @@
 , gnome3, librsvg, gdk_pixbuf, file, libnotify }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-tweak-tool-3.10.1";
+  name = "gnome-tweak-tool-3.12.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-tweak-tool/3.10/${name}.tar.xz";
-    sha256 = "fb5af9022c0521a925ef9f295e4080212b1b45427cd5f5f3a901667590afa7ec";
+    url = "mirror://gnome/sources/gnome-tweak-tool/3.12/${name}.tar.xz";
+    sha256 = "f8811d638797ef62500770a8dccc5bc689a427c8396a0dff8cbeddffdebf0e29";
   };
 
   doCheck = true;

From 463585a5ecf33064747fe9720007416fdd6f68a5 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Tue, 2 Sep 2014 11:20:26 +0200
Subject: [PATCH 1098/1453] gnome-tweak-tool: update 3.10.1 -> 3.12.0

---
 .../desktops/gnome-3/3.12/misc/gnome-tweak-tool/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/default.nix
index 2eccb9a32cf9..e424ab3635ad 100644
--- a/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/default.nix
@@ -4,11 +4,11 @@
 , gnome3, librsvg, gdk_pixbuf, file, libnotify }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-tweak-tool-3.10.1";
+  name = "gnome-tweak-tool-3.12.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-tweak-tool/3.10/${name}.tar.xz";
-    sha256 = "fb5af9022c0521a925ef9f295e4080212b1b45427cd5f5f3a901667590afa7ec";
+    url = "mirror://gnome/sources/gnome-tweak-tool/3.12/${name}.tar.xz";
+    sha256 = "f8811d638797ef62500770a8dccc5bc689a427c8396a0dff8cbeddffdebf0e29";
   };
 
   doCheck = true;

From aa8a728b047c3955f8bacda1016aeef39de90518 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 29 Aug 2014 18:18:02 +0200
Subject: [PATCH 1099/1453] Cache::Cache: Disable tests

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index a50a56177947..67accf016cc9 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -480,6 +480,7 @@ let self = _self // overrides; _self = with self; {
       sha256 = "14s75bsm5irisp8wkbwl3ycw160srr1rks7x9jcbvcxh79wr6gbh";
     };
     propagatedBuildInputs = [ DigestSHA1 Error IPCShareLite ];
+    doCheck = false; # randomly fails
   };
 
   CacheFastMmap = buildPerlPackage rec {

From ccd4a52f68479599f8bfaa2656d0c00acd1cc209 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Sep 2014 15:10:13 +0200
Subject: [PATCH 1100/1453] haskell-git-annex: update to version 5.20140831

---
 .../version-management/git-and-tools/git-annex/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
index 62132271ec99..7224d8c6900d 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
@@ -17,8 +17,8 @@
 
 cabal.mkDerivation (self: {
   pname = "git-annex";
-  version = "5.20140817";
-  sha256 = "0cly19rd250qiikzszgad2r5xz570kr00vcb8ij6icbm53pw3hxc";
+  version = "5.20140831";
+  sha256 = "0s2pc8bm3c79dsbafwp2pc5yghzh6vdzs9sj0mfq6rxiv27wrrwq";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [

From 1cac137bd799882b877778a69951cb023db80d4b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Sep 2014 15:10:24 +0200
Subject: [PATCH 1101/1453] haskell-Chart-cairo: update to version 1.3

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

diff --git a/pkgs/development/libraries/haskell/Chart-cairo/default.nix b/pkgs/development/libraries/haskell/Chart-cairo/default.nix
index d2dea8158197..28480a4d27d3 100644
--- a/pkgs/development/libraries/haskell/Chart-cairo/default.nix
+++ b/pkgs/development/libraries/haskell/Chart-cairo/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "Chart-cairo";
-  version = "1.2.4";
-  sha256 = "1ggqh3v14mwv9q1pmz3hbx7g1dvibfwl1vzvag92q7432q4pqm2z";
+  version = "1.3";
+  sha256 = "1d8v4imbb2g30gbxj3xlm1vqc17cnqbiysxp78n3vrxnalr8s98l";
   buildDepends = [
     cairo Chart colour dataDefaultClass lens mtl operational time
   ];

From e76cc54f0c36bbfaff4e0e29d18d3cec5753f678 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Sep 2014 15:10:26 +0200
Subject: [PATCH 1102/1453] haskell-Chart-diagrams: update to version 1.3

---
 .../development/libraries/haskell/Chart-diagrams/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/Chart-diagrams/default.nix b/pkgs/development/libraries/haskell/Chart-diagrams/default.nix
index 002b762fbac2..ff4898eb1e7d 100644
--- a/pkgs/development/libraries/haskell/Chart-diagrams/default.nix
+++ b/pkgs/development/libraries/haskell/Chart-diagrams/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "Chart-diagrams";
-  version = "1.2.4";
-  sha256 = "099frqvfjqqc7h3zr52saqyg37di0klr0y649afzxd7lj3d67mvw";
+  version = "1.3";
+  sha256 = "1lfdv2bn942w4b0bjd6aw59wdc2jfk305ym5vm88liy9127b65bp";
   buildDepends = [
     blazeSvg Chart colour dataDefaultClass diagramsCore diagramsLib
     diagramsPostscript diagramsSvg lens mtl operational SVGFonts text
@@ -20,6 +20,5 @@ cabal.mkDerivation (self: {
     description = "Diagrams backend for Charts";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
   };
 })

From ba1ccb4bf446970ad40e32e697d8cd832de63e39 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Sep 2014 15:10:29 +0200
Subject: [PATCH 1103/1453] haskell-Chart-gtk: update to version 1.3

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

diff --git a/pkgs/development/libraries/haskell/Chart-gtk/default.nix b/pkgs/development/libraries/haskell/Chart-gtk/default.nix
index 9dbb3c8ae9a9..0ce13bd87378 100644
--- a/pkgs/development/libraries/haskell/Chart-gtk/default.nix
+++ b/pkgs/development/libraries/haskell/Chart-gtk/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "Chart-gtk";
-  version = "1.2.4";
-  sha256 = "16dfmkls341cmk13j1z3rw2wxdvxr5rqsv1ff4qjhjak9j7hkqjq";
+  version = "1.3";
+  sha256 = "1bi7gim31w3xf6jsd2hkwhkhw1i9c4dmxnm3f46336k9rsxn59ph";
   buildDepends = [ cairo Chart ChartCairo colour gtk mtl time ];
   meta = {
     homepage = "https://github.com/timbod7/haskell-chart/wiki";

From 7c8afa9d047f601dac68817830271c938d6bc20a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Sep 2014 15:10:31 +0200
Subject: [PATCH 1104/1453] haskell-Chart: update to version 1.3

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

diff --git a/pkgs/development/libraries/haskell/Chart/default.nix b/pkgs/development/libraries/haskell/Chart/default.nix
index d5696a562da4..557721007ed5 100644
--- a/pkgs/development/libraries/haskell/Chart/default.nix
+++ b/pkgs/development/libraries/haskell/Chart/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "Chart";
-  version = "1.2.4";
-  sha256 = "0zizrkxsligvxs5x5r2j0pynf6ncjl4mgyzbh1zfqgnz29frylh7";
+  version = "1.3";
+  sha256 = "1xvr90x1kmnjfmbap47ffzi3xbawcwz7q6b76v2gbqp4gjlhiyx7";
   buildDepends = [
     colour dataDefaultClass lens mtl operational time
   ];

From 3bd01d920317564d110520f0c926007495382ddb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Sep 2014 15:10:34 +0200
Subject: [PATCH 1105/1453] haskell-c2hs: update to version 0.18.1

---
 pkgs/development/libraries/haskell/c2hs/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/c2hs/default.nix b/pkgs/development/libraries/haskell/c2hs/default.nix
index 95ead17f01f5..eaa91c51a239 100644
--- a/pkgs/development/libraries/haskell/c2hs/default.nix
+++ b/pkgs/development/libraries/haskell/c2hs/default.nix
@@ -1,18 +1,19 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, filepath, HUnit, languageC, shelly, testFramework
-, testFrameworkHunit, text, yaml
+{ cabal, dlist, filepath, HUnit, languageC, shelly, testFramework
+, testFrameworkHunit, text, transformers, yaml
 }:
 
 cabal.mkDerivation (self: {
   pname = "c2hs";
-  version = "0.17.2";
-  sha256 = "1xrk0izdy5akjgmg9k4l9ccmmgv1avwh152pfpc1xm2rrwrg4bxk";
+  version = "0.18.1";
+  sha256 = "17miqihfidzd1nqdswnd7j0580jlv2pj19wxlx8vb3dc5wga58xd";
   isLibrary = false;
   isExecutable = true;
-  buildDepends = [ filepath languageC ];
+  buildDepends = [ dlist filepath languageC shelly text yaml ];
   testDepends = [
-    filepath HUnit shelly testFramework testFrameworkHunit text yaml
+    filepath HUnit shelly testFramework testFrameworkHunit text
+    transformers
   ];
   jailbreak = true;
   doCheck = false;

From 3c52c0c203de642b79deada54b5901e9d9bc682d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Sep 2014 15:10:37 +0200
Subject: [PATCH 1106/1453] haskell-doctest: update to version 0.9.11.1

---
 pkgs/development/libraries/haskell/doctest/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/doctest/default.nix b/pkgs/development/libraries/haskell/doctest/default.nix
index 018fac066702..af3f9e2d5255 100644
--- a/pkgs/development/libraries/haskell/doctest/default.nix
+++ b/pkgs/development/libraries/haskell/doctest/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "doctest";
-  version = "0.9.11";
-  sha256 = "04y6y5hixqh8awl37wrss20c2drvx070w7wd6icfx7r0jqds97jr";
+  version = "0.9.11.1";
+  sha256 = "1gzzzwr7f7281mlbfbk74nxr28l70lwfaws4xjfx2v06xazl99db";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ deepseq filepath ghcPaths syb transformers ];
@@ -18,7 +18,7 @@ cabal.mkDerivation (self: {
   doCheck = false;
   noHaddock = self.stdenv.lib.versionOlder self.ghc.version "7.4";
   meta = {
-    homepage = "https://github.com/sol/doctest-haskell#readme";
+    homepage = "https://github.com/sol/doctest#readme";
     description = "Test interactive Haskell examples";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;

From ab5e6c2e5cf7f7539f6cd42fc890242a8ad13820 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Sep 2014 15:10:40 +0200
Subject: [PATCH 1107/1453] haskell-haddock-library: update to version 1.1.1

---
 .../development/libraries/haskell/haddock-library/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/haddock-library/default.nix b/pkgs/development/libraries/haskell/haddock-library/default.nix
index aece9e35873e..a7041b3ba28e 100644
--- a/pkgs/development/libraries/haskell/haddock-library/default.nix
+++ b/pkgs/development/libraries/haskell/haddock-library/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "haddock-library";
-  version = "1.1.0";
-  sha256 = "0apqm9nxgxbpvcphaim93q4z67c1cd0vdjz0i1cbr67ymffl69nd";
+  version = "1.1.1";
+  sha256 = "0sjnmbmq1pss9ikcqnhvpf57rv78lzi1r99ywpmmvj1gyva2s31m";
   buildDepends = [ deepseq ];
   testDepends = [ baseCompat deepseq hspec QuickCheck ];
   meta = {

From 1e43fac17110c71871a11ee343397b03d295511a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Sep 2014 15:10:42 +0200
Subject: [PATCH 1108/1453] haskell-http-client: update to version 0.3.8.1

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

diff --git a/pkgs/development/libraries/haskell/http-client/default.nix b/pkgs/development/libraries/haskell/http-client/default.nix
index 7015c9446e85..6e41fb85e681 100644
--- a/pkgs/development/libraries/haskell/http-client/default.nix
+++ b/pkgs/development/libraries/haskell/http-client/default.nix
@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-client";
-  version = "0.3.8";
-  sha256 = "0v5j6fcigjpksj1m0n15g3j680k7qkms3cqd0b1w0ma7k63kcibc";
+  version = "0.3.8.1";
+  sha256 = "1iy3wg88z1w0l5dzxkynlw0xd7np5xbxcrcdj3f2kzyfr39mw5v0";
   buildDepends = [
     base64Bytestring blazeBuilder caseInsensitive cookie
     dataDefaultClass deepseq exceptions filepath httpTypes mimeTypes

From 3c63776aa597c172cd2f01509fdd3c8337fc245b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Sep 2014 15:10:45 +0200
Subject: [PATCH 1109/1453] haskell-recaptcha: update to version 0.1.0.3

---
 pkgs/development/libraries/haskell/recaptcha/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/recaptcha/default.nix b/pkgs/development/libraries/haskell/recaptcha/default.nix
index dd92b7e79deb..00fe58be4b12 100644
--- a/pkgs/development/libraries/haskell/recaptcha/default.nix
+++ b/pkgs/development/libraries/haskell/recaptcha/default.nix
@@ -1,12 +1,12 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, HTTP, network, xhtml }:
+{ cabal, HTTP, network, networkUri, xhtml }:
 
 cabal.mkDerivation (self: {
   pname = "recaptcha";
-  version = "0.1.0.2";
-  sha256 = "04sdfp6bmcd3qkz1iqxijfiqa4qf78m5d16r9gjv90ckqf68kbih";
-  buildDepends = [ HTTP network xhtml ];
+  version = "0.1.0.3";
+  sha256 = "18rqsqzni11nr2cvs7ah9k87w493d92c0gmc0n6fhfq6gay9ia19";
+  buildDepends = [ HTTP network networkUri xhtml ];
   meta = {
     homepage = "http://github.com/jgm/recaptcha/tree/master";
     description = "Functions for using the reCAPTCHA service in web applications";

From 49c7b7040bc9cb8c989f9a0dea5ef6522bd3dc82 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Sep 2014 15:12:59 +0200
Subject: [PATCH 1110/1453] haskell-haddock: add version 2.15.0

---
 .../libraries/haskell/haddock-api/default.nix | 19 ++++++++++++++++++
 .../tools/documentation/haddock/2.15.0.nix    | 20 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  5 ++++-
 3 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/haskell/haddock-api/default.nix
 create mode 100644 pkgs/development/tools/documentation/haddock/2.15.0.nix

diff --git a/pkgs/development/libraries/haskell/haddock-api/default.nix b/pkgs/development/libraries/haskell/haddock-api/default.nix
new file mode 100644
index 000000000000..2f3afa32196a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/haddock-api/default.nix
@@ -0,0 +1,19 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, Cabal, deepseq, filepath, ghcPaths, haddockLibrary, xhtml
+}:
+
+cabal.mkDerivation (self: {
+  pname = "haddock-api";
+  version = "2.15.0";
+  sha256 = "17h5h40ddn0kiqnz6rmz9p0jqvng11lq3xm6lnizwix9kcwl843b";
+  buildDepends = [
+    Cabal deepseq filepath ghcPaths haddockLibrary xhtml
+  ];
+  meta = {
+    homepage = "http://www.haskell.org/haddock/";
+    description = "A documentation-generation tool for Haskell libraries";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/tools/documentation/haddock/2.15.0.nix b/pkgs/development/tools/documentation/haddock/2.15.0.nix
new file mode 100644
index 000000000000..3b3d91a1f2f1
--- /dev/null
+++ b/pkgs/development/tools/documentation/haddock/2.15.0.nix
@@ -0,0 +1,20 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, Cabal, filepath, haddockApi }:
+
+cabal.mkDerivation (self: {
+  pname = "haddock";
+  version = "2.15.0";
+  sha256 = "1vay0v0a02xj2m40w71vmjadlm6pzv309r1jhr61xv1wnj88i75w";
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [ haddockApi ];
+  testDepends = [ Cabal filepath ];
+  preCheck = "unset GHC_PACKAGE_PATH";
+  meta = {
+    homepage = "http://www.haskell.org/haddock/";
+    description = "A documentation-generation tool for Haskell libraries";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index cfb06b0880d2..15f6ed71007f 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2928,7 +2928,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   haddock_2_13_2 = callPackage ../development/tools/documentation/haddock/2.13.2.nix {};
   haddock_2_14_2 = callPackage ../development/tools/documentation/haddock/2.14.2.nix {};
   haddock_2_14_3 = callPackage ../development/tools/documentation/haddock/2.14.3.nix {};
-  haddock = self.haddock_2_14_3;
+  haddock_2_15_0 = callPackage ../development/tools/documentation/haddock/2.15.0.nix {};
+  haddock = self.haddock_2_15_0;
+
+  haddockApi = callPackage ../development/libraries/haskell/haddock-api {};
 
   haddockLibrary = callPackage ../development/libraries/haskell/haddock-library {};
 

From baa186c020edd5294d89f44e41aa6038c7e12189 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Sep 2014 15:19:19 +0200
Subject: [PATCH 1111/1453] haskell-directory-layout: disable test suite to fix
 https://github.com/supki/directory-layout/issues/9

---
 pkgs/development/libraries/haskell/directory-layout/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/directory-layout/default.nix b/pkgs/development/libraries/haskell/directory-layout/default.nix
index 610b1a5ec63e..2cc9682dccb1 100644
--- a/pkgs/development/libraries/haskell/directory-layout/default.nix
+++ b/pkgs/development/libraries/haskell/directory-layout/default.nix
@@ -16,6 +16,7 @@ cabal.mkDerivation (self: {
     commandQq doctest filepath free hspec lens semigroups temporary
     text transformers unorderedContainers
   ];
+  doCheck = false;
   meta = {
     description = "Directory layout DSL";
     license = self.stdenv.lib.licenses.bsd3;

From 3129fb3a11051de5ace0ce25a21e02e8e481cfa8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Sep 2014 16:10:06 +0200
Subject: [PATCH 1112/1453] haskell-docs: broken by the recent update to
 Haddock 2.15

---
 pkgs/development/tools/haskell/haskell-docs/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/tools/haskell/haskell-docs/default.nix b/pkgs/development/tools/haskell/haskell-docs/default.nix
index b9cd34c716e0..9cc92aafc219 100644
--- a/pkgs/development/tools/haskell/haskell-docs/default.nix
+++ b/pkgs/development/tools/haskell/haskell-docs/default.nix
@@ -20,5 +20,7 @@ cabal.mkDerivation (self: {
     description = "A program to find and display the docs and type of a name";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
+    broken = true;
   };
 })

From bf197d6f58627d8a10c11690f7e8a7b874296a00 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Sep 2014 16:18:09 +0200
Subject: [PATCH 1113/1453] haskell-ncurses: broken by update of c2hs

Upstream has been notified.
---
 pkgs/development/libraries/haskell/ncurses/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/haskell/ncurses/default.nix b/pkgs/development/libraries/haskell/ncurses/default.nix
index 7e9ac0ddd95e..f964af3c8b72 100644
--- a/pkgs/development/libraries/haskell/ncurses/default.nix
+++ b/pkgs/development/libraries/haskell/ncurses/default.nix
@@ -15,5 +15,7 @@ cabal.mkDerivation (self: {
     description = "Modernised bindings to GNU ncurses";
     license = self.stdenv.lib.licenses.gpl3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
+    broken = true;
   };
 })

From 2fcbff576ad95922a66c73a7ba8551f1eab19410 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 2 Sep 2014 11:41:54 +0200
Subject: [PATCH 1114/1453] haskell-timeplot: broken by Chart update

https://github.com/jkff/timeplot/issues/17
---
 pkgs/development/tools/haskell/timeplot/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/tools/haskell/timeplot/default.nix b/pkgs/development/tools/haskell/timeplot/default.nix
index 4342b877a2e8..a07383778ed1 100644
--- a/pkgs/development/tools/haskell/timeplot/default.nix
+++ b/pkgs/development/tools/haskell/timeplot/default.nix
@@ -20,5 +20,7 @@ cabal.mkDerivation (self: {
     description = "A tool for visualizing time series from log files";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
+    broken = true;
   };
 })

From b8260f543597ab2b5a9afa5c4937934416a646a5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 2 Sep 2014 11:57:34 +0200
Subject: [PATCH 1115/1453] dolphin-emu: drop reference to git from buildInputs
 since it's no longer an argument to the expression after #3936

---
 pkgs/misc/emulators/dolphin-emu/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/misc/emulators/dolphin-emu/default.nix
index 812e20ebc064..bf03e1e52aa9 100644
--- a/pkgs/misc/emulators/dolphin-emu/default.nix
+++ b/pkgs/misc/emulators/dolphin-emu/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ stdenv pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib
                   gettext libpthreadstubs libXrandr libXext readline openal
-                  git libXdmcp portaudio SDL wxGTK30 pulseaudio ];
+                  libXdmcp portaudio SDL wxGTK30 pulseaudio ];
 
   meta = {
     homepage = http://dolphin-emu.org/;

From 44b58f4e7455124ec97f075755130def29a45734 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Tue, 2 Sep 2014 12:07:36 +0200
Subject: [PATCH 1116/1453] pythonPackages: add docker-py

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 57032cf2ec4d..3af1950f9b17 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1835,6 +1835,27 @@ rec {
     };
   };
 
+  docker = buildPythonPackage rec {
+    name = "docker-py-0.4.0";
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/d/docker-py/${name}.tar.gz";
+      md5 = "21ab8fd729105487e6423b654d6c0860";
+    };
+
+    propagatedBuildInputs = [ six requests ];
+
+    # Version conflict
+    doCheck = false;
+
+    meta = {
+      description = "An API client for docker written in Python";
+      homepage = https://github.com/docker/docker-py;
+      license = licenses.asl20;
+    };
+  };
+
+
   dogpile_cache = buildPythonPackage rec {
     name = "dogpile.cache-0.5.4";
 

From f6dd506372cf9501eb992849fd8e28ec12fa97b3 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 2 Sep 2014 12:58:17 +0400
Subject: [PATCH 1117/1453] Update freeipmi

---
 pkgs/tools/system/freeipmi/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix
index 48562adffebe..8f94b21a7712 100644
--- a/pkgs/tools/system/freeipmi/default.nix
+++ b/pkgs/tools/system/freeipmi/default.nix
@@ -1,11 +1,12 @@
 { fetchurl, stdenv, libgcrypt, readline }:
 
 stdenv.mkDerivation rec {
-  name = "freeipmi-1.3.4";
+  version = "1.4.5";
+  name = "freeipmi-${version}";
 
   src = fetchurl {
     url = "mirror://gnu/freeipmi/${name}.tar.gz";
-    sha256 = "0gadf3yj019y3rvgf34pxk502p0p6nrhy6nwldvvir5rknndxh63";
+    sha256 = "033zakrk3kvi4y41kslicr90b3yb2kj052cl6nbja7ybn70y9nkz";
   };
 
   buildInputs = [ libgcrypt readline ];
@@ -30,10 +31,14 @@ stdenv.mkDerivation rec {
       '';
 
     homepage = http://www.gnu.org/software/freeipmi/;
+    downloadPage = "http://www.gnu.org/software/freeipmi/download.html";
 
     license = stdenv.lib.licenses.gpl3Plus;
 
     maintainers = with stdenv.lib.maintainers; [ raskin ];
     platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+
+    updateWalker = true;
+    inherit version;
   };
 }

From 9668a7a63bf7f3f12404f9cd742c63a2b1e78cf4 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 2 Sep 2014 12:58:32 +0400
Subject: [PATCH 1118/1453] Update getmail

---
 pkgs/tools/networking/getmail/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix
index 6d9666506b88..8c9103790b9b 100644
--- a/pkgs/tools/networking/getmail/default.nix
+++ b/pkgs/tools/networking/getmail/default.nix
@@ -1,12 +1,13 @@
 { stdenv, fetchurl, buildPythonPackage }:
 
 buildPythonPackage rec {
-  name = "getmail-4.43.0";
+  version = "4.46.0";
+  name = "getmail-${version}";
   namePrefix = "";
 
   src = fetchurl {
     url = "http://pyropus.ca/software/getmail/old-versions/${name}.tar.gz";
-    sha256 = "0abcj4d2jp9y56c85kq7265d8wcij91w9lpzib9q6j9lcs4la8hy";
+    sha256 = "15rqmm25pq6ll8aaqh8h6pfdkpqs7y6yismb3h3w1bz8j292c8zl";
   };
 
   doCheck = false;
@@ -15,5 +16,9 @@ buildPythonPackage rec {
     description = "A program for retrieving mail";
     maintainers = [ stdenv.lib.maintainers.raskin stdenv.lib.maintainers.iElectric ];
     platforms = stdenv.lib.platforms.linux;
+
+    homepage = "http://pyropus.ca/software/getmail/";
+    inherit version;
+    updateWalker = true;
   };
 }

From 23639a93fa0822168009033ae35ede874546d9cc Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 2 Sep 2014 13:03:33 +0400
Subject: [PATCH 1119/1453] Update ioping

---
 pkgs/tools/system/ioping/default.nix | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/system/ioping/default.nix b/pkgs/tools/system/ioping/default.nix
index 52d32b4e838e..588da0624ce6 100644
--- a/pkgs/tools/system/ioping/default.nix
+++ b/pkgs/tools/system/ioping/default.nix
@@ -10,16 +10,15 @@ let
     (builtins.attrNames (builtins.removeAttrs x helperArgNames));
   sourceInfo = rec {
     baseName="ioping";
-    version="0.7";
+    version = "0.8";
     name="${baseName}-${version}";
     url="http://ioping.googlecode.com/files/${name}.tar.gz";
-    hash="1c0k9gsq7rr9fqh6znn3i196l84zsm44nq3pl1b7grsnnbp2hki3";
   };
 in
 rec {
   src = a.fetchurl {
     url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+    sha256 = "0j7yal61nby1lkg9wnr6lxfljbd7wl3n0z8khqwvc9lf57bxngz2";
   };
 
   inherit (sourceInfo) name version;
@@ -40,11 +39,8 @@ rec {
     platforms = with a.lib.platforms;
       linux;
     license = a.lib.licenses.gpl3Plus;
-  };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://code.google.com/p/ioping/downloads/list";
-    };
+    downloadPage = "http://code.google.com/p/ioping/downloads/list";
+    inherit version;
   };
 }) x
 

From 36e3de7646a8afd4a1cfc6f0b4b327f7bc9e2fb5 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 2 Sep 2014 13:07:53 +0400
Subject: [PATCH 1120/1453] ioping auto-updater

---
 pkgs/tools/system/ioping/default.upstream | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 pkgs/tools/system/ioping/default.upstream

diff --git a/pkgs/tools/system/ioping/default.upstream b/pkgs/tools/system/ioping/default.upstream
new file mode 100644
index 000000000000..e51cb487852d
--- /dev/null
+++ b/pkgs/tools/system/ioping/default.upstream
@@ -0,0 +1,5 @@
+url http://code.google.com/p/ioping/downloads/list
+version_link '[.]tar[.][a-z0-9]+$'
+process 'code[.]google[.]com//' ''
+
+do_overwrite() { do_overwrite_just_version; }

From 5addaeb74f4dbb57220ebe8ad3bdd092fd48d768 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 2 Sep 2014 13:08:18 +0400
Subject: [PATCH 1121/1453] More support for SF.net in auto-updater

---
 .../upstream-updater/update-walker-service-specific.sh |  4 ++++
 pkgs/build-support/upstream-updater/update-walker.sh   | 10 +++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/upstream-updater/update-walker-service-specific.sh b/pkgs/build-support/upstream-updater/update-walker-service-specific.sh
index 28c28f695875..b66001073f27 100644
--- a/pkgs/build-support/upstream-updater/update-walker-service-specific.sh
+++ b/pkgs/build-support/upstream-updater/update-walker-service-specific.sh
@@ -8,6 +8,10 @@ SF_version_dir () {
   version_link 'http://sourceforge.net/.+/'"$1"'[0-9.]+/$'
 }
 
+SF_version_tarball () {
+  version_link '[.]tar[.].*/download$'
+}
+
 GH_latest () {
   prefetch_command_rel ../fetchgit/nix-prefetch-git
   revision "$("$(dirname "$0")/urls-from-page.sh" "$CURRENT_URL/commits" | grep /commit/ | head -n 1 | xargs basename )"
diff --git a/pkgs/build-support/upstream-updater/update-walker.sh b/pkgs/build-support/upstream-updater/update-walker.sh
index e11eb722e0e4..e60499b60f27 100755
--- a/pkgs/build-support/upstream-updater/update-walker.sh
+++ b/pkgs/build-support/upstream-updater/update-walker.sh
@@ -280,6 +280,12 @@ do_overwrite_just_version () {
   set_var_value sha256 $CURRENT_HASH
 }
 
+minimize_overwrite() {
+  do_overwrite(){
+    do_overwrite_just_version
+  }
+}
+
 process_config () {
   CONFIG_DIR="$(directory_of "$1")"
   CONFIG_NAME="$(basename "$1")"
@@ -297,9 +303,7 @@ process_config () {
       exit 1;
     }
     [ -z "$(retrieve_meta fullRegenerate)" ] && eval "
-      do_overwrite(){
-        do_overwrite_just_version
-      }
+      minimize_overwrite
     "
   fi
   ensure_attribute_name

From 1d7f18798ee74d9ad099d97f4cfbfce139b7b63f Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 2 Sep 2014 13:09:44 +0400
Subject: [PATCH 1122/1453] Update ipmiutil

---
 pkgs/tools/system/ipmiutil/default.nix      | 12 ++++--------
 pkgs/tools/system/ipmiutil/default.upstream |  4 ++++
 2 files changed, 8 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/tools/system/ipmiutil/default.upstream

diff --git a/pkgs/tools/system/ipmiutil/default.nix b/pkgs/tools/system/ipmiutil/default.nix
index c5f33c323594..6590b1ad2091 100644
--- a/pkgs/tools/system/ipmiutil/default.nix
+++ b/pkgs/tools/system/ipmiutil/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   baseName = "ipmiutil";
-  version = "2.9.3";
+  version = "2.7.3";
   name = "${baseName}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/${baseName}/${name}.tar.gz";
-    sha256 = "1dwyxp4jn5wxzyahd0x839kj1q7z6xin1wybpx9na4xsgscj6v27";
+    sha256 = "0z6ykz5db4ws7hpi25waf9vznwsh0vp819h5s7s8r054vxslrfpq";
   };
 
   buildInputs = [ openssl ];
@@ -26,11 +26,7 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ raskin ];
     platforms = platforms.linux;
     license = licenses.bsd3;
-  };
-
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://sourceforge.net/projects/ipmiutil/files/ipmiutil/";
-    };
+    downloadPage = "http://sourceforge.net/projects/ipmiutil/files/ipmiutil/";
+    inherit version;
   };
 }
diff --git a/pkgs/tools/system/ipmiutil/default.upstream b/pkgs/tools/system/ipmiutil/default.upstream
new file mode 100644
index 000000000000..18dc096a36b6
--- /dev/null
+++ b/pkgs/tools/system/ipmiutil/default.upstream
@@ -0,0 +1,4 @@
+url http://sourceforge.net/projects/ipmiutil/files/ipmiutil/
+SF_version_tarball
+SF_redirect
+minimize_overwrite

From 6d7c2c785821b08f69f558049610d253fc777773 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 2 Sep 2014 13:16:25 +0400
Subject: [PATCH 1123/1453] Update ised

---
 pkgs/tools/misc/ised/default.nix      | 11 +++--------
 pkgs/tools/misc/ised/default.upstream |  4 ++++
 2 files changed, 7 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/tools/misc/ised/default.upstream

diff --git a/pkgs/tools/misc/ised/default.nix b/pkgs/tools/misc/ised/default.nix
index 02cb65b1060a..96acc6c8ab93 100644
--- a/pkgs/tools/misc/ised/default.nix
+++ b/pkgs/tools/misc/ised/default.nix
@@ -10,16 +10,15 @@ let
     (builtins.attrNames (builtins.removeAttrs x helperArgNames));
   sourceInfo = rec {
     baseName="ised";
-    version="2.5.0";
+    version = "2.6.0";
     name="${baseName}-${version}";
     url="mirror://sourceforge/project/ised/${name}.tar.bz2";
-    hash="1avfb4ivq6iz50rraci0pcxl0w94899sz6icdqc0l4954y4zs8qd";
   };
 in
 rec {
   src = a.fetchurl {
     url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+    sha256 = "0rf9brqkrad8f3czpfc1bxq9ybv3nxci9276wdxas033c82cqkjs";
   };
 
   inherit (sourceInfo) name version;
@@ -37,11 +36,7 @@ rec {
     platforms = with a.lib.platforms;
       linux;
     license = a.lib.licenses.gpl3Plus;
-  };
-  passthru = {
-    updateInfo = {
-      downloadPage = "ised.sf.net";
-    };
+    inherit version;
   };
 }) x
 
diff --git a/pkgs/tools/misc/ised/default.upstream b/pkgs/tools/misc/ised/default.upstream
new file mode 100644
index 000000000000..6539bf477e54
--- /dev/null
+++ b/pkgs/tools/misc/ised/default.upstream
@@ -0,0 +1,4 @@
+url http://ised.sourceforge.net/web_nav.html
+SF_version_tarball
+SF_redirect
+minimize_overwrite

From ee713859f4017aececc4025f11d1874d1e930690 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 2 Sep 2014 13:25:05 +0400
Subject: [PATCH 1124/1453] Update libosip

---
 pkgs/development/libraries/osip/default.nix      | 5 +++--
 pkgs/development/libraries/osip/default.upstream | 3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/osip/default.upstream

diff --git a/pkgs/development/libraries/osip/default.nix b/pkgs/development/libraries/osip/default.nix
index cfa838f5a370..4db1cb5b5246 100644
--- a/pkgs/development/libraries/osip/default.nix
+++ b/pkgs/development/libraries/osip/default.nix
@@ -1,9 +1,9 @@
 {stdenv, fetchurl}:
 stdenv.mkDerivation rec {
-  version = "4.0.0";
+  version = "4.1.0";
   src = fetchurl {
     url = "mirror://gnu/osip/libosip2-${version}.tar.gz";
-    sha256 = "05dhj4s5k4qmhn2amca070xgh1gkcl42n040fhwsn3vm86524bdv";
+    sha256 = "014503kqv7z63az6lgxr5fbajlrqylm5c4kgbf8p3a0n6cva0slr";
   };
   name = "libosip2-${version}";
 
@@ -13,5 +13,6 @@ stdenv.mkDerivation rec {
     description = "The GNU oSIP library, an implementation of the Session Initiation Protocol (SIP)";
     maintainers = with stdenv.lib.maintainers; [ raskin ];
     platforms = stdenv.lib.platforms.linux;
+    inherit version;
   };
 }
diff --git a/pkgs/development/libraries/osip/default.upstream b/pkgs/development/libraries/osip/default.upstream
new file mode 100644
index 000000000000..ba0ed2a9b299
--- /dev/null
+++ b/pkgs/development/libraries/osip/default.upstream
@@ -0,0 +1,3 @@
+url http://ftp.u-tx.net/gnu/osip/
+attribute_name libosip
+minimize_overwrite

From bacd3e852dbd11fd24f3013e0535ac9d1af19e36 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 2 Sep 2014 13:41:46 +0400
Subject: [PATCH 1125/1453] Update pari

---
 pkgs/applications/science/math/pari/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix
index 576a28b054f4..e59bb9fe666a 100644
--- a/pkgs/applications/science/math/pari/default.nix
+++ b/pkgs/applications/science/math/pari/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, gmp, readline }:
 
 stdenv.mkDerivation rec {
-  name = "pari-2.5.5";
+  version = "2.7.1";
+  name = "pari-${version}";
 
   src = fetchurl {
     url = "http://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz";
-    sha256 = "058nw1fhggy7idii4f124ami521lv3izvngs9idfz964aks8cvvn";
+    sha256 = "1gj1rddi22hinzwy7r6hljgbi252wwwyd6gapg4hvcn0ycc7jqyc";
   };
 
   buildInputs = [gmp readline];
@@ -21,5 +22,9 @@ stdenv.mkDerivation rec {
     license     = "GPLv2+";
     maintainers = with stdenv.lib.maintainers; [ertes raskin];
     platforms   = stdenv.lib.platforms.linux;
+
+    inherit version;
+    downloadPage = "http://pari.math.u-bordeaux.fr/download.html";
+    updateWalker = true;
   };
 }

From 3ba3ec0f8fb68f4c0f9b731af4dadf3f3686def5 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 2 Sep 2014 13:48:05 +0400
Subject: [PATCH 1126/1453] Update Regina-REXX

---
 pkgs/development/interpreters/regina/default.nix     | 12 ++++--------
 .../development/interpreters/regina/default.upstream |  5 +++++
 2 files changed, 9 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/development/interpreters/regina/default.upstream

diff --git a/pkgs/development/interpreters/regina/default.nix b/pkgs/development/interpreters/regina/default.nix
index d8b3558be4f5..992f7281554c 100644
--- a/pkgs/development/interpreters/regina/default.nix
+++ b/pkgs/development/interpreters/regina/default.nix
@@ -12,16 +12,15 @@ let
   sourceInfo = rec {
     baseName="Regina-REXX";
     pname="regina-rexx";
-    version="3.5";
+    version = "3.8.2";
     name="${baseName}-${version}";
     url="mirror://sourceforge/${pname}/${pname}/${version}/${name}.tar.gz";
-    hash="0gh0k6lbhfixs44adha7lxirl3a08jabdylzr6m7mh5q5fhzv5f8";
   };
 in
 rec {
   src = a.fetchurl {
     url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+    sha256 = "06vr6p9pqr5zzsxm1l9iwb2w9z8qkm971c2knh0vf5bbm6znjz35";
   };
 
   inherit (sourceInfo) name version;
@@ -43,11 +42,8 @@ rec {
     platforms = with a.lib.platforms;
       linux;
     license = a.lib.licenses.lgpl2;
-  };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://sourceforge.net/projects/regina-rexx/files/regina-rexx/";
-    };
+    downloadPage = "http://sourceforge.net/projects/regina-rexx/files/regina-rexx/";
+    inherit version;
   };
 }) x
 
diff --git a/pkgs/development/interpreters/regina/default.upstream b/pkgs/development/interpreters/regina/default.upstream
new file mode 100644
index 000000000000..7b3c6905a1ca
--- /dev/null
+++ b/pkgs/development/interpreters/regina/default.upstream
@@ -0,0 +1,5 @@
+url http://sourceforge.net/projects/regina-rexx/files/regina-rexx/
+SF_version_dir
+SF_version_tarball
+SF_redirect
+minimize_overwrite

From f78afc0b27622372ad485466509a6cc377c172bf Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 2 Sep 2014 14:15:10 +0400
Subject: [PATCH 1127/1453] Update libefw. Releases on Google Drive. Ouch

---
 pkgs/development/libraries/libewf/default.nix      | 13 ++++++++-----
 pkgs/development/libraries/libewf/default.upstream |  7 +++++++
 2 files changed, 15 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/development/libraries/libewf/default.upstream

diff --git a/pkgs/development/libraries/libewf/default.nix b/pkgs/development/libraries/libewf/default.nix
index 7c948aa98247..fad0170ade78 100644
--- a/pkgs/development/libraries/libewf/default.nix
+++ b/pkgs/development/libraries/libewf/default.nix
@@ -1,10 +1,11 @@
-{ fetchurl, stdenv, zlib, openssl, libuuid, file }:
+{ fetchurl, stdenv, zlib, openssl, libuuid, file, fuse }:
 
 stdenv.mkDerivation rec {
-  name = "libewf-20100226";
+  version = "20140608";
+  name = "libewf-${version}";
   src = fetchurl {
-    url = "mirror://sourceforge/libewf/${name}.tar.gz";
-    sha256 = "aedd2a6b3df6525ff535ab95cd569ebb361a4022eb4163390f26257913c2941a";
+    url = "https://googledrive.com/host/0B3fBvzttpiiSMTdoaVExWWNsRjg/libewf-20140608.tar.gz";
+    sha256 = "0wfsffzxk934hl8cpwr14w8ixnh8d23x0xnnzcspjwi2c7730h6i";
   };
 
   preConfigure = ''sed -e 's@/usr/bin/file@file@g' -i configure'';
@@ -14,6 +15,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Library for support of the Expert Witness Compression Format";
     homepage = http://sourceforge.net/projects/libewf/;
-    license = "free";
+    license = stdenv.lib.licenses.lgpl3;
+    maintainers = [ stdenv.lib.maintainers.raskin ] ;
+    inherit version;
   };
 }
diff --git a/pkgs/development/libraries/libewf/default.upstream b/pkgs/development/libraries/libewf/default.upstream
new file mode 100644
index 000000000000..a071132463f8
--- /dev/null
+++ b/pkgs/development/libraries/libewf/default.upstream
@@ -0,0 +1,7 @@
+url https://code.google.com/p/libewf/
+version_link 'googledrive[.]com'
+version_link '[.]tar[.]'
+do_overwrite () {
+  do_overwrite_just_version
+  set_var_value url "$CURRENT_URL"
+}

From 7b6d33a591a541af26564fd5e3312fbc4782d387 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 2 Sep 2014 14:15:51 +0400
Subject: [PATCH 1128/1453] Update spandsp

---
 pkgs/development/libraries/spandsp/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/spandsp/default.nix b/pkgs/development/libraries/spandsp/default.nix
index f88ab48e027e..24dc443ca705 100644
--- a/pkgs/development/libraries/spandsp/default.nix
+++ b/pkgs/development/libraries/spandsp/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, audiofile, libtiff}:
 stdenv.mkDerivation rec {
-  version = "0.0.5";
+  version = "0.0.6";
   name = "spandsp-${version}";
   src=fetchurl {
-    url = "http://www.soft-switch.org/downloads/spandsp/spandsp-${version}.tgz";
-    sha256 = "07f42a237c77b08fa765c3a148c83cdfa267bf24c0ab681d80b90d30dd0b3dbf";
+    url = "http://www.soft-switch.org/downloads/spandsp/spandsp-${version}.tar.gz";
+    sha256 = "0rclrkyspzk575v8fslzjpgp4y2s4x7xk3r55ycvpi4agv33l1fc";
   };
   buildInputs = [];
   propagatedBuildInputs = [audiofile libtiff];
@@ -13,6 +13,9 @@ stdenv.mkDerivation rec {
     platforms = with stdenv.lib.platforms; linux;
     maintainers = with stdenv.lib.maintainers; [raskin];
     license = with stdenv.lib.licenses; gpl2;
+    downloadPage = "http://www.soft-switch.org/downloads/spandsp/";
+    inherit version;
+    updateWalker = true;
   };
 }
 

From 0d8c76057fa561407d4f23e1b903cd1927f56efa Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 2 Sep 2014 14:17:59 +0400
Subject: [PATCH 1129/1453] Update Wavemon

---
 pkgs/tools/networking/wavemon/default.nix | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/networking/wavemon/default.nix b/pkgs/tools/networking/wavemon/default.nix
index e9c102817e10..b5927fd24780 100644
--- a/pkgs/tools/networking/wavemon/default.nix
+++ b/pkgs/tools/networking/wavemon/default.nix
@@ -11,16 +11,15 @@ let
     (builtins.attrNames (builtins.removeAttrs x helperArgNames));
   sourceInfo = rec {
     baseName="wavemon";
-    version="0.7.5";
+    version = "0.7.6";
     name="${baseName}-${version}";
     url="http://eden-feed.erg.abdn.ac.uk/wavemon/stable-releases/${name}.tar.bz2";
-    hash="0b1fx00aar2fsw49a10w5bpiyjpz8h8f4nrlwb1acfw36yi1pfkd";
   };
 in
 rec {
   src = a.fetchurl {
     url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+    sha256 = "18cwlzgmwzy7z9dfr6lwd8kmkv0pqiihizm4gi0kkm52bzz6836y";
   };
 
   inherit (sourceInfo) name version;
@@ -38,11 +37,9 @@ rec {
     platforms = with a.lib.platforms;
       linux;
     license = a.lib.licenses.gpl2Plus;
-  };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://eden-feed.erg.abdn.ac.uk/wavemon/";
-    };
+    downloadPage = "http://eden-feed.erg.abdn.ac.uk/wavemon/";
+    inherit version;
+    updateWalker = true;
   };
 }) x
 

From 85caa0942d2a468782d83e21d8cf4a6ed98e5415 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 2 Sep 2014 14:18:19 +0400
Subject: [PATCH 1130/1453] Update SleuthKit

---
 pkgs/tools/system/sleuthkit/default.nix      | 6 ++++--
 pkgs/tools/system/sleuthkit/default.upstream | 5 +++++
 2 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/tools/system/sleuthkit/default.upstream

diff --git a/pkgs/tools/system/sleuthkit/default.nix b/pkgs/tools/system/sleuthkit/default.nix
index 0148e3c699eb..016e2ccda37c 100644
--- a/pkgs/tools/system/sleuthkit/default.nix
+++ b/pkgs/tools/system/sleuthkit/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, libewf, afflib, openssl, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "sleuthkit-3.2.2";
+  version = "4.1.3";
+  name = "sleuthkit-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/sleuthkit/${name}.tar.gz";
-    sha256 = "02hik5xvbgh1dpisvc3wlhhq1aprnlsk0spbw6h5khpbq9wqnmgj";
+    sha256 = "09q3ky4rpv18jasf5gc2hlivzadzl70jy4nnk23db1483aix5yb7";
   };
 
   enableParallelBuilding = true;
@@ -20,5 +21,6 @@ stdenv.mkDerivation rec {
     maintainers = [ stdenv.lib.maintainers.raskin ];
     platforms = stdenv.lib.platforms.linux;
     license = "IBM Public License";
+    inherit version;
   };
 }
diff --git a/pkgs/tools/system/sleuthkit/default.upstream b/pkgs/tools/system/sleuthkit/default.upstream
new file mode 100644
index 000000000000..f8ffe9352ede
--- /dev/null
+++ b/pkgs/tools/system/sleuthkit/default.upstream
@@ -0,0 +1,5 @@
+url http://sourceforge.net/projects/sleuthkit/files/sleuthkit/
+SF_version_dir
+SF_version_tarball
+SF_redirect
+minimize_overwrite

From 10b4bc3c439c0d37c833d7a00f52673759d9b3b4 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 2 Sep 2014 14:22:49 +0400
Subject: [PATCH 1131/1453] Update XDaliClock

---
 pkgs/tools/misc/xdaliclock/default.nix | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/misc/xdaliclock/default.nix b/pkgs/tools/misc/xdaliclock/default.nix
index 79c6a743bce4..df1a7eedeffd 100644
--- a/pkgs/tools/misc/xdaliclock/default.nix
+++ b/pkgs/tools/misc/xdaliclock/default.nix
@@ -12,17 +12,16 @@ let
     (builtins.attrNames (builtins.removeAttrs x helperArgNames));
   sourceInfo = rec {
     baseName="xdaliclock";
-    version="2.40";
+    version = "2.41";
     name="${baseName}-${version}";
     project="${baseName}";
     url="http://www.jwz.org/${project}/${name}.tar.gz";
-    hash="03i8vwi9vz3gr938wr4miiymwv283mg11wgfaf2jhl6aqbmz4id7";
   };
 in
 rec {
   src = a.fetchurl {
     url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+    sha256 = "1crkjvza692irkqm9vwgn58m8ps93n0rxigm6pasgl5dnx3p6d1d";
   };
 
   inherit (sourceInfo) name version;
@@ -46,10 +45,8 @@ rec {
     platforms = with a.lib.platforms;
       linux ++ freebsd;
     license = "free"; #TODO BSD on Gentoo, looks like MIT
-  };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://www.jwz.org/xdaliclock/";
-    };
+    downloadPage = "http://www.jwz.org/xdaliclock/";
+    inherit version;
+    updateWalker = true;
   };
 }) x

From 48dce0642bef6481a934ae19c6db514f12cb5c10 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 2 Sep 2014 14:25:04 +0400
Subject: [PATCH 1132/1453] Add auto-updater for XScreensaver

---
 pkgs/misc/screensavers/xscreensaver/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix
index 047917498100..40fad768b169 100644
--- a/pkgs/misc/screensavers/xscreensaver/default.nix
+++ b/pkgs/misc/screensavers/xscreensaver/default.nix
@@ -41,5 +41,8 @@ stdenv.mkDerivation rec {
     description = "A set of screensavers";
     maintainers = with stdenv.lib.maintainers; [ raskin urkud ];
     platforms = with stdenv.lib.platforms; allBut cygwin;
+    inherit version;
+    downloadPage = "http://www.jwz.org/xscreensaver/download.html";
+    updateWalker = true;
   };
 }

From 2fc76ea05417671306d27f9ba83ef1b8d4049f3d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 2 Sep 2014 12:28:56 +0200
Subject: [PATCH 1133/1453] haskell-auto-update: disable test suite to work
 around build failure

https://github.com/yesodweb/wai/issues/285
---
 pkgs/development/libraries/haskell/auto-update/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/auto-update/default.nix b/pkgs/development/libraries/haskell/auto-update/default.nix
index e047e938dae2..85f15b500ed1 100644
--- a/pkgs/development/libraries/haskell/auto-update/default.nix
+++ b/pkgs/development/libraries/haskell/auto-update/default.nix
@@ -7,6 +7,7 @@ cabal.mkDerivation (self: {
   version = "0.1.1.2";
   sha256 = "0901zqky70wyxl17vwz6smhnpsfjnsk0f2xqiyz902vl7apx66c6";
   testDepends = [ hspec ];
+  doCheck = false;
   meta = {
     homepage = "https://github.com/yesodweb/wai";
     description = "Efficiently run periodic, on-demand actions";

From 6329b7ae600105227bf13498a23ce328a98554c0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 2 Sep 2014 12:44:44 +0200
Subject: [PATCH 1134/1453] Drop unnecessary attributes

---
 pkgs/development/libraries/serf/default.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix
index 873f59dba3ab..1e8eec6ae452 100644
--- a/pkgs/development/libraries/serf/default.nix
+++ b/pkgs/development/libraries/serf/default.nix
@@ -1,8 +1,7 @@
 { stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, krb5, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  version = "1.3.7";
-  name = "serf-${version}";
+  name = "serf-1.3.7";
 
   src = fetchurl {
     url = "http://serf.googlecode.com/svn/src_releases/${name}.tar.bz2";
@@ -28,11 +27,8 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "HTTP client library based on APR";
-    license = stdenv.lib.licenses.asl20 ;
+    license = stdenv.lib.licenses.asl20;
     maintainers = [stdenv.lib.maintainers.raskin];
     hydraPlatforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
-    inherit version;
-    downloadPage = "http://serf.googlecode.com/svn/src_releases/";
-    updateWalker = true;
   };
 }

From ac9cb299355fb082c0b9ee1950606dcc5e82fc08 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Tue, 2 Sep 2014 12:53:33 +0200
Subject: [PATCH 1135/1453] gnome3_12.clutter-gst: update from 2.0.10 to 2.0.12

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

diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix
index c73aac074e7f..7cef673dbc69 100644
--- a/pkgs/development/libraries/clutter-gst/default.nix
+++ b/pkgs/development/libraries/clutter-gst/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, pkgconfig, clutter, gtk3, glib, cogl }:
 
 stdenv.mkDerivation rec {
-  name = "clutter-gst-2.0.10";
+  name = "clutter-gst-2.0.12";
 
   src = fetchurl {
     url = "mirror://gnome/sources/clutter-gst/2.0/${name}.tar.xz";
-    sha256 = "f00cf492a6d4f1036c70d8a0ebd2f0f47586ea9a9b49b1ffda79c9dc7eadca00";
+    sha256 = "1dgzpd5l5ld622b8185c3khvvllm5hfvq4q1a1mgzhxhj8v4bwf2";
   };
 
   propagatedBuildInputs = [ clutter gtk3 glib cogl ];

From df6d65ad550f5f6dc76f4889dc74eb621744a663 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Tue, 2 Sep 2014 12:53:41 +0200
Subject: [PATCH 1136/1453] gnome3_12.empathy: update from 3.12.2 to 3.12.5

---
 pkgs/desktops/gnome-3/3.12/core/empathy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix b/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix
index 7fb341948be5..c6ac93b10747 100644
--- a/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix
@@ -11,11 +11,11 @@
 # TODO: enable more features
 
 stdenv.mkDerivation rec {
-  name = "empathy-3.12.2";
+  name = "empathy-3.12.5";
 
   src = fetchurl {
     url = "mirror://gnome/sources/empathy/3.12/${name}.tar.xz";
-    sha256 = "414d0c6b1a30b1afbf35ad04b0b9ff3ada3e06fab797a50a7147cdfe0905e7cd";
+    sha256 = "0rhgpiv75aafmdh6r7d4ci59lnxqmmwg9hvsa5b3mk7j2d2pma86";
   };
 
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard

From 64746e1f24d073e958ff16b42d17be73751c68fe Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Tue, 2 Sep 2014 12:53:49 +0200
Subject: [PATCH 1137/1453] gnome3_12.evolution: update from 3.12.2 to 3.12.5

---
 pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix
index f9fbbbe56c62..8cba366faae6 100644
--- a/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix
@@ -5,11 +5,11 @@
 , libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit }:
 
 stdenv.mkDerivation rec {
-  name = "evolution-3.12.2";
+  name = "evolution-3.12.5";
 
   src = fetchurl {
     url = "mirror://gnome/sources/evolution/3.12/${name}.tar.xz";
-    sha256 = "60742334aaf1e3b9f044c2003c44a37be5905b166e24580e9e6e6c5ae1b9f948";
+    sha256 = "08y1qiydbbk4fq8rrql9sgbwsny8bwz6f7m5kbbj5zjqvf1baksj";
   };
 
   doCheck = true;

From de51a490f5039b950b8742b8c2dd78089fb0b6a3 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Tue, 2 Sep 2014 12:54:01 +0200
Subject: [PATCH 1138/1453] gnome3_12.folks: update from 0.9.6 to 0.9.8

---
 pkgs/desktops/gnome-3/3.12/core/folks/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/folks/default.nix b/pkgs/desktops/gnome-3/3.12/core/folks/default.nix
index 47b958002a39..7e3af8405a4b 100644
--- a/pkgs/desktops/gnome-3/3.12/core/folks/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/folks/default.nix
@@ -5,11 +5,11 @@
 # TODO: enable more folks backends
 
 stdenv.mkDerivation rec {
-  name = "folks-0.9.6";
+  name = "folks-0.9.8";
 
   src = fetchurl {
     url = "mirror://gnome/sources/folks/0.9/${name}.tar.xz";
-    sha256 = "a67e055b5a2724a34a80946e2940c4c0ad708cb1f4e0a09407c6b69a5e40267f";
+    sha256 = "09cbs3ihcswpi1wg8xbjmkqjbhnxa1idy1fbzmz0gah7l5mxmlfj";
   };
 
   propagatedBuildInputs = [ glib gnome3.libgee sqlite ];

From f3bc1dc2632ffa8b46055ea088a400f993b4830f Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Tue, 2 Sep 2014 12:54:08 +0200
Subject: [PATCH 1139/1453] gnome3_12.geary: update from 0.6.0 to 0.6.2

---
 pkgs/desktops/gnome-3/3.12/misc/geary/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/misc/geary/default.nix b/pkgs/desktops/gnome-3/3.12/misc/geary/default.nix
index 1eb6c0e3ed29..768e8bdb36ef 100644
--- a/pkgs/desktops/gnome-3/3.12/misc/geary/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/misc/geary/default.nix
@@ -5,11 +5,11 @@
 , gnome3, librsvg, gnome_doc_utils, webkitgtk }:
 
 stdenv.mkDerivation rec {
-  name = "geary-0.6.0";
+  name = "geary-0.6.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/geary/0.6/${name}.tar.xz";
-    sha256 = "44ad1dc2c81c50006c751f8e72aa817f07002188da4c29e158060524a1962715";
+    sha256 = "0ap40mpj89sx82kcxlhl9gipq34ks2b70yhiv9s8zc5wg0nm7rpg";
   };
 
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];

From f08c327ab2dc69b0151d6d589e7732c5655efdfd Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Tue, 2 Sep 2014 12:54:14 +0200
Subject: [PATCH 1140/1453] gnome3_12.gedit: update from 3.12.1 to 3.12.2

---
 pkgs/desktops/gnome-3/3.12/apps/gedit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/apps/gedit/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gedit/default.nix
index 0909a4239db5..c65a28c34467 100644
--- a/pkgs/desktops/gnome-3/3.12/apps/gedit/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/apps/gedit/default.nix
@@ -4,11 +4,11 @@
 , gnome3, librsvg, gdk_pixbuf, file }:
 
 stdenv.mkDerivation rec {
-  name = "gedit-3.12.1";
+  name = "gedit-3.12.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gedit/3.12/${name}.tar.xz";
-    sha256 = "8e3edc62102934a8be708b0fdf27b86368fa9ede885628283bf8e91b26bbb67f";
+    sha256 = "0lxnswqa0ysr57cqh062wp41sd76p6q7y3mnkl7rligd5c8hnikm";
   };
 
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];

From 95dffc12e8049b0caa8c8490fdfde6adbd154b22 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Tue, 2 Sep 2014 12:54:22 +0200
Subject: [PATCH 1141/1453] gnome3_12.gnome-calculator: update from 3.12.1 to
 3.12.3

---
 pkgs/desktops/gnome-3/3.12/core/gnome-calculator/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-calculator/default.nix
index 666032f56a73..19d0c9c10e89 100644
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-calculator/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-calculator/default.nix
@@ -3,11 +3,11 @@
 , itstool, gnome3, librsvg, gdk_pixbuf }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-calculator-3.12.1";
+  name = "gnome-calculator-3.12.3";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-calculator/3.12/${name}.tar.xz";
-    sha256 = "15a75bbe19f6d2280d864f0504f6fc5b1f148fea9738b5548b64b7b8c0c64740";
+    sha256 = "0bn3agh3g22iradfpzkc19a2b33b1mbf0ciy1hf2sijrczi24410";
   };
 
   NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";

From ac7f0a8cf257f1f2dd589d57e332da47fb216f3b Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Tue, 2 Sep 2014 12:54:30 +0200
Subject: [PATCH 1142/1453] gnome3_12.gnome-music: update from 3.12.2 to
 3.12.2.1

---
 pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix
index d784544a183d..c5f9bdb27746 100644
--- a/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix
@@ -4,11 +4,11 @@
 , makeWrapper, itstool, gnome3, librsvg, gst_all_1 }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-music-3.12.2";
+  name = "gnome-music-3.12.2.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-music/3.12/${name}.tar.xz";
-    sha256 = "ec4807018166aabed0263cb3ffce672e1fc1a3e959f48a5ad48b8eb08ddb451a";
+    sha256 = "1vwzjv5001pg37qc0sh4ph3srqwg3vgibbdlqpim9w2k70l9j34z";
   };
 
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];

From b00b560dba7477bdfa20b18e2b0a9bb4b504ddf5 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Tue, 2 Sep 2014 12:54:38 +0200
Subject: [PATCH 1143/1453] gnome3_12.gnome-user-docs: update from 3.12.1 to
 3.12.2

---
 pkgs/desktops/gnome-3/3.12/core/gnome-user-docs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-user-docs/default.nix
index 7377c839d1c9..2a237b15c21c 100644
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-user-docs/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-user-docs/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, file, gnome3, itstool, libxml2, intltool }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-user-docs-3.12.1";
+  name = "gnome-user-docs-3.12.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-user-docs/3.12/${name}.tar.xz";
-    sha256 = "bfd084d72c688d6efb0c34bb572a704cc2ce093c97a33390eaffb5e42158d418";
+    sha256 = "1cj45lpa74vkbxyila3d6pn5m1gh51nljp9fjirxmzwi1h6wg7jd";
   };
 
   buildInputs = [ pkgconfig gnome3.yelp itstool libxml2 intltool ];

From 4426b5aca7e05e78c10a0ebaedaa6dd0e99c8907 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Tue, 2 Sep 2014 12:55:33 +0200
Subject: [PATCH 1144/1453] grilo: update from 0.2.10 to 0.2.11

---
 pkgs/desktops/gnome-3/3.12/core/grilo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/grilo/default.nix b/pkgs/desktops/gnome-3/3.12/core/grilo/default.nix
index 6f1bfbbcfe94..9c0e3f9a0bc9 100644
--- a/pkgs/desktops/gnome-3/3.12/core/grilo/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/grilo/default.nix
@@ -2,11 +2,11 @@
 , libxml2, gnome3, gobjectIntrospection, libsoup }:
 
 stdenv.mkDerivation rec {
-  name = "grilo-0.2.10";
+  name = "grilo-0.2.11";
 
   src = fetchurl {
     url = "mirror://gnome/sources/grilo/0.2/${name}.tar.xz";
-    sha256 = "559a2470fe541b0090bcfdfac7a33e92dba967727bbab6d0eca70e5636a77b25";
+    sha256 = "8a52c37521de80d6caf08a519a708489b9e2b097c2758a0acaab6fbd26d30ea6";
   };
 
   configureFlags = [ "--enable-grl-pls" "--enable-grl-net" ];

From 7cb6d4cd87702dd5f61487431d846d318b91fb05 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Tue, 2 Sep 2014 12:55:46 +0200
Subject: [PATCH 1145/1453] gnome3_12.grilo-plugins: update from 0.2.12 to
 0.2.13

---
 pkgs/desktops/gnome-3/3.12/core/grilo-plugins/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/3.12/core/grilo-plugins/default.nix
index a8a1c244767c..9076d5c58390 100644
--- a/pkgs/desktops/gnome-3/3.12/core/grilo-plugins/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/grilo-plugins/default.nix
@@ -3,11 +3,11 @@
 , gmime, json_glib, avahi, tracker, itstool }:
 
 stdenv.mkDerivation rec {
-  name = "grilo-plugins-0.2.12";
+  name = "grilo-plugins-0.2.13";
 
   src = fetchurl {
     url = "mirror://gnome/sources/grilo-plugins/0.2/${name}.tar.xz";
-    sha256 = "15bed8a633c81b251920ab677d455433e641388f605277ca88e549cc89012b48";
+    sha256 = "008jwm5ydl0k25p3d2fkcail40fj9y3qknihxb5fg941p8qlhm55";
   };
 
   installFlags = [ "GRL_PLUGINS_DIR=$(out)/lib/grilo-0.2" ];

From 70991e666e44d8ee314bda3ee6a4315f5e064632 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Tue, 2 Sep 2014 12:55:54 +0200
Subject: [PATCH 1146/1453] gnome3_12.gtksourceview: update from 3.12.2 to
 3.12.3

---
 pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix
index 4564b0d21e17..8a89425a6963 100644
--- a/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "gtksourceview-${version}";
-  version = "3.12.2";
+  version = "3.12.3";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtksourceview/3.12/gtksourceview-${version}.tar.xz";
-    sha256 = "62a31eee00f633d7959efb7eec44049ebd0345d670265853dcd21c057f3f30ad";
+    sha256 = "1xzmw9n9zbkaasl8xi7s5h49wiv5dq4qf8hr2pzjkack3ai5j6gk";
   };
 
   buildInputs = [ pkgconfig atk cairo glib gtk3 pango

From f02ab3f9c4f4afa08c2b32f4fea74241d9800327 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Tue, 2 Sep 2014 12:56:01 +0200
Subject: [PATCH 1147/1453] gnome3_12.totem: update from 3.12.1 to 3.12.2

---
 pkgs/desktops/gnome-3/3.12/core/totem/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/totem/default.nix b/pkgs/desktops/gnome-3/3.12/core/totem/default.nix
index 3589299df3ec..1322fdcaae31 100644
--- a/pkgs/desktops/gnome-3/3.12/core/totem/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/totem/default.nix
@@ -5,11 +5,11 @@
 , gnome3, librsvg, gdk_pixbuf, file }:
 
 stdenv.mkDerivation rec {
-  name = "totem-3.12.1";
+  name = "totem-3.12.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/totem/3.12/${name}.tar.xz";
-    sha256 = "dd168cdd4051d01131d47c24fa45bfd08b6ccf45900ac4b64bae47f6f47a35e3";
+    sha256 = "1law033wxbs8v3l2fk0p1v8lf9m45dm997yhq0cmqgw10jxxiybn";
   };
 
   doCheck = true;

From 12018a0df9b2d33e4c0c8ec4366382211447a54d Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Tue, 2 Sep 2014 12:56:07 +0200
Subject: [PATCH 1148/1453] gnome3_12.tracker: update from 1.0.1 to 1.0.3,
 potentially fixes CVE-2012-2671, CVE-2012-6109

---
 pkgs/desktops/gnome-3/3.12/core/tracker/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix b/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix
index 79155fe9b567..cf84f511416b 100644
--- a/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix
@@ -8,11 +8,11 @@
 , libpng, libexif, libgsf, libuuid, bzip2 }:
 
 stdenv.mkDerivation rec {
-  name = "tracker-1.0.1";
+  name = "tracker-1.0.3";
 
   src = fetchurl {
     url = "mirror://gnome/sources/tracker/1.0/${name}.tar.xz";
-    sha256 = "76e7918e62526a8209f9c9226f82abe592a6332826ac7c12e6e405063181e889";
+    sha256 = "11pqcldgh07mjn38dlbj6ry5qkfbpf79ln5sqx7q86hhqzh3712h";
   };
 
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];

From 17e96cd1a3d09e250b5a067a4402c01966adf832 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Tue, 2 Sep 2014 12:57:10 +0200
Subject: [PATCH 1149/1453] vte: update from 0.36.2 to 0.36.3

---
 pkgs/desktops/gnome-3/3.12/core/vte/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/vte/default.nix b/pkgs/desktops/gnome-3/3.12/core/vte/default.nix
index 41597e47fa54..011424820e82 100644
--- a/pkgs/desktops/gnome-3/3.12/core/vte/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/vte/default.nix
@@ -3,14 +3,14 @@
 stdenv.mkDerivation rec {
 
   versionMajor = "0.36";
-  versionMinor = "2";
+  versionMinor = "3";
   moduleName   = "vte";
 
   name = "${moduleName}-${versionMajor}.${versionMinor}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
-    sha256 = "f45eed3aed823068c7563345ea947be0e6ddb3dacd74646e6d7d26a921e04345";
+    sha256 = "54e5b07be3c0f7b158302f54ee79d4de1cb002f4259b6642b79b1e0e314a959c";
   };
 
   buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib gnome3.gtk3 ncurses ];

From 8a4a0a5aa077298bc87cc3547789339fcaa139c2 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Tue, 2 Sep 2014 12:58:06 +0200
Subject: [PATCH 1150/1453] json-glib: update from 1.0.0 to 1.0.2

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

diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix
index 7a45ca0f2272..a50163c601d4 100644
--- a/pkgs/development/libraries/json-glib/default.nix
+++ b/pkgs/development/libraries/json-glib/default.nix
@@ -7,9 +7,9 @@ stdenv.mkDerivation rec {
     project = "json-glib";
     major = "1";
     minor = "0";
-    patchlevel = "0";
+    patchlevel = "2";
     extension = "xz";
-    sha256 = "dbf558d2da989ab84a27e4e13daa51ceaa97eb959c2c2f80976c9322a8f4cdde";
+    sha256 = "887bd192da8f5edc53b490ec51bf3ffebd958a671f5963e4f3af32c22e35660a";
   };
 
   configureflags= "--with-introspection" ; 

From 9d64b445b61f71b13f9803cf0313ebd77dda4499 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 2 Sep 2014 13:07:49 +0200
Subject: [PATCH 1151/1453] swig: Disable ccache stuff

http://hydra.nixos.org/build/13936297
---
 pkgs/development/tools/misc/swig/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/swig/default.nix b/pkgs/development/tools/misc/swig/default.nix
index 66d6b65453ea..c4fcd3158457 100644
--- a/pkgs/development/tools/misc/swig/default.nix
+++ b/pkgs/development/tools/misc/swig/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   # 'make check' uses boost and tcl
   buildInputs = stdenv.lib.optionals doCheck [ boost tcl ];
 
-  configureFlags = stdenv.lib.optionalString stdenv.isDarwin "--disable-ccache";
+  configureFlags = "--disable-ccache";
 
   meta = {
     description = "Interface compiler that connects C/C++ code to higher-level languages";

From 715943a6fbaf025bcadd6dcee5f6007c4da15ab7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 2 Sep 2014 13:18:03 +0200
Subject: [PATCH 1152/1453] ld-wrapper: Put back the --sysroot filter

We still need this because some clang-based packages depend on
it. (The sysroot filtering was originally done by clang-wrapper's
ld-wrapper, but we merged the ld-wrappers in
a4f9b9c8b5ec9ef106671ffdf93e0059835d0ec1.)

http://hydra.nixos.org/build/13906922
---
 pkgs/build-support/gcc-wrapper/ld-wrapper.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/build-support/gcc-wrapper/ld-wrapper.sh b/pkgs/build-support/gcc-wrapper/ld-wrapper.sh
index 51803e12a4ea..822c4a03a218 100644
--- a/pkgs/build-support/gcc-wrapper/ld-wrapper.sh
+++ b/pkgs/build-support/gcc-wrapper/ld-wrapper.sh
@@ -32,6 +32,9 @@ if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE" \
             # We cannot skip this; barf.
             echo "impure path \`$p' used in link" >&2
             exit 1
+        elif test "${p:0:9}" = "--sysroot"; then
+            # Our ld is not built with sysroot support (Can we fix that?)
+            :
         else
             rest=("${rest[@]}" "$p")
         fi

From 1e786087e4e5bf8d602c87e49edd2fa5d61b8a82 Mon Sep 17 00:00:00 2001
From: Andreas Herrmann <andreash87@gmx.ch>
Date: Sun, 31 Aug 2014 20:02:25 +0200
Subject: [PATCH 1153/1453] mpi4py: New package, version 1.3.1

---
 .../python-modules/mpi4py/default.nix         | 55 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  6 ++
 2 files changed, 61 insertions(+)
 create mode 100644 pkgs/development/python-modules/mpi4py/default.nix

diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix
new file mode 100644
index 000000000000..6c487dc07ad0
--- /dev/null
+++ b/pkgs/development/python-modules/mpi4py/default.nix
@@ -0,0 +1,55 @@
+{ stdenv, fetchurl, python, buildPythonPackage, mpi, openssh }:
+
+buildPythonPackage rec {
+  name = "mpi4py-1.3.1";
+
+  src = fetchurl {
+    url = "https://bitbucket.org/mpi4py/mpi4py/downloads/${name}.tar.gz";
+    sha256 = "e7bd2044aaac5a6ea87a87b2ecc73b310bb6efe5026031e33067ea3c2efc3507";
+  };
+
+  passthru = {
+    inherit mpi;
+  };
+
+  # The tests in the `test_spawn` module fail in the chroot build environment.
+  # However, they do pass in a pure, or non-pure nix-shell. Hence, we
+  # deactivate these particular tests.
+  # Unfortunately, the command-line arguments to `./setup.py test` are not
+  # correctly passed to the test-runner. Hence, these arguments are patched
+  # directly into `setup.py`.
+  patchPhase = ''
+    sed 's/err = main(cmd.args or \[\])/err = main(cmd.args or ["-v", "-e", "test_spawn"])/' -i setup.py
+  '';
+
+  configurePhase = "";
+
+  installPhase = ''
+    mkdir -p "$out/lib/${python.libPrefix}/site-packages"
+    export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH"
+
+    ${python}/bin/${python.executable} setup.py install \
+      --install-lib=$out/lib/${python.libPrefix}/site-packages \
+      --prefix="$out"
+
+    # --install-lib:
+    # sometimes packages specify where files should be installed outside the usual
+    # python lib prefix, we override that back so all infrastructure (setup hooks)
+    # work as expected
+  '';
+
+  setupPyBuildFlags = ["--mpicc=${mpi}/bin/mpicc"];
+
+  buildInputs = [ mpi ];
+  # Requires openssh for tests. Tests of dependent packages will also fail,
+  # if openssh is not present. E.g. h5py with mpi support.
+  propagatedBuildInputs = [ openssh ];
+
+  meta = {
+    description = "
+      Provides Python bindings for the Message Passing Interface standard.
+    ";
+    homepage = "http://code.google.com/p/mpi4py/";
+    license = stdenv.lib.licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7b39b083eea6..c786da4e0e06 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -106,6 +106,12 @@ rec {
     pylabQtSupport = false;
   });
 
+  mpi4py = callPackage ../development/python-modules/mpi4py {
+    inherit (pkgs) stdenv fetchurl openssh;
+    inherit python buildPythonPackage;
+    mpi = pkgs.openmpi;
+  };
+
   nixpart = callPackage ../tools/filesystems/nixpart { };
 
   # This is used for NixOps to make sure we won't break it with the next major

From 728793ef0bb7dd3ebf0bb4471492eed6f3a1a8ab Mon Sep 17 00:00:00 2001
From: Andreas Herrmann <andreash87@gmx.ch>
Date: Sun, 31 Aug 2014 20:02:38 +0200
Subject: [PATCH 1154/1453] h5py: New package, version 2.3.1

---
 .../python-modules/h5py/default.nix           | 43 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 13 ++++++
 2 files changed, 56 insertions(+)
 create mode 100644 pkgs/development/python-modules/h5py/default.nix

diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix
new file mode 100644
index 000000000000..9ab68ac4cd2b
--- /dev/null
+++ b/pkgs/development/python-modules/h5py/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchurl, python, buildPythonPackage
+, numpy, hdf5, cython
+, mpiSupport ? false, mpi4py ? null, mpi ? null }:
+
+assert mpiSupport == hdf5.mpiSupport;
+assert mpiSupport -> mpi != null
+  && mpi4py != null
+  && mpi == mpi4py.mpi
+  && mpi == hdf5.mpi
+  ;
+
+with stdenv.lib;
+
+buildPythonPackage rec {
+  name = "h5py-2.3.1";
+
+  src = fetchurl {
+    url = "https://pypi.python.org/packages/source/h/h5py/${name}.tar.gz";
+    md5 = "8f32f96d653e904d20f9f910c6d9dd91";
+  };
+
+  setupPyBuildFlags = [ "--hdf5=${hdf5}" ]
+    ++ optional mpiSupport "--mpi"
+    ;
+  setupPyInstallFlags = setupPyBuildFlags;
+
+  preBuild = if mpiSupport then "export CC=${mpi}/bin/mpicc" else "";
+
+  buildInputs = [ hdf5 cython ]
+    ++ optional mpiSupport mpi
+    ;
+  propagatedBuildInputs = [ numpy ]
+    ++ optional mpiSupport mpi4py
+    ;
+
+  meta = {
+    description = "
+      The h5py package is a Pythonic interface to the HDF5 binary data format.
+    ";
+    homepage = "http://www.h5py.org/";
+    license = stdenv.lib.licenses.bsd2;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c786da4e0e06..48155df78153 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -90,6 +90,19 @@ rec {
     '';
   };
 
+  h5py = callPackage ../development/python-modules/h5py {
+    inherit (pkgs) stdenv fetchurl;
+    inherit python buildPythonPackage cython numpy;
+    hdf5 = pkgs.hdf5.override { mpi = null; };
+  };
+
+  h5py-mpi = h5py.override {
+    mpiSupport = true;
+    mpi = pkgs.openmpi;
+    hdf5 = pkgs.hdf5.override { mpi = pkgs.openmpi; enableShared = true; };
+    inherit mpi4py;
+  };
+
   ipython = import ../shells/ipython {
     inherit (pkgs) stdenv fetchurl sip pyqt4;
     inherit buildPythonPackage pythonPackages;

From 3b0c725255259723fb496c2732eb9dd10890a798 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Tue, 2 Sep 2014 14:05:09 +0200
Subject: [PATCH 1155/1453] Add attributes for all relevant Android SDK API
 levels and their capabilities

---
 .../development/mobile/androidenv/default.nix | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix
index 422c1516f2d0..6e71195e41cb 100644
--- a/pkgs/development/mobile/androidenv/default.nix
+++ b/pkgs/development/mobile/androidenv/default.nix
@@ -63,8 +63,38 @@ rec {
     abiVersions = [ "armeabi-v7a" ];
     useGoogleAPIs = true;
   };
+
+  androidsdk_2_3_3 = androidsdk {
+    platformVersions = [ "10" ];
+    abiVersions = [ "armeabi-v7a" ];
+    useGoogleAPIs = true;
+  };
+  
+  androidsdk_3_0 = androidsdk {
+    platformVersions = [ "11" ];
+    abiVersions = [ "armeabi-v7a" ];
+    useGoogleAPIs = true;
+  };
+  
+  androidsdk_3_1 = androidsdk {
+    platformVersions = [ "12" ];
+    abiVersions = [ "armeabi-v7a" ];
+    useGoogleAPIs = true;
+  };
+  
+  androidsdk_3_2 = androidsdk {
+    platformVersions = [ "13" ];
+    abiVersions = [ "armeabi-v7a" ];
+    useGoogleAPIs = true;
+  };
   
   androidsdk_4_0 = androidsdk {
+    platformVersions = [ "14" ];
+    abiVersions = [ "armeabi-v7a" ];
+    useGoogleAPIs = true;
+  };
+  
+  androidsdk_4_0_3 = androidsdk {
     platformVersions = [ "15" ];
     abiVersions = [ "armeabi-v7a" ];
     useGoogleAPIs = true;

From c8871e0b654c318508559ba4a7e2651d3e1a0e42 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Fri, 1 Aug 2014 18:26:21 -0700
Subject: [PATCH 1156/1453] ewemoa : add the Android Support repository

---
 .../mobile/androidenv/androidsdk.nix            | 11 ++++++++++-
 pkgs/development/mobile/androidenv/default.nix  |  6 +++++-
 .../mobile/androidenv/support-repository.nix    | 17 +++++++++++++++++
 3 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/mobile/androidenv/support-repository.nix

diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix
index 3c9327f1c594..60f71517323d 100644
--- a/pkgs/development/mobile/androidenv/androidsdk.nix
+++ b/pkgs/development/mobile/androidenv/androidsdk.nix
@@ -1,5 +1,5 @@
 { stdenv, stdenv_32bit, fetchurl, unzip, makeWrapper
-, platformTools, buildTools, support, platforms, sysimages, addons
+, platformTools, buildTools, support, supportRepository, platforms, sysimages, addons
 , zlib_32bit
 , libX11_32bit, libxcb_32bit, libXau_32bit, libXdmcp_32bit, libXext_32bit, mesa_32bit, alsaLib_32bit
 , libX11, libXext, libXrender, libxcb, libXau, libXdmcp, libXtst, mesa, alsaLib
@@ -139,6 +139,15 @@ stdenv.mkDerivation rec {
       
     cd ..
 
+    # Symlink required extras
+
+    mkdir -p extras/android
+    cd extras/android
+
+    ln -s ${supportRepository}/m2repository
+
+    cd ../..
+
     # Symlink required platforms
    
     mkdir -p platforms
diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix
index 6e71195e41cb..796f0f862bdd 100644
--- a/pkgs/development/mobile/androidenv/default.nix
+++ b/pkgs/development/mobile/androidenv/default.nix
@@ -16,6 +16,10 @@ rec {
     inherit (pkgs) stdenv fetchurl unzip;
   };
   
+  supportRepository = import ./support-repository.nix {
+    inherit (pkgs) stdenv fetchurl unzip;
+  };
+
   platforms = if (pkgs.stdenv.system == "i686-linux" || pkgs.stdenv.system == "x86_64-linux")
     then import ./platforms-linux.nix {
       inherit (pkgs) stdenv fetchurl unzip;
@@ -39,7 +43,7 @@ rec {
     inherit (pkgs) freetype fontconfig glib gtk atk mesa file alsaLib jdk;
     inherit (pkgs.xorg) libX11 libXext libXrender libxcb libXau libXdmcp libXtst;
     
-    inherit platformTools buildTools support platforms sysimages addons;
+    inherit platformTools buildTools support supportRepository platforms sysimages addons;
     
     stdenv_32bit = pkgs_i686.stdenv;
     zlib_32bit = pkgs_i686.zlib;
diff --git a/pkgs/development/mobile/androidenv/support-repository.nix b/pkgs/development/mobile/androidenv/support-repository.nix
new file mode 100644
index 000000000000..66a532328b1b
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/support-repository.nix
@@ -0,0 +1,17 @@
+{stdenv, fetchurl, unzip}:
+
+stdenv.mkDerivation {
+  name = "android-support-repository-r5";
+  src = fetchurl {
+    url = http://dl-ssl.google.com/android/repository/android_m2repository_r05.zip;
+    sha1 = "2ee9723da079ba0d4fe2a185e00ded842de96f13";
+  };
+
+  buildCommand = ''
+    mkdir -p $out
+    cd $out
+    unzip $src
+  '';
+
+  buildInputs = [ unzip ];
+}

From ef8220d1bf6143d73be248fcfb58f14d1c4d987f Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Tue, 2 Sep 2014 14:11:09 +0200
Subject: [PATCH 1157/1453] Expose Android NDK in the top level expression

---
 pkgs/tools/package-management/disnix/default.nix          | 6 +++---
 pkgs/tools/package-management/disnix/disnixos/default.nix | 6 +++---
 pkgs/tools/package-management/disnix/dysnomia/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix                           | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix
index 61e998fd545e..b6b88aef0225 100644
--- a/pkgs/tools/package-management/disnix/default.nix
+++ b/pkgs/tools/package-management/disnix/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, dysnomia, libintlOrEmpty, libiconvOrEmpty }:
 
 stdenv.mkDerivation {
-  name = "disnix-0.3pre174e883b7b09da822494876d2f297736f33707a7";
+  name = "disnix-0.3pre24d959b3b37ce285971810245643a7f18cb85fcc";
   
   src = fetchurl {
-    url = http://hydra.nixos.org/build/11773951/download/4/disnix-0.3pre174e883b7b09da822494876d2f297736f33707a7.tar.gz;
-    sha256 = "19hdh2mrlyiq1g3z6lnnqqvripmfcdnm18jpm4anp5iarhnwh3y4";
+    url = http://hydra.nixos.org/build/13612993/download/4/disnix-0.3pre24d959b3b37ce285971810245643a7f18cb85fcc.tar.gz;
+    sha256 = "0ml8g6h7x79mvv84il9vb9b88kqak9m3yzavmar66i3dvyqr1dwb";
   };
   
   buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconvOrEmpty dysnomia ];
diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix
index 65ae91f6e187..0190a5fd679c 100644
--- a/pkgs/tools/package-management/disnix/disnixos/default.nix
+++ b/pkgs/tools/package-management/disnix/disnixos/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, disnix, socat, pkgconfig, getopt }:
 
 stdenv.mkDerivation {
-  name = "disnixos-0.2prebb320d396f93d7062c28d6a54105d8e8196b9d99";
+  name = "disnixos-0.2prec3310e2d8975c45e4ffacec940049fb781739b8d";
   
   src = fetchurl {
-    url = http://hydra.nixos.org/build/9877039/download/3/disnixos-0.2preb10c56eeb1be3046645eea90c779e2d64045581f.tar.gz;
-    sha256 = "1pkpf6vp9q3jjp212lghbs1km8iqh4rm9xa5jm0dqb5ya25f0jf2";
+    url = http://hydra.nixos.org/build/13617499/download/3/disnixos-0.2prec3310e2d8975c45e4ffacec940049fb781739b8d.tar.gz;
+    sha256 = "1kcpzzwy9jc1zz700whnp6sc77yp3wxzr935f07jy55ddkl8mdi5";
   };
   
   buildInputs = [ socat pkgconfig disnix getopt ];
diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix
index a1914224dbdb..574bf8f9ab39 100644
--- a/pkgs/tools/package-management/disnix/dysnomia/default.nix
+++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix
@@ -19,10 +19,10 @@ assert enableEjabberdDump -> ejabberd != null;
 assert enableMongoDatabase -> mongodb != null;
 
 stdenv.mkDerivation {
-  name = "dysnomia-0.3pre09cc08f5ffc737d988923bb7329a7ec711badd82";
+  name = "dysnomia-0.3precf347cbd508f488f115f8961371a3cecf03fd530";
   src = fetchurl {
-    url = http://hydra.nixos.org/build/11407191/download/1/dysnomia-0.3pre09cc08f5ffc737d988923bb7329a7ec711badd82.tar.gz;
-    sha256 = "1i7yb299bq1z7cy4sk83m5faahj8inh73xn5bi6jcv492zv3kgwz";
+    url = http://hydra.nixos.org/build/13281061/download/1/dysnomia-0.3precf347cbd508f488f115f8961371a3cecf03fd530.tar.gz;
+    sha256 = "0xiqpz2c3dh4pbdprvrd7plvq3ipngqbjkwpmbhw1nw90x5rpa2d";
   };
   
   preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else "";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d2d0f69132c4..05c9d695bc2b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -528,7 +528,7 @@ let
     pkgs_i686 = pkgsi686Linux;
   };
 
-  inherit (androidenv) androidsdk_4_1;
+  inherit (androidenv) androidsdk_4_4 androidndk;
 
   aria2 = callPackage ../tools/networking/aria2 { };
   aria = aria2;

From 217cda9c5430ef74b171edc65c4149bbefc4742b Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Tue, 2 Sep 2014 16:37:13 +0200
Subject: [PATCH 1158/1453] pythonPackages: add websocket_client, fix
 pythonPackages.docker

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3af1950f9b17..a3018b8e15f3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1843,7 +1843,7 @@ rec {
       md5 = "21ab8fd729105487e6423b654d6c0860";
     };
 
-    propagatedBuildInputs = [ six requests ];
+    propagatedBuildInputs = [ six requests websocket_client ];
 
     # Version conflict
     doCheck = false;
@@ -9948,6 +9948,24 @@ rec {
   };
 
 
+  websocket_client = buildPythonPackage rec {
+    name = "websocket-client-0.17.0";
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/w/websocket-client/${name}.tar.gz";
+      md5 = "c86591719085eaf4a01c2275e0c834fc";
+    };
+
+    propagatedBuildInputs = [ six backports_ssl_match_hostname_3_4_0_2 unittest2 argparse ];
+
+    meta = {
+      homepage = https://github.com/liris/websocket-client;
+      description = "Websocket client for python";
+      license = licenses.lgpl2;
+    };
+  };
+
+
   webhelpers = buildPythonPackage rec {
     name = "WebHelpers-1.3";
 

From 6a0b39b0afe9be1caae76adb925a26cb6adc5485 Mon Sep 17 00:00:00 2001
From: Michel Kuhlmann <michel@kuhlmanns.info>
Date: Tue, 2 Sep 2014 12:48:34 +0200
Subject: [PATCH 1159/1453] haskell-hindent: initial expression

---
 .../libraries/haskell/hindent/default.nix       | 17 +++++++++++++++++
 pkgs/top-level/haskell-packages.nix             |  2 ++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/hindent/default.nix

diff --git a/pkgs/development/libraries/haskell/hindent/default.nix b/pkgs/development/libraries/haskell/hindent/default.nix
new file mode 100644
index 000000000000..cef49d0b2fac
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hindent/default.nix
@@ -0,0 +1,17 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, dataDefault, haskellSrcExts, mtl, text }:
+
+cabal.mkDerivation (self: {
+  pname = "hindent";
+  version = "2.1";
+  sha256 = "0gvrh26d1d6d1fy4qfpwrghdrlvk82mkya8vaz0xnrs89p9gr9rz";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ dataDefault haskellSrcExts mtl text ];
+  meta = {
+    description = "Extensible Haskell pretty printer";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 15f6ed71007f..cb2353617830 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1188,6 +1188,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   hi = callPackage ../development/libraries/haskell/hi {};
 
+  hindent = callPackage ../development/libraries/haskell/hindent {};
+
   hint = callPackage ../development/libraries/haskell/hint {};
 
   hit = callPackage ../development/libraries/haskell/hit {};

From d812281674d6852a61e9aebc24787ce3213a2c95 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 2 Sep 2014 17:57:09 +0200
Subject: [PATCH 1160/1453] zile: update from 2.4.9 to 2.4.11, adpot it and set
 platforms to linux

---
 pkgs/applications/editors/zile/default.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix
index 32d30cd47450..48839246600d 100644
--- a/pkgs/applications/editors/zile/default.nix
+++ b/pkgs/applications/editors/zile/default.nix
@@ -1,14 +1,14 @@
-{ fetchurl, stdenv, ncurses, boehmgc, perl, help2man }:
+{ fetchurl, stdenv, pkgconfig, ncurses, boehmgc, perl, help2man }:
 
 stdenv.mkDerivation rec {
-  name = "zile-2.4.9";
+  name = "zile-2.4.11";
 
   src = fetchurl {
     url = "mirror://gnu/zile/${name}.tar.gz";
-    sha256 = "0j801c28ypm924rw3lqyb6khxyslg6ycrv16wmmwcam0mk3mj6f7";
+    sha256 = "1k593y1xzvlj52q0gyhcx2lllws4sg84b8r9pcginjb1vjypplhz";
   };
 
-  buildInputs = [ ncurses boehmgc ];
+  buildInputs = [ pkgconfig ncurses boehmgc ];
   nativeBuildInputs = [ help2man perl ];
 
   # `help2man' wants to run Zile, which fails when cross-compiling.
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   # XXX: Work around cross-compilation-unfriendly `gl_FUNC_FSTATAT' macro.
   preConfigure = "export gl_cv_func_fstatat_zero_flag=yes";
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Lightweight Emacs clone";
 
     longDescription = ''
@@ -45,8 +45,10 @@ stdenv.mkDerivation rec {
 
     homepage = http://www.gnu.org/software/zile/;
 
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = licenses.gpl3Plus;
 
-    maintainers = [ ];
+    maintainers = with maintainers; [ pSub ];
+
+    platforms = platforms.linux;
   };
 }

From 36614ff3e290a9330dd8e29bdc6cc38ede1e7001 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 31 Aug 2014 09:18:13 -0700
Subject: [PATCH 1161/1453] Revert "Revert "Merge pull request #2449 from
 wkennington/master.grub""

This reverts commit 94205f5f21c4d9942bb4205c06229438051b6853.

Conflicts:
	nixos/modules/system/boot/loader/grub/install-grub.pl
---
 .../installer/tools/nixos-generate-config.pl  |  21 +++
 nixos/modules/installer/tools/tools.nix       |   1 +
 nixos/modules/installer/virtualbox-demo.nix   |   3 +
 .../modules/system/boot/loader/grub/grub.nix  |  37 +++--
 .../system/boot/loader/grub/install-grub.pl   | 135 +++++++++++++++---
 nixos/modules/tasks/filesystems/zfs.nix       |   6 +-
 nixos/release-combined.nix                    |   4 +
 nixos/release.nix                             |   2 +-
 nixos/tests/installer.nix                     |  13 +-
 pkgs/tools/misc/grub/2.0x.nix                 |  60 ++++----
 pkgs/top-level/all-packages.nix               |   6 +-
 11 files changed, 223 insertions(+), 65 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index 66a8152a3a6c..73dd87cef5cf 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -20,6 +20,13 @@ sub uniq {
     return @res;
 }
 
+sub runCommand {
+    my ($cmd) = @_;
+    open FILE, "$cmd 2>/dev/null |" or die "Failed to execute: $cmd\n";
+    my @ret = <FILE>;
+    close FILE;
+    return ($?, @ret);
+}
 
 # Process the command line.
 my $outDir = "/etc/nixos";
@@ -337,6 +344,20 @@ EOF
         }
     }
 
+    # Is this a btrfs filesystem?
+    if ($fsType eq "btrfs") {
+        my ($status, @info) = runCommand("btrfs subvol show $rootDir$mountPoint");
+        if ($status != 0) {
+            die "Failed to retreive subvolume info for $mountPoint";
+        }
+        my @subvols = join("", @info) =~ m/Name:[ \t\n]*([^ \t\n]*)/;
+        if ($#subvols > 0) {
+            die "Btrfs subvol name for $mountPoint listed multiple times in mount\n"
+        } elsif ($#subvols == 0) {
+            push @extraOptions, "subvol=$subvols[0]";
+        }
+    }
+
     # Emit the filesystem.
     $fileSystems .= <<EOF;
   fileSystems.\"$mountPoint\" =
diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix
index 39da2f1f0be6..91a30695a7a5 100644
--- a/nixos/modules/installer/tools/tools.nix
+++ b/nixos/modules/installer/tools/tools.nix
@@ -38,6 +38,7 @@ let
   nixos-generate-config = makeProg {
     name = "nixos-generate-config";
     src = ./nixos-generate-config.pl;
+    path = [ pkgs.btrfsProgs ];
     perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl";
   };
 
diff --git a/nixos/modules/installer/virtualbox-demo.nix b/nixos/modules/installer/virtualbox-demo.nix
index f68f8dc40aa8..49ec08996104 100644
--- a/nixos/modules/installer/virtualbox-demo.nix
+++ b/nixos/modules/installer/virtualbox-demo.nix
@@ -10,6 +10,9 @@ with lib;
       ../profiles/clone-config.nix
     ];
 
+  # FIXME: UUID detection is currently broken
+  boot.loader.grub.fsIdentifier = "provided";
+
   # Allow mounting of shared folders.
   users.extraUsers.demo.extraGroups = [ "vboxsf" ];
 
diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index 0cc060db8f90..bc9a155ac95b 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -6,7 +6,8 @@ let
 
   cfg = config.boot.loader.grub;
 
-  realGrub = if cfg.version == 1 then pkgs.grub else pkgs.grub2;
+  realGrub = if cfg.version == 1 then pkgs.grub
+    else pkgs.grub2.override { zfsSupport = cfg.zfsSupport; };
 
   grub =
     # Don't include GRUB if we're only generating a GRUB menu (e.g.,
@@ -25,11 +26,12 @@ let
       inherit (cfg)
         version extraConfig extraPerEntryConfig extraEntries
         extraEntriesBeforeNixOS extraPrepareConfig configurationLimit copyKernels timeout
-        default devices explicitBootRoot;
+        default devices fsIdentifier;
       path = (makeSearchPath "bin" [
-        pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.findutils pkgs.diffutils
+        pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.findutils pkgs.diffutils pkgs.btrfsProgs
+        pkgs.utillinux
       ]) + ":" + (makeSearchPath "sbin" [
-        pkgs.mdadm
+        pkgs.mdadm pkgs.utillinux
       ]);
     });
 
@@ -209,12 +211,26 @@ in
         '';
       };
 
-      explicitBootRoot = mkOption {
-        default = "";
-        type = types.str;
+      fsIdentifier = mkOption {
+        default = "uuid";
+        type = types.addCheck types.str
+          (type: type == "uuid" || type == "label" || type == "provided");
         description = ''
-          The relative path of /boot within the parent volume. Leave empty
-          if /boot is not a btrfs subvolume.
+          Determines how grub will identify devices when generating the
+          configuration file. A value of uuid / label signifies that grub
+          will always resolve the uuid or label of the device before using
+          it in the configuration. A value of provided means that grub will
+          use the device name as show in <command>df</command> or
+          <command>mount</command>. Note, zfs zpools / datasets are ignored
+          and will always be mounted using their labels.
+        '';
+      };
+
+      zfsSupport = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          Whether grub should be build against libzfs.
         '';
       };
 
@@ -260,6 +276,9 @@ in
           ${pkgs.coreutils}/bin/cp -pf "${v}" "/boot/${n}"
         '') config.boot.loader.grub.extraFiles);
 
+    assertions = [{ assertion = !cfg.zfsSupport || cfg.version == 2;
+                    message = "Only grub version 2 provides zfs support";}];
+
     })
 
   ];
diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index b4900358a5dc..7ced51f57e16 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -1,5 +1,6 @@
 use strict;
 use warnings;
+use Class::Struct;
 use XML::LibXML;
 use File::Basename;
 use File::Path;
@@ -27,6 +28,14 @@ sub writeFile {
     close FILE or die;
 }
 
+sub runCommand {
+    my ($cmd) = @_;
+    open FILE, "$cmd 2>/dev/null |" or die "Failed to execute: $cmd\n";
+    my @ret = <FILE>;
+    close FILE;
+    return ($?, @ret);
+}
+
 my $grub = get("grub");
 my $grubVersion = int(get("version"));
 my $extraConfig = get("extraConfig");
@@ -39,7 +48,7 @@ my $configurationLimit = int(get("configurationLimit"));
 my $copyKernels = get("copyKernels") eq "true";
 my $timeout = int(get("timeout"));
 my $defaultEntry = int(get("default"));
-my $explicitBootRoot = get("explicitBootRoot");
+my $fsIdentifier = get("fsIdentifier");
 $ENV{'PATH'} = get("path");
 
 die "unsupported GRUB version\n" if $grubVersion != 1 && $grubVersion != 2;
@@ -48,22 +57,108 @@ print STDERR "updating GRUB $grubVersion menu...\n";
 
 mkpath("/boot/grub", 0, 0700);
 
-
 # Discover whether /boot is on the same filesystem as / and
 # /nix/store.  If not, then all kernels and initrds must be copied to
-# /boot, and all paths in the GRUB config file must be relative to the
-# root of the /boot filesystem.  `$bootRoot' is the path to be
-# prepended to paths under /boot.
-my $bootRoot = "/boot";
-if (stat("/")->dev != stat("/boot")->dev) {
-    $bootRoot = "";
-    $copyKernels = 1;
-} elsif (stat("/boot")->dev != stat("/nix/store")->dev) {
+# /boot.
+if (stat("/boot")->dev != stat("/nix/store")->dev) {
     $copyKernels = 1;
 }
 
-if ($explicitBootRoot ne "") {
-    $bootRoot = $explicitBootRoot;
+# Discover information about the location of /boot
+struct(Fs => {
+    device => '$',
+    type => '$',
+    mount => '$',
+});
+sub GetFs {
+    my ($dir) = @_;
+    my ($status, @dfOut) = runCommand("df -T $dir");
+    if ($status != 0 || $#dfOut != 1) {
+        die "Failed to retrieve output about $dir from `df`";
+    }
+    my @boot = split(/[ \n\t]+/, $dfOut[1]);
+    return Fs->new(device => $boot[0], type => $boot[1], mount => $boot[6]);
+}
+struct (Grub => {
+    path => '$',
+    search => '$',
+});
+my $driveid = 1;
+sub GrubFs {
+    my ($dir) = @_;
+    my $fs = GetFs($dir);
+    my $path = "/" . substr($dir, length($fs->mount));
+    my $search = "";
+
+    if ($grubVersion > 1) {
+        # ZFS is completely separate logic as zpools are always identified by a label
+        # or custom UUID
+        if ($fs->type eq 'zfs') {
+            my $sid = index($fs->device, '/');
+
+            if ($sid < 0) {
+                $search = '--label ' . $fs->device;
+                $path = '/@' . $path;
+            } else {
+                $search = '--label ' . substr($fs->device, 0, $sid);
+                $path = '/' . substr($fs->device, $sid) . '/@' . $path;
+            }
+        } else {
+            my %types = ('uuid' => '--fs-uuid', 'label' => '--label');
+
+            if ($fsIdentifier eq 'provided') {
+                # If the provided dev is identifying the partition using a label or uuid,
+                # we should get the label / uuid and do a proper search
+                my @matches = $fs->device =~ m/\/dev\/disk\/by-(label|uuid)\/(.*)/;
+                if ($#matches > 1) {
+                    die "Too many matched devices"
+                } elsif ($#matches == 1) {
+                    $search = "$types{$matches[0]} $matches[1]"
+                }
+            } else {
+                # Determine the identifying type
+                $search = $types{$fsIdentifier} . ' ';
+
+                # Based on the type pull in the identifier from the system
+                my ($status, @devInfo) = runCommand("blkid -o export @{[$fs->device]}");
+                if ($status != 0) {
+                    die "Failed to get blkid info for @{[$fs->device]}";
+                }
+                my @matches = join("", @devInfo) =~ m/@{[uc $fsIdentifier]}=([^\n]*)/;
+                if ($#matches != 0) {
+                    die "Couldn't find a $types{$fsIdentifier} for @{[$fs->device]}\n"
+                }
+                $search .= $matches[0];
+            }
+
+            # BTRFS is a special case in that we need to fix the referrenced path based on subvolumes
+            if ($fs->type eq 'btrfs') {
+                my ($status, @info) = runCommand("btrfs subvol show @{[$fs->mount]}");
+                if ($status != 0) {
+                    die "Failed to retreive subvolume info for @{[$fs->mount]}";
+                }
+                my @subvols = join("", @info) =~ m/Name:[ \t\n]*([^ \t\n]*)/;
+                if ($#subvols > 0) {
+                    die "Btrfs subvol name for @{[$fs->device]} listed multiple times in mount\n"
+                } elsif ($#subvols == 0) {
+                    $path = "/$subvols[0]$path";
+                }
+            }
+        }
+        if (not $search eq "") {
+            $search = "search --set=drive$driveid " . $search;
+            $path = "(\$drive$driveid)$path";
+            $driveid += 1;
+        }
+    }
+    return Grub->new(path => $path, search => $search);
+}
+my $grubBoot = GrubFs("/boot");
+my $grubStore = GrubFs("/nix");
+
+# We don't need to copy if we can read the kernels directly
+if ($grubStore->search ne "") {
+    $copyKernels = 0;
 }
 
 # Generate the header.
@@ -76,12 +171,14 @@ if ($grubVersion == 1) {
     ";
     if ($splashImage) {
         copy $splashImage, "/boot/background.xpm.gz" or die "cannot copy $splashImage to /boot\n";
-        $conf .= "splashimage $bootRoot/background.xpm.gz\n";
+        $conf .= "splashimage " . $grubBoot->path . "/background.xpm.gz\n";
     }
 }
 
 else {
     $conf .= "
+        " . $grubBoot->search . "
+        " . $grubStore->search . "
         if [ -s \$prefix/grubenv ]; then
           load_env
         fi
@@ -102,7 +199,7 @@ else {
           set timeout=$timeout
         fi
 
-        if loadfont $bootRoot/grub/fonts/unicode.pf2; then
+        if loadfont " . $grubBoot->path . "/grub/fonts/unicode.pf2; then
           set gfxmode=640x480
           insmod gfxterm
           insmod vbe
@@ -116,7 +213,7 @@ else {
         copy $splashImage, "/boot/background.png" or die "cannot copy $splashImage to /boot\n";
         $conf .= "
             insmod png
-            if background_image $bootRoot/background.png; then
+            if background_image " . $grubBoot->path . "/background.png; then
               set color_normal=white/black
               set color_highlight=black/white
             else
@@ -138,7 +235,7 @@ mkpath("/boot/kernels", 0, 0755) if $copyKernels;
 
 sub copyToKernelsDir {
     my ($path) = @_;
-    return $path unless $copyKernels;
+    return $grubStore->path . substr($path, length("/nix")) unless $copyKernels;
     $path =~ /\/nix\/store\/(.*)/ or die;
     my $name = $1; $name =~ s/\//-/g;
     my $dst = "/boot/kernels/$name";
@@ -151,7 +248,7 @@ sub copyToKernelsDir {
         rename $tmp, $dst or die "cannot rename $tmp to $dst\n";
     }
     $copied{$dst} = 1;
-    return "$bootRoot/kernels/$name";
+    return $grubBoot->path . "/kernels/$name";
 }
 
 sub addEntry {
@@ -178,6 +275,8 @@ sub addEntry {
         $conf .= "  " . ($xen ? "module" : "initrd") . " $initrd\n\n";
     } else {
         $conf .= "menuentry \"$name\" {\n";
+        $conf .= $grubBoot->search . "\n";
+        $conf .= $grubStore->search . "\n";
         $conf .= "  $extraPerEntryConfig\n" if $extraPerEntryConfig;
         $conf .= "  multiboot $xen $xenParams\n" if $xen;
         $conf .= "  " . ($xen ? "module" : "linux") . " $kernel $kernelParams\n";
@@ -195,7 +294,7 @@ addEntry("NixOS - Default", $defaultConfig);
 $conf .= "$extraEntries\n" unless $extraEntriesBeforeNixOS;
 
 # extraEntries could refer to @bootRoot@, which we have to substitute
-$conf =~ s/\@bootRoot\@/$bootRoot/g;
+$conf =~ s/\@bootRoot\@/$grubBoot->path/g;
 
 # Emit submenus for all system profiles.
 sub addProfile {
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index d7deb44c407c..1c4bbc16b499 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -133,7 +133,7 @@ in
       };
 
       boot.initrd = mkIf inInitrd {
-        kernelModules = [ "spl" "zfs" ] ;
+        kernelModules = [ "spl" "zfs" ];
         extraUtilsCommands =
           ''
             cp -v ${zfsPkg}/sbin/zfs $out/bin
@@ -148,6 +148,10 @@ in
           '';
       };
 
+      boot.loader.grub = mkIf inInitrd {
+        zfsSupport = true;
+      };
+
       systemd.services."zpool-import" = {
         description = "Import zpools";
         after = [ "systemd-udev-settle.service" ];
diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index dae3b9210a86..23348e1d089e 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -52,6 +52,10 @@ in rec {
         (all nixos.tests.installer.lvm)
         (all nixos.tests.installer.separateBoot)
         (all nixos.tests.installer.simple)
+        (all nixos.tests.installer.simpleLabels)
+        (all nixos.tests.installer.simpleProvided)
+        (all nixos.tests.installer.btrfsSimple)
+        (all nixos.tests.installer.btrfsSubvols)
         (all nixos.tests.ipv6)
         (all nixos.tests.kde4)
         (all nixos.tests.login)
diff --git a/nixos/release.nix b/nixos/release.nix
index e2b93640f917..f78ecb4383d0 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -231,7 +231,7 @@ in rec {
   tests.installer.simpleLabels = forAllSystems (system: (import tests/installer.nix { inherit system; }).simpleLabels.test);
   tests.installer.simpleProvided = forAllSystems (system: (import tests/installer.nix { inherit system; }).simpleProvided.test);
   tests.installer.btrfsSimple = forAllSystems (system: (import tests/installer.nix { inherit system; }).btrfsSimple.test);
-  #tests.installer.btrfsSubvols = forAllSystems (system: (import tests/installer.nix { inherit system; }).btrfsSubvols.test);
+  tests.installer.btrfsSubvols = forAllSystems (system: (import tests/installer.nix { inherit system; }).btrfsSubvols.test);
   tests.influxdb = callTest tests/influxdb.nix {};
   tests.ipv6 = callTest tests/ipv6.nix {};
   tests.jenkins = callTest tests/jenkins.nix {};
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 6ee52fd63d8b..154f3323d294 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -35,8 +35,8 @@ let
 
 
   # The configuration to install.
-  makeConfig = { testChannel, useEFI, grubVersion, grubDevice }: pkgs.writeText "configuration.nix"
-    ''
+  makeConfig = { testChannel, useEFI, grubVersion, grubDevice, grubIdentifier }:
+    pkgs.writeText "configuration.nix" ''
       { config, pkgs, modulesPath, ... }:
 
       { imports =
@@ -54,6 +54,7 @@ let
           ''}
           boot.loader.grub.device = "${grubDevice}";
           boot.loader.grub.extraConfig = "serial; terminal_output.serial";
+          boot.loader.grub.fsIdentifier = "${grubIdentifier}";
         ''}
 
         environment.systemPackages = [ ${optionalString testChannel "pkgs.rlwrap"} ];
@@ -93,7 +94,7 @@ let
   # disk, and then reboot from the hard disk.  It's parameterized with
   # a test script fragment `createPartitions', which must create
   # partitions and filesystems.
-  testScriptFun = { createPartitions, testChannel, useEFI, grubVersion, grubDevice }:
+  testScriptFun = { createPartitions, testChannel, useEFI, grubVersion, grubDevice, grubIdentifier }:
     let
       # FIXME: OVMF doesn't boot from virtio http://www.mail-archive.com/edk2-devel@lists.sourceforge.net/msg01501.html
       iface = if useEFI || grubVersion == 1 then "scsi" else "virtio";
@@ -161,7 +162,7 @@ let
       $machine->succeed("cat /mnt/etc/nixos/hardware-configuration.nix >&2");
 
       $machine->copyFileFromHost(
-          "${ makeConfig { inherit testChannel useEFI grubVersion grubDevice; } }",
+          "${ makeConfig { inherit testChannel useEFI grubVersion grubDevice grubIdentifier; } }",
           "/mnt/etc/nixos/configuration.nix");
 
       # Perform the installation.
@@ -216,13 +217,13 @@ let
 
 
   makeInstallerTest = name:
-    { createPartitions, testChannel ? false, useEFI ? false, grubVersion ? 2, grubDevice ? "/dev/vda" }:
+    { createPartitions, testChannel ? false, useEFI ? false, grubVersion ? 2, grubDevice ? "/dev/vda", grubIdentifier ? "uuid" }:
     makeTest {
       inherit iso;
       name = "installer-" + name;
       nodes = if testChannel then { inherit webserver; } else { };
       testScript = testScriptFun {
-        inherit createPartitions testChannel useEFI grubVersion grubDevice;
+        inherit createPartitions testChannel useEFI grubVersion grubDevice grubIdentifier;
       };
     };
 
diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix
index b1877bdcf98c..e3c07af759c9 100644
--- a/pkgs/tools/misc/grub/2.0x.nix
+++ b/pkgs/tools/misc/grub/2.0x.nix
@@ -1,30 +1,45 @@
-{ fetchurl, stdenv, flex, bison, gettext, ncurses, libusb, freetype, qemu
-, devicemapper, EFIsupport ? false }:
+{ stdenv, fetchurl, autogen, flex, bison, python, autoconf, automake
+, gettext, ncurses, libusb, freetype, qemu, devicemapper
+, linuxPackages ? null
+, efiSupport ? false
+, zfsSupport ? false
+}:
 
+with stdenv.lib;
 let
+  efiSystems = {
+    "i686-linux".target = "i386";
+    "x86_64-linux".target = "x86_64";
+  };
 
-  prefix = "grub${if EFIsupport then "-efi" else ""}";
+  canEfi = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) efiSystems);
 
-  version = "2.00";
+  prefix = "grub${if efiSupport then "-efi" else ""}";
+
+  version = "2.02-beta2";
 
   unifont_bdf = fetchurl {
     url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz";
     sha256 = "0s0qfff6n6282q28nwwblp5x295zd6n71kl43xj40vgvdqxv0fxx";
   };
+in (
 
-in
+assert efiSupport -> canEfi;
+assert zfsSupport -> linuxPackages != null && linuxPackages.zfs != null;
 
 stdenv.mkDerivation rec {
   name = "${prefix}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnu/grub/grub-${version}.tar.xz";
-    sha256 = "0n64hpmsccvicagvr0c6v0kgp2yw0kgnd3jvsyd26cnwgs7c6kkq";
+    name = "grub-2.02-beta2.tar.xz";
+    url = "http://alpha.gnu.org/gnu/grub/grub-2.02~beta2.tar.xz";
+    sha256 = "13a13fhc0wf473dn73zhga15mjvkg6vqp4h25dxg4n7am2r05izn";
   };
 
-  nativeBuildInputs = [ flex bison ];
+  nativeBuildInputs = [ autogen flex bison python autoconf automake ];
   buildInputs = [ ncurses libusb freetype gettext devicemapper ]
-    ++ stdenv.lib.optional doCheck qemu;
+    ++ optional doCheck qemu
+    ++ optional zfsSupport linuxPackages.zfs;
 
   preConfigure =
     '' for i in "tests/util/"*.in
@@ -43,27 +58,19 @@ stdenv.mkDerivation rec {
        # See <http://www.mail-archive.com/qemu-devel@nongnu.org/msg22775.html>.
        sed -i "tests/util/grub-shell.in" \
            -e's/qemu-system-i386/qemu-system-x86_64 -nodefaults/g'
-
-       # Fix for building on Glibc 2.16.  Won't be needed once the
-       # gnulib in grub is updated.
-       sed -i '/gets is a security hole/d' grub-core/gnulib/stdio.in.h
     '';
 
   prePatch =
-    '' gunzip < "${unifont_bdf}" > "unifont.bdf"
+    '' sh autogen.sh
+       gunzip < "${unifont_bdf}" > "unifont.bdf"
        sed -i "configure" \
            -e "s|/usr/src/unifont.bdf|$PWD/unifont.bdf|g"
     '';
 
   patches = [ ./fix-bash-completion.patch ];
 
-  configureFlags =
-    let arch = if stdenv.system == "i686-linux" then "i386"
-               else if stdenv.system == "x86_64-linux" then "x86_64"
-               else throw "unsupported EFI firmware architecture";
-    in
-      stdenv.lib.optionals EFIsupport
-        [ "--with-platform=efi" "--target=${arch}" "--program-prefix=" ];
+  configureFlags = optional zfsSupport "--enable-libzfs"
+    ++ optionals efiSupport [ "--with-platform=efi" "--target=${efiSystems.${stdenv.system}.target}" "--program-prefix=" ];
 
   doCheck = false;
   enableParallelBuilding = true;
@@ -72,7 +79,7 @@ stdenv.mkDerivation rec {
     paxmark pms $out/sbin/grub-{probe,bios-setup}
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "GNU GRUB, the Grand Unified Boot Loader (2.x beta)";
 
     longDescription =
@@ -89,11 +96,8 @@ stdenv.mkDerivation rec {
 
     homepage = http://www.gnu.org/software/grub/;
 
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = licenses.gpl3Plus;
 
-    platforms = if EFIsupport then
-      [ "i686-linux" "x86_64-linux" ]
-    else
-      stdenv.lib.platforms.gnu;
+    platforms = platforms.gnu;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 05c9d695bc2b..6e5caa3af9ed 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1235,9 +1235,11 @@ let
     buggyBiosCDSupport = config.grub.buggyBiosCDSupport or true;
   };
 
-  grub2 = callPackage ../tools/misc/grub/2.0x.nix { libusb = libusb1; flex = flex_2_5_35; };
+  grub2 = callPackage ../tools/misc/grub/2.0x.nix { };
 
-  grub2_efi = grub2.override { EFIsupport = true; };
+  grub2_efi = grub2.override { efiSupport = true; };
+
+  grub2_zfs = grub2.override { zfsSupport = true; };
 
   gssdp = callPackage ../development/libraries/gssdp {
     inherit (gnome) libsoup;

From 0b66483c9a64ccda86828edadda29d5ccd532b9f Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 31 Aug 2014 09:18:51 -0700
Subject: [PATCH 1162/1453] nixos/install-grub: Store path should be /nix/store
 not /nix

---
 nixos/modules/system/boot/loader/grub/install-grub.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index 7ced51f57e16..9ef1a6977047 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -154,7 +154,7 @@ sub GrubFs {
     return Grub->new(path => $path, search => $search);
 }
 my $grubBoot = GrubFs("/boot");
-my $grubStore = GrubFs("/nix");
+my $grubStore = GrubFs("/nix/store");
 
 # We don't need to copy if we can read the kernels directly
 if ($grubStore->search ne "") {

From 7fae42352235b9315021005928fea9a058c516e8 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 30 Aug 2014 15:33:44 -0700
Subject: [PATCH 1163/1453] nixos/generate-config: Support detecting nested
 subvolumes

---
 .../installer/tools/nixos-generate-config.pl  | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index 73dd87cef5cf..ab5b2954f6b5 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -346,15 +346,25 @@ EOF
 
     # Is this a btrfs filesystem?
     if ($fsType eq "btrfs") {
-        my ($status, @info) = runCommand("btrfs subvol show $rootDir$mountPoint");
+        my ($status, @id_info) = runCommand("btrfs subvol show $rootDir$mountPoint");
         if ($status != 0) {
-            die "Failed to retreive subvolume info for $mountPoint";
+            die "Failed to retreive subvolume info for $mountPoint\n";
         }
-        my @subvols = join("", @info) =~ m/Name:[ \t\n]*([^ \t\n]*)/;
-        if ($#subvols > 0) {
+        my @ids = join("", @id_info) =~ m/Object ID:[ \t\n]*([^ \t\n]*)/;
+        if ($#ids > 0) {
             die "Btrfs subvol name for $mountPoint listed multiple times in mount\n"
-        } elsif ($#subvols == 0) {
-            push @extraOptions, "subvol=$subvols[0]";
+        } elsif ($#ids == 0) {
+            my ($status, @path_info) = runCommand("btrfs subvol list $rootDir$mountPoint");
+            if ($status != 0) {
+                die "Failed to find $mountPoint subvolume id from btrfs\n";
+            }
+            my @paths = join("", @path_info) =~ m/ID $ids[0] [^\n]* path ([^\n]*)/;
+            if ($#paths > 0) {
+                die "Btrfs returned multiple paths for a single subvolume id, mountpoint $mountPoint\n";
+            } elsif ($#paths != 0) {
+                die "Btrfs did not return a path for the subvolume at $mountPoint\n";
+            }
+            push @extraOptions, "subvol=$paths[0]";
         }
     }
 

From 01ab1d57a3e02d388a8e1903031b273b47c6bb94 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 30 Aug 2014 15:44:13 -0700
Subject: [PATCH 1164/1453] nixos/install-grub: Detect nested btrfs subvolumes

---
 .../system/boot/loader/grub/install-grub.pl   | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index 9ef1a6977047..f1807f53ff1d 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -133,15 +133,25 @@ sub GrubFs {
 
             # BTRFS is a special case in that we need to fix the referrenced path based on subvolumes
             if ($fs->type eq 'btrfs') {
-                my ($status, @info) = runCommand("btrfs subvol show @{[$fs->mount]}");
+                my ($status, @id_info) = runCommand("btrfs subvol show @{[$fs->mount]}");
                 if ($status != 0) {
-                    die "Failed to retreive subvolume info for @{[$fs->mount]}";
+                    die "Failed to retreive subvolume info for @{[$fs->mount]}\n";
                 }
-                my @subvols = join("", @info) =~ m/Name:[ \t\n]*([^ \t\n]*)/;
-                if ($#subvols > 0) {
+                my @ids = join("", @id_info) =~ m/Object ID:[ \t\n]*([^ \t\n]*)/;
+                if ($#ids > 0) {
                     die "Btrfs subvol name for @{[$fs->device]} listed multiple times in mount\n"
-                } elsif ($#subvols == 0) {
-                    $path = "/$subvols[0]$path";
+                } elsif ($#ids == 0) {
+                    my ($status, @path_info) = runCommand("btrfs subvol list @{[$fs->mount]}");
+                    if ($status != 0) {
+                        die "Failed to find @{[$fs->mount]} subvolume id from btrfs\n";
+                    }
+                    my @paths = join("", @path_info) =~ m/ID $ids[0] [^\n]* path ([^\n]*)/;
+                    if ($#paths > 0) {
+                        die "Btrfs returned multiple paths for a single subvolume id, mountpoint @{[$fs->mount]}\n";
+                    } elsif ($#paths != 0) {
+                        die "Btrfs did not return a path for the subvolume at @{[$fs->mount]}\n";
+                    }
+                    $path = "/$paths[0]$path";
                 }
             }
         }

From 39442393627569a4fd644b3d23658178a8245218 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 29 Aug 2014 16:37:28 -0700
Subject: [PATCH 1165/1453] nixos/tests-installer: Add a test for btrfs default
 volumes and bind mounts

---
 nixos/release-combined.nix |  1 +
 nixos/release.nix          |  1 +
 nixos/tests/installer.nix  | 24 ++++++++++++++++++++++++
 3 files changed, 26 insertions(+)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 23348e1d089e..0c72bae35bbc 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -56,6 +56,7 @@ in rec {
         (all nixos.tests.installer.simpleProvided)
         (all nixos.tests.installer.btrfsSimple)
         (all nixos.tests.installer.btrfsSubvols)
+        (all nixos.tests.installer.btrfsSubvolDefault)
         (all nixos.tests.ipv6)
         (all nixos.tests.kde4)
         (all nixos.tests.login)
diff --git a/nixos/release.nix b/nixos/release.nix
index f78ecb4383d0..d4e1a3737e3b 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -232,6 +232,7 @@ in rec {
   tests.installer.simpleProvided = forAllSystems (system: (import tests/installer.nix { inherit system; }).simpleProvided.test);
   tests.installer.btrfsSimple = forAllSystems (system: (import tests/installer.nix { inherit system; }).btrfsSimple.test);
   tests.installer.btrfsSubvols = forAllSystems (system: (import tests/installer.nix { inherit system; }).btrfsSubvols.test);
+  tests.installer.btrfsSubvolDefault = forAllSystems (system: (import tests/installer.nix { inherit system; }).btrfsSubvolDefault.test);
   tests.influxdb = callTest tests/influxdb.nix {};
   tests.ipv6 = callTest tests/ipv6.nix {};
   tests.jenkins = callTest tests/jenkins.nix {};
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 154f3323d294..7765b7945c7a 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -469,4 +469,28 @@ in {
       );
     '';
   };
+
+  # Test to see if we can detect default and aux subvolumes correctly
+  btrfsSubvolDefault = makeInstallerTest "btrfsSubvolDefault" {
+    createPartitions = ''
+      $machine->succeed(
+        "sgdisk -Z /dev/vda",
+        "sgdisk -n 1:0:+1M -n 2:0:+1G -N 3 -t 1:ef02 -t 2:8200 -t 3:8300 -c 3:root /dev/vda",
+        "mkswap /dev/vda2 -L swap",
+        "swapon -L swap",
+        "mkfs.btrfs -L root /dev/vda3",
+        "btrfs device scan",
+        "mount LABEL=root /mnt",
+        "btrfs subvol create /mnt/badpath",
+        "btrfs subvol create /mnt/badpath/boot",
+        "btrfs subvol create /mnt/nixos",
+        "btrfs subvol set-default \$(btrfs subvol list /mnt | grep 'nixos' | awk '{print \$2}') /mnt",
+        "umount /mnt",
+        "mount -o defaults LABEL=root /mnt",
+        "mkdir -p /mnt/badpath/boot", # Help ensure the detection mechanism is actually looking up subvolumes
+        "mkdir /mnt/boot",
+        "mount -o defaults,subvol=badpath/boot LABEL=root /mnt/boot",
+      );
+    '';
+  };
 }

From 87b6232f3a4c9903a432fffd8bc627f2c445a10d Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 30 Aug 2014 16:30:56 -0700
Subject: [PATCH 1166/1453] nixos/generate-config: Don't interpret btrfs
 subvols as bind mounts

---
 .../installer/tools/nixos-generate-config.pl   | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index ab5b2954f6b5..c6f499b82506 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -22,7 +22,7 @@ sub uniq {
 
 sub runCommand {
     my ($cmd) = @_;
-    open FILE, "$cmd 2>/dev/null |" or die "Failed to execute: $cmd\n";
+    open FILE, "$cmd 2>&1 |" or die "Failed to execute: $cmd\n";
     my @ret = <FILE>;
     close FILE;
     return ($?, @ret);
@@ -311,10 +311,13 @@ foreach my $fs (read_file("/proc/self/mountinfo")) {
 
     # Maybe this is a bind-mount of a filesystem we saw earlier?
     if (defined $fsByDev{$fields[2]}) {
-        my $path = $fields[3]; $path = "" if $path eq "/";
-        my $base = $fsByDev{$fields[2]};
-        $base = "" if $base eq "/";
-        $fileSystems .= <<EOF;
+        # Make sure this isn't a btrfs subvolume
+        my ($status, @msg) = runCommand("btrfs subvol show $rootDir$mountPoint");
+        if (join("", @msg) =~ /ERROR:/) {
+            my $path = $fields[3]; $path = "" if $path eq "/";
+            my $base = $fsByDev{$fields[2]};
+            $base = "" if $base eq "/";
+            $fileSystems .= <<EOF;
   fileSystems.\"$mountPoint\" =
     { device = \"$base$path\";
       fsType = \"none\";
@@ -322,7 +325,8 @@ foreach my $fs (read_file("/proc/self/mountinfo")) {
     };
 
 EOF
-        next;
+            next;
+        }
     }
     $fsByDev{$fields[2]} = $mountPoint;
 
@@ -347,7 +351,7 @@ EOF
     # Is this a btrfs filesystem?
     if ($fsType eq "btrfs") {
         my ($status, @id_info) = runCommand("btrfs subvol show $rootDir$mountPoint");
-        if ($status != 0) {
+        if ($status != 0 || join("", @msg) =~ /ERROR:/) {
             die "Failed to retreive subvolume info for $mountPoint\n";
         }
         my @ids = join("", @id_info) =~ m/Object ID:[ \t\n]*([^ \t\n]*)/;

From 4eff4afa3c4c26f7c23cda8c2f08e5046541494b Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 30 Aug 2014 15:48:54 -0700
Subject: [PATCH 1167/1453] nixos/installer-test: Use nested subvolumes for
 root to test detection

---
 nixos/tests/installer.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 7765b7945c7a..66ab2567e197 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -462,8 +462,9 @@ in {
         "mount LABEL=root /mnt",
         "btrfs subvol create /mnt/boot",
         "btrfs subvol create /mnt/nixos",
+        "btrfs subvol create /mnt/nixos/default",
         "umount /mnt",
-        "mount -o defaults,subvol=nixos LABEL=root /mnt",
+        "mount -o defaults,subvol=nixos/default LABEL=root /mnt",
         "mkdir /mnt/boot",
         "mount -o defaults,subvol=boot LABEL=root /mnt/boot",
       );

From 61908bdd80a40b8231e4106e38f8b38d4e4a4c09 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 31 Aug 2014 09:28:45 -0700
Subject: [PATCH 1168/1453] nixos/install-grub: Always copy kernels for
 different devices

---
 nixos/modules/system/boot/loader/grub/install-grub.pl | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index f1807f53ff1d..05fc99006095 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -166,11 +166,6 @@ sub GrubFs {
 my $grubBoot = GrubFs("/boot");
 my $grubStore = GrubFs("/nix/store");
 
-# We don't need to copy if we can read the kernels directly
-if ($grubStore->search ne "") {
-    $copyKernels = 0;
-}
-
 # Generate the header.
 my $conf .= "# Automatically generated.  DO NOT EDIT THIS FILE!\n";
 

From 94679376395b32759c19b2145b684099b6f67471 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 31 Aug 2014 17:15:39 -0700
Subject: [PATCH 1169/1453] nixos/install-grub: Only check for /nix to be the
 mountPoint for the store

---
 nixos/modules/system/boot/loader/grub/install-grub.pl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index 05fc99006095..570cd2239b0c 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -164,7 +164,8 @@ sub GrubFs {
     return Grub->new(path => $path, search => $search);
 }
 my $grubBoot = GrubFs("/boot");
-my $grubStore = GrubFs("/nix/store");
+# FIXME: Should be /nix/store, but this fails in the installer
+my $grubStore = GrubFs("/nix");
 
 # Generate the header.
 my $conf .= "# Automatically generated.  DO NOT EDIT THIS FILE!\n";

From 961e9867b3e502e66001280c2c7c5f3b08d6e469 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 1 Sep 2014 00:01:41 -0700
Subject: [PATCH 1170/1453] nixos/generate-config: Only add store search path
 when kernels are not copied

---
 nixos/modules/system/boot/loader/grub/install-grub.pl | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index 570cd2239b0c..4e196d67e931 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -182,9 +182,12 @@ if ($grubVersion == 1) {
 }
 
 else {
+    if ($copyKernels == 0) {
+        $conf .= "
+            " . $grubStore->search;
+    }
     $conf .= "
         " . $grubBoot->search . "
-        " . $grubStore->search . "
         if [ -s \$prefix/grubenv ]; then
           load_env
         fi
@@ -282,7 +285,9 @@ sub addEntry {
     } else {
         $conf .= "menuentry \"$name\" {\n";
         $conf .= $grubBoot->search . "\n";
-        $conf .= $grubStore->search . "\n";
+        if ($copyKernels == 0) {
+            $conf .= $grubStore->search . "\n";
+        }
         $conf .= "  $extraPerEntryConfig\n" if $extraPerEntryConfig;
         $conf .= "  multiboot $xen $xenParams\n" if $xen;
         $conf .= "  " . ($xen ? "module" : "linux") . " $kernel $kernelParams\n";

From ac502d28ff4fabd8fb97c45c209e67c0d35d184a Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 23 Aug 2014 14:05:31 -0700
Subject: [PATCH 1171/1453] tinc_pre: Add derivation

The tinc developer has made significant developments to the next version
of tinc including many protocol security fixes. This patch adds the
prerelease of the next major tinc release.
---
 pkgs/tools/networking/tinc/pre.nix | 33 ++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/tools/networking/tinc/pre.nix

diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix
new file mode 100644
index 000000000000..b2a7ca537286
--- /dev/null
+++ b/pkgs/tools/networking/tinc/pre.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchgit, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }:
+
+stdenv.mkDerivation rec {
+  version = "1.1pre78bf82c";
+  name = "tinc-${version}";
+
+  src = fetchgit {
+    url = "git://tinc-vpn.org/tinc";
+    rev = "78bf82cf332327889f0f61388b73053850d8e59b";
+    sha256 = "0azjy78qrzpk16b5jm08kx01ln2j9q0q69g86ah60fms525w1xjk";
+  };
+
+  buildInputs = [ autoreconfHook texinfo ncurses readline zlib lzo openssl ];
+
+  configureFlags = [
+    "--sysconfdir=/etc"
+    "--localstatedir=/var"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "VPN daemon with full mesh routing";
+    longDescription = ''
+      tinc is a Virtual Private Network (VPN) daemon that uses tunnelling and
+      encryption to create a secure private network between hosts on the
+      Internet.  It features full mesh routing, as well as encryption,
+      authentication, compression and ethernet bridging.
+    '';
+    homepage="http://www.tinc-vpn.org/";
+    license = licenses.gpl2Plus;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ wkennington ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 05c9d695bc2b..eee5ed3d9b0c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2260,6 +2260,8 @@ let
 
   tinc = callPackage ../tools/networking/tinc { };
 
+  tinc_pre = callPackage ../tools/networking/tinc/pre.nix { };
+
   tiny8086 = callPackage ../applications/virtualization/8086tiny { };
 
   tmpwatch = callPackage ../tools/misc/tmpwatch  { };

From d13423c74f93620c1b8810e9818bbb025016d137 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 24 Aug 2014 19:53:13 -0700
Subject: [PATCH 1172/1453] tinc_pre: Experimental Patches

---
 pkgs/tools/networking/tinc/pre.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix
index b2a7ca537286..030cb30a1502 100644
--- a/pkgs/tools/networking/tinc/pre.nix
+++ b/pkgs/tools/networking/tinc/pre.nix
@@ -1,13 +1,12 @@
 { stdenv, fetchgit, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }:
 
 stdenv.mkDerivation rec {
-  version = "1.1pre78bf82c";
-  name = "tinc-${version}";
+  name = "tinc-1.1pre38d7e73";
 
   src = fetchgit {
     url = "git://tinc-vpn.org/tinc";
-    rev = "78bf82cf332327889f0f61388b73053850d8e59b";
-    sha256 = "0azjy78qrzpk16b5jm08kx01ln2j9q0q69g86ah60fms525w1xjk";
+    rev = "38d7e730e619a8b86dfbf68d77773564595f12a1";
+    sha256 = "0xac1jm6x9lkybd6sz8lfcdrb8h69kh1ckg35ag1rssr45hxikbz";
   };
 
   buildInputs = [ autoreconfHook texinfo ncurses readline zlib lzo openssl ];

From af4c369d0a21e77afb1bdb0993e67e027d29235a Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 2 Sep 2014 20:17:55 +0400
Subject: [PATCH 1173/1453] Revert "Create wrapper directory outside of /bin/
 for FHS chroots to be closer to FHS"

This reverts commit 9deb7f8aae431ed7725cfaa13edf8645d19d91f2.
---
 pkgs/build-support/setup-hooks/make-wrapper.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/make-wrapper.sh b/pkgs/build-support/setup-hooks/make-wrapper.sh
index dd43068be279..95d1a5192137 100644
--- a/pkgs/build-support/setup-hooks/make-wrapper.sh
+++ b/pkgs/build-support/setup-hooks/make-wrapper.sh
@@ -97,9 +97,9 @@ filterExisting() {
 wrapProgram() {
     local prog="$1"
     local progBasename=$(basename $prog)
-    local hiddenDir="$(dirname $prog)/../wrapped-bin/.$progBasename-wrapped-bin"
-    mkdir -p $hiddenDir
-    local hidden="$(cd "$hiddenDir"; pwd)/$progBasename"
+    local hiddenDir=$(dirname $prog)/.$progBasename-wrapped-bin
+    local hidden=$hiddenDir/$progBasename
+    mkdir $hiddenDir
     mv $prog $hidden
     makeWrapper $hidden $prog "$@"
 }

From 76f4eb5f93451b6300e42f775c4a63adbb7f4986 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 2 Sep 2014 20:45:41 +0400
Subject: [PATCH 1174/1453] Revert "python-wrapper: fix wrapped argv[0] w/o
 sed, maybe"

This reverts commit a6dd9bd0cb3ef4896c41f70e37bc3a72d36aa569.
---
 pkgs/build-support/setup-hooks/make-wrapper.sh  | 5 +----
 pkgs/development/python-modules/generic/wrap.sh | 6 ++++++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/make-wrapper.sh b/pkgs/build-support/setup-hooks/make-wrapper.sh
index 95d1a5192137..41f2a59246d1 100644
--- a/pkgs/build-support/setup-hooks/make-wrapper.sh
+++ b/pkgs/build-support/setup-hooks/make-wrapper.sh
@@ -96,10 +96,7 @@ filterExisting() {
 # Syntax: wrapProgram <PROGRAM> <MAKE-WRAPPER FLAGS...>
 wrapProgram() {
     local prog="$1"
-    local progBasename=$(basename $prog)
-    local hiddenDir=$(dirname $prog)/.$progBasename-wrapped-bin
-    local hidden=$hiddenDir/$progBasename
-    mkdir $hiddenDir
+    local hidden="$(dirname "$prog")/.$(basename "$prog")"-wrapped
     mv $prog $hidden
     makeWrapper $hidden $prog "$@"
 }
diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh
index 282aeca9ed1c..857f002cace9 100644
--- a/pkgs/development/python-modules/generic/wrap.sh
+++ b/pkgs/development/python-modules/generic/wrap.sh
@@ -26,6 +26,12 @@ wrapPythonProgramsIn() {
             # dont wrap EGG-INFO scripts since they are called from python
             if echo "$i" | grep -v EGG-INFO/scripts; then
                 echo "wrapping \`$i'..."
+                sed -i "$i" -re '1 {
+                    /^#!/!b; :r
+                    /\\$/{N;b r}
+                    /__future__|^ *(#.*)?$/{n;b r}
+                    /^ *[^# ]/i import sys; sys.argv[0] = '"'$(basename "$i")'"'
+                }'
                 wrapProgram "$i" \
                     --prefix PYTHONPATH ":" $program_PYTHONPATH \
                     --prefix PATH ":" $program_PATH

From 0ede64bfcb18430f2e5d5b4079a173f809947b0e Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 2 Sep 2014 21:17:52 +0400
Subject: [PATCH 1175/1453] Override postFixup for urlwatch so it works somehwo

---
 pkgs/tools/networking/urlwatch/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix
index 4843f07c8f22..1be71942e70a 100644
--- a/pkgs/tools/networking/urlwatch/default.nix
+++ b/pkgs/tools/networking/urlwatch/default.nix
@@ -12,6 +12,10 @@ python3Packages.buildPythonPackage rec {
     ./convert-to-python3.sh
   '';
 
+  postFixup = ''
+    wrapProgram "$out/bin/urlwatch" --prefix "PYTHONPATH" : "$PYTHONPATH"
+  '';
+
   meta = {
     description = "A tool for monitoring webpages for updates";
     homepage = https://thp.io/2008/urlwatch/;

From 02f5f25b2ddcb8ea5b577e35ac170547716603aa Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Sun, 31 Aug 2014 23:37:43 -0700
Subject: [PATCH 1176/1453] merge in ewemoa's zipalign fix with my updated
 build-tools

now passes Android tests found at https://github.com/svanderburg/nix-androidenvtests !
---
 pkgs/development/mobile/androidenv/build-tools.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix
index 58bf35493618..215844ea396a 100644
--- a/pkgs/development/mobile/androidenv/build-tools.nix
+++ b/pkgs/development/mobile/androidenv/build-tools.nix
@@ -39,6 +39,13 @@ stdenv.mkDerivation {
         do
             patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib:`pwd` $i
         done
+
+        # These binaries also need zlib in addition to libstdc++
+        for i in zipalign
+        do
+            patchelf --set-interpreter ${stdenv_32bit.gcc.libc}/lib/ld-linux.so.2 $i
+            patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib:${zlib_32bit}/lib $i
+        done
         
         # These binaries need to find libstdc++, libgcc_s, and zlib
         for i in aapt dexdump

From 800beea5f96c18fda25ab01e935a31e9f01a4a78 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Tue, 2 Sep 2014 19:18:30 +0200
Subject: [PATCH 1177/1453] androidsdk: Bump to version 23.02 and update all
 its plugins and conversion scripts

---
 pkgs/development/mobile/androidenv/addon.xml  |  621 ++++---
 pkgs/development/mobile/androidenv/addons.nix |    4 +-
 .../mobile/androidenv/androidsdk.nix          |   27 +-
 .../mobile/androidenv/build-tools.nix         |   10 +-
 .../mobile/androidenv/{fetch => fetch.sh}     |    5 +-
 .../mobile/androidenv/generate-addons.xsl     |    6 +-
 .../mobile/androidenv/generate-platforms.sh   |    4 +-
 .../mobile/androidenv/generate-platforms.xsl  |   10 +-
 .../androidenv/generate-sysimages-others.xsl  |   21 -
 .../mobile/androidenv/generate-sysimages.sh   |    4 +-
 .../mobile/androidenv/generate-sysimages.xsl  |   10 +-
 .../mobile/androidenv/platforms-linux.nix     |   10 +-
 .../mobile/androidenv/platforms-macosx.nix    |   10 +-
 .../mobile/androidenv/repository-10.xml       | 1562 +++++++++++++++++
 .../mobile/androidenv/repository-8.xml        | 1277 --------------
 .../mobile/androidenv/sys-img-mips.xml        |  132 --
 .../mobile/androidenv/sys-img-x86.xml         |  154 --
 .../development/mobile/androidenv/sys-img.xml |  712 ++++++++
 .../mobile/androidenv/sysimages.nix           |   84 +-
 19 files changed, 2675 insertions(+), 1988 deletions(-)
 rename pkgs/development/mobile/androidenv/{fetch => fetch.sh} (58%)
 delete mode 100644 pkgs/development/mobile/androidenv/generate-sysimages-others.xsl
 create mode 100644 pkgs/development/mobile/androidenv/repository-10.xml
 delete mode 100644 pkgs/development/mobile/androidenv/repository-8.xml
 delete mode 100644 pkgs/development/mobile/androidenv/sys-img-mips.xml
 delete mode 100644 pkgs/development/mobile/androidenv/sys-img-x86.xml
 create mode 100644 pkgs/development/mobile/androidenv/sys-img.xml

diff --git a/pkgs/development/mobile/androidenv/addon.xml b/pkgs/development/mobile/androidenv/addon.xml
index aee3c847e93e..274ae734b6ee 100644
--- a/pkgs/development/mobile/androidenv/addon.xml
+++ b/pkgs/development/mobile/androidenv/addon.xml
@@ -14,167 +14,274 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 -->
-<sdk:sdk-addon xmlns:sdk="http://schemas.android.com/sdk/android/addon/5" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<sdk:sdk-addon xmlns:sdk="http://schemas.android.com/sdk/android/addon/7" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
-    <sdk:license id="android-sdk-license" type="text">Terms and Conditions
-
-This is the Android Software Development Kit License Agreement.
+    <sdk:license id="android-sdk-license" type="text">To get started with the Android SDK, you must agree to the following terms and conditions.
 
+This is the Android SDK License Agreement (the &quot;License Agreement&quot;).
 
 1. Introduction
 
-
-1.1 The Android Software Development Kit (referred to in this License Agreement as the &quot;SDK&quot; and specifically including the Android system files, packaged APIs, and Google APIs add-ons) is licensed to you subject to the terms of this License Agreement. This License Agreement forms a legally binding contract between you and Google in relation to your use of the SDK.
+1.1 The Android SDK (referred to in the License Agreement as the &quot;SDK&quot; and specifically including the Android system files, packaged APIs, and SDK library files and tools , if and when they are made available) is licensed to you subject to the terms of the License Agreement. The License Agreement forms a legally binding contract between you and Google in relation to your use of the SDK.
 
 1.2 &quot;Android&quot; means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time.
 
 1.3 &quot;Google&quot; means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.
 
+2. Accepting the License Agreement
 
-2. Accepting this License Agreement
+2.1 In order to use the SDK, you must first agree to the License Agreement. You may not use the SDK if you do not accept the License Agreement.
 
-
-2.1 In order to use the SDK, you must first agree to this License Agreement. You may not use the SDK if you do not accept this License Agreement.
-
-2.2 By clicking to accept, you hereby agree to the terms of this License Agreement.
+2.2 By clicking to accept and/or using the SDK, you hereby agree to the terms of the License Agreement.
 
 2.3 You may not use the SDK and may not accept the License Agreement if you are a person barred from receiving the SDK under the laws of the United States or other countries including the country in which you are resident or from which you use the SDK.
 
-2.4 If you are agreeing to be bound by this License Agreement on behalf of your employer or other entity, you represent and warrant that you have full legal authority to bind your employer or such entity to this License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the SDK on behalf of your employer or other entity.
-
+2.4 If you will use the SDK internally within your company or organization you agree to be bound by the License Agreement on behalf of your employer or other entity, and you represent and warrant that you have full legal authority to bind your employer or such entity to the License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the SDK on behalf of your employer or other entity.
 
 3. SDK License from Google
 
-
-3.1 Subject to the terms of this License Agreement, Google grants you a limited, worldwide, royalty-free, non-assignable and non-exclusive license to use the SDK solely to develop applications to run on the Android platform.
+3.1 Subject to the terms of the License Agreement, Google grants you a royalty-free, non-assignable, non-exclusive, non-sublicensable, limited, revocable license to use the SDK, personally or internally within your company or organization, solely to develop and distribute applications to run on the Android platform.
 
 3.2 You agree that Google or third parties own all legal right, title and interest in and to the SDK, including any Intellectual Property Rights that subsist in the SDK. &quot;Intellectual Property Rights&quot; means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you.
 
-3.3 You may not use the SDK for any purpose not expressly permitted by this License Agreement.  Except to the extent required by applicable third party licenses, you may not: (a) copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK; or (b) load any part of the SDK onto a mobile handset or any other hardware device except a personal computer, combine any part of the SDK with other software, or distribute any software or device incorporating a part of the SDK.
+3.3 You may not use the SDK for any purpose not expressly permitted by the License Agreement. Except to the extent required by applicable third party licenses, you may not: (a) copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK; or (b) load any part of the SDK onto a mobile handset or any other hardware device except a personal computer, combine any part of the SDK with other software, or distribute any software or device incorporating a part of the SDK.
 
 3.4 You agree that you will not take any actions that may cause or result in the fragmentation of Android, including but not limited to distributing, participating in the creation of, or promoting in any way a software development kit derived from the SDK.
 
-3.5 Use, reproduction and distribution of components of the SDK licensed under an open source software license are governed solely by the terms of that open source software license and not this License Agreement.
+3.5 Use, reproduction and distribution of components of the SDK licensed under an open source software license are governed solely by the terms of that open source software license and not the License Agreement. You agree to remain a licensee in good standing in regard to such open source software licenses under all the rights granted and to refrain from any actions that may terminate, suspend, or breach such rights.
 
 3.6 You agree that the form and nature of the SDK that Google provides may change without prior notice to you and that future versions of the SDK may be incompatible with applications developed on previous versions of the SDK. You agree that Google may stop (permanently or temporarily) providing the SDK (or any features within the SDK) to you or to users generally at Google's sole discretion, without prior notice to you.
 
-3.7 Nothing in this License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features.
+3.7 Nothing in the License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features.
 
 3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the SDK.
 
-
 4. Use of the SDK by You
 
+4.1 Google agrees that nothing in the License Agreement gives Google any right, title or interest from you (or your licensors) under the License Agreement in or to any software applications that you develop using the SDK, including any intellectual property rights that subsist in those applications.
 
-4.1 Google agrees that it obtains no right, title or interest from you (or your licensors) under this License Agreement in or to any software applications that you develop using the SDK, including any intellectual property rights that subsist in those applications.
+4.2 You agree to use the SDK and write applications only for purposes that are permitted by (a) the License Agreement, and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries).
 
-4.2 You agree to use the SDK and write applications only for purposes that are permitted by (a) this License Agreement and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries).
+4.3 You agree that if you use the SDK to develop applications, you will protect the privacy and legal rights of users. If users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If users provide you with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, each user has given you permission to do so.
 
-4.3 You agree that if you use the SDK to develop applications for general public users, you will protect the privacy and legal rights of those users. If the users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If the user provides your application with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, the user has given you permission to do so.
-
-4.4 You agree that you will not engage in any activity with the SDK, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of any third party including, but not limited to, Google or any mobile communications carrier.
+4.4 You agree that you will not engage in any activity with the SDK, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of Google or any third party.
 
 4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through Android and/or applications for Android, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so.
 
-4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under this License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach.
-
+4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under the License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach.
 
 5. Your Developer Credentials
 
-
 5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials.
 
-
 6. Privacy and Information
 
-
 6.1 In order to continually innovate and improve the SDK, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the SDK are being used and how they are being used. Before any of this information is collected, the SDK will notify you and seek your consent. If you withhold consent, the information will not be collected.
 
-6.2 The data collected is examined in the aggregate to improve the SDK and is maintained in accordance with Google's Privacy Policy.
-
+6.2 The data collected is examined in the aggregate to improve the SDK and is maintained in accordance with Google's Privacy Policy located at http://www.google.com/policies/privacy/.
 
 7. Third Party Applications
 
-
 7.1 If you use the SDK to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources.
 
 7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners.
 
-7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party. In that case, this License Agreement does not affect your legal relationship with these third parties.
+7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party.
 
+8. Using Google APIs
 
-8. Using Android APIs
-
-
-8.1 Google Data APIs
+8.1 Google APIs
 
 8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service.
 
 8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so.
 
+9. Terminating the License Agreement
 
-9. Terminating this License Agreement
+9.1 The License Agreement will continue to apply until terminated by either you or Google as set out below.
 
+9.2 If you want to terminate the License Agreement, you may do so by ceasing your use of the SDK and any relevant developer credentials.
 
-9.1 This License Agreement will continue to apply until terminated by either you or Google as set out below.
+9.3 Google may at any time, terminate the License Agreement, with or without cause, upon notice to you.
 
-9.2 If you want to terminate this License Agreement, you may do so by ceasing your use of the SDK and any relevant developer credentials.
+9.4 The License Agreement will automatically terminate without notice or other action when Google ceases to provide the SDK or certain parts of the SDK to users in the country in which you are resident or from which you use the service.
 
-9.3 Google may at any time, terminate this License Agreement with you if:
-(A) you have breached any provision of this License Agreement; or
-(B) Google is required to do so by law; or
-(C) the partner with whom Google offered certain parts of SDK (such as APIs) to you has terminated its relationship with Google or ceased to offer certain parts of the SDK to you; or
-(D) Google decides to no longer provide the SDK or certain parts of the SDK to users in the country in which you are resident or from which you use the service, or the provision of the SDK or certain SDK services to you by Google is, in Google's sole discretion, no longer commercially viable.
-
-9.4 When this License Agreement comes to an end, all of the legal rights, obligations and liabilities that you and Google have benefited from, been subject to (or which have accrued over time whilst this License Agreement has been in force) or which are expressed to continue indefinitely, shall be unaffected by this cessation, and the provisions of paragraph 14.7 shall continue to apply to such rights, obligations and liabilities indefinitely.
-
-
-10. DISCLAIMER OF WARRANTIES
+9.5 When the License Agreement is terminated, the license granted to you in the License Agreement will terminate, you will immediately cease all use of the SDK, and the provisions of paragraphs 10, 11, 12 and 14 shall survive indefinitely.
 
+10. DISCLAIMERS
 
 10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE SDK IS AT YOUR SOLE RISK AND THAT THE SDK IS PROVIDED &quot;AS IS&quot; AND &quot;AS AVAILABLE&quot; WITHOUT WARRANTY OF ANY KIND FROM GOOGLE.
 
-10.2 YOUR USE OF THE SDK AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE SDK IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE.
+10.2 YOUR USE OF THE SDK AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE SDK IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE. WITHOUT LIMITING THE FOREGOING, YOU UNDERSTAND THAT THE SDK MAY CONTAIN ERRORS, DEFECTS AND SECURITY VULNERABILITIES THAT CAN RESULT IN SIGNIFICANT DAMAGE, INCLUDING THE COMPLETE, IRRECOVERABLE LOSS OF USE OF YOUR COMPUTER SYSTEM OR OTHER DEVICE.
 
 10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
 
-
 11. LIMITATION OF LIABILITY
 
-
 11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING.
 
-
 12. Indemnification
 
-
-12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys fees) arising out of or accruing from (a) your use of the SDK, (b) any application you develop on the SDK that infringes any copyright, trademark, trade secret, trade dress, patent or other intellectual property right of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you with this License Agreement.
-
+12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys’ fees) arising out of or accruing from (a) your use of the SDK, (b) any application you develop on the SDK that infringes any Intellectual Property Rights of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you of the License Agreement.
 
 13. Changes to the License Agreement
 
-
 13.1 Google may make changes to the License Agreement as it distributes new versions of the SDK. When these changes are made, Google will make a new version of the License Agreement available on the website where the SDK is made available.
 
-
 14. General Legal Terms
 
+14.1 The License Agreement constitutes the whole legal agreement between you and Google and governs your use of the SDK (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the SDK.
 
-14.1 This License Agreement constitutes the whole legal agreement between you and Google and governs your use of the SDK (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the SDK.
+14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in the License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google.
 
-14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in this License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google.
+14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of the License Agreement is invalid, then that provision will be removed from the License Agreement without affecting the rest of the License Agreement. The remaining provisions of the License Agreement will continue to be valid and enforceable.
 
-14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of this License Agreement is invalid, then that provision will be removed from this License Agreement without affecting the rest of this License Agreement. The remaining provisions of this License Agreement will continue to be valid and enforceable.
-
-14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to this License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of this License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to this License Agreement.
+14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to the License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of the License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to the License Agreement.
 
 14.5 EXPORT RESTRICTIONS. THE SDK IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE SDK. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE.
 
-14.6 The rights granted in this License Agreement may not be assigned or transferred by either you or Google without the prior written approval of the other party. Neither you nor Google shall be permitted to delegate their responsibilities or obligations under this License Agreement without the prior written approval of the other party.
+14.6 The License Agreement may not be assigned or transferred by you without the prior written approval of Google, and any attempted assignment without such approval will be void. You shall not delegate your responsibilities or obligations under the License Agreement without the prior written approval of Google.
 
-14.7 This License Agreement, and your relationship with Google under this License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from this License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.
+14.7 The License Agreement, and your relationship with Google under the License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from the License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.
 
-November 13, 2012
+June 2014.
+    </sdk:license>
+
+
+    <sdk:license id="android-sdk-preview-license" type="text">To get started with the Android SDK Preview, you must agree to the following terms and conditions.
+As described below, please note that this is a preview version of the Android SDK, subject to change, that you use at your own risk.  The Android SDK Preview is not a stable release, and may contain errors and defects that can result in serious damage to your computer systems, devices and data.
+
+This is the Android SDK Preview License Agreement (the &quot;License Agreement&quot;).
+
+1. Introduction
+
+1.1 The Android SDK Preview (referred to in the License Agreement as the “Preview” and specifically including the Android system files, packaged APIs, and Preview library files, if and when they are made available) is licensed to you subject to the terms of the License Agreement. The License Agreement forms a legally binding contract between you and Google in relation to your use of the Preview.
+
+1.2 &quot;Android&quot; means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time.
+
+1.3 &quot;Google&quot; means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.
+
+2. Accepting the License Agreement
+
+2.1 In order to use the Preview, you must first agree to the License Agreement. You may not use the Preview if you do not accept the License Agreement.
+
+2.2 By clicking to accept and/or using the Preview, you hereby agree to the terms of the License Agreement.
+
+2.3 You may not use the Preview and may not accept the License Agreement if you are a person barred from receiving the Preview under the laws of the United States or other countries including the country in which you are resident or from which you use the Preview.
+
+2.4 If you will use the Preview internally within your company or organization you agree to be bound by the License Agreement on behalf of your employer or other entity, and you represent and warrant that you have full legal authority to bind your employer or such entity to the License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the Preview on behalf of your employer or other entity.
+
+3. Preview License from Google
+
+3.1 Subject to the terms of the License Agreement, Google grants you a royalty-free, non-assignable, non-exclusive, non-sublicensable, limited, revocable license to use the Preview, personally or internally within your company or organization, solely to develop applications to run on the Android platform.
+
+3.2 You agree that Google or third parties owns all legal right, title and interest in and to the Preview, including any Intellectual Property Rights that subsist in the Preview. &quot;Intellectual Property Rights&quot; means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you.
+
+3.3 You may not use the Preview for any purpose not expressly permitted by the License Agreement. Except to the extent required by applicable third party licenses, you may not: (a) copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the Preview or any part of the Preview; or (b) load any part of the Preview onto a mobile handset or any other hardware device except a personal computer, combine any part of the Preview with other software, or distribute any software or device incorporating a part of the Preview.
+
+3.4 You agree that you will not take any actions that may cause or result in the fragmentation of Android, including but not limited to distributing, participating in the creation of, or promoting in any way a software development kit derived from the Preview.
+
+3.5 Use, reproduction and distribution of components of the Preview licensed under an open source software license are governed solely by the terms of that open source software license and not the License Agreement. You agree to remain a licensee in good standing in regard to such open source software licenses under all the rights granted and to refrain from any actions that may terminate, suspend, or breach such rights.
+
+3.6 You agree that the form and nature of the Preview that Google provides may change without prior notice to you and that future versions of the Preview may be incompatible with applications developed on previous versions of the Preview. You agree that Google may stop (permanently or temporarily) providing the Preview (or any features within the Preview) to you or to users generally at Google's sole discretion, without prior notice to you.
+
+3.7 Nothing in the License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features.
+
+3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the Preview.
+
+4. Use of the Preview by You
+
+4.1 Google agrees that nothing in the License Agreement gives Google any right, title or interest from you (or your licensors) under the License Agreement in or to any software applications that you develop using the Preview, including any intellectual property rights that subsist in those applications.
+
+4.2 You agree to use the Preview and write applications only for purposes that are permitted by (a) the License Agreement, and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries).
+
+4.3 You agree that if you use the Preview to develop applications, you will protect the privacy and legal rights of users. If users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If users provide you with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, each user has given you permission to do so.
+
+4.4 You agree that you will not engage in any activity with the Preview, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of Google or any third party.
+
+4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through Android and/or applications for Android, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so.
+
+4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under the License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach.
+
+4.7 The Preview is in development, and your testing and feedback are an important part of the development process. By using the Preview, you acknowledge that implementation of some features are still under development and that you should not rely on the Preview having the full functionality of a stable release. You agree not to publicly distribute or ship any application using this Preview as this Preview will no longer be supported after the official Android SDK is released.
+
+5. Your Developer Credentials
+
+5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials.
+
+6. Privacy and Information
+
+6.1 In order to continually innovate and improve the Preview, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the Preview are being used and how they are being used. Before any of this information is collected, the Preview will notify you and seek your consent. If you withhold consent, the information will not be collected.
+
+6.2 The data collected is examined in the aggregate to improve the Preview and is maintained in accordance with Google's Privacy Policy located at http://www.google.com/policies/privacy/.
+
+7. Third Party Applications
+
+7.1 If you use the Preview to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources.
+
+7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners.
+
+7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party.
+
+8. Using Google APIs
+
+8.1 Google APIs
+
+8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service.
+
+8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so.
+
+9. Terminating the License Agreement
+
+9.1 the License Agreement will continue to apply until terminated by either you or Google as set out below.
+
+9.2 If you want to terminate the License Agreement, you may do so by ceasing your use of the Preview and any relevant developer credentials.
+
+9.3 Google may at any time, terminate the License Agreement, with or without cause, upon notice to you.
+
+9.4 The License Agreement will automatically terminate without notice or other action upon the earlier of:
+(A) when Google ceases to provide the Preview or certain parts of the Preview to users in the country in which you are resident or from which you use the service; and
+(B) Google issues a final release version of the Android SDK.
+
+9.5 When the License Agreement is terminated, the license granted to you in the License Agreement will terminate, you will immediately cease all use of the Preview, and the provisions of paragraphs 10, 11, 12 and 14 shall survive indefinitely.
+
+10. DISCLAIMERS
+
+10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE PREVIEW IS AT YOUR SOLE RISK AND THAT THE PREVIEW IS PROVIDED &quot;AS IS&quot; AND &quot;AS AVAILABLE&quot; WITHOUT WARRANTY OF ANY KIND FROM GOOGLE.
+
+10.2 YOUR USE OF THE PREVIEW AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE PREVIEW IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE. WITHOUT LIMITING THE FOREGOING, YOU UNDERSTAND THAT THE PREVIEW IS NOT A STABLE RELEASE AND MAY CONTAIN ERRORS, DEFECTS AND SECURITY VULNERABILITIES THAT CAN RESULT IN SIGNIFICANT DAMAGE, INCLUDING THE COMPLETE, IRRECOVERABLE LOSS OF USE OF YOUR COMPUTER SYSTEM OR OTHER DEVICE.
+
+10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+
+11. LIMITATION OF LIABILITY
+
+11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING.
+
+12. Indemnification
+
+12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys’ fees) arising out of or accruing from (a) your use of the Preview, (b) any application you develop on the Preview that infringes any Intellectual Property Rights of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you of the License Agreement.
+
+13. Changes to the License Agreement
+
+13.1 Google may make changes to the License Agreement as it distributes new versions of the Preview. When these changes are made, Google will make a new version of the License Agreement available on the website where the Preview is made available.
+
+14. General Legal Terms
+
+14.1 the License Agreement constitutes the whole legal agreement between you and Google and governs your use of the Preview (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the Preview.
+
+14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in the License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google.
+
+14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of the License Agreement is invalid, then that provision will be removed from the License Agreement without affecting the rest of the License Agreement. The remaining provisions of the License Agreement will continue to be valid and enforceable.
+
+14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to the License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of the License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to the License Agreement.
+
+14.5 EXPORT RESTRICTIONS. THE PREVIEW IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE PREVIEW. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE.
+
+14.6 The License Agreement may not be assigned or transferred by you without the prior written approval of Google, and any attempted assignment without such approval will be void. You shall not delegate your responsibilities or obligations under the License Agreement without the prior written approval of Google.
+
+14.7 The License Agreement, and your relationship with Google under the License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from the License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.
+
+June 2014.
     </sdk:license>
 
     <sdk:license id="android-googletv-license" type="text">Terms and Conditions
@@ -321,151 +428,6 @@ This is the Google TV Add-on for the Android Software Development Kit License Ag
 August 15, 2011
     </sdk:license>
 
-    <sdk:license id="google-gdk-license" type="text">This is an early Sneak Peek of the GDK that is subject to change. Please stay tuned for the full Developer Preview coming soon.
-
-Terms and Conditions
-
-This is the Glass Development Kit License Agreement.
-
-1. Introduction
-
-1.1 The Glass Development Kit (referred to in this License Agreement as the "GDK" and specifically including the Android system files, packaged APIs, and GDK library files, if and when they are made available) is licensed to you subject to the terms of this License Agreement. This License Agreement forms a legally binding contract between you and Google in relation to your use of the GDK.
-
-1.2 &quot;Glass&quot; means Glass devices and the Glass software stack for use on Glass devices.
-
-
-1.3 &quot;Android&quot; means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time.
-
-1.4 &quot;Google&quot; means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.
-
-2. Accepting this License Agreement
-
-2.1 In order to use the GDK, you must first agree to this License Agreement. You may not use the GDK if you do not accept this License Agreement.
-
-2.2 By clicking to accept, you hereby agree to the terms of this License Agreement.
-
-2.3 You may not use the GDK and may not accept the License Agreement if you are a person barred from receiving the GDK under the laws of the United States or other countries including the country in which you are resident or from which you use the GDK.
-
-2.4 If you are agreeing to be bound by this License Agreement on behalf of your employer or other entity, you represent and warrant that you have full legal authority to bind your employer or such entity to this License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the GDK on behalf of your employer or other entity.
-
-3. GDK License from Google
-
-3.1 Subject to the terms of this License Agreement, Google grants you a limited, worldwide, royalty-free, non-assignable and non-exclusive license to use the GDK solely to develop applications to run on the Glass platform for Glass devices.
-
-3.2 You agree that Google or third parties own all legal right, title and interest in and to the GDK, including any Intellectual Property Rights that subsist in the GDK. &quot;Intellectual Property Rights&quot; means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you.
-
-3.3 You may not use the GDK for any purpose not expressly permitted by this License Agreement.  Except to the extent required by applicable third party licenses, you may not: (a) copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the GDK or any part of the GDK; or (b) load any part of the GDK onto a mobile handset or wearable computing device or any other hardware device except a Glass device personal computer, combine any part of the GDK with other software, or distribute any software or device incorporating a part of the GDK.
-
-3.4 You agree that you will not take any actions that may cause or result in the fragmentation of Glass, including but not limited to distributing, participating in the creation of, or promoting in any way a software development kit derived from the GDK.
-
-3.5 Use, reproduction and distribution of components of the GDK licensed under an open source software license are governed solely by the terms of that open source software license and not this License Agreement.
-
-3.6 You agree that the form and nature of the GDK that Google provides may change without prior notice to you and that future versions of the GDK may be incompatible with applications developed on previous versions of the GDK. You agree that Google may stop (permanently or temporarily) providing the GDK (or any features within the GDK) to you or to users generally at Google's sole discretion, without prior notice to you.
-
-3.7 Nothing in this License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features.
-
-3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the GDK.
-
-
-3.9 Your use of any Android system files, packaged APIs, or other components of the GDK which are part of the Android Software Development Kit is subject to the terms of the Android Software Development Kit License Agreement located at http://developer.android.com/sdk/terms.html. These terms are hereby incorporated by reference into this License Agreement.
-
-4. Use of the GDK by You
-
-4.1 Google agrees that it obtains no right, title or interest from you (or your licensors) under this License Agreement in or to any software applications that you develop using the GDK, including any intellectual property rights that subsist in those applications.
-
-4.2 You agree to use the GDK and write applications only for purposes that are permitted by (a) this License Agreement, (b) the Glass Platform Developer Policies (located at https://developers.google.com/glass/policies, and hereby incorporated into this License Agreement by reference), and (c) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries).
-
-4.3 You agree that if you use the GDK to develop applications for general public users, you will protect the privacy and legal rights of those users. If the users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If the user provides your application with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, the user has given you permission to do so.
-
-4.4 You agree that you will not engage in any activity with the GDK, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of any third party including, but not limited to, Google.
-
-4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through Glass and/or applications for Glass, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so.
-
-4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under this License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach.
-
-
-4.7 The GDK is in development, and your testing and feedback are an important part of the development process. By using the GDK, you acknowledge that implementation of some features are still under development and that you should not rely on the GDK, Glass devices, Glass system software, Google Mirror API, or Glass services having the full functionality of a stable release.
-
-5. Your Developer Credentials
-
-5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials.
-
-6. Privacy and Information
-
-
-6.1 In order to continually innovate and improve the GDK, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the GDK are being used and how they are being used. Before any of this information is collected, the GDK will notify you and seek your consent. If you withhold consent, the information will not be collected.
-
-6.2 The data collected is examined in the aggregate to improve the GDK and is maintained in accordance with Google's Privacy Policy.
-
-7. Third Party Applications
-
-7.1 If you use the GDK to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources.
-
-7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners.
-
-7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party. In that case, this License Agreement does not affect your legal relationship with these third parties.
-
-8. Using Google APIs
-
-8.1 Google APIs
-
-8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service.
-
-8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so.
-
-9. Terminating this License Agreement
-
-9.1 This License Agreement will continue to apply until terminated by either you or Google as set out below.
-
-9.2 If you want to terminate this License Agreement, you may do so by ceasing your use of the GDK and any relevant developer credentials.
-
-9.3 Google may at any time, terminate this License Agreement with you if:
-(A) you have breached any provision of this License Agreement; or
-(B) Google is required to do so by law; or
-(C) the partner with whom Google offered certain parts of GDK (such as APIs) to you has terminated its relationship with Google or ceased to offer certain parts of the GDK to you; or
-(D) Google decides to no longer provide the GDK or certain parts of the GDK to users in the country in which you are resident or from which you use the service, or the provision of the GDK or certain GDK services to you by Google is, in Google's sole discretion, no longer commercially viable.
-
-9.4 When this License Agreement comes to an end, all of the legal rights, obligations and liabilities that you and Google have benefited from, been subject to (or which have accrued over time whilst this License Agreement has been in force) or which are expressed to continue indefinitely, shall be unaffected by this cessation, and the provisions of paragraph 14.7 shall continue to apply to such rights, obligations and liabilities indefinitely.
-
-10. DISCLAIMER OF WARRANTIES
-
-10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE GDK IS AT YOUR SOLE RISK AND THAT THE GDK IS PROVIDED &quot;AS IS&quot; AND &quot;AS AVAILABLE&quot; WITHOUT WARRANTY OF ANY KIND FROM GOOGLE.
-
-10.2 YOUR USE OF THE GDK AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE GDK IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE.
-
-10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-
-11. LIMITATION OF LIABILITY
-
-11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING.
-
-12. Indemnification
-
-12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys fees) arising out of or accruing from (a) your use of the GDK, (b) any application you develop on the GDK that infringes any copyright, trademark, trade secret, trade dress, patent or other intellectual property right of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you with this License Agreement.
-
-13. Changes to the License Agreement
-
-13.1 Google may make changes to the License Agreement as it distributes new versions of the GDK. When these changes are made, Google will make a new version of the License Agreement available on the website where the GDK is made available.
-
-14. General Legal Terms
-
-14.1 This License Agreement constitutes the whole legal agreement between you and Google and governs your use of the GDK (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the GDK.
-
-14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in this License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google.
-
-14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of this License Agreement is invalid, then that provision will be removed from this License Agreement without affecting the rest of this License Agreement. The remaining provisions of this License Agreement will continue to be valid and enforceable.
-
-14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to this License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of this License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to this License Agreement.
-
-14.5 EXPORT RESTRICTIONS. THE GDK IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE GDK. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE.
-
-14.6 The rights granted in this License Agreement may not be assigned or transferred by either you or Google without the prior written approval of the other party. Neither you nor Google shall be permitted to delegate their responsibilities or obligations under this License Agreement without the prior written approval of the other party.
-
-14.7 This License Agreement, and your relationship with Google under this License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from this License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.
-
-November 19, 2013
-    </sdk:license>
-
     <!-- ADD-ONS ....................... -->
 
     <sdk:add-on>
@@ -479,7 +441,7 @@ November 19, 2013
         <sdk:desc-url>http://developer.android.com/</sdk:desc-url>
         <sdk:uses-license ref="android-sdk-license"/>
         <sdk:archives>
-            <sdk:archive os="any">
+            <sdk:archive>
                 <sdk:size>34908058</sdk:size>
                 <sdk:checksum type="sha1">1f92abf3a76be66ae8032257fc7620acbd2b2e3a</sdk:checksum>
                 <sdk:url>google_apis-3-r03.zip</sdk:url>
@@ -506,7 +468,7 @@ November 19, 2013
         <sdk:desc-url>http://developer.android.com/</sdk:desc-url>
         <sdk:uses-license ref="android-sdk-license"/>
         <sdk:archives>
-            <sdk:archive os="any">
+            <sdk:archive>
                 <sdk:size>42435735</sdk:size>
                 <sdk:checksum type="sha1">9b6e86d8568558de4d606a7debc4f6049608dbd0</sdk:checksum>
                 <sdk:url>google_apis-4_r02.zip</sdk:url>
@@ -534,7 +496,7 @@ November 19, 2013
         <sdk:uses-license ref="android-sdk-license"/>
         <sdk:obsolete/>
         <sdk:archives>
-            <sdk:archive os="any">
+            <sdk:archive>
                 <sdk:size>49123776</sdk:size>
                 <sdk:checksum type="sha1">46eaeb56b645ee7ffa24ede8fa17f3df70db0503</sdk:checksum>
                 <sdk:url>google_apis-5_r01.zip</sdk:url>
@@ -562,7 +524,7 @@ November 19, 2013
         <sdk:obsolete/>
         <sdk:uses-license ref="android-sdk-license"/>
         <sdk:archives>
-            <sdk:archive os="any">
+            <sdk:archive>
                 <sdk:size>53382941</sdk:size>
                 <sdk:checksum type="sha1">5ff545d96e031e09580a6cf55713015c7d4936b2</sdk:checksum>
                 <sdk:url>google_apis-6_r01.zip</sdk:url>
@@ -589,7 +551,7 @@ November 19, 2013
         <sdk:desc-url>http://developer.android.com/</sdk:desc-url>
         <sdk:uses-license ref="android-sdk-license"/>
         <sdk:archives>
-            <sdk:archive os="any">
+            <sdk:archive>
                 <sdk:size>53691339</sdk:size>
                 <sdk:checksum type="sha1">2e7f91e0fe34fef7f58aeced973c6ae52361b5ac</sdk:checksum>
                 <sdk:url>google_apis-7_r01.zip</sdk:url>
@@ -616,7 +578,7 @@ November 19, 2013
         <sdk:desc-url>http://developer.android.com/</sdk:desc-url>
         <sdk:uses-license ref="android-sdk-license"/>
         <sdk:archives>
-            <sdk:archive os="any">
+            <sdk:archive>
                 <sdk:size>59505020</sdk:size>
                 <sdk:checksum type="sha1">3079958e7ec87222cac1e6b27bc471b27bf2c352</sdk:checksum>
                 <sdk:url>google_apis-8_r02.zip</sdk:url>
@@ -643,7 +605,7 @@ November 19, 2013
         <sdk:desc-url>http://developer.android.com/</sdk:desc-url>
         <sdk:uses-license ref="android-sdk-license"/>
         <sdk:archives>
-            <sdk:archive os="any">
+            <sdk:archive>
                 <sdk:size>63401546</sdk:size>
                 <sdk:checksum type="sha1">78664645a1e9accea4430814f8694291a7f1ea5d</sdk:checksum>
                 <sdk:url>google_apis-9_r02.zip</sdk:url>
@@ -671,7 +633,7 @@ November 19, 2013
         <sdk:desc-url>http://developer.android.com/</sdk:desc-url>
         <sdk:uses-license ref="android-sdk-license"/>
         <sdk:archives>
-            <sdk:archive os="any">
+            <sdk:archive>
                 <sdk:size>65781578</sdk:size>
                 <sdk:checksum type="sha1">cc0711857c881fa7534f90cf8cc09b8fe985484d</sdk:checksum>
                 <sdk:url>google_apis-10_r02.zip</sdk:url>
@@ -698,7 +660,7 @@ November 19, 2013
         <sdk:desc-url>http://developer.android.com/</sdk:desc-url>
         <sdk:uses-license ref="android-sdk-license"/>
         <sdk:archives>
-            <sdk:archive os="any">
+            <sdk:archive>
                 <sdk:size>83477179</sdk:size>
                 <sdk:checksum type="sha1">5eab5e81addee9f3576d456d205208314b5146a5</sdk:checksum>
                 <sdk:url>google_apis-11_r01.zip</sdk:url>
@@ -725,7 +687,7 @@ November 19, 2013
         <sdk:desc-url>http://developer.android.com/</sdk:desc-url>
         <sdk:uses-license ref="android-sdk-license"/>
         <sdk:archives>
-            <sdk:archive os="any">
+            <sdk:archive>
                 <sdk:size>86099835</sdk:size>
                 <sdk:checksum type="sha1">e9999f4fa978812174dfeceec0721c793a636e5d</sdk:checksum>
                 <sdk:url>google_apis-12_r01.zip</sdk:url>
@@ -752,7 +714,7 @@ November 19, 2013
         <sdk:desc-url>http://developer.android.com/</sdk:desc-url>
         <sdk:uses-license ref="android-sdk-license"/>
         <sdk:archives>
-            <sdk:archive os="any">
+            <sdk:archive>
                 <sdk:size>88615525</sdk:size>
                 <sdk:checksum type="sha1">3b153edd211c27dc736c893c658418a4f9041417</sdk:checksum>
                 <sdk:url>google_apis-13_r01.zip</sdk:url>
@@ -785,7 +747,7 @@ November 19, 2013
             </sdk:lib>
         </sdk:libs>
         <sdk:archives>
-            <sdk:archive arch="any" os="any">
+            <sdk:archive>
                 <sdk:size>106533714</sdk:size>
                 <sdk:checksum type="sha1">f8eb4d96ad0492b4c0db2d7e4f1a1a3836664d39</sdk:checksum>
                 <sdk:url>google_apis-14_r02.zip</sdk:url>
@@ -814,7 +776,7 @@ November 19, 2013
             </sdk:lib>
         </sdk:libs>
         <sdk:archives>
-            <sdk:archive arch="any" os="any">
+            <sdk:archive>
                 <sdk:size>106612472</sdk:size>
                 <sdk:checksum type="sha1">6757c12788da0ea00c2ab58e54cb438b9f2bcf66</sdk:checksum>
                 <sdk:url>google_apis-15_r02.zip</sdk:url>
@@ -844,7 +806,7 @@ November 19, 2013
             </sdk:lib>
         </sdk:libs>
         <sdk:archives>
-            <sdk:archive arch="any" os="any">
+            <sdk:archive>
                 <sdk:size>127278413</sdk:size>
                 <sdk:checksum type="sha1">63467dd32f471e3e81e33e9772c22f33235aa3b3</sdk:checksum>
                 <sdk:url>google_apis-16_r03.zip</sdk:url>
@@ -874,7 +836,7 @@ November 19, 2013
             </sdk:lib>
         </sdk:libs>
         <sdk:archives>
-            <sdk:archive arch="any" os="any">
+            <sdk:archive>
                 <sdk:size>137156978</sdk:size>
                 <sdk:checksum type="sha1">8246f61d24f0408c8e7bc352a1e522b7e2b619ba</sdk:checksum>
                 <sdk:url>google_apis-17_r03.zip</sdk:url>
@@ -904,7 +866,7 @@ November 19, 2013
             </sdk:lib>
         </sdk:libs>
         <sdk:archives>
-            <sdk:archive arch="any" os="any">
+            <sdk:archive>
                 <sdk:size>143149689</sdk:size>
                 <sdk:checksum type="sha1">147bce09c1163edc17194f3db496ec1086fcf965</sdk:checksum>
                 <sdk:url>google_apis-18_r03.zip</sdk:url>
@@ -914,14 +876,14 @@ November 19, 2013
     </sdk:add-on>
 
     <sdk:add-on>
-        <!-- Generated at Mon Oct 28 22:29:49 2013 from git_klp-release @ 892118 -->
+        <!-- Generated at Wed Jul 30 22:26:20 2014 from git_klp-sdk-release @ 1314097 -->
         <sdk:vendor-id>google</sdk:vendor-id>
         <sdk:vendor-display>Google Inc.</sdk:vendor-display>
         <sdk:name-id>google_apis</sdk:name-id>
-        <sdk:name-display>Google APIs</sdk:name-display>
+        <sdk:name-display>Google APIs (ARM System Image)</sdk:name-display>
         <sdk:description>Android + Google APIs</sdk:description>
         <sdk:api-level>19</sdk:api-level>
-        <sdk:revision>1</sdk:revision>
+        <sdk:revision>7</sdk:revision>
         <sdk:libs>
             <sdk:lib>
                 <sdk:name>com.google.android.maps</sdk:name>
@@ -934,16 +896,15 @@ November 19, 2013
             </sdk:lib>
         </sdk:libs>
         <sdk:archives>
-            <sdk:archive arch="any" os="any">
-                <sdk:size>150689239</sdk:size>
-                <sdk:checksum type="sha1">6c530a8318446e4da1e3ab7d2abd154bc493bc5a</sdk:checksum>
-                <sdk:url>google_apis-19_r01.zip</sdk:url>
+            <sdk:archive>
+                <sdk:size>160661775</sdk:size>
+                <sdk:checksum type="sha1">150f5a3fec4f03313ca770b90126605619bd713c</sdk:checksum>
+                <sdk:url>google_apis-19_r07.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
         <sdk:uses-license ref="android-sdk-license"/>
     </sdk:add-on>
 
-
     <!-- GOOGLE TV ADDONS ............. -->
 
     <sdk:add-on>
@@ -957,10 +918,11 @@ November 19, 2013
         <sdk:desc-url>http://developer.android.com/</sdk:desc-url>
         <sdk:uses-license ref="android-googletv-license"/>
         <sdk:archives>
-            <sdk:archive os="linux">
+            <sdk:archive>
                 <sdk:size>78266751</sdk:size>
                 <sdk:checksum type="sha1">92128a12e7e8b0fb5bac59153d7779b717e7b840</sdk:checksum>
                 <sdk:url>google_tv-12_r02.zip</sdk:url>
+                <sdk:host-os>linux</sdk:host-os>
             </sdk:archive>
         </sdk:archives>
         <sdk:libs/>
@@ -977,7 +939,7 @@ November 19, 2013
         <sdk:desc-url>http://developer.android.com/</sdk:desc-url>
         <sdk:uses-license ref="android-googletv-license"/>
         <sdk:archives>
-            <sdk:archive os="any">
+            <sdk:archive>
                 <sdk:size>87721879</sdk:size>
                 <sdk:checksum type="sha1">b73f7c66011ac8180b44aa4e83b8d78c66ea9a09</sdk:checksum>
                 <sdk:url>google_tv-13_r01.zip</sdk:url>
@@ -986,71 +948,48 @@ November 19, 2013
         <sdk:libs/>
     </sdk:add-on>
 
-
-    <!-- GLASS ADDONS ............. -->
-
-    <sdk:add-on>
-        <sdk:vendor-id>google</sdk:vendor-id>
-        <sdk:vendor-display>Google Inc.</sdk:vendor-display>
-        <sdk:name-id>google_gdk</sdk:name-id>
-        <sdk:name-display>Glass Development Kit Sneak Peek</sdk:name-display>
-        <sdk:api-level>15</sdk:api-level>
-        <sdk:revision>01</sdk:revision>
-        <sdk:description>Sneak peek of the Glass Development Kit</sdk:description>
-        <sdk:desc-url>https://developers.google.com/glass/gdk/</sdk:desc-url>
-        <sdk:uses-license ref="google-gdk-license"/>
-        <sdk:archives>
-            <sdk:archive os="any">
-                <sdk:size>281839</sdk:size>
-                <sdk:checksum type="sha1">a3c7317fb2fe8a0dfc06828a5aabc457372b82a7</sdk:checksum>
-                <sdk:url>https://dl-ssl.google.com/glass/xe11/google-gdk.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-        <sdk:libs>
-            <sdk:lib>
-                <sdk:name>com.google.android.glass</sdk:name>
-                <sdk:description>APIs for Google Glass Development Kit Sneak Peek.</sdk:description>
-            </sdk:lib>
-        </sdk:libs>
-    </sdk:add-on>
-
-
     <!-- EXTRAS VENDOR=ANDROID ........................ -->
 
     <sdk:extra>
-        <!-- Generated at Wed Oct 30 14:52:38 2013 from git_klp-dev @ 894928 -->
-        <sdk:revision>19</sdk:revision>
+        <!-- Generated at Mon Jun 23 19:18:59 2014 from git_klp-modular-release @ 1246132 -->
+        <sdk:revision>
+            <sdk:major>20</sdk:major>
+            <sdk:minor>0</sdk:minor>
+            <sdk:micro>0</sdk:micro>
+        </sdk:revision>
         <sdk:vendor-display>Android</sdk:vendor-display>
         <sdk:vendor-id>android</sdk:vendor-id>
         <sdk:name-display>Android Support Library</sdk:name-display>
         <sdk:path>support</sdk:path>
         <sdk:old-paths>compatibility</sdk:old-paths>
         <sdk:archives>
-            <sdk:archive arch="any" os="any">
-                <sdk:size>4905998</sdk:size>
-                <sdk:checksum type="sha1">54b8661595856a08f032d41bb139f375a7609308</sdk:checksum>
-                <sdk:url>support_r19.zip</sdk:url>
+            <sdk:archive>
+                <sdk:size>5508097</sdk:size>
+                <sdk:checksum type="sha1">719c260dc3eb950712988f987daaf91afa9e36af</sdk:checksum>
+                <sdk:url>support_r20.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
         <sdk:uses-license ref="android-sdk-license"/>
     </sdk:extra>
 
     <sdk:extra>
-        <!-- Generated from git_klp-dev @ 894928  -->
-        <sdk:revision>3</sdk:revision>
+        <!-- Generated from git_lmp-preview-release @ 1242878  -->
+        <sdk:revision>
+            <sdk:major>6</sdk:major>
+        </sdk:revision>
         <sdk:vendor-display>Android</sdk:vendor-display>
         <sdk:vendor-id>android</sdk:vendor-id>
         <sdk:name-display>Android Support Repository</sdk:name-display>
         <sdk:description>Local Maven repository for Support Libraries</sdk:description>
         <sdk:path>m2repository</sdk:path>
         <sdk:archives>
-            <sdk:archive arch="any" os="any">
-                <sdk:size>6282146</sdk:size>
-                <sdk:checksum type="sha1">db4650f817f1507211ec6186d2d9e72074e6df12</sdk:checksum>
-                <sdk:url>android_m2repository_r03.zip</sdk:url>
+            <sdk:archive>
+                <sdk:size>22271942</sdk:size>
+                <sdk:checksum type="sha1">d4874fd330f41a7c16de392ce917c2a3562dd620</sdk:checksum>
+                <sdk:url>android_m2repository_r06.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
-        <sdk:uses-license ref="android-sdk-license"/>
+        <sdk:uses-license ref="android-sdk-preview-license"/>
     </sdk:extra>
 
     <!-- EXTRAS VENDOR=GOOGLE ....................... -->
@@ -1060,14 +999,16 @@ November 19, 2013
         <sdk:vendor-display>Google Inc.</sdk:vendor-display>
         <sdk:name-display>Google Repository</sdk:name-display>
         <sdk:path>m2repository</sdk:path>
-        <sdk:revision>4</sdk:revision>
+        <sdk:revision>
+            <sdk:major>11</sdk:major>
+        </sdk:revision>
         <sdk:description>Local Maven repository for Google Libraries</sdk:description>
         <sdk:uses-license ref="android-sdk-license"/>
         <sdk:archives>
-            <sdk:archive os="any">
-                <sdk:size>3891592</sdk:size>
-                <sdk:checksum type="sha1">c418daafd203a8cb4899d49bd321da83b927586e</sdk:checksum>
-                <sdk:url>google_m2repository_r04.zip</sdk:url>
+            <sdk:archive>
+                <sdk:size>18832133</sdk:size>
+                <sdk:checksum type="sha1">08b5114037d187cf3d4b44a25570149ef4f8ab3d</sdk:checksum>
+                <sdk:url>google_m2repository_r11.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
     </sdk:extra>
@@ -1078,11 +1019,13 @@ November 19, 2013
         <sdk:name-display>Google Play Licensing Library</sdk:name-display>
         <sdk:path>play_licensing</sdk:path>
         <sdk:old-paths>market_licensing</sdk:old-paths>
-        <sdk:revision>2</sdk:revision>
+        <sdk:revision>
+            <sdk:major>2</sdk:major>
+        </sdk:revision>
         <sdk:description>Google Play Licensing client library</sdk:description>
         <sdk:desc-url>http://developer.android.com/guide/publishing/licensing.html</sdk:desc-url>
         <sdk:archives>
-            <sdk:archive os="any">
+            <sdk:archive>
                 <sdk:size>75109</sdk:size>
                 <sdk:checksum type="sha1">355e8dc304a92a5616db235af8ee7bd554356254</sdk:checksum>
                 <sdk:url>market_licensing-r02.zip</sdk:url>
@@ -1097,11 +1040,13 @@ November 19, 2013
         <sdk:name-display>Google Play APK Expansion Library</sdk:name-display>
         <sdk:path>play_apk_expansion</sdk:path>
         <sdk:old-paths>market_apk_expansion</sdk:old-paths>
-        <sdk:revision>3</sdk:revision>
+        <sdk:revision>
+            <sdk:major>3</sdk:major>
+        </sdk:revision>
         <sdk:description>Google Play APK Expansion library</sdk:description>
         <sdk:desc-url>http://developer.android.com/guide/market/expansion-files.html</sdk:desc-url>
         <sdk:archives>
-            <sdk:archive os="any">
+            <sdk:archive>
                 <sdk:size>110201</sdk:size>
                 <sdk:checksum type="sha1">5305399dc1a56814e86b8459ce24871916f78b8c</sdk:checksum>
                 <sdk:url>market_apk_expansion-r03.zip</sdk:url>
@@ -1115,12 +1060,14 @@ November 19, 2013
         <sdk:vendor-display>Google Inc.</sdk:vendor-display>
         <sdk:name-display>Google Play services for Froyo</sdk:name-display>
         <sdk:path>google_play_services_froyo</sdk:path>
-        <sdk:revision>12</sdk:revision>
+        <sdk:revision>
+            <sdk:major>12</sdk:major>
+        </sdk:revision>
         <sdk:description>Google Play services client library and sample code</sdk:description>
         <sdk:desc-url>https://developers.google.com/android/google-play-services/index</sdk:desc-url>
         <sdk:uses-license ref="android-sdk-license"/>
         <sdk:archives>
-            <sdk:archive os="any">
+            <sdk:archive>
                 <sdk:size>5265389</sdk:size>
                 <sdk:checksum type="sha1">92558dbc380bba3d55d0ec181167fb05ce7c79d9</sdk:checksum>
                 <sdk:url>google_play_services_3265130_r12.zip</sdk:url>
@@ -1133,34 +1080,59 @@ November 19, 2013
         <sdk:vendor-display>Google Inc.</sdk:vendor-display>
         <sdk:name-display>Google Play services</sdk:name-display>
         <sdk:path>google_play_services</sdk:path>
-        <sdk:revision>13</sdk:revision>
+        <sdk:revision>
+            <sdk:major>19</sdk:major>
+        </sdk:revision>
         <sdk:description>Google Play services client library and sample code</sdk:description>
         <sdk:desc-url>https://developers.google.com/android/google-play-services/index</sdk:desc-url>
         <sdk:uses-license ref="android-sdk-license"/>
         <sdk:archives>
-            <sdk:archive os="any">
-                <sdk:size>7958511</sdk:size>
-                <sdk:checksum type="sha1">1be94e8f767616e862f0088ab673e1980a6022c4</sdk:checksum>
-                <sdk:url>google_play_services_4030530_r13.zip</sdk:url>
+            <sdk:archive>
+                <sdk:size>13982276</sdk:size>
+                <sdk:checksum type="sha1">847a8806dd3c43effc2afdd7b49fc6ba27f72d5d</sdk:checksum>
+                <sdk:url>google_play_services_5089000_r19.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
     </sdk:extra>
 
     <sdk:extra>
-        <!-- Generated at Thu Jul 18 16:46:04 PDT 2013 from git_master @ 745409 -->
         <sdk:vendor-id>google</sdk:vendor-id>
         <sdk:vendor-display>Google Inc.</sdk:vendor-display>
-        <sdk:name-display>Google USB Driver</sdk:name-display>
-        <sdk:path>usb_driver</sdk:path>
-        <sdk:revision>8</sdk:revision>
-        <sdk:description>USB Driver for Windows, revision 8</sdk:description>
-        <sdk:desc-url>http://developer.android.com/</sdk:desc-url>
-        <sdk:uses-license ref="android-sdk-license"/>
+        <sdk:name-display>Google Play services for Fit Preview</sdk:name-display>
+        <sdk:path>google_play_services_fit_preview</sdk:path>
+        <sdk:revision>
+            <sdk:major>1</sdk:major>
+        </sdk:revision>
+        <sdk:description>Google Play services client library and sample code</sdk:description>
+        <sdk:desc-url>https://developers.google.com/android/google-play-services/index</sdk:desc-url>
+        <sdk:uses-license ref="android-sdk-preview-license"/>
         <sdk:archives>
-            <sdk:archive os="windows">
-                <sdk:size>8682230</sdk:size>
-                <sdk:checksum type="sha1">2b2f91098a984a865a70f0bd841a843fb54462fc</sdk:checksum>
-                <sdk:url>usb_driver_r08-windows.zip</sdk:url>
+            <sdk:archive>
+                <sdk:size>15224769</sdk:size>
+                <sdk:checksum type="sha1">34369ca796268ec7274bc49d659d9e8f042b55ae</sdk:checksum>
+                <sdk:url>google_play_services_fit_preview_5208000_r01.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+    </sdk:extra>
+
+    <sdk:extra>
+        <!-- Generated at Tue Jun 10 11:38:56 2014 from git_master-release @ 1216520 -->
+        <sdk:vendor-id>google</sdk:vendor-id>
+        <sdk:uses-license ref="android-sdk-license"/>
+        <sdk:desc-url>http://developer.android.com/</sdk:desc-url>
+        <sdk:path>usb_driver</sdk:path>
+        <sdk:description>USB Driver for Windows, revision 10</sdk:description>
+        <sdk:name-display>Google USB Driver</sdk:name-display>
+        <sdk:vendor-display>Google Inc.</sdk:vendor-display>
+        <sdk:revision>
+            <sdk:major>10</sdk:major>
+        </sdk:revision>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:url>usb_driver_r10-windows.zip</sdk:url>
+                <sdk:checksum type="sha1">a5f8280829f07bb3144a8d657ec7aa0128443a2c</sdk:checksum>
+                <sdk:size>8682752</sdk:size>
+                <sdk:host-os>windows</sdk:host-os>
             </sdk:archive>
         </sdk:archives>
     </sdk:extra>
@@ -1171,11 +1143,13 @@ November 19, 2013
         <sdk:name-display>Google Play Billing Library</sdk:name-display>
         <sdk:path>play_billing</sdk:path>
         <sdk:old-paths>market_billing</sdk:old-paths>
-        <sdk:revision>5</sdk:revision>
+        <sdk:revision>
+            <sdk:major>5</sdk:major>
+        </sdk:revision>
         <sdk:description>Google Play Billing files and sample code</sdk:description>
         <sdk:desc-url>http://developer.android.com/google/play/billing/index.html</sdk:desc-url>
         <sdk:archives>
-            <sdk:archive os="any">
+            <sdk:archive>
                 <sdk:size>436654</sdk:size>
                 <sdk:checksum type="sha1">bd2ac5ce7127070ac3229003eb69cfb806628ac9</sdk:checksum>
                 <sdk:url>play_billing_r05.zip</sdk:url>
@@ -1189,29 +1163,35 @@ November 19, 2013
         <sdk:vendor-display>Google Inc.</sdk:vendor-display>
         <sdk:name-display>Google AdMob Ads SDK</sdk:name-display>
         <sdk:path>admob_ads_sdk</sdk:path>
-        <sdk:revision>11</sdk:revision>
+        <sdk:revision>
+            <sdk:major>11</sdk:major>
+        </sdk:revision>
         <sdk:description>AdMob Ads SDK</sdk:description>
         <sdk:desc-url>https://developers.google.com/mobile-ads-sdk/docs/</sdk:desc-url>
         <sdk:archives>
-            <sdk:archive os="any">
+            <sdk:archive>
                 <sdk:size>704512</sdk:size>
                 <sdk:checksum type="sha1">0102859d9575baa0bf4fd5eb422af2ad0fe6cb82</sdk:checksum>
                 <sdk:url>https://dl-ssl.google.com/googleadmobadssdk/googleadmobadssdkandroid-6.4.1.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
         <sdk:uses-license ref="android-sdk-license"/>
+        <sdk:obsolete/>
     </sdk:extra>
 
     <sdk:extra>
+        <sdk:obsolete/>
         <sdk:vendor-id>google</sdk:vendor-id>
         <sdk:vendor-display>Google Inc.</sdk:vendor-display>
         <sdk:name-display>Google Analytics App Tracking SDK</sdk:name-display>
         <sdk:path>analytics_sdk_v2</sdk:path>
-        <sdk:revision>3</sdk:revision>
+        <sdk:revision>
+            <sdk:major>3</sdk:major>
+        </sdk:revision>
         <sdk:description>Analytics App Tracking SDK</sdk:description>
         <sdk:desc-url>http://developers.google.com/analytics/devguides/collection/</sdk:desc-url>
         <sdk:archives>
-            <sdk:archive os="any">
+            <sdk:archive>
                 <sdk:size>211432</sdk:size>
                 <sdk:checksum type="sha1">dc14026bf0ce78315cb5dd00552607de0894de83</sdk:checksum>
                 <sdk:url>https://dl.google.com/gaformobileapps/GoogleAnalyticsAndroid_2.0beta5.zip</sdk:url>
@@ -1225,11 +1205,13 @@ November 19, 2013
         <sdk:vendor-display>Google Inc.</sdk:vendor-display>
         <sdk:name-display>Google Web Driver</sdk:name-display>
         <sdk:path>webdriver</sdk:path>
-        <sdk:revision>2</sdk:revision>
+        <sdk:revision>
+            <sdk:major>2</sdk:major>
+        </sdk:revision>
         <sdk:description>WebDriver</sdk:description>
         <sdk:desc-url>http://selenium.googlecode.com</sdk:desc-url>
         <sdk:archives>
-            <sdk:archive os="any">
+            <sdk:archive>
                 <sdk:size>4055193</sdk:size>
                 <sdk:checksum type="sha1">13f3a3b2670a5fc04a7342861644be9a01b07e38</sdk:checksum>
                 <sdk:url>webdriver_r02.zip</sdk:url>
@@ -1241,18 +1223,21 @@ November 19, 2013
     <sdk:extra>
         <sdk:vendor-id>google</sdk:vendor-id>
         <sdk:vendor-display>Google Inc.</sdk:vendor-display>
-        <sdk:name-display>[Deprecated] Google Cloud Messaging for Android Library</sdk:name-display>
+        <sdk:name-display>Google Cloud Messaging for Android Library</sdk:name-display>
         <sdk:path>gcm</sdk:path>
-        <sdk:revision>3</sdk:revision>
+        <sdk:revision>
+            <sdk:major>3</sdk:major>
+        </sdk:revision>
         <sdk:description>GCM library has been moved to Google Play Services (com.google.android.gms.gcm) and this standalone version is no longer supported</sdk:description>
         <sdk:desc-url>https://developers.google.com/android/gcm/index</sdk:desc-url>
         <sdk:archives>
-            <sdk:archive os="any">
+            <sdk:archive>
                 <sdk:size>5901400</sdk:size>
                 <sdk:checksum type="sha1">ad066fd0dc7fc99d8aadac09c65a3c2519fbc7bf</sdk:checksum>
                 <sdk:url>gcm_r03.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
         <sdk:uses-license ref="android-sdk-license"/>
+        <sdk:obsolete/>
     </sdk:extra>
 </sdk:sdk-addon>
diff --git a/pkgs/development/mobile/androidenv/addons.nix b/pkgs/development/mobile/androidenv/addons.nix
index 8aacde4eee7b..4f7ed6e9e8e4 100644
--- a/pkgs/development/mobile/androidenv/addons.nix
+++ b/pkgs/development/mobile/androidenv/addons.nix
@@ -209,8 +209,8 @@ in
   google_apis_19 = buildGoogleApis {
     name = "google_apis-19";
       src = fetchurl {
-        url = https://dl-ssl.google.com/android/repository/google_apis-19_r01.zip;
-        sha1 = "6c530a8318446e4da1e3ab7d2abd154bc493bc5a";
+        url = https://dl-ssl.google.com/android/repository/google_apis-19_r07.zip;
+        sha1 = "150f5a3fec4f03313ca770b90126605619bd713c";
       };
       meta = {
         description = "Android + Google APIs";
diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix
index 60f71517323d..1a5cf9500cdd 100644
--- a/pkgs/development/mobile/androidenv/androidsdk.nix
+++ b/pkgs/development/mobile/androidenv/androidsdk.nix
@@ -9,36 +9,35 @@
 
 stdenv.mkDerivation rec {
   name = "android-sdk-${version}";
-  version = "22.6.2";
+  version = "23.0.2";
   
   src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
     then fetchurl {
       url = "http://dl.google.com/android/android-sdk_r${version}-linux.tgz";
-      md5 = "ff1541418a44d894bedc5cef10622220";
+      md5 = "94a8c62086a7398cc0e73e1c8e65f71e";
     }
     else if stdenv.system == "x86_64-darwin" then fetchurl {
       url = "http://dl.google.com/android/android-sdk_r${version}-macosx.zip";
-      md5 = "2a319c862dd1dcf450bfe2a6b3d9c608";
+      md5 = "322787b0e6c629d926c28690c79ac0d8";
     }
     else throw "platform not ${stdenv.system} supported!";
   
   buildCommand = ''
     mkdir -p $out/libexec
     cd $out/libexec
-    unpackFile $src;
-    
+    unpackFile $src
     cd android-sdk-*/tools
     
     ${stdenv.lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
     ''
       # There are a number of native binaries. We must patch them to let them find the interpreter and libstdc++
-    
-      for i in dmtracedump emulator emulator-arm emulator-mips emulator-x86 hprof-conv mksdcard sqlite3
+      
+      for i in emulator emulator-arm emulator-mips emulator-x86 mksdcard
       do
           patchelf --set-interpreter ${stdenv_32bit.gcc.libc}/lib/ld-linux.so.2 $i
           patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib $i
       done
-    
+      
       ${stdenv.lib.optionalString (stdenv.system == "x86_64-linux") ''
         # We must also patch the 64-bit emulator instances, if needed
         
@@ -49,16 +48,8 @@ stdenv.mkDerivation rec {
         done
       ''}
       
-      # These tools also need zlib in addition to libstdc++
-    
-      for i in etc1tool zipalign
-      do
-          patchelf --set-interpreter ${stdenv_32bit.gcc.libc}/lib/ld-linux.so.2 $i
-          patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib:${zlib_32bit}/lib $i
-      done
-    
-      # The android script has a hardcoded reference to /bin/ls that must be patched
-      sed -i -e "s|/bin/ls|ls|" android
+      # Patch the path to the executable so that it can find sdkmanager.jar file
+      #sed -i -e 's|frameworkdir="\$progdir"|'"frameworkdir=$(echo $out/libexec/android-sdk-*/tools/lib)|" android
       
       # The android script used SWT and wants to dynamically load some GTK+ stuff.
       # The following wrapper ensures that they can be found:
diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix
index 215844ea396a..11beb29f3cea 100644
--- a/pkgs/development/mobile/androidenv/build-tools.nix
+++ b/pkgs/development/mobile/androidenv/build-tools.nix
@@ -1,15 +1,15 @@
 {stdenv, stdenv_32bit, fetchurl, unzip, zlib_32bit}:
 
 stdenv.mkDerivation {
-  name = "android-build-tools-r18.1.0";
+  name = "android-build-tools-r20";
   src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
     then fetchurl {
-      url = https://dl-ssl.google.com/android/repository/build-tools_r18.1-linux.zip;
-      sha1 = "f314a0599e51397f0886fe888b50dd98f2f050d8";
+      url = https://dl-ssl.google.com/android/repository/build-tools_r20-linux.zip;
+      sha1 = "b688905526a5584d1327a662d871a635ff502758";
     }
     else if stdenv.system == "x86_64-darwin" then fetchurl {
-      url = https://dl-ssl.google.com/android/repository/build-tools_r18.1-macosx.zip;
-      sha1 = "16ddb299b8b43063e5bb3387ec17147c5053dfd8";
+      url = https://dl-ssl.google.com/android/repository/build-tools_r20-macosx.zip;
+      sha1 = "1240f629411c108a714c4ddd756937c7fab93f83";
     }
     else throw "System ${stdenv.system} not supported!";
   
diff --git a/pkgs/development/mobile/androidenv/fetch b/pkgs/development/mobile/androidenv/fetch.sh
similarity index 58%
rename from pkgs/development/mobile/androidenv/fetch
rename to pkgs/development/mobile/androidenv/fetch.sh
index 30aabc9e0863..92abb18f25f3 100755
--- a/pkgs/development/mobile/androidenv/fetch
+++ b/pkgs/development/mobile/androidenv/fetch.sh
@@ -5,10 +5,9 @@ android list sdk | grep 'Parse XML:' | cut -f8- -d\  # | xargs -n 1 curl -O
 
 # we skip the intel addons, as they are Windows+osX only
 # we skip the default sys-img (arm?) because it is empty
-curl -o repository-8.xml https://dl-ssl.google.com/android/repository/repository-8.xml
+curl -o repository-10.xml https://dl-ssl.google.com/android/repository/repository-10.xml
 curl -o addon.xml        https://dl-ssl.google.com/android/repository/addon.xml
-curl -o sys-img-mips.xml https://dl-ssl.google.com/android/repository/sys-img/mips/sys-img.xml
-curl -o sys-img-x86.xml  https://dl-ssl.google.com/android/repository/sys-img/x86/sys-img.xml
+curl -o sys-img.xml https://dl-ssl.google.com/android/repository/sys-img/android/sys-img.xml
 
 ./generate-addons.sh
 ./generate-platforms.sh
diff --git a/pkgs/development/mobile/androidenv/generate-addons.xsl b/pkgs/development/mobile/androidenv/generate-addons.xsl
index 0100b980a4ef..51d0c07c9346 100644
--- a/pkgs/development/mobile/androidenv/generate-addons.xsl
+++ b/pkgs/development/mobile/androidenv/generate-addons.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:sdk="http://schemas.android.com/sdk/android/addon/5">
+  xmlns:sdk="http://schemas.android.com/sdk/android/addon/7">
 
   <xsl:output omit-xml-declaration="yes" indent="no" />
   <xsl:template match="/sdk:sdk-addon">
@@ -23,8 +23,8 @@ in
   google_apis_<xsl:value-of select="sdk:api-level" /> = buildGoogleApis {
     name = "<xsl:value-of select="sdk:name-id" />-<xsl:value-of select="sdk:api-level" />";
       src = fetchurl {
-        url = https://dl-ssl.google.com/android/repository/<xsl:value-of select="sdk:archives/sdk:archive[@os='any']/sdk:url" />;
-        sha1 = "<xsl:value-of select="sdk:archives/sdk:archive[@os='any']/sdk:checksum[@type='sha1']" />";
+        url = https://dl-ssl.google.com/android/repository/<xsl:value-of select="sdk:archives/sdk:archive/sdk:url" />;
+        sha1 = "<xsl:value-of select="sdk:archives/sdk:archive/sdk:checksum[@type='sha1']" />";
       };
       meta = {
         description = "<xsl:value-of select="sdk:description" />";
diff --git a/pkgs/development/mobile/androidenv/generate-platforms.sh b/pkgs/development/mobile/androidenv/generate-platforms.sh
index 8ac4ad328f44..58d3ba58d379 100755
--- a/pkgs/development/mobile/androidenv/generate-platforms.sh
+++ b/pkgs/development/mobile/androidenv/generate-platforms.sh
@@ -1,4 +1,4 @@
 #!/bin/sh -e
 
-xsltproc --stringparam os linux generate-platforms.xsl repository-8.xml > platforms-linux.nix
-xsltproc --stringparam os macosx generate-platforms.xsl repository-8.xml > platforms-macosx.nix
+xsltproc --stringparam os linux generate-platforms.xsl repository-10.xml > platforms-linux.nix
+xsltproc --stringparam os macosx generate-platforms.xsl repository-10.xml > platforms-macosx.nix
diff --git a/pkgs/development/mobile/androidenv/generate-platforms.xsl b/pkgs/development/mobile/androidenv/generate-platforms.xsl
index 249f044550b1..ba556f2baac9 100644
--- a/pkgs/development/mobile/androidenv/generate-platforms.xsl
+++ b/pkgs/development/mobile/androidenv/generate-platforms.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:sdk="http://schemas.android.com/sdk/android/repository/8">
+  xmlns:sdk="http://schemas.android.com/sdk/android/repository/10">
 
   <xsl:param name="os" />
   <xsl:output omit-xml-declaration="yes" indent="no" />
@@ -10,7 +10,7 @@
 
 let
   buildPlatform = args:
-    stdenv.mkDerivation (args // {   
+    stdenv.mkDerivation (args // {
       buildInputs = [ unzip ];
       buildCommand = ''
         mkdir -p $out
@@ -20,12 +20,12 @@ let
   });
 in
 {
-    <xsl:for-each select="sdk:platform">
+    <xsl:for-each select="sdk:platform[sdk:api-level &lt; 20]">
   platform_<xsl:value-of select="sdk:api-level" /> = buildPlatform {
     name = "android-platform-<xsl:value-of select="sdk:version" />";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/<xsl:value-of select="sdk:archives/sdk:archive[@os=$os or @os='any']/sdk:url" />;
-      sha1 = "<xsl:value-of select="sdk:archives/sdk:archive[@os=$os or @os='any']/sdk:checksum[@type='sha1']" />";
+      url = <xsl:value-of select="sdk:archives/sdk:archive[sdk:host-os=$os or count(sdk:host-os) = 0]/sdk:url" />;
+      sha1 = "<xsl:value-of select="sdk:archives/sdk:archive[sdk:host-os=$os or count(sdk:host-os) = 0]/sdk:checksum[@type='sha1']" />";
     };
     meta = {
       description = "<xsl:value-of select="sdk:description" />";
diff --git a/pkgs/development/mobile/androidenv/generate-sysimages-others.xsl b/pkgs/development/mobile/androidenv/generate-sysimages-others.xsl
deleted file mode 100644
index 31ab72add364..000000000000
--- a/pkgs/development/mobile/androidenv/generate-sysimages-others.xsl
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:str="http://exslt.org/strings"
-  xmlns:sdk="http://schemas.android.com/sdk/android/sys-img/1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-  <xsl:param name="abi" />
-  <xsl:output omit-xml-declaration="yes" indent="no" />
-
-  <xsl:template match="/sdk:sdk-sys-img">
-    <xsl:for-each select="sdk:system-image">
-  sysimg_<xsl:value-of select="sdk:abi" />_<xsl:value-of select="sdk:api-level" /> = buildSystemImage {
-    name = "<xsl:value-of select="sdk:abi" />-<xsl:value-of select="sdk:api-level" />";
-    src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/sys-img/<xsl:value-of select="$abi" />/<xsl:value-of select="sdk:archives/sdk:archive[@os='any']/sdk:url" />;
-      sha1 = "<xsl:value-of select="sdk:archives/sdk:archive[@os='any']/sdk:checksum[@type='sha1']" />";
-    };
-  };
-    </xsl:for-each>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/pkgs/development/mobile/androidenv/generate-sysimages.sh b/pkgs/development/mobile/androidenv/generate-sysimages.sh
index 90b1e04c2297..ef2f825642b7 100755
--- a/pkgs/development/mobile/androidenv/generate-sysimages.sh
+++ b/pkgs/development/mobile/androidenv/generate-sysimages.sh
@@ -17,9 +17,7 @@ in
 {
 EOF
 
-xsltproc generate-sysimages.xsl repository-8.xml >> sysimages.nix
-xsltproc --stringparam abi x86 generate-sysimages-others.xsl sys-img-x86.xml >> sysimages.nix
-xsltproc --stringparam abi mips generate-sysimages-others.xsl sys-img-mips.xml >> sysimages.nix
+xsltproc generate-sysimages.xsl sys-img.xml >> sysimages.nix
 
 cat >> sysimages.nix << "EOF"
 }
diff --git a/pkgs/development/mobile/androidenv/generate-sysimages.xsl b/pkgs/development/mobile/androidenv/generate-sysimages.xsl
index be9947d536a9..6de690622b5d 100644
--- a/pkgs/development/mobile/androidenv/generate-sysimages.xsl
+++ b/pkgs/development/mobile/androidenv/generate-sysimages.xsl
@@ -2,17 +2,17 @@
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:str="http://exslt.org/strings"
-  xmlns:sdk="http://schemas.android.com/sdk/android/repository/8">
+  xmlns:sdk="http://schemas.android.com/sdk/android/sys-img/3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
   <xsl:output omit-xml-declaration="yes" indent="no" />
 
-  <xsl:template match="/sdk:sdk-repository">
+  <xsl:template match="/sdk:sdk-sys-img">
     <xsl:for-each select="sdk:system-image">
   sysimg_<xsl:value-of select="sdk:abi" />_<xsl:value-of select="sdk:api-level" /> = buildSystemImage {
-    name = "<xsl:value-of select="sdk:abi" />-<xsl:value-of select="sdk:api-level" />";
+    name = "sysimg-<xsl:value-of select="sdk:abi" />-<xsl:value-of select="sdk:api-level" />";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/<xsl:value-of select="sdk:archives/sdk:archive[@os='any']/sdk:url" />;
-      sha1 = "<xsl:value-of select="sdk:archives/sdk:archive[@os='any']/sdk:checksum[@type='sha1']" />";
+      url = <xsl:if test="not(starts-with(sdk:archives/sdk:archive/sdk:url, 'https://'))">https://dl-ssl.google.com/android/repository/sys-img/android/</xsl:if><xsl:value-of select="sdk:archives/sdk:archive/sdk:url" />;
+      sha1 = "<xsl:value-of select="sdk:archives/sdk:archive/sdk:checksum[@type='sha1']" />";
     };
   };
     </xsl:for-each>
diff --git a/pkgs/development/mobile/androidenv/platforms-linux.nix b/pkgs/development/mobile/androidenv/platforms-linux.nix
index f9f5a2d50f4f..feb967d01082 100644
--- a/pkgs/development/mobile/androidenv/platforms-linux.nix
+++ b/pkgs/development/mobile/androidenv/platforms-linux.nix
@@ -3,7 +3,7 @@
 
 let
   buildPlatform = args:
-    stdenv.mkDerivation (args // {   
+    stdenv.mkDerivation (args // {
       buildInputs = [ unzip ];
       buildCommand = ''
         mkdir -p $out
@@ -219,13 +219,13 @@ in
   };
     
   platform_19 = buildPlatform {
-    name = "android-platform-4.4";
+    name = "android-platform-4.4.2";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/android-19_r01.zip;
-      sha1 = "96281811998272dce46e8285d15fce444a3d5a96";
+      url = https://dl-ssl.google.com/android/repository/android-19_r03.zip;
+      sha1 = "5f33d8fd36a384fe2b170035e04a29c274a9ef95";
     };
     meta = {
-      description = "Android SDK Platform 4.4";
+      description = "Android SDK Platform 4.4.2";
       
     };
   };
diff --git a/pkgs/development/mobile/androidenv/platforms-macosx.nix b/pkgs/development/mobile/androidenv/platforms-macosx.nix
index a95561d3e856..0e93ed9412be 100644
--- a/pkgs/development/mobile/androidenv/platforms-macosx.nix
+++ b/pkgs/development/mobile/androidenv/platforms-macosx.nix
@@ -3,7 +3,7 @@
 
 let
   buildPlatform = args:
-    stdenv.mkDerivation (args // {   
+    stdenv.mkDerivation (args // {
       buildInputs = [ unzip ];
       buildCommand = ''
         mkdir -p $out
@@ -219,13 +219,13 @@ in
   };
     
   platform_19 = buildPlatform {
-    name = "android-platform-4.4";
+    name = "android-platform-4.4.2";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/android-19_r01.zip;
-      sha1 = "96281811998272dce46e8285d15fce444a3d5a96";
+      url = https://dl-ssl.google.com/android/repository/android-19_r03.zip;
+      sha1 = "5f33d8fd36a384fe2b170035e04a29c274a9ef95";
     };
     meta = {
-      description = "Android SDK Platform 4.4";
+      description = "Android SDK Platform 4.4.2";
       
     };
   };
diff --git a/pkgs/development/mobile/androidenv/repository-10.xml b/pkgs/development/mobile/androidenv/repository-10.xml
new file mode 100644
index 000000000000..81023cae2eea
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/repository-10.xml
@@ -0,0 +1,1562 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+-->
+<sdk:sdk-repository xmlns:sdk="http://schemas.android.com/sdk/android/repository/10" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+    <sdk:license id="android-sdk-license" type="text">To get started with the Android SDK, you must agree to the following terms and conditions.
+
+This is the Android SDK License Agreement (the &quot;License Agreement&quot;).
+
+1. Introduction
+
+1.1 The Android SDK (referred to in the License Agreement as the &quot;SDK&quot; and specifically including the Android system files, packaged APIs, and SDK library files and tools , if and when they are made available) is licensed to you subject to the terms of the License Agreement. The License Agreement forms a legally binding contract between you and Google in relation to your use of the SDK.
+
+1.2 &quot;Android&quot; means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time.
+
+1.3 &quot;Google&quot; means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.
+
+2. Accepting the License Agreement
+
+2.1 In order to use the SDK, you must first agree to the License Agreement. You may not use the SDK if you do not accept the License Agreement.
+
+2.2 By clicking to accept and/or using the SDK, you hereby agree to the terms of the License Agreement.
+
+2.3 You may not use the SDK and may not accept the License Agreement if you are a person barred from receiving the SDK under the laws of the United States or other countries including the country in which you are resident or from which you use the SDK.
+
+2.4 If you will use the SDK internally within your company or organization you agree to be bound by the License Agreement on behalf of your employer or other entity, and you represent and warrant that you have full legal authority to bind your employer or such entity to the License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the SDK on behalf of your employer or other entity.
+
+3. SDK License from Google
+
+3.1 Subject to the terms of the License Agreement, Google grants you a royalty-free, non-assignable, non-exclusive, non-sublicensable, limited, revocable license to use the SDK, personally or internally within your company or organization, solely to develop and distribute applications to run on the Android platform.
+
+3.2 You agree that Google or third parties own all legal right, title and interest in and to the SDK, including any Intellectual Property Rights that subsist in the SDK. &quot;Intellectual Property Rights&quot; means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you.
+
+3.3 You may not use the SDK for any purpose not expressly permitted by the License Agreement. Except to the extent required by applicable third party licenses, you may not: (a) copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK; or (b) load any part of the SDK onto a mobile handset or any other hardware device except a personal computer, combine any part of the SDK with other software, or distribute any software or device incorporating a part of the SDK.
+
+3.4 You agree that you will not take any actions that may cause or result in the fragmentation of Android, including but not limited to distributing, participating in the creation of, or promoting in any way a software development kit derived from the SDK.
+
+3.5 Use, reproduction and distribution of components of the SDK licensed under an open source software license are governed solely by the terms of that open source software license and not the License Agreement. You agree to remain a licensee in good standing in regard to such open source software licenses under all the rights granted and to refrain from any actions that may terminate, suspend, or breach such rights.
+
+3.6 You agree that the form and nature of the SDK that Google provides may change without prior notice to you and that future versions of the SDK may be incompatible with applications developed on previous versions of the SDK. You agree that Google may stop (permanently or temporarily) providing the SDK (or any features within the SDK) to you or to users generally at Google's sole discretion, without prior notice to you.
+
+3.7 Nothing in the License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features.
+
+3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the SDK.
+
+4. Use of the SDK by You
+
+4.1 Google agrees that nothing in the License Agreement gives Google any right, title or interest from you (or your licensors) under the License Agreement in or to any software applications that you develop using the SDK, including any intellectual property rights that subsist in those applications.
+
+4.2 You agree to use the SDK and write applications only for purposes that are permitted by (a) the License Agreement, and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries).
+
+4.3 You agree that if you use the SDK to develop applications, you will protect the privacy and legal rights of users. If users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If users provide you with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, each user has given you permission to do so.
+
+4.4 You agree that you will not engage in any activity with the SDK, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of Google or any third party.
+
+4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through Android and/or applications for Android, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so.
+
+4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under the License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach.
+
+5. Your Developer Credentials
+
+5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials.
+
+6. Privacy and Information
+
+6.1 In order to continually innovate and improve the SDK, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the SDK are being used and how they are being used. Before any of this information is collected, the SDK will notify you and seek your consent. If you withhold consent, the information will not be collected.
+
+6.2 The data collected is examined in the aggregate to improve the SDK and is maintained in accordance with Google's Privacy Policy located at http://www.google.com/policies/privacy/.
+
+7. Third Party Applications
+
+7.1 If you use the SDK to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources.
+
+7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners.
+
+7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party.
+
+8. Using Google APIs
+
+8.1 Google APIs
+
+8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service.
+
+8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so.
+
+9. Terminating the License Agreement
+
+9.1 The License Agreement will continue to apply until terminated by either you or Google as set out below.
+
+9.2 If you want to terminate the License Agreement, you may do so by ceasing your use of the SDK and any relevant developer credentials.
+
+9.3 Google may at any time, terminate the License Agreement, with or without cause, upon notice to you.
+
+9.4 The License Agreement will automatically terminate without notice or other action when Google ceases to provide the SDK or certain parts of the SDK to users in the country in which you are resident or from which you use the service.
+
+9.5 When the License Agreement is terminated, the license granted to you in the License Agreement will terminate, you will immediately cease all use of the SDK, and the provisions of paragraphs 10, 11, 12 and 14 shall survive indefinitely.
+
+10. DISCLAIMERS
+
+10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE SDK IS AT YOUR SOLE RISK AND THAT THE SDK IS PROVIDED &quot;AS IS&quot; AND &quot;AS AVAILABLE&quot; WITHOUT WARRANTY OF ANY KIND FROM GOOGLE.
+
+10.2 YOUR USE OF THE SDK AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE SDK IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE. WITHOUT LIMITING THE FOREGOING, YOU UNDERSTAND THAT THE SDK MAY CONTAIN ERRORS, DEFECTS AND SECURITY VULNERABILITIES THAT CAN RESULT IN SIGNIFICANT DAMAGE, INCLUDING THE COMPLETE, IRRECOVERABLE LOSS OF USE OF YOUR COMPUTER SYSTEM OR OTHER DEVICE.
+
+10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+
+11. LIMITATION OF LIABILITY
+
+11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING.
+
+12. Indemnification
+
+12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys’ fees) arising out of or accruing from (a) your use of the SDK, (b) any application you develop on the SDK that infringes any Intellectual Property Rights of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you of the License Agreement.
+
+13. Changes to the License Agreement
+
+13.1 Google may make changes to the License Agreement as it distributes new versions of the SDK. When these changes are made, Google will make a new version of the License Agreement available on the website where the SDK is made available.
+
+14. General Legal Terms
+
+14.1 The License Agreement constitutes the whole legal agreement between you and Google and governs your use of the SDK (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the SDK.
+
+14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in the License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google.
+
+14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of the License Agreement is invalid, then that provision will be removed from the License Agreement without affecting the rest of the License Agreement. The remaining provisions of the License Agreement will continue to be valid and enforceable.
+
+14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to the License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of the License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to the License Agreement.
+
+14.5 EXPORT RESTRICTIONS. THE SDK IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE SDK. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE.
+
+14.6 The License Agreement may not be assigned or transferred by you without the prior written approval of Google, and any attempted assignment without such approval will be void. You shall not delegate your responsibilities or obligations under the License Agreement without the prior written approval of Google.
+
+14.7 The License Agreement, and your relationship with Google under the License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from the License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.
+
+June 2014.
+    </sdk:license>
+
+    <sdk:license id="android-sdk-preview-license" type="text">To get started with the Android SDK Preview, you must agree to the following terms and conditions.
+As described below, please note that this is a preview version of the Android SDK, subject to change, that you use at your own risk.  The Android SDK Preview is not a stable release, and may contain errors and defects that can result in serious damage to your computer systems, devices and data.
+
+This is the Android SDK Preview License Agreement (the &quot;License Agreement&quot;).
+
+1. Introduction
+
+1.1 The Android SDK Preview (referred to in the License Agreement as the “Preview” and specifically including the Android system files, packaged APIs, and Preview library files, if and when they are made available) is licensed to you subject to the terms of the License Agreement. The License Agreement forms a legally binding contract between you and Google in relation to your use of the Preview.
+
+1.2 &quot;Android&quot; means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time.
+
+1.3 &quot;Google&quot; means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.
+
+2. Accepting the License Agreement
+
+2.1 In order to use the Preview, you must first agree to the License Agreement. You may not use the Preview if you do not accept the License Agreement.
+
+2.2 By clicking to accept and/or using the Preview, you hereby agree to the terms of the License Agreement.
+
+2.3 You may not use the Preview and may not accept the License Agreement if you are a person barred from receiving the Preview under the laws of the United States or other countries including the country in which you are resident or from which you use the Preview.
+
+2.4 If you will use the Preview internally within your company or organization you agree to be bound by the License Agreement on behalf of your employer or other entity, and you represent and warrant that you have full legal authority to bind your employer or such entity to the License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the Preview on behalf of your employer or other entity.
+
+3. Preview License from Google
+
+3.1 Subject to the terms of the License Agreement, Google grants you a royalty-free, non-assignable, non-exclusive, non-sublicensable, limited, revocable license to use the Preview, personally or internally within your company or organization, solely to develop applications to run on the Android platform.
+
+3.2 You agree that Google or third parties owns all legal right, title and interest in and to the Preview, including any Intellectual Property Rights that subsist in the Preview. &quot;Intellectual Property Rights&quot; means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you.
+
+3.3 You may not use the Preview for any purpose not expressly permitted by the License Agreement. Except to the extent required by applicable third party licenses, you may not: (a) copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the Preview or any part of the Preview; or (b) load any part of the Preview onto a mobile handset or any other hardware device except a personal computer, combine any part of the Preview with other software, or distribute any software or device incorporating a part of the Preview.
+
+3.4 You agree that you will not take any actions that may cause or result in the fragmentation of Android, including but not limited to distributing, participating in the creation of, or promoting in any way a software development kit derived from the Preview.
+
+3.5 Use, reproduction and distribution of components of the Preview licensed under an open source software license are governed solely by the terms of that open source software license and not the License Agreement. You agree to remain a licensee in good standing in regard to such open source software licenses under all the rights granted and to refrain from any actions that may terminate, suspend, or breach such rights.
+
+3.6 You agree that the form and nature of the Preview that Google provides may change without prior notice to you and that future versions of the Preview may be incompatible with applications developed on previous versions of the Preview. You agree that Google may stop (permanently or temporarily) providing the Preview (or any features within the Preview) to you or to users generally at Google's sole discretion, without prior notice to you.
+
+3.7 Nothing in the License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features.
+
+3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the Preview.
+
+4. Use of the Preview by You
+
+4.1 Google agrees that nothing in the License Agreement gives Google any right, title or interest from you (or your licensors) under the License Agreement in or to any software applications that you develop using the Preview, including any intellectual property rights that subsist in those applications.
+
+4.2 You agree to use the Preview and write applications only for purposes that are permitted by (a) the License Agreement, and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries).
+
+4.3 You agree that if you use the Preview to develop applications, you will protect the privacy and legal rights of users. If users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If users provide you with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, each user has given you permission to do so.
+
+4.4 You agree that you will not engage in any activity with the Preview, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of Google or any third party.
+
+4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through Android and/or applications for Android, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so.
+
+4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under the License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach.
+
+4.7 The Preview is in development, and your testing and feedback are an important part of the development process. By using the Preview, you acknowledge that implementation of some features are still under development and that you should not rely on the Preview having the full functionality of a stable release. You agree not to publicly distribute or ship any application using this Preview as this Preview will no longer be supported after the official Android SDK is released.
+
+5. Your Developer Credentials
+
+5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials.
+
+6. Privacy and Information
+
+6.1 In order to continually innovate and improve the Preview, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the Preview are being used and how they are being used. Before any of this information is collected, the Preview will notify you and seek your consent. If you withhold consent, the information will not be collected.
+
+6.2 The data collected is examined in the aggregate to improve the Preview and is maintained in accordance with Google's Privacy Policy located at http://www.google.com/policies/privacy/.
+
+7. Third Party Applications
+
+7.1 If you use the Preview to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources.
+
+7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners.
+
+7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party.
+
+8. Using Google APIs
+
+8.1 Google APIs
+
+8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service.
+
+8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so.
+
+9. Terminating the License Agreement
+
+9.1 the License Agreement will continue to apply until terminated by either you or Google as set out below.
+
+9.2 If you want to terminate the License Agreement, you may do so by ceasing your use of the Preview and any relevant developer credentials.
+
+9.3 Google may at any time, terminate the License Agreement, with or without cause, upon notice to you.
+
+9.4 The License Agreement will automatically terminate without notice or other action upon the earlier of:
+(A) when Google ceases to provide the Preview or certain parts of the Preview to users in the country in which you are resident or from which you use the service; and
+(B) Google issues a final release version of the Android SDK.
+
+9.5 When the License Agreement is terminated, the license granted to you in the License Agreement will terminate, you will immediately cease all use of the Preview, and the provisions of paragraphs 10, 11, 12 and 14 shall survive indefinitely.
+
+10. DISCLAIMERS
+
+10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE PREVIEW IS AT YOUR SOLE RISK AND THAT THE PREVIEW IS PROVIDED &quot;AS IS&quot; AND &quot;AS AVAILABLE&quot; WITHOUT WARRANTY OF ANY KIND FROM GOOGLE.
+
+10.2 YOUR USE OF THE PREVIEW AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE PREVIEW IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE. WITHOUT LIMITING THE FOREGOING, YOU UNDERSTAND THAT THE PREVIEW IS NOT A STABLE RELEASE AND MAY CONTAIN ERRORS, DEFECTS AND SECURITY VULNERABILITIES THAT CAN RESULT IN SIGNIFICANT DAMAGE, INCLUDING THE COMPLETE, IRRECOVERABLE LOSS OF USE OF YOUR COMPUTER SYSTEM OR OTHER DEVICE.
+
+10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+
+11. LIMITATION OF LIABILITY
+
+11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING.
+
+12. Indemnification
+
+12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys’ fees) arising out of or accruing from (a) your use of the Preview, (b) any application you develop on the Preview that infringes any Intellectual Property Rights of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you of the License Agreement.
+
+13. Changes to the License Agreement
+
+13.1 Google may make changes to the License Agreement as it distributes new versions of the Preview. When these changes are made, Google will make a new version of the License Agreement available on the website where the Preview is made available.
+
+14. General Legal Terms
+
+14.1 the License Agreement constitutes the whole legal agreement between you and Google and governs your use of the Preview (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the Preview.
+
+14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in the License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google.
+
+14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of the License Agreement is invalid, then that provision will be removed from the License Agreement without affecting the rest of the License Agreement. The remaining provisions of the License Agreement will continue to be valid and enforceable.
+
+14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to the License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of the License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to the License Agreement.
+
+14.5 EXPORT RESTRICTIONS. THE PREVIEW IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE PREVIEW. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE.
+
+14.6 The License Agreement may not be assigned or transferred by you without the prior written approval of Google, and any attempted assignment without such approval will be void. You shall not delegate your responsibilities or obligations under the License Agreement without the prior written approval of Google.
+
+14.7 The License Agreement, and your relationship with Google under the License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from the License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.
+
+June 2014.
+    </sdk:license>
+
+    <!-- PLATFORMS ........................ -->
+
+    <sdk:platform>
+        <sdk:version>1.1</sdk:version>
+        <sdk:api-level>2</sdk:api-level>
+        <sdk:revision>1</sdk:revision>
+        <sdk:description>Android SDK Platform 1.1_r1</sdk:description>
+        <sdk:desc-url>http://developer.android.com/sdk/android-1.1.html</sdk:desc-url>
+        <sdk:obsolete/>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>46828615</sdk:size>
+                <sdk:checksum type="sha1">a4060f29ed39fc929c302836d488998c53c3002e</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/android-1.1_r1-windows.zip</sdk:url>
+                <sdk:host-os>windows</sdk:host-os>
+            </sdk:archive>
+            <sdk:archive>
+                <sdk:size>45584305</sdk:size>
+                <sdk:checksum type="sha1">e21dbcff45b7356657449ebb3c7e941be2bb5ebe</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/android-1.1_r1-macosx.zip</sdk:url>
+                <sdk:host-os>macosx</sdk:host-os>
+            </sdk:archive>
+            <sdk:archive>
+                <sdk:size>45476658</sdk:size>
+                <sdk:checksum type="sha1">c054d25c9b4c6251fa49c2f9c54336998679d3fe</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/android-1.1_r1-linux.zip</sdk:url>
+                <sdk:host-os>linux</sdk:host-os>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:layoutlib>
+            <sdk:api>4</sdk:api>
+        </sdk:layoutlib>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:platform>
+
+    <!-- Generated manually from earlier versions -->
+
+    <sdk:platform>
+        <sdk:version>1.5</sdk:version>
+        <sdk:api-level>3</sdk:api-level>
+        <sdk:revision>04</sdk:revision>
+        <sdk:min-tools-rev>
+            <sdk:major>6</sdk:major>
+        </sdk:min-tools-rev>
+        <sdk:description>Android SDK Platform 1.5_r3</sdk:description>
+        <sdk:desc-url>http://developer.android.com/sdk/android-1.5.html</sdk:desc-url>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>54624370</sdk:size>
+                <sdk:checksum type="sha1">5bb106d2e40d481edd337b0833093843e15fe49a</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/android-1.5_r04-windows.zip</sdk:url>
+                <sdk:host-os>windows</sdk:host-os>
+            </sdk:archive>
+            <sdk:archive>
+                <sdk:size>52440607</sdk:size>
+                <sdk:checksum type="sha1">d3a67c2369afa48b6c3c7624de5031c262018d1e</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/android-1.5_r04-macosx.zip</sdk:url>
+                <sdk:host-os>macosx</sdk:host-os>
+            </sdk:archive>
+            <sdk:archive>
+                <sdk:size>53348669</sdk:size>
+                <sdk:checksum type="sha1">5c134b7df5f4b8bd5b61ba93bdaebada8fa3468c</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/android-1.5_r04-linux.zip</sdk:url>
+                <sdk:host-os>linux</sdk:host-os>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:layoutlib>
+            <sdk:api>4</sdk:api>
+        </sdk:layoutlib>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:platform>
+
+    <sdk:platform>
+        <sdk:version>1.6</sdk:version>
+        <sdk:api-level>4</sdk:api-level>
+        <sdk:codename/>
+        <sdk:revision>03</sdk:revision>
+        <sdk:min-tools-rev>
+            <sdk:major>6</sdk:major>
+        </sdk:min-tools-rev>
+        <sdk:description>Android SDK Platform 1.6_r2</sdk:description>
+        <sdk:desc-url>http://developer.android.com/sdk/android-1.6.html</sdk:desc-url>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>63454485</sdk:size>
+                <sdk:checksum type="sha1">483ed088e45bbdf3444baaf9250c8b02e5383cb0</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/android-1.6_r03-linux.zip</sdk:url>
+                <sdk:host-os>linux</sdk:host-os>
+            </sdk:archive>
+            <sdk:archive>
+                <sdk:size>62418496</sdk:size>
+                <sdk:checksum type="sha1">bdafad44f5df9f127979bdb21a1fdd87ee3cd625</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/android-1.6_r03-macosx.zip</sdk:url>
+                <sdk:host-os>macosx</sdk:host-os>
+            </sdk:archive>
+            <sdk:archive>
+                <sdk:size>64654625</sdk:size>
+                <sdk:checksum type="sha1">ce0b5e4ffaf12ca4fd07c2da71a8a1ab4a03dc22</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/android-1.6_r03-windows.zip</sdk:url>
+                <sdk:host-os>windows</sdk:host-os>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:layoutlib>
+            <sdk:api>4</sdk:api>
+        </sdk:layoutlib>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:platform>
+
+    <!-- Generated on Thu Oct 22 10:16:34 PDT 2009 using eclair-sdk 17704: Platform. Addon. Tools. Doc. -->
+
+    <sdk:platform>
+        <sdk:version>2.0</sdk:version>
+        <sdk:api-level>5</sdk:api-level>
+        <sdk:codename/>
+        <sdk:revision>01</sdk:revision>
+        <sdk:min-tools-rev>
+            <sdk:major>3</sdk:major>
+        </sdk:min-tools-rev>
+        <sdk:description>Android SDK Platform 2.0, revision 1</sdk:description>
+        <sdk:desc-url>http://developer.android.com/sdk/android-2.0.html</sdk:desc-url>
+        <sdk:obsolete/>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>75095268</sdk:size>
+                <sdk:checksum type="sha1">be9be6a99ca32875c96ec7f91160ca9fce7e3c7d</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/android-2.0_r01-linux.zip</sdk:url>
+                <sdk:host-os>linux</sdk:host-os>
+            </sdk:archive>
+            <sdk:archive>
+                <sdk:size>74956356</sdk:size>
+                <sdk:checksum type="sha1">2a866d0870dbba18e0503cd41e5fae988a21b314</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/android-2.0_r01-macosx.zip</sdk:url>
+                <sdk:host-os>macosx</sdk:host-os>
+            </sdk:archive>
+            <sdk:archive>
+                <sdk:size>76288040</sdk:size>
+                <sdk:checksum type="sha1">aeb623217ff88b87216d6eb7dbc846ed53f68f57</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/android-2.0_r01-windows.zip</sdk:url>
+                <sdk:host-os>windows</sdk:host-os>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:layoutlib>
+            <sdk:api>4</sdk:api>
+        </sdk:layoutlib>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:platform>
+
+    <!-- Generated on Mon Nov 23 14:08:02 PST 2009 using eclair-release 20723: Platform. Addon. -->
+
+    <sdk:platform>
+        <sdk:version>2.0.1</sdk:version>
+        <sdk:api-level>6</sdk:api-level>
+        <sdk:codename/>
+        <sdk:revision>01</sdk:revision>
+        <sdk:min-tools-rev>
+            <sdk:major>4</sdk:major>
+        </sdk:min-tools-rev>
+        <sdk:description>Android SDK Platform 2.0.1_r1</sdk:description>
+        <sdk:desc-url>http://developer.android.com/sdk/android-2.0.1.html</sdk:desc-url>
+        <sdk:obsolete/>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>79192618</sdk:size>
+                <sdk:checksum type="sha1">ce2c971dce352aa28af06bda92a070116aa5ae1a</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/android-2.0.1_r01-linux.zip</sdk:url>
+                <sdk:host-os>linux</sdk:host-os>
+            </sdk:archive>
+            <sdk:archive>
+                <sdk:size>79035527</sdk:size>
+                <sdk:checksum type="sha1">c3096f80d75a6fc8cb38ef8a18aec920e53d42c0</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/android-2.0.1_r01-macosx.zip</sdk:url>
+                <sdk:host-os>macosx</sdk:host-os>
+            </sdk:archive>
+            <sdk:archive>
+                <sdk:size>80385601</sdk:size>
+                <sdk:checksum type="sha1">255781ebe4509d9707d0e77edda2815e2bc216e6</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/android-2.0.1_r01-windows.zip</sdk:url>
+                <sdk:host-os>windows</sdk:host-os>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:layoutlib>
+            <sdk:api>4</sdk:api>
+        </sdk:layoutlib>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:platform>
+
+    <!-- Generated on Thu May  6 15:57:41 PDT 2010 using eclair 35983: Platform. -->
+
+    <sdk:platform>
+        <sdk:version>2.1</sdk:version>
+        <sdk:api-level>7</sdk:api-level>
+        <sdk:codename/>
+        <sdk:revision>03</sdk:revision>
+        <sdk:min-tools-rev>
+            <sdk:major>8</sdk:major>
+        </sdk:min-tools-rev>
+        <sdk:description>Android SDK Platform 2.1_r3</sdk:description>
+        <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>70142829</sdk:size>
+                <sdk:checksum type="sha1">5ce51b023ac19f8738500b1007a1da5de2349a1e</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/android-2.1_r03-linux.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:layoutlib>
+            <sdk:api>4</sdk:api>
+        </sdk:layoutlib>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:platform>
+
+    <!-- Generated on Wed Jun 30 16:13:06 PDT 2010 using froyo-release 43546: Platform. Addon. -->
+
+    <sdk:platform>
+        <sdk:version>2.2</sdk:version>
+        <sdk:api-level>8</sdk:api-level>
+        <sdk:codename/>
+        <sdk:revision>03</sdk:revision>
+        <sdk:min-tools-rev>
+            <sdk:major>8</sdk:major>
+        </sdk:min-tools-rev>
+        <sdk:description>Android SDK Platform 2.2_r3</sdk:description>
+        <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>74652366</sdk:size>
+                <sdk:checksum type="sha1">231262c63eefdff8fd0386e9ccfefeb27a8f9202</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/android-2.2_r03-linux.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:layoutlib>
+            <sdk:api>4</sdk:api>
+        </sdk:layoutlib>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:platform>
+
+    <!-- Generated on Thu Jan 20 09:40:59 PST 2011 using gingerbread-sdk-release 93351: Platform. -->
+
+    <sdk:platform>
+        <sdk:version>2.3.1</sdk:version>
+        <sdk:api-level>9</sdk:api-level>
+        <sdk:codename/>
+        <sdk:revision>02</sdk:revision>
+        <sdk:min-tools-rev>
+            <sdk:major>8</sdk:major>
+        </sdk:min-tools-rev>
+        <sdk:description>Android SDK Platform 2.3.1_r2</sdk:description>
+        <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
+        <sdk:obsolete/>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>78732563</sdk:size>
+                <sdk:checksum type="sha1">209f8a7a8b2cb093fce858b8b55fed3ba5206773</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/android-2.3.1_r02-linux.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:layoutlib>
+            <sdk:api>4</sdk:api>
+        </sdk:layoutlib>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:platform>
+
+    <!-- Generated on Fri Feb  4 16:41:27 PST 2011 using gingerbread-release 101070: Platform. -->
+
+    <sdk:platform>
+        <sdk:version>2.3.3</sdk:version>
+        <sdk:api-level>10</sdk:api-level>
+        <sdk:codename/>
+        <sdk:revision>02</sdk:revision>
+        <sdk:min-tools-rev>
+            <sdk:major>8</sdk:major>
+        </sdk:min-tools-rev>
+        <sdk:description>Android SDK Platform 2.3.3._r2</sdk:description>
+        <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>85470907</sdk:size>
+                <sdk:checksum type="sha1">887e37783ec32f541ea33c2c649dda648e8e6fb3</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/android-2.3.3_r02-linux.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:layoutlib>
+            <sdk:api>4</sdk:api>
+        </sdk:layoutlib>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:platform>
+
+    <!-- Generated on Thu Feb 17 08:41:10 PST 2011 using honeycomb 104254: Platform. -->
+
+    <sdk:platform>
+        <sdk:version>3.0</sdk:version>
+        <sdk:api-level>11</sdk:api-level>
+        <sdk:codename/>
+        <sdk:revision>02</sdk:revision>
+        <sdk:min-tools-rev>
+            <sdk:major>10</sdk:major>
+        </sdk:min-tools-rev>
+        <sdk:description>Android SDK Platform 3.0, revision 2</sdk:description>
+        <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>104513908</sdk:size>
+                <sdk:checksum type="sha1">2c7d4bd13f276e76f6bbd87315fe27aba351dd37</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/android-3.0_r02-linux.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:layoutlib>
+            <sdk:api>4</sdk:api>
+        </sdk:layoutlib>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:platform>
+
+    <!-- Generated on Wed May  4 19:39:17 PDT 2011 using honeycomb-mr1 123685: Platform.
+         r2: layoutlib.jar from 3.0 to fix issue with ADT 10.
+    -->
+
+    <sdk:platform>
+        <sdk:version>3.1</sdk:version>
+        <sdk:api-level>12</sdk:api-level>
+        <sdk:codename/>
+        <sdk:revision>03</sdk:revision>
+        <sdk:min-tools-rev>
+            <sdk:major>11</sdk:major>
+        </sdk:min-tools-rev>
+        <sdk:description>Android SDK Platform 3.1, revision 3</sdk:description>
+        <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>106472351</sdk:size>
+                <sdk:checksum type="sha1">4a50a6679cd95bb68bb5fc032e754cd7c5e2b1bf</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/android-3.1_r03-linux.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:layoutlib>
+            <sdk:api>4</sdk:api>
+        </sdk:layoutlib>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:platform>
+
+    <!-- Generated on Fri Jul 15 11:50:12 PDT 2011 using honeycomb-mr2-release 140714: Platform. -->
+
+    <sdk:platform>
+        <sdk:version>3.2</sdk:version>
+        <sdk:api-level>13</sdk:api-level>
+        <sdk:codename/>
+        <sdk:revision>01</sdk:revision>
+        <sdk:min-tools-rev>
+            <sdk:major>12</sdk:major>
+        </sdk:min-tools-rev>
+        <sdk:description>Android SDK Platform 3.2, revision 1</sdk:description>
+        <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>108426536</sdk:size>
+                <sdk:checksum type="sha1">6189a500a8c44ae73a439604363de93591163cd9</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/android-3.2_r01-linux.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:layoutlib>
+            <sdk:api>4</sdk:api>
+        </sdk:layoutlib>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:platform>
+
+    <sdk:platform>
+        <!-- Generated at Thu Dec 15 16:53:11 2011 from git_ics-mr0 @ 238991 -->
+        <sdk:revision>3</sdk:revision>
+        <sdk:description>Android SDK Platform 4.0</sdk:description>
+        <sdk:version>4.0</sdk:version>
+        <sdk:api-level>14</sdk:api-level>
+        <sdk:layoutlib>
+            <sdk:api>7</sdk:api>
+            <sdk:revision>1</sdk:revision>
+        </sdk:layoutlib>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>45919570</sdk:size>
+                <sdk:checksum type="sha1">41ba83b51e886461628c41b1b4d47762e0688ed5</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/android-14_r03.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:platform>
+
+    <sdk:platform>
+        <!-- Generated at Fri Mar 16 11:22:43 2012 from ics-mr1 @ 291902 -->
+        <sdk:revision>3</sdk:revision>
+        <sdk:description>Android SDK Platform 4.0.3</sdk:description>
+        <sdk:version>4.0.3</sdk:version>
+        <sdk:api-level>15</sdk:api-level>
+        <sdk:min-tools-rev>
+            <sdk:major>15</sdk:major>
+        </sdk:min-tools-rev>
+        <sdk:layoutlib>
+            <sdk:api>7</sdk:api>
+            <sdk:revision>1</sdk:revision>
+        </sdk:layoutlib>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>44414679</sdk:size>
+                <sdk:checksum type="sha1">23da24610a8da51054c5391001c51ce43a778b97</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/android-15_r03.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:platform>
+
+    <sdk:platform>
+        <!-- Generated at Thu Dec  6 10:54:05 2012 from git_jb-dev @ 543062 -->
+        <sdk:revision>4</sdk:revision>
+        <sdk:description>Android SDK Platform 4.1.2</sdk:description>
+        <sdk:version>4.1.2</sdk:version>
+        <sdk:api-level>16</sdk:api-level>
+        <sdk:min-tools-rev>
+            <sdk:major>21</sdk:major>
+        </sdk:min-tools-rev>
+        <sdk:layoutlib>
+            <sdk:api>9</sdk:api>
+            <sdk:revision>1</sdk:revision>
+        </sdk:layoutlib>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>48005140</sdk:size>
+                <sdk:checksum type="sha1">90b9157b8b45f966be97e11a22fba4591b96c2ee</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/android-16_r04.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:platform>
+
+    <sdk:platform>
+        <!-- Generated at Wed Feb 13 11:27:09 2013 from git_jb-mr1.1-dev @ 576024 -->
+        <sdk:revision>2</sdk:revision>
+        <sdk:description>Android SDK Platform 4.2.2</sdk:description>
+        <sdk:version>4.2.2</sdk:version>
+        <sdk:api-level>17</sdk:api-level>
+        <sdk:min-tools-rev>
+            <sdk:major>21</sdk:major>
+        </sdk:min-tools-rev>
+        <sdk:layoutlib>
+            <sdk:api>9</sdk:api>
+            <sdk:revision>1</sdk:revision>
+        </sdk:layoutlib>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>48057484</sdk:size>
+                <sdk:checksum type="sha1">c442c32c1b702173ab0929a74486e4f86fe528ec</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/android-17_r02.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:platform>
+
+    <sdk:platform>
+        <!-- Generated at Wed Sep 11 18:15:07 2013 from git_jb-mr2-dev @ 819563 -->
+        <sdk:revision>2</sdk:revision>
+        <sdk:description>Android SDK Platform 4.3</sdk:description>
+        <sdk:version>4.3</sdk:version>
+        <sdk:api-level>18</sdk:api-level>
+        <sdk:min-tools-rev>
+            <sdk:major>21</sdk:major>
+        </sdk:min-tools-rev>
+        <sdk:layoutlib>
+            <sdk:api>10</sdk:api>
+            <sdk:revision>1</sdk:revision>
+        </sdk:layoutlib>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>57319855</sdk:size>
+                <sdk:checksum type="sha1">62a9438d4cf6692f4d6510c27a380be195db9534</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/android-18_r02.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:platform>
+
+    <sdk:platform>
+        <!-- Generated at Fri Feb 28 18:03:43 2014 from git_klp-sdk-release @ 1035858 -->
+        <sdk:revision>3</sdk:revision>
+        <sdk:description>Android SDK Platform 4.4.2</sdk:description>
+        <sdk:version>4.4.2</sdk:version>
+        <sdk:api-level>19</sdk:api-level>
+        <sdk:min-tools-rev>
+            <sdk:major>22</sdk:major>
+        </sdk:min-tools-rev>
+        <sdk:layoutlib>
+            <sdk:api>10</sdk:api>
+            <sdk:revision>1</sdk:revision>
+        </sdk:layoutlib>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>63798840</sdk:size>
+                <sdk:checksum type="sha1">5f33d8fd36a384fe2b170035e04a29c274a9ef95</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/android-19_r03.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:platform>
+
+    <sdk:platform>
+        <!-- Generated at Mon Jun 23 19:17:42 2014 from git_klp-modular-release @ 1246132 -->
+        <sdk:revision>1</sdk:revision>
+        <sdk:description>Android SDK Platform 4.4W</sdk:description>
+        <sdk:version>4.4W</sdk:version>
+        <sdk:api-level>20</sdk:api-level>
+        <sdk:min-tools-rev>
+            <sdk:major>22</sdk:major>
+        </sdk:min-tools-rev>
+        <sdk:layoutlib>
+            <sdk:api>10</sdk:api>
+            <sdk:revision>1</sdk:revision>
+        </sdk:layoutlib>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>63548914</sdk:size>
+                <sdk:checksum type="sha1">928b1d181101a5bc06f739eb40501e1249dd4895</sdk:checksum>
+                <sdk:url>android-20_r01.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:platform>
+
+    <sdk:platform>
+        <!-- Generated at Fri Jul 11 18:20:46 2014 from git_lmp-preview-dev @ 1272903 -->
+        <sdk:revision>3</sdk:revision>
+        <sdk:description>Android SDK Platform L</sdk:description>
+        <sdk:version>L</sdk:version>
+        <sdk:api-level>20</sdk:api-level>
+        <sdk:codename>L</sdk:codename>
+        <sdk:min-tools-rev>
+            <sdk:major>22</sdk:major>
+        </sdk:min-tools-rev>
+        <sdk:layoutlib>
+            <sdk:api>11</sdk:api>
+            <sdk:revision>1</sdk:revision>
+        </sdk:layoutlib>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>69421660</sdk:size>
+                <sdk:checksum type="sha1">76b6da426db06b2e2901dbc5e02d210ba83753c4</sdk:checksum>
+                <sdk:url>android-L_r03.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-preview-license"/>
+    </sdk:platform>
+
+    <!-- SAMPLES ........................ -->
+
+    <!-- Generated on Mon Feb 22 13:39:38 PST 2010 using eclair 25887: Samples. -->
+
+    <sdk:sample>
+        <sdk:api-level>7</sdk:api-level>
+        <sdk:codename/>
+        <sdk:revision>01</sdk:revision>
+        <sdk:description>Android SDK Samples for Android API 7, revision 1</sdk:description>
+        <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>7677831</sdk:size>
+                <sdk:checksum type="sha1">51e4907f60f248ede5c58b54ce7b6ae0b473e0ca</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/samples-2.1_r01-linux.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:sample>
+
+    <!-- Generated on Tue May 11 19:15:20 PDT 2010 using froyo 36658: Samples. -->
+
+    <sdk:sample>
+        <sdk:api-level>8</sdk:api-level>
+        <sdk:codename/>
+        <sdk:revision>01</sdk:revision>
+        <sdk:description>Android SDK Samples for Android API 8, revision 1</sdk:description>
+        <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>7969716</sdk:size>
+                <sdk:checksum type="sha1">d16d8bf2dd84cedf73b98b948d66461c8f19d6fb</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/samples-2.2_r01-linux.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:sample>
+
+    <!-- Generated on Tue Nov 30 19:39:34 PST 2010 using gingerbread 79962: Samples. -->
+
+    <sdk:sample>
+        <sdk:api-level>9</sdk:api-level>
+        <sdk:codename/>
+        <sdk:revision>01</sdk:revision>
+        <sdk:description>Android SDK Samples for Android API 9, revision 1</sdk:description>
+        <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
+        <sdk:obsolete/>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>8516326</sdk:size>
+                <sdk:checksum type="sha1">36f7dd6c8b5dbb50b3cf3e3ac5209f3fe55db2aa</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/samples-2.3_r01-linux.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:sample>
+
+    <!-- Generated on Tue Feb  8 17:37:15 PST 2011 using gingerbread 102121: Samples. -->
+
+    <sdk:sample>
+        <sdk:api-level>10</sdk:api-level>
+        <sdk:codename/>
+        <sdk:revision>01</sdk:revision>
+        <sdk:description>Android SDK Samples for Android API 10, revision 1</sdk:description>
+        <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>8539583</sdk:size>
+                <sdk:checksum type="sha1">93b0c3f3bdf5b07f1f115100b4954f0665297a0d</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/samples-2.3.3_r01-linux.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:sample>
+
+    <!-- Generated on Thu Feb 17 08:45:49 PST 2011 using honeycomb 104254: Samples. -->
+
+    <sdk:sample>
+        <sdk:api-level>11</sdk:api-level>
+        <sdk:codename/>
+        <sdk:revision>01</sdk:revision>
+        <sdk:description>Android SDK Samples for Android API 11, revision 1</sdk:description>
+        <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>11976920</sdk:size>
+                <sdk:checksum type="sha1">3749ace584631270268d65bb1d0ad61b0d691682</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/samples-3.0_r01-linux.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:sample>
+
+    <!-- Generated on Wed May  4 19:49:56 PDT 2011 using honeycomb-mr1 123685: Samples. -->
+
+    <sdk:sample>
+        <sdk:api-level>12</sdk:api-level>
+        <sdk:codename/>
+        <sdk:revision>01</sdk:revision>
+        <sdk:description>Android SDK Samples for Android API 12, revision 1</sdk:description>
+        <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>12150514</sdk:size>
+                <sdk:checksum type="sha1">df0ace37cbca73373fe94080f94c71557cac73a7</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/samples-3.1_r01-linux.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:sample>
+
+    <!-- Generated on Fri Jul 15 11:52:24 PDT 2011 using honeycomb-mr2 142871: Samples. -->
+
+    <sdk:sample>
+        <sdk:api-level>13</sdk:api-level>
+        <sdk:codename/>
+        <sdk:revision>01</sdk:revision>
+        <sdk:description>Android SDK Samples for Android API 13, revision 1</sdk:description>
+        <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>12193502</sdk:size>
+                <sdk:checksum type="sha1">078bcf1abc1cb8921f3fa482c252963a782bed60</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/samples-3.2_r01-linux.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:sample>
+
+    <sdk:sample>
+        <!-- Generated at Wed Dec  7 13:48:27 2011 from git_ics-mr0 @ 234950 -->
+        <sdk:revision>2</sdk:revision>
+        <sdk:api-level>14</sdk:api-level>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>16253619</sdk:size>
+                <sdk:checksum type="sha1">1312c22ab0b650e26835cc3945d4ff8cea183416</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/samples-14_r02.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:sample>
+
+    <sdk:sample>
+        <!-- Generated at Fri Mar 16 11:27:52 2012 from ics-mr1 @ 291902 -->
+        <sdk:revision>2</sdk:revision>
+        <sdk:api-level>15</sdk:api-level>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>16366656</sdk:size>
+                <sdk:checksum type="sha1">042f368c5b09eca4d278264e6dbf9c12c5f73d1f</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/samples-15_r02.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:sample>
+
+    <sdk:sample>
+        <!-- Generated at Sun Jun 24 14:02:06 2012 from git_jb-release @ 391408 -->
+        <sdk:revision>1</sdk:revision>
+        <sdk:api-level>16</sdk:api-level>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>14729945</sdk:size>
+                <sdk:checksum type="sha1">dce3a2d41db50a381ef47ee8bddbe928520e685e</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/samples-16_r01.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:sample>
+
+    <sdk:sample>
+        <!-- Generated at Mon Nov 12 17:18:09 2012 from git_jb-mr1-dev @ 526865 -->
+        <sdk:revision>1</sdk:revision>
+        <sdk:api-level>17</sdk:api-level>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>14840030</sdk:size>
+                <sdk:checksum type="sha1">12d58cb26503610fc05bd7618c434cc6f983bc41</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/samples-17_r01.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:sample>
+
+    <sdk:sample>
+        <!-- Generated at Tue Jul 23 17:17:22 2013 from git_jb-mr2-ub-dev @ 751786 -->
+        <sdk:revision>1</sdk:revision>
+        <sdk:api-level>18</sdk:api-level>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>19897793</sdk:size>
+                <sdk:checksum type="sha1">73e879ce46c04a6e63ad1a9107018b4782945007</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/samples-18_r01.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:sample>
+
+    <sdk:sample>
+        <!-- Generated at Wed Aug 27 10:42:00 2014 from git_klp-docs @ 1377789 -->
+        <sdk:revision>6</sdk:revision>
+        <sdk:api-level>19</sdk:api-level>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>31900752</sdk:size>
+                <sdk:checksum type="sha1">19593662771934b0b1e3be56ed18d13e6489bcd4</sdk:checksum>
+                <sdk:url>samples-19_r06.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:sample>
+
+    <sdk:sample>
+        <!-- Generated at Wed Jul 23 12:59:18 2014 from git_klp-modular-mr0-release @ 1298572 -->
+        <sdk:revision>2</sdk:revision>
+        <sdk:api-level>20</sdk:api-level>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>49718791</sdk:size>
+                <sdk:checksum type="sha1">4b906c46057ee8f502b4f27c23670fd87a49d6ff</sdk:checksum>
+                <sdk:url>samples-20_r02.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:sample>
+
+    <sdk:sample>
+        <!-- Generated at Wed Aug 27 10:44:44 2014 from git_lmp-preview-dev @ 1378586 -->
+        <sdk:revision>2</sdk:revision>
+        <sdk:api-level>20</sdk:api-level>
+        <sdk:codename>L</sdk:codename>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>41182182</sdk:size>
+                <sdk:checksum type="sha1">4afc36cf3f53051881729f733fe9bb571104c48f</sdk:checksum>
+                <sdk:url>samples-L_r02.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-preview-license"/>
+    </sdk:sample>
+
+    <!-- PLATFORM-TOOLS ........................ -->
+
+    <sdk:platform-tool>
+        <!-- Generated at Mon Jun 23 19:20:39 2014 from git_lmp-preview-dev @ 1244090 -->
+        <sdk:revision>
+            <sdk:major>20</sdk:major>
+            <sdk:minor>0</sdk:minor>
+            <sdk:micro>0</sdk:micro>
+        </sdk:revision>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>1741113</sdk:size>
+                <sdk:checksum type="sha1">72c34cc6a991f53e2588f9d5487559f013bc30f9</sdk:checksum>
+                <sdk:url>platform-tools_r20-windows.zip</sdk:url>
+                <sdk:host-os>windows</sdk:host-os>
+            </sdk:archive>
+            <sdk:archive>
+                <sdk:size>1753061</sdk:size>
+                <sdk:checksum type="sha1">fb120ce85b6698b801cb4788b204693c1d682b87</sdk:checksum>
+                <sdk:url>platform-tools_r20-linux.zip</sdk:url>
+                <sdk:host-os>linux</sdk:host-os>
+            </sdk:archive>
+            <sdk:archive>
+                <sdk:size>1666257</sdk:size>
+                <sdk:checksum type="sha1">f2c65c58caf76169d9bebf25eef5c69ff99670b5</sdk:checksum>
+                <sdk:url>platform-tools_r20-macosx.zip</sdk:url>
+                <sdk:host-os>macosx</sdk:host-os>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:platform-tool>
+
+    <!-- BUILD-TOOLS ........................ -->
+
+    <sdk:build-tool>
+        <!-- Generated at Tue May 14 16:40:25 2013 from git_jb-mr1.1-dev @ 673949 -->
+        <sdk:revision>
+            <sdk:major>17</sdk:major>
+            <sdk:minor>0</sdk:minor>
+            <sdk:micro>0</sdk:micro>
+        </sdk:revision>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>11004914</sdk:size>
+                <sdk:checksum type="sha1">899897d327b0bad492d3a40d3db4d96119c15bc0</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/build-tools_r17-windows.zip</sdk:url>
+                <sdk:host-os>windows</sdk:host-os>
+            </sdk:archive>
+            <sdk:archive>
+                <sdk:size>11696007</sdk:size>
+                <sdk:checksum type="sha1">2c2872bc3806aabf16a12e3959c2183ddc866e6d</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/build-tools_r17-linux.zip</sdk:url>
+                <sdk:host-os>linux</sdk:host-os>
+            </sdk:archive>
+            <sdk:archive>
+                <sdk:size>12208114</sdk:size>
+                <sdk:checksum type="sha1">602ee709be9dbb8f179b1e4075148a57f9419930</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/build-tools_r17-macosx.zip</sdk:url>
+                <sdk:host-os>macosx</sdk:host-os>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:build-tool>
+
+    <!-- Build tools version 18.0.0 was broken for renderscript, so it has been removed -->
+
+    <sdk:build-tool>
+        <!-- Generated at Mon Jul 29 15:14:00 2013 from git_jb-mr2-dev @ 754669 -->
+        <sdk:revision>
+            <sdk:major>18</sdk:major>
+            <sdk:minor>0</sdk:minor>
+            <sdk:micro>1</sdk:micro>
+        </sdk:revision>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>15413527</sdk:size>
+                <sdk:checksum type="sha1">a6c2afd0b6289d589351956d2f5212b37014ca7d</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/build-tools_r18.0.1-windows.zip</sdk:url>
+                <sdk:host-os>windows</sdk:host-os>
+            </sdk:archive>
+            <sdk:archive>
+                <sdk:size>16627330</sdk:size>
+                <sdk:checksum type="sha1">f11618492b0d2270c332325d45d752d3656a9640</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/build-tools_r18.0.1-linux.zip</sdk:url>
+                <sdk:host-os>linux</sdk:host-os>
+            </sdk:archive>
+            <sdk:archive>
+                <sdk:size>16633121</sdk:size>
+                <sdk:checksum type="sha1">d84f5692fb44d60fc53e5b2507cebf9f24626902</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/build-tools_r18.0.1-macosx.zip</sdk:url>
+                <sdk:host-os>macosx</sdk:host-os>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:build-tool>
+
+    <sdk:build-tool>
+        <!-- Generated at Wed Sep 11 17:41:47 2013 from git_jb-mr2-dev @ 819563 -->
+        <sdk:revision>
+            <sdk:major>18</sdk:major>
+            <sdk:minor>1</sdk:minor>
+            <sdk:micro>0</sdk:micro>
+        </sdk:revision>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>19659547</sdk:size>
+                <sdk:checksum type="sha1">3a9810fc8559ab03c09378f07531e8cae2f1db30</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/build-tools_r18.1-windows.zip</sdk:url>
+                <sdk:host-os>windows</sdk:host-os>
+            </sdk:archive>
+            <sdk:archive>
+                <sdk:size>20229298</sdk:size>
+                <sdk:checksum type="sha1">f314a0599e51397f0886fe888b50dd98f2f050d8</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/build-tools_r18.1-linux.zip</sdk:url>
+                <sdk:host-os>linux</sdk:host-os>
+            </sdk:archive>
+            <sdk:archive>
+                <sdk:size>20451524</sdk:size>
+                <sdk:checksum type="sha1">16ddb299b8b43063e5bb3387ec17147c5053dfd8</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/build-tools_r18.1-macosx.zip</sdk:url>
+                <sdk:host-os>macosx</sdk:host-os>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:build-tool>
+
+    <sdk:build-tool>
+        <!-- Generated at Thu Oct 10 14:18:15 2013 from git_jb-mr2-dev @ 867478 -->
+        <sdk:revision>
+            <sdk:major>18</sdk:major>
+            <sdk:minor>1</sdk:minor>
+            <sdk:micro>1</sdk:micro>
+        </sdk:revision>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>19660000</sdk:size>
+                <sdk:checksum type="sha1">c4605066e2f851387ea70bc1442b1968bd7b4a15</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/build-tools_r18.1.1-windows.zip</sdk:url>
+                <sdk:host-os>windows</sdk:host-os>
+            </sdk:archive>
+            <sdk:archive>
+                <sdk:size>20229760</sdk:size>
+                <sdk:checksum type="sha1">68c9acbfc0cec2d51b19efaed39831a17055d998</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/build-tools_r18.1.1-linux.zip</sdk:url>
+                <sdk:host-os>linux</sdk:host-os>
+            </sdk:archive>
+            <sdk:archive>
+                <sdk:size>20452157</sdk:size>
+                <sdk:checksum type="sha1">a9d9d37f6ddf859e57abc78802a77aaa166e48d4</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/build-tools_r18.1.1-macosx.zip</sdk:url>
+                <sdk:host-os>macosx</sdk:host-os>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:build-tool>
+
+    <sdk:build-tool>
+        <!-- Generated at Mon Oct 28 23:12:03 2013 from git_klp-release @ 886418 -->
+        <sdk:revision>
+            <sdk:major>19</sdk:major>
+            <sdk:minor>0</sdk:minor>
+            <sdk:micro>0</sdk:micro>
+        </sdk:revision>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>20611447</sdk:size>
+                <sdk:checksum type="sha1">6edf505c20f5ece9c48fa0aff9a90488f9654d52</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/build-tools_r19-windows.zip</sdk:url>
+                <sdk:host-os>windows</sdk:host-os>
+            </sdk:archive>
+            <sdk:archive>
+                <sdk:size>21339943</sdk:size>
+                <sdk:checksum type="sha1">55c1a6cf632e7d346f0002b275ec41fd3137fd83</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/build-tools_r19-linux.zip</sdk:url>
+                <sdk:host-os>linux</sdk:host-os>
+            </sdk:archive>
+            <sdk:archive>
+                <sdk:size>21441270</sdk:size>
+                <sdk:checksum type="sha1">86ec1c12db1bc446b7bcaefc5cc14eb361044e90</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/build-tools_r19-macosx.zip</sdk:url>
+                <sdk:host-os>macosx</sdk:host-os>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:build-tool>
+
+    <sdk:build-tool>
+        <!-- Generated at Thu Dec  5 14:01:45 2013 from git_klp-dev @ 938007 -->
+        <sdk:revision>
+            <sdk:major>19</sdk:major>
+            <sdk:minor>0</sdk:minor>
+            <sdk:micro>1</sdk:micro>
+        </sdk:revision>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>20500648</sdk:size>
+                <sdk:checksum type="sha1">5ef422bac5b28f4ced108319ed4a6bc7050a6234</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/build-tools_r19.0.1-windows.zip</sdk:url>
+                <sdk:host-os>windows</sdk:host-os>
+            </sdk:archive>
+            <sdk:archive>
+                <sdk:size>21229048</sdk:size>
+                <sdk:checksum type="sha1">18d2312dc4368858914213087f4e61445aca4517</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/build-tools_r19.0.1-linux.zip</sdk:url>
+                <sdk:host-os>linux</sdk:host-os>
+            </sdk:archive>
+            <sdk:archive>
+                <sdk:size>21450597</sdk:size>
+                <sdk:checksum type="sha1">efaf50fb19a3edb8d03efbff76f89a249ad2920b</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/build-tools_r19.0.1-macosx.zip</sdk:url>
+                <sdk:host-os>macosx</sdk:host-os>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:build-tool>
+
+    <sdk:build-tool>
+        <!-- Generated at Wed Feb 12 12:38:29 2014 from git_klp-sdk-release @ 1009316 -->
+        <sdk:revision>
+            <sdk:major>19</sdk:major>
+            <sdk:minor>0</sdk:minor>
+            <sdk:micro>2</sdk:micro>
+        </sdk:revision>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>20621117</sdk:size>
+                <sdk:checksum type="sha1">af664672d0d709c9ae30937b1062317d3ade7f95</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/build-tools_r19.0.2-windows.zip</sdk:url>
+                <sdk:host-os>windows</sdk:host-os>
+            </sdk:archive>
+            <sdk:archive>
+                <sdk:size>21352552</sdk:size>
+                <sdk:checksum type="sha1">a03a6bdea0091aea32e1b35b90a7294c9f04e3dd</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/build-tools_r19.0.2-linux.zip</sdk:url>
+                <sdk:host-os>linux</sdk:host-os>
+            </sdk:archive>
+            <sdk:archive>
+                <sdk:size>21453726</sdk:size>
+                <sdk:checksum type="sha1">145bc43065d45f756d99d87329d899052b9a9288</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/build-tools_r19.0.2-macosx.zip</sdk:url>
+                <sdk:host-os>macosx</sdk:host-os>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:build-tool>
+
+    <sdk:build-tool>
+        <!-- Generated at Fri Feb 28 17:11:02 2014 from git_klp-sdk-release @ 1035858 -->
+        <sdk:revision>
+            <sdk:major>19</sdk:major>
+            <sdk:minor>0</sdk:minor>
+            <sdk:micro>3</sdk:micro>
+        </sdk:revision>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>20730715</sdk:size>
+                <sdk:checksum type="sha1">cb46b433b67a0a6910ff00db84be8b527ea3102f</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/build-tools_r19.0.3-windows.zip</sdk:url>
+                <sdk:host-os>windows</sdk:host-os>
+            </sdk:archive>
+            <sdk:archive>
+                <sdk:size>21462150</sdk:size>
+                <sdk:checksum type="sha1">c2d6055478e9d2d4fba476ee85f99181ddd1160c</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/build-tools_r19.0.3-linux.zip</sdk:url>
+                <sdk:host-os>linux</sdk:host-os>
+            </sdk:archive>
+            <sdk:archive>
+                <sdk:size>21563992</sdk:size>
+                <sdk:checksum type="sha1">651cf8754373b2d52e7f6aab2c52eabffe4e9ea4</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/build-tools_r19.0.3-macosx.zip</sdk:url>
+                <sdk:host-os>macosx</sdk:host-os>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:build-tool>
+
+    <sdk:build-tool>
+        <!-- Generated at Tue May  6 14:19:40 2014 from git_klp-sdk-release @ 1153987 -->
+        <sdk:revision>
+            <sdk:major>19</sdk:major>
+            <sdk:minor>1</sdk:minor>
+            <sdk:micro>0</sdk:micro>
+        </sdk:revision>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>20812533</sdk:size>
+                <sdk:checksum type="sha1">13b367fbdbff8132cb4356f716e8dc8a8df745c5</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/build-tools_r19.1-windows.zip</sdk:url>
+                <sdk:host-os>windows</sdk:host-os>
+            </sdk:archive>
+            <sdk:archive>
+                <sdk:size>21490972</sdk:size>
+                <sdk:checksum type="sha1">1ff20ac15fa47a75d00346ec12f180d531b3ca89</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/build-tools_r19.1-linux.zip</sdk:url>
+                <sdk:host-os>linux</sdk:host-os>
+            </sdk:archive>
+            <sdk:archive>
+                <sdk:size>21590160</sdk:size>
+                <sdk:checksum type="sha1">0d11aae3417de1efb4b9a0e0a7855904a61bcec1</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/build-tools_r19.1-macosx.zip</sdk:url>
+                <sdk:host-os>macosx</sdk:host-os>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:build-tool>
+
+    <sdk:build-tool>
+        <!-- Generated at Mon Jun 23 19:17:29 2014 from git_klp-modular-release @ 1246132 -->
+        <sdk:revision>
+            <sdk:major>20</sdk:major>
+            <sdk:minor>0</sdk:minor>
+            <sdk:micro>0</sdk:micro>
+        </sdk:revision>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>20828006</sdk:size>
+                <sdk:checksum type="sha1">cf20720e452b642d5eb59dabe05c0c729b36ec75</sdk:checksum>
+                <sdk:url>build-tools_r20-windows.zip</sdk:url>
+                <sdk:host-os>windows</sdk:host-os>
+            </sdk:archive>
+            <sdk:archive>
+                <sdk:size>21445463</sdk:size>
+                <sdk:checksum type="sha1">b688905526a5584d1327a662d871a635ff502758</sdk:checksum>
+                <sdk:url>build-tools_r20-linux.zip</sdk:url>
+                <sdk:host-os>linux</sdk:host-os>
+            </sdk:archive>
+            <sdk:archive>
+                <sdk:size>21650508</sdk:size>
+                <sdk:checksum type="sha1">1240f629411c108a714c4ddd756937c7fab93f83</sdk:checksum>
+                <sdk:url>build-tools_r20-macosx.zip</sdk:url>
+                <sdk:host-os>macosx</sdk:host-os>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:build-tool>
+
+    <!-- TOOLS ........................ -->
+
+    <sdk:tool>
+        <!-- Generated at Wed Jul  2 12:10:55 2014 from git_ub-tools-idea133-milestone @ 1259578 -->
+        <sdk:revision>
+            <sdk:major>23</sdk:major>
+            <sdk:minor>0</sdk:minor>
+            <sdk:micro>2</sdk:micro>
+        </sdk:revision>
+        <sdk:min-platform-tools-rev>
+            <sdk:major>20</sdk:major>
+        </sdk:min-platform-tools-rev>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>141154615</sdk:size>
+                <sdk:checksum type="sha1">0a64ec9b7777bb00ff299c94c359163ef5e443ae</sdk:checksum>
+                <sdk:url>tools_r23.0.2-windows.zip</sdk:url>
+                <sdk:host-os>windows</sdk:host-os>
+            </sdk:archive>
+            <sdk:archive>
+                <sdk:size>141930870</sdk:size>
+                <sdk:checksum type="sha1">e8a2d55d750adeaded60a3daad48e62b09aa472a</sdk:checksum>
+                <sdk:url>tools_r23.0.2-linux.zip</sdk:url>
+                <sdk:host-os>linux</sdk:host-os>
+            </sdk:archive>
+            <sdk:archive>
+                <sdk:size>90920343</sdk:size>
+                <sdk:checksum type="sha1">c46b1e173188ba82a56d6b9e349fdae4e8922bab</sdk:checksum>
+                <sdk:url>tools_r23.0.2-macosx.zip</sdk:url>
+                <sdk:host-os>macosx</sdk:host-os>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:tool>
+
+    <!-- DOCS ........................ -->
+
+    <sdk:doc>
+        <!-- Generated at Mon Jun 23 19:19:47 2014 from git_lmp-preview-release @ 1242878 -->
+        <sdk:revision>1</sdk:revision>
+        <sdk:api-level>20</sdk:api-level>
+        <sdk:codename>L</sdk:codename>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>207889084</sdk:size>
+                <sdk:checksum type="sha1">58a94248c7c960829db3d779c84534e5e783210f</sdk:checksum>
+                <sdk:url>docs-L_r01.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-preview-license"/>
+    </sdk:doc>
+
+    <!-- SOURCES ........................ -->
+
+    <sdk:source>
+        <!-- Generated at Wed Dec  7 13:48:11 2011 from git_ics-mr0 @ 234950 -->
+        <sdk:revision>1</sdk:revision>
+        <sdk:api-level>14</sdk:api-level>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>16152383</sdk:size>
+                <sdk:checksum type="sha1">eaf4ed7dcac46e68516a1b4aa5b0d9e5a39a7555</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/sources-14_r01.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:source>
+
+    <sdk:source>
+        <!-- Generated at Fri Mar 30 10:43:44 2012 from ics-mr1 @ 302030 -->
+        <sdk:revision>2</sdk:revision>
+        <sdk:api-level>15</sdk:api-level>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>16468746</sdk:size>
+                <sdk:checksum type="sha1">e5992a5747c9590783fbbdd700337bf0c9f6b1fa</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/sources-15_r02.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:source>
+
+    <sdk:source>
+        <!-- Generated at Thu Jul 19 18:39:42 2012 from git_jb-release @ 403059 -->
+        <sdk:revision>2</sdk:revision>
+        <sdk:api-level>16</sdk:api-level>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>17876720</sdk:size>
+                <sdk:checksum type="sha1">0f83c14ed333c45d962279ab5d6bc98a0269ef84</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/sources-16_r02.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:source>
+
+    <sdk:source>
+        <!-- Generated at Mon Nov 12 17:16:08 2012 from git_jb-mr1-dev @ 526865 -->
+        <sdk:revision>1</sdk:revision>
+        <sdk:api-level>17</sdk:api-level>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>18976816</sdk:size>
+                <sdk:checksum type="sha1">6f1f18cd2d2b1852d7f6892df9cee3823349d43a</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/sources-17_r01.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:source>
+
+    <sdk:source>
+        <!-- Generated at Tue Jul 23 17:18:30 2013 from git_jb-mr2-release @ 737497 -->
+        <sdk:revision>1</sdk:revision>
+        <sdk:api-level>18</sdk:api-level>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>20226735</sdk:size>
+                <sdk:checksum type="sha1">8b49fdf7433f4881a2bfb559b5dd05d8ec65fb78</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/sources-18_r01.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:source>
+
+    <sdk:source>
+        <!-- Generated at Thu Dec  5 14:04:22 2013 from git_klp-dev @ 938007 -->
+        <sdk:revision>2</sdk:revision>
+        <sdk:api-level>19</sdk:api-level>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>21819439</sdk:size>
+                <sdk:checksum type="sha1">433a1d043ef77561571250e94cb7a0ef24a202e7</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/sources-19_r02.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:source>
+
+    <sdk:source>
+        <!-- Generated at Mon Jun 23 19:18:43 2014 from git_klp-modular-release @ 1246132 -->
+        <sdk:revision>1</sdk:revision>
+        <sdk:api-level>20</sdk:api-level>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>23367603</sdk:size>
+                <sdk:checksum type="sha1">8da3e40f2625f9f7ef38b7e403f49f67226c0d76</sdk:checksum>
+                <sdk:url>sources-20_r01.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:source>
+</sdk:sdk-repository>
+
diff --git a/pkgs/development/mobile/androidenv/repository-8.xml b/pkgs/development/mobile/androidenv/repository-8.xml
deleted file mode 100644
index 46ae8aa9a7ce..000000000000
--- a/pkgs/development/mobile/androidenv/repository-8.xml
+++ /dev/null
@@ -1,1277 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<sdk:sdk-repository xmlns:sdk="http://schemas.android.com/sdk/android/repository/8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-    <sdk:license id="android-sdk-license" type="text">Terms and Conditions
-
-This is the Android Software Development Kit License Agreement.
-
-
-1. Introduction
-
-
-1.1 The Android Software Development Kit (referred to in this License Agreement as the &quot;SDK&quot; and specifically including the Android system files, packaged APIs, and Google APIs add-ons) is licensed to you subject to the terms of this License Agreement. This License Agreement forms a legally binding contract between you and Google in relation to your use of the SDK.
-
-1.2 &quot;Android&quot; means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time.
-
-1.3 &quot;Google&quot; means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.
-
-
-2. Accepting this License Agreement
-
-
-2.1 In order to use the SDK, you must first agree to this License Agreement. You may not use the SDK if you do not accept this License Agreement.
-
-2.2 By clicking to accept, you hereby agree to the terms of this License Agreement.
-
-2.3 You may not use the SDK and may not accept the License Agreement if you are a person barred from receiving the SDK under the laws of the United States or other countries including the country in which you are resident or from which you use the SDK.
-
-2.4 If you are agreeing to be bound by this License Agreement on behalf of your employer or other entity, you represent and warrant that you have full legal authority to bind your employer or such entity to this License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the SDK on behalf of your employer or other entity.
-
-
-3. SDK License from Google
-
-
-3.1 Subject to the terms of this License Agreement, Google grants you a limited, worldwide, royalty-free, non-assignable and non-exclusive license to use the SDK solely to develop applications to run on the Android platform.
-
-3.2 You agree that Google or third parties own all legal right, title and interest in and to the SDK, including any Intellectual Property Rights that subsist in the SDK. &quot;Intellectual Property Rights&quot; means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you.
-
-3.3 You may not use the SDK for any purpose not expressly permitted by this License Agreement.  Except to the extent required by applicable third party licenses, you may not: (a) copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK; or (b) load any part of the SDK onto a mobile handset or any other hardware device except a personal computer, combine any part of the SDK with other software, or distribute any software or device incorporating a part of the SDK.
-
-3.4 You agree that you will not take any actions that may cause or result in the fragmentation of Android, including but not limited to distributing, participating in the creation of, or promoting in any way a software development kit derived from the SDK.
-
-3.5 Use, reproduction and distribution of components of the SDK licensed under an open source software license are governed solely by the terms of that open source software license and not this License Agreement.
-
-3.6 You agree that the form and nature of the SDK that Google provides may change without prior notice to you and that future versions of the SDK may be incompatible with applications developed on previous versions of the SDK. You agree that Google may stop (permanently or temporarily) providing the SDK (or any features within the SDK) to you or to users generally at Google's sole discretion, without prior notice to you.
-
-3.7 Nothing in this License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features.
-
-3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the SDK.
-
-
-4. Use of the SDK by You
-
-
-4.1 Google agrees that it obtains no right, title or interest from you (or your licensors) under this License Agreement in or to any software applications that you develop using the SDK, including any intellectual property rights that subsist in those applications.
-
-4.2 You agree to use the SDK and write applications only for purposes that are permitted by (a) this License Agreement and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries).
-
-4.3 You agree that if you use the SDK to develop applications for general public users, you will protect the privacy and legal rights of those users. If the users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If the user provides your application with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, the user has given you permission to do so.
-
-4.4 You agree that you will not engage in any activity with the SDK, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of any third party including, but not limited to, Google or any mobile communications carrier.
-
-4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through Android and/or applications for Android, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so.
-
-4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under this License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach.
-
-
-5. Your Developer Credentials
-
-
-5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials.
-
-
-6. Privacy and Information
-
-
-6.1 In order to continually innovate and improve the SDK, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the SDK are being used and how they are being used. Before any of this information is collected, the SDK will notify you and seek your consent. If you withhold consent, the information will not be collected.
-
-6.2 The data collected is examined in the aggregate to improve the SDK and is maintained in accordance with Google's Privacy Policy.
-
-
-7. Third Party Applications
-
-
-7.1 If you use the SDK to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources.
-
-7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners.
-
-7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party. In that case, this License Agreement does not affect your legal relationship with these third parties.
-
-
-8. Using Android APIs
-
-
-8.1 Google Data APIs
-
-8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service.
-
-8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so.
-
-
-9. Terminating this License Agreement
-
-
-9.1 This License Agreement will continue to apply until terminated by either you or Google as set out below.
-
-9.2 If you want to terminate this License Agreement, you may do so by ceasing your use of the SDK and any relevant developer credentials.
-
-9.3 Google may at any time, terminate this License Agreement with you if:
-(A) you have breached any provision of this License Agreement; or
-(B) Google is required to do so by law; or
-(C) the partner with whom Google offered certain parts of SDK (such as APIs) to you has terminated its relationship with Google or ceased to offer certain parts of the SDK to you; or
-(D) Google decides to no longer provide the SDK or certain parts of the SDK to users in the country in which you are resident or from which you use the service, or the provision of the SDK or certain SDK services to you by Google is, in Google's sole discretion, no longer commercially viable.
-
-9.4 When this License Agreement comes to an end, all of the legal rights, obligations and liabilities that you and Google have benefited from, been subject to (or which have accrued over time whilst this License Agreement has been in force) or which are expressed to continue indefinitely, shall be unaffected by this cessation, and the provisions of paragraph 14.7 shall continue to apply to such rights, obligations and liabilities indefinitely.
-
-
-10. DISCLAIMER OF WARRANTIES
-
-
-10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE SDK IS AT YOUR SOLE RISK AND THAT THE SDK IS PROVIDED &quot;AS IS&quot; AND &quot;AS AVAILABLE&quot; WITHOUT WARRANTY OF ANY KIND FROM GOOGLE.
-
-10.2 YOUR USE OF THE SDK AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE SDK IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE.
-
-10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-
-
-11. LIMITATION OF LIABILITY
-
-
-11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING.
-
-
-12. Indemnification
-
-
-12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys fees) arising out of or accruing from (a) your use of the SDK, (b) any application you develop on the SDK that infringes any copyright, trademark, trade secret, trade dress, patent or other intellectual property right of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you with this License Agreement.
-
-
-13. Changes to the License Agreement
-
-
-13.1 Google may make changes to the License Agreement as it distributes new versions of the SDK. When these changes are made, Google will make a new version of the License Agreement available on the website where the SDK is made available.
-
-
-14. General Legal Terms
-
-
-14.1 This License Agreement constitutes the whole legal agreement between you and Google and governs your use of the SDK (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the SDK.
-
-14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in this License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google.
-
-14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of this License Agreement is invalid, then that provision will be removed from this License Agreement without affecting the rest of this License Agreement. The remaining provisions of this License Agreement will continue to be valid and enforceable.
-
-14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to this License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of this License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to this License Agreement.
-
-14.5 EXPORT RESTRICTIONS. THE SDK IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE SDK. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE.
-
-14.6 The rights granted in this License Agreement may not be assigned or transferred by either you or Google without the prior written approval of the other party. Neither you nor Google shall be permitted to delegate their responsibilities or obligations under this License Agreement without the prior written approval of the other party.
-
-14.7 This License Agreement, and your relationship with Google under this License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from this License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.
-
-November 13, 2012
-    </sdk:license>
-
-    <!-- PLATFORMS ........................ -->
-
-    <sdk:platform>
-        <sdk:version>1.1</sdk:version>
-        <sdk:api-level>2</sdk:api-level>
-        <sdk:revision>1</sdk:revision>
-        <sdk:description>Android SDK Platform 1.1_r1</sdk:description>
-        <sdk:desc-url>http://developer.android.com/sdk/android-1.1.html</sdk:desc-url>
-        <sdk:obsolete/>
-        <sdk:archives>
-            <sdk:archive arch="any" os="windows">
-                <sdk:size>46828615</sdk:size>
-                <sdk:checksum type="sha1">a4060f29ed39fc929c302836d488998c53c3002e</sdk:checksum>
-                <sdk:url>android-1.1_r1-windows.zip</sdk:url>
-            </sdk:archive>
-            <sdk:archive arch="any" os="macosx">
-                <sdk:size>45584305</sdk:size>
-                <sdk:checksum type="sha1">e21dbcff45b7356657449ebb3c7e941be2bb5ebe</sdk:checksum>
-                <sdk:url>android-1.1_r1-macosx.zip</sdk:url>
-            </sdk:archive>
-            <sdk:archive arch="any" os="linux">
-                <sdk:size>45476658</sdk:size>
-                <sdk:checksum type="sha1">c054d25c9b4c6251fa49c2f9c54336998679d3fe</sdk:checksum>
-                <sdk:url>android-1.1_r1-linux.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-        <sdk:layoutlib>
-            <sdk:api>4</sdk:api>
-        </sdk:layoutlib>
-        <sdk:uses-license ref="android-sdk-license"/>
-    </sdk:platform>
-
-    <!-- Generated manually from earlier versions -->
-
-    <sdk:platform>
-        <sdk:version>1.5</sdk:version>
-        <sdk:api-level>3</sdk:api-level>
-        <sdk:revision>04</sdk:revision>
-        <sdk:min-tools-rev>
-            <sdk:major>6</sdk:major>
-        </sdk:min-tools-rev>
-        <sdk:description>Android SDK Platform 1.5_r3</sdk:description>
-        <sdk:desc-url>http://developer.android.com/sdk/android-1.5.html</sdk:desc-url>
-        <sdk:archives>
-            <sdk:archive arch="any" os="windows">
-                <sdk:size>54624370</sdk:size>
-                <sdk:checksum type="sha1">5bb106d2e40d481edd337b0833093843e15fe49a</sdk:checksum>
-                <sdk:url>android-1.5_r04-windows.zip</sdk:url>
-            </sdk:archive>
-            <sdk:archive arch="any" os="macosx">
-                <sdk:size>52440607</sdk:size>
-                <sdk:checksum type="sha1">d3a67c2369afa48b6c3c7624de5031c262018d1e</sdk:checksum>
-                <sdk:url>android-1.5_r04-macosx.zip</sdk:url>
-            </sdk:archive>
-            <sdk:archive arch="any" os="linux">
-                <sdk:size>53348669</sdk:size>
-                <sdk:checksum type="sha1">5c134b7df5f4b8bd5b61ba93bdaebada8fa3468c</sdk:checksum>
-                <sdk:url>android-1.5_r04-linux.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-        <sdk:layoutlib>
-            <sdk:api>4</sdk:api>
-        </sdk:layoutlib>
-        <sdk:uses-license ref="android-sdk-license"/>
-    </sdk:platform>
-
-    <sdk:platform>
-        <sdk:version>1.6</sdk:version>
-        <sdk:api-level>4</sdk:api-level>
-        <sdk:codename/>
-        <sdk:revision>03</sdk:revision>
-        <sdk:min-tools-rev>
-            <sdk:major>6</sdk:major>
-        </sdk:min-tools-rev>
-        <sdk:description>Android SDK Platform 1.6_r2</sdk:description>
-        <sdk:desc-url>http://developer.android.com/sdk/android-1.6.html</sdk:desc-url>
-        <sdk:archives>
-            <sdk:archive arch="any" os="linux">
-                <sdk:size>63454485</sdk:size>
-                <sdk:checksum type="sha1">483ed088e45bbdf3444baaf9250c8b02e5383cb0</sdk:checksum>
-                <sdk:url>android-1.6_r03-linux.zip</sdk:url>
-            </sdk:archive>
-            <sdk:archive arch="any" os="macosx">
-                <sdk:size>62418496</sdk:size>
-                <sdk:checksum type="sha1">bdafad44f5df9f127979bdb21a1fdd87ee3cd625</sdk:checksum>
-                <sdk:url>android-1.6_r03-macosx.zip</sdk:url>
-            </sdk:archive>
-            <sdk:archive arch="any" os="windows">
-                <sdk:size>64654625</sdk:size>
-                <sdk:checksum type="sha1">ce0b5e4ffaf12ca4fd07c2da71a8a1ab4a03dc22</sdk:checksum>
-                <sdk:url>android-1.6_r03-windows.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-        <sdk:layoutlib>
-            <sdk:api>4</sdk:api>
-        </sdk:layoutlib>
-        <sdk:uses-license ref="android-sdk-license"/>
-    </sdk:platform>
-
-    <!-- Generated on Thu Oct 22 10:16:34 PDT 2009 using eclair-sdk 17704: Platform. Addon. Tools. Doc. -->
-
-    <sdk:platform>
-        <sdk:version>2.0</sdk:version>
-        <sdk:api-level>5</sdk:api-level>
-        <sdk:codename/>
-        <sdk:revision>01</sdk:revision>
-        <sdk:min-tools-rev>
-            <sdk:major>3</sdk:major>
-        </sdk:min-tools-rev>
-        <sdk:description>Android SDK Platform 2.0, revision 1</sdk:description>
-        <sdk:desc-url>http://developer.android.com/sdk/android-2.0.html</sdk:desc-url>
-        <sdk:obsolete/>
-        <sdk:archives>
-            <sdk:archive arch="any" os="linux">
-                <sdk:size>75095268</sdk:size>
-                <sdk:checksum type="sha1">be9be6a99ca32875c96ec7f91160ca9fce7e3c7d</sdk:checksum>
-                <sdk:url>android-2.0_r01-linux.zip</sdk:url>
-            </sdk:archive>
-            <sdk:archive arch="any" os="macosx">
-                <sdk:size>74956356</sdk:size>
-                <sdk:checksum type="sha1">2a866d0870dbba18e0503cd41e5fae988a21b314</sdk:checksum>
-                <sdk:url>android-2.0_r01-macosx.zip</sdk:url>
-            </sdk:archive>
-            <sdk:archive arch="any" os="windows">
-                <sdk:size>76288040</sdk:size>
-                <sdk:checksum type="sha1">aeb623217ff88b87216d6eb7dbc846ed53f68f57</sdk:checksum>
-                <sdk:url>android-2.0_r01-windows.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-        <sdk:layoutlib>
-            <sdk:api>4</sdk:api>
-        </sdk:layoutlib>
-        <sdk:uses-license ref="android-sdk-license"/>
-    </sdk:platform>
-
-    <!-- Generated on Mon Nov 23 14:08:02 PST 2009 using eclair-release 20723: Platform. Addon. -->
-
-    <sdk:platform>
-        <sdk:version>2.0.1</sdk:version>
-        <sdk:api-level>6</sdk:api-level>
-        <sdk:codename/>
-        <sdk:revision>01</sdk:revision>
-        <sdk:min-tools-rev>
-            <sdk:major>4</sdk:major>
-        </sdk:min-tools-rev>
-        <sdk:description>Android SDK Platform 2.0.1_r1</sdk:description>
-        <sdk:desc-url>http://developer.android.com/sdk/android-2.0.1.html</sdk:desc-url>
-        <sdk:obsolete/>
-        <sdk:archives>
-            <sdk:archive arch="any" os="linux">
-                <sdk:size>79192618</sdk:size>
-                <sdk:checksum type="sha1">ce2c971dce352aa28af06bda92a070116aa5ae1a</sdk:checksum>
-                <sdk:url>android-2.0.1_r01-linux.zip</sdk:url>
-            </sdk:archive>
-            <sdk:archive arch="any" os="macosx">
-                <sdk:size>79035527</sdk:size>
-                <sdk:checksum type="sha1">c3096f80d75a6fc8cb38ef8a18aec920e53d42c0</sdk:checksum>
-                <sdk:url>android-2.0.1_r01-macosx.zip</sdk:url>
-            </sdk:archive>
-            <sdk:archive arch="any" os="windows">
-                <sdk:size>80385601</sdk:size>
-                <sdk:checksum type="sha1">255781ebe4509d9707d0e77edda2815e2bc216e6</sdk:checksum>
-                <sdk:url>android-2.0.1_r01-windows.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-        <sdk:layoutlib>
-            <sdk:api>4</sdk:api>
-        </sdk:layoutlib>
-        <sdk:uses-license ref="android-sdk-license"/>
-    </sdk:platform>
-
-    <!-- Generated on Thu May  6 15:57:41 PDT 2010 using eclair 35983: Platform. -->
-
-    <sdk:platform>
-        <sdk:version>2.1</sdk:version>
-        <sdk:api-level>7</sdk:api-level>
-        <sdk:codename/>
-        <sdk:revision>03</sdk:revision>
-        <sdk:min-tools-rev>
-            <sdk:major>8</sdk:major>
-        </sdk:min-tools-rev>
-        <sdk:description>Android SDK Platform 2.1_r3</sdk:description>
-        <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
-        <sdk:archives>
-            <sdk:archive arch="any" os="any">
-                <sdk:size>70142829</sdk:size>
-                <sdk:checksum type="sha1">5ce51b023ac19f8738500b1007a1da5de2349a1e</sdk:checksum>
-                <sdk:url>android-2.1_r03-linux.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-        <sdk:layoutlib>
-            <sdk:api>4</sdk:api>
-        </sdk:layoutlib>
-        <sdk:uses-license ref="android-sdk-license"/>
-    </sdk:platform>
-
-    <!-- Generated on Wed Jun 30 16:13:06 PDT 2010 using froyo-release 43546: Platform. Addon. -->
-
-    <sdk:platform>
-        <sdk:version>2.2</sdk:version>
-        <sdk:api-level>8</sdk:api-level>
-        <sdk:codename/>
-        <sdk:revision>03</sdk:revision>
-        <sdk:min-tools-rev>
-            <sdk:major>8</sdk:major>
-        </sdk:min-tools-rev>
-        <sdk:description>Android SDK Platform 2.2_r3</sdk:description>
-        <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
-        <sdk:archives>
-            <sdk:archive arch="any" os="any">
-                <sdk:size>74652366</sdk:size>
-                <sdk:checksum type="sha1">231262c63eefdff8fd0386e9ccfefeb27a8f9202</sdk:checksum>
-                <sdk:url>android-2.2_r03-linux.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-        <sdk:layoutlib>
-            <sdk:api>4</sdk:api>
-        </sdk:layoutlib>
-        <sdk:uses-license ref="android-sdk-license"/>
-    </sdk:platform>
-
-    <!-- Generated on Thu Jan 20 09:40:59 PST 2011 using gingerbread-sdk-release 93351: Platform. -->
-
-    <sdk:platform>
-        <sdk:version>2.3.1</sdk:version>
-        <sdk:api-level>9</sdk:api-level>
-        <sdk:codename/>
-        <sdk:revision>02</sdk:revision>
-        <sdk:min-tools-rev>
-            <sdk:major>8</sdk:major>
-        </sdk:min-tools-rev>
-        <sdk:description>Android SDK Platform 2.3.1_r2</sdk:description>
-        <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
-        <sdk:obsolete/>
-        <sdk:archives>
-            <sdk:archive arch="any" os="any">
-                <sdk:size>78732563</sdk:size>
-                <sdk:checksum type="sha1">209f8a7a8b2cb093fce858b8b55fed3ba5206773</sdk:checksum>
-                <sdk:url>android-2.3.1_r02-linux.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-        <sdk:layoutlib>
-            <sdk:api>4</sdk:api>
-        </sdk:layoutlib>
-        <sdk:uses-license ref="android-sdk-license"/>
-    </sdk:platform>
-
-    <!-- Generated on Fri Feb  4 16:41:27 PST 2011 using gingerbread-release 101070: Platform. -->
-
-    <sdk:platform>
-        <sdk:version>2.3.3</sdk:version>
-        <sdk:api-level>10</sdk:api-level>
-        <sdk:codename/>
-        <sdk:revision>02</sdk:revision>
-        <sdk:min-tools-rev>
-            <sdk:major>8</sdk:major>
-        </sdk:min-tools-rev>
-        <sdk:description>Android SDK Platform 2.3.3._r2</sdk:description>
-        <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
-        <sdk:archives>
-            <sdk:archive arch="any" os="any">
-                <sdk:size>85470907</sdk:size>
-                <sdk:checksum type="sha1">887e37783ec32f541ea33c2c649dda648e8e6fb3</sdk:checksum>
-                <sdk:url>android-2.3.3_r02-linux.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-        <sdk:layoutlib>
-            <sdk:api>4</sdk:api>
-        </sdk:layoutlib>
-        <sdk:uses-license ref="android-sdk-license"/>
-    </sdk:platform>
-
-    <!-- Generated on Thu Feb 17 08:41:10 PST 2011 using honeycomb 104254: Platform. -->
-
-    <sdk:platform>
-        <sdk:version>3.0</sdk:version>
-        <sdk:api-level>11</sdk:api-level>
-        <sdk:codename/>
-        <sdk:revision>02</sdk:revision>
-        <sdk:min-tools-rev>
-            <sdk:major>10</sdk:major>
-        </sdk:min-tools-rev>
-        <sdk:description>Android SDK Platform 3.0, revision 2</sdk:description>
-        <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
-        <sdk:archives>
-            <sdk:archive arch="any" os="any">
-                <sdk:size>104513908</sdk:size>
-                <sdk:checksum type="sha1">2c7d4bd13f276e76f6bbd87315fe27aba351dd37</sdk:checksum>
-                <sdk:url>android-3.0_r02-linux.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-        <sdk:layoutlib>
-            <sdk:api>4</sdk:api>
-        </sdk:layoutlib>
-        <sdk:uses-license ref="android-sdk-license"/>
-    </sdk:platform>
-
-    <!-- Generated on Wed May  4 19:39:17 PDT 2011 using honeycomb-mr1 123685: Platform.
-         r2: layoutlib.jar from 3.0 to fix issue with ADT 10.
-    -->
-
-    <sdk:platform>
-        <sdk:version>3.1</sdk:version>
-        <sdk:api-level>12</sdk:api-level>
-        <sdk:codename/>
-        <sdk:revision>03</sdk:revision>
-        <sdk:min-tools-rev>
-            <sdk:major>11</sdk:major>
-        </sdk:min-tools-rev>
-        <sdk:description>Android SDK Platform 3.1, revision 3</sdk:description>
-        <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
-        <sdk:archives>
-            <sdk:archive arch="any" os="any">
-                <sdk:size>106472351</sdk:size>
-                <sdk:checksum type="sha1">4a50a6679cd95bb68bb5fc032e754cd7c5e2b1bf</sdk:checksum>
-                <sdk:url>android-3.1_r03-linux.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-        <sdk:layoutlib>
-            <sdk:api>4</sdk:api>
-        </sdk:layoutlib>
-        <sdk:uses-license ref="android-sdk-license"/>
-    </sdk:platform>
-
-    <!-- Generated on Fri Jul 15 11:50:12 PDT 2011 using honeycomb-mr2-release 140714: Platform. -->
-
-    <sdk:platform>
-        <sdk:version>3.2</sdk:version>
-        <sdk:api-level>13</sdk:api-level>
-        <sdk:codename/>
-        <sdk:revision>01</sdk:revision>
-        <sdk:min-tools-rev>
-            <sdk:major>12</sdk:major>
-        </sdk:min-tools-rev>
-        <sdk:description>Android SDK Platform 3.2, revision 1</sdk:description>
-        <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
-        <sdk:archives>
-            <sdk:archive arch="any" os="any">
-                <sdk:size>108426536</sdk:size>
-                <sdk:checksum type="sha1">6189a500a8c44ae73a439604363de93591163cd9</sdk:checksum>
-                <sdk:url>android-3.2_r01-linux.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-        <sdk:layoutlib>
-            <sdk:api>4</sdk:api>
-        </sdk:layoutlib>
-        <sdk:uses-license ref="android-sdk-license"/>
-    </sdk:platform>
-
-    <sdk:platform>
-        <!-- Generated at Thu Dec 15 16:53:11 2011 from git_ics-mr0 @ 238991 -->
-        <sdk:revision>3</sdk:revision>
-        <sdk:description>Android SDK Platform 4.0</sdk:description>
-        <sdk:version>4.0</sdk:version>
-        <sdk:api-level>14</sdk:api-level>
-        <sdk:layoutlib>
-            <sdk:api>7</sdk:api>
-            <sdk:revision>1</sdk:revision>
-        </sdk:layoutlib>
-        <sdk:archives>
-            <sdk:archive arch="any" os="any">
-                <sdk:size>45919570</sdk:size>
-                <sdk:checksum type="sha1">41ba83b51e886461628c41b1b4d47762e0688ed5</sdk:checksum>
-                <sdk:url>android-14_r03.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-        <sdk:uses-license ref="android-sdk-license"/>
-    </sdk:platform>
-
-    <sdk:platform>
-        <!-- Generated at Fri Mar 16 11:22:43 2012 from ics-mr1 @ 291902 -->
-        <sdk:revision>3</sdk:revision>
-        <sdk:description>Android SDK Platform 4.0.3</sdk:description>
-        <sdk:version>4.0.3</sdk:version>
-        <sdk:api-level>15</sdk:api-level>
-        <sdk:min-tools-rev>
-            <sdk:major>15</sdk:major>
-        </sdk:min-tools-rev>
-        <sdk:layoutlib>
-            <sdk:api>7</sdk:api>
-            <sdk:revision>1</sdk:revision>
-        </sdk:layoutlib>
-        <sdk:archives>
-            <sdk:archive arch="any" os="any">
-                <sdk:size>44414679</sdk:size>
-                <sdk:checksum type="sha1">23da24610a8da51054c5391001c51ce43a778b97</sdk:checksum>
-                <sdk:url>android-15_r03.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-        <sdk:uses-license ref="android-sdk-license"/>
-    </sdk:platform>
-
-    <sdk:platform>
-        <!-- Generated at Thu Dec  6 10:54:05 2012 from git_jb-dev @ 543062 -->
-        <sdk:revision>4</sdk:revision>
-        <sdk:description>Android SDK Platform 4.1.2</sdk:description>
-        <sdk:version>4.1.2</sdk:version>
-        <sdk:api-level>16</sdk:api-level>
-        <sdk:min-tools-rev>
-            <sdk:major>21</sdk:major>
-        </sdk:min-tools-rev>
-        <sdk:layoutlib>
-            <sdk:api>9</sdk:api>
-            <sdk:revision>1</sdk:revision>
-        </sdk:layoutlib>
-        <sdk:archives>
-            <sdk:archive arch="any" os="any">
-                <sdk:size>48005140</sdk:size>
-                <sdk:checksum type="sha1">90b9157b8b45f966be97e11a22fba4591b96c2ee</sdk:checksum>
-                <sdk:url>android-16_r04.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-        <sdk:uses-license ref="android-sdk-license"/>
-    </sdk:platform>
-
-    <sdk:platform>
-        <!-- Generated at Wed Feb 13 11:27:09 2013 from git_jb-mr1.1-dev @ 576024 -->
-        <sdk:revision>2</sdk:revision>
-        <sdk:description>Android SDK Platform 4.2.2</sdk:description>
-        <sdk:version>4.2.2</sdk:version>
-        <sdk:api-level>17</sdk:api-level>
-        <sdk:min-tools-rev>
-            <sdk:major>21</sdk:major>
-        </sdk:min-tools-rev>
-        <sdk:layoutlib>
-            <sdk:api>9</sdk:api>
-            <sdk:revision>1</sdk:revision>
-        </sdk:layoutlib>
-        <sdk:archives>
-            <sdk:archive arch="any" os="any">
-                <sdk:size>48057484</sdk:size>
-                <sdk:checksum type="sha1">c442c32c1b702173ab0929a74486e4f86fe528ec</sdk:checksum>
-                <sdk:url>android-17_r02.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-        <sdk:uses-license ref="android-sdk-license"/>
-    </sdk:platform>
-
-    <sdk:platform>
-        <!-- Generated at Wed Sep 11 18:15:07 2013 from git_jb-mr2-dev @ 819563 -->
-        <sdk:revision>2</sdk:revision>
-        <sdk:description>Android SDK Platform 4.3</sdk:description>
-        <sdk:version>4.3</sdk:version>
-        <sdk:api-level>18</sdk:api-level>
-        <sdk:min-tools-rev>
-            <sdk:major>21</sdk:major>
-        </sdk:min-tools-rev>
-        <sdk:layoutlib>
-            <sdk:api>10</sdk:api>
-            <sdk:revision>1</sdk:revision>
-        </sdk:layoutlib>
-        <sdk:archives>
-            <sdk:archive arch="any" os="any">
-                <sdk:size>57319855</sdk:size>
-                <sdk:checksum type="sha1">62a9438d4cf6692f4d6510c27a380be195db9534</sdk:checksum>
-                <sdk:url>android-18_r02.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-        <sdk:uses-license ref="android-sdk-license"/>
-    </sdk:platform>
-
-    <sdk:platform>
-        <!-- Generated at Mon Oct 28 23:34:31 2013 from git_klp-release @ 892118 -->
-        <sdk:revision>1</sdk:revision>
-        <sdk:description>Android SDK Platform 4.4</sdk:description>
-        <sdk:version>4.4</sdk:version>
-        <sdk:api-level>19</sdk:api-level>
-        <sdk:min-tools-rev>
-            <sdk:major>22</sdk:major>
-        </sdk:min-tools-rev>
-        <sdk:layoutlib>
-            <sdk:api>10</sdk:api>
-            <sdk:revision>1</sdk:revision>
-        </sdk:layoutlib>
-        <sdk:archives>
-            <sdk:archive arch="any" os="any">
-                <sdk:size>59279956</sdk:size>
-                <sdk:checksum type="sha1">96281811998272dce46e8285d15fce444a3d5a96</sdk:checksum>
-                <sdk:url>android-19_r01.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-        <sdk:uses-license ref="android-sdk-license"/>
-    </sdk:platform>
-
-
-    <!-- SYSTEM IMAGES ........................ -->
-
-    <sdk:system-image>
-        <!-- Generated at Wed Dec  7 13:47:01 2011 from git_ics-mr0 @ 229537 -->
-        <sdk:revision>2</sdk:revision>
-        <sdk:description>Android SDK Platform 4.0</sdk:description>
-        <sdk:api-level>14</sdk:api-level>
-        <sdk:abi>armeabi-v7a</sdk:abi>
-        <sdk:archives>
-            <sdk:archive arch="any" os="any">
-                <sdk:size>99621822</sdk:size>
-                <sdk:checksum type="sha1">d8991b0c06b18d7d6ed4169d67460ee1add6661b</sdk:checksum>
-                <sdk:url>sysimg_armv7a-14_r02.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-        <sdk:uses-license ref="android-sdk-license"/>
-    </sdk:system-image>
-
-    <sdk:system-image>
-        <!-- Generated at Fri Mar 30 10:43:23 2012 from ics-mr1 @ 302030 -->
-        <sdk:revision>2</sdk:revision>
-        <sdk:description>Android SDK Platform 4.0.3</sdk:description>
-        <sdk:api-level>15</sdk:api-level>
-        <sdk:abi>armeabi-v7a</sdk:abi>
-        <sdk:archives>
-            <sdk:archive arch="any" os="any">
-                <sdk:size>96227377</sdk:size>
-                <sdk:checksum type="sha1">1bf977d6cb4e0ad38dceac0c4863d1caa21f326e</sdk:checksum>
-                <sdk:url>sysimg_armv7a-15_r02.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-        <sdk:uses-license ref="android-sdk-license"/>
-    </sdk:system-image>
-
-    <sdk:system-image>
-        <!-- Generated at Tue Oct  9 13:43:08 2012 from git_jb-dev @ 495790 -->
-        <sdk:revision>3</sdk:revision>
-        <sdk:description>Android SDK Platform 4.1</sdk:description>
-        <sdk:api-level>16</sdk:api-level>
-        <sdk:abi>armeabi-v7a</sdk:abi>
-        <sdk:archives>
-            <sdk:archive arch="any" os="any">
-                <sdk:size>112528368</sdk:size>
-                <sdk:checksum type="sha1">d1cddb23f17aad5821a089c403d4cddad2cf9ef7</sdk:checksum>
-                <sdk:url>sysimg_armv7a-16_r03.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-        <sdk:uses-license ref="android-sdk-license"/>
-    </sdk:system-image>
-
-    <sdk:system-image>
-        <!-- Generated at Wed Feb 13 11:29:12 2013 from git_jb-mr1.1-dev @ 576024 -->
-        <sdk:revision>2</sdk:revision>
-        <sdk:description>Android SDK Platform 4.2.2</sdk:description>
-        <sdk:api-level>17</sdk:api-level>
-        <sdk:abi>armeabi-v7a</sdk:abi>
-        <sdk:archives>
-            <sdk:archive arch="any" os="any">
-                <sdk:size>116553808</sdk:size>
-                <sdk:checksum type="sha1">1c321cda1af793b84d47d1a8d15f85444d265e3c</sdk:checksum>
-                <sdk:url>sysimg_armv7a-17_r02.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-        <sdk:uses-license ref="android-sdk-license"/>
-    </sdk:system-image>
-
-    <sdk:system-image>
-        <!-- Generated at Mon Aug 12 12:43:28 2013 from git_jb-mr2-dev @ 774058 -->
-        <sdk:revision>2</sdk:revision>
-        <sdk:description>Android SDK Platform 4.3</sdk:description>
-        <sdk:api-level>18</sdk:api-level>
-        <sdk:abi>armeabi-v7a</sdk:abi>
-        <sdk:archives>
-            <sdk:archive arch="any" os="any">
-                <sdk:size>125457135</sdk:size>
-                <sdk:checksum type="sha1">4a1a93200210d8c42793324362868846f67401ab</sdk:checksum>
-                <sdk:url>sysimg_armv7a-18_r02.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-        <sdk:uses-license ref="android-sdk-license"/>
-    </sdk:system-image>
-
-    <sdk:system-image>
-        <!-- Generated at Mon Oct 28 23:36:43 2013 from git_klp-release @ 892118 -->
-        <sdk:revision>1</sdk:revision>
-        <sdk:description>Android SDK Platform 4.4</sdk:description>
-        <sdk:api-level>19</sdk:api-level>
-        <sdk:abi>armeabi-v7a</sdk:abi>
-        <sdk:archives>
-            <sdk:archive arch="any" os="any">
-                <sdk:size>155838103</sdk:size>
-                <sdk:checksum type="sha1">12dd1187dfd953b1ffcef5067d94578590f9e600</sdk:checksum>
-                <sdk:url>sysimg_armv7a-19_r01.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-        <sdk:uses-license ref="android-sdk-license"/>
-    </sdk:system-image>
-
-
-    <!-- SAMPLES ........................ -->
-
-    <!-- Generated on Mon Feb 22 13:39:38 PST 2010 using eclair 25887: Samples. -->
-
-    <sdk:sample>
-        <sdk:api-level>7</sdk:api-level>
-        <sdk:codename/>
-        <sdk:revision>01</sdk:revision>
-        <sdk:description>Android SDK Samples for Android API 7, revision 1</sdk:description>
-        <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
-        <sdk:archives>
-            <sdk:archive arch="any" os="any">
-                <sdk:size>7677831</sdk:size>
-                <sdk:checksum type="sha1">51e4907f60f248ede5c58b54ce7b6ae0b473e0ca</sdk:checksum>
-                <sdk:url>samples-2.1_r01-linux.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-        <sdk:uses-license ref="android-sdk-license"/>
-    </sdk:sample>
-
-    <!-- Generated on Tue May 11 19:15:20 PDT 2010 using froyo 36658: Samples. -->
-
-    <sdk:sample>
-        <sdk:api-level>8</sdk:api-level>
-        <sdk:codename/>
-        <sdk:revision>01</sdk:revision>
-        <sdk:description>Android SDK Samples for Android API 8, revision 1</sdk:description>
-        <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
-        <sdk:archives>
-            <sdk:archive arch="any" os="any">
-                <sdk:size>7969716</sdk:size>
-                <sdk:checksum type="sha1">d16d8bf2dd84cedf73b98b948d66461c8f19d6fb</sdk:checksum>
-                <sdk:url>samples-2.2_r01-linux.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-        <sdk:uses-license ref="android-sdk-license"/>
-    </sdk:sample>
-
-    <!-- Generated on Tue Nov 30 19:39:34 PST 2010 using gingerbread 79962: Samples. -->
-
-    <sdk:sample>
-        <sdk:api-level>9</sdk:api-level>
-        <sdk:codename/>
-        <sdk:revision>01</sdk:revision>
-        <sdk:description>Android SDK Samples for Android API 9, revision 1</sdk:description>
-        <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
-        <sdk:obsolete/>
-        <sdk:archives>
-            <sdk:archive arch="any" os="any">
-                <sdk:size>8516326</sdk:size>
-                <sdk:checksum type="sha1">36f7dd6c8b5dbb50b3cf3e3ac5209f3fe55db2aa</sdk:checksum>
-                <sdk:url>samples-2.3_r01-linux.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-        <sdk:uses-license ref="android-sdk-license"/>
-    </sdk:sample>
-
-    <!-- Generated on Tue Feb  8 17:37:15 PST 2011 using gingerbread 102121: Samples. -->
-
-    <sdk:sample>
-        <sdk:api-level>10</sdk:api-level>
-        <sdk:codename/>
-        <sdk:revision>01</sdk:revision>
-        <sdk:description>Android SDK Samples for Android API 10, revision 1</sdk:description>
-        <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
-        <sdk:archives>
-            <sdk:archive arch="any" os="any">
-                <sdk:size>8539583</sdk:size>
-                <sdk:checksum type="sha1">93b0c3f3bdf5b07f1f115100b4954f0665297a0d</sdk:checksum>
-                <sdk:url>samples-2.3.3_r01-linux.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-        <sdk:uses-license ref="android-sdk-license"/>
-    </sdk:sample>
-
-    <!-- Generated on Thu Feb 17 08:45:49 PST 2011 using honeycomb 104254: Samples. -->
-
-    <sdk:sample>
-        <sdk:api-level>11</sdk:api-level>
-        <sdk:codename/>
-        <sdk:revision>01</sdk:revision>
-        <sdk:description>Android SDK Samples for Android API 11, revision 1</sdk:description>
-        <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
-        <sdk:archives>
-            <sdk:archive arch="any" os="any">
-                <sdk:size>11976920</sdk:size>
-                <sdk:checksum type="sha1">3749ace584631270268d65bb1d0ad61b0d691682</sdk:checksum>
-                <sdk:url>samples-3.0_r01-linux.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-        <sdk:uses-license ref="android-sdk-license"/>
-    </sdk:sample>
-
-    <!-- Generated on Wed May  4 19:49:56 PDT 2011 using honeycomb-mr1 123685: Samples. -->
-
-    <sdk:sample>
-        <sdk:api-level>12</sdk:api-level>
-        <sdk:codename/>
-        <sdk:revision>01</sdk:revision>
-        <sdk:description>Android SDK Samples for Android API 12, revision 1</sdk:description>
-        <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
-        <sdk:archives>
-            <sdk:archive arch="any" os="any">
-                <sdk:size>12150514</sdk:size>
-                <sdk:checksum type="sha1">df0ace37cbca73373fe94080f94c71557cac73a7</sdk:checksum>
-                <sdk:url>samples-3.1_r01-linux.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-        <sdk:uses-license ref="android-sdk-license"/>
-    </sdk:sample>
-
-    <!-- Generated on Fri Jul 15 11:52:24 PDT 2011 using honeycomb-mr2 142871: Samples. -->
-
-    <sdk:sample>
-        <sdk:api-level>13</sdk:api-level>
-        <sdk:codename/>
-        <sdk:revision>01</sdk:revision>
-        <sdk:description>Android SDK Samples for Android API 13, revision 1</sdk:description>
-        <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
-        <sdk:archives>
-            <sdk:archive arch="any" os="any">
-                <sdk:size>12193502</sdk:size>
-                <sdk:checksum type="sha1">078bcf1abc1cb8921f3fa482c252963a782bed60</sdk:checksum>
-                <sdk:url>samples-3.2_r01-linux.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-        <sdk:uses-license ref="android-sdk-license"/>
-    </sdk:sample>
-
-    <sdk:sample>
-        <!-- Generated at Wed Dec  7 13:48:27 2011 from git_ics-mr0 @ 234950 -->
-        <sdk:revision>2</sdk:revision>
-        <sdk:api-level>14</sdk:api-level>
-        <sdk:archives>
-            <sdk:archive arch="any" os="any">
-                <sdk:size>16253619</sdk:size>
-                <sdk:checksum type="sha1">1312c22ab0b650e26835cc3945d4ff8cea183416</sdk:checksum>
-                <sdk:url>samples-14_r02.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-        <sdk:uses-license ref="android-sdk-license"/>
-    </sdk:sample>
-
-    <sdk:sample>
-        <!-- Generated at Fri Mar 16 11:27:52 2012 from ics-mr1 @ 291902 -->
-        <sdk:revision>2</sdk:revision>
-        <sdk:api-level>15</sdk:api-level>
-        <sdk:archives>
-            <sdk:archive arch="any" os="any">
-                <sdk:size>16366656</sdk:size>
-                <sdk:checksum type="sha1">042f368c5b09eca4d278264e6dbf9c12c5f73d1f</sdk:checksum>
-                <sdk:url>samples-15_r02.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-        <sdk:uses-license ref="android-sdk-license"/>
-    </sdk:sample>
-
-    <sdk:sample>
-        <!-- Generated at Sun Jun 24 14:02:06 2012 from git_jb-release @ 391408 -->
-        <sdk:revision>1</sdk:revision>
-        <sdk:api-level>16</sdk:api-level>
-        <sdk:archives>
-            <sdk:archive arch="any" os="any">
-                <sdk:size>14729945</sdk:size>
-                <sdk:checksum type="sha1">dce3a2d41db50a381ef47ee8bddbe928520e685e</sdk:checksum>
-                <sdk:url>samples-16_r01.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-        <sdk:uses-license ref="android-sdk-license"/>
-    </sdk:sample>
-
-    <sdk:sample>
-        <!-- Generated at Mon Nov 12 17:18:09 2012 from git_jb-mr1-dev @ 526865 -->
-        <sdk:revision>1</sdk:revision>
-        <sdk:api-level>17</sdk:api-level>
-        <sdk:archives>
-            <sdk:archive arch="any" os="any">
-                <sdk:size>14840030</sdk:size>
-                <sdk:checksum type="sha1">12d58cb26503610fc05bd7618c434cc6f983bc41</sdk:checksum>
-                <sdk:url>samples-17_r01.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-        <sdk:uses-license ref="android-sdk-license"/>
-    </sdk:sample>
-
-    <sdk:sample>
-        <!-- Generated at Tue Jul 23 17:17:22 2013 from git_jb-mr2-ub-dev @ 751786 -->
-        <sdk:revision>1</sdk:revision>
-        <sdk:api-level>18</sdk:api-level>
-        <sdk:archives>
-            <sdk:archive arch="any" os="any">
-                <sdk:size>19897793</sdk:size>
-                <sdk:checksum type="sha1">73e879ce46c04a6e63ad1a9107018b4782945007</sdk:checksum>
-                <sdk:url>samples-18_r01.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-        <sdk:uses-license ref="android-sdk-license"/>
-    </sdk:sample>
-
-    <sdk:sample>
-        <!-- Generated at Wed Oct 30 20:26:32 2013 from git_klp-dev @ 896074 -->
-        <sdk:revision>1</sdk:revision>
-        <sdk:api-level>19</sdk:api-level>
-        <sdk:archives>
-            <sdk:archive arch="any" os="any">
-                <sdk:size>20697510</sdk:size>
-                <sdk:checksum type="sha1">c2007694b5e5ad6737f647db8160155d5258cb7f</sdk:checksum>
-                <sdk:url>samples-19_r01.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-        <sdk:uses-license ref="android-sdk-license"/>
-    </sdk:sample>
-
-    <!-- PLATFORM-TOOLS ........................ -->
-
-    <sdk:platform-tool>
-        <!-- Generated at Mon Oct 28 23:35:14 2013 from git_klp-release @ 886418 -->
-        <sdk:revision>
-            <sdk:major>19</sdk:major>
-            <sdk:minor>0</sdk:minor>
-            <sdk:micro>0</sdk:micro>
-        </sdk:revision>
-        <sdk:archives>
-            <sdk:archive arch="any" os="windows">
-                <sdk:size>1116358</sdk:size>
-                <sdk:checksum type="sha1">755dcb5b5b72bbca90dd055eec4c8d0b1fce7cfd</sdk:checksum>
-                <sdk:url>platform-tools_r19-windows.zip</sdk:url>
-            </sdk:archive>
-            <sdk:archive arch="any" os="linux">
-                <sdk:size>1172749</sdk:size>
-                <sdk:checksum type="sha1">66ee37daf8a2a8f1aa8939ccd4093658e30aa49b</sdk:checksum>
-                <sdk:url>platform-tools_r19-linux.zip</sdk:url>
-            </sdk:archive>
-            <sdk:archive arch="any" os="macosx">
-                <sdk:size>1120849</sdk:size>
-                <sdk:checksum type="sha1">69af30f488163dfc3da8cef1bb6cc7e8a6df5681</sdk:checksum>
-                <sdk:url>platform-tools_r19-macosx.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-        <sdk:uses-license ref="android-sdk-license"/>
-    </sdk:platform-tool>
-
-    <!-- BUILD-TOOLS ........................ -->
-
-    <sdk:build-tool>
-        <!-- Generated at Tue May 14 16:40:25 2013 from git_jb-mr1.1-dev @ 673949 -->
-        <sdk:revision>
-            <sdk:major>17</sdk:major>
-            <sdk:minor>0</sdk:minor>
-            <sdk:micro>0</sdk:micro>
-        </sdk:revision>
-        <sdk:archives>
-            <sdk:archive arch="any" os="windows">
-                <sdk:size>11004914</sdk:size>
-                <sdk:checksum type="sha1">899897d327b0bad492d3a40d3db4d96119c15bc0</sdk:checksum>
-                <sdk:url>build-tools_r17-windows.zip</sdk:url>
-            </sdk:archive>
-            <sdk:archive arch="any" os="linux">
-                <sdk:size>11696007</sdk:size>
-                <sdk:checksum type="sha1">2c2872bc3806aabf16a12e3959c2183ddc866e6d</sdk:checksum>
-                <sdk:url>build-tools_r17-linux.zip</sdk:url>
-            </sdk:archive>
-            <sdk:archive arch="any" os="macosx">
-                <sdk:size>12208114</sdk:size>
-                <sdk:checksum type="sha1">602ee709be9dbb8f179b1e4075148a57f9419930</sdk:checksum>
-                <sdk:url>build-tools_r17-macosx.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-        <sdk:uses-license ref="android-sdk-license"/>
-    </sdk:build-tool>
-
-    <!-- Build tools version 18.0.0 was broken for renderscript, so it has been removed -->
-
-    <sdk:build-tool>
-        <!-- Generated at Mon Jul 29 15:14:00 2013 from git_jb-mr2-dev @ 754669 -->
-        <sdk:revision>
-            <sdk:major>18</sdk:major>
-            <sdk:minor>0</sdk:minor>
-            <sdk:micro>1</sdk:micro>
-        </sdk:revision>
-        <sdk:archives>
-            <sdk:archive arch="any" os="windows">
-                <sdk:size>15413527</sdk:size>
-                <sdk:checksum type="sha1">a6c2afd0b6289d589351956d2f5212b37014ca7d</sdk:checksum>
-                <sdk:url>build-tools_r18.0.1-windows.zip</sdk:url>
-            </sdk:archive>
-            <sdk:archive arch="any" os="linux">
-                <sdk:size>16627330</sdk:size>
-                <sdk:checksum type="sha1">f11618492b0d2270c332325d45d752d3656a9640</sdk:checksum>
-                <sdk:url>build-tools_r18.0.1-linux.zip</sdk:url>
-            </sdk:archive>
-            <sdk:archive arch="any" os="macosx">
-                <sdk:size>16633121</sdk:size>
-                <sdk:checksum type="sha1">d84f5692fb44d60fc53e5b2507cebf9f24626902</sdk:checksum>
-                <sdk:url>build-tools_r18.0.1-macosx.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-        <sdk:uses-license ref="android-sdk-license"/>
-    </sdk:build-tool>
-
-    <sdk:build-tool>
-        <!-- Generated at Wed Sep 11 17:41:47 2013 from git_jb-mr2-dev @ 819563 -->
-        <sdk:revision>
-            <sdk:major>18</sdk:major>
-            <sdk:minor>1</sdk:minor>
-            <sdk:micro>0</sdk:micro>
-        </sdk:revision>
-        <sdk:archives>
-            <sdk:archive arch="any" os="windows">
-                <sdk:size>19659547</sdk:size>
-                <sdk:checksum type="sha1">3a9810fc8559ab03c09378f07531e8cae2f1db30</sdk:checksum>
-                <sdk:url>build-tools_r18.1-windows.zip</sdk:url>
-            </sdk:archive>
-            <sdk:archive arch="any" os="linux">
-                <sdk:size>20229298</sdk:size>
-                <sdk:checksum type="sha1">f314a0599e51397f0886fe888b50dd98f2f050d8</sdk:checksum>
-                <sdk:url>build-tools_r18.1-linux.zip</sdk:url>
-            </sdk:archive>
-            <sdk:archive arch="any" os="macosx">
-                <sdk:size>20451524</sdk:size>
-                <sdk:checksum type="sha1">16ddb299b8b43063e5bb3387ec17147c5053dfd8</sdk:checksum>
-                <sdk:url>build-tools_r18.1-macosx.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-        <sdk:uses-license ref="android-sdk-license"/>
-    </sdk:build-tool>
-
-    <sdk:build-tool>
-        <!-- Generated at Thu Oct 10 14:18:15 2013 from git_jb-mr2-dev @ 867478 -->
-        <sdk:revision>
-            <sdk:major>18</sdk:major>
-            <sdk:minor>1</sdk:minor>
-            <sdk:micro>1</sdk:micro>
-        </sdk:revision>
-        <sdk:archives>
-            <sdk:archive arch="any" os="windows">
-                <sdk:size>19660000</sdk:size>
-                <sdk:checksum type="sha1">c4605066e2f851387ea70bc1442b1968bd7b4a15</sdk:checksum>
-                <sdk:url>build-tools_r18.1.1-windows.zip</sdk:url>
-            </sdk:archive>
-            <sdk:archive arch="any" os="linux">
-                <sdk:size>20229760</sdk:size>
-                <sdk:checksum type="sha1">68c9acbfc0cec2d51b19efaed39831a17055d998</sdk:checksum>
-                <sdk:url>build-tools_r18.1.1-linux.zip</sdk:url>
-            </sdk:archive>
-            <sdk:archive arch="any" os="macosx">
-                <sdk:size>20452157</sdk:size>
-                <sdk:checksum type="sha1">a9d9d37f6ddf859e57abc78802a77aaa166e48d4</sdk:checksum>
-                <sdk:url>build-tools_r18.1.1-macosx.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-        <sdk:uses-license ref="android-sdk-license"/>
-    </sdk:build-tool>
-
-    <sdk:build-tool>
-        <!-- Generated at Mon Oct 28 23:12:03 2013 from git_klp-release @ 886418 -->
-        <sdk:revision>
-            <sdk:major>19</sdk:major>
-            <sdk:minor>0</sdk:minor>
-            <sdk:micro>0</sdk:micro>
-        </sdk:revision>
-        <sdk:archives>
-            <sdk:archive arch="any" os="windows">
-                <sdk:size>20611447</sdk:size>
-                <sdk:checksum type="sha1">6edf505c20f5ece9c48fa0aff9a90488f9654d52</sdk:checksum>
-                <sdk:url>build-tools_r19-windows.zip</sdk:url>
-            </sdk:archive>
-            <sdk:archive arch="any" os="linux">
-                <sdk:size>21339943</sdk:size>
-                <sdk:checksum type="sha1">55c1a6cf632e7d346f0002b275ec41fd3137fd83</sdk:checksum>
-                <sdk:url>build-tools_r19-linux.zip</sdk:url>
-            </sdk:archive>
-            <sdk:archive arch="any" os="macosx">
-                <sdk:size>21441270</sdk:size>
-                <sdk:checksum type="sha1">86ec1c12db1bc446b7bcaefc5cc14eb361044e90</sdk:checksum>
-                <sdk:url>build-tools_r19-macosx.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-        <sdk:uses-license ref="android-sdk-license"/>
-    </sdk:build-tool>
-
-    <!-- TOOLS ........................ -->
-
-    <sdk:tool>
-        <!-- Generated at Mon Oct 28 23:45:30 2013 from git_mirror-aosp-tools_r22.2 @ 887826 -->
-        <sdk:revision>
-            <sdk:major>22</sdk:major>
-            <sdk:minor>3</sdk:minor>
-        </sdk:revision>
-        <sdk:min-platform-tools-rev>
-            <sdk:major>18</sdk:major>
-        </sdk:min-platform-tools-rev>
-        <sdk:archives>
-            <sdk:archive arch="any" os="windows">
-                <sdk:size>108726734</sdk:size>
-                <sdk:checksum type="sha1">1cdc825c9a84ccf69b4a6386076a881d962dd7a9</sdk:checksum>
-                <sdk:url>tools_r22.3-windows.zip</sdk:url>
-            </sdk:archive>
-            <sdk:archive arch="any" os="linux">
-                <sdk:size>101224750</sdk:size>
-                <sdk:checksum type="sha1">f76251916a23cb3d85e579f01cc6711a334f9064</sdk:checksum>
-                <sdk:url>tools_r22.3-linux.zip</sdk:url>
-            </sdk:archive>
-            <sdk:archive arch="any" os="macosx">
-                <sdk:size>74859563</sdk:size>
-                <sdk:checksum type="sha1">697d7f6fa44f02e6894d0eeb948ea97e3cdc8c3c</sdk:checksum>
-                <sdk:url>tools_r22.3-macosx.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-        <sdk:uses-license ref="android-sdk-license"/>
-    </sdk:tool>
-
-    <!-- DOCS ........................ -->
-
-    <sdk:doc>
-        <!-- Generated at Wed Oct 30 22:52:09 2013 from git_klp-dev @ 896129 -->
-        <sdk:revision>1</sdk:revision>
-        <sdk:api-level>19</sdk:api-level>
-        <sdk:archives>
-            <sdk:archive arch="any" os="any">
-                <sdk:size>181765706</sdk:size>
-                <sdk:checksum type="sha1">6c92bb045f75a2eabfbdc3e26ff64ce0a7a2b3fc</sdk:checksum>
-                <sdk:url>docs-19_r01.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-        <sdk:uses-license ref="android-sdk-license"/>
-    </sdk:doc>
-
-    <!-- SOURCES ........................ -->
-
-    <sdk:source>
-        <!-- Generated at Wed Dec  7 13:48:11 2011 from git_ics-mr0 @ 234950 -->
-        <sdk:revision>1</sdk:revision>
-        <sdk:api-level>14</sdk:api-level>
-        <sdk:archives>
-            <sdk:archive arch="any" os="any">
-                <sdk:size>16152383</sdk:size>
-                <sdk:checksum type="sha1">eaf4ed7dcac46e68516a1b4aa5b0d9e5a39a7555</sdk:checksum>
-                <sdk:url>sources-14_r01.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-        <sdk:uses-license ref="android-sdk-license"/>
-    </sdk:source>
-
-    <sdk:source>
-        <!-- Generated at Fri Mar 30 10:43:44 2012 from ics-mr1 @ 302030 -->
-        <sdk:revision>2</sdk:revision>
-        <sdk:api-level>15</sdk:api-level>
-        <sdk:archives>
-            <sdk:archive arch="any" os="any">
-                <sdk:size>16468746</sdk:size>
-                <sdk:checksum type="sha1">e5992a5747c9590783fbbdd700337bf0c9f6b1fa</sdk:checksum>
-                <sdk:url>sources-15_r02.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-        <sdk:uses-license ref="android-sdk-license"/>
-    </sdk:source>
-
-    <sdk:source>
-        <!-- Generated at Thu Jul 19 18:39:42 2012 from git_jb-release @ 403059 -->
-        <sdk:revision>2</sdk:revision>
-        <sdk:api-level>16</sdk:api-level>
-        <sdk:archives>
-            <sdk:archive arch="any" os="any">
-                <sdk:size>17876720</sdk:size>
-                <sdk:checksum type="sha1">0f83c14ed333c45d962279ab5d6bc98a0269ef84</sdk:checksum>
-                <sdk:url>sources-16_r02.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-        <sdk:uses-license ref="android-sdk-license"/>
-    </sdk:source>
-
-    <sdk:source>
-        <!-- Generated at Mon Nov 12 17:16:08 2012 from git_jb-mr1-dev @ 526865 -->
-        <sdk:revision>1</sdk:revision>
-        <sdk:api-level>17</sdk:api-level>
-        <sdk:archives>
-            <sdk:archive arch="any" os="any">
-                <sdk:size>18976816</sdk:size>
-                <sdk:checksum type="sha1">6f1f18cd2d2b1852d7f6892df9cee3823349d43a</sdk:checksum>
-                <sdk:url>sources-17_r01.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-        <sdk:uses-license ref="android-sdk-license"/>
-    </sdk:source>
-
-    <sdk:source>
-        <!-- Generated at Tue Jul 23 17:18:30 2013 from git_jb-mr2-release @ 737497 -->
-        <sdk:revision>1</sdk:revision>
-        <sdk:api-level>18</sdk:api-level>
-        <sdk:archives>
-            <sdk:archive arch="any" os="any">
-                <sdk:size>20226735</sdk:size>
-                <sdk:checksum type="sha1">8b49fdf7433f4881a2bfb559b5dd05d8ec65fb78</sdk:checksum>
-                <sdk:url>sources-18_r01.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-        <sdk:uses-license ref="android-sdk-license"/>
-    </sdk:source>
-
-    <sdk:source>
-        <!-- Generated at Mon Oct 28 23:37:07 2013 from git_klp-release @ 892118 -->
-        <sdk:revision>1</sdk:revision>
-        <sdk:api-level>19</sdk:api-level>
-        <sdk:archives>
-            <sdk:archive arch="any" os="any">
-                <sdk:size>21656670</sdk:size>
-                <sdk:checksum type="sha1">91d9f5f4117723eecc4434b7de0e7f6295ea0508</sdk:checksum>
-                <sdk:url>sources-19_r01.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-        <sdk:uses-license ref="android-sdk-license"/>
-    </sdk:source>
-</sdk:sdk-repository>
diff --git a/pkgs/development/mobile/androidenv/sys-img-mips.xml b/pkgs/development/mobile/androidenv/sys-img-mips.xml
deleted file mode 100644
index c839d283f4ea..000000000000
--- a/pkgs/development/mobile/androidenv/sys-img-mips.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<sdk:sdk-sys-img xmlns:sdk="http://schemas.android.com/sdk/android/sys-img/1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-    <sdk:license id="mips-android-sysimage-license" type="text">
-    <![CDATA[
-MIPS Technologies, Inc. (“MIPS”) Internal Evaluation License Agreement for MIPS Android™ System Images for Android Software Development Kit (SDK):
-This Internal Evaluation License Agreement (this "Agreement") is entered into by and between MIPS and you (as an individual developer or a legal entity -- identified below as “Recipient”). MIPS shall make the Evaluation Software available to Recipient as described in accordance with the terms and conditions set forth below.
- 
-By clicking on the “Accept” button, downloading, installing, or otherwise using the Evaluation Materials (defined below), you agree to be bound by the terms of this Agreement effective as of the date you click “Accept” (the “Effective Date”), and if doing so on behalf of an entity, you represent that you are authorized to bind the entity to the terms and conditions of this Agreement. If you do not agree to be bound by the terms and conditions of this Agreement, do not download, install, or use the Evaluation Materials.
- 
-1. DEFINITIONS. These terms shall have the following meanings:
- 
-1.1 “MIPS” shall mean MIPS Technologies, Inc., a Delaware corporation having a principal place of business at: 955 East Arques Ave., Sunnyvale, CA 94085
- 
-1.2 “Evaluation Software” shall mean MIPS Android™ emulator system images for Android Software Development Kit (SDK), as made available to Recipient.
- 
-1.3 “Evaluation Materials" means, collectively, the Evaluation Software (in source and/or object code form) and documentation (including, without limitation, any design documents, specifications, reference manuals, and other related materials) related to the Evaluation Software as made available to Recipient.
- 
-1.4 “Open Source Software” means any software that requires (as a condition of use, modification and/or distribution of such software) that such software or other software incorporated into, derived from or distributed with such software (a) be disclosed or distributed in source code form; or (b) be licensed by the user to third parties for the purpose of making and/or distributing derivative works; or (c) be redistributable at no charge. Open Source Software includes, without limitation, software licensed or distributed under any of the following licenses or distribution models, or licenses or distribution models substantially similar to any of the following: (a) GNU’s General Public License (GPL) or Lesser/Library GPL (LGPL), (b) the Artistic License (e.g., PERL), (c) the Mozilla Public License, (d) the Netscape Public License, (e) the Sun Community Source License (SCSL), (f) the Sun Industry Source License (SISL), (g) the Apache Software license and (h) the Common Public License (CPL).
- 
-1.5 “Pre-Release Materials” means “alpha” or “beta” designated pre-release features, which may not be fully functional, which MIPS may substantially modify in producing any production version of the Evaluation Materials, and/or which is still under development by MIPS and/or MIPS’ suppliers.
- 
-2. PURPOSE. MIPS desires to make the Evaluation Materials available to Recipient solely for Recipient's internal evaluation of the Evaluation Software to evaluate the desirability of cooperating with MIPS in developing products that are compatible with the Evaluation Software and/or to advise MIPS as to possible modifications to the Evaluation Software. Recipient may not disclose, distribute, modify (except to facilitate the above-mentioned internal evaluation), or make commercial use of the Evaluation Materials or any modifications of the Evaluation Materials.
- 
-THE EVALUATION MATERIALS ARE PROVIDED FOR EVALUATION PURPOSES ONLY AND MAY NOT BE MODIFIED (EXCEPT TO FACILITATE THE INTERNAL EVALUATION) OR DISTRIBUTED BY RECIPIENT OR INCORPORATED INTO RECIPIENT’S PRODUCTS OR SOFTWARE. PLEASE CONTACT A MIPS SALES REPRESENTATIVE TO LEARN ABOUT THE AVAILABILITY AND COST OF A COMMERCIAL VERSION OF THE EVALUATION SOFTWARE.
- 
-3. TITLE. Title to the Evaluation Materials remains with MIPS or its suppliers. Recipient shall not mortgage, pledge or encumber the Evaluation Materials in any way. Recipient shall return all Evaluation Materials, keeping no copies, upon termination or expiration of this Agreement.
- 
-4. LICENSE. MIPS grants Recipient a royalty-free, personal, nontransferable, nonexclusive license under its copyrights to use the Evaluation Software only for the purposes described in paragraph 2 above and only for a period beginning on the Effective Date and extending to the first anniversary of the Effective Date (the “Evaluation Period”). Unless otherwise communicated in writing by MIPS to Recipient, to the extent the Evaluation Software is provided in more than one delivery or release (each, a “Release”) the license grant in this Section 4 and the Evaluation Period shall apply to each Release, in which case the Evaluation Period shall begin on the date that the Release is made generally available and continue to the first anniversary of such date. Recipient may not make modifications to the Evaluation Software. Recipient shall not disassemble, reverse-engineer, or decompile any software that is not provided to Recipient in source code form.
-
-
-EXCEPT AS PROVIDED HEREIN, NO OTHER LICENSE, EXPRESS OR IMPLIED, BY ESTOPPEL OR OTHERWISE, TO ANY OTHER MIPS INTELLECTUAL PROPERTY RIGHTS IS GRANTED TO THE RECIPIENT. OTHER THAN AS EXPLICITLY SET FORTH IN PARAGRAPH 2 ABOVE, NO RIGHT TO COPY, TO REPRODUCE, TO MODIFY, OR TO CREATE DERIVATIVE WORKS OF, THE EVALUATION MATERIALS IS GRANTED HEREIN.
- 
-5. NO OBLIGATION. Recipient shall have no duty to purchase or license any product from MIPS. MIPS and its suppliers shall have no obligation to provide support for, or develop a non-evaluation version of, the Evaluation Software or to license any version of it.
- 
-6. MODIFICATIONS. This Agreement does not obligate Recipient to provide MIPS with comments or suggestions regarding Evaluation Materials. However, should Recipient provide MIPS with comments or suggestions for the modification, correction, improvement or enhancement of (a) the Evaluation Materials or (b) MIPS products or processes which may embody the Evaluation Materials, then Recipient agrees to grant and hereby grants to MIPS a non-exclusive, irrevocable, worldwide, fully paid-up, royalty-free license, with the right to sublicense MIPS’ licensees and customers, under Recipient’s Intellectual property rights, to use and disclose such comments and suggestions in any manner MIPS chooses and to display, perform, copy, make, have made, use, sell, offer to sell, import, and otherwise dispose of MIPS’ and its sublicensee’s products embodying such comments and suggestions in any manner and via any media MIPS chooses, without reference to the source.
- 
-7. WARRANTY DISCLAIMER. MIPS AND ITS SUPPLIERS MAKE NO WARRANTIES WITH RESPECT TO EVALUATION MATERIALS, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, OR ANY IMPLIED WARRANTY OF NONINFRINGEMENT WITH RESPECT TO THIRD PARTY INTELLECTUAL PROPERTY. RECIPIENT ACKNOWLEDGES AND AGREES THAT THE EVALUATION MATERIALS ARE PROVIDED “AS IS,” WITHOUT WARRANTY OF ANY KIND.
- 
-8. LIMITATION OF LIABILITY. MIPS AND ITS SUPPLIERS SHALL NOT BE LIABLE FOR ANY PROPERTY DAMAGE, PERSONAL INJURY, LOSS OF PROFITS, INTERRUPTION OF BUSINESS OR FOR ANY DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL OR INCIDENTAL DAMAGES, HOWEVER CAUSED OR ALLEGED, WHETHER FOR BREACH OF WARRANTY, CONTRACT, STRICT LIABILITY OR OTHERWISE, INCLUDING WITHOUT LIMITATION, UNDER TORT OR OTHER LEGAL THEORY. MIPS AND ITS SUPPLIERS DISCLAIM ANY AND ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY INTELLECTUAL PROPERTY RIGHTS OF ANY KIND RELATING TO THE EVALUATION MATERIALS.
- 
-9. EXPIRATION. MIPS may terminate this Agreement immediately after a breach by Recipient or otherwise at MIPS’ reasonable discretion and upon five (5) business days’ notice to Recipient.
- 
-10. GENERAL.
- 
-10.1 Controlling Law. This Agreement shall be governed by California law excluding its choice of law rules. With the exception of MIPS’ rights to enforce its intellectual property rights and any confidentiality obligations under this Agreement or any licenses distributed with the Evaluation Materials, all disputes and any claims arising under or relating to this Agreement shall be subject to the exclusive jurisdiction and venue of the state and federal courts located in Santa Clara County, California. Each party hereby agrees to jurisdiction and venue in the courts set forth in the preceding sentence. The parties agree that the United Nations Convention on Contracts for the International Sale of Goods is specifically excluded from application to this Agreement. The parties consent to the personal jurisdiction of the above courts.
- 
-10.2 Remedies. Recipient acknowledges and agrees that any breach of confidentiality obligations under this Agreement or any licenses distributed with the Evaluation Materials, as well as any disclosure, commercialization, or public use of the Evaluation Materials, would cause irreparable injury to MIPS, and therefore Recipient agrees to consent to, and hereby consents to, the grant of an injunction by any court of competent jurisdiction in the event of an actual or threatened breach.
- 
-10.3 Assignment. Recipient may not delegate, assign or transfer this Agreement, the license granted or any of Recipient’s rights, obligations, or duties hereunder, expressly, by implication, by operation of law, by way of merger (regardless of whether Recipient is the surviving entity) or acquisition, or otherwise and any attempt to do so, without MIPS’ express prior written consent, shall be ineffective, null and void. MIPS may freely assign this Agreement, and its rights and obligations hereunder, in its sole discretion.
- 
-10.4 Entire Agreement. This Agreement constitutes the entire agreement between Recipient and MIPS and supersedes in their entirety any and all oral or written agreements previously existing between Recipient and MIPS with respect to the subject matter hereof. This Agreement may only be amended or supplemented by a writing that refers explicitly to this Agreement and that is signed or otherwise accepted by duly authorized representatives of Recipient and MIPS.
- 
-10.5 Severability. In the event that any provision of this Agreement is finally adjudicated to be unenforceable or invalid under any applicable law, such unenforceability or invalidity shall not render this Agreement unenforceable or invalid as a whole, and, in such event, such unenforceable or invalid provision shall be interpreted so as to best accomplish the objectives of such provision within the limits of applicable law or applicable court decisions.
- 
-10.6 Export Regulations / Export Control. Recipient shall not export, either directly or indirectly, any product, service or technical data or system incorporating the Evaluation Materials without first obtaining any required license or other necessary approval from the U.S. Department of Commerce or any other governing agency or department of the United States Government. In the event any product is exported from the United States or re-exported from a foreign destination by Recipient, Recipient shall ensure that the distribution and export/re-export or import of the product is in compliance with all applicable laws, regulations, orders, or other restrictions of the U.S. Export Administration Regulations and the appropriate foreign government. Recipient agrees that neither it nor any of its subsidiaries will export/re-export any technical data, process, product, or service, directly or indirectly, to any country for which the United States government or any agency thereof or the foreign government from where it is shipping requires an export license, or other governmental approval, without first obtaining such license or approval. Recipient also agrees to implement measures to ensure that foreign national employees are authorized to receive any information controlled by U.S. export control laws. An export is "deemed" to take place when information is released to a foreign national wherever located.
- 
-10.7 Special Terms for Pre-Release Materials. If so indicated in the description of the Evaluation Software, the Evaluation Software may contain Pre-Release Materials. Recipient hereby understands, acknowledges and agrees that: (i) Pre-Release Materials may not be fully tested and may contain bugs or errors; (ii) Pre-Release materials are not suitable for commercial release in their current state; (iii) regulatory approvals for Pre-Release Materials (such as UL or FCC) have not been obtained, and Pre-Release Materials may therefore not be certified for use in certain countries or environments or may not be suitable for certain applications and (iv) MIPS can provide no assurance that it will ever produce or make generally available a production version of the Pre-Release Materials . MIPS is not under any obligation to develop and/or release or offer for sale or license a final product based upon the Pre-Release Materials and may unilaterally elect to abandon the Pre-Release Materials or any such development platform at any time and without any obligation or liability whatsoever to Recipient or any other person.
- 
-ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS” AND “AS AVAILABLE”, POSSIBLY WITH FAULTS, AND WITHOUT REPRESENTATION OR WARRANTY OF ANY KIND.
- 
-10.8 Open Source Software. In the event Open Source software is included with Evaluation Software, such Open Source software is licensed pursuant to the applicable Open Source software license agreement identified in the Open Source software comments in the applicable source code file(s) and/or file header as indicated in the Evaluation Software. Additional detail may be available (where applicable) in the accompanying on-line documentation. With respect to the Open Source software, nothing in this Agreement limits any rights under, or grants rights that supersede, the terms of any applicable Open Source software license agreement.
-    ]]>
-    </sdk:license>
-
-    <sdk:system-image>
-        <sdk:revision>1</sdk:revision>
-        <sdk:description>Android 4.0.4</sdk:description>
-        <sdk:api-level>15</sdk:api-level>
-        <sdk:abi>mips</sdk:abi>
-        <sdk:uses-license ref="mips-android-sysimage-license"/>
-        <sdk:archives>
-            <sdk:archive os="any">
-                <sdk:size>117503178</sdk:size>
-                <sdk:checksum type="sha1">a753bb4a6783124dad726c500ce9aec9d2c1b2d9</sdk:checksum>
-                <sdk:url>sysimg_mips-15_r01.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-    </sdk:system-image>
-
-    <sdk:system-image>
-        <sdk:revision>4</sdk:revision>
-        <!-- mipsia repo tag qa-dev-mips-jb-20130123,
-             github.com/MIPS branch dev-mips-jb, tag mips-jb-4.1.2_r1m1
-             repo init -u git://github.com/MIPS/manifests.git
-                 -b dev-mips-jb -m mips-jb-4.1.2_r1m1.xml           -->
-        <sdk:description>Android 4.1.2</sdk:description>
-        <sdk:api-level>16</sdk:api-level>
-        <sdk:abi>mips</sdk:abi>
-        <sdk:uses-license ref="mips-android-sysimage-license"/>
-        <sdk:archives>
-            <sdk:archive os="any">
-                <sdk:size>122482530</sdk:size>
-                <sdk:checksum type="sha1">67943c54fb3943943ffeb05fdd39c0b753681f6e</sdk:checksum>
-                <sdk:url>sysimg_mips-16_r04.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-    </sdk:system-image>
-
-    <sdk:system-image>
-        <sdk:revision>1</sdk:revision>
-        <!-- mipsia repo tag qa-dev-mips-jb-mr1-20121219,
-             github.com/MIPS tag mips-jb-4.2.1_r1 -->
-        <sdk:description>Android 4.2.1</sdk:description>
-        <sdk:api-level>17</sdk:api-level>
-        <sdk:abi>mips</sdk:abi>
-        <sdk:uses-license ref="mips-android-sysimage-license"/>
-        <sdk:archives>
-            <sdk:archive os="any">
-                <sdk:size>131781761</sdk:size>
-                <sdk:checksum type="sha1">f0c6e153bd584c29e51b5c9723cfbf30f996a05d</sdk:checksum>
-                <sdk:url>sysimg_mips-17_r01.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-    </sdk:system-image>
-
-</sdk:sdk-sys-img>
diff --git a/pkgs/development/mobile/androidenv/sys-img-x86.xml b/pkgs/development/mobile/androidenv/sys-img-x86.xml
deleted file mode 100644
index 75ddf73eb1d2..000000000000
--- a/pkgs/development/mobile/androidenv/sys-img-x86.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<!--
-* Copyright (C) 2012 The Android Open Source Project * * Licensed under the Apache License, version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License.
--->
-<sdk:sdk-sys-img xmlns:sdk="http://schemas.android.com/sdk/android/sys-img/1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-<sdk:license id="intel-android-sysimage-license" type="text">
-<![CDATA[
-Intel Corporation Internal Evaluation License Agreement for x86 Android* System Images for Android Software Development Kit (SDK)
-This Internal Evaluation License Agreement (this "Agreement") is entered into by and between Intel and you (as an individual developer or a legal entity -- identified below as Recipient). Intel shall provide the Evaluation Software to Recipient as described in accordance with the Internal Evaluation License Terms and Conditions.
-
-Definitions.
-These terms shall have the following meanings:
-
-"Intel" or "INTEL"
-Intel Corporation
-With an Address of:
-2200 Mission College Blvd.
-Santa Clara, CA 95052
-Office of the General Counsel
-Mail Stop: RNB-4-51
-Attn: Software and Services Group Legal
-
-"Evaluation Software"
-The x86 Android* emulator system images for Android  Software Development Kit (SDK), as provided by Intel.
-
-INTERNAL EVALUATION LICENSE TERMS AND CONDITIONS
-
-1. DEFINITIONS.
-
-1.1 Additional Defined Terms. "Agreement", "Evaluation Software",  "Intel", "Non-disclosure Agreement", "Recipient", and "Effective Date" shall have the meanings ascribed to them on the signature page(s) of this Agreement.
-
-1.2 Evaluation Materials means, collectively, the Evaluation Software (in source and/or object code form) and documentation (including, without limitation, any design documents, specifications and other related materials) related to the Evaluation Software.
-
-1.3 "Open Source Software" means any software that requires as a condition of use, modification and/or distribution of such software that such software or other software incorporated into, derived from or distributed with such software (a) be disclosed or distributed in source code form; or (b) be licensed by the user to third parties for the purpose of making and/or distributing derivative works; or (c) be redistributable at no charge. Open Source Software includes, without limitation, software licensed or distributed under any of the following licenses or distribution models, or licenses or distribution models substantially similar to any of the following: (a) GNU’s General Public License (GPL) or Lesser/Library GPL (LGPL), (b) the Artistic License (e.g., PERL), (c) the Mozilla Public License, (d) the Netscape Public License, (e) the Sun Community Source License (SCSL), (f) the Sun Industry Source License (SISL), (g) the Apache Software license and (h) the Common Public License (CPL).
-
-1.4 "Pre-Release Materials" means "alpha" or "beta" designated pre-release features, which may not be fully functional, which Intel may substantially modify in producing any production version of the Evaluation Materials and/or is still under development by Intel and/or Intel’s suppliers.
-
-2. PURPOSE. Intel desires to provide the Evaluation Materials to Recipient solely for Recipient's internal evaluation of the Evaluation Software and other Intel products, to evaluate the desirability of cooperating with Intel in developing products based on the Evaluation Software and/or to advise Intel as to possible modifications to the Evaluation Software. Recipient may not disclose, distribute or make commercial use of the Evaluation Materials or any modifications to the Evaluation Materials.
-THE EVALUATION MATERIALS ARE PROVIDED FOR EVALUATION PURPOSES ONLY AND MAY NOT BE DISTRIBUTED BY RECIPIENT OR INCORPORATED INTO RECIPIENT’S PRODUCTS OR SOFTWARE. PLEASE CONTACT AN INTEL SALES REPRESENTATIVE TO LEARN ABOUT THE AVAILABILITY AND COST OF A COMMERICAL VERSION OF THE EVALUATION SOFTWARE.
-
-3. TITLE. Title to the Evaluation Materials remains with Intel or its suppliers. Recipient shall not mortgage, pledge or encumber the Evaluation Materials in any way. Recipient shall return all Evaluation Materials, keeping no copies, upon termination or expiration of this Agreement.
-
-4. LICENSE. Intel grants Recipient a royalty-free, personal, nontransferable, nonexclusive license under its copyrights to use the Evaluation Software only for the purposes described in paragraph 2 above. Unless otherwise communicated in writing by Intel to Recipient, to the extent the Evaluation Software is provided in more than one delivery or release (each, a "Release") the license grant in this Section 4 and the Evaluation Period shall apply to each Release. Recipient may not make modifications to the Evaluation Software. Recipient shall not disassemble, reverse-engineer, or decompile any software not provided to Recipient in source code form.
-EXCEPT AS PROVIDED HEREIN, NO OTHER LICENSE, EXPRESS OR IMPLIED, BY ESTOPPEL OR OTHERWISE, TO ANY OTHER INTELLECTUAL PROPERTY RIGHTS IS GRANTED TO THE RECIPIENT.
-
-5. NO OBLIGATION. Recipient shall have no duty to purchase or license any product from Intel. Intel and its suppliers shall have no obligation to provide support for, or develop a non-evaluation version of, the Evaluation Software or to license any version of it.
-
-6. MODIFICATIONS. This Agreement does NOT obligate Recipient to provide Intel with comments or suggestions regarding Evaluation Materials. However, should Recipient provide Intel with comments or suggestions for the modification, correction, improvement or enhancement of (a) the Evaluation Materials or (b) Intel products or processes which may embody the Evaluation Materials, Recipient grants to Intel a non-exclusive, irrevocable, worldwide, royalty-free license, with the right to sublicense Intel’s licensees and customers, under Recipient intellectual property rights, the rights to use and disclose such comments and suggestions in any manner Intel chooses and to display, perform, copy, make, have made, use, sell, offer to sell, import, and otherwise dispose of Intel’s and its sublicensee’s products embodying such comments and suggestions in any manner and via any media Intel chooses, without reference to the source.
-
-7. WARRANTY DISCLAIMER. INTEL AND ITS SUPPLIERS MAKE NO WARRANTIES WITH RESPECT TO EVALUATION MATERIALS, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, OR ANY IMPLIED WARRANTY OF NONINFRINGEMENT. THE EVALUATION MATERIALS ARE PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND.
-
-8. LIMITATION OF LIABILITY. INTEL AND ITS SUPPLIERS SHALL NOT BE LIABLE FOR ANY PROPERTY DAMAGE, PERSONAL INJURY, LOSS OF PROFITS, INTERRUPTION OF BUSINESS OR ANY SPECIAL, CONSEQUENTIAL OR INCIDENTAL DAMAGES, HOWEVER CAUSED, WHETHER FOR BREACH OF WARRANTY, CONTRACT, STRICT LIABILITY OR OTHERWISE. INTEL AND ITS SUPPLIERS DISCLAIM ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY INTELLECTUAL PROPERTY RIGHTS RELATING TO THE EVALUATION MATERIALS.
-
-9. EXPIRATION. Intel may terminate this Agreement immediately after a breach by Recipient.
-
-10. GENERAL.
-
-10.1 Controlling Law. Any claims arising under or relating to this Agreement shall be governed by the internal substantive laws of the State of Delaware or federal courts located in Delaware, without regard to principles of conflict of laws. Each party hereby agrees to jurisdiction and venue in the courts of the State of Delaware for all disputes and litigation arising under or relating to this Agreement. The parties agree that the United Nations Convention on Contracts for the International Sale of Goods is specifically excluded from application to this Agreement. The parties consent to the personal jurisdiction of the above courts.
-
-10.2 Remedies. Recipient acknowledges that any disclosure, commercialization, or public use of the Evaluation Materials would cause irreparable injury to Intel and consents to the grant of an injunction by any court of competent jurisdiction in the event of a threatened breach.
-
-10.3 Assignment. Recipient may not delegate, assign or transfer this Agreement, the license granted or any of Recipient’s rights or duties hereunder, expressly, by implication, by operation of law, by way of merger (regardless of whether Recipient is the surviving entity) or acquisition, or otherwise and any attempt to do so, without Intel’s express prior written consent, shall be null and void. Intel may assign this Agreement, and its rights and obligations hereunder, in its sole discretion.
-
-10.4 Entire Agreement. This Agreement constitutes the entire agreement between Recipient and Intel and supersedes in their entirety any and all oral or written agreements previously existing between Recipient and Intel with respect to the subject matter hereof. This Agreement supersedes any and all "click-to-accept" or shrink-wrapped licenses, in hard-copy or electronic form, embedded in or included with the Evaluation Materials. This Agreement may only be amended or supplemented by a writing that refers explicitly to this Agreement and that is signed by duly authorized representatives of Recipient and Intel. Without limiting the foregoing, terms and conditions on any purchase orders or similar materials submitted by Recipient to Intel, and any terms contained in Intel’s standard acknowledgment form that are in conflict with these terms, shall be of no force or effect.
-
-10.5 Severability. In the event that any provision of this Agreement shall be unenforceable or invalid under any applicable law or be so held by applicable court decision, such unenforceability or invalidity shall not render this Agreement unenforceable or invalid as a whole, and, in such event, such provision shall be changed and interpreted so as to best accomplish the objectives of such unenforceable or invalid provision within the limits of applicable law or applicable court decisions.
-
-10.6 Export Regulations / Export Control. Recipient shall not export, either directly or indirectly, any product, service or technical data or system incorporating the Evaluation Materials without first obtaining any required license or other approval from the U.S. Department of Commerce or any other agency or department of the United States Government. In the event any product is exported from the United States or re-exported from a foreign destination by Recipient, Recipient shall ensure that the distribution and export/re-export or import of the product is in compliance with all laws, regulations, orders, or other restrictions of the U.S. Export Administration Regulations and the appropriate foreign government. Recipient agrees that neither it nor any of its subsidiaries will export/re-export any technical data, process, product, or service, directly or indirectly, to any country for which the United States government or any agency thereof or the foreign government from where it is shipping requires an export license, or other governmental approval, without first obtaining such license or approval. Recipient also agrees to implement measures to ensure that foreign national employees are authorized to receive any information controlled by U.S. export control laws. An export is "deemed" to take place when information is released to a foreign national wherever located.
-
-10.7 Special Terms for Pre-Release Materials. If so indicated in the description of the Evaluation Software, the Evaluation Software may contain Pre-Release Materials. Recipient hereby understands, acknowledges and agrees that: (i) Pre-Release Materials may not be fully tested and may contain bugs or errors; (ii) Pre-Release materials are not suitable for commercial release in their current state; (iii) regulatory approvals for Pre-Release Materials (such as UL or FCC) have not been obtained, and Pre-Release Materials may therefore not be certified for use in certain countries or environments and (iv) Intel can provide no assurance that it will ever produce or make generally available a production version of the Pre-Release Materials . Intel is not under any obligation to develop and/or release or offer for sale or license a final product based upon the Pre-Release Materials and may unilaterally elect to abandon the Pre-Release Materials or any such development platform at any time and without any obligation or liability whatsoever to Recipient or any other person.
-
-10.8 Open Source Software. In the event Open Source software is included with Evaluation Software, such Open Source software is licensed pursuant to the applicable Open Source software license agreement identified in the Open Source software comments in the applicable source code file(s) and/or file header provided with Evaluation Software. Additional detail may be provided (where applicable) in the accompanying on-line documentation. With respect to the Open Source software, nothing in this Agreement limits any rights under, or grants rights that supersede, the terms of any applicable Open Source software license agreement.
-ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED POSSIBLY WITH FAULTS
-]]>
-</sdk:license>
-
-<!-- SYSTEM IMAGES ........................ -->
-
-<sdk:system-image>
-    <sdk:description>Android SDK Platform 2.3.7</sdk:description>
-    <sdk:revision>2</sdk:revision>
-    <sdk:api-level>10</sdk:api-level>
-    <sdk:abi>x86</sdk:abi>
-    <sdk:uses-license ref="intel-android-sysimage-license"/>
-    <sdk:archives>
-      <sdk:archive arch="any" os="any">
-        <sdk:size>55463895</sdk:size>
-        <sdk:checksum type="sha1">34e2436f69606cdfe35d3ef9112f0c64e3ff021d</sdk:checksum>
-        <sdk:url>sysimg_x86-10_r02.zip</sdk:url>
-      </sdk:archive>
-    </sdk:archives>
-</sdk:system-image>
-
-<sdk:system-image>
-    <sdk:description>Android SDK Platform 4.0.4</sdk:description>
-    <sdk:revision>1</sdk:revision>
-    <sdk:api-level>15</sdk:api-level>
-    <sdk:abi>x86</sdk:abi>
-    <sdk:uses-license ref="intel-android-sysimage-license"/>
-    <sdk:archives>
-      <sdk:archive arch="any" os="any">
-        <sdk:size>112619605</sdk:size>
-        <sdk:checksum type="sha1">d540325952e0f097509622b9e685737584b83e40</sdk:checksum>
-        <sdk:url>sysimg_x86-15_r01.zip</sdk:url>
-      </sdk:archive>
-    </sdk:archives>
-</sdk:system-image>
-
-<sdk:system-image>
-    <sdk:description>Android SDK Platform 4.1.1</sdk:description>
-    <sdk:revision>1</sdk:revision>
-    <sdk:api-level>16</sdk:api-level>
-    <sdk:abi>x86</sdk:abi>
-    <sdk:uses-license ref="intel-android-sysimage-license"/>
-    <sdk:archives>
-      <sdk:archive arch="any" os="any">
-        <sdk:size>131840348</sdk:size>
-        <sdk:checksum type="sha1">9d35bcaa4f9b40443941f32b8a50337f413c021a</sdk:checksum>
-        <sdk:url>sysimg_x86-16_r01.zip</sdk:url>
-      </sdk:archive>
-    </sdk:archives>
-</sdk:system-image>
-
-<sdk:system-image>
-    <sdk:description>Android SDK Platform 4.2</sdk:description>
-    <sdk:revision>1</sdk:revision>
-    <sdk:api-level>17</sdk:api-level>
-    <sdk:abi>x86</sdk:abi>
-    <sdk:uses-license ref="intel-android-sysimage-license"/>
-    <sdk:archives>
-        <sdk:archive arch="any" os="any">
-            <sdk:size>138799122</sdk:size>
-            <sdk:checksum type="sha1">ddb3313e8dcd07926003f7b828eafea1115ea35b</sdk:checksum>
-            <sdk:url>sysimg_x86-17_r01.zip</sdk:url>
-        </sdk:archive>
-    </sdk:archives>
-</sdk:system-image>
-
-<sdk:system-image>
-    <sdk:description>Android SDK Platform 4.3</sdk:description>
-    <sdk:revision>1</sdk:revision>
-    <sdk:api-level>18</sdk:api-level>
-    <sdk:abi>x86</sdk:abi>
-    <sdk:uses-license ref="intel-android-sysimage-license"/>
-    <sdk:archives>
-        <sdk:archive arch="any" os="any">
-            <sdk:size>155656419</sdk:size>
-            <sdk:checksum type="sha1">f11bc9fccd3e7e46c07d8b26e112a8d0b45966c1</sdk:checksum>
-            <sdk:url>sysimg_x86-18_r01.zip</sdk:url>
-        </sdk:archive>
-    </sdk:archives>
-</sdk:system-image>
-
-</sdk:sdk-sys-img>
diff --git a/pkgs/development/mobile/androidenv/sys-img.xml b/pkgs/development/mobile/androidenv/sys-img.xml
new file mode 100644
index 000000000000..5d2b0f7a883a
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/sys-img.xml
@@ -0,0 +1,712 @@
+<!--
+* Copyright (C) 2012 The Android Open Source Project
+*
+* Licensed under the Apache License, version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+-->
+<sdk:sdk-sys-img xmlns:sdk="http://schemas.android.com/sdk/android/sys-img/3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+
+    <sdk:license id="android-sdk-license" type="text">To get started with the Android SDK, you must agree to the following terms and conditions.
+
+This is the Android SDK License Agreement (the &quot;License Agreement&quot;).
+
+1. Introduction
+
+1.1 The Android SDK (referred to in the License Agreement as the &quot;SDK&quot; and specifically including the Android system files, packaged APIs, and SDK library files and tools , if and when they are made available) is licensed to you subject to the terms of the License Agreement. The License Agreement forms a legally binding contract between you and Google in relation to your use of the SDK.
+
+1.2 &quot;Android&quot; means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time.
+
+1.3 &quot;Google&quot; means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.
+
+2. Accepting the License Agreement
+
+2.1 In order to use the SDK, you must first agree to the License Agreement. You may not use the SDK if you do not accept the License Agreement.
+
+2.2 By clicking to accept and/or using the SDK, you hereby agree to the terms of the License Agreement.
+
+2.3 You may not use the SDK and may not accept the License Agreement if you are a person barred from receiving the SDK under the laws of the United States or other countries including the country in which you are resident or from which you use the SDK.
+
+2.4 If you will use the SDK internally within your company or organization you agree to be bound by the License Agreement on behalf of your employer or other entity, and you represent and warrant that you have full legal authority to bind your employer or such entity to the License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the SDK on behalf of your employer or other entity.
+
+3. SDK License from Google
+
+3.1 Subject to the terms of the License Agreement, Google grants you a royalty-free, non-assignable, non-exclusive, non-sublicensable, limited, revocable license to use the SDK, personally or internally within your company or organization, solely to develop and distribute applications to run on the Android platform.
+
+3.2 You agree that Google or third parties own all legal right, title and interest in and to the SDK, including any Intellectual Property Rights that subsist in the SDK. &quot;Intellectual Property Rights&quot; means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you.
+
+3.3 You may not use the SDK for any purpose not expressly permitted by the License Agreement. Except to the extent required by applicable third party licenses, you may not: (a) copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK; or (b) load any part of the SDK onto a mobile handset or any other hardware device except a personal computer, combine any part of the SDK with other software, or distribute any software or device incorporating a part of the SDK.
+
+3.4 You agree that you will not take any actions that may cause or result in the fragmentation of Android, including but not limited to distributing, participating in the creation of, or promoting in any way a software development kit derived from the SDK.
+
+3.5 Use, reproduction and distribution of components of the SDK licensed under an open source software license are governed solely by the terms of that open source software license and not the License Agreement. You agree to remain a licensee in good standing in regard to such open source software licenses under all the rights granted and to refrain from any actions that may terminate, suspend, or breach such rights.
+
+3.6 You agree that the form and nature of the SDK that Google provides may change without prior notice to you and that future versions of the SDK may be incompatible with applications developed on previous versions of the SDK. You agree that Google may stop (permanently or temporarily) providing the SDK (or any features within the SDK) to you or to users generally at Google's sole discretion, without prior notice to you.
+
+3.7 Nothing in the License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features.
+
+3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the SDK.
+
+4. Use of the SDK by You
+
+4.1 Google agrees that nothing in the License Agreement gives Google any right, title or interest from you (or your licensors) under the License Agreement in or to any software applications that you develop using the SDK, including any intellectual property rights that subsist in those applications.
+
+4.2 You agree to use the SDK and write applications only for purposes that are permitted by (a) the License Agreement, and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries).
+
+4.3 You agree that if you use the SDK to develop applications, you will protect the privacy and legal rights of users. If users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If users provide you with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, each user has given you permission to do so.
+
+4.4 You agree that you will not engage in any activity with the SDK, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of Google or any third party.
+
+4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through Android and/or applications for Android, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so.
+
+4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under the License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach.
+
+5. Your Developer Credentials
+
+5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials.
+
+6. Privacy and Information
+
+6.1 In order to continually innovate and improve the SDK, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the SDK are being used and how they are being used. Before any of this information is collected, the SDK will notify you and seek your consent. If you withhold consent, the information will not be collected.
+
+6.2 The data collected is examined in the aggregate to improve the SDK and is maintained in accordance with Google's Privacy Policy located at http://www.google.com/policies/privacy/.
+
+7. Third Party Applications
+
+7.1 If you use the SDK to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources.
+
+7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners.
+
+7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party.
+
+8. Using Google APIs
+
+8.1 Google APIs
+
+8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service.
+
+8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so.
+
+9. Terminating the License Agreement
+
+9.1 The License Agreement will continue to apply until terminated by either you or Google as set out below.
+
+9.2 If you want to terminate the License Agreement, you may do so by ceasing your use of the SDK and any relevant developer credentials.
+
+9.3 Google may at any time, terminate the License Agreement, with or without cause, upon notice to you.
+
+9.4 The License Agreement will automatically terminate without notice or other action when Google ceases to provide the SDK or certain parts of the SDK to users in the country in which you are resident or from which you use the service.
+
+9.5 When the License Agreement is terminated, the license granted to you in the License Agreement will terminate, you will immediately cease all use of the SDK, and the provisions of paragraphs 10, 11, 12 and 14 shall survive indefinitely.
+
+10. DISCLAIMERS
+
+10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE SDK IS AT YOUR SOLE RISK AND THAT THE SDK IS PROVIDED &quot;AS IS&quot; AND &quot;AS AVAILABLE&quot; WITHOUT WARRANTY OF ANY KIND FROM GOOGLE.
+
+10.2 YOUR USE OF THE SDK AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE SDK IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE. WITHOUT LIMITING THE FOREGOING, YOU UNDERSTAND THAT THE SDK MAY CONTAIN ERRORS, DEFECTS AND SECURITY VULNERABILITIES THAT CAN RESULT IN SIGNIFICANT DAMAGE, INCLUDING THE COMPLETE, IRRECOVERABLE LOSS OF USE OF YOUR COMPUTER SYSTEM OR OTHER DEVICE.
+
+10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+
+11. LIMITATION OF LIABILITY
+
+11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING.
+
+12. Indemnification
+
+12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys’ fees) arising out of or accruing from (a) your use of the SDK, (b) any application you develop on the SDK that infringes any Intellectual Property Rights of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you of the License Agreement.
+
+13. Changes to the License Agreement
+
+13.1 Google may make changes to the License Agreement as it distributes new versions of the SDK. When these changes are made, Google will make a new version of the License Agreement available on the website where the SDK is made available.
+
+14. General Legal Terms
+
+14.1 The License Agreement constitutes the whole legal agreement between you and Google and governs your use of the SDK (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the SDK.
+
+14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in the License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google.
+
+14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of the License Agreement is invalid, then that provision will be removed from the License Agreement without affecting the rest of the License Agreement. The remaining provisions of the License Agreement will continue to be valid and enforceable.
+
+14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to the License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of the License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to the License Agreement.
+
+14.5 EXPORT RESTRICTIONS. THE SDK IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE SDK. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE.
+
+14.6 The License Agreement may not be assigned or transferred by you without the prior written approval of Google, and any attempted assignment without such approval will be void. You shall not delegate your responsibilities or obligations under the License Agreement without the prior written approval of Google.
+
+14.7 The License Agreement, and your relationship with Google under the License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from the License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.
+
+June 2014.
+    </sdk:license>
+
+    <sdk:license id="android-sdk-preview-license" type="text">To get started with the Android SDK Preview, you must agree to the following terms and conditions.
+As described below, please note that this is a preview version of the Android SDK, subject to change, that you use at your own risk.  The Android SDK Preview is not a stable release, and may contain errors and defects that can result in serious damage to your computer systems, devices and data.
+
+This is the Android SDK Preview License Agreement (the &quot;License Agreement&quot;).
+
+1. Introduction
+
+1.1 The Android SDK Preview (referred to in the License Agreement as the “Preview” and specifically including the Android system files, packaged APIs, and Preview library files, if and when they are made available) is licensed to you subject to the terms of the License Agreement. The License Agreement forms a legally binding contract between you and Google in relation to your use of the Preview.
+
+1.2 &quot;Android&quot; means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time.
+
+1.3 &quot;Google&quot; means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.
+
+2. Accepting the License Agreement
+
+2.1 In order to use the Preview, you must first agree to the License Agreement. You may not use the Preview if you do not accept the License Agreement.
+
+2.2 By clicking to accept and/or using the Preview, you hereby agree to the terms of the License Agreement.
+
+2.3 You may not use the Preview and may not accept the License Agreement if you are a person barred from receiving the Preview under the laws of the United States or other countries including the country in which you are resident or from which you use the Preview.
+
+2.4 If you will use the Preview internally within your company or organization you agree to be bound by the License Agreement on behalf of your employer or other entity, and you represent and warrant that you have full legal authority to bind your employer or such entity to the License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the Preview on behalf of your employer or other entity.
+
+3. Preview License from Google
+
+3.1 Subject to the terms of the License Agreement, Google grants you a royalty-free, non-assignable, non-exclusive, non-sublicensable, limited, revocable license to use the Preview, personally or internally within your company or organization, solely to develop applications to run on the Android platform.
+
+3.2 You agree that Google or third parties owns all legal right, title and interest in and to the Preview, including any Intellectual Property Rights that subsist in the Preview. &quot;Intellectual Property Rights&quot; means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you.
+
+3.3 You may not use the Preview for any purpose not expressly permitted by the License Agreement. Except to the extent required by applicable third party licenses, you may not: (a) copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the Preview or any part of the Preview; or (b) load any part of the Preview onto a mobile handset or any other hardware device except a personal computer, combine any part of the Preview with other software, or distribute any software or device incorporating a part of the Preview.
+
+3.4 You agree that you will not take any actions that may cause or result in the fragmentation of Android, including but not limited to distributing, participating in the creation of, or promoting in any way a software development kit derived from the Preview.
+
+3.5 Use, reproduction and distribution of components of the Preview licensed under an open source software license are governed solely by the terms of that open source software license and not the License Agreement. You agree to remain a licensee in good standing in regard to such open source software licenses under all the rights granted and to refrain from any actions that may terminate, suspend, or breach such rights.
+
+3.6 You agree that the form and nature of the Preview that Google provides may change without prior notice to you and that future versions of the Preview may be incompatible with applications developed on previous versions of the Preview. You agree that Google may stop (permanently or temporarily) providing the Preview (or any features within the Preview) to you or to users generally at Google's sole discretion, without prior notice to you.
+
+3.7 Nothing in the License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features.
+
+3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the Preview.
+
+4. Use of the Preview by You
+
+4.1 Google agrees that nothing in the License Agreement gives Google any right, title or interest from you (or your licensors) under the License Agreement in or to any software applications that you develop using the Preview, including any intellectual property rights that subsist in those applications.
+
+4.2 You agree to use the Preview and write applications only for purposes that are permitted by (a) the License Agreement, and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries).
+
+4.3 You agree that if you use the Preview to develop applications, you will protect the privacy and legal rights of users. If users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If users provide you with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, each user has given you permission to do so.
+
+4.4 You agree that you will not engage in any activity with the Preview, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of Google or any third party.
+
+4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through Android and/or applications for Android, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so.
+
+4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under the License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach.
+
+4.7 The Preview is in development, and your testing and feedback are an important part of the development process. By using the Preview, you acknowledge that implementation of some features are still under development and that you should not rely on the Preview having the full functionality of a stable release. You agree not to publicly distribute or ship any application using this Preview as this Preview will no longer be supported after the official Android SDK is released.
+
+5. Your Developer Credentials
+
+5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials.
+
+6. Privacy and Information
+
+6.1 In order to continually innovate and improve the Preview, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the Preview are being used and how they are being used. Before any of this information is collected, the Preview will notify you and seek your consent. If you withhold consent, the information will not be collected.
+
+6.2 The data collected is examined in the aggregate to improve the Preview and is maintained in accordance with Google's Privacy Policy located at http://www.google.com/policies/privacy/.
+
+7. Third Party Applications
+
+7.1 If you use the Preview to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources.
+
+7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners.
+
+7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party.
+
+8. Using Google APIs
+
+8.1 Google APIs
+
+8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service.
+
+8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so.
+
+9. Terminating the License Agreement
+
+9.1 the License Agreement will continue to apply until terminated by either you or Google as set out below.
+
+9.2 If you want to terminate the License Agreement, you may do so by ceasing your use of the Preview and any relevant developer credentials.
+
+9.3 Google may at any time, terminate the License Agreement, with or without cause, upon notice to you.
+
+9.4 The License Agreement will automatically terminate without notice or other action upon the earlier of:
+(A) when Google ceases to provide the Preview or certain parts of the Preview to users in the country in which you are resident or from which you use the service; and
+(B) Google issues a final release version of the Android SDK.
+
+9.5 When the License Agreement is terminated, the license granted to you in the License Agreement will terminate, you will immediately cease all use of the Preview, and the provisions of paragraphs 10, 11, 12 and 14 shall survive indefinitely.
+
+10. DISCLAIMERS
+
+10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE PREVIEW IS AT YOUR SOLE RISK AND THAT THE PREVIEW IS PROVIDED &quot;AS IS&quot; AND &quot;AS AVAILABLE&quot; WITHOUT WARRANTY OF ANY KIND FROM GOOGLE.
+
+10.2 YOUR USE OF THE PREVIEW AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE PREVIEW IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE. WITHOUT LIMITING THE FOREGOING, YOU UNDERSTAND THAT THE PREVIEW IS NOT A STABLE RELEASE AND MAY CONTAIN ERRORS, DEFECTS AND SECURITY VULNERABILITIES THAT CAN RESULT IN SIGNIFICANT DAMAGE, INCLUDING THE COMPLETE, IRRECOVERABLE LOSS OF USE OF YOUR COMPUTER SYSTEM OR OTHER DEVICE.
+
+10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+
+11. LIMITATION OF LIABILITY
+
+11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING.
+
+12. Indemnification
+
+12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys’ fees) arising out of or accruing from (a) your use of the Preview, (b) any application you develop on the Preview that infringes any Intellectual Property Rights of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you of the License Agreement.
+
+13. Changes to the License Agreement
+
+13.1 Google may make changes to the License Agreement as it distributes new versions of the Preview. When these changes are made, Google will make a new version of the License Agreement available on the website where the Preview is made available.
+
+14. General Legal Terms
+
+14.1 the License Agreement constitutes the whole legal agreement between you and Google and governs your use of the Preview (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the Preview.
+
+14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in the License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google.
+
+14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of the License Agreement is invalid, then that provision will be removed from the License Agreement without affecting the rest of the License Agreement. The remaining provisions of the License Agreement will continue to be valid and enforceable.
+
+14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to the License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of the License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to the License Agreement.
+
+14.5 EXPORT RESTRICTIONS. THE PREVIEW IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE PREVIEW. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE.
+
+14.6 The License Agreement may not be assigned or transferred by you without the prior written approval of Google, and any attempted assignment without such approval will be void. You shall not delegate your responsibilities or obligations under the License Agreement without the prior written approval of Google.
+
+14.7 The License Agreement, and your relationship with Google under the License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from the License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.
+
+June 2014.
+    </sdk:license>
+
+    <sdk:license id="intel-android-sysimage-license" type="text">
+<![CDATA[
+Intel Corporation Internal Evaluation License Agreement for x86 Android* System Images for Android Software Development Kit (SDK)
+This Internal Evaluation License Agreement (this "Agreement") is entered into by and between Intel and you (as an individual developer or a legal entity -- identified below as Recipient). Intel shall provide the Evaluation Software to Recipient as described in accordance with the Internal Evaluation License Terms and Conditions.
+
+Definitions.
+These terms shall have the following meanings:
+
+"Intel" or "INTEL"
+Intel Corporation
+With an Address of:
+2200 Mission College Blvd.
+Santa Clara, CA 95052
+Office of the General Counsel
+Mail Stop: RNB-4-51
+Attn: Software and Services Group Legal
+
+"Evaluation Software"
+The x86 Android* emulator system images for Android  Software Development Kit (SDK), as provided by Intel.
+
+INTERNAL EVALUATION LICENSE TERMS AND CONDITIONS
+
+1. DEFINITIONS.
+
+1.1 Additional Defined Terms. "Agreement", "Evaluation Software",  "Intel", "Non-disclosure Agreement", "Recipient", and "Effective Date" shall have the meanings ascribed to them on the signature page(s) of this Agreement.
+
+1.2 Evaluation Materials means, collectively, the Evaluation Software (in source and/or object code form) and documentation (including, without limitation, any design documents, specifications and other related materials) related to the Evaluation Software.
+
+1.3 "Open Source Software" means any software that requires as a condition of use, modification and/or distribution of such software that such software or other software incorporated into, derived from or distributed with such software (a) be disclosed or distributed in source code form; or (b) be licensed by the user to third parties for the purpose of making and/or distributing derivative works; or (c) be redistributable at no charge. Open Source Software includes, without limitation, software licensed or distributed under any of the following licenses or distribution models, or licenses or distribution models substantially similar to any of the following: (a) GNU’s General Public License (GPL) or Lesser/Library GPL (LGPL), (b) the Artistic License (e.g., PERL), (c) the Mozilla Public License, (d) the Netscape Public License, (e) the Sun Community Source License (SCSL), (f) the Sun Industry Source License (SISL), (g) the Apache Software license and (h) the Common Public License (CPL).
+
+1.4 "Pre-Release Materials" means "alpha" or "beta" designated pre-release features, which may not be fully functional, which Intel may substantially modify in producing any production version of the Evaluation Materials and/or is still under development by Intel and/or Intel’s suppliers.
+
+2. PURPOSE. Intel desires to provide the Evaluation Materials to Recipient solely for Recipient's internal evaluation of the Evaluation Software and other Intel products, to evaluate the desirability of cooperating with Intel in developing products based on the Evaluation Software and/or to advise Intel as to possible modifications to the Evaluation Software. Recipient may not disclose, distribute or make commercial use of the Evaluation Materials or any modifications to the Evaluation Materials.
+THE EVALUATION MATERIALS ARE PROVIDED FOR EVALUATION PURPOSES ONLY AND MAY NOT BE DISTRIBUTED BY RECIPIENT OR INCORPORATED INTO RECIPIENT’S PRODUCTS OR SOFTWARE. PLEASE CONTACT AN INTEL SALES REPRESENTATIVE TO LEARN ABOUT THE AVAILABILITY AND COST OF A COMMERICAL VERSION OF THE EVALUATION SOFTWARE.
+
+3. TITLE. Title to the Evaluation Materials remains with Intel or its suppliers. Recipient shall not mortgage, pledge or encumber the Evaluation Materials in any way. Recipient shall return all Evaluation Materials, keeping no copies, upon termination or expiration of this Agreement.
+
+4. LICENSE. Intel grants Recipient a royalty-free, personal, nontransferable, nonexclusive license under its copyrights to use the Evaluation Software only for the purposes described in paragraph 2 above. Unless otherwise communicated in writing by Intel to Recipient, to the extent the Evaluation Software is provided in more than one delivery or release (each, a "Release") the license grant in this Section 4 and the Evaluation Period shall apply to each Release. Recipient may not make modifications to the Evaluation Software. Recipient shall not disassemble, reverse-engineer, or decompile any software not provided to Recipient in source code form.
+EXCEPT AS PROVIDED HEREIN, NO OTHER LICENSE, EXPRESS OR IMPLIED, BY ESTOPPEL OR OTHERWISE, TO ANY OTHER INTELLECTUAL PROPERTY RIGHTS IS GRANTED TO THE RECIPIENT.
+
+5. NO OBLIGATION. Recipient shall have no duty to purchase or license any product from Intel. Intel and its suppliers shall have no obligation to provide support for, or develop a non-evaluation version of, the Evaluation Software or to license any version of it.
+
+6. MODIFICATIONS. This Agreement does NOT obligate Recipient to provide Intel with comments or suggestions regarding Evaluation Materials. However, should Recipient provide Intel with comments or suggestions for the modification, correction, improvement or enhancement of (a) the Evaluation Materials or (b) Intel products or processes which may embody the Evaluation Materials, Recipient grants to Intel a non-exclusive, irrevocable, worldwide, royalty-free license, with the right to sublicense Intel’s licensees and customers, under Recipient intellectual property rights, the rights to use and disclose such comments and suggestions in any manner Intel chooses and to display, perform, copy, make, have made, use, sell, offer to sell, import, and otherwise dispose of Intel’s and its sublicensee’s products embodying such comments and suggestions in any manner and via any media Intel chooses, without reference to the source.
+
+7. WARRANTY DISCLAIMER. INTEL AND ITS SUPPLIERS MAKE NO WARRANTIES WITH RESPECT TO EVALUATION MATERIALS, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, OR ANY IMPLIED WARRANTY OF NONINFRINGEMENT. THE EVALUATION MATERIALS ARE PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND.
+
+8. LIMITATION OF LIABILITY. INTEL AND ITS SUPPLIERS SHALL NOT BE LIABLE FOR ANY PROPERTY DAMAGE, PERSONAL INJURY, LOSS OF PROFITS, INTERRUPTION OF BUSINESS OR ANY SPECIAL, CONSEQUENTIAL OR INCIDENTAL DAMAGES, HOWEVER CAUSED, WHETHER FOR BREACH OF WARRANTY, CONTRACT, STRICT LIABILITY OR OTHERWISE. INTEL AND ITS SUPPLIERS DISCLAIM ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY INTELLECTUAL PROPERTY RIGHTS RELATING TO THE EVALUATION MATERIALS.
+
+9. EXPIRATION. Intel may terminate this Agreement immediately after a breach by Recipient.
+
+10. GENERAL.
+
+10.1 Controlling Law. Any claims arising under or relating to this Agreement shall be governed by the internal substantive laws of the State of Delaware or federal courts located in Delaware, without regard to principles of conflict of laws. Each party hereby agrees to jurisdiction and venue in the courts of the State of Delaware for all disputes and litigation arising under or relating to this Agreement. The parties agree that the United Nations Convention on Contracts for the International Sale of Goods is specifically excluded from application to this Agreement. The parties consent to the personal jurisdiction of the above courts.
+
+10.2 Remedies. Recipient acknowledges that any disclosure, commercialization, or public use of the Evaluation Materials would cause irreparable injury to Intel and consents to the grant of an injunction by any court of competent jurisdiction in the event of a threatened breach.
+
+10.3 Assignment. Recipient may not delegate, assign or transfer this Agreement, the license granted or any of Recipient’s rights or duties hereunder, expressly, by implication, by operation of law, by way of merger (regardless of whether Recipient is the surviving entity) or acquisition, or otherwise and any attempt to do so, without Intel’s express prior written consent, shall be null and void. Intel may assign this Agreement, and its rights and obligations hereunder, in its sole discretion.
+
+10.4 Entire Agreement. This Agreement constitutes the entire agreement between Recipient and Intel and supersedes in their entirety any and all oral or written agreements previously existing between Recipient and Intel with respect to the subject matter hereof. This Agreement supersedes any and all "click-to-accept" or shrink-wrapped licenses, in hard-copy or electronic form, embedded in or included with the Evaluation Materials. This Agreement may only be amended or supplemented by a writing that refers explicitly to this Agreement and that is signed by duly authorized representatives of Recipient and Intel. Without limiting the foregoing, terms and conditions on any purchase orders or similar materials submitted by Recipient to Intel, and any terms contained in Intel’s standard acknowledgment form that are in conflict with these terms, shall be of no force or effect.
+
+10.5 Severability. In the event that any provision of this Agreement shall be unenforceable or invalid under any applicable law or be so held by applicable court decision, such unenforceability or invalidity shall not render this Agreement unenforceable or invalid as a whole, and, in such event, such provision shall be changed and interpreted so as to best accomplish the objectives of such unenforceable or invalid provision within the limits of applicable law or applicable court decisions.
+
+10.6 Export Regulations / Export Control. Recipient shall not export, either directly or indirectly, any product, service or technical data or system incorporating the Evaluation Materials without first obtaining any required license or other approval from the U.S. Department of Commerce or any other agency or department of the United States Government. In the event any product is exported from the United States or re-exported from a foreign destination by Recipient, Recipient shall ensure that the distribution and export/re-export or import of the product is in compliance with all laws, regulations, orders, or other restrictions of the U.S. Export Administration Regulations and the appropriate foreign government. Recipient agrees that neither it nor any of its subsidiaries will export/re-export any technical data, process, product, or service, directly or indirectly, to any country for which the United States government or any agency thereof or the foreign government from where it is shipping requires an export license, or other governmental approval, without first obtaining such license or approval. Recipient also agrees to implement measures to ensure that foreign national employees are authorized to receive any information controlled by U.S. export control laws. An export is "deemed" to take place when information is released to a foreign national wherever located.
+
+10.7 Special Terms for Pre-Release Materials. If so indicated in the description of the Evaluation Software, the Evaluation Software may contain Pre-Release Materials. Recipient hereby understands, acknowledges and agrees that: (i) Pre-Release Materials may not be fully tested and may contain bugs or errors; (ii) Pre-Release materials are not suitable for commercial release in their current state; (iii) regulatory approvals for Pre-Release Materials (such as UL or FCC) have not been obtained, and Pre-Release Materials may therefore not be certified for use in certain countries or environments and (iv) Intel can provide no assurance that it will ever produce or make generally available a production version of the Pre-Release Materials . Intel is not under any obligation to develop and/or release or offer for sale or license a final product based upon the Pre-Release Materials and may unilaterally elect to abandon the Pre-Release Materials or any such development platform at any time and without any obligation or liability whatsoever to Recipient or any other person.
+
+10.8 Open Source Software. In the event Open Source software is included with Evaluation Software, such Open Source software is licensed pursuant to the applicable Open Source software license agreement identified in the Open Source software comments in the applicable source code file(s) and/or file header provided with Evaluation Software. Additional detail may be provided (where applicable) in the accompanying on-line documentation. With respect to the Open Source software, nothing in this Agreement limits any rights under, or grants rights that supersede, the terms of any applicable Open Source software license agreement.
+ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED POSSIBLY WITH FAULTS
+]]>
+    </sdk:license>
+    <sdk:license id="mips-android-sysimage-license" type="text">
+<![CDATA[
+MIPS Technologies, Inc. (“MIPS”) Internal Evaluation License Agreement for MIPS Android™ System Images for Android Software Development Kit (SDK):
+This Internal Evaluation License Agreement (this "Agreement") is entered into by and between MIPS and you (as an individual developer or a legal entity -- identified below as “Recipient”). MIPS shall make the Evaluation Software available to Recipient as described in accordance with the terms and conditions set forth below.
+
+By clicking on the “Accept” button, downloading, installing, or otherwise using the Evaluation Materials (defined below), you agree to be bound by the terms of this Agreement effective as of the date you click “Accept” (the “Effective Date”), and if doing so on behalf of an entity, you represent that you are authorized to bind the entity to the terms and conditions of this Agreement. If you do not agree to be bound by the terms and conditions of this Agreement, do not download, install, or use the Evaluation Materials.
+
+1. DEFINITIONS. These terms shall have the following meanings:
+
+1.1 “MIPS” shall mean MIPS Technologies, Inc., a Delaware corporation having a principal place of business at: 955 East Arques Ave., Sunnyvale, CA 94085
+
+1.2 “Evaluation Software” shall mean MIPS Android™ emulator system images for Android Software Development Kit (SDK), as made available to Recipient.
+
+1.3 “Evaluation Materials" means, collectively, the Evaluation Software (in source and/or object code form) and documentation (including, without limitation, any design documents, specifications, reference manuals, and other related materials) related to the Evaluation Software as made available to Recipient.
+
+1.4 “Open Source Software” means any software that requires (as a condition of use, modification and/or distribution of such software) that such software or other software incorporated into, derived from or distributed with such software (a) be disclosed or distributed in source code form; or (b) be licensed by the user to third parties for the purpose of making and/or distributing derivative works; or (c) be redistributable at no charge. Open Source Software includes, without limitation, software licensed or distributed under any of the following licenses or distribution models, or licenses or distribution models substantially similar to any of the following: (a) GNU’s General Public License (GPL) or Lesser/Library GPL (LGPL), (b) the Artistic License (e.g., PERL), (c) the Mozilla Public License, (d) the Netscape Public License, (e) the Sun Community Source License (SCSL), (f) the Sun Industry Source License (SISL), (g) the Apache Software license and (h) the Common Public License (CPL).
+
+1.5 “Pre-Release Materials” means “alpha” or “beta” designated pre-release features, which may not be fully functional, which MIPS may substantially modify in producing any production version of the Evaluation Materials, and/or which is still under development by MIPS and/or MIPS’ suppliers.
+
+2. PURPOSE. MIPS desires to make the Evaluation Materials available to Recipient solely for Recipient's internal evaluation of the Evaluation Software to evaluate the desirability of cooperating with MIPS in developing products that are compatible with the Evaluation Software and/or to advise MIPS as to possible modifications to the Evaluation Software. Recipient may not disclose, distribute, modify (except to facilitate the above-mentioned internal evaluation), or make commercial use of the Evaluation Materials or any modifications of the Evaluation Materials.
+
+THE EVALUATION MATERIALS ARE PROVIDED FOR EVALUATION PURPOSES ONLY AND MAY NOT BE MODIFIED (EXCEPT TO FACILITATE THE INTERNAL EVALUATION) OR DISTRIBUTED BY RECIPIENT OR INCORPORATED INTO RECIPIENT’S PRODUCTS OR SOFTWARE. PLEASE CONTACT A MIPS SALES REPRESENTATIVE TO LEARN ABOUT THE AVAILABILITY AND COST OF A COMMERCIAL VERSION OF THE EVALUATION SOFTWARE.
+
+3. TITLE. Title to the Evaluation Materials remains with MIPS or its suppliers. Recipient shall not mortgage, pledge or encumber the Evaluation Materials in any way. Recipient shall return all Evaluation Materials, keeping no copies, upon termination or expiration of this Agreement.
+
+4. LICENSE. MIPS grants Recipient a royalty-free, personal, nontransferable, nonexclusive license under its copyrights to use the Evaluation Software only for the purposes described in paragraph 2 above and only for a period beginning on the Effective Date and extending to the first anniversary of the Effective Date (the “Evaluation Period”). Unless otherwise communicated in writing by MIPS to Recipient, to the extent the Evaluation Software is provided in more than one delivery or release (each, a “Release”) the license grant in this Section 4 and the Evaluation Period shall apply to each Release, in which case the Evaluation Period shall begin on the date that the Release is made generally available and continue to the first anniversary of such date. Recipient may not make modifications to the Evaluation Software. Recipient shall not disassemble, reverse-engineer, or decompile any software that is not provided to Recipient in source code form.
+
+
+EXCEPT AS PROVIDED HEREIN, NO OTHER LICENSE, EXPRESS OR IMPLIED, BY ESTOPPEL OR OTHERWISE, TO ANY OTHER MIPS INTELLECTUAL PROPERTY RIGHTS IS GRANTED TO THE RECIPIENT. OTHER THAN AS EXPLICITLY SET FORTH IN PARAGRAPH 2 ABOVE, NO RIGHT TO COPY, TO REPRODUCE, TO MODIFY, OR TO CREATE DERIVATIVE WORKS OF, THE EVALUATION MATERIALS IS GRANTED HEREIN.
+
+5. NO OBLIGATION. Recipient shall have no duty to purchase or license any product from MIPS. MIPS and its suppliers shall have no obligation to provide support for, or develop a non-evaluation version of, the Evaluation Software or to license any version of it.
+
+6. MODIFICATIONS. This Agreement does not obligate Recipient to provide MIPS with comments or suggestions regarding Evaluation Materials. However, should Recipient provide MIPS with comments or suggestions for the modification, correction, improvement or enhancement of (a) the Evaluation Materials or (b) MIPS products or processes which may embody the Evaluation Materials, then Recipient agrees to grant and hereby grants to MIPS a non-exclusive, irrevocable, worldwide, fully paid-up, royalty-free license, with the right to sublicense MIPS’ licensees and customers, under Recipient’s Intellectual property rights, to use and disclose such comments and suggestions in any manner MIPS chooses and to display, perform, copy, make, have made, use, sell, offer to sell, import, and otherwise dispose of MIPS’ and its sublicensee’s products embodying such comments and suggestions in any manner and via any media MIPS chooses, without reference to the source.
+
+7. WARRANTY DISCLAIMER. MIPS AND ITS SUPPLIERS MAKE NO WARRANTIES WITH RESPECT TO EVALUATION MATERIALS, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, OR ANY IMPLIED WARRANTY OF NONINFRINGEMENT WITH RESPECT TO THIRD PARTY INTELLECTUAL PROPERTY. RECIPIENT ACKNOWLEDGES AND AGREES THAT THE EVALUATION MATERIALS ARE PROVIDED “AS IS,” WITHOUT WARRANTY OF ANY KIND.
+
+8. LIMITATION OF LIABILITY. MIPS AND ITS SUPPLIERS SHALL NOT BE LIABLE FOR ANY PROPERTY DAMAGE, PERSONAL INJURY, LOSS OF PROFITS, INTERRUPTION OF BUSINESS OR FOR ANY DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL OR INCIDENTAL DAMAGES, HOWEVER CAUSED OR ALLEGED, WHETHER FOR BREACH OF WARRANTY, CONTRACT, STRICT LIABILITY OR OTHERWISE, INCLUDING WITHOUT LIMITATION, UNDER TORT OR OTHER LEGAL THEORY. MIPS AND ITS SUPPLIERS DISCLAIM ANY AND ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY INTELLECTUAL PROPERTY RIGHTS OF ANY KIND RELATING TO THE EVALUATION MATERIALS.
+
+9. EXPIRATION. MIPS may terminate this Agreement immediately after a breach by Recipient or otherwise at MIPS’ reasonable discretion and upon five (5) business days’ notice to Recipient.
+
+10. GENERAL.
+
+10.1 Controlling Law. This Agreement shall be governed by California law excluding its choice of law rules. With the exception of MIPS’ rights to enforce its intellectual property rights and any confidentiality obligations under this Agreement or any licenses distributed with the Evaluation Materials, all disputes and any claims arising under or relating to this Agreement shall be subject to the exclusive jurisdiction and venue of the state and federal courts located in Santa Clara County, California. Each party hereby agrees to jurisdiction and venue in the courts set forth in the preceding sentence. The parties agree that the United Nations Convention on Contracts for the International Sale of Goods is specifically excluded from application to this Agreement. The parties consent to the personal jurisdiction of the above courts.
+
+10.2 Remedies. Recipient acknowledges and agrees that any breach of confidentiality obligations under this Agreement or any licenses distributed with the Evaluation Materials, as well as any disclosure, commercialization, or public use of the Evaluation Materials, would cause irreparable injury to MIPS, and therefore Recipient agrees to consent to, and hereby consents to, the grant of an injunction by any court of competent jurisdiction in the event of an actual or threatened breach.
+
+10.3 Assignment. Recipient may not delegate, assign or transfer this Agreement, the license granted or any of Recipient’s rights, obligations, or duties hereunder, expressly, by implication, by operation of law, by way of merger (regardless of whether Recipient is the surviving entity) or acquisition, or otherwise and any attempt to do so, without MIPS’ express prior written consent, shall be ineffective, null and void. MIPS may freely assign this Agreement, and its rights and obligations hereunder, in its sole discretion.
+
+10.4 Entire Agreement. This Agreement constitutes the entire agreement between Recipient and MIPS and supersedes in their entirety any and all oral or written agreements previously existing between Recipient and MIPS with respect to the subject matter hereof. This Agreement may only be amended or supplemented by a writing that refers explicitly to this Agreement and that is signed or otherwise accepted by duly authorized representatives of Recipient and MIPS.
+
+10.5 Severability. In the event that any provision of this Agreement is finally adjudicated to be unenforceable or invalid under any applicable law, such unenforceability or invalidity shall not render this Agreement unenforceable or invalid as a whole, and, in such event, such unenforceable or invalid provision shall be interpreted so as to best accomplish the objectives of such provision within the limits of applicable law or applicable court decisions.
+
+10.6 Export Regulations / Export Control. Recipient shall not export, either directly or indirectly, any product, service or technical data or system incorporating the Evaluation Materials without first obtaining any required license or other necessary approval from the U.S. Department of Commerce or any other governing agency or department of the United States Government. In the event any product is exported from the United States or re-exported from a foreign destination by Recipient, Recipient shall ensure that the distribution and export/re-export or import of the product is in compliance with all applicable laws, regulations, orders, or other restrictions of the U.S. Export Administration Regulations and the appropriate foreign government. Recipient agrees that neither it nor any of its subsidiaries will export/re-export any technical data, process, product, or service, directly or indirectly, to any country for which the United States government or any agency thereof or the foreign government from where it is shipping requires an export license, or other governmental approval, without first obtaining such license or approval. Recipient also agrees to implement measures to ensure that foreign national employees are authorized to receive any information controlled by U.S. export control laws. An export is "deemed" to take place when information is released to a foreign national wherever located.
+
+10.7 Special Terms for Pre-Release Materials. If so indicated in the description of the Evaluation Software, the Evaluation Software may contain Pre-Release Materials. Recipient hereby understands, acknowledges and agrees that: (i) Pre-Release Materials may not be fully tested and may contain bugs or errors; (ii) Pre-Release materials are not suitable for commercial release in their current state; (iii) regulatory approvals for Pre-Release Materials (such as UL or FCC) have not been obtained, and Pre-Release Materials may therefore not be certified for use in certain countries or environments or may not be suitable for certain applications and (iv) MIPS can provide no assurance that it will ever produce or make generally available a production version of the Pre-Release Materials . MIPS is not under any obligation to develop and/or release or offer for sale or license a final product based upon the Pre-Release Materials and may unilaterally elect to abandon the Pre-Release Materials or any such development platform at any time and without any obligation or liability whatsoever to Recipient or any other person.
+
+ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS” AND “AS AVAILABLE”, POSSIBLY WITH FAULTS, AND WITHOUT REPRESENTATION OR WARRANTY OF ANY KIND.
+
+10.8 Open Source Software. In the event Open Source software is included with Evaluation Software, such Open Source software is licensed pursuant to the applicable Open Source software license agreement identified in the Open Source software comments in the applicable source code file(s) and/or file header as indicated in the Evaluation Software. Additional detail may be available (where applicable) in the accompanying on-line documentation. With respect to the Open Source software, nothing in this Agreement limits any rights under, or grants rights that supersede, the terms of any applicable Open Source software license agreement.
+    ]]>
+    </sdk:license>
+
+    <!-- ARM SYSTEM IMAGES ........................ -->
+
+    <sdk:system-image>
+        <!-- Generated at Wed Dec  7 13:47:01 2011 from git_ics-mr0 @ 229537 -->
+        <sdk:revision>2</sdk:revision>
+        <sdk:description>Android SDK Platform 4.0</sdk:description>
+        <sdk:api-level>14</sdk:api-level>
+        <sdk:abi>armeabi-v7a</sdk:abi>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>99621822</sdk:size>
+                <sdk:checksum type="sha1">d8991b0c06b18d7d6ed4169d67460ee1add6661b</sdk:checksum>
+                <sdk:url>sysimg_armv7a-14_r02.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+        <sdk:tag-id>default</sdk:tag-id>
+    </sdk:system-image>
+
+    <sdk:system-image>
+        <!-- Generated at Fri Mar 30 10:43:23 2012 from ics-mr1 @ 302030 -->
+        <sdk:revision>2</sdk:revision>
+        <sdk:description>Android SDK Platform 4.0.3</sdk:description>
+        <sdk:api-level>15</sdk:api-level>
+        <sdk:abi>armeabi-v7a</sdk:abi>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>96227377</sdk:size>
+                <sdk:checksum type="sha1">1bf977d6cb4e0ad38dceac0c4863d1caa21f326e</sdk:checksum>
+                <sdk:url>sysimg_armv7a-15_r02.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+        <sdk:tag-id>default</sdk:tag-id>
+    </sdk:system-image>
+
+    <sdk:system-image>
+        <!-- Generated at Tue Oct  9 13:43:08 2012 from git_jb-dev @ 495790 -->
+        <sdk:revision>3</sdk:revision>
+        <sdk:description>Android SDK Platform 4.1</sdk:description>
+        <sdk:api-level>16</sdk:api-level>
+        <sdk:abi>armeabi-v7a</sdk:abi>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>112528368</sdk:size>
+                <sdk:checksum type="sha1">d1cddb23f17aad5821a089c403d4cddad2cf9ef7</sdk:checksum>
+                <sdk:url>sysimg_armv7a-16_r03.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+        <sdk:tag-id>default</sdk:tag-id>
+    </sdk:system-image>
+
+    <sdk:system-image>
+        <!-- Generated at Wed Feb 13 11:29:12 2013 from git_jb-mr1.1-dev @ 576024 -->
+        <sdk:revision>2</sdk:revision>
+        <sdk:description>Android SDK Platform 4.2.2</sdk:description>
+        <sdk:api-level>17</sdk:api-level>
+        <sdk:abi>armeabi-v7a</sdk:abi>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>116553808</sdk:size>
+                <sdk:checksum type="sha1">1c321cda1af793b84d47d1a8d15f85444d265e3c</sdk:checksum>
+                <sdk:url>sysimg_armv7a-17_r02.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+        <sdk:tag-id>default</sdk:tag-id>
+    </sdk:system-image>
+
+    <sdk:system-image>
+        <!-- Generated at Mon Aug 12 12:43:28 2013 from git_jb-mr2-dev @ 774058 -->
+        <sdk:revision>2</sdk:revision>
+        <sdk:description>Android SDK Platform 4.3</sdk:description>
+        <sdk:api-level>18</sdk:api-level>
+        <sdk:abi>armeabi-v7a</sdk:abi>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>125457135</sdk:size>
+                <sdk:checksum type="sha1">4a1a93200210d8c42793324362868846f67401ab</sdk:checksum>
+                <sdk:url>sysimg_armv7a-18_r02.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+        <sdk:tag-id>default</sdk:tag-id>
+    </sdk:system-image>
+
+    <sdk:system-image>
+        <!-- Generated at Thu Dec  5 14:04:05 2013 from git_klp-dev @ 938007 -->
+        <sdk:revision>2</sdk:revision>
+        <sdk:description>Android SDK Platform 4.4.2</sdk:description>
+        <sdk:api-level>19</sdk:api-level>
+        <sdk:abi>armeabi-v7a</sdk:abi>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>158478012</sdk:size>
+                <sdk:checksum type="sha1">e0d375397e28e3d5d9577a00132463a4696248e5</sdk:checksum>
+                <sdk:url>sysimg_armv7a-19_r02.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+        <sdk:tag-id>default</sdk:tag-id>
+    </sdk:system-image>
+
+    <sdk:system-image>
+        <!-- Generated at Mon Jun 23 19:22:34 2014 from git_lmp-preview-release @ 1242878 -->
+        <sdk:revision>1</sdk:revision>
+        <sdk:description>Android SDK Platform L</sdk:description>
+        <sdk:api-level>20</sdk:api-level>
+        <sdk:codename>L</sdk:codename>
+        <sdk:abi>armeabi-v7a</sdk:abi>
+        <sdk:tag-id>default</sdk:tag-id>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>227716008</sdk:size>
+                <sdk:checksum type="sha1">1d5d81a7078b5b2a685620d93e1e04a51d2e786a</sdk:checksum>
+                <sdk:url>sysimg_armv7a-L_r01.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-preview-license"/>
+    </sdk:system-image>
+
+    <sdk:system-image>
+        <!-- Generated at Mon Jun 23 19:23:13 2014 from git_lmp-preview-release @ 1242878 -->
+        <sdk:revision>1</sdk:revision>
+        <sdk:description>Android SDK Platform L</sdk:description>
+        <sdk:api-level>20</sdk:api-level>
+        <sdk:codename>L</sdk:codename>
+        <sdk:abi>x86</sdk:abi>
+        <sdk:tag-id>default</sdk:tag-id>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>245850484</sdk:size>
+                <sdk:checksum type="sha1">c2d32d6244821ff59f370469778525f6a5345010</sdk:checksum>
+                <sdk:url>sysimg_x86-L_r01.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-preview-license"/>
+    </sdk:system-image>
+    <!-- X86 SYSTEM IMAGES ........................ -->
+
+    <sdk:system-image>
+        <sdk:description>Android SDK Platform 2.3.7</sdk:description>
+        <sdk:revision>2</sdk:revision>
+        <sdk:api-level>10</sdk:api-level>
+        <sdk:abi>x86</sdk:abi>
+        <sdk:uses-license ref="intel-android-sysimage-license"/>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>55463895</sdk:size>
+                <sdk:checksum type="sha1">34e2436f69606cdfe35d3ef9112f0c64e3ff021d</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-10_r02.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:tag-id>default</sdk:tag-id>
+    </sdk:system-image>
+
+    <sdk:system-image>
+        <sdk:description>Android SDK Platform 4.0.4</sdk:description>
+        <sdk:revision>1</sdk:revision>
+        <sdk:api-level>15</sdk:api-level>
+        <sdk:abi>x86</sdk:abi>
+        <sdk:uses-license ref="intel-android-sysimage-license"/>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>112619605</sdk:size>
+                <sdk:checksum type="sha1">d540325952e0f097509622b9e685737584b83e40</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-15_r01.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:tag-id>default</sdk:tag-id>
+    </sdk:system-image>
+
+    <sdk:system-image>
+        <sdk:description>Android SDK Platform 4.1.1</sdk:description>
+        <sdk:revision>1</sdk:revision>
+        <sdk:api-level>16</sdk:api-level>
+        <sdk:abi>x86</sdk:abi>
+        <sdk:uses-license ref="intel-android-sysimage-license"/>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>131840348</sdk:size>
+                <sdk:checksum type="sha1">9d35bcaa4f9b40443941f32b8a50337f413c021a</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-16_r01.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:tag-id>default</sdk:tag-id>
+    </sdk:system-image>
+
+    <sdk:system-image>
+        <sdk:description>Android SDK Platform 4.2</sdk:description>
+        <sdk:revision>1</sdk:revision>
+        <sdk:api-level>17</sdk:api-level>
+        <sdk:abi>x86</sdk:abi>
+        <sdk:uses-license ref="intel-android-sysimage-license"/>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>138799122</sdk:size>
+                <sdk:checksum type="sha1">ddb3313e8dcd07926003f7b828eafea1115ea35b</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-17_r01.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:tag-id>default</sdk:tag-id>
+    </sdk:system-image>
+
+    <sdk:system-image>
+        <sdk:description>Android SDK Platform 4.3</sdk:description>
+        <sdk:revision>1</sdk:revision>
+        <sdk:api-level>18</sdk:api-level>
+        <sdk:abi>x86</sdk:abi>
+        <sdk:uses-license ref="intel-android-sysimage-license"/>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>155656419</sdk:size>
+                <sdk:checksum type="sha1">f11bc9fccd3e7e46c07d8b26e112a8d0b45966c1</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-18_r01.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:tag-id>default</sdk:tag-id>
+    </sdk:system-image>
+
+    <sdk:system-image>
+        <!-- Generated at Thu Feb 20 15:52:49 2014 from git_klp-sdk-release @ 999428 -->
+        <sdk:revision>2</sdk:revision>
+        <sdk:description>Android SDK Platform 4.4.2</sdk:description>
+        <sdk:api-level>19</sdk:api-level>
+        <sdk:abi>x86</sdk:abi>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>178922720</sdk:size>
+                <sdk:checksum type="sha1">8889cb418984a2a7916a359da7c429d2431ed060</sdk:checksum>
+                <sdk:url>sysimg_x86-19_r02.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+        <sdk:tag-id>default</sdk:tag-id>
+    </sdk:system-image>
+
+    <!-- MIPS SYSTEM IMAGES ........................ -->
+
+    <sdk:system-image>
+        <sdk:revision>1</sdk:revision>
+        <sdk:description>Android 4.0.4</sdk:description>
+        <sdk:api-level>15</sdk:api-level>
+        <sdk:abi>mips</sdk:abi>
+        <sdk:uses-license ref="mips-android-sysimage-license"/>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>117503178</sdk:size>
+                <sdk:checksum type="sha1">a753bb4a6783124dad726c500ce9aec9d2c1b2d9</sdk:checksum>
+                <sdk:url>sysimg_mips-15_r01.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:tag-id>default</sdk:tag-id>
+    </sdk:system-image>
+
+    <sdk:system-image>
+        <sdk:revision>4</sdk:revision>
+        <!-- mipsia repo tag qa-dev-mips-jb-20130123,
+             github.com/MIPS branch dev-mips-jb, tag mips-jb-4.1.2_r1m1
+             repo init -u git://github.com/MIPS/manifests.git
+                 -b dev-mips-jb -m mips-jb-4.1.2_r1m1.xml           -->
+        <sdk:description>Android 4.1.2</sdk:description>
+        <sdk:api-level>16</sdk:api-level>
+        <sdk:abi>mips</sdk:abi>
+        <sdk:uses-license ref="mips-android-sysimage-license"/>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>122482530</sdk:size>
+                <sdk:checksum type="sha1">67943c54fb3943943ffeb05fdd39c0b753681f6e</sdk:checksum>
+                <sdk:url>sysimg_mips-16_r04.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:tag-id>default</sdk:tag-id>
+    </sdk:system-image>
+
+    <sdk:system-image>
+        <sdk:revision>1</sdk:revision>
+        <!-- mipsia repo tag qa-dev-mips-jb-mr1-20121219,
+             github.com/MIPS tag mips-jb-4.2.1_r1 -->
+        <sdk:description>Android 4.2.1</sdk:description>
+        <sdk:api-level>17</sdk:api-level>
+        <sdk:abi>mips</sdk:abi>
+        <sdk:uses-license ref="mips-android-sysimage-license"/>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>131781761</sdk:size>
+                <sdk:checksum type="sha1">f0c6e153bd584c29e51b5c9723cfbf30f996a05d</sdk:checksum>
+                <sdk:url>sysimg_mips-17_r01.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:tag-id>default</sdk:tag-id>
+    </sdk:system-image>
+
+</sdk:sdk-sys-img>
diff --git a/pkgs/development/mobile/androidenv/sysimages.nix b/pkgs/development/mobile/androidenv/sysimages.nix
index bbbf3a4fc687..ddc6dd99d39d 100644
--- a/pkgs/development/mobile/androidenv/sysimages.nix
+++ b/pkgs/development/mobile/androidenv/sysimages.nix
@@ -14,113 +14,137 @@ in
 {
 
   sysimg_armeabi-v7a_14 = buildSystemImage {
-    name = "armeabi-v7a-14";
+    name = "sysimg-armeabi-v7a-14";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-14_r02.zip;
+      url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_armv7a-14_r02.zip;
       sha1 = "d8991b0c06b18d7d6ed4169d67460ee1add6661b";
     };
   };
     
   sysimg_armeabi-v7a_15 = buildSystemImage {
-    name = "armeabi-v7a-15";
+    name = "sysimg-armeabi-v7a-15";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-15_r02.zip;
+      url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_armv7a-15_r02.zip;
       sha1 = "1bf977d6cb4e0ad38dceac0c4863d1caa21f326e";
     };
   };
     
   sysimg_armeabi-v7a_16 = buildSystemImage {
-    name = "armeabi-v7a-16";
+    name = "sysimg-armeabi-v7a-16";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-16_r03.zip;
+      url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_armv7a-16_r03.zip;
       sha1 = "d1cddb23f17aad5821a089c403d4cddad2cf9ef7";
     };
   };
     
   sysimg_armeabi-v7a_17 = buildSystemImage {
-    name = "armeabi-v7a-17";
+    name = "sysimg-armeabi-v7a-17";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-17_r02.zip;
+      url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_armv7a-17_r02.zip;
       sha1 = "1c321cda1af793b84d47d1a8d15f85444d265e3c";
     };
   };
     
   sysimg_armeabi-v7a_18 = buildSystemImage {
-    name = "armeabi-v7a-18";
+    name = "sysimg-armeabi-v7a-18";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-18_r02.zip;
+      url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_armv7a-18_r02.zip;
       sha1 = "4a1a93200210d8c42793324362868846f67401ab";
     };
   };
     
   sysimg_armeabi-v7a_19 = buildSystemImage {
-    name = "armeabi-v7a-19";
+    name = "sysimg-armeabi-v7a-19";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-19_r01.zip;
-      sha1 = "12dd1187dfd953b1ffcef5067d94578590f9e600";
+      url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_armv7a-19_r02.zip;
+      sha1 = "e0d375397e28e3d5d9577a00132463a4696248e5";
+    };
+  };
+    
+  sysimg_armeabi-v7a_20 = buildSystemImage {
+    name = "sysimg-armeabi-v7a-20";
+    src = fetchurl {
+      url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_armv7a-L_r01.zip;
+      sha1 = "1d5d81a7078b5b2a685620d93e1e04a51d2e786a";
+    };
+  };
+    
+  sysimg_x86_20 = buildSystemImage {
+    name = "sysimg-x86-20";
+    src = fetchurl {
+      url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-L_r01.zip;
+      sha1 = "c2d32d6244821ff59f370469778525f6a5345010";
     };
   };
     
   sysimg_x86_10 = buildSystemImage {
-    name = "x86-10";
+    name = "sysimg-x86-10";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/sys-img/x86/sysimg_x86-10_r02.zip;
+      url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-10_r02.zip;
       sha1 = "34e2436f69606cdfe35d3ef9112f0c64e3ff021d";
     };
   };
     
   sysimg_x86_15 = buildSystemImage {
-    name = "x86-15";
+    name = "sysimg-x86-15";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/sys-img/x86/sysimg_x86-15_r01.zip;
+      url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-15_r01.zip;
       sha1 = "d540325952e0f097509622b9e685737584b83e40";
     };
   };
     
   sysimg_x86_16 = buildSystemImage {
-    name = "x86-16";
+    name = "sysimg-x86-16";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/sys-img/x86/sysimg_x86-16_r01.zip;
+      url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-16_r01.zip;
       sha1 = "9d35bcaa4f9b40443941f32b8a50337f413c021a";
     };
   };
     
   sysimg_x86_17 = buildSystemImage {
-    name = "x86-17";
+    name = "sysimg-x86-17";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/sys-img/x86/sysimg_x86-17_r01.zip;
+      url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-17_r01.zip;
       sha1 = "ddb3313e8dcd07926003f7b828eafea1115ea35b";
     };
   };
     
   sysimg_x86_18 = buildSystemImage {
-    name = "x86-18";
+    name = "sysimg-x86-18";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/sys-img/x86/sysimg_x86-18_r01.zip;
+      url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-18_r01.zip;
       sha1 = "f11bc9fccd3e7e46c07d8b26e112a8d0b45966c1";
     };
   };
     
-  sysimg_mips_15 = buildSystemImage {
-    name = "mips-15";
+  sysimg_x86_19 = buildSystemImage {
+    name = "sysimg-x86-19";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/sys-img/mips/sysimg_mips-15_r01.zip;
+      url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-19_r02.zip;
+      sha1 = "8889cb418984a2a7916a359da7c429d2431ed060";
+    };
+  };
+    
+  sysimg_mips_15 = buildSystemImage {
+    name = "sysimg-mips-15";
+    src = fetchurl {
+      url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_mips-15_r01.zip;
       sha1 = "a753bb4a6783124dad726c500ce9aec9d2c1b2d9";
     };
   };
     
   sysimg_mips_16 = buildSystemImage {
-    name = "mips-16";
+    name = "sysimg-mips-16";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/sys-img/mips/sysimg_mips-16_r04.zip;
+      url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_mips-16_r04.zip;
       sha1 = "67943c54fb3943943ffeb05fdd39c0b753681f6e";
     };
   };
     
   sysimg_mips_17 = buildSystemImage {
-    name = "mips-17";
+    name = "sysimg-mips-17";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/sys-img/mips/sysimg_mips-17_r01.zip;
+      url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_mips-17_r01.zip;
       sha1 = "f0c6e153bd584c29e51b5c9723cfbf30f996a05d";
     };
   };

From 7b7fd5044fd41252d3f3da156e139b08ad6cb2ad Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Tue, 2 Sep 2014 19:19:03 +0200
Subject: [PATCH 1178/1453] androidsdk: remove obsolete workaround

---
 pkgs/development/mobile/androidenv/androidsdk.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix
index 1a5cf9500cdd..560753eecfc5 100644
--- a/pkgs/development/mobile/androidenv/androidsdk.nix
+++ b/pkgs/development/mobile/androidenv/androidsdk.nix
@@ -48,9 +48,6 @@ stdenv.mkDerivation rec {
         done
       ''}
       
-      # Patch the path to the executable so that it can find sdkmanager.jar file
-      #sed -i -e 's|frameworkdir="\$progdir"|'"frameworkdir=$(echo $out/libexec/android-sdk-*/tools/lib)|" android
-      
       # The android script used SWT and wants to dynamically load some GTK+ stuff.
       # The following wrapper ensures that they can be found:
       wrapProgram `pwd`/android \

From 6734f37ec6b7d263374f0a6ef9a1cdeab68be1d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 2 Sep 2014 21:52:34 +0200
Subject: [PATCH 1179/1453] twinkle: disable parallel building, as it was
 failing

http://hydra.nixos.org/build/13919809
---
 .../networking/instant-messengers/twinkle/default.nix           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/twinkle/default.nix b/pkgs/applications/networking/instant-messengers/twinkle/default.nix
index 2e6b904c134e..c7f33c1f5805 100644
--- a/pkgs/applications/networking/instant-messengers/twinkle/default.nix
+++ b/pkgs/applications/networking/instant-messengers/twinkle/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_LINK = "-Wl,--as-needed -lboost_regex -lasound -lzrtpcpp -lspeex -lspeexdsp";
 
-  enableParallelBuilding = true;
+  #enableParallelBuilding = true; # fatal error: messageform.h: No such file or directory
 
   meta = with stdenv.lib; {
     homepage = http://www.twinklephone.com/;

From e39b1f4ec8740e7dd34185c38464db5ac814eed5 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 3 Sep 2014 02:09:52 +0400
Subject: [PATCH 1180/1453] Add a few meta-attribute descriptions; rewrite the
 meta-attribure list description to mean that it is expected that all used
 meta-attributes are described in the manual.

---
 doc/meta.xml | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/doc/meta.xml b/doc/meta.xml
index e91f94d15c24..fc0ff9777922 100644
--- a/doc/meta.xml
+++ b/doc/meta.xml
@@ -84,8 +84,7 @@ hello-2.3  A program that produces a familiar, friendly greeting
 
 <section><title>Standard meta-attributes</title>
 
-<para>The following meta-attributes have a standard
-interpretation:</para>
+<para>It is expected that each meta-attribute is one of the following:</para>
 
 <variablelist>
 
@@ -112,12 +111,23 @@ interpretation:</para>
     package.</para></listitem>
   </varlistentry>
 
+  <varlistentry>
+    <term><varname>version</varname></term>
+    <listitem><para>Package version.</para></listitem>
+  </varlistentry>
+
   <varlistentry>
     <term><varname>homepage</varname></term>
     <listitem><para>The package’s homepage.  Example:
     <literal>http://www.gnu.org/software/hello/manual/</literal></para></listitem>
   </varlistentry>
 
+  <varlistentry>
+    <term><varname>downloadPage</varname></term>
+    <listitem><para>The page where a link to the current version can be found.  Example:
+    <literal>http://ftp.gnu.org/gnu/hello/</literal></para></listitem>
+  </varlistentry>
+
   <varlistentry>
     <term><varname>license</varname></term>
     <listitem><para>The license for the package. One from the
@@ -195,6 +205,16 @@ meta.hydraPlatforms = [];
     they are fixed.</para></listitem>
   </varlistentry>
 
+  <varlistentry>
+    <term><varname>updateWalker</varname></term>
+    <listitem><para>If set to <literal>true</literal>, the package is
+    tested to be updated correctly by the <literal>update-walker.sh</literal>
+    script without additional settings. Such packages have
+    <varname>meta.version</varname> set and their homepage (or
+    the page specified by <varname>meta.downloadPage</varname>) contains
+    a direct link to the package tarball.</para></listitem>
+  </varlistentry>
+
 </variablelist>
 
 
@@ -256,9 +276,9 @@ to indicate the specific license:
 </variablelist>
 
 </para>
-  
+
 
 </section>
-  
+
 
 </chapter>

From 9659d0f4fb5cc596e7574dc5dbaf0b4075fb1955 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 2 Sep 2014 15:36:25 -0700
Subject: [PATCH 1181/1453] nixos/dnsmasq: Fix regressions during the systemd
 update

---
 nixos/modules/services/networking/dnsmasq.nix | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/networking/dnsmasq.nix b/nixos/modules/services/networking/dnsmasq.nix
index d2a8af6ac8b1..31d57a648bfa 100644
--- a/nixos/modules/services/networking/dnsmasq.nix
+++ b/nixos/modules/services/networking/dnsmasq.nix
@@ -11,7 +11,10 @@ let
       conf-file=/etc/dnsmasq-conf.conf
       resolv-file=/etc/dnsmasq-resolv.conf
     ''}
-      ${cfg.extraConfig}
+    ${flip concatMapStrings cfg.servers (server: ''
+      server=${server}
+    '')}
+    ${cfg.extraConfig}
   '';
 
 in
@@ -43,12 +46,10 @@ in
         default = [];
         example = [ "8.8.8.8" "8.8.4.4" ];
         description = ''
-          The parameter to dnsmasq -S.
+          The dns servers which dnsmasq should query.
         '';
       };
 
-
-
       extraConfig = mkOption {
         type = types.string;
         default = "";
@@ -67,8 +68,8 @@ in
 
   config = mkIf config.services.dnsmasq.enable {
 
-    environment.systemPackages = [ dnsmasq ]
-      ++ (if cfg.resolveLocalQueries then [ pkgs.openresolv ] else []);
+    networking.nameservers =
+      optional cfg.resolveLocalQueries "127.0.0.1";
 
     services.dbus.packages = [ dnsmasq ];
 
@@ -83,10 +84,14 @@ in
         description = "dnsmasq daemon";
         after = [ "network.target" ];
         wantedBy = [ "multi-user.target" ];
+        path = [ dnsmasq ];
+        preStart = ''
+          touch /etc/dnsmasq-{conf,resolv}.conf
+          dnsmasq --test
+        '';
         serviceConfig = {
           Type = "dbus";
           BusName = "uk.org.thekelleys.dnsmasq";
-          ExecStartPre = "${dnsmasq}/bin/dnsmasq --test";
           ExecStart = "${dnsmasq}/bin/dnsmasq -k --enable-dbus --user=dnsmasq -C ${dnsmasqConf}";
           ExecReload = "${dnsmasq}/bin/kill -HUP $MAINPID";
         };

From 0bf05a02f4a1637a1b9a06ce886350e2ea9f2b96 Mon Sep 17 00:00:00 2001
From: Michael Fellinger <m.fellinger@gmail.com>
Date: Wed, 3 Sep 2014 02:30:04 +0200
Subject: [PATCH 1182/1453] diod: add systemd service and config

---
 nixos/modules/module-list.nix                 |   1 +
 .../services/network-filesystems/diod.nix     | 164 ++++++++++++++++++
 2 files changed, 165 insertions(+)
 create mode 100644 nixos/modules/services/network-filesystems/diod.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 76d1ed8a9d43..3604753c8804 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -192,6 +192,7 @@
   ./services/network-filesystems/openafs-client/default.nix
   ./services/network-filesystems/rsyncd.nix
   ./services/network-filesystems/samba.nix
+  ./services/network-filesystems/diod.nix
   ./services/networking/amuled.nix
   ./services/networking/atftpd.nix
   ./services/networking/avahi-daemon.nix
diff --git a/nixos/modules/services/network-filesystems/diod.nix b/nixos/modules/services/network-filesystems/diod.nix
new file mode 100644
index 000000000000..efd8e1018f16
--- /dev/null
+++ b/nixos/modules/services/network-filesystems/diod.nix
@@ -0,0 +1,164 @@
+{ config, lib, pkgs, ... }:
+with lib;
+let
+  cfg = config.services.diod;
+
+  diodBool = b: if b then "1" else "0";
+
+  diodConfig = pkgs.writeText "diod.conf" ''
+    allsquash = ${diodBool cfg.allsquash}
+    auth_required = ${diodBool cfg.authRequired}
+    exportall = ${diodBool cfg.exportall}
+    exportopts = "${concatStringsSep "," cfg.exportopts}"
+    exports = { ${concatStringsSep ", " (map (s: ''"${s}"'' ) cfg.exports)} }
+    listen = { ${concatStringsSep ", " (map (s: ''"${s}"'' ) cfg.listen)} }
+    logdest = "${cfg.logdest}"
+    nwthreads = ${toString cfg.nwthreads}
+    squashuser = "${cfg.squashuser}"
+    statfs_passthru = ${diodBool cfg.statfsPassthru}
+    userdb = ${diodBool cfg.userdb}
+    ${cfg.extraConfig}
+  '';
+in
+{
+  options = {
+    services.diod = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Whether to enable the diod 9P file server.";
+      };
+
+      listen = mkOption {
+        type = types.listOf types.str;
+        default = [ ];
+        description = ''
+          [ "IP:PORT" [,"IP:PORT",...] ]
+          List the interfaces and ports that diod should listen on.
+        '';
+      };
+
+      exports = mkOption {
+        type = types.listOf types.path;
+        default = [];
+        description = ''
+          List the file systems that clients will be allowed to mount. All paths should
+          be fully qualified. The exports table can include two types of element:
+          a string element (as above),
+          or an alternate table element form { path="/path", opts="ro" }.
+          In the alternate form, the (optional) opts attribute is a comma-separated list
+          of export options. The two table element forms can be mixed in the exports
+          table. Note that although diod will not traverse file system boundaries for a
+          given mount due to inode uniqueness constraints, subdirectories of a file
+          system can be separately exported.
+        '';
+      };
+
+      exportall = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Export all file systems listed in /proc/mounts. If new file systems are mounted
+          after diod has started, they will become immediately mountable. If there is a
+          duplicate entry for a file system in the exports list, any options listed in
+          the exports entry will apply.
+        '';
+      };
+
+      exportopts = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        description = ''
+          Establish a default set of export options. These are overridden, not appended
+          to, by opts attributes in an "exports" entry.
+        '';
+      };
+
+      nwthreads = mkOption {
+        type = types.int;
+        default = 16;
+        description = ''
+          Sets the (fixed) number of worker threads created to handle 9P
+          requests for a unique aname. The default is 16 per aname.
+        '';
+      };
+
+      authRequired = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Allow clients to connect without authentication, i.e. without a valid MUNGE credential.
+          Default is false.
+        '';
+      };
+
+      userdb = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          This option disables password/group lookups. It allows any uid to attach and
+          assumes gid=uid, and supplementary groups contain only the primary gid.
+          Default is false
+        '';
+      };
+
+      allsquash = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Remap all users to "nobody". The attaching user need not be present in the
+          password file.
+          Default is true
+        '';
+      };
+
+      squashuser = mkOption {
+        type = types.str;
+        default = "nobody";
+        description = ''
+          Change the squash user from the default of "nobody". The squash user must be
+          present in the password file.
+        '';
+      };
+
+      logdest = mkOption {
+        type = types.str;
+        default = "syslog:daemon:err";
+        description = ''
+          Set the destination for logging.
+          DEST is in the form of "syslog:facility:level" or "filename".
+          The default is "syslog:daemon:err".
+        '';
+      };
+
+
+      statfsPassthru = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          This option configures statfs to return the host file system's type
+          rather than V9FS_MAGIC. The default is false (return V9FS_MAGIC).
+        '';
+      };
+
+      extraConfig = mkOption {
+        type = types.lines;
+        default = "";
+        description = "Extra configuration options for diod.conf.";
+      };
+    };
+  };
+
+  config = mkIf config.services.diod.enable {
+    environment.systemPackages = [ pkgs.diod ];
+
+    systemd.services.diod = {
+      description = "diod 9P file server";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
+      serviceConfig = {
+        ExecStart = "${pkgs.diod}/sbin/diod -c ${diodConfig}";
+      };
+    };
+  };
+}

From e805c78ed3a19c362305a2c7633e0d718c4e2665 Mon Sep 17 00:00:00 2001
From: Michael Fellinger <m.fellinger@gmail.com>
Date: Wed, 3 Sep 2014 02:55:00 +0200
Subject: [PATCH 1183/1453] diod: remove redundant default doc

---
 nixos/modules/services/network-filesystems/diod.nix | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/services/network-filesystems/diod.nix b/nixos/modules/services/network-filesystems/diod.nix
index efd8e1018f16..1ab5f52d438c 100644
--- a/nixos/modules/services/network-filesystems/diod.nix
+++ b/nixos/modules/services/network-filesystems/diod.nix
@@ -79,7 +79,7 @@ in
         default = 16;
         description = ''
           Sets the (fixed) number of worker threads created to handle 9P
-          requests for a unique aname. The default is 16 per aname.
+          requests for a unique aname.
         '';
       };
 
@@ -88,7 +88,6 @@ in
         default = false;
         description = ''
           Allow clients to connect without authentication, i.e. without a valid MUNGE credential.
-          Default is false.
         '';
       };
 
@@ -98,7 +97,6 @@ in
         description = ''
           This option disables password/group lookups. It allows any uid to attach and
           assumes gid=uid, and supplementary groups contain only the primary gid.
-          Default is false
         '';
       };
 
@@ -108,7 +106,6 @@ in
         description = ''
           Remap all users to "nobody". The attaching user need not be present in the
           password file.
-          Default is true
         '';
       };
 
@@ -116,8 +113,7 @@ in
         type = types.str;
         default = "nobody";
         description = ''
-          Change the squash user from the default of "nobody". The squash user must be
-          present in the password file.
+          Change the squash user. The squash user must be present in the password file.
         '';
       };
 
@@ -126,8 +122,7 @@ in
         default = "syslog:daemon:err";
         description = ''
           Set the destination for logging.
-          DEST is in the form of "syslog:facility:level" or "filename".
-          The default is "syslog:daemon:err".
+          The value has the form of "syslog:facility:level" or "filename".
         '';
       };
 
@@ -137,7 +132,7 @@ in
         default = false;
         description = ''
           This option configures statfs to return the host file system's type
-          rather than V9FS_MAGIC. The default is false (return V9FS_MAGIC).
+          rather than V9FS_MAGIC.
         '';
       };
 

From ccc758f414821d7115dfddc3c05ab1adfb1a11f7 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 2 Sep 2014 18:56:53 -0700
Subject: [PATCH 1184/1453] nixos/install-grub: Fix typo

---
 nixos/modules/system/boot/loader/grub/install-grub.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index 4e196d67e931..668e74a9722e 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -135,7 +135,7 @@ sub GrubFs {
             if ($fs->type eq 'btrfs') {
                 my ($status, @id_info) = runCommand("btrfs subvol show @{[$fs->mount]}");
                 if ($status != 0) {
-                    die "Failed to retreive subvolume info for @{[$fs->mount]}\n";
+                    die "Failed to retrieve subvolume info for @{[$fs->mount]}\n";
                 }
                 my @ids = join("", @id_info) =~ m/Object ID:[ \t\n]*([^ \t\n]*)/;
                 if ($#ids > 0) {

From c369c4afbd8ca0e1d43e53408383bb623fe41a79 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 2 Sep 2014 18:57:09 -0700
Subject: [PATCH 1185/1453] grub2: Fix zfs support

---
 pkgs/tools/misc/grub/2.0x.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix
index e3c07af759c9..fdb2ae556e8d 100644
--- a/pkgs/tools/misc/grub/2.0x.nix
+++ b/pkgs/tools/misc/grub/2.0x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autogen, flex, bison, python, autoconf, automake
+{ stdenv, fetchurl, fetchgit, autogen, flex, bison, python, autoconf, automake
 , gettext, ncurses, libusb, freetype, qemu, devicemapper
 , linuxPackages ? null
 , efiSupport ? false
@@ -14,9 +14,9 @@ let
 
   canEfi = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) efiSystems);
 
-  prefix = "grub${if efiSupport then "-efi" else ""}";
+  prefix = "grub${if efiSupport then "-efi" else ""}${optionalString zfsSupport "-zfs"}";
 
-  version = "2.02-beta2";
+  version = "2.02-git-1de3a4";
 
   unifont_bdf = fetchurl {
     url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz";
@@ -30,10 +30,10 @@ assert zfsSupport -> linuxPackages != null && linuxPackages.zfs != null;
 stdenv.mkDerivation rec {
   name = "${prefix}-${version}";
 
-  src = fetchurl {
-    name = "grub-2.02-beta2.tar.xz";
-    url = "http://alpha.gnu.org/gnu/grub/grub-2.02~beta2.tar.xz";
-    sha256 = "13a13fhc0wf473dn73zhga15mjvkg6vqp4h25dxg4n7am2r05izn";
+  src = fetchgit {
+    url = "git://git.savannah.gnu.org/grub.git";
+    rev = "1de3a48098053aaebd35232bd73e3ce3f3fdf51c";
+    sha256 = "0d1953nmi251czkm1dmd7vnm3iz2rkqbznlp6ph33va0d7kw1kfc";
   };
 
   nativeBuildInputs = [ autogen flex bison python autoconf automake ];

From 626a666da53229e463549bca0d24e2b21a4801cd Mon Sep 17 00:00:00 2001
From: Josh Cartwright <joshc@eso.teric.us>
Date: Wed, 3 Sep 2014 05:36:45 +0200
Subject: [PATCH 1186/1453] gummiboot/builder: fix timeout setting when unset

The gummiboot-builder.py script is expecting the @timeout@ metavar to be
substituted for either an empty string (in the case where a user has
left the timeout unset) or the actual value set in the system
configuration.

However, the config.boot.loader.gummiboot.timeout option defaults to
'null', and due to the way pkgs.substituteAll works, the substitution
for '@timeout@' is _never_ set to the empty string.  This causes the
builder script to put a bogus line into /boot/loader/loader.conf:

   timeout @timeout@

Fix this by explicitly setting 'timeout' to the empty string when it's
unset in the system configuration.

Signed-off-by: Josh Cartwright <joshc@eso.teric.us>
---
 nixos/modules/system/boot/loader/gummiboot/gummiboot.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/loader/gummiboot/gummiboot.nix b/nixos/modules/system/boot/loader/gummiboot/gummiboot.nix
index e7a481e90a79..003f72b37f9e 100644
--- a/nixos/modules/system/boot/loader/gummiboot/gummiboot.nix
+++ b/nixos/modules/system/boot/loader/gummiboot/gummiboot.nix
@@ -16,7 +16,7 @@ let
 
     nix = config.nix.package;
 
-    inherit (cfg) timeout;
+    timeout = if cfg.timeout != null then cfg.timeout else "";
 
     inherit (efi) efiSysMountPoint canTouchEfiVariables;
   };

From 28af151e1a0c010da8b98d3a33245ab78b3cfd9a Mon Sep 17 00:00:00 2001
From: Justin Bedo <cu@cua0.org>
Date: Wed, 3 Sep 2014 15:48:33 +1000
Subject: [PATCH 1187/1453] Added missing curl dependency to RCurl package

---
 pkgs/development/r-modules/cran-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix
index dcffbccb510a..e986944d45df 100644
--- a/pkgs/development/r-modules/cran-packages.nix
+++ b/pkgs/development/r-modules/cran-packages.nix
@@ -38,7 +38,7 @@
 
 let
 
-  inherit (pkgs) R fetchurl stdenv;
+  inherit (pkgs) R fetchurl stdenv curl;
 
   buildRPackage = import ./generic-builder.nix R;
 
@@ -4252,7 +4252,7 @@ let self = _self // overrides; _self = with self; {
   rcqp = derive { name="rcqp"; version="0.3"; sha256="0vxcgchnxdsdamclcshjbkn00ysmfmqp586a36wsyv3zqrd6rg7p"; depends=[plyr]; };
   Rcsdp = derive { name="Rcsdp"; version="0.1.53"; sha256="0x91hyx6z9f4zd7djxlq7dnznmr9skyzwbbcbjyid9hxbcfyvhcp"; depends=[]; };
   rCUR = derive { name="rCUR"; version="1.3"; sha256="1f38xbc5n91k2y88cg0sv1z2p4g5vl7v2k1024f42f7526g2p2lx"; depends=[MASS Matrix lattice]; };
-  RCurl = derive { name="RCurl"; version="1.95-4.3"; sha256="1gyjarnxwz3ldpm1vwq9ls6al66rvs7yshzhrl1fv9lbm1qi8yfg"; depends=[bitops]; };
+  RCurl = derive { name="RCurl"; version="1.95-4.3"; sha256="1gyjarnxwz3ldpm1vwq9ls6al66rvs7yshzhrl1fv9lbm1qi8yfg"; depends=[bitops curl]; };
   Rd2roxygen = derive { name="Rd2roxygen"; version="1.4"; sha256="09dxgp65zac5b9mxbjrvy3ihdwski98xva5afq659b8yfvkviq4g"; depends=[roxygen2 formatR]; };
   rda = derive { name="rda"; version="1.0.2-2"; sha256="1g2q7c0y138i9r7jgjrlpqznvwpqsj6f7vljqqfzh2l6kcj43vjj"; depends=[]; };
   rdatamarket = derive { name="rdatamarket"; version="0.6.4"; sha256="16a1yxvf841505a8gh7jf09fx6ipysymrpvsd4b07xdg5hvbzx25"; depends=[zoo RCurl RJSONIO]; };

From 74343ca3abe9968e1f59eda56627023a07270440 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 3 Sep 2014 10:11:18 +0400
Subject: [PATCH 1188/1453] =?UTF-8?q?Fix=20handling=20of=20paths=20with=20?=
 =?UTF-8?q?multuple=20mounts=20=E2=80=94=20for=20example=20rootfs=20first?=
 =?UTF-8?q?=20mount=20for=20/?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/tools/filesystems/btrfsprogs/default.nix       |  2 ++
 .../filesystems/btrfsprogs/multiple_mounts.patch    | 13 +++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/tools/filesystems/btrfsprogs/multiple_mounts.patch

diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix
index 02f214ad430e..79566d15bb9a 100644
--- a/pkgs/tools/filesystems/btrfsprogs/default.nix
+++ b/pkgs/tools/filesystems/btrfsprogs/default.nix
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
     asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt
   ];
 
+  patches = [ ./multiple_mounts.patch ];
+
   # for btrfs to get the rpath to libgcc_s, needed for pthread_cancel to work
   NIX_CFLAGS_LINK = "-lgcc_s";
 
diff --git a/pkgs/tools/filesystems/btrfsprogs/multiple_mounts.patch b/pkgs/tools/filesystems/btrfsprogs/multiple_mounts.patch
new file mode 100644
index 000000000000..0ba6550a2d3b
--- /dev/null
+++ b/pkgs/tools/filesystems/btrfsprogs/multiple_mounts.patch
@@ -0,0 +1,13 @@
+Only in btrfs-progs-v3.16-orig: btrfs-progs-v3.16
+diff -U3 -r btrfs-progs-v3.16-orig/utils.c btrfs-progs-v3.16/utils.c
+--- btrfs-progs-v3.16-orig/utils.c	2014-09-03 09:57:45.644858545 +0400
++++ btrfs-progs-v3.16/utils.c	2014-09-03 09:59:26.968855663 +0400
+@@ -2360,7 +2360,7 @@
+ 		len = strlen(ent->mnt_dir);
+ 		if (strncmp(ent->mnt_dir, path, len) == 0) {
+ 			/* match found */
+-			if (longest_matchlen < len) {
++			if ((longest_matchlen < len) || (longest_matchlen==len && not_btrfs)) {
+ 				free(longest_match);
+ 				longest_matchlen = len;
+ 				longest_match = strdup(ent->mnt_dir);

From 33a3f76ee4e4fe7040aef35d5c01e23f68b4797b Mon Sep 17 00:00:00 2001
From: Nathan Bijnens <nathan@nathan.gs>
Date: Wed, 3 Sep 2014 10:39:48 +0400
Subject: [PATCH 1189/1453]  Copy.com: client #3617

---
 nixos/modules/module-list.nix                 |     1 +
 nixos/modules/module-list.nix.orig            |   372 +
 .../modules/services/networking/copy-com.nix  |    53 +
 .../networking/copy-com/default.nix           |    58 +
 pkgs/top-level/all-packages.nix               |     2 +
 pkgs/top-level/all-packages.nix.orig          | 11653 ++++++++++++++++
 6 files changed, 12139 insertions(+)
 mode change 100644 => 100755 nixos/modules/module-list.nix
 create mode 100644 nixos/modules/module-list.nix.orig
 create mode 100644 nixos/modules/services/networking/copy-com.nix
 create mode 100644 pkgs/applications/networking/copy-com/default.nix
 create mode 100644 pkgs/top-level/all-packages.nix.orig

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
old mode 100644
new mode 100755
index 3604753c8804..7679d3e6ac44
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -203,6 +203,7 @@
   ./services/networking/cjdns.nix
   ./services/networking/cntlm.nix
   ./services/networking/connman.nix
+  ./services/networking/copy-com.nix
   ./services/networking/ddclient.nix
   ./services/networking/dhcpcd.nix
   ./services/networking/dhcpd.nix
diff --git a/nixos/modules/module-list.nix.orig b/nixos/modules/module-list.nix.orig
new file mode 100644
index 000000000000..3604753c8804
--- /dev/null
+++ b/nixos/modules/module-list.nix.orig
@@ -0,0 +1,372 @@
+[
+  ./config/fonts/corefonts.nix
+  ./config/fonts/fontconfig.nix
+  ./config/fonts/fontdir.nix
+  ./config/fonts/fonts.nix
+  ./config/fonts/ghostscript.nix
+  ./config/gnu.nix
+  ./config/gtk-exe-env.nix
+  ./config/i18n.nix
+  ./config/krb5.nix
+  ./config/ldap.nix
+  ./config/networking.nix
+  ./config/no-x-libs.nix
+  ./config/nsswitch.nix
+  ./config/power-management.nix
+  ./config/pulseaudio.nix
+  ./config/qt-plugin-env.nix
+  ./config/shells-environment.nix
+  ./config/swap.nix
+  ./config/sysctl.nix
+  ./config/system-environment.nix
+  ./config/system-path.nix
+  ./config/timezone.nix
+  ./config/vpnc.nix
+  ./config/unix-odbc-drivers.nix
+  ./config/users-groups.nix
+  ./config/zram.nix
+  ./hardware/all-firmware.nix
+  ./hardware/cpu/amd-microcode.nix
+  ./hardware/cpu/intel-microcode.nix
+  ./hardware/network/b43.nix
+  ./hardware/network/intel-2100bg.nix
+  ./hardware/network/intel-2200bg.nix
+  ./hardware/network/intel-3945abg.nix
+  ./hardware/network/ralink.nix
+  ./hardware/network/rtl8192c.nix
+  ./hardware/opengl.nix
+  ./hardware/pcmcia.nix
+  ./hardware/video/bumblebee.nix
+  ./hardware/video/nvidia.nix
+  ./installer/tools/nixos-checkout.nix
+  ./installer/tools/tools.nix
+  ./misc/assertions.nix
+  ./misc/check-config.nix
+  ./misc/crashdump.nix
+  ./misc/ids.nix
+  ./misc/lib.nix
+  ./misc/locate.nix
+  ./misc/meta.nix
+  ./misc/nixpkgs.nix
+  ./misc/passthru.nix
+  ./misc/version.nix
+  ./programs/atop.nix
+  ./programs/bash/bash.nix
+  ./programs/bash/command-not-found.nix
+  ./programs/blcr.nix
+  ./programs/dconf.nix
+  ./programs/environment.nix
+  ./programs/info.nix
+  ./programs/nano.nix
+  ./programs/screen.nix
+  ./programs/shadow.nix
+  ./programs/shell.nix
+  ./programs/ssh.nix
+  ./programs/ssmtp.nix
+  ./programs/uim.nix
+  ./programs/venus.nix
+  ./programs/wvdial.nix
+  ./programs/freetds.nix
+  ./programs/zsh/zsh.nix
+  ./rename.nix
+  ./security/apparmor.nix
+  ./security/apparmor-suid.nix
+  ./security/ca.nix
+  ./security/duosec.nix
+  ./security/grsecurity.nix
+  ./security/pam.nix
+  ./security/pam_usb.nix
+  ./security/polkit.nix
+  ./security/prey.nix
+  ./security/rngd.nix
+  ./security/rtkit.nix
+  ./security/setuid-wrappers.nix
+  ./security/sudo.nix
+  ./services/amqp/activemq/default.nix
+  ./services/amqp/rabbitmq.nix
+  ./services/audio/alsa.nix
+  ./services/audio/fuppes.nix
+  ./services/audio/mpd.nix
+  ./services/audio/mopidy.nix
+  ./services/backup/almir.nix
+  ./services/backup/bacula.nix
+  ./services/backup/mysql-backup.nix
+  ./services/backup/postgresql-backup.nix
+  ./services/backup/rsnapshot.nix
+  ./services/backup/sitecopy-backup.nix
+  ./services/backup/tarsnap.nix
+  ./services/continuous-integration/jenkins/default.nix
+  ./services/continuous-integration/jenkins/slave.nix
+  ./services/databases/4store-endpoint.nix
+  ./services/databases/4store.nix
+  ./services/databases/couchdb.nix
+  ./services/databases/firebird.nix
+  ./services/databases/influxdb.nix
+  ./services/databases/memcached.nix
+  ./services/databases/monetdb.nix
+  ./services/databases/mongodb.nix
+  ./services/databases/mysql.nix
+  ./services/databases/neo4j.nix 
+  ./services/databases/openldap.nix
+  ./services/databases/postgresql.nix
+  ./services/databases/redis.nix
+  ./services/databases/virtuoso.nix
+  ./services/desktops/accountsservice.nix
+  ./services/desktops/geoclue2.nix
+  ./services/desktops/gnome3/at-spi2-core.nix
+  ./services/desktops/gnome3/evolution-data-server.nix
+  ./services/desktops/gnome3/gnome-documents.nix
+  ./services/desktops/gnome3/gnome-keyring.nix
+  ./services/desktops/gnome3/gnome-online-accounts.nix
+  ./services/desktops/gnome3/gnome-online-miners.nix
+  ./services/desktops/gnome3/gnome-user-share.nix
+  ./services/desktops/gnome3/gvfs.nix
+  ./services/desktops/gnome3/seahorse.nix
+  ./services/desktops/gnome3/sushi.nix
+  ./services/desktops/gnome3/tracker.nix
+  ./services/desktops/telepathy.nix
+  ./services/games/ghost-one.nix
+  ./services/games/minecraft-server.nix
+  ./services/hardware/acpid.nix
+  ./services/hardware/amd-hybrid-graphics.nix
+  ./services/hardware/bluetooth.nix
+  ./services/hardware/nvidia-optimus.nix
+  ./services/hardware/pcscd.nix
+  ./services/hardware/pommed.nix
+  ./services/hardware/sane.nix
+  ./services/hardware/tcsd.nix
+  ./services/hardware/thinkfan.nix
+  ./services/hardware/udev.nix
+  ./services/hardware/udisks2.nix
+  ./services/hardware/upower.nix
+  ./services/logging/klogd.nix
+  ./services/logging/logcheck.nix
+  ./services/logging/logrotate.nix
+  ./services/logging/logstash.nix
+  ./services/logging/rsyslogd.nix
+  ./services/logging/syslogd.nix
+  ./services/logging/syslog-ng.nix
+  ./services/mail/dovecot.nix
+  ./services/mail/freepops.nix
+  ./services/mail/mail.nix
+  ./services/mail/mlmmj.nix
+  ./services/mail/opensmtpd.nix
+  ./services/mail/postfix.nix
+  ./services/mail/spamassassin.nix
+  #./services/misc/autofs.nix
+  ./services/misc/cgminer.nix
+  ./services/misc/dictd.nix
+  ./services/misc/disnix.nix
+  ./services/misc/felix.nix
+  ./services/misc/folding-at-home.nix
+  ./services/misc/gitolite.nix
+  ./services/misc/gpsd.nix
+  ./services/misc/nix-daemon.nix
+  ./services/misc/nix-gc.nix
+  ./services/misc/nixos-manual.nix
+  ./services/misc/nix-ssh-serve.nix
+  ./services/misc/rippled.nix
+  ./services/misc/rogue.nix
+  ./services/misc/siproxd.nix
+  ./services/misc/svnserve.nix
+  ./services/misc/synergy.nix
+  ./services/misc/uhub.nix
+  ./services/misc/zookeeper.nix
+  ./services/monitoring/apcupsd.nix
+  ./services/monitoring/dd-agent.nix
+  ./services/monitoring/graphite.nix
+  ./services/monitoring/monit.nix
+  ./services/monitoring/munin.nix
+  ./services/monitoring/nagios.nix
+  ./services/monitoring/riemann.nix
+  ./services/monitoring/riemann-dash.nix
+  ./services/monitoring/smartd.nix
+  ./services/monitoring/statsd.nix
+  ./services/monitoring/systemhealth.nix
+  ./services/monitoring/ups.nix
+  ./services/monitoring/uptime.nix
+  ./services/monitoring/zabbix-agent.nix
+  ./services/monitoring/zabbix-server.nix
+  ./services/network-filesystems/drbd.nix
+  ./services/network-filesystems/nfsd.nix
+  ./services/network-filesystems/openafs-client/default.nix
+  ./services/network-filesystems/rsyncd.nix
+  ./services/network-filesystems/samba.nix
+  ./services/network-filesystems/diod.nix
+  ./services/networking/amuled.nix
+  ./services/networking/atftpd.nix
+  ./services/networking/avahi-daemon.nix
+  ./services/networking/bind.nix
+  ./services/networking/bitlbee.nix
+  ./services/networking/btsync.nix
+  ./services/networking/chrony.nix
+  ./services/networking/cjdns.nix
+  ./services/networking/cntlm.nix
+  ./services/networking/connman.nix
+  ./services/networking/ddclient.nix
+  ./services/networking/dhcpcd.nix
+  ./services/networking/dhcpd.nix
+  ./services/networking/dnsmasq.nix
+  ./services/networking/ejabberd.nix
+  ./services/networking/firewall.nix
+  ./services/networking/flashpolicyd.nix
+  ./services/networking/freenet.nix
+  ./services/networking/git-daemon.nix
+  ./services/networking/gnunet.nix
+  ./services/networking/gogoclient.nix
+  ./services/networking/gvpe.nix
+  ./services/networking/haproxy.nix
+  ./services/networking/hostapd.nix
+  ./services/networking/ifplugd.nix
+  ./services/networking/iodined.nix
+  ./services/networking/ircd-hybrid/default.nix
+  ./services/networking/kippo.nix
+  ./services/networking/minidlna.nix
+  ./services/networking/murmur.nix
+  ./services/networking/nat.nix
+  ./services/networking/networkmanager.nix
+  ./services/networking/ngircd.nix
+  ./services/networking/notbit.nix
+  ./services/networking/nsd.nix
+  ./services/networking/ntopng.nix
+  ./services/networking/ntpd.nix
+  ./services/networking/oidentd.nix
+  ./services/networking/openfire.nix
+  ./services/networking/openntpd.nix
+  ./services/networking/openvpn.nix
+  ./services/networking/polipo.nix
+  ./services/networking/prayer.nix
+  ./services/networking/privoxy.nix
+  ./services/networking/quassel.nix
+  ./services/networking/radicale.nix
+  ./services/networking/radvd.nix
+  ./services/networking/rdnssd.nix
+  ./services/networking/rpcbind.nix
+  ./services/networking/sabnzbd.nix
+  ./services/networking/searx.nix
+  ./services/networking/spiped.nix
+  ./services/networking/ssh/lshd.nix
+  ./services/networking/ssh/sshd.nix
+  ./services/networking/supybot.nix
+  ./services/networking/syncthing.nix
+  ./services/networking/tcpcrypt.nix
+  ./services/networking/teamspeak3.nix
+  ./services/networking/tftpd.nix
+  ./services/networking/unbound.nix
+  ./services/networking/unifi.nix
+  ./services/networking/vsftpd.nix
+  ./services/networking/wakeonlan.nix
+  ./services/networking/websockify.nix
+  ./services/networking/wicd.nix
+  ./services/networking/wpa_supplicant.nix
+  ./services/networking/xinetd.nix
+  ./services/networking/znc.nix
+  ./services/printing/cupsd.nix
+  ./services/scheduling/atd.nix
+  ./services/scheduling/cron.nix
+  ./services/scheduling/fcron.nix
+  ./services/search/elasticsearch.nix
+  ./services/search/solr.nix
+  ./services/security/clamav.nix
+  ./services/security/fail2ban.nix
+  ./services/security/fprot.nix
+  ./services/security/frandom.nix
+  ./services/security/haveged.nix
+  ./services/security/torify.nix
+  ./services/security/tor.nix
+  ./services/security/torsocks.nix
+  ./services/system/dbus.nix
+  ./services/system/kerberos.nix
+  ./services/system/nscd.nix
+  ./services/system/uptimed.nix
+  ./services/torrent/deluge.nix
+  ./services/torrent/transmission.nix
+  ./services/ttys/agetty.nix
+  ./services/ttys/gpm.nix
+  ./services/ttys/kmscon.nix
+  ./services/web-servers/apache-httpd/default.nix
+  ./services/web-servers/fcgiwrap.nix
+  ./services/web-servers/jboss/default.nix
+  ./services/web-servers/lighttpd/cgit.nix
+  ./services/web-servers/lighttpd/default.nix
+  ./services/web-servers/lighttpd/gitweb.nix
+  ./services/web-servers/nginx/default.nix
+  ./services/web-servers/phpfpm.nix
+  ./services/web-servers/tomcat.nix
+  ./services/web-servers/varnish/default.nix
+  ./services/web-servers/winstone.nix
+  ./services/web-servers/zope2.nix
+  ./services/x11/desktop-managers/default.nix
+  ./services/x11/display-managers/auto.nix
+  ./services/x11/display-managers/default.nix
+  ./services/x11/display-managers/gdm.nix
+  ./services/x11/display-managers/kdm.nix
+  ./services/x11/display-managers/lightdm.nix
+  ./services/x11/display-managers/slim.nix
+  ./services/x11/hardware/multitouch.nix
+  ./services/x11/hardware/synaptics.nix
+  ./services/x11/hardware/wacom.nix
+  ./services/x11/redshift.nix
+  ./services/x11/window-managers/awesome.nix
+  #./services/x11/window-managers/compiz.nix
+  ./services/x11/window-managers/default.nix
+  ./services/x11/window-managers/fluxbox.nix
+  ./services/x11/window-managers/icewm.nix
+  ./services/x11/window-managers/bspwm.nix
+  ./services/x11/window-managers/metacity.nix
+  ./services/x11/window-managers/none.nix
+  ./services/x11/window-managers/twm.nix
+  ./services/x11/window-managers/wmii.nix
+  ./services/x11/window-managers/xmonad.nix
+  ./services/x11/xfs.nix
+  ./services/x11/xserver.nix
+  ./system/activation/activation-script.nix
+  ./system/activation/top-level.nix
+  ./system/boot/emergency-mode.nix
+  ./system/boot/kernel.nix
+  ./system/boot/kexec.nix
+  ./system/boot/loader/efi.nix
+  ./system/boot/loader/generations-dir/generations-dir.nix
+  ./system/boot/loader/grub/grub.nix
+  ./system/boot/loader/grub/memtest.nix
+  ./system/boot/loader/gummiboot/gummiboot.nix
+  ./system/boot/loader/init-script/init-script.nix
+  ./system/boot/loader/raspberrypi/raspberrypi.nix
+  ./system/boot/luksroot.nix
+  ./system/boot/modprobe.nix
+  ./system/boot/shutdown.nix
+  ./system/boot/stage-1.nix
+  ./system/boot/stage-2.nix
+  ./system/boot/systemd.nix
+  ./system/boot/tmp.nix
+  ./system/etc/etc.nix
+  ./system/upstart/upstart.nix
+  ./tasks/cpu-freq.nix
+  ./tasks/encrypted-devices.nix
+  ./tasks/filesystems.nix
+  ./tasks/filesystems/btrfs.nix
+  ./tasks/filesystems/cifs.nix
+  ./tasks/filesystems/ext.nix
+  ./tasks/filesystems/f2fs.nix
+  ./tasks/filesystems/nfs.nix
+  ./tasks/filesystems/reiserfs.nix
+  ./tasks/filesystems/unionfs-fuse.nix
+  ./tasks/filesystems/vfat.nix
+  ./tasks/filesystems/xfs.nix
+  ./tasks/filesystems/zfs.nix
+  ./tasks/kbd.nix
+  ./tasks/lvm.nix
+  ./tasks/network-interfaces.nix
+  ./tasks/scsi-link-power-management.nix
+  ./tasks/swraid.nix
+  ./tasks/trackpoint.nix
+  ./testing/service-runner.nix
+  ./virtualisation/container-config.nix
+  ./virtualisation/containers.nix
+  ./virtualisation/docker.nix
+  ./virtualisation/libvirtd.nix
+  #./virtualisation/nova.nix
+  ./virtualisation/openvswitch.nix
+  ./virtualisation/virtualbox-guest.nix
+  #./virtualisation/xen-dom0.nix
+]
diff --git a/nixos/modules/services/networking/copy-com.nix b/nixos/modules/services/networking/copy-com.nix
new file mode 100644
index 000000000000..36bd29109b8a
--- /dev/null
+++ b/nixos/modules/services/networking/copy-com.nix
@@ -0,0 +1,53 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  
+  cfg = config.services.copy-com;
+
+in 
+
+{
+  options = {
+
+    services.copy-com = {
+	  
+	  enable = mkOption {
+          default = false;
+          description = "
+            Enable the copy.com client.
+
+            The first time copy.com is run, it needs to be configured. Before enabling run 
+            copy_console manually.
+          ";
+      };
+
+      user = mkOption {
+        description = "The user for which copy should run.";
+      };
+
+      debug = mkOption {
+        default = false;
+        description = "Output more.";
+      };
+	  };
+  };
+
+  config = mkIf cfg.enable {
+    environment.systemPackages = [ pkgs.postfix ];
+
+    systemd.services."copy-com-${cfg.user}" = {
+      description = "Copy.com Client";
+      after = [ "network.target" "local-fs.target" ];
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = {
+        ExecStart = "${pkgs.copy-com}/bin/copy_console ${if cfg.debug then "-consoleOutput -debugToConsole=dirwatch,path-watch,csm_path,csm -debug -console" else ""}";
+        User = "${cfg.user}";
+      };
+
+    };
+  };
+
+}
+
diff --git a/pkgs/applications/networking/copy-com/default.nix b/pkgs/applications/networking/copy-com/default.nix
new file mode 100644
index 000000000000..98679e9609ec
--- /dev/null
+++ b/pkgs/applications/networking/copy-com/default.nix
@@ -0,0 +1,58 @@
+{ stdenv, coreutils, fetchurl, patchelf, gcc }:
+
+let
+  arch = if stdenv.system == "x86_64-linux" then "x86_64"
+    else if stdenv.system == "i686-linux" then "x86"
+    else if stdenv.system == "armv6-linux" then "armv6h"
+    else throw "Copy.com client for: ${stdenv.system} not supported!";
+
+  interpreter = if stdenv.system == "x86_64-linux" then "ld-linux-x86-64.so.2"
+    else if stdenv.system == "i686-linux" then "ld-linux.so.2"
+    else if stdenv.system == "armv6-linux" then "ld-linux.so.2"
+    else throw "Copy.com client for: ${stdenv.system} not supported!";
+
+  appdir = "opt/copy";
+  
+in stdenv.mkDerivation {
+  
+  name = "copy-com-1.4";
+
+  src = fetchurl {
+    # Note: copy.com doesn't version this file. Annoying.
+    url = "https://copy.com/install/linux/Copy.tgz";
+    sha256 = "f8da6dbfdaac71c4c4e9102671cf8fbe4ac5cb1dac63464783b8b62a7939b6fa";
+  };
+
+  buildInputs = [ coreutils patchelf ];
+
+  phases = "unpackPhase installPhase";
+
+  installPhase = ''
+    mkdir -p $out/opt
+    cp -r ${arch} "$out/${appdir}"
+    ensureDir "$out/bin"
+    ln -s "$out/${appdir}/CopyConsole" "$out/bin/copy_console"
+    ln -s "$out/${appdir}/CopyAgent" "$out/bin/copy_agent"
+    ln -s "$out/${appdir}/CopyCmd" "$out/bin/copy_cmd"
+    patchelf --set-interpreter ${stdenv.glibc}/lib/${interpreter} \
+      "$out/${appdir}/CopyConsole"
+
+    RPATH=${gcc.gcc}/lib:$out/${appdir}
+    echo "updating rpaths to: $RPATH"
+    find "$out/${appdir}" -type f -a -perm +0100 \
+      -print -exec patchelf --force-rpath --set-rpath "$RPATH" {} \;
+
+
+
+  '';
+
+  meta = {
+    homepage = http://copy.com;
+    description = "Copy.com Client";
+    # Closed Source unfortunately.
+    license = stdenv.lib.licenses.unfree;
+    maintainers = with stdenv.lib.maintainers; [ nathan-gs ];
+    # NOTE: Copy.com itself only works on linux, so this is ok.
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2fc56937e367..b74625535228 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9780,6 +9780,8 @@ let
 
   bittorrentSync = callPackage ../applications/networking/bittorrentsync { };
 
+  copy-com = callPackage ../applications/networking/copy-com { };
+
   dropbox = callPackage ../applications/networking/dropbox { };
 
   dropbox-cli = callPackage ../applications/networking/dropbox-cli { };
diff --git a/pkgs/top-level/all-packages.nix.orig b/pkgs/top-level/all-packages.nix.orig
new file mode 100644
index 000000000000..6e5caa3af9ed
--- /dev/null
+++ b/pkgs/top-level/all-packages.nix.orig
@@ -0,0 +1,11653 @@
+/* This file composes the Nix Packages collection.  That is, it
+   imports the functions that build the various packages, and calls
+   them with appropriate arguments.  The result is a set of all the
+   packages in the Nix Packages collection for some particular
+   platform. */
+
+
+{ # The system (e.g., `i686-linux') for which to build the packages.
+  system ? builtins.currentSystem
+
+, # The standard environment to use.  Only used for bootstrapping.  If
+  # null, the default standard environment is used.
+  bootStdenv ? null
+
+, # Non-GNU/Linux OSes are currently "impure" platforms, with their libc
+  # outside of the store.  Thus, GCC, GFortran, & co. must always look for
+  # files in standard system directories (/usr/include, etc.)
+  noSysDirs ? (system != "x86_64-darwin"
+               && system != "x86_64-freebsd" && system != "i686-freebsd"
+               && system != "x86_64-kfreebsd-gnu")
+
+  # More flags for the bootstrapping of stdenv.
+, gccWithCC ? true
+, gccWithProfiling ? true
+
+, # Allow a configuration attribute set to be passed in as an
+  # argument.  Otherwise, it's read from $NIXPKGS_CONFIG or
+  # ~/.nixpkgs/config.nix.
+  config ? null
+
+, crossSystem ? null
+, platform ? null
+}:
+
+
+let config_ = config; platform_ = platform; in # rename the function arguments
+
+let
+
+  lib = import ../../lib;
+
+  # The contents of the configuration file found at $NIXPKGS_CONFIG or
+  # $HOME/.nixpkgs/config.nix.
+  # for NIXOS (nixos-rebuild): use nixpkgs.config option
+  config =
+    let
+      toPath = builtins.toPath;
+      getEnv = x: if builtins ? getEnv then builtins.getEnv x else "";
+      pathExists = name:
+        builtins ? pathExists && builtins.pathExists (toPath name);
+
+      configFile = getEnv "NIXPKGS_CONFIG";
+      homeDir = getEnv "HOME";
+      configFile2 = homeDir + "/.nixpkgs/config.nix";
+
+      configExpr =
+        if config_ != null then config_
+        else if configFile != "" && pathExists configFile then import (toPath configFile)
+        else if homeDir != "" && pathExists configFile2 then import (toPath configFile2)
+        else {};
+
+    in
+      # allow both:
+      # { /* the config */ } and
+      # { pkgs, ... } : { /* the config */ }
+      if builtins.isFunction configExpr
+        then configExpr { inherit pkgs; }
+        else configExpr;
+
+  # Allow setting the platform in the config file. Otherwise, let's use a reasonable default (pc)
+
+  platformAuto = let
+      platforms = (import ./platforms.nix);
+    in
+      if system == "armv6l-linux" then platforms.raspberrypi
+      else if system == "armv5tel-linux" then platforms.sheevaplug
+      else if system == "mips64el-linux" then platforms.fuloong2f_n32
+      else if system == "x86_64-linux" then platforms.pc64
+      else if system == "i686-linux" then platforms.pc32
+      else platforms.pcBase;
+
+  platform = if platform_ != null then platform_
+    else config.platform or platformAuto;
+
+  # Helper functions that are exported through `pkgs'.
+  helperFunctions =
+    stdenvAdapters //
+    (import ../build-support/trivial-builders.nix { inherit (pkgs) stdenv; inherit (pkgs.xorg) lndir; });
+
+  stdenvAdapters =
+    import ../stdenv/adapters.nix pkgs;
+
+
+  # Allow packages to be overriden globally via the `packageOverrides'
+  # configuration option, which must be a function that takes `pkgs'
+  # as an argument and returns a set of new or overriden packages.
+  # The `packageOverrides' function is called with the *original*
+  # (un-overriden) set of packages, allowing packageOverrides
+  # attributes to refer to the original attributes (e.g. "foo =
+  # ... pkgs.foo ...").
+  pkgs = applyGlobalOverrides (config.packageOverrides or (pkgs: {}));
+
+
+  # Return the complete set of packages, after applying the overrides
+  # returned by the `overrider' function (see above).  Warning: this
+  # function is very expensive!
+  applyGlobalOverrides = overrider:
+    let
+      # Call the overrider function.  We don't want stdenv overrides
+      # in the case of cross-building, or otherwise the basic
+      # overrided packages will not be built with the crossStdenv
+      # adapter.
+      overrides = overrider pkgsOrig //
+        (lib.optionalAttrs (pkgsOrig.stdenv ? overrides && crossSystem == null) (pkgsOrig.stdenv.overrides pkgsOrig));
+
+      # The un-overriden packages, passed to `overrider'.
+      pkgsOrig = pkgsFun pkgs {};
+
+      # The overriden, final packages.
+      pkgs = pkgsFun pkgs overrides;
+    in pkgs;
+
+
+  # The package compositions.  Yes, this isn't properly indented.
+  pkgsFun = pkgs: overrides:
+    with helperFunctions;
+    let defaultScope = pkgs // pkgs.xorg; self = self_ // overrides;
+    self_ = with self; helperFunctions // {
+
+  # Make some arguments passed to all-packages.nix available
+  inherit system platform;
+
+  # Allow callPackage to fill in the pkgs argument
+  inherit pkgs;
+
+
+  # We use `callPackage' to be able to omit function arguments that
+  # can be obtained from `pkgs' or `pkgs.xorg' (i.e. `defaultScope').
+  # Use `newScope' for sets of packages in `pkgs' (see e.g. `gnome'
+  # below).
+  callPackage = newScope {};
+
+  newScope = extra: lib.callPackageWith (defaultScope // extra);
+
+
+  # Override system. This is useful to build i686 packages on x86_64-linux.
+  forceSystem = system: kernel: (import ./all-packages.nix) {
+    inherit system;
+    platform = platform // { kernelArch = kernel; };
+    inherit bootStdenv noSysDirs gccWithCC gccWithProfiling config
+      crossSystem;
+  };
+
+
+  # Used by wine, firefox with debugging version of Flash, ...
+  pkgsi686Linux = forceSystem "i686-linux" "i386";
+
+  callPackage_i686 = lib.callPackageWith (pkgsi686Linux // pkgsi686Linux.xorg);
+
+
+  # For convenience, allow callers to get the path to Nixpkgs.
+  path = ../..;
+
+
+  ### Symbolic names.
+
+  x11 = xlibsWrapper;
+
+  # `xlibs' is the set of X library components.  This used to be the
+  # old modular X llibraries project (called `xlibs') but now it's just
+  # the set of packages in the modular X.org tree (which also includes
+  # non-library components like the server, drivers, fonts, etc.).
+  xlibs = xorg // {xlibs = xlibsWrapper;};
+
+
+  ### Helper functions.
+
+  inherit lib config stdenvAdapters;
+
+  inherit (lib) lowPrio hiPrio appendToName makeOverridable;
+  inherit (misc) versionedDerivation;
+
+  # Applying this to an attribute set will cause nix-env to look
+  # inside the set for derivations.
+  recurseIntoAttrs = attrs: attrs // { recurseForDerivations = true; };
+
+  builderDefs = lib.composedArgsAndFun (import ../build-support/builder-defs/builder-defs.nix) {
+    inherit stringsWithDeps lib stdenv writeScript
+      fetchurl fetchmtn fetchgit;
+  };
+
+  builderDefsPackage = builderDefs.builderDefsPackage builderDefs;
+
+  stringsWithDeps = lib.stringsWithDeps;
+
+
+  ### Nixpkgs maintainer tools
+
+  nix-generate-from-cpan = callPackage ../../maintainers/scripts/nix-generate-from-cpan.nix { };
+
+  nixpkgs-lint = callPackage ../../maintainers/scripts/nixpkgs-lint.nix { };
+
+
+  ### STANDARD ENVIRONMENT
+
+
+  allStdenvs = import ../stdenv {
+    inherit system platform config;
+    allPackages = args: import ./all-packages.nix ({ inherit config system; } // args);
+  };
+
+  defaultStdenv = allStdenvs.stdenv // { inherit platform; };
+
+  stdenvCross = lowPrio (makeStdenvCross defaultStdenv crossSystem binutilsCross gccCrossStageFinal);
+
+  stdenv =
+    if bootStdenv != null then (bootStdenv // {inherit platform;}) else
+      if crossSystem != null then
+        stdenvCross
+      else
+        let
+            changer = config.replaceStdenv or null;
+        in if changer != null then
+          changer {
+            # We import again all-packages to avoid recursivities.
+            pkgs = import ./all-packages.nix {
+              # We remove packageOverrides to avoid recursivities
+              config = removeAttrs config [ "replaceStdenv" ];
+            };
+          }
+      else
+        defaultStdenv;
+
+  stdenvApple = stdenvAdapters.overrideGCC allStdenvs.stdenvNative gccApple;
+
+  forceNativeDrv = drv : if crossSystem == null then drv else
+    (drv // { crossDrv = drv.nativeDrv; });
+
+  # A stdenv capable of building 32-bit binaries.  On x86_64-linux,
+  # it uses GCC compiled with multilib support; on i686-linux, it's
+  # just the plain stdenv.
+  stdenv_32bit = lowPrio (
+    if system == "x86_64-linux" then
+      overrideGCC stdenv gcc48_multi
+    else
+      stdenv);
+
+
+  ### BUILD SUPPORT
+
+  attrSetToDir = arg: import ../build-support/upstream-updater/attrset-to-dir.nix {
+    inherit writeTextFile stdenv lib;
+    theAttrSet = arg;
+  };
+
+  autoreconfHook = makeSetupHook
+    { substitutions = { inherit autoconf automake libtool; }; }
+    ../build-support/setup-hooks/autoreconf.sh;
+
+  buildEnv = import ../build-support/buildenv {
+    inherit (pkgs) runCommand perl;
+  };
+
+  buildFHSChrootEnv = import ../build-support/build-fhs-chrootenv {
+    inherit stdenv glibc glibcLocales gcc coreutils diffutils findutils;
+    inherit gnused gnugrep gnutar gzip bzip2 bashInteractive xz shadow gawk;
+    inherit less buildEnv;
+  };
+
+  dotnetenv = import ../build-support/dotnetenv {
+    inherit stdenv;
+    dotnetfx = dotnetfx40;
+  };
+
+  scatterOutputHook = makeSetupHook {} ../build-support/setup-hooks/scatter_output.sh;
+
+  vsenv = callPackage ../build-support/vsenv {
+    vs = vs90wrapper;
+  };
+
+  fetchbower = import ../build-support/fetchbower {
+    inherit stdenv git;
+    inherit (nodePackages) fetch-bower;
+  };
+
+  fetchbzr = import ../build-support/fetchbzr {
+    inherit stdenv bazaar;
+  };
+
+  fetchcvs = import ../build-support/fetchcvs {
+    inherit stdenv cvs;
+  };
+
+  fetchdarcs = import ../build-support/fetchdarcs {
+    inherit stdenv darcs nix;
+  };
+
+  fetchgit = import ../build-support/fetchgit {
+    inherit stdenv git cacert;
+  };
+
+  fetchgitPrivate = import ../build-support/fetchgit/private.nix {
+    inherit fetchgit writeScript openssh stdenv;
+  };
+
+  fetchgitrevision = import ../build-support/fetchgitrevision runCommand git;
+
+  fetchmtn = callPackage ../build-support/fetchmtn (config.fetchmtn or {});
+
+  packer = callPackage ../development/tools/packer { };
+
+  fetchpatch = callPackage ../build-support/fetchpatch { };
+
+  fetchsvn = import ../build-support/fetchsvn {
+    inherit stdenv subversion openssh;
+    sshSupport = true;
+  };
+
+  fetchsvnrevision = import ../build-support/fetchsvnrevision runCommand subversion;
+
+  fetchsvnssh = import ../build-support/fetchsvnssh {
+    inherit stdenv subversion openssh expect;
+    sshSupport = true;
+  };
+
+  fetchhg = import ../build-support/fetchhg {
+    inherit stdenv mercurial nix;
+  };
+
+  # `fetchurl' downloads a file from the network.
+  fetchurl = import ../build-support/fetchurl {
+    inherit curl stdenv;
+  };
+
+  # A wrapper around fetchurl that generates miror://gnome URLs automatically
+  fetchurlGnome = callPackage ../build-support/fetchurl/gnome.nix { };
+
+  # fetchurlBoot is used for curl and its dependencies in order to
+  # prevent a cyclic dependency (curl depends on curl.tar.bz2,
+  # curl.tar.bz2 depends on fetchurl, fetchurl depends on curl).  It
+  # uses the curl from the previous bootstrap phase (e.g. a statically
+  # linked curl in the case of stdenv-linux).
+  fetchurlBoot = stdenv.fetchurlBoot;
+
+  fetchzip = import ../build-support/fetchzip { inherit lib fetchurl unzip; };
+
+  fetchFromGitHub = { owner, repo, rev, sha256 }: fetchzip {
+    name = "${repo}-${rev}-src";
+    url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz";
+    inherit sha256;
+  };
+
+  resolveMirrorURLs = {url}: fetchurl {
+    showURLs = true;
+    inherit url;
+  };
+
+  libredirect = callPackage ../build-support/libredirect { };
+
+  makeDesktopItem = import ../build-support/make-desktopitem {
+    inherit stdenv;
+  };
+
+  makeAutostartItem = import ../build-support/make-startupitem {
+    inherit stdenv;
+    inherit lib;
+  };
+
+  makeInitrd = {contents, compressor ? "gzip -9"}:
+    import ../build-support/kernel/make-initrd.nix {
+      inherit stdenv perl perlArchiveCpio cpio contents ubootChooser compressor;
+    };
+
+  makeWrapper = makeSetupHook { } ../build-support/setup-hooks/make-wrapper.sh;
+
+  makeModulesClosure = { kernel, rootModules, allowMissing ? false }:
+    import ../build-support/kernel/modules-closure.nix {
+      inherit stdenv kmod kernel nukeReferences rootModules allowMissing;
+    };
+
+  pathsFromGraph = ../build-support/kernel/paths-from-graph.pl;
+
+  srcOnly = args: (import ../build-support/src-only) ({inherit stdenv; } // args);
+
+  substituteAll = import ../build-support/substitute/substitute-all.nix {
+    inherit stdenv;
+  };
+
+  replaceDependency = import ../build-support/replace-dependency.nix {
+    inherit runCommand nix lib;
+  };
+
+  nukeReferences = callPackage ../build-support/nuke-references/default.nix { };
+
+  vmTools = import ../build-support/vm/default.nix {
+    inherit pkgs;
+  };
+
+  releaseTools = import ../build-support/release/default.nix {
+    inherit pkgs;
+  };
+
+  composableDerivation = (import ../../lib/composable-derivation.nix) {
+    inherit pkgs lib;
+  };
+
+  platforms = import ./platforms.nix;
+
+  setJavaClassPath = makeSetupHook { } ../build-support/setup-hooks/set-java-classpath.sh;
+
+  fixDarwinDylibNames = makeSetupHook { } ../build-support/setup-hooks/fix-darwin-dylib-names.sh;
+
+  keepBuildTree = makeSetupHook { } ../build-support/setup-hooks/keep-build-tree.sh;
+
+  enableGCOVInstrumentation = makeSetupHook { } ../build-support/setup-hooks/enable-coverage-instrumentation.sh;
+
+  makeGCOVReport = makeSetupHook
+    { deps = [ pkgs.lcov pkgs.enableGCOVInstrumentation ]; }
+    ../build-support/setup-hooks/make-coverage-analysis-report.sh;
+
+
+  ### TOOLS
+
+  abduco = callPackage ../tools/misc/abduco { };
+
+  acct = callPackage ../tools/system/acct { };
+
+  acoustidFingerprinter = callPackage ../tools/audio/acoustid-fingerprinter {
+    ffmpeg = ffmpeg_1;
+  };
+
+  actdiag = pythonPackages.actdiag;
+
+  adom = callPackage ../games/adom { };
+
+  aefs = callPackage ../tools/filesystems/aefs { };
+
+  aegisub = callPackage ../applications/video/aegisub {
+    wxGTK = wxGTK30;
+    lua = lua5_1;
+  };
+
+  aespipe = callPackage ../tools/security/aespipe { };
+
+  aescrypt = callPackage ../tools/misc/aescrypt { };
+
+  ahcpd = callPackage ../tools/networking/ahcpd { };
+
+  aircrackng = callPackage ../tools/networking/aircrack-ng { };
+
+  analog = callPackage ../tools/admin/analog {};
+
+  apktool = callPackage ../development/tools/apktool {
+    buildTools = androidenv.buildTools;
+  };
+
+  apt-offline = callPackage ../tools/misc/apt-offline { };
+
+  archivemount = callPackage ../tools/filesystems/archivemount { };
+
+  arandr = callPackage ../tools/X11/arandr { };
+
+  arcanist = callPackage ../development/tools/misc/arcanist {};
+
+  arduino_core = callPackage ../development/arduino/arduino-core {
+    jdk = jdk;
+    jre = jdk;
+  };
+
+  argyllcms = callPackage ../tools/graphics/argyllcms {};
+
+  arp-scan = callPackage ../tools/misc/arp-scan { };
+
+  ascii = callPackage ../tools/text/ascii { };
+
+  asymptote = builderDefsPackage ../tools/graphics/asymptote {
+    inherit freeglut ghostscriptX imagemagick fftw boehmgc
+      mesa ncurses readline gsl libsigsegv python zlib perl
+      texinfo xz;
+    texLive = texLiveAggregationFun {
+      paths = [ texLive texLiveExtra texLiveCMSuper ];
+    };
+  };
+
+  awscli = callPackage ../tools/admin/awscli { };
+
+  ec2_api_tools = callPackage ../tools/virtualization/ec2-api-tools { };
+
+  ec2_ami_tools = callPackage ../tools/virtualization/ec2-ami-tools { };
+
+  altermime = callPackage ../tools/networking/altermime {};
+
+  amule = callPackage ../tools/networking/p2p/amule { };
+
+  amuleDaemon = appendToName "daemon" (amule.override {
+    monolithic = false;
+    daemon = true;
+  });
+
+  amuleGui = appendToName "gui" (amule.override {
+    monolithic = false;
+    client = true;
+  });
+
+  androidenv = import ../development/mobile/androidenv {
+    inherit pkgs;
+    pkgs_i686 = pkgsi686Linux;
+  };
+
+  apg = callPackage ../tools/security/apg { };
+
+  grc = callPackage ../tools/misc/grc { };
+
+  otool = callPackage ../os-specific/darwin/otool { };
+
+  pass = callPackage ../tools/security/pass {
+    gnupg = gnupg1compat;
+  };
+
+  setfile = callPackage ../os-specific/darwin/setfile { };
+
+  install_name_tool = callPackage ../os-specific/darwin/install_name_tool { };
+
+  xcodeenv = callPackage ../development/mobile/xcodeenv { };
+
+  titaniumenv = callPackage ../development/mobile/titaniumenv {
+    inherit pkgs;
+    pkgs_i686 = pkgsi686Linux;
+  };
+
+  inherit (androidenv) androidsdk_4_4 androidndk;
+
+  aria2 = callPackage ../tools/networking/aria2 { };
+  aria = aria2;
+
+  at = callPackage ../tools/system/at { };
+
+  atftp = callPackage ../tools/networking/atftp {};
+
+  autogen = callPackage ../development/tools/misc/autogen { };
+
+  autojump = callPackage ../tools/misc/autojump { };
+
+  autorandr = callPackage ../tools/misc/autorandr {
+    inherit (xorg) xrandr xdpyinfo;
+  };
+
+  avahi = callPackage ../development/libraries/avahi {
+    qt4Support = config.avahi.qt4Support or false;
+  };
+
+  aws = callPackage ../tools/virtualization/aws { };
+
+  aws_mturk_clt = callPackage ../tools/misc/aws-mturk-clt { };
+
+  axel = callPackage ../tools/networking/axel { };
+
+  azureus = callPackage ../tools/networking/p2p/azureus { };
+
+  basex = callPackage ../tools/text/xml/basex { };
+
+  babeld = callPackage ../tools/networking/babeld { };
+
+  badvpn = callPackage ../tools/networking/badvpn {};
+
+  banner = callPackage ../games/banner {};
+
+  barcode = callPackage ../tools/graphics/barcode {};
+
+  bc = callPackage ../tools/misc/bc { };
+
+  bcache-tools = callPackage ../tools/filesystems/bcache-tools { };
+
+  bchunk = callPackage ../tools/cd-dvd/bchunk { };
+
+  bfr = callPackage ../tools/misc/bfr { };
+
+  bindfs = callPackage ../tools/filesystems/bindfs { };
+
+  bitbucket-cli = pythonPackages.bitbucket-cli;
+
+  blockdiag = pythonPackages.blockdiag;
+
+  bmon = callPackage ../tools/misc/bmon { };
+
+  bochs = callPackage ../applications/virtualization/bochs { wxSupport = false; };
+
+  boomerang = callPackage ../development/tools/boomerang { };
+
+  bootchart = callPackage ../tools/system/bootchart { };
+
+  bro = callPackage ../applications/networking/ids/bro { };
+
+  bsod = callPackage ../misc/emulators/bsod { };
+
+  btrfsProgs = callPackage ../tools/filesystems/btrfsprogs { };
+
+  bwm_ng = callPackage ../tools/networking/bwm-ng { };
+
+  byobu = callPackage ../tools/misc/byobu { };
+
+  capstone = callPackage ../development/libraries/capstone { };
+
+  catdoc = callPackage ../tools/text/catdoc { };
+
+  ccnet = callPackage ../tools/networking/ccnet { };
+
+  consul = callPackage ../servers/consul { };
+  consul_ui = callPackage ../servers/consul/ui.nix { };
+
+  chntpw = callPackage ../tools/security/chntpw { };
+
+  coprthr = callPackage ../development/libraries/coprthr {
+    flex = flex_2_5_35;
+  };
+
+  crawl = callPackage ../games/crawl { lua = lua5; };
+
+  cv = callPackage ../tools/misc/cv { };
+
+  direnv = callPackage ../tools/misc/direnv { };
+
+  ditaa = callPackage ../tools/graphics/ditaa { };
+
+  dlx = callPackage ../misc/emulators/dlx { };
+
+  eggdrop = callPackage ../tools/networking/eggdrop { };
+
+  enca = callPackage ../tools/text/enca { };
+
+  fasd = callPackage ../tools/misc/fasd {
+    inherit (haskellPackages) pandoc;
+  };
+
+  fop = callPackage ../tools/typesetting/fop { };
+
+  mcrl = callPackage ../tools/misc/mcrl { };
+
+  mcrl2 = callPackage ../tools/misc/mcrl2 { };
+
+  mpdcron = callPackage ../tools/audio/mpdcron { };
+
+  syslogng = callPackage ../tools/system/syslog-ng { };
+
+  syslogng_incubator = callPackage ../tools/system/syslog-ng-incubator { };
+
+  rsyslog = callPackage ../tools/system/rsyslog { };
+
+  mcrypt = callPackage ../tools/misc/mcrypt { };
+
+  mcelog = callPackage ../os-specific/linux/mcelog { };
+
+  apparix = callPackage ../tools/misc/apparix { };
+
+  appdata-tools = callPackage ../tools/misc/appdata-tools { };
+
+  asciidoc = callPackage ../tools/typesetting/asciidoc {
+    inherit (pythonPackages) matplotlib numpy aafigure recursivePthLoader;
+    enableStandardFeatures = false;
+  };
+
+  asciidoc-full = appendToName "full" (asciidoc.override {
+    inherit (pythonPackages) pygments;
+    enableStandardFeatures = true;
+  });
+
+  autossh = callPackage ../tools/networking/autossh { };
+
+  bacula = callPackage ../tools/backup/bacula { };
+
+  beanstalkd = callPackage ../servers/beanstalkd { };
+
+  bgs = callPackage ../tools/X11/bgs { };
+
+  biber = callPackage ../tools/typesetting/biber {
+    inherit (perlPackages)
+      autovivification BusinessISBN BusinessISMN BusinessISSN ConfigAutoConf
+      DataCompare DataDump DateSimple EncodeEUCJPASCII EncodeHanExtra EncodeJIS2K
+      ExtUtilsLibBuilder FileSlurp IPCRun3 Log4Perl LWPProtocolHttps ListAllUtils
+      ListMoreUtils ModuleBuild MozillaCA ReadonlyXS RegexpCommon TextBibTeX
+      UnicodeCollate UnicodeLineBreak URI XMLLibXMLSimple XMLLibXSLT XMLWriter;
+  };
+
+  bibtextools = callPackage ../tools/typesetting/bibtex-tools {
+    inherit (strategoPackages016) strategoxt sdf;
+  };
+
+  bittorrent = callPackage ../tools/networking/p2p/bittorrent {
+    gui = true;
+  };
+
+  bittornado = callPackage ../tools/networking/p2p/bit-tornado { };
+
+  blueman = callPackage ../tools/bluetooth/blueman {
+    inherit (pythonPackages) notify;
+  };
+
+  bmrsa = builderDefsPackage (import ../tools/security/bmrsa/11.nix) {
+    inherit unzip;
+  };
+
+  bogofilter = callPackage ../tools/misc/bogofilter { };
+
+  bsdiff = callPackage ../tools/compression/bsdiff { };
+
+  btar = callPackage ../tools/backup/btar { };
+
+  bud = callPackage ../tools/networking/bud {
+    inherit (pythonPackages) gyp;
+  };
+
+  bup = callPackage ../tools/backup/bup {
+    inherit (pythonPackages) pyxattr pylibacl setuptools fuse;
+    inherit (haskellPackages) pandoc;
+    par2Support = (config.bup.par2Support or false);
+  };
+
+  ori = callPackage ../tools/backup/ori { };
+
+  atool = callPackage ../tools/archivers/atool { };
+
+  bzip2 = callPackage ../tools/compression/bzip2 { };
+
+  cabextract = callPackage ../tools/archivers/cabextract { };
+
+  cadaver = callPackage ../tools/networking/cadaver { };
+
+  cantata = callPackage ../applications/audio/cantata { };
+
+  can-utils = callPackage ../os-specific/linux/can-utils { };
+
+  ccid = callPackage ../tools/security/ccid { };
+
+  ccrypt = callPackage ../tools/security/ccrypt { };
+
+  cdecl = callPackage ../development/tools/cdecl { };
+
+  cdrdao = callPackage ../tools/cd-dvd/cdrdao { };
+
+  cdrkit = callPackage ../tools/cd-dvd/cdrkit { };
+
+  ceph = callPackage ../tools/filesystems/ceph { };
+
+  cfdg = builderDefsPackage ../tools/graphics/cfdg {
+    inherit libpng bison flex ffmpeg;
+  };
+
+  checkinstall = callPackage ../tools/package-management/checkinstall { };
+
+  cheetahTemplate = builderDefsPackage (import ../tools/text/cheetah-template/2.0.1.nix) {
+    inherit makeWrapper python;
+  };
+
+  chkrootkit = callPackage ../tools/security/chkrootkit { };
+
+  chrony = callPackage ../tools/networking/chrony { };
+
+  chunkfs = callPackage ../tools/filesystems/chunkfs { };
+
+  chunksync = callPackage ../tools/backup/chunksync { };
+
+  cjdns = callPackage ../tools/networking/cjdns { };
+
+  cksfv = callPackage ../tools/networking/cksfv { };
+
+  clementine = callPackage ../applications/audio/clementine { };
+
+  ciopfs = callPackage ../tools/filesystems/ciopfs { };
+
+  colord = callPackage ../tools/misc/colord { };
+
+  colord-gtk = callPackage ../tools/misc/colord-gtk { };
+
+  colordiff = callPackage ../tools/text/colordiff { };
+
+  concurrencykit = callPackage ../development/libraries/concurrencykit { };
+
+  connect = callPackage ../tools/networking/connect { };
+
+  conspy = callPackage ../os-specific/linux/conspy {};
+
+  connman = callPackage ../tools/networking/connman { };
+
+  connmanui = callPackage ../tools/networking/connmanui { };
+
+  convertlit = callPackage ../tools/text/convertlit { };
+
+  collectd = callPackage ../tools/system/collectd { };
+
+  colormake = callPackage ../development/tools/build-managers/colormake { };
+
+  cowsay = callPackage ../tools/misc/cowsay { };
+
+  cpuminer = callPackage ../tools/misc/cpuminer { };
+
+  cpuminer-multi = callPackage ../tools/misc/cpuminer-multi { };
+
+  cuetools = callPackage ../tools/cd-dvd/cuetools { };
+
+  unifdef = callPackage ../development/tools/misc/unifdef { };
+
+  "unionfs-fuse" = callPackage ../tools/filesystems/unionfs-fuse { };
+
+  usb_modeswitch = callPackage ../development/tools/misc/usb-modeswitch { };
+
+  anthy = callPackage ../tools/inputmethods/anthy { };
+
+  biosdevname = callPackage ../tools/networking/biosdevname { };
+
+  clamav = callPackage ../tools/security/clamav { };
+
+  cloc = callPackage ../tools/misc/cloc {
+    inherit (perlPackages) perl AlgorithmDiff RegexpCommon;
+  };
+
+  cloog = callPackage ../development/libraries/cloog { };
+
+  cloogppl = callPackage ../development/libraries/cloog-ppl { };
+
+  convmv = callPackage ../tools/misc/convmv { };
+
+  cool-old-term = callPackage ../applications/misc/cool-old-term { };
+
+  coreutils = callPackage ../tools/misc/coreutils
+    {
+      # TODO: Add ACL support for cross-Linux.
+      aclSupport = crossSystem == null && stdenv.isLinux;
+    };
+
+  cpio = callPackage ../tools/archivers/cpio { };
+
+  cromfs = callPackage ../tools/archivers/cromfs { };
+
+  cron = callPackage ../tools/system/cron { };
+
+  cudatoolkit5 = callPackage ../development/compilers/cudatoolkit/5.5.nix {
+    python = python26;
+  };
+
+  cudatoolkit6 = callPackage ../development/compilers/cudatoolkit/6.0.nix {
+    python = python26;
+  };
+
+  cudatoolkit = cudatoolkit5;
+
+  curl = callPackage ../tools/networking/curl rec {
+    fetchurl = fetchurlBoot;
+    zlibSupport = true;
+    sslSupport = zlibSupport;
+    scpSupport = zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin;
+  };
+
+  curl3 = callPackage ../tools/networking/curl/7.15.nix rec {
+    zlibSupport = true;
+    sslSupport = zlibSupport;
+  };
+
+  cunit = callPackage ../tools/misc/cunit { };
+
+  curlftpfs = callPackage ../tools/filesystems/curlftpfs { };
+
+  cutter = callPackage ../tools/networking/cutter { };
+
+  dadadodo = builderDefsPackage (import ../tools/text/dadadodo) { };
+
+  daq = callPackage ../applications/networking/ids/daq { };
+
+  dar = callPackage ../tools/archivers/dar { };
+
+  davfs2 = callPackage ../tools/filesystems/davfs2 { };
+
+  dbench = callPackage ../development/tools/misc/dbench { };
+
+  dcraw = callPackage ../tools/graphics/dcraw { };
+
+  debian_devscripts = callPackage ../tools/misc/debian-devscripts {
+    inherit (perlPackages) CryptSSLeay LWP TimeDate DBFile FileDesktopEntry;
+  };
+
+  debootstrap = callPackage ../tools/misc/debootstrap { };
+
+  detox = callPackage ../tools/misc/detox { };
+
+  ddclient = callPackage ../tools/networking/ddclient { };
+
+  dd_rescue = callPackage ../tools/system/dd_rescue { };
+
+  ddrescue = callPackage ../tools/system/ddrescue { };
+
+  deluge = pythonPackages.deluge;
+
+  desktop_file_utils = callPackage ../tools/misc/desktop-file-utils { };
+
+  despotify = callPackage ../development/libraries/despotify { };
+
+  dev86 = callPackage ../development/compilers/dev86 { };
+
+  dnsmasq = callPackage ../tools/networking/dnsmasq { };
+
+  dnstop = callPackage ../tools/networking/dnstop { };
+
+  dhcp = callPackage ../tools/networking/dhcp { };
+
+  dhcpcd = callPackage ../tools/networking/dhcpcd { };
+
+  di = callPackage ../tools/system/di { };
+
+  diffstat = callPackage ../tools/text/diffstat { };
+
+  diffutils = callPackage ../tools/text/diffutils { };
+
+  wgetpaste = callPackage ../tools/text/wgetpaste { };
+
+  dirmngr = callPackage ../tools/security/dirmngr { };
+
+  disper = callPackage ../tools/misc/disper { };
+
+  dmd = callPackage ../development/compilers/dmd { };
+
+  dmg2img = callPackage ../tools/misc/dmg2img { };
+
+  docbook2odf = callPackage ../tools/typesetting/docbook2odf {
+    inherit (perlPackages) PerlMagick;
+  };
+
+  docbook2x = callPackage ../tools/typesetting/docbook2x {
+    inherit (perlPackages) XMLSAX XMLParser XMLNamespaceSupport;
+  };
+
+  dosfstools = callPackage ../tools/filesystems/dosfstools { };
+
+  dotnetfx35 = callPackage ../development/libraries/dotnetfx35 { };
+
+  dotnetfx40 = callPackage ../development/libraries/dotnetfx40 { };
+
+  dolphinEmu = callPackage ../misc/emulators/dolphin-emu { };
+  dolphinEmuMaster = callPackage ../misc/emulators/dolphin-emu/master.nix { };
+
+  dropbear = callPackage ../tools/networking/dropbear { };
+
+  dtach = callPackage ../tools/misc/dtach { };
+
+  duo-unix = callPackage ../tools/security/duo-unix { };
+
+  duplicity = callPackage ../tools/backup/duplicity {
+    inherit (pythonPackages) boto lockfile;
+    gnupg = gnupg1;
+  };
+
+  duply = callPackage ../tools/backup/duply { };
+
+  dvdplusrwtools = callPackage ../tools/cd-dvd/dvd+rw-tools { };
+
+  dvgrab = callPackage ../tools/video/dvgrab { };
+
+  dvtm = callPackage ../tools/misc/dvtm { };
+
+  e2fsprogs = callPackage ../tools/filesystems/e2fsprogs { };
+
+  easyrsa = callPackage ../tools/networking/easyrsa { };
+
+  ebook_tools = callPackage ../tools/text/ebook-tools { };
+
+  ecryptfs = callPackage ../tools/security/ecryptfs { };
+
+  editres = callPackage ../tools/graphics/editres {
+    inherit (xlibs) libXt libXaw;
+    inherit (xorg) utilmacros;
+  };
+
+  edk2 = callPackage ../development/compilers/edk2 { };
+
+  emscripten = callPackage ../development/compilers/emscripten { };
+
+  emscriptenfastcomp = callPackage ../development/compilers/emscripten-fastcomp { };
+
+  efibootmgr = callPackage ../tools/system/efibootmgr { };
+
+  efivar = callPackage ../tools/system/efivar { };
+
+  evemu = callPackage ../tools/system/evemu { };
+
+  elasticsearch = callPackage ../servers/search/elasticsearch { };
+
+  elasticsearchPlugins = recurseIntoAttrs (
+    callPackage ../servers/search/elasticsearch/plugins.nix { }
+  );
+
+  emv = callPackage ../tools/misc/emv { };
+
+  enblendenfuse = callPackage ../tools/graphics/enblend-enfuse { };
+
+  encfs = callPackage ../tools/filesystems/encfs { };
+
+  enscript = callPackage ../tools/text/enscript { };
+
+  ethtool = callPackage ../tools/misc/ethtool { };
+
+  ettercap = callPackage ../applications/networking/sniffers/ettercap { };
+
+  euca2ools = callPackage ../tools/virtualization/euca2ools { pythonPackages = python26Packages; };
+
+  evtest = callPackage ../applications/misc/evtest { };
+
+  exempi = callPackage ../development/libraries/exempi { };
+
+  execline = callPackage ../tools/misc/execline { };
+
+  exercism = callPackage ../development/tools/exercism { };
+
+  exif = callPackage ../tools/graphics/exif { };
+
+  exiftags = callPackage ../tools/graphics/exiftags { };
+
+  extundelete = callPackage ../tools/filesystems/extundelete { };
+
+  expect = callPackage ../tools/misc/expect { };
+
+  f2fs-tools = callPackage ../tools/filesystems/f2fs-tools { };
+
+  fabric = pythonPackages.fabric;
+
+  fail2ban = callPackage ../tools/security/fail2ban {
+    systemd = systemd.override {
+      pythonSupport = true;
+    };
+  };
+
+  fakeroot = callPackage ../tools/system/fakeroot { };
+
+  fakechroot = callPackage ../tools/system/fakechroot { };
+
+  fcitx = callPackage ../tools/inputmethods/fcitx { };
+
+  fcron = callPackage ../tools/system/fcron { };
+
+  fdm = callPackage ../tools/networking/fdm {};
+
+  figlet = callPackage ../tools/misc/figlet { };
+
+  file = callPackage ../tools/misc/file { };
+
+  filegive = callPackage ../tools/networking/filegive { };
+
+  fileschanged = callPackage ../tools/misc/fileschanged { };
+
+  findutils = callPackage ../tools/misc/findutils { };
+
+  finger_bsd = callPackage ../tools/networking/bsd-finger { };
+
+  fio = callPackage ../tools/system/fio { };
+
+  flashtool = callPackage_i686 ../development/mobile/flashtool {
+    platformTools = androidenv.platformTools;
+  };
+
+  flashrom = callPackage ../tools/misc/flashrom { };
+
+  flpsed = callPackage ../applications/editors/flpsed { };
+
+  flvstreamer = callPackage ../tools/networking/flvstreamer { };
+
+  libbsd = callPackage ../development/libraries/libbsd { };
+
+  lprof = callPackage ../tools/graphics/lprof { };
+
+  fdk_aac = callPackage ../development/libraries/fdk-aac { };
+
+  flvtool2 = callPackage ../tools/video/flvtool2 { };
+
+  fontforge = lowPrio (callPackage ../tools/misc/fontforge { });
+
+  fontforgeX = callPackage ../tools/misc/fontforge {
+    withX11 = true;
+  };
+
+  forktty = callPackage ../os-specific/linux/forktty {};
+
+  fortune = callPackage ../tools/misc/fortune { };
+
+  fox = callPackage ../development/libraries/fox/default.nix {
+    libpng = libpng12;
+  };
+
+  fox_1_6 = callPackage ../development/libraries/fox/fox-1.6.nix { };
+
+  fping = callPackage ../tools/networking/fping {};
+
+  fprot = callPackage ../tools/security/fprot { };
+
+  freeipmi = callPackage ../tools/system/freeipmi {};
+
+  freetalk = callPackage ../applications/networking/instant-messengers/freetalk {
+    guile = guile_1_8;
+  };
+
+  freetds = callPackage ../development/libraries/freetds { };
+
+  ftgl = callPackage ../development/libraries/ftgl { };
+
+  ftgl212 = callPackage ../development/libraries/ftgl/2.1.2.nix { };
+
+  fuppes = callPackage ../tools/networking/fuppes {
+    ffmpeg = ffmpeg_0_6_90;
+  };
+
+  fsfs = callPackage ../tools/filesystems/fsfs { };
+
+  fuse_zip = callPackage ../tools/filesystems/fuse-zip { };
+
+  fuse_exfat = callPackage ../tools/filesystems/fuse-exfat { };
+
+  dos2unix = callPackage ../tools/text/dos2unix { };
+
+  uni2ascii = callPackage ../tools/text/uni2ascii { };
+
+  g500-control = callPackage ../tools/misc/g500-control { };
+
+  galculator = callPackage ../applications/misc/galculator {
+    gtk = gtk3;
+  };
+
+  gawk = callPackage ../tools/text/gawk { };
+
+  gawkInteractive = appendToName "interactive"
+    (gawk.override { readlineSupport = true; });
+
+  gbdfed = callPackage ../tools/misc/gbdfed {
+    gtk = gtk2;
+  };
+
+  gdmap = callPackage ../tools/system/gdmap { };
+
+  genext2fs = callPackage ../tools/filesystems/genext2fs { };
+
+  gengetopt = callPackage ../development/tools/misc/gengetopt { };
+
+  getmail = callPackage ../tools/networking/getmail { };
+
+  getopt = callPackage ../tools/misc/getopt { };
+
+  gftp = callPackage ../tools/networking/gftp { };
+
+  gifsicle = callPackage ../tools/graphics/gifsicle { };
+
+  glusterfs = callPackage ../tools/filesystems/glusterfs { };
+
+  glmark2 = callPackage ../tools/graphics/glmark2 { };
+
+  glxinfo = callPackage ../tools/graphics/glxinfo { };
+
+  gmvault = callPackage ../tools/networking/gmvault { };
+
+  gnokii = builderDefsPackage (import ../tools/misc/gnokii) {
+    inherit intltool perl gettext libusb pkgconfig bluez readline pcsclite
+      libical gtk glib;
+    inherit (xorg) libXpm;
+  };
+
+  gnufdisk = callPackage ../tools/system/fdisk {
+    guile = guile_1_8;
+  };
+
+  gnugrep = callPackage ../tools/text/gnugrep {
+    libiconv = libiconvOrNull;
+  };
+
+  gnulib = callPackage ../development/tools/gnulib { };
+
+  gnupatch = callPackage ../tools/text/gnupatch { };
+
+  gnupg1orig = callPackage ../tools/security/gnupg1 { };
+
+  gnupg1compat = callPackage ../tools/security/gnupg1compat { };
+
+  # use config.packageOverrides if you prefer original gnupg1
+  gnupg1 = gnupg1compat;
+
+  gnupg = callPackage ../tools/security/gnupg { libusb = libusb1; };
+
+  gnupg2_1 = lowPrio (callPackage ../tools/security/gnupg/git.nix {
+    libassuan = libassuan2_1;
+  });
+
+  gnuplot = callPackage ../tools/graphics/gnuplot { };
+
+  gnuplot_qt = gnuplot.override { withQt = true; };
+
+  # must have AquaTerm installed separately
+  gnuplot_aquaterm = gnuplot.override { aquaterm = true; };
+
+  gnused = callPackage ../tools/text/gnused { };
+
+  gnutar = callPackage ../tools/archivers/gnutar { };
+
+  gnuvd = callPackage ../tools/misc/gnuvd { };
+
+  goaccess = callPackage ../tools/misc/goaccess { };
+
+  googleAuthenticator = callPackage ../os-specific/linux/google-authenticator { };
+
+  gource = callPackage ../applications/version-management/gource {};
+
+  gpodder = callPackage ../applications/audio/gpodder { };
+
+  gptfdisk = callPackage ../tools/system/gptfdisk { };
+
+  grafana = callPackage ../development/tools/misc/grafana { };
+
+  grafx2 = callPackage ../applications/graphics/grafx2 {};
+
+  graphviz = callPackage ../tools/graphics/graphviz { };
+
+  /* Readded by Michael Raskin. There are programs in the wild
+   * that do want 2.0 but not 2.22. Please give a day's notice for
+   * objections before removal. The feature is integer coordinates
+   */
+  graphviz_2_0 = callPackage ../tools/graphics/graphviz/2.0.nix { };
+  
+  /* Readded by Michael Raskin. There are programs in the wild
+   * that do want 2.32 but not 2.0 or 2.36. Please give a day's notice for
+   * objections before removal. The feature is libgraph.
+   */
+  graphviz_2_32 = callPackage ../tools/graphics/graphviz/2.32.nix { };
+
+  grive = callPackage ../tools/filesystems/grive {
+    json_c = json-c-0-11; # won't configure with 0.12; others are vulnerable
+  };
+
+  groff = callPackage ../tools/text/groff {
+    ghostscript = null;
+  };
+
+  grub = callPackage_i686 ../tools/misc/grub {
+    buggyBiosCDSupport = config.grub.buggyBiosCDSupport or true;
+  };
+
+  grub2 = callPackage ../tools/misc/grub/2.0x.nix { };
+
+  grub2_efi = grub2.override { efiSupport = true; };
+
+  grub2_zfs = grub2.override { zfsSupport = true; };
+
+  gssdp = callPackage ../development/libraries/gssdp {
+    inherit (gnome) libsoup;
+  };
+
+  gt5 = callPackage ../tools/system/gt5 { };
+
+  gtest = callPackage ../development/libraries/gtest {};
+  gmock = callPackage ../development/libraries/gmock {};
+
+  gtkdatabox = callPackage ../development/libraries/gtkdatabox {};
+
+  gtkgnutella = callPackage ../tools/networking/p2p/gtk-gnutella { };
+
+  gtkvnc = callPackage ../tools/admin/gtk-vnc {};
+
+  gtmess = callPackage ../applications/networking/instant-messengers/gtmess { };
+
+  gummiboot = callPackage ../tools/misc/gummiboot { };
+
+  gupnp = callPackage ../development/libraries/gupnp {
+    inherit (gnome) libsoup;
+  };
+
+  gupnp_av = callPackage ../development/libraries/gupnp-av {};
+
+  gupnp_igd = callPackage ../development/libraries/gupnp-igd {};
+
+  gupnptools = callPackage ../tools/networking/gupnp-tools {};
+
+  gvpe = builderDefsPackage ../tools/networking/gvpe {
+    inherit openssl gmp nettools iproute;
+  };
+
+  gvolicon = callPackage ../tools/audio/gvolicon {};
+
+  gzip = callPackage ../tools/compression/gzip { };
+
+  gzrt = callPackage ../tools/compression/gzrt { };
+
+  partclone = callPackage ../tools/backup/partclone { };
+
+  partimage = callPackage ../tools/backup/partimage { };
+
+  pigz = callPackage ../tools/compression/pigz { };
+
+  haproxy = callPackage ../tools/networking/haproxy { };
+
+  haveged = callPackage ../tools/security/haveged { };
+
+  hawkthorne = callPackage ../games/hawkthorne { love = love_0_9; };
+
+  hardlink = callPackage ../tools/system/hardlink { };
+
+  hashcat = callPackage ../tools/security/hashcat { };
+
+  halibut = callPackage ../tools/typesetting/halibut { };
+
+  hddtemp = callPackage ../tools/misc/hddtemp { };
+
+  hdf5 = callPackage ../tools/misc/hdf5 {
+    szip = null;
+    mpi = null;
+  };
+
+  hdf5-mpi = hdf5.override {
+    szip = null;
+    mpi = pkgs.openmpi;
+  };
+
+  heimdall = callPackage ../tools/misc/heimdall { };
+
+  hevea = callPackage ../tools/typesetting/hevea { };
+
+  highlight = callPackage ../tools/text/highlight {
+    lua = lua5;
+  };
+
+  host = callPackage ../tools/networking/host { };
+
+  hping = callPackage ../tools/networking/hping { };
+
+  httpie = callPackage ../tools/networking/httpie { };
+
+  httpfs2 = callPackage ../tools/filesystems/httpfs { };
+
+  # FIXME: This Hydra snapshot is outdated and depends on the `nixPerl',
+  # which no longer exists.
+  #
+  # hydra = callPackage ../development/tools/misc/hydra {
+  #   nix = nixUnstable;
+  # };
+
+  iasl = callPackage ../development/compilers/iasl { };
+
+  icecast = callPackage ../servers/icecast { };
+
+  icoutils = callPackage ../tools/graphics/icoutils { };
+
+  idutils = callPackage ../tools/misc/idutils { };
+
+  idle3tools = callPackage ../tools/system/idle3tools { };
+
+  iftop = callPackage ../tools/networking/iftop { };
+
+  imapproxy = callPackage ../tools/networking/imapproxy { };
+
+  imapsync = callPackage ../tools/networking/imapsync {
+    inherit (perlPackages) MailIMAPClient;
+  };
+
+  inadyn = callPackage ../tools/networking/inadyn { };
+
+  inetutils = callPackage ../tools/networking/inetutils { };
+
+  ioping = callPackage ../tools/system/ioping {};
+
+  iodine = callPackage ../tools/networking/iodine { };
+
+  iperf = callPackage ../tools/networking/iperf { };
+
+  ipmitool = callPackage ../tools/system/ipmitool {
+    static = false;
+  };
+
+  ipmiutil = callPackage ../tools/system/ipmiutil {};
+
+  ised = callPackage ../tools/misc/ised {};
+
+  isl = callPackage ../development/libraries/isl { };
+  isl_0_12 = callPackage ../development/libraries/isl/0.12.2.nix { };
+
+  isync = callPackage ../tools/networking/isync { };
+
+  jd-gui = callPackage_i686 ../tools/security/jd-gui { };
+
+  jdiskreport = callPackage ../tools/misc/jdiskreport { };
+
+  jfsrec = callPackage ../tools/filesystems/jfsrec {
+    boost = boost144;
+  };
+
+  jfsutils = callPackage ../tools/filesystems/jfsutils { };
+
+  jhead = callPackage ../tools/graphics/jhead { };
+
+  jing = callPackage ../tools/text/xml/jing { };
+
+  jmtpfs = callPackage ../tools/filesystems/jmtpfs { };
+
+  jnettop = callPackage ../tools/networking/jnettop { };
+
+  jq = callPackage ../development/tools/jq {};
+
+  jscoverage = callPackage ../development/tools/misc/jscoverage { };
+
+  jwhois = callPackage ../tools/networking/jwhois { };
+
+  kazam = callPackage ../applications/video/kazam { };
+
+  kalibrate-rtl = callPackage ../tools/misc/kalibrate-rtl { };
+
+  kexectools = callPackage ../os-specific/linux/kexectools { };
+
+  keychain = callPackage ../tools/misc/keychain { };
+
+  kismet = callPackage ../applications/networking/sniffers/kismet { };
+
+  less = callPackage ../tools/misc/less { };
+
+  lockfileProgs = callPackage ../tools/misc/lockfile-progs { };
+
+  logstash = callPackage ../tools/misc/logstash { };
+
+  logstash-forwarder = callPackage ../tools/misc/logstash-forwarder { };
+
+  kippo = callPackage ../servers/kippo { };
+
+  klavaro = callPackage ../games/klavaro {};
+
+  kzipmix = callPackage_i686 ../tools/compression/kzipmix { };
+
+  minidlna = callPackage ../tools/networking/minidlna {
+    ffmpeg = ffmpeg_0_10;
+  };
+
+  mmv = callPackage ../tools/misc/mmv { };
+
+  most = callPackage ../tools/misc/most { };
+
+  multitail = callPackage ../tools/misc/multitail { };
+
+  netperf = callPackage ../applications/networking/netperf { };
+
+  ninka = callPackage ../development/tools/misc/ninka { };
+
+  nodejs = callPackage ../development/web/nodejs {};
+
+  nodePackages = recurseIntoAttrs (import ./node-packages.nix {
+    inherit pkgs stdenv nodejs fetchurl fetchgit;
+    neededNatives = [python] ++ lib.optional (lib.elem system lib.platforms.linux) utillinux;
+    self = pkgs.nodePackages;
+  });
+
+  ldapvi = callPackage ../tools/misc/ldapvi { };
+
+  ldns = callPackage ../development/libraries/ldns { };
+
+  lftp = callPackage ../tools/networking/lftp { };
+
+  libconfig = callPackage ../development/libraries/libconfig { };
+
+  libee = callPackage ../development/libraries/libee { };
+
+  libestr = callPackage ../development/libraries/libestr { };
+
+  libevdev = callPackage ../development/libraries/libevdev { };
+
+  liboauth = callPackage ../development/libraries/liboauth { };
+
+  libtirpc = callPackage ../development/libraries/ti-rpc { };
+
+  libshout = callPackage ../development/libraries/libshout { };
+
+  libqmi = callPackage ../development/libraries/libqmi { };
+
+  libmbim = callPackage ../development/libraries/libmbim { };
+
+  libtorrent = callPackage ../tools/networking/p2p/libtorrent { };
+
+  logcheck = callPackage ../tools/system/logcheck {
+    inherit (perlPackages) mimeConstruct;
+  };
+
+  logrotate = callPackage ../tools/system/logrotate { };
+
+  logstalgia = callPackage ../tools/graphics/logstalgia {};
+
+  lout = callPackage ../tools/typesetting/lout { };
+
+  lrzip = callPackage ../tools/compression/lrzip { };
+
+  # lsh installs `bin/nettle-lfib-stream' and so does Nettle.  Give the
+  # former a lower priority than Nettle.
+  lsh = lowPrio (callPackage ../tools/networking/lsh { });
+
+  lshw = callPackage ../tools/system/lshw { };
+
+  lxc = callPackage ../os-specific/linux/lxc { };
+
+  lzip = callPackage ../tools/compression/lzip { };
+
+  lzma = xz;
+
+  xz = callPackage ../tools/compression/xz { };
+
+  lzop = callPackage ../tools/compression/lzop { };
+
+  maildrop = callPackage ../tools/networking/maildrop { };
+
+  mailpile = callPackage ../applications/networking/mailreaders/mailpile { };
+
+  mailutils = callPackage ../tools/networking/mailutils {
+    guile = guile_1_8;
+  };
+
+  mairix = callPackage ../tools/text/mairix { };
+
+  makemkv = callPackage ../applications/video/makemkv { };
+
+  man = callPackage ../tools/misc/man { };
+
+  man_db = callPackage ../tools/misc/man-db { };
+
+  memtest86 = callPackage ../tools/misc/memtest86 { };
+
+  memtest86plus = callPackage ../tools/misc/memtest86+ { };
+
+  meo = callPackage ../tools/security/meo { };
+
+  mc = callPackage ../tools/misc/mc { };
+
+  mcabber = callPackage ../applications/networking/instant-messengers/mcabber { };
+
+  mcron = callPackage ../tools/system/mcron {
+    guile = guile_1_8;
+  };
+
+  mdbtools = callPackage ../tools/misc/mdbtools { };
+
+  mdbtools_git = callPackage ../tools/misc/mdbtools/git.nix {
+    inherit (gnome) scrollkeeper;
+  };
+
+  mednafen = callPackage ../misc/emulators/mednafen { };
+
+  mednafen-server = callPackage ../misc/emulators/mednafen/server.nix { };
+
+  megacli = callPackage ../tools/misc/megacli { };
+
+  megatools = callPackage ../tools/networking/megatools { };
+
+  mfcuk = callPackage ../tools/security/mfcuk { };
+
+  minecraft = callPackage ../games/minecraft { };
+
+  minecraft-server = callPackage ../games/minecraft-server { };
+
+  minetest = callPackage ../games/minetest {
+    libpng = libpng12;
+  };
+
+  miniupnpc = callPackage ../tools/networking/miniupnpc { };
+
+  miniupnpd = callPackage ../tools/networking/miniupnpd { };
+
+  minixml = callPackage ../development/libraries/minixml { };
+
+  mjpegtools = callPackage ../tools/video/mjpegtools { };
+
+  mkcue = callPackage ../tools/cd-dvd/mkcue { };
+
+  mkpasswd = callPackage ../tools/security/mkpasswd { };
+
+  mktemp = callPackage ../tools/security/mktemp { };
+
+  mktorrent = callPackage ../tools/misc/mktorrent { };
+
+  modemmanager = callPackage ../tools/networking/modemmanager {};
+
+  monit = callPackage ../tools/system/monit { };
+
+  mosh = callPackage ../tools/networking/mosh {
+    boost = boostHeaders;
+    inherit (perlPackages) IOTty;
+  };
+
+  mpage = callPackage ../tools/text/mpage { };
+
+  mr = callPackage ../applications/version-management/mr { };
+
+  mscgen = callPackage ../tools/graphics/mscgen { };
+
+  msf = builderDefsPackage (import ../tools/security/metasploit/3.1.nix) {
+    inherit ruby makeWrapper;
+  };
+
+  mssys = callPackage ../tools/misc/mssys { };
+
+  mtdutils = callPackage ../tools/filesystems/mtdutils { };
+
+  mtools = callPackage ../tools/filesystems/mtools { };
+
+  mtr = callPackage ../tools/networking/mtr {};
+
+  multitran = recurseIntoAttrs (let callPackage = newScope pkgs.multitran; in rec {
+    multitrandata = callPackage ../tools/text/multitran/data { };
+
+    libbtree = callPackage ../tools/text/multitran/libbtree { };
+
+    libmtsupport = callPackage ../tools/text/multitran/libmtsupport { };
+
+    libfacet = callPackage ../tools/text/multitran/libfacet { };
+
+    libmtquery = callPackage ../tools/text/multitran/libmtquery { };
+
+    mtutils = callPackage ../tools/text/multitran/mtutils { };
+  });
+
+  munge = callPackage ../tools/security/munge { };
+
+  muscleframework = callPackage ../tools/security/muscleframework { };
+
+  muscletool = callPackage ../tools/security/muscletool { };
+
+  mysql2pgsql = callPackage ../tools/misc/mysql2pgsql { };
+
+  namazu = callPackage ../tools/text/namazu { };
+
+  nbd = callPackage ../tools/networking/nbd { };
+
+  ndjbdns = callPackage ../tools/networking/ndjbdns { };
+
+  netatalk = callPackage ../tools/filesystems/netatalk { };
+
+  netcdf = callPackage ../development/libraries/netcdf { };
+
+  nc6 = callPackage ../tools/networking/nc6 { };
+
+  ncat = callPackage ../tools/networking/ncat { };
+
+  ncftp = callPackage ../tools/networking/ncftp { };
+
+  ncompress = callPackage ../tools/compression/ncompress { };
+
+  ndisc6 = callPackage ../tools/networking/ndisc6 { };
+
+  netboot = callPackage ../tools/networking/netboot {};
+
+  netcat = callPackage ../tools/networking/netcat { };
+
+  netcat-openbsd = callPackage ../tools/networking/netcat-openbsd { };
+
+  nethogs = callPackage ../tools/networking/nethogs { };
+
+  netkittftp = callPackage ../tools/networking/netkit/tftp { };
+
+  netpbm = callPackage ../tools/graphics/netpbm { };
+
+  netrw = callPackage ../tools/networking/netrw { };
+
+  netselect = callPackage ../tools/networking/netselect { };
+
+  networkmanager = callPackage ../tools/networking/network-manager { };
+
+  networkmanager_openvpn = callPackage ../tools/networking/network-manager/openvpn.nix { };
+
+  networkmanager_pptp = callPackage ../tools/networking/network-manager/pptp.nix { };
+
+  networkmanager_vpnc = callPackage ../tools/networking/network-manager/vpnc.nix { };
+
+  networkmanager_openconnect = callPackage ../tools/networking/network-manager/openconnect.nix { };
+
+  networkmanagerapplet = newScope gnome ../tools/networking/network-manager-applet { dconf = gnome3.dconf; };
+
+  newsbeuter = callPackage ../applications/networking/feedreaders/newsbeuter { };
+
+  newsbeuter-dev = callPackage ../applications/networking/feedreaders/newsbeuter/dev.nix { };
+
+  ngrep = callPackage ../tools/networking/ngrep { };
+
+  ngrok = callPackage ../tools/misc/ngrok { };
+
+  mpack = callPackage ../tools/networking/mpack { };
+
+  pa_applet = callPackage ../tools/audio/pa-applet { };
+
+  pnmixer = callPackage ../tools/audio/pnmixer { };
+
+  nifskope = callPackage ../tools/graphics/nifskope { };
+
+  nilfs_utils = callPackage ../tools/filesystems/nilfs-utils {};
+
+  nitrogen = callPackage ../tools/X11/nitrogen {};
+
+  nlopt = callPackage ../development/libraries/nlopt {};
+
+  npapi_sdk = callPackage ../development/libraries/npapi-sdk {};
+
+  npth = callPackage ../development/libraries/npth {};
+
+  nmap = callPackage ../tools/security/nmap { };
+
+  nmap_graphical = callPackage ../tools/security/nmap {
+    inherit (pythonPackages) pysqlite;
+    graphicalSupport = true;
+  };
+
+  notbit = callPackage ../applications/networking/notbit { };
+
+  nox = callPackage ../tools/package-management/nox {
+    pythonPackages = python3Packages;
+    nix = nixUnstable;
+  };
+
+  nss_pam_ldapd = callPackage ../tools/networking/nss-pam-ldapd {};
+
+  ntfs3g = callPackage ../tools/filesystems/ntfs-3g { };
+
+  # ntfsprogs are merged into ntfs-3g
+  ntfsprogs = pkgs.ntfs3g;
+
+  ntop = callPackage ../tools/networking/ntop { };
+
+  ntopng = callPackage ../tools/networking/ntopng { };
+
+  ntp = callPackage ../tools/networking/ntp { };
+
+  numdiff = callPackage ../tools/text/numdiff { };
+
+  nssmdns = callPackage ../tools/networking/nss-mdns { };
+
+  nwdiag = pythonPackages.nwdiag;
+
+  nylon = callPackage ../tools/networking/nylon { };
+
+  nzbget = callPackage ../tools/networking/nzbget { };
+
+  oathToolkit = callPackage ../tools/security/oath-toolkit { };
+
+  obex_data_server = callPackage ../tools/bluetooth/obex-data-server { };
+
+  obexd = callPackage ../tools/bluetooth/obexd { };
+
+  obexfs = callPackage ../tools/bluetooth/obexfs { };
+
+  obexftp = callPackage ../tools/bluetooth/obexftp { };
+
+  obnam = callPackage ../tools/backup/obnam { };
+
+  odt2txt = callPackage ../tools/text/odt2txt { };
+
+  offlineimap = callPackage ../tools/networking/offlineimap {
+    inherit (pythonPackages) sqlite3;
+  };
+
+  opendbx = callPackage ../development/libraries/opendbx { };
+
+  opendkim = callPackage ../development/libraries/opendkim { };
+
+  opendylan = callPackage ../development/compilers/opendylan {
+    opendylan-bootstrap = opendylan_bin;
+  };
+
+  opendylan_bin = callPackage ../development/compilers/opendylan/bin.nix { };
+
+  openjade = callPackage ../tools/text/sgml/openjade { };
+
+  openntpd = callPackage ../tools/networking/openntpd { };
+
+  openobex = callPackage ../tools/bluetooth/openobex { };
+
+  openopc = callPackage ../tools/misc/openopc {
+    pythonFull = python27Full.override {
+      extraLibs = [ python27Packages.pyro3 ];
+    };
+  };
+
+  openresolv = callPackage ../tools/networking/openresolv { };
+
+  opensc = callPackage ../tools/security/opensc { };
+
+  opensc_dnie_wrapper = callPackage ../tools/security/opensc-dnie-wrapper { };
+
+  openssh =
+    callPackage ../tools/networking/openssh {
+      hpnSupport = false;
+      withKerberos = false;
+      etcDir = "/etc/ssh";
+      pam = if stdenv.isLinux then pam else null;
+    };
+
+  openssh_hpn = pkgs.appendToName "with-hpn" (openssh.override { hpnSupport = true; });
+
+  openssh_with_kerberos = pkgs.appendToName "with-kerberos" (openssh.override { withKerberos = true; });
+
+  opensp = callPackage ../tools/text/sgml/opensp { };
+
+  spCompat = callPackage ../tools/text/sgml/opensp/compat.nix { };
+
+  openvpn = callPackage ../tools/networking/openvpn { };
+
+  openvpn_learnaddress = callPackage ../tools/networking/openvpn/openvpn_learnaddress.nix { };
+
+  openvswitch = callPackage ../os-specific/linux/openvswitch { };
+
+  optipng = callPackage ../tools/graphics/optipng {
+    libpng = libpng12;
+  };
+
+  oslrd = callPackage ../tools/networking/oslrd { };
+
+  ossec = callPackage ../tools/security/ossec {};
+
+  otpw = callPackage ../os-specific/linux/otpw { };
+
+  p7zip = callPackage ../tools/archivers/p7zip { };
+
+  pal = callPackage ../tools/misc/pal { };
+
+  panomatic = callPackage ../tools/graphics/panomatic { };
+
+  par2cmdline = callPackage ../tools/networking/par2cmdline { };
+
+  parallel = callPackage ../tools/misc/parallel { };
+
+  parcellite = callPackage ../tools/misc/parcellite { };
+
+  patchutils = callPackage ../tools/text/patchutils { };
+
+  parted = callPackage ../tools/misc/parted { hurd = null; };
+
+  pitivi = callPackage ../applications/video/pitivi {
+    gst = gst_all_1;
+    clutter-gtk = clutter_gtk;
+    inherit (gnome3) gnome_icon_theme gnome_icon_theme_symbolic;
+  };
+
+  p0f = callPackage ../tools/security/p0f { };
+
+  pngout = callPackage ../tools/graphics/pngout { };
+
+  hurdPartedCross =
+    if crossSystem != null && crossSystem.config == "i586-pc-gnu"
+    then (makeOverridable
+            ({ hurd }:
+              (parted.override {
+                # Needs the Hurd's libstore.
+                inherit hurd;
+
+                # The Hurd wants a libparted.a.
+                enableStatic = true;
+
+                gettext = null;
+                readline = null;
+                devicemapper = null;
+              }).crossDrv)
+           { hurd = gnu.hurdCrossIntermediate; })
+    else null;
+
+  ipsecTools = callPackage ../os-specific/linux/ipsec-tools { flex = flex_2_5_35; };
+
+  patch = gnupatch;
+
+  pbzip2 = callPackage ../tools/compression/pbzip2 { };
+
+  pciutils = callPackage ../tools/system/pciutils { };
+
+  pcsclite = callPackage ../tools/security/pcsclite { };
+
+  pdf2djvu = callPackage ../tools/typesetting/pdf2djvu { };
+
+  pdfjam = callPackage ../tools/typesetting/pdfjam { };
+
+  jbig2enc = callPackage ../tools/graphics/jbig2enc { };
+
+  pdfread = callPackage ../tools/graphics/pdfread { };
+
+  briss = callPackage ../tools/graphics/briss { };
+
+  bully = callPackage ../tools/networking/bully { };
+
+  pdnsd = callPackage ../tools/networking/pdnsd { };
+
+  peco = callPackage ../tools/text/peco { };
+
+  pg_top = callPackage ../tools/misc/pg_top { };
+
+  pdsh = callPackage ../tools/networking/pdsh {
+    rsh = true;          # enable internal rsh implementation
+    ssh = openssh;
+  };
+
+  pfstools = callPackage ../tools/graphics/pfstools { };
+
+  philter = callPackage ../tools/networking/philter { };
+
+  pinentry = callPackage ../tools/security/pinentry { };
+
+  pius = callPackage ../tools/security/pius { };
+
+  pk2cmd = callPackage ../tools/misc/pk2cmd { };
+
+  plantuml = callPackage ../tools/misc/plantuml { };
+
+  plan9port = callPackage ../tools/system/plan9port { };
+
+  ploticus = callPackage ../tools/graphics/ploticus {
+    libpng = libpng12;
+  };
+
+  plotutils = callPackage ../tools/graphics/plotutils { };
+
+  plowshare = callPackage ../tools/misc/plowshare { };
+
+  pngcrush = callPackage ../tools/graphics/pngcrush { };
+
+  pngnq = callPackage ../tools/graphics/pngnq { };
+
+  pngtoico = callPackage ../tools/graphics/pngtoico {
+    libpng = libpng12;
+  };
+
+  pngquant = callPackage ../tools/graphics/pngquant { };
+
+  podiff = callPackage ../tools/text/podiff { };
+
+  poedit = callPackage ../tools/text/poedit { };
+
+  polipo = callPackage ../servers/polipo { };
+
+  polkit_gnome = callPackage ../tools/security/polkit-gnome { };
+
+  ponysay = callPackage ../tools/misc/ponysay { };
+
+  povray = callPackage ../tools/graphics/povray { };
+
+  ppl = callPackage ../development/libraries/ppl { };
+
+  ppp = callPackage ../tools/networking/ppp { };
+
+  pptp = callPackage ../tools/networking/pptp {};
+
+  prey-bash-client = callPackage ../tools/security/prey { };
+
+  projectm = callPackage ../applications/audio/projectm { };
+
+  proxychains = callPackage ../tools/networking/proxychains { };
+
+  proxytunnel = callPackage ../tools/misc/proxytunnel { };
+
+  cntlm = callPackage ../tools/networking/cntlm { };
+
+  pastebinit = callPackage ../tools/misc/pastebinit { };
+
+  psmisc = callPackage ../os-specific/linux/psmisc { };
+
+  pstoedit = callPackage ../tools/graphics/pstoedit { };
+
+  pv = callPackage ../tools/misc/pv { };
+
+  pwgen = callPackage ../tools/security/pwgen { };
+
+  pwnat = callPackage ../tools/networking/pwnat { };
+
+  pycangjie = callPackage ../development/python-modules/pycangjie { };
+
+  pydb = callPackage ../development/tools/pydb { };
+
+  pystringtemplate = callPackage ../development/python-modules/stringtemplate { };
+
+  pythonDBus = dbus_python;
+
+  pythonIRClib = builderDefsPackage (import ../development/python-modules/irclib) {
+    inherit python;
+  };
+
+  pythonSexy = builderDefsPackage (import ../development/python-modules/libsexy) {
+    inherit python libsexy pkgconfig libxml2 pygtk pango gtk glib;
+  };
+
+  openmpi = callPackage ../development/libraries/openmpi { };
+
+  qhull = callPackage ../development/libraries/qhull { };
+
+  qjoypad = callPackage ../tools/misc/qjoypad { };
+
+  qshowdiff = callPackage ../tools/text/qshowdiff { };
+
+  quilt = callPackage ../development/tools/quilt { };
+
+  radvd = callPackage ../tools/networking/radvd { };
+
+  ranger = callPackage ../applications/misc/ranger { };
+
+  privateer = callPackage ../games/privateer { };
+
+  rtmpdump = callPackage ../tools/video/rtmpdump { };
+
+  reaverwps = callPackage ../tools/networking/reaver-wps {};
+
+  recutils = callPackage ../tools/misc/recutils { };
+
+  recoll = callPackage ../applications/search/recoll { };
+
+  reiser4progs = callPackage ../tools/filesystems/reiser4progs { };
+
+  reiserfsprogs = callPackage ../tools/filesystems/reiserfsprogs { };
+
+  relfs = callPackage ../tools/filesystems/relfs {
+    inherit (gnome) gnome_vfs GConf;
+  };
+
+  remarkjs = callPackage ../development/web/remarkjs { };
+
+  remind = callPackage ../tools/misc/remind { };
+
+  remmina = callPackage ../applications/networking/remote/remmina {};
+
+  renameutils = callPackage ../tools/misc/renameutils { };
+
+  replace = callPackage ../tools/text/replace { };
+
+  reptyr = callPackage ../os-specific/linux/reptyr {};
+
+  rdiff_backup = callPackage ../tools/backup/rdiff-backup { };
+
+  rdmd = callPackage ../development/compilers/rdmd { };
+
+  rhash = callPackage ../tools/security/rhash { };
+
+  riemann_c_client = callPackage ../tools/misc/riemann-c-client { };
+
+  ripmime = callPackage ../tools/networking/ripmime {};
+
+  rkflashtool = callPackage ../tools/misc/rkflashtool { };
+
+  rmlint = callPackage ../tools/misc/rmlint {};
+
+  rng_tools = callPackage ../tools/security/rng-tools { };
+
+  rsnapshot = callPackage ../tools/backup/rsnapshot {
+    # For the `logger' command, we can use either `utillinux' or
+    # GNU Inetutils.  The latter is more portable.
+    logger = inetutils;
+  };
+
+  rlwrap = callPackage ../tools/misc/rlwrap { };
+
+  rockbox_utility = callPackage ../tools/misc/rockbox-utility { };
+
+  rpPPPoE = builderDefsPackage (import ../tools/networking/rp-pppoe) {
+    inherit ppp;
+  };
+
+  rpm = callPackage ../tools/package-management/rpm { };
+
+  rrdtool = callPackage ../tools/misc/rrdtool { };
+
+  rtorrent = callPackage ../tools/networking/p2p/rtorrent { };
+
+  rubber = callPackage ../tools/typesetting/rubber { };
+
+  rxp = callPackage ../tools/text/xml/rxp { };
+
+  rzip = callPackage ../tools/compression/rzip { };
+
+  s3backer = callPackage ../tools/filesystems/s3backer { };
+
+  s3cmd = callPackage ../tools/networking/s3cmd { };
+
+  s3cmd_15_pre_81e3842f7a = lowPrio (callPackage ../tools/networking/s3cmd/git.nix { });
+
+  s3sync = callPackage ../tools/networking/s3sync {
+    ruby = ruby18;
+  };
+
+  s6Dns = callPackage ../tools/networking/s6-dns { };
+
+  s6LinuxUtils = callPackage ../os-specific/linux/s6-linux-utils { };
+
+  s6Networking = callPackage ../tools/networking/s6-networking { };
+
+  s6PortableUtils = callPackage ../tools/misc/s6-portable-utils { };
+
+  sablotron = callPackage ../tools/text/xml/sablotron { };
+
+  safecopy = callPackage ../tools/system/safecopy { };
+
+  salut_a_toi = callPackage ../applications/networking/instant-messengers/salut-a-toi {};
+
+  samplicator = callPackage ../tools/networking/samplicator { };
+
+  screen = callPackage ../tools/misc/screen { };
+
+  scrot = callPackage ../tools/graphics/scrot { };
+
+  scrypt = callPackage ../tools/security/scrypt { };
+
+  sdcv = callPackage ../applications/misc/sdcv { };
+
+  sec = callPackage ../tools/admin/sec { };
+
+  seccure = callPackage ../tools/security/seccure { };
+
+  setserial = builderDefsPackage (import ../tools/system/setserial) {
+    inherit groff;
+  };
+
+  seqdiag = pythonPackages.seqdiag;
+
+  screenfetch = callPackage ../tools/misc/screenfetch { };
+
+  sg3_utils = callPackage ../tools/system/sg3_utils { };
+
+  sharutils = callPackage ../tools/archivers/sharutils { };
+
+  shotwell = callPackage ../applications/graphics/shotwell { };
+
+  shebangfix = callPackage ../tools/misc/shebangfix { };
+
+  shellinabox = callPackage ../servers/shellinabox { };
+
+  siege = callPackage ../tools/networking/siege {};
+
+  silc_client = callPackage ../applications/networking/instant-messengers/silc-client { };
+
+  silc_server = callPackage ../servers/silc-server { };
+
+  silver-searcher = callPackage ../tools/text/silver-searcher { };
+
+  simplescreenrecorder = callPackage ../applications/video/simplescreenrecorder { };
+
+  sleuthkit = callPackage ../tools/system/sleuthkit {};
+
+  slimrat = callPackage ../tools/networking/slimrat {
+    inherit (perlPackages) WWWMechanize LWP;
+  };
+
+  slsnif = callPackage ../tools/misc/slsnif { };
+
+  smartmontools = callPackage ../tools/system/smartmontools { };
+
+  smbldaptools = callPackage ../tools/networking/smbldaptools {
+    inherit (perlPackages) NetLDAP CryptSmbHash DigestSHA1;
+  };
+
+  smbnetfs = callPackage ../tools/filesystems/smbnetfs {};
+
+  snort = callPackage ../applications/networking/ids/snort { };
+
+  snx = callPackage_i686 ../tools/networking/snx {
+    inherit (pkgsi686Linux) pam gcc33;
+    inherit (pkgsi686Linux.xlibs) libX11;
+  };
+
+  solr = callPackage ../servers/search/solr { };
+
+  sparsehash = callPackage ../development/libraries/sparsehash { };
+
+  spiped = callPackage ../tools/networking/spiped { };
+
+  sproxy = haskellPackages.callPackage ../tools/networking/sproxy { };
+
+  sproxy-web = haskellPackages.callPackage ../tools/networking/sproxy-web { };
+
+  stardict = callPackage ../applications/misc/stardict/stardict.nix {
+    inherit (gnome) libgnomeui scrollkeeper;
+  };
+
+  storebrowse = callPackage ../tools/system/storebrowse { };
+
+  fusesmb = callPackage ../tools/filesystems/fusesmb { };
+
+  sl = callPackage ../tools/misc/sl { };
+
+  socat = callPackage ../tools/networking/socat { };
+
+  socat2pre = lowPrio (callPackage ../tools/networking/socat/2.x.nix { });
+
+  sourceHighlight = callPackage ../tools/text/source-highlight {
+    # Boost 1.54 causes the "test_regexranges" test to fail
+    boost = boost149;
+  };
+
+  spaceFM = callPackage ../applications/misc/spacefm { };
+
+  squashfsTools = callPackage ../tools/filesystems/squashfs { };
+
+  sshfsFuse = callPackage ../tools/filesystems/sshfs-fuse { };
+
+  sshuttle = callPackage ../tools/security/sshuttle { };
+
+  sudo = callPackage ../tools/security/sudo { };
+
+  suidChroot = builderDefsPackage (import ../tools/system/suid-chroot) { };
+
+  super = callPackage ../tools/security/super { };
+
+  ssdeep = callPackage ../tools/security/ssdeep { };
+
+  ssmtp = callPackage ../tools/networking/ssmtp {
+    tlsSupport = true;
+  };
+
+  ssss = callPackage ../tools/security/ssss { };
+
+  storeBackup = callPackage ../tools/backup/store-backup { };
+
+  stow = callPackage ../tools/misc/stow { };
+
+  stun = callPackage ../tools/networking/stun { };
+
+  stunnel = callPackage ../tools/networking/stunnel { };
+
+  su = shadow.su;
+
+  surfraw = callPackage ../tools/networking/surfraw { };
+
+  swec = callPackage ../tools/networking/swec {
+    inherit (perlPackages) LWP URI HTMLParser HTTPServerSimple Parent;
+  };
+
+  svnfs = callPackage ../tools/filesystems/svnfs { };
+
+  sysbench = callPackage ../development/tools/misc/sysbench {};
+
+  system_config_printer = callPackage ../tools/misc/system-config-printer {
+    libxml2 = libxml2Python;
+   };
+
+  sitecopy = callPackage ../tools/networking/sitecopy { };
+
+  stricat = callPackage ../tools/security/stricat { };
+
+  privoxy = callPackage ../tools/networking/privoxy { };
+
+  t1utils = callPackage ../tools/misc/t1utils { };
+
+  tarsnap = callPackage ../tools/backup/tarsnap { };
+
+  tcpcrypt = callPackage ../tools/security/tcpcrypt { };
+
+  tboot = callPackage ../tools/security/tboot { };
+
+  tcl2048 = callPackage ../games/tcl2048 { };
+
+  tcpdump = callPackage ../tools/networking/tcpdump { };
+
+  tcpflow = callPackage ../tools/networking/tcpflow { };
+
+  teamviewer = callPackage_i686 ../applications/networking/remote/teamviewer { };
+
+  # Work In Progress: it doesn't start unless running a daemon as root
+  teamviewer8 = lowPrio (callPackage_i686 ../applications/networking/remote/teamviewer/8.nix { });
+
+  telnet = callPackage ../tools/networking/telnet { };
+
+  texmacs = callPackage ../applications/editors/texmacs {
+    tex = texLive; /* tetex is also an option */
+    extraFonts = true;
+    guile = guile_1_8;
+  };
+
+  texmaker = callPackage ../applications/editors/texmaker { };
+
+  texstudio = callPackage ../applications/editors/texstudio { };
+
+  tiled-qt = callPackage ../applications/editors/tiled-qt { qt = qt4; };
+
+  tinc = callPackage ../tools/networking/tinc { };
+
+  tiny8086 = callPackage ../applications/virtualization/8086tiny { };
+
+  tmpwatch = callPackage ../tools/misc/tmpwatch  { };
+
+  tmux = callPackage ../tools/misc/tmux { };
+
+  tor = callPackage ../tools/security/tor { };
+
+  torbutton = callPackage ../tools/security/torbutton { };
+
+  torbrowser = callPackage ../tools/security/tor/torbrowser.nix { };
+
+  torsocks = callPackage ../tools/security/tor/torsocks.nix { };
+
+  tpm-quote-tools = callPackage ../tools/security/tpm-quote-tools { };
+
+  tpm-tools = callPackage ../tools/security/tpm-tools { };
+
+  trickle = callPackage ../tools/networking/trickle {};
+
+  trousers = callPackage ../tools/security/trousers { };
+
+  ttf2pt1 = callPackage ../tools/misc/ttf2pt1 { };
+
+  ttysnoop = callPackage ../os-specific/linux/ttysnoop {};
+
+  twitterBootstrap = callPackage ../development/web/twitter-bootstrap {};
+
+  txt2man = callPackage ../tools/misc/txt2man { };
+
+  ucl = callPackage ../development/libraries/ucl { };
+
+  ucspi-tcp = callPackage ../tools/networking/ucspi-tcp { };
+
+  udftools = callPackage ../tools/filesystems/udftools {};
+
+  udptunnel = callPackage ../tools/networking/udptunnel { };
+
+  ufraw = callPackage ../applications/graphics/ufraw { };
+
+  unetbootin = callPackage ../tools/cd-dvd/unetbootin { };
+
+  unfs3 = callPackage ../servers/unfs3 { };
+
+  unoconv = callPackage ../tools/text/unoconv { };
+
+  upx = callPackage ../tools/compression/upx { };
+
+  urlview = callPackage ../applications/misc/urlview {};
+
+  usbmuxd = callPackage ../tools/misc/usbmuxd {};
+
+  vacuum = callPackage ../applications/networking/instant-messengers/vacuum {};
+
+  volatility = callPackage ../tools/security/volatility { };
+
+  vidalia = callPackage ../tools/security/vidalia { };
+
+  vbetool = builderDefsPackage ../tools/system/vbetool {
+    inherit pciutils libx86 zlib;
+  };
+
+  vde2 = callPackage ../tools/networking/vde2 { };
+
+  vboot_reference = callPackage ../tools/system/vboot_reference { };
+
+  vcsh = callPackage ../applications/version-management/vcsh { };
+
+  verilog = callPackage ../applications/science/electronics/verilog {};
+
+  vfdecrypt = callPackage ../tools/misc/vfdecrypt { };
+
+  vifm = callPackage ../applications/misc/vifm { };
+
+  viking = callPackage ../applications/misc/viking {
+    inherit (gnome) scrollkeeper;
+  };
+
+  vnc2flv = callPackage ../tools/video/vnc2flv {};
+
+  vncrec = builderDefsPackage ../tools/video/vncrec {
+    inherit (xlibs) imake libX11 xproto gccmakedep libXt
+      libXmu libXaw libXext xextproto libSM libICE libXpm
+      libXp;
+  };
+
+  vobcopy = callPackage ../tools/cd-dvd/vobcopy { };
+
+  vobsub2srt = callPackage ../tools/cd-dvd/vobsub2srt { };
+
+  vorbisgain = callPackage ../tools/misc/vorbisgain { };
+
+  vpnc = callPackage ../tools/networking/vpnc { };
+
+  openconnect = callPackage ../tools/networking/openconnect.nix { };
+
+  vtun = callPackage ../tools/networking/vtun { };
+
+  wal_e = callPackage ../tools/backup/wal-e { };
+
+  watchman = callPackage ../development/tools/watchman { };
+
+  wbox = callPackage ../tools/networking/wbox {};
+
+  welkin = callPackage ../tools/graphics/welkin {};
+
+  testdisk = callPackage ../tools/misc/testdisk { };
+
+  htmlTidy = callPackage ../tools/text/html-tidy { };
+
+  html-xml-utils = callPackage ../tools/text/xml/html-xml-utils { };
+
+  tftp_hpa = callPackage ../tools/networking/tftp-hpa {};
+
+  tigervnc = callPackage ../tools/admin/tigervnc {
+    fontDirectories = [ xorg.fontadobe75dpi xorg.fontmiscmisc xorg.fontcursormisc
+      xorg.fontbhlucidatypewriter75dpi ];
+    inherit (xorg) xorgserver;
+    fltk = fltk13;
+  };
+
+  tightvnc = callPackage ../tools/admin/tightvnc {
+    fontDirectories = [ xorg.fontadobe75dpi xorg.fontmiscmisc xorg.fontcursormisc
+      xorg.fontbhlucidatypewriter75dpi ];
+  };
+
+  time = callPackage ../tools/misc/time { };
+
+  tkabber = callPackage ../applications/networking/instant-messengers/tkabber { };
+
+  qfsm = callPackage ../applications/science/electronics/qfsm { };
+
+  tkgate = callPackage ../applications/science/electronics/tkgate/1.x.nix {
+    inherit (xlibs) libX11 imake xproto gccmakedep;
+  };
+
+  # The newer package is low-priority because it segfaults at startup.
+  tkgate2 = lowPrio (callPackage ../applications/science/electronics/tkgate/2.x.nix {
+    inherit (xlibs) libX11;
+  });
+
+  tm = callPackage ../tools/system/tm { };
+
+  trang = callPackage ../tools/text/xml/trang { };
+
+  tre = callPackage ../development/libraries/tre { };
+
+  ts = callPackage ../tools/system/ts { };
+
+  transfig = callPackage ../tools/graphics/transfig {
+    libpng = libpng12;
+  };
+
+  truecrypt = callPackage ../applications/misc/truecrypt {
+    wxGUI = config.truecrypt.wxGUI or true;
+  };
+
+  ttmkfdir = callPackage ../tools/misc/ttmkfdir { };
+
+  uim = callPackage ../tools/inputmethods/uim {
+    inherit (pkgs.kde4) kdelibs;
+  };
+
+  uhub = callPackage ../servers/uhub { };
+
+  unclutter = callPackage ../tools/misc/unclutter { };
+
+  unbound = callPackage ../tools/networking/unbound { };
+
+  units = callPackage ../tools/misc/units { };
+
+  unrar = callPackage ../tools/archivers/unrar { };
+
+  xar = callPackage ../tools/compression/xar { };
+
+  xarchive = callPackage ../tools/archivers/xarchive { };
+
+  xarchiver = callPackage ../tools/archivers/xarchiver { };
+
+  xcruiser = callPackage ../applications/misc/xcruiser { };
+
+  unarj = callPackage ../tools/archivers/unarj { };
+
+  unshield = callPackage ../tools/archivers/unshield { };
+
+  unzip = callPackage ../tools/archivers/unzip { };
+
+  unzipNLS = lowPrio (unzip.override { enableNLS = true; });
+
+  uptimed = callPackage ../tools/system/uptimed { };
+
+  urlwatch = callPackage ../tools/networking/urlwatch { };
+
+  varnish = callPackage ../servers/varnish { };
+
+  varnish2 = callPackage ../servers/varnish/2.1.nix { };
+
+  venus = callPackage ../tools/misc/venus {
+    python = python27;
+  };
+
+  vlan = callPackage ../tools/networking/vlan { };
+
+  wakelan = callPackage ../tools/networking/wakelan { };
+
+  wavemon = callPackage ../tools/networking/wavemon { };
+
+  w3cCSSValidator = callPackage ../tools/misc/w3c-css-validator {
+    tomcat = tomcat6;
+  };
+
+  wdfs = callPackage ../tools/filesystems/wdfs { };
+
+  wdiff = callPackage ../tools/text/wdiff { };
+
+  webalizer = callPackage ../tools/networking/webalizer { };
+
+  webdruid = builderDefsPackage ../tools/admin/webdruid {
+    inherit zlib libpng freetype gd which
+      libxml2 geoip;
+  };
+
+  weighttp = callPackage ../tools/networking/weighttp { };
+
+  wget = callPackage ../tools/networking/wget {
+    inherit (perlPackages) LWP;
+  };
+
+  which = callPackage ../tools/system/which { };
+
+  wicd = callPackage ../tools/networking/wicd { };
+
+  wkhtmltopdf = callPackage ../tools/graphics/wkhtmltopdf { };
+
+  wv = callPackage ../tools/misc/wv { };
+
+  wv2 = callPackage ../tools/misc/wv2 { };
+
+  x86info = callPackage ../os-specific/linux/x86info { };
+
+  x11_ssh_askpass = callPackage ../tools/networking/x11-ssh-askpass { };
+
+  xbursttools = assert stdenv ? glibc; import ../tools/misc/xburst-tools {
+    inherit stdenv fetchgit autoconf automake confuse pkgconfig libusb libusb1;
+    # It needs a cross compiler for mipsel to build the firmware it will
+    # load into the Ben Nanonote
+    gccCross =
+      let
+        pkgsCross = (import ./all-packages.nix) {
+          inherit system;
+          inherit bootStdenv noSysDirs gccWithCC gccWithProfiling config;
+          # Ben Nanonote system
+          crossSystem = {
+            config = "mipsel-unknown-linux";
+            bigEndian = true;
+            arch = "mips";
+            float = "soft";
+            withTLS = true;
+            libc = "uclibc";
+            platform = {
+              name = "ben_nanonote";
+              kernelMajor = "2.6";
+              # It's not a bcm47xx processor, but for the headers this should work
+              kernelHeadersBaseConfig = "bcm47xx_defconfig";
+              kernelArch = "mips";
+            };
+            gcc = {
+              arch = "mips32";
+            };
+          };
+        };
+      in
+        pkgsCross.gccCrossStageStatic;
+  };
+
+  xclip = callPackage ../tools/misc/xclip { };
+
+  xtitle = callPackage ../tools/misc/xtitle { };
+
+  xdelta = callPackage ../tools/compression/xdelta { };
+
+  xdummy = callPackage ../tools/misc/xdummy { };
+
+  xfsprogs = callPackage ../tools/filesystems/xfsprogs { };
+
+  xmlroff = callPackage ../tools/typesetting/xmlroff {
+    inherit (gnome) libgnomeprint;
+  };
+
+  xmlstarlet = callPackage ../tools/text/xml/xmlstarlet { };
+
+  xmlto = callPackage ../tools/typesetting/xmlto { };
+
+  xmltv = callPackage ../tools/misc/xmltv { };
+
+  xmpppy = builderDefsPackage (import ../development/python-modules/xmpppy) {
+    inherit python setuptools;
+  };
+
+  xorriso = callPackage ../tools/cd-dvd/xorriso { };
+
+  xpf = callPackage ../tools/text/xml/xpf {
+    libxml2 = libxml2Python;
+  };
+
+  xsel = callPackage ../tools/misc/xsel { };
+
+  xtreemfs = callPackage ../tools/filesystems/xtreemfs {};
+
+  xvfb_run = callPackage ../tools/misc/xvfb-run { inherit (texFunctions) fontsConf; };
+
+  youtubeDL = callPackage ../tools/misc/youtube-dl { };
+
+  zbar = callPackage ../tools/graphics/zbar {
+    pygtk = lib.overrideDerivation pygtk (x: {
+      gtk = gtk2;
+    });
+  };
+
+  zdelta = callPackage ../tools/compression/zdelta { };
+
+  zfstools = callPackage ../tools/filesystems/zfstools {
+    zfs = linuxPackages.zfs;
+  };
+
+  zile = callPackage ../applications/editors/zile { };
+
+  zip = callPackage ../tools/archivers/zip { };
+
+  zpaq = callPackage ../tools/archivers/zpaq { };
+  zpaqd = callPackage ../tools/archivers/zpaq/zpaqd.nix { };
+
+  zsync = callPackage ../tools/compression/zsync { };
+
+
+  ### SHELLS
+
+  bash = lowPrio (callPackage ../shells/bash {
+    texinfo = null;
+  });
+
+  bashInteractive = appendToName "interactive" (callPackage ../shells/bash {
+    interactive = true;
+    readline = readline63; # Includes many vi mode fixes
+  });
+
+  bashCompletion = callPackage ../shells/bash-completion { };
+
+  dash = callPackage ../shells/dash { };
+
+  fish = callPackage ../shells/fish {
+    python = python27Full;
+  };
+
+  tcsh = callPackage ../shells/tcsh { };
+
+  rush = callPackage ../shells/rush { };
+
+  zsh = callPackage ../shells/zsh { };
+
+
+  ### DEVELOPMENT / COMPILERS
+
+  abc =
+    abcPatchable [];
+
+  abcPatchable = patches :
+    import ../development/compilers/abc/default.nix {
+      inherit stdenv fetchurl patches jre apacheAnt;
+      javaCup = callPackage ../development/libraries/java/cup { };
+    };
+
+  aldor = callPackage ../development/compilers/aldor { };
+
+  aliceml = callPackage ../development/compilers/aliceml { };
+
+  aspectj = callPackage ../development/compilers/aspectj { };
+
+  ats = callPackage ../development/compilers/ats { };
+  ats2 = callPackage ../development/compilers/ats2 { };
+
+  avra = callPackage ../development/compilers/avra { };
+
+  bigloo = callPackage ../development/compilers/bigloo { };
+
+  chicken = callPackage ../development/compilers/chicken { };
+
+  ccl = builderDefsPackage ../development/compilers/ccl {};
+
+  clang = wrapClang llvmPackages.clang;
+
+  clang_34 = wrapClang llvmPackages_34.clang;
+  clang_33 = wrapClang (clangUnwrapped llvm_33 ../development/compilers/llvm/3.3/clang.nix);
+
+  clangAnalyzer = callPackage ../development/tools/analysis/clang-analyzer {
+    clang = clang_34;
+    llvmPackages = llvmPackages_34;
+  };
+
+  clangUnwrapped = llvm: pkg: callPackage pkg {
+    stdenv = if stdenv.isDarwin then stdenvApple else stdenv;
+    inherit llvm;
+  };
+
+  clangSelf = clangWrapSelf llvmPackagesSelf.clang;
+
+  clangWrapSelf = build: (import ../build-support/clang-wrapper) {
+    clang = build;
+    stdenv = clangStdenv;
+    libc = glibc;
+    binutils = binutils;
+    shell = bash;
+    inherit libcxx coreutils zlib;
+    nativeTools = false;
+    nativeLibc = false;
+  };
+
+  #Use this instead of stdenv to build with clang
+  clangStdenv = lowPrio (stdenvAdapters.overrideGCC stdenv clang);
+  libcxxStdenv = stdenvAdapters.overrideGCC stdenv (clangWrapSelf llvmPackages.clang);
+
+  clean = callPackage ../development/compilers/clean { };
+
+  closurecompiler = callPackage ../development/compilers/closure { };
+
+  cmucl_binary = callPackage ../development/compilers/cmucl/binary.nix { };
+
+  compcert = callPackage ../development/compilers/compcert {};
+
+  cryptol1 = lowPrio (callPackage ../development/compilers/cryptol/1.8.x.nix {});
+  cryptol2 = with haskellPackages_ghc763; callPackage ../development/compilers/cryptol/2.0.x.nix {
+    Cabal = Cabal_1_18_1_3;
+    cabalInstall = cabalInstall_1_18_0_3;
+    process = process_1_2_0_0;
+  };
+
+  cython = pythonPackages.cython;
+  cython3 = python3Packages.cython;
+
+  dylan = callPackage ../development/compilers/gwydion-dylan {
+    dylan = callPackage ../development/compilers/gwydion-dylan/binary.nix {  };
+  };
+
+  ecl = callPackage ../development/compilers/ecl { };
+
+  eql = callPackage ../development/compilers/eql {};
+
+  adobe_flex_sdk = callPackage ../development/compilers/adobe-flex-sdk { };
+
+  fpc = callPackage ../development/compilers/fpc { };
+
+  gambit = callPackage ../development/compilers/gambit { };
+
+  gcc = gcc48;
+
+  gcc33 = wrapGCC (import ../development/compilers/gcc/3.3 {
+    inherit fetchurl stdenv noSysDirs;
+  });
+
+  gcc34 = wrapGCC (import ../development/compilers/gcc/3.4 {
+    inherit fetchurl stdenv noSysDirs;
+  });
+
+  gcc48_realCross = lib.addMetaAttrs { hydraPlatforms = []; }
+    (callPackage ../development/compilers/gcc/4.8 {
+      inherit noSysDirs;
+      binutilsCross = binutilsCross;
+      libcCross = libcCross;
+      profiledCompiler = false;
+      enableMultilib = false;
+      crossStageStatic = false;
+      cross = assert crossSystem != null; crossSystem;
+    });
+
+  gcc_realCross = gcc48_realCross;
+
+  gccCrossStageStatic = let
+      libcCross1 =
+        if stdenv.cross.libc == "msvcrt" then windows.mingw_w64_headers
+        else if stdenv.cross.libc == "libSystem" then darwin.xcode
+        else null;
+    in
+      wrapGCCCross {
+      gcc = forceNativeDrv (lib.addMetaAttrs { hydraPlatforms = []; } (
+        gcc_realCross.override {
+          crossStageStatic = true;
+          langCC = false;
+          libcCross = libcCross1;
+          enableShared = false;
+        }));
+      libc = libcCross1;
+      binutils = binutilsCross;
+      cross = assert crossSystem != null; crossSystem;
+  };
+
+  # Only needed for mingw builds
+  gccCrossMingw2 = wrapGCCCross {
+    gcc = gccCrossStageStatic.gcc;
+    libc = windows.mingw_headers2;
+    binutils = binutilsCross;
+    cross = assert crossSystem != null; crossSystem;
+  };
+
+  gccCrossStageFinal = wrapGCCCross {
+    gcc = forceNativeDrv (gcc_realCross.override {
+      libpthreadCross =
+        # FIXME: Don't explicitly refer to `i586-pc-gnu'.
+        if crossSystem != null && crossSystem.config == "i586-pc-gnu"
+        then gnu.libpthreadCross
+        else null;
+
+      # XXX: We have troubles cross-compiling libstdc++ on MinGW (see
+      # <http://hydra.nixos.org/build/4268232>), so don't even try.
+      langCC = (crossSystem == null
+                || crossSystem.config != "i686-pc-mingw32");
+     });
+    libc = libcCross;
+    binutils = binutilsCross;
+    cross = assert crossSystem != null; crossSystem;
+  };
+
+  gcc44 = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc/4.4) {
+    inherit fetchurl stdenv gmp mpfr /* ppl cloogppl */
+      gettext which noSysDirs;
+    texinfo = texinfo4;
+    profiledCompiler = true;
+  }));
+
+  gcc45 = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.5 {
+    inherit fetchurl stdenv gmp mpfr mpc libelf zlib perl
+      gettext which noSysDirs;
+    texinfo = texinfo4;
+
+    ppl = null;
+    cloogppl = null;
+
+    # bootstrapping a profiled compiler does not work in the sheevaplug:
+    # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944
+    profiledCompiler = !stdenv.isArm;
+
+    # When building `gcc.crossDrv' (a "Canadian cross", with host == target
+    # and host != build), `cross' must be null but the cross-libc must still
+    # be passed.
+    cross = null;
+    libcCross = if crossSystem != null then libcCross else null;
+    libpthreadCross =
+      if crossSystem != null && crossSystem.config == "i586-pc-gnu"
+      then gnu.libpthreadCross
+      else null;
+  }));
+
+  gcc46 = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.6 {
+    inherit noSysDirs;
+
+    ppl = null;
+    cloog = null;
+
+    # bootstrapping a profiled compiler does not work in the sheevaplug:
+    # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944
+    profiledCompiler = false;
+
+    # When building `gcc.crossDrv' (a "Canadian cross", with host == target
+    # and host != build), `cross' must be null but the cross-libc must still
+    # be passed.
+    cross = null;
+    libcCross = if crossSystem != null then libcCross else null;
+    libpthreadCross =
+      if crossSystem != null && crossSystem.config == "i586-pc-gnu"
+      then gnu.libpthreadCross
+      else null;
+    texinfo = texinfo413;
+  }));
+
+  gcc48 = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.8 {
+    inherit noSysDirs;
+
+    # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion
+    profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64));
+
+    # When building `gcc.crossDrv' (a "Canadian cross", with host == target
+    # and host != build), `cross' must be null but the cross-libc must still
+    # be passed.
+    cross = null;
+    libcCross = if crossSystem != null then libcCross else null;
+    libpthreadCross =
+      if crossSystem != null && crossSystem.config == "i586-pc-gnu"
+      then gnu.libpthreadCross
+      else null;
+  }));
+
+  gcc48_multi =
+    if system == "x86_64-linux" then lowPrio (
+      wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi (gcc48.gcc.override {
+        stdenv = overrideGCC stdenv (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi gcc.gcc);
+        profiledCompiler = false;
+        enableMultilib = true;
+      }))
+    else throw "Multilib gcc not supported on ‘${system}’";
+
+  gcc48_debug = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.8 {
+    stripped = false;
+
+    inherit noSysDirs;
+    cross = null;
+    libcCross = null;
+    binutilsCross = null;
+  }));
+
+  gcc49 = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.9 {
+    inherit noSysDirs;
+
+    # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion
+    profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64));
+
+    # When building `gcc.crossDrv' (a "Canadian cross", with host == target
+    # and host != build), `cross' must be null but the cross-libc must still
+    # be passed.
+    cross = null;
+    libcCross = if crossSystem != null then libcCross else null;
+    libpthreadCross =
+      if crossSystem != null && crossSystem.config == "i586-pc-gnu"
+      then gnu.libpthreadCross
+      else null;
+  }));
+
+  gccApple =
+    assert stdenv.isDarwin;
+    wrapGCC (makeOverridable (import ../development/compilers/gcc/4.2-apple64) {
+      inherit fetchurl noSysDirs;
+      profiledCompiler = true;
+      # Since it fails to build with GCC 4.6, build it with the "native"
+      # Apple-GCC.
+      stdenv = allStdenvs.stdenvNative;
+    });
+
+  gfortran = gfortran48;
+
+  gfortran48 = wrapGCC (gcc48.gcc.override {
+    name = "gfortran";
+    langFortran = true;
+    langCC = false;
+    langC = false;
+    profiledCompiler = false;
+  });
+
+  gcj = gcj48;
+
+  gcj48 = wrapGCC (gcc48.gcc.override {
+    name = "gcj";
+    langJava = true;
+    langFortran = false;
+    langCC = false;
+    langC = false;
+    profiledCompiler = false;
+    inherit zip unzip zlib boehmgc gettext pkgconfig perl;
+    inherit gtk;
+    inherit (gnome) libart_lgpl;
+    inherit (xlibs) libX11 libXt libSM libICE libXtst libXi libXrender
+      libXrandr xproto renderproto xextproto inputproto randrproto;
+  });
+
+  gnat = gnat45;
+
+  gnat45 = wrapGCC (gcc45.gcc.override {
+    name = "gnat";
+    langCC = false;
+    langC = true;
+    langAda = true;
+    profiledCompiler = false;
+    inherit gnatboot;
+    # We can't use the ppl stuff, because we would have
+    # libstdc++ problems.
+    cloogppl = null;
+    ppl = null;
+  });
+
+  gnat46 = wrapGCC (gcc46.gcc.override {
+    name = "gnat";
+    langCC = false;
+    langC = true;
+    langAda = true;
+    profiledCompiler = false;
+    gnatboot = gnat45;
+    # We can't use the ppl stuff, because we would have
+    # libstdc++ problems.
+    ppl = null;
+    cloog = null;
+  });
+
+  gnatboot = wrapGCC (import ../development/compilers/gnatboot {
+    inherit fetchurl stdenv;
+  });
+
+  gccgo = gccgo48;
+
+  gccgo48 = wrapGCC (gcc48.gcc.override {
+    name = "gccgo";
+    langCC = true; #required for go.
+    langC = true;
+    langGo = true;
+  });
+
+  ghdl = wrapGCC (import ../development/compilers/gcc/4.3 {
+    inherit stdenv fetchurl gmp mpfr noSysDirs gnat;
+    texinfo = texinfo4;
+    name = "ghdl";
+    langVhdl = true;
+    langCC = false;
+    langC = false;
+    profiledCompiler = false;
+    enableMultilib = false;
+  });
+
+  ghdl_mcode = callPackage ../development/compilers/ghdl { };
+
+  gcl = builderDefsPackage ../development/compilers/gcl {
+    inherit mpfr m4 binutils fetchcvs emacs zlib which
+      texinfo;
+    gmp = gmp4;
+    inherit (xlibs) libX11 xproto inputproto libXi
+      libXext xextproto libXt libXaw libXmu;
+    inherit stdenv;
+    texLive = texLiveAggregationFun {
+      paths = [
+        texLive texLiveExtra
+      ];
+    };
+  };
+
+  jhc = callPackage ../development/compilers/jhc {
+    inherit (haskellPackages_ghc763) ghc binary zlib utf8String readline fgl
+      regexCompat HsSyck random;
+  };
+
+  gcc-arm-embedded-4_7 = callPackage_i686 ../development/compilers/gcc-arm-embedded {
+    version = "4.7-2013q3-20130916";
+    releaseType = "update";
+    sha256 = "1bd9bi9q80xn2rpy0rn1vvj70rh15kb7dmah0qs4q2rv78fqj40d";
+  };
+  gcc-arm-embedded-4_8 = callPackage_i686 ../development/compilers/gcc-arm-embedded {
+    version = "4.8-2014q1-20140314";
+    releaseType = "update";
+    sha256 = "ce92859550819d4a3d1a6e2672ea64882b30afa2c08cf67fa8e1d93788c2c577";
+  };
+  gcc-arm-embedded = gcc-arm-embedded-4_8;
+
+  # Haskell and GHC
+
+  # Import Haskell infrastructure.
+
+  haskell = let pkgs_       = pkgs // { gmp = gmp.override { withStatic = true; }; };
+                callPackage = newScope pkgs_;
+                newScope    = extra: lib.callPackageWith (pkgs_ // pkgs_.xorg // extra);
+            in callPackage ./haskell-defaults.nix { pkgs = pkgs_; inherit callPackage newScope; };
+
+  # Available GHC versions.
+
+  # For several compiler versions, we export a large set of Haskell-related
+  # packages.
+
+  # NOTE (recurseIntoAttrs): After discussion, we originally decided to
+  # enable it for all GHC versions. However, this is getting too much,
+  # particularly in connection with Hydra builds for all these packages.
+  # So we enable it for selected versions only. We build all ghcs, though
+
+  ghc = recurseIntoAttrs (lib.mapAttrs' (name: value:
+    lib.nameValuePair (builtins.substring (builtins.stringLength "packages_") (builtins.stringLength name) name) value.ghc
+  ) (lib.filterAttrs (name: value:
+    builtins.substring 0 (builtins.stringLength "packages_") name == "packages_"
+  ) haskell));
+
+  haskellPackages = haskellPackages_ghc783;
+  haskellPlatform = haskellPlatformPackages."2013_2_0_0";
+
+  haskellPackages_ghc6104 = haskell.packages_ghc6104;
+  haskellPackages_ghc6123 = haskell.packages_ghc6123;
+  haskellPackages_ghc704  = haskell.packages_ghc704;
+  haskellPackages_ghc722  = haskell.packages_ghc722;
+  haskellPackages_ghc742  = haskell.packages_ghc742;
+  haskellPackages_ghc763  = haskell.packages_ghc763;
+  haskellPackages_ghc783_no_profiling = recurseIntoAttrs haskell.packages_ghc783.noProfiling;
+  haskellPackages_ghc783_profiling    = recurseIntoAttrs haskell.packages_ghc783.profiling;
+  haskellPackages_ghc783              = recurseIntoAttrs haskell.packages_ghc783.highPrio;
+  haskellPackages_ghcHEAD = haskell.packages_ghcHEAD;
+
+  haskellPlatformPackages = recurseIntoAttrs (import ../development/libraries/haskell/haskell-platform { inherit pkgs; });
+
+  haxe = callPackage ../development/compilers/haxe { };
+
+  hhvm = callPackage ../development/compilers/hhvm { };
+  hiphopvm = hhvm; /* Compatibility alias */
+
+  falcon = builderDefsPackage (import ../development/interpreters/falcon) {
+    inherit cmake;
+  };
+
+  fsharp = callPackage ../development/compilers/fsharp {};
+
+  go_1_0 = callPackage ../development/compilers/go { };
+
+  go_1_1 =
+    if stdenv.isDarwin then
+      callPackage ../development/compilers/go/1.1-darwin.nix { }
+    else
+      callPackage ../development/compilers/go/1.1.nix { };
+
+  go_1_2 = callPackage ../development/compilers/go/1.2.nix { };
+
+  go_1_3 = callPackage ../development/compilers/go/1.3.nix { };
+
+  go = go_1_3;
+
+  gox = callPackage ../development/compilers/go/gox.nix { };
+
+  gprolog = callPackage ../development/compilers/gprolog { };
+
+  gwt240 = callPackage ../development/compilers/gwt/2.4.0.nix { };
+
+  icedtea7_jdk = callPackage ../development/compilers/icedtea rec {
+    jdk = openjdk;
+    jdkPath = "${openjdk}/lib/openjdk";
+  } // { outputs = [ "out" ]; };
+
+  icedtea7_jre = (lib.setName "icedtea7-${lib.getVersion pkgs.icedtea7_jdk.jre}" (lib.addMetaAttrs
+    { description = "Free Java runtime environment based on OpenJDK 7.0 and the IcedTea project"; }
+    pkgs.icedtea7_jdk.jre)) // { outputs = [ "jre" ]; };
+
+  icedtea7_web = callPackage ../development/compilers/icedtea-web {
+    jdk = "${icedtea7_jdk}/lib/icedtea";
+  };
+
+  ikarus = callPackage ../development/compilers/ikarus { };
+
+  hugs = callPackage ../development/compilers/hugs { };
+
+  path64 = callPackage ../development/compilers/path64 { };
+
+  openjdk =
+    if stdenv.isDarwin then
+      callPackage ../development/compilers/openjdk-darwin { }
+    else
+      let
+        openjdkBootstrap = callPackage ../development/compilers/openjdk/bootstrap.nix { };
+      in (callPackage ../development/compilers/openjdk {
+        jdk = openjdkBootstrap;
+      }) // { outputs = [ "out" ]; };
+
+  # FIXME: Need a way to set per-output meta attributes.
+  openjre = (lib.setName "openjre-${lib.getVersion pkgs.openjdk.jre}" (lib.addMetaAttrs
+    { description = "The open-source Java Runtime Environment"; }
+    pkgs.openjdk.jre)) // { outputs = [ "jre" ]; };
+
+  jdk = if stdenv.isDarwin || stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"
+    then pkgs.openjdk
+    else pkgs.oraclejdk;
+  jre = if stdenv.isDarwin || stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"
+    then pkgs.openjre
+    else pkgs.oraclejre;
+
+  oraclejdk = pkgs.jdkdistro true false;
+
+  oraclejdk7 = pkgs.oraclejdk7distro true false;
+
+  oraclejdk8 = pkgs.oraclejdk8distro true false;
+
+  oraclejre = lowPrio (pkgs.jdkdistro false false);
+
+  oraclejre7 = lowPrio (pkgs.oraclejdk7distro false false);
+
+  oraclejre8 = lowPrio (pkgs.oraclejdk8distro false false);
+
+  jrePlugin = lowPrio (pkgs.jdkdistro false true);
+
+  supportsJDK =
+    system == "i686-linux" ||
+    system == "x86_64-linux";
+
+  jdkdistro = installjdk: pluginSupport:
+    assert supportsJDK;
+    (if pluginSupport then appendToName "with-plugin" else x: x)
+      (callPackage ../development/compilers/oraclejdk/jdk6-linux.nix { });
+
+  oraclejdk7distro = installjdk: pluginSupport:
+    assert supportsJDK;
+    (if pluginSupport then appendToName "with-plugin" else x: x)
+      (callPackage ../development/compilers/oraclejdk/jdk7-linux.nix { inherit installjdk; });
+
+  oraclejdk8distro = installjdk: pluginSupport:
+    assert supportsJDK;
+    (if pluginSupport then appendToName "with-plugin" else x: x)
+      (callPackage ../development/compilers/oraclejdk/jdk8-linux.nix { inherit installjdk; });
+
+  jikes = callPackage ../development/compilers/jikes { };
+
+  juliaGit = callPackage ../development/compilers/julia/git-20131013.nix {
+    liblapack = liblapack.override {shared = true;};
+    llvm = llvm_33;
+    openblas = openblas_0_2_2;
+  };
+  julia021 = callPackage ../development/compilers/julia/0.2.1.nix {
+    liblapack = liblapack.override {shared = true;};
+    llvm = llvm_33;
+    openblas = openblas_0_2_2;
+  };
+  julia030 = let
+    liblapack = liblapack_3_5_0.override {shared = true;};
+  in callPackage ../development/compilers/julia/0.3.0.nix {
+    inherit liblapack;
+    suitesparse = suitesparse.override {
+      inherit liblapack;
+    };
+    llvm = llvm_34;
+    openblas = openblas_0_2_10;
+  };
+  julia = julia030;
+
+  lazarus = builderDefsPackage (import ../development/compilers/fpc/lazarus.nix) {
+    inherit makeWrapper gtk glib pango atk gdk_pixbuf;
+    inherit (xlibs) libXi inputproto libX11 xproto libXext xextproto;
+    fpc = fpc;
+  };
+
+  lessc = callPackage ../development/compilers/lessc { };
+
+  llvm = llvmPackages.llvm;
+
+  llvm_34 = llvmPackages_34.llvm;
+  llvm_33 = llvm_v ../development/compilers/llvm/3.3/llvm.nix;
+
+  llvm_v = path: callPackage path {
+    stdenv = if stdenv.isDarwin then stdenvApple else stdenv;
+  };
+
+  llvmPackages = if !stdenv.isDarwin then llvmPackages_34 else llvmPackages_34 // {
+    # until someone solves build problems with _34
+    llvm = llvm_33;
+    clang = clang_33;
+  };
+
+  llvmPackages_34 = recurseIntoAttrs (import ../development/compilers/llvm/3.4 {
+    inherit stdenv newScope fetchurl;
+    isl = isl_0_12;
+  });
+  llvmPackagesSelf = import ../development/compilers/llvm/3.4 { inherit newScope fetchurl; isl = isl_0_12; stdenv = libcxxStdenv; };
+
+  manticore = callPackage ../development/compilers/manticore { };
+
+  mentorToolchains = recurseIntoAttrs (
+    callPackage_i686 ../development/compilers/mentor {}
+  );
+
+  mercury = callPackage ../development/compilers/mercury { };
+
+  mitscheme = callPackage ../development/compilers/mit-scheme { };
+
+  mlton = callPackage ../development/compilers/mlton { };
+
+  mono = callPackage ../development/compilers/mono {
+    inherit (xlibs) libX11;
+  };
+
+  monoDLLFixer = callPackage ../build-support/mono-dll-fixer { };
+
+  mozart = callPackage ../development/compilers/mozart { };
+
+  neko = callPackage ../development/compilers/neko { };
+
+  nasm = callPackage ../development/compilers/nasm { };
+
+  nvidia_cg_toolkit = callPackage ../development/compilers/nvidia-cg-toolkit { };
+
+  ocaml = ocamlPackages.ocaml;
+
+  ocaml_3_08_0 = callPackage ../development/compilers/ocaml/3.08.0.nix { };
+
+  ocaml_3_10_0 = callPackage ../development/compilers/ocaml/3.10.0.nix { };
+
+  ocaml_3_11_2 = callPackage ../development/compilers/ocaml/3.11.2.nix { };
+
+  ocaml_3_12_1 = callPackage ../development/compilers/ocaml/3.12.1.nix { };
+
+  ocaml_4_00_1 = callPackage ../development/compilers/ocaml/4.00.1.nix { };
+
+  ocaml_4_01_0 = callPackage ../development/compilers/ocaml/4.01.0.nix { };
+
+  orc = callPackage ../development/compilers/orc { };
+
+  metaocaml_3_09 = callPackage ../development/compilers/ocaml/metaocaml-3.09.nix { };
+
+  ber_metaocaml_003 = callPackage ../development/compilers/ocaml/ber-metaocaml-003.nix { };
+
+  mkOcamlPackages = ocaml: self: let callPackage = newScope self; in rec {
+    inherit ocaml;
+
+    camlidl = callPackage ../development/tools/ocaml/camlidl { };
+
+    camlp5_5_strict = callPackage ../development/tools/ocaml/camlp5/5.15.nix { };
+
+    camlp5_5_transitional = callPackage ../development/tools/ocaml/camlp5/5.15.nix {
+      transitional = true;
+    };
+
+    camlp5_6_strict = callPackage ../development/tools/ocaml/camlp5 { };
+
+    camlp5_6_transitional = callPackage ../development/tools/ocaml/camlp5 {
+      transitional = true;
+    };
+
+    camlp5_strict = camlp5_6_strict;
+
+    camlp5_transitional = camlp5_6_transitional;
+
+    camlzip = callPackage ../development/ocaml-modules/camlzip { };
+
+    camomile_0_8_2 = callPackage ../development/ocaml-modules/camomile/0.8.2.nix { };
+    camomile = callPackage ../development/ocaml-modules/camomile { };
+
+    camlimages = callPackage ../development/ocaml-modules/camlimages {
+      libpng = libpng12;
+      giflib = giflib_4_1;
+    };
+
+    biniou = callPackage ../development/ocaml-modules/biniou { };
+
+    ocaml_cairo = callPackage ../development/ocaml-modules/ocaml-cairo { };
+
+    cmdliner = callPackage ../development/ocaml-modules/cmdliner { };
+
+    cppo = callPackage ../development/tools/ocaml/cppo { };
+
+    cryptokit = callPackage ../development/ocaml-modules/cryptokit { };
+
+    csv = callPackage ../development/ocaml-modules/csv { };
+
+    deriving = callPackage ../development/tools/ocaml/deriving { };
+
+    easy-format = callPackage ../development/ocaml-modules/easy-format { };
+
+    findlib = callPackage ../development/tools/ocaml/findlib { };
+
+    javalib = callPackage ../development/ocaml-modules/javalib {
+      extlib = ocaml_extlib_maximal;
+    };
+
+    dypgen = callPackage ../development/ocaml-modules/dypgen { };
+
+    patoline = callPackage ../tools/typesetting/patoline { };
+
+    gmetadom = callPackage ../development/ocaml-modules/gmetadom { };
+
+    lablgl = callPackage ../development/ocaml-modules/lablgl { };
+
+    lablgtk = callPackage ../development/ocaml-modules/lablgtk {
+      inherit (gnome) libgnomecanvas libglade gtksourceview;
+    };
+
+    lablgtkmathview = callPackage ../development/ocaml-modules/lablgtkmathview {
+      gtkmathview = callPackage ../development/libraries/gtkmathview { };
+    };
+
+    lambdaTerm = callPackage ../development/ocaml-modules/lambda-term { };
+
+    menhir = callPackage ../development/ocaml-modules/menhir { };
+
+    merlin = callPackage ../development/tools/ocaml/merlin { };
+
+    mldonkey = callPackage ../applications/networking/p2p/mldonkey { };
+
+    mlgmp =  callPackage ../development/ocaml-modules/mlgmp { };
+
+    ocaml_batteries = callPackage ../development/ocaml-modules/batteries { };
+
+    ocaml_cryptgps = callPackage ../development/ocaml-modules/cryptgps { };
+
+    ocaml_data_notation = callPackage ../development/ocaml-modules/odn { };
+
+    ocaml_expat = callPackage ../development/ocaml-modules/expat { };
+
+    ocamlgraph = callPackage ../development/ocaml-modules/ocamlgraph { };
+
+    ocaml_http = callPackage ../development/ocaml-modules/http { };
+
+    ocamlify = callPackage ../development/tools/ocaml/ocamlify { };
+
+    ocaml_lwt = callPackage ../development/ocaml-modules/lwt { };
+
+    ocamlmod = callPackage ../development/tools/ocaml/ocamlmod { };
+
+    ocaml_mysql = callPackage ../development/ocaml-modules/mysql { };
+
+    ocamlnet = callPackage ../development/ocaml-modules/ocamlnet { };
+
+    ocaml_oasis = callPackage ../development/tools/ocaml/oasis { };
+
+    ocaml_pcre = callPackage ../development/ocaml-modules/pcre {
+      inherit pcre;
+    };
+
+    ocaml_react = callPackage ../development/ocaml-modules/react { };
+
+    ocamlsdl= callPackage ../development/ocaml-modules/ocamlsdl { };
+
+    ocaml_sqlite3 = callPackage ../development/ocaml-modules/sqlite3 { };
+
+    ocaml_ssl = callPackage ../development/ocaml-modules/ssl { };
+
+    ocaml_text = callPackage ../development/ocaml-modules/ocaml-text { };
+
+    ounit = callPackage ../development/ocaml-modules/ounit { };
+
+    ulex = callPackage ../development/ocaml-modules/ulex { };
+
+    ulex08 = callPackage ../development/ocaml-modules/ulex/0.8 {
+      camlp5 = camlp5_transitional;
+    };
+
+    ocaml_typeconv = callPackage ../development/ocaml-modules/typeconv { };
+
+    ocaml_typeconv_3_0_5 = callPackage ../development/ocaml-modules/typeconv/3.0.5.nix { };
+
+    ocaml_sexplib = callPackage ../development/ocaml-modules/sexplib { };
+
+    ocaml_extlib = callPackage ../development/ocaml-modules/extlib { };
+    ocaml_extlib_maximal = callPackage ../development/ocaml-modules/extlib {
+      minimal = false;
+    };
+
+    pycaml = callPackage ../development/ocaml-modules/pycaml { };
+
+    opam_1_0_0 = callPackage ../development/tools/ocaml/opam/1.0.0.nix { };
+    opam_1_1 = callPackage ../development/tools/ocaml/opam/1.1.nix { };
+    opam = opam_1_1;
+
+    utop = callPackage ../development/tools/ocaml/utop { };
+
+    sawja = callPackage ../development/ocaml-modules/sawja { };
+
+    uucd = callPackage ../development/ocaml-modules/uucd { };
+    uunf = callPackage ../development/ocaml-modules/uunf { };
+    uutf = callPackage ../development/ocaml-modules/uutf { };
+    xmlm = callPackage ../development/ocaml-modules/xmlm { };
+
+    yojson = callPackage ../development/ocaml-modules/yojson { };
+
+    zarith = callPackage ../development/ocaml-modules/zarith { };
+
+    zed = callPackage ../development/ocaml-modules/zed { };
+
+  };
+
+  ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0;
+  ocamlPackages_3_10_0 = mkOcamlPackages ocaml_3_10_0 pkgs.ocamlPackages_3_10_0;
+  ocamlPackages_3_11_2 = mkOcamlPackages ocaml_3_11_2 pkgs.ocamlPackages_3_11_2;
+  ocamlPackages_3_12_1 = mkOcamlPackages ocaml_3_12_1 pkgs.ocamlPackages_3_12_1;
+  ocamlPackages_4_00_1 = mkOcamlPackages ocaml_4_00_1 pkgs.ocamlPackages_4_00_1;
+  ocamlPackages_4_01_0 = mkOcamlPackages ocaml_4_01_0 pkgs.ocamlPackages_4_01_0;
+  ocamlPackages_latest = ocamlPackages_4_01_0;
+
+  ocaml_make = callPackage ../development/ocaml-modules/ocamlmake { };
+
+  opa = let callPackage = newScope pkgs.ocamlPackages_4_00_1; in callPackage ../development/compilers/opa { };
+
+  ocamlnat = let callPackage = newScope pkgs.ocamlPackages_3_12_1; in callPackage ../development/ocaml-modules/ocamlnat { };
+
+  qcmm = callPackage ../development/compilers/qcmm {
+    lua   = lua4;
+    ocaml = ocaml_3_08_0;
+  };
+
+  roadsend = callPackage ../development/compilers/roadsend { };
+
+  rustc       = callPackage ../development/compilers/rustc/0.11.nix {};
+  rustcMaster = callPackage ../development/compilers/rustc/head.nix {};
+
+  rust = rustc;
+
+
+  sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {};
+  sbcl = callPackage ../development/compilers/sbcl {
+    clisp = clisp;
+  };
+
+  scala_2_9 = callPackage ../development/compilers/scala/2.9.nix { };
+  scala_2_10 = callPackage ../development/compilers/scala/2.10.nix { };
+  scala_2_11 = callPackage ../development/compilers/scala { };
+  scala = scala_2_11;
+
+  sdcc = callPackage ../development/compilers/sdcc { };
+
+  smlnjBootstrap = callPackage ../development/compilers/smlnj/bootstrap.nix { };
+  smlnj = callPackage_i686 ../development/compilers/smlnj { };
+
+  stalin = callPackage ../development/compilers/stalin { };
+
+  strategoPackages = recurseIntoAttrs strategoPackages018;
+
+  strategoPackages016 = callPackage ../development/compilers/strategoxt/0.16.nix {
+    stdenv = overrideInStdenv stdenv [gnumake380];
+  };
+
+  strategoPackages017 = callPackage ../development/compilers/strategoxt/0.17.nix {
+    readline = readline5;
+  };
+
+  strategoPackages018 = callPackage ../development/compilers/strategoxt/0.18.nix {
+    readline = readline5;
+  };
+
+  metaBuildEnv = callPackage ../development/compilers/meta-environment/meta-build-env { };
+
+  swiProlog = callPackage ../development/compilers/swi-prolog { };
+
+  tbb = callPackage ../development/libraries/tbb { };
+
+  tinycc = callPackage ../development/compilers/tinycc { };
+
+  urweb = callPackage ../development/compilers/urweb { };
+
+  vala = callPackage ../development/compilers/vala/default.nix { };
+
+  visualcpp = callPackage ../development/compilers/visual-c++ { };
+
+  vs90wrapper = callPackage ../development/compilers/vs90wrapper { };
+
+  webdsl = callPackage ../development/compilers/webdsl { };
+
+  win32hello = callPackage ../development/compilers/visual-c++/test { };
+
+  wrapGCCWith = gccWrapper: glibc: baseGCC: gccWrapper {
+    nativeTools = stdenv ? gcc && stdenv.gcc.nativeTools;
+    nativeLibc = stdenv ? gcc && stdenv.gcc.nativeLibc;
+    nativePrefix = if stdenv ? gcc then stdenv.gcc.nativePrefix else "";
+    gcc = baseGCC;
+    libc = glibc;
+    shell = bash;
+    inherit stdenv binutils coreutils zlib;
+  };
+
+  wrapClangWith = clangWrapper: glibc: baseClang: clangWrapper {
+    nativeTools = stdenv.gcc.nativeTools or false;
+    nativeLibc = stdenv.gcc.nativeLibc or false;
+    nativePrefix = stdenv.gcc.nativePrefix or "";
+    clang = baseClang;
+    libc = glibc;
+    shell = bash;
+    binutils = stdenv.gcc.binutils;
+    inherit stdenv coreutils zlib;
+  };
+
+  wrapClang = wrapClangWith (makeOverridable (import ../build-support/clang-wrapper)) glibc;
+
+  wrapGCC = wrapGCCWith (makeOverridable (import ../build-support/gcc-wrapper)) glibc;
+
+  wrapGCCCross =
+    {gcc, libc, binutils, cross, shell ? "", name ? "gcc-cross-wrapper"}:
+
+    forceNativeDrv (import ../build-support/gcc-cross-wrapper {
+      nativeTools = false;
+      nativeLibc = false;
+      noLibc = (libc == null);
+      inherit stdenv gcc binutils libc shell name cross;
+    });
+
+  # prolog
+  yap = callPackage ../development/compilers/yap { };
+
+  yasm = callPackage ../development/compilers/yasm { };
+
+
+  ### DEVELOPMENT / INTERPRETERS
+
+  acl2 = builderDefsPackage ../development/interpreters/acl2 {
+    inherit sbcl;
+  };
+
+  angelscript = callPackage ../development/interpreters/angelscript {};
+
+  clisp = callPackage ../development/interpreters/clisp { };
+
+  # compatibility issues in 2.47 - at list 2.44.1 is known good
+  # for sbcl bootstrap
+  clisp_2_44_1 = callPackage ../development/interpreters/clisp/2.44.1.nix {
+    libsigsegv = libsigsegv_25;
+  };
+
+  clojure = callPackage ../development/interpreters/clojure { };
+
+  clooj = callPackage ../development/interpreters/clojure/clooj.nix { };
+
+  erlangR14 = callPackage ../development/interpreters/erlang/R14.nix { };
+  erlangR15 = callPackage ../development/interpreters/erlang/R15.nix { };
+  erlangR16 = callPackage ../development/interpreters/erlang/R16.nix { };
+  erlangR16_odbc = callPackage ../development/interpreters/erlang/R16.nix { odbcSupport = true; };
+  erlangR17 = callPackage ../development/interpreters/erlang/R17.nix { };
+  erlangR17_odbc = callPackage ../development/interpreters/erlang/R17.nix { odbcSupport = true; };
+  erlang = erlangR17;
+  erlang_odbc = erlangR17_odbc;
+
+  rebar = callPackage ../development/tools/build-managers/rebar { };
+
+  elixir = callPackage ../development/interpreters/elixir { };
+
+  groovy = callPackage ../development/interpreters/groovy { };
+
+  guile_1_8 = callPackage ../development/interpreters/guile/1.8.nix { };
+
+  guile_2_0 = callPackage ../development/interpreters/guile { };
+
+  guile = guile_2_0;
+
+  hadoop = callPackage ../applications/networking/cluster/hadoop { };
+
+  io = callPackage ../development/interpreters/io { };
+
+  j = callPackage ../development/interpreters/j {};
+
+  jmeter = callPackage ../applications/networking/jmeter {};
+
+  davmail = callPackage ../applications/networking/davmail {};
+
+  lxappearance = callPackage ../applications/misc/lxappearance {};
+
+  kona = callPackage ../development/interpreters/kona {};
+
+  love = callPackage ../development/interpreters/love {lua=lua5;};
+  love_luajit = callPackage ../development/interpreters/love {lua=luajit;};
+  love_0_9 = callPackage ../development/interpreters/love/0.9.nix { };
+
+  lua4 = callPackage ../development/interpreters/lua-4 { };
+  lua5_0 = callPackage ../development/interpreters/lua-5/5.0.3.nix { };
+  lua5_1 = callPackage ../development/interpreters/lua-5/5.1.nix { };
+  lua5_2 = callPackage ../development/interpreters/lua-5/5.2.nix { };
+  lua5_2_compat = callPackage ../development/interpreters/lua-5/5.2.nix {
+    compat = true;
+  };
+  lua5 = lua5_1;
+  lua = lua5;
+
+  lua5_sockets = callPackage ../development/interpreters/lua-5/sockets.nix {};
+  lua5_expat = callPackage ../development/interpreters/lua-5/expat.nix {};
+  lua5_filesystem = callPackage ../development/interpreters/lua-5/filesystem.nix {};
+  lua5_sec = callPackage ../development/interpreters/lua-5/sec.nix {};
+
+  luarocks = callPackage ../development/tools/misc/luarocks {
+     lua = lua5;
+  };
+
+  luajit = callPackage ../development/interpreters/luajit {};
+
+  lush2 = callPackage ../development/interpreters/lush {};
+
+  maude = callPackage ../development/interpreters/maude {
+    bison = bison2;
+    flex = flex_2_5_35;
+  };
+
+  mesos = callPackage ../applications/networking/cluster/mesos {
+    sasl = cyrus_sasl;
+    automake = automake114x;
+    inherit (pythonPackages) python boto setuptools distutils-cfg wrapPython;
+    pythonProtobuf = pythonPackages.protobuf;
+  };
+
+  octave = callPackage ../development/interpreters/octave {
+    fltk = fltk13;
+    qt = null;
+    ghostscript = null;
+    llvm = null;
+    hdf5 = null;
+    glpk = null;
+    suitesparse = null;
+    openjdk = null;
+    gnuplot = null;
+    readline = readline63;
+  };
+  octaveFull = (lowPrio (callPackage ../development/interpreters/octave {
+    fltk = fltk13;
+    qt = qt4;
+  }));
+
+  # mercurial (hg) bleeding edge version
+  octaveHG = callPackage ../development/interpreters/octave/hg.nix { };
+
+  ocropus = callPackage ../applications/misc/ocropus { };
+
+  perl514 = callPackage ../development/interpreters/perl/5.14 { };
+
+  perl516 = callPackage ../development/interpreters/perl/5.16 {
+    fetchurl = fetchurlBoot;
+  };
+
+  perl520 = callPackage ../development/interpreters/perl/5.20 { };
+
+  perl = if system != "i686-cygwin" then perl516 else sysPerl;
+
+  php = php54;
+
+  phpPackages = recurseIntoAttrs (import ./php-packages.nix {
+    inherit php pkgs;
+  });
+
+  php53 = callPackage ../development/interpreters/php/5.3.nix { };
+
+  php_fpm53 = callPackage ../development/interpreters/php/5.3.nix {
+    config = config // {
+      php = (config.php or {}) // {
+        fpm = true;
+        apxs2 = false;
+      };
+    };
+  };
+
+  php54 = callPackage ../development/interpreters/php/5.4.nix { };
+
+  picolisp = callPackage ../development/interpreters/picolisp {};
+
+  pltScheme = racket; # just to be sure
+
+  polyml = callPackage ../development/compilers/polyml { };
+
+  pure = callPackage ../development/interpreters/pure {
+    llvm = llvm_33 ;
+  };
+
+  python = python2;
+  python2 = python27;
+  python3 = python34;
+
+  # pythonPackages further below, but assigned here because they need to be in sync
+  pythonPackages = python2Packages;
+  python2Packages = python27Packages;
+  python3Packages = python34Packages;
+
+  pythonFull = python2Full;
+  python2Full = python27Full;
+
+  python26 = callPackage ../development/interpreters/python/2.6 { db = db47; };
+  python27 = callPackage ../development/interpreters/python/2.7 { };
+  python32 = callPackage ../development/interpreters/python/3.2 { };
+  python33 = callPackage ../development/interpreters/python/3.3 { };
+  python34 = hiPrio (callPackage ../development/interpreters/python/3.4 { });
+
+  pypy = callPackage ../development/interpreters/pypy/2.3 { };
+
+  python26Full = callPackage ../development/interpreters/python/wrapper.nix {
+    extraLibs = [];
+    postBuild = "";
+    python = python26;
+    inherit (python26Packages) recursivePthLoader;
+  };
+  python27Full = callPackage ../development/interpreters/python/wrapper.nix {
+    extraLibs = [];
+    postBuild = "";
+    python = python27;
+    inherit (python27Packages) recursivePthLoader;
+  };
+
+  pythonDocs = recurseIntoAttrs (import ../development/interpreters/python/docs {
+    inherit stdenv fetchurl lib;
+  });
+
+  pythonLinkmeWrapper = callPackage ../development/interpreters/python/python-linkme-wrapper.nix { };
+
+  pypi2nix = python27Packages.pypi2nix;
+
+  pyrex = pyrex095;
+
+  pyrex095 = callPackage ../development/interpreters/pyrex/0.9.5.nix { };
+
+  pyrex096 = callPackage ../development/interpreters/pyrex/0.9.6.nix { };
+
+  qi = callPackage ../development/compilers/qi { };
+
+  racket = callPackage ../development/interpreters/racket { };
+
+  rakudo = callPackage ../development/interpreters/rakudo { };
+
+  rascal = callPackage ../development/interpreters/rascal { };
+
+  regina = callPackage ../development/interpreters/regina { };
+
+  renpy = callPackage ../development/interpreters/renpy {
+    wrapPython = pythonPackages.wrapPython;
+  };
+
+  ruby18 = callPackage ../development/interpreters/ruby/ruby-18.nix { };
+  ruby19 = callPackage ../development/interpreters/ruby/ruby-19.nix { };
+  ruby2 = lowPrio (callPackage ../development/interpreters/ruby/ruby-2.0.nix { });
+  ruby21 = callPackage ../development/interpreters/ruby/ruby-2.1.2.nix { };
+
+  ruby = ruby19;
+
+  rubyLibs = recurseIntoAttrs (callPackage ../development/interpreters/ruby/libs.nix { });
+
+  rake = rubyLibs.rake;
+
+  rubySqlite3 = callPackage ../development/ruby-modules/sqlite3 { };
+
+  rubygemsFun = ruby: builderDefsPackage (import ../development/interpreters/ruby/rubygems.nix) {
+    inherit ruby makeWrapper;
+  };
+  rubygems = hiPrio (rubygemsFun ruby);
+
+  rq = callPackage ../applications/networking/cluster/rq { };
+
+  scsh = callPackage ../development/interpreters/scsh { };
+
+  scheme48 = callPackage ../development/interpreters/scheme48 { };
+
+  self = callPackage_i686 ../development/interpreters/self { };
+
+  spark = callPackage ../applications/networking/cluster/spark { };
+
+  spidermonkey = callPackage ../development/interpreters/spidermonkey { };
+  spidermonkey_1_8_0rc1 = callPackage ../development/interpreters/spidermonkey/1.8.0-rc1.nix { };
+  spidermonkey_185 = callPackage ../development/interpreters/spidermonkey/185-1.0.0.nix { };
+  spidermonkey_17 = callPackage ../development/interpreters/spidermonkey/17.0.nix { };
+  spidermonkey_24 = callPackage ../development/interpreters/spidermonkey/24.2.nix { };
+
+  supercollider = callPackage ../development/interpreters/supercollider {
+    qt = qt4;
+    fftw = fftwSinglePrec;
+  };
+
+  supercollider_scel = supercollider.override { useSCEL = true; };
+
+  sysPerl = callPackage ../development/interpreters/perl/sys-perl { };
+
+  tcl = callPackage ../development/interpreters/tcl { };
+
+  xulrunner = callPackage ../development/interpreters/xulrunner {
+    inherit (gnome) libIDL;
+    inherit (pythonPackages) pysqlite;
+  };
+
+  xulrunner_30 = firefox30Pkgs.xulrunner;
+
+
+  ### DEVELOPMENT / MISC
+
+  amdadlsdk = callPackage ../development/misc/amdadl-sdk { };
+
+  amdappsdk26 = callPackage ../development/misc/amdapp-sdk {
+    version = "2.6";
+  };
+
+  amdappsdk27 = callPackage ../development/misc/amdapp-sdk {
+    version = "2.7";
+  };
+
+  amdappsdk28 = callPackage ../development/misc/amdapp-sdk {
+    version = "2.8";
+  };
+
+  amdappsdk = amdappsdk28;
+
+  amdappsdkFull = callPackage ../development/misc/amdapp-sdk {
+    version = "2.8";
+    samples = true;
+  };
+
+  avrgcclibc = callPackage ../development/misc/avr-gcc-with-avr-libc {
+    gcc = gcc46;
+    stdenv = overrideGCC stdenv gcc46;
+  };
+
+  avr8burnomat = callPackage ../development/misc/avr8-burn-omat { };
+
+  sourceFromHead = import ../build-support/source-from-head-fun.nix {
+    inherit config;
+  };
+
+  ecj = callPackage ../development/eclipse/ecj { };
+
+  jdtsdk = callPackage ../development/eclipse/jdt-sdk { };
+
+  jruby165 = callPackage ../development/interpreters/jruby { };
+
+  guileCairo = callPackage ../development/guile-modules/guile-cairo { };
+
+  guileGnome = callPackage ../development/guile-modules/guile-gnome {
+    gconf = gnome.GConf;
+    inherit (gnome) gnome_vfs libglade libgnome libgnomecanvas libgnomeui;
+  };
+
+  guile_lib = callPackage ../development/guile-modules/guile-lib { };
+
+  guile_ncurses = callPackage ../development/guile-modules/guile-ncurses { };
+
+  guile-xcb = callPackage ../development/guile-modules/guile-xcb { };
+
+  pharo-vm = callPackage_i686 ../development/pharo/vm { };
+
+  srecord = callPackage ../development/tools/misc/srecord { };
+
+  windowssdk = (
+    import ../development/misc/windows-sdk {
+      inherit fetchurl stdenv cabextract;
+    });
+
+
+  ### DEVELOPMENT / TOOLS
+
+  ansible = callPackage ../tools/system/ansible { };
+
+  antlr = callPackage ../development/tools/parsing/antlr/2.7.7.nix { };
+
+  antlr3 = callPackage ../development/tools/parsing/antlr { };
+
+  ant = apacheAnt;
+
+  apacheAnt = callPackage ../development/tools/build-managers/apache-ant { };
+
+  astyle = callPackage ../development/tools/misc/astyle { };
+
+  autobuild = callPackage ../development/tools/misc/autobuild { };
+
+  autoconf = callPackage ../development/tools/misc/autoconf { };
+
+  autoconf213 = callPackage ../development/tools/misc/autoconf/2.13.nix { };
+
+  autocutsel = callPackage ../tools/X11/autocutsel{ };
+
+  automake = automake112x;
+
+  automake111x = callPackage ../development/tools/misc/automake/automake-1.11.x.nix { };
+
+  automake112x = callPackage ../development/tools/misc/automake/automake-1.12.x.nix { };
+
+  automake113x = callPackage ../development/tools/misc/automake/automake-1.13.x.nix { };
+
+  automake114x = callPackage ../development/tools/misc/automake/automake-1.14.x.nix { };
+
+  automoc4 = callPackage ../development/tools/misc/automoc4 { };
+
+  avrdude = callPackage ../development/tools/misc/avrdude { };
+
+  avarice = callPackage ../development/tools/misc/avarice { };
+
+  babeltrace = callPackage ../development/tools/misc/babeltrace { };
+
+  bam = callPackage ../development/tools/build-managers/bam {};
+
+  binutils = callPackage ../development/tools/misc/binutils {
+    inherit noSysDirs;
+  };
+
+  binutils_nogold = lowPrio (callPackage ../development/tools/misc/binutils {
+    inherit noSysDirs;
+    gold = false;
+  });
+
+  binutilsCross =
+    if crossSystem != null && crossSystem.libc == "libSystem" then darwin.cctools
+    else lowPrio (forceNativeDrv (import ../development/tools/misc/binutils {
+      inherit stdenv fetchurl zlib bison;
+      noSysDirs = true;
+      cross = assert crossSystem != null; crossSystem;
+    }));
+
+  bison2 = callPackage ../development/tools/parsing/bison/2.x.nix { };
+  bison3 = callPackage ../development/tools/parsing/bison/3.x.nix { };
+  bison = bison3;
+
+  bossa = callPackage ../development/tools/misc/bossa {
+    wxGTK = wxGTK30;
+  };
+
+  buildbot = callPackage ../development/tools/build-managers/buildbot {
+    inherit (pythonPackages) twisted jinja2 sqlalchemy sqlalchemy_migrate;
+    dateutil = pythonPackages.dateutil_1_5;
+  };
+
+  buildbotSlave = callPackage ../development/tools/build-managers/buildbot-slave {
+    inherit (pythonPackages) twisted;
+  };
+
+  byacc = callPackage ../development/tools/parsing/byacc { };
+
+  casperjs = callPackage ../development/tools/casperjs { };
+
+  cbrowser = callPackage ../development/tools/misc/cbrowser { };
+
+  ccache = callPackage ../development/tools/misc/ccache { };
+
+  # Wrapper that works as gcc or g++
+  # It can be used by setting in nixpkgs config like this, for example:
+  #    replaceStdenv = { pkgs }: pkgs.ccacheStdenv;
+  # But if you build in chroot, you should have that path in chroot
+  # If instantiated directly, it will use the HOME/.ccache as cache directory.
+  # You can use an override in packageOverrides to set extraConfig:
+  #    packageOverrides = pkgs: {
+  #     ccacheWrapper = pkgs.ccacheWrapper.override {
+  #       extraConfig = ''
+  #         CCACHE_COMPRESS=1
+  #         CCACHE_DIR=/bin/.ccache
+  #       '';
+  #     };
+  #
+  ccacheWrapper = makeOverridable ({ extraConfig ? "" }:
+     wrapGCC (ccache.links extraConfig)) {};
+  ccacheStdenv = lowPrio (overrideGCC stdenv ccacheWrapper);
+
+  cccc = callPackage ../development/tools/analysis/cccc { };
+
+  cgdb = callPackage ../development/tools/misc/cgdb { };
+
+  chromedriver = callPackage ../development/tools/selenium/chromedriver { gconf = gnome.GConf; };
+
+  chrpath = callPackage ../development/tools/misc/chrpath { };
+
+  "cl-launch" = callPackage ../development/tools/misc/cl-launch {};
+
+  complexity = callPackage ../development/tools/misc/complexity { };
+
+  ctags = callPackage ../development/tools/misc/ctags { };
+
+  ctagsWrapped = import ../development/tools/misc/ctags/wrapped.nix {
+    inherit pkgs ctags writeScriptBin;
+  };
+
+  cmake = callPackage ../development/tools/build-managers/cmake { };
+
+  cmake264 = callPackage ../development/tools/build-managers/cmake/264.nix { };
+
+  cmakeCurses = cmake.override { useNcurses = true; };
+
+  cmakeWithGui = cmakeCurses.override { useQt4 = true; };
+
+  coccinelle = callPackage ../development/tools/misc/coccinelle { };
+
+  framac = callPackage ../development/tools/analysis/frama-c { };
+
+  cppi = callPackage ../development/tools/misc/cppi { };
+
+  cproto = callPackage ../development/tools/misc/cproto { };
+
+  cflow = callPackage ../development/tools/misc/cflow { };
+
+  cov-build = callPackage ../development/tools/analysis/cov-build {};
+
+  cppcheck = callPackage ../development/tools/analysis/cppcheck { };
+
+  cscope = callPackage ../development/tools/misc/cscope { };
+
+  csslint = callPackage ../development/web/csslint { };
+
+  libcxx = callPackage ../development/libraries/libc++ { stdenv = pkgs.clangStdenv; };
+  libcxxabi = callPackage ../development/libraries/libc++abi { stdenv = pkgs.clangStdenv; };
+
+  libsigrok = callPackage ../development/tools/libsigrok { };
+
+  libsigrokdecode = callPackage ../development/tools/libsigrokdecode { };
+
+  dejagnu = callPackage ../development/tools/misc/dejagnu { };
+
+  dfeet = callPackage ../development/tools/misc/d-feet {
+    inherit (pythonPackages) pep8;
+  };
+
+  dfu-programmer = callPackage ../development/tools/misc/dfu-programmer { };
+
+  ddd = callPackage ../development/tools/misc/ddd { };
+
+  distcc = callPackage ../development/tools/misc/distcc { };
+
+  # distccWrapper: wrapper that works as gcc or g++
+  # It can be used by setting in nixpkgs config like this, for example:
+  #    replaceStdenv = { pkgs }: pkgs.distccStdenv;
+  # But if you build in chroot, a default 'nix' will create
+  # a new net namespace, and won't have network access.
+  # You can use an override in packageOverrides to set extraConfig:
+  #    packageOverrides = pkgs: {
+  #     distccWrapper = pkgs.distccWrapper.override {
+  #       extraConfig = ''
+  #         DISTCC_HOSTS="myhost1 myhost2"
+  #       '';
+  #     };
+  #
+  distccWrapper = makeOverridable ({ extraConfig ? "" }:
+     wrapGCC (distcc.links extraConfig)) {};
+  distccStdenv = lowPrio (overrideGCC stdenv distccWrapper);
+
+  distccMasquerade = callPackage ../development/tools/misc/distcc/masq.nix {
+    gccRaw = gcc.gcc;
+    binutils = binutils;
+  };
+
+  docutils = builderDefsPackage (import ../development/tools/documentation/docutils) {
+    inherit python pil makeWrapper;
+  };
+
+  doxygen = callPackage ../development/tools/documentation/doxygen {
+    qt4 = null;
+  };
+
+  doxygen_gui = lowPrio (doxygen.override { inherit qt4; });
+
+  drush = callPackage ../development/tools/misc/drush { };
+
+  eggdbus = callPackage ../development/tools/misc/eggdbus { };
+
+  elfutils = callPackage ../development/tools/misc/elfutils { };
+
+  epm = callPackage ../development/tools/misc/epm { };
+
+  emma = callPackage ../development/tools/analysis/emma { };
+
+  findbugs = callPackage ../development/tools/analysis/findbugs { };
+
+  pmd = callPackage ../development/tools/analysis/pmd { };
+
+  jdepend = callPackage ../development/tools/analysis/jdepend { };
+
+  checkstyle = callPackage ../development/tools/analysis/checkstyle { };
+
+  flex_2_5_35 = callPackage ../development/tools/parsing/flex/2.5.35.nix { };
+  flex_2_5_39 = callPackage ../development/tools/parsing/flex/2.5.39.nix { };
+  flex = flex_2_5_39;
+
+  m4 = gnum4;
+
+  global = callPackage ../development/tools/misc/global { };
+
+  gnome_doc_utils = callPackage ../development/tools/documentation/gnome-doc-utils {};
+
+  gnum4 = callPackage ../development/tools/misc/gnum4 { };
+
+  gnumake380 = callPackage ../development/tools/build-managers/gnumake/3.80 { };
+  gnumake381 = callPackage ../development/tools/build-managers/gnumake/3.81 { };
+  gnumake382 = callPackage ../development/tools/build-managers/gnumake/3.82 { };
+  gnumake40  = callPackage ../development/tools/build-managers/gnumake/4.0  { };
+  gnumake = gnumake382;
+
+  gob2 = callPackage ../development/tools/misc/gob2 { };
+
+  gradle = callPackage ../development/tools/build-managers/gradle { };
+
+  gperf = callPackage ../development/tools/misc/gperf { };
+
+  gtk_doc = callPackage ../development/tools/documentation/gtk-doc { };
+
+  gtkdialog = callPackage ../development/tools/misc/gtkdialog { };
+
+  guileLint = callPackage ../development/tools/guile/guile-lint { };
+
+  gwrap = callPackage ../development/tools/guile/g-wrap { };
+
+  help2man = callPackage ../development/tools/misc/help2man {
+    inherit (perlPackages) LocaleGettext;
+  };
+
+  hyenae = callPackage ../tools/networking/hyenae { };
+
+  ibus = callPackage ../development/libraries/ibus { };
+
+  iconnamingutils = callPackage ../development/tools/misc/icon-naming-utils {
+    inherit (perlPackages) XMLSimple;
+  };
+
+  indent = callPackage ../development/tools/misc/indent { };
+
+  ino = callPackage ../development/arduino/ino { };
+
+  inotifyTools = callPackage ../development/tools/misc/inotify-tools { };
+
+  intel-gpu-tools = callPackage ../development/tools/misc/intel-gpu-tools {
+    inherit (xorg) libpciaccess dri2proto libX11 libXext libXv libXrandr;
+  };
+
+  ired = callPackage ../development/tools/analysis/radare/ired.nix { };
+
+  itstool = callPackage ../development/tools/misc/itstool { };
+
+  jam = callPackage ../development/tools/build-managers/jam { };
+
+  jikespg = callPackage ../development/tools/parsing/jikespg { };
+
+  jenkins = callPackage ../development/tools/continuous-integration/jenkins { };
+
+  lcov = callPackage ../development/tools/analysis/lcov { };
+
+  leiningen = callPackage ../development/tools/build-managers/leiningen { };
+
+  libtool = libtool_2;
+
+  libtool_1_5 = callPackage ../development/tools/misc/libtool { };
+
+  libtool_2 = callPackage ../development/tools/misc/libtool/libtool2.nix { };
+
+  lsof = callPackage ../development/tools/misc/lsof { };
+
+  ltrace = callPackage ../development/tools/misc/ltrace { };
+
+  lttng-tools = callPackage ../development/tools/misc/lttng-tools { };
+
+  lttng-ust = callPackage ../development/tools/misc/lttng-ust { };
+
+  lttv = callPackage ../development/tools/misc/lttv { };
+
+  mk = callPackage ../development/tools/build-managers/mk { };
+
+  neoload = callPackage ../development/tools/neoload {
+    licenseAccepted = (config.neoload.accept_license or false);
+  };
+
+  ninja = callPackage ../development/tools/build-managers/ninja { };
+
+  nixbang = callPackage ../development/tools/misc/nixbang {
+      pythonPackages = python3Packages;
+  };
+
+  node_webkit = callPackage ../development/tools/node-webkit {
+    gconf = pkgs.gnome.GConf;
+  };
+
+  noweb = callPackage ../development/tools/literate-programming/noweb { };
+
+  omake = callPackage ../development/tools/ocaml/omake { };
+  omake_rc1 = callPackage ../development/tools/ocaml/omake/0.9.8.6-rc1.nix { };
+
+  opengrok = callPackage ../development/tools/misc/opengrok { };
+
+  openocd = callPackage ../development/tools/misc/openocd { };
+
+  oprofile = callPackage ../development/tools/profiling/oprofile { };
+
+  patchelf = callPackage ../development/tools/misc/patchelf { };
+
+  peg = callPackage ../development/tools/parsing/peg { };
+
+  phantomjs = callPackage ../development/tools/phantomjs {
+    stdenv = if stdenv.isDarwin
+      then overrideGCC stdenv gccApple
+      else stdenv;
+  };
+
+  pmccabe = callPackage ../development/tools/misc/pmccabe { };
+
+  /* Make pkgconfig always return a nativeDrv, never a proper crossDrv,
+     because most usage of pkgconfig as buildInput (inheritance of
+     pre-cross nixpkgs) means using it using as nativeBuildInput
+     cross_renaming: we should make all programs use pkgconfig as
+     nativeBuildInput after the renaming.
+     */
+  pkgconfig = forceNativeDrv (callPackage ../development/tools/misc/pkgconfig { });
+  pkgconfigUpstream = lowPrio (pkgconfig.override { vanilla = true; });
+
+  prelink = callPackage ../development/tools/misc/prelink { };
+
+  premake3 = callPackage ../development/tools/misc/premake/3.nix { };
+
+  premake4 = callPackage ../development/tools/misc/premake { };
+
+  premake = premake4;
+
+  pstack = callPackage ../development/tools/misc/gdb/pstack.nix { };
+
+  radare = callPackage ../development/tools/analysis/radare {
+    inherit (gnome) vte;
+    lua = lua5;
+    useX11 = config.radare.useX11 or false;
+    pythonBindings = config.radare.pythonBindings or false;
+    rubyBindings = config.radare.rubyBindings or false;
+    luaBindings = config.radare.luaBindings or false;
+  };
+
+  ragel = callPackage ../development/tools/parsing/ragel { };
+
+  re2c = callPackage ../development/tools/parsing/re2c { };
+
+  remake = callPackage ../development/tools/build-managers/remake { };
+
+  saleae-logic = callPackage ../development/tools/misc/saleae-logic { };
+
+  # couldn't find the source yet
+  seleniumRCBin = callPackage ../development/tools/selenium/remote-control {
+    jre = jdk;
+  };
+
+  selenium-server-standalone = callPackage ../development/tools/selenium/server { };
+
+  scons = callPackage ../development/tools/build-managers/scons { };
+
+  simpleBuildTool = callPackage ../development/tools/build-managers/simple-build-tool { };
+
+  sigrok-cli = callPackage ../development/tools/sigrok-cli { };
+
+  slimerjs = callPackage ../development/tools/slimerjs {};
+
+  sloccount = callPackage ../development/tools/misc/sloccount { };
+
+  smatch = callPackage ../development/tools/analysis/smatch {
+    buildllvmsparse = false;
+    buildc2xml = false;
+  };
+
+  smc = callPackage ../tools/misc/smc { };
+
+  sparse = callPackage ../development/tools/analysis/sparse { };
+
+  speedtest_cli = callPackage ../tools/networking/speedtest-cli { };
+
+  spin = callPackage ../development/tools/analysis/spin { };
+
+  splint = callPackage ../development/tools/analysis/splint {
+    flex = flex_2_5_35;
+  };
+
+  stm32flash = callPackage ../development/tools/misc/stm32flash { };
+
+  strace = callPackage ../development/tools/misc/strace { };
+
+  swig = callPackage ../development/tools/misc/swig { };
+
+  swig2 = callPackage ../development/tools/misc/swig/2.x.nix { };
+
+  swig3 = callPackage ../development/tools/misc/swig/3.x.nix { };
+
+  swigWithJava = swig;
+
+  swfmill = callPackage ../tools/video/swfmill { };
+
+  swftools = callPackage ../tools/video/swftools { };
+
+  tcptrack = callPackage ../development/tools/misc/tcptrack { };
+
+  teensy-loader = callPackage ../development/tools/misc/teensy { };
+
+  texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { };
+  texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { };
+  texinfo4 = texinfo413;
+  texinfo = texinfo5;
+  texinfoInteractive = appendToName "interactive" (
+    texinfo.override { interactive = true; }
+  );
+
+  texi2html = callPackage ../development/tools/misc/texi2html { };
+
+  uhd = callPackage ../development/tools/misc/uhd { };
+
+  uisp = callPackage ../development/tools/misc/uisp { };
+
+  uncrustify = callPackage ../development/tools/misc/uncrustify { };
+
+  vagrant = callPackage ../development/tools/vagrant {
+    ruby = ruby2;
+  };
+
+  gdb = callPackage ../development/tools/misc/gdb {
+    hurd = gnu.hurdCross;
+    readline = readline63;
+    inherit (gnu) mig;
+  };
+
+  gdbCross = lowPrio (callPackage ../development/tools/misc/gdb {
+    target = crossSystem;
+  });
+
+  valgrind = callPackage ../development/tools/analysis/valgrind {
+    stdenv =
+      # On Darwin, Valgrind 3.7.0 expects Apple's GCC (for
+      # `__private_extern'.)
+      if stdenv.isDarwin
+      then overrideGCC stdenv gccApple
+      else stdenv;
+  };
+
+  valkyrie = callPackage ../development/tools/analysis/valkyrie { };
+
+  xc3sprog = callPackage ../development/tools/misc/xc3sprog { };
+
+  xmlindent = callPackage ../development/web/xmlindent {};
+
+  xpwn = callPackage ../development/mobile/xpwn {};
+
+  xxdiff = callPackage ../development/tools/misc/xxdiff {
+    bison = bison2;
+  };
+
+  yacc = bison;
+
+  yodl = callPackage ../development/tools/misc/yodl { };
+
+
+  ### DEVELOPMENT / LIBRARIES
+
+  a52dec = callPackage ../development/libraries/a52dec { };
+
+  aacskeys = callPackage ../development/libraries/aacskeys { };
+
+  aalib = callPackage ../development/libraries/aalib { };
+
+  accountsservice = callPackage ../development/libraries/accountsservice { };
+
+  acl = callPackage ../development/libraries/acl { };
+
+  activemq = callPackage ../development/libraries/apache-activemq { };
+
+  adns = callPackage ../development/libraries/adns { };
+
+  afflib = callPackage ../development/libraries/afflib {};
+
+  agg = callPackage ../development/libraries/agg { };
+
+  allegro = callPackage ../development/libraries/allegro {};
+  allegro5 = callPackage ../development/libraries/allegro/5.nix {};
+  allegro5unstable = callPackage
+    ../development/libraries/allegro/5-unstable.nix {};
+
+  amrnb = callPackage ../development/libraries/amrnb { };
+
+  amrwb = callPackage ../development/libraries/amrwb { };
+
+  apr = callPackage ../development/libraries/apr { };
+
+  aprutil = callPackage ../development/libraries/apr-util {
+    bdbSupport = true;
+  };
+
+  asio = callPackage ../development/libraries/asio { };
+
+  aspell = callPackage ../development/libraries/aspell { };
+
+  aspellDicts = recurseIntoAttrs (import ../development/libraries/aspell/dictionaries.nix {
+    inherit fetchurl stdenv aspell which;
+  });
+
+  aterm = aterm25;
+
+  aterm25 = callPackage ../development/libraries/aterm/2.5.nix { };
+
+  aterm28 = lowPrio (callPackage ../development/libraries/aterm/2.8.nix { });
+
+  attica = callPackage ../development/libraries/attica { };
+
+  attr = callPackage ../development/libraries/attr { };
+
+  at_spi2_core = callPackage ../development/libraries/at-spi2-core { };
+
+  at_spi2_atk = callPackage ../development/libraries/at-spi2-atk { };
+
+  aqbanking = callPackage ../development/libraries/aqbanking { };
+
+  aubio = callPackage ../development/libraries/aubio { };
+
+  audiofile = callPackage ../development/libraries/audiofile { };
+
+  babl_0_0_22 = callPackage ../development/libraries/babl/0_0_22.nix { };
+
+  babl = callPackage ../development/libraries/babl { };
+
+  beecrypt = callPackage ../development/libraries/beecrypt { };
+
+  boehmgc = callPackage ../development/libraries/boehm-gc { };
+
+  boolstuff = callPackage ../development/libraries/boolstuff { };
+
+  boost144 = callPackage ../development/libraries/boost/1.44.nix { };
+  boost149 = callPackage ../development/libraries/boost/1.49.nix { };
+  boost155 = callPackage ../development/libraries/boost/1.55.nix { };
+  boost = boost155;
+
+  boostHeaders = callPackage ../development/libraries/boost/header-only-wrapper.nix { };
+
+  botan = callPackage ../development/libraries/botan { };
+  botanUnstable = callPackage ../development/libraries/botan/unstable.nix { };
+
+  box2d = callPackage ../development/libraries/box2d { };
+  box2d_2_0_1 = callPackage ../development/libraries/box2d/2.0.1.nix { };
+
+  buddy = callPackage ../development/libraries/buddy { };
+
+  bwidget = callPackage ../development/libraries/bwidget { };
+
+  c-ares = callPackage ../development/libraries/c-ares {
+    fetchurl = fetchurlBoot;
+  };
+
+  caelum = callPackage ../development/libraries/caelum { };
+
+  capnproto = callPackage ../development/libraries/capnproto { };
+
+  scmccid = callPackage ../development/libraries/scmccid { };
+
+  ccrtp = callPackage ../development/libraries/ccrtp { };
+  ccrtp_1_8 = callPackage ../development/libraries/ccrtp/1.8.nix { };
+
+  celt = callPackage ../development/libraries/celt {};
+  celt_0_7 = callPackage ../development/libraries/celt/0.7.nix {};
+  celt_0_5_1 = callPackage ../development/libraries/celt/0.5.1.nix {};
+
+  cgal = callPackage ../development/libraries/CGAL {};
+
+  cgui = callPackage ../development/libraries/cgui {};
+
+  check = callPackage ../development/libraries/check { };
+
+  chipmunk = builderDefsPackage (import ../development/libraries/chipmunk) {
+    inherit cmake freeglut mesa;
+    inherit (xlibs) libX11 xproto inputproto libXi libXmu;
+  };
+
+  chmlib = callPackage ../development/libraries/chmlib { };
+
+  chromaprint = callPackage ../development/libraries/chromaprint { };
+
+  cil = callPackage ../development/libraries/cil { };
+
+  cilaterm = callPackage ../development/libraries/cil-aterm {
+    stdenv = overrideInStdenv stdenv [gnumake380];
+  };
+
+  clanlib = callPackage ../development/libraries/clanlib { };
+
+  classads = callPackage ../development/libraries/classads { };
+
+  classpath = callPackage ../development/libraries/java/classpath {
+    javac = gcj;
+    jvm = gcj;
+    gconf = gnome.GConf;
+  };
+
+  clearsilver = callPackage ../development/libraries/clearsilver { };
+
+  cln = callPackage ../development/libraries/cln { };
+
+  clppcre = builderDefsPackage (import ../development/libraries/cl-ppcre) { };
+
+  clucene_core_2 = callPackage ../development/libraries/clucene-core/2.x.nix { };
+
+  clucene_core_1 = callPackage ../development/libraries/clucene-core { };
+
+  clucene_core = clucene_core_1;
+
+  clutter = callPackage ../development/libraries/clutter { };
+
+  clutter_1_18 = callPackage ../development/libraries/clutter/1.18.nix {
+    cogl = cogl_1_18;
+  };
+
+  clutter-gst = callPackage ../development/libraries/clutter-gst { };
+
+  clutter_gtk = callPackage ../development/libraries/clutter-gtk { };
+  clutter_gtk_0_10 = callPackage ../development/libraries/clutter-gtk/0.10.8.nix { };
+
+  cminpack = callPackage ../development/libraries/cminpack { };
+
+  cogl = callPackage ../development/libraries/cogl { };
+
+  cogl_1_18 = callPackage ../development/libraries/cogl/1.18.nix { };
+
+  coin3d = callPackage ../development/libraries/coin3d { };
+
+  commoncpp2 = callPackage ../development/libraries/commoncpp2 { };
+
+  confuse = callPackage ../development/libraries/confuse { };
+
+  coredumper = callPackage ../development/libraries/coredumper { };
+
+  ctl = callPackage ../development/libraries/ctl { };
+
+  cpp-netlib = callPackage ../development/libraries/cpp-netlib { };
+
+  cppunit = callPackage ../development/libraries/cppunit { };
+
+  cppnetlib = callPackage ../development/libraries/cppnetlib {
+    boost = boostHeaders;
+  };
+
+  cracklib = callPackage ../development/libraries/cracklib { };
+
+  cryptopp = callPackage ../development/libraries/crypto++ { };
+
+  cyrus_sasl = callPackage ../development/libraries/cyrus-sasl { };
+
+  # Make bdb5 the default as it is the last release under the custom
+  # bsd-like license
+  db = db5;
+  db4 = db48;
+  db44 = callPackage ../development/libraries/db/db-4.4.nix { };
+  db45 = callPackage ../development/libraries/db/db-4.5.nix { };
+  db47 = callPackage ../development/libraries/db/db-4.7.nix { };
+  db48 = callPackage ../development/libraries/db/db-4.8.nix { };
+  db5 = db53;
+  db53 = callPackage ../development/libraries/db/db-5.3.nix { };
+  db6 = db60;
+  db60 = callPackage ../development/libraries/db/db-6.0.nix { };
+
+  dbus = callPackage ../development/libraries/dbus { };
+  dbus_cplusplus  = callPackage ../development/libraries/dbus-cplusplus { };
+  dbus_glib       = callPackage ../development/libraries/dbus-glib { };
+  dbus_java       = callPackage ../development/libraries/java/dbus-java { };
+  dbus_python     = callPackage ../development/python-modules/dbus { };
+
+  # Should we deprecate these? Currently there are many references.
+  dbus_tools = pkgs.dbus.tools;
+  dbus_libs = pkgs.dbus.libs;
+  dbus_daemon = pkgs.dbus.daemon;
+
+  dhex = callPackage ../applications/editors/dhex { };
+
+  dclib = callPackage ../development/libraries/dclib { };
+
+  dillo = callPackage ../applications/networking/browsers/dillo {
+    fltk = fltk13;
+  };
+
+  directfb = callPackage ../development/libraries/directfb { };
+
+  dotconf = callPackage ../development/libraries/dotconf { };
+
+  dssi = callPackage ../development/libraries/dssi {};
+
+  dragonegg = llvmPackages.dragonegg;
+
+  dxflib = callPackage ../development/libraries/dxflib {};
+
+  eigen = callPackage ../development/libraries/eigen {};
+
+  eigen2 = callPackage ../development/libraries/eigen/2.0.nix {};
+
+  enchant = callPackage ../development/libraries/enchant { };
+
+  enet = callPackage ../development/libraries/enet { };
+
+  enginepkcs11 = callPackage ../development/libraries/enginepkcs11 { };
+
+  epoxy = callPackage ../development/libraries/epoxy {
+    inherit (xorg) utilmacros libX11;
+  };
+
+  esdl = callPackage ../development/libraries/esdl { };
+
+  exiv2 = callPackage ../development/libraries/exiv2 { };
+
+  expat = callPackage ../development/libraries/expat { };
+
+  extremetuxracer = callPackage ../games/extremetuxracer {
+    libpng = libpng12;
+  };
+
+  eventlog = callPackage ../development/libraries/eventlog { };
+
+  facile = callPackage ../development/libraries/facile { };
+
+  faac = callPackage ../development/libraries/faac { };
+
+  faad2 = callPackage ../development/libraries/faad2 { };
+
+  farsight2 = callPackage ../development/libraries/farsight2 { };
+
+  farstream = callPackage ../development/libraries/farstream {
+    inherit (gst_all_1)
+      gstreamer gst-plugins-base gst-python gst-plugins-good gst-plugins-bad
+      gst-libav;
+  };
+
+  fcgi = callPackage ../development/libraries/fcgi { };
+
+  ffmpeg_0_6 = callPackage ../development/libraries/ffmpeg/0.6.nix {
+    vpxSupport = !stdenv.isMips;
+  };
+
+  ffmpeg_0_6_90 = callPackage ../development/libraries/ffmpeg/0.6.90.nix {
+    vpxSupport = !stdenv.isMips;
+  };
+
+  ffmpeg_0_10 = callPackage ../development/libraries/ffmpeg/0.10.nix {
+    vpxSupport = !stdenv.isMips;
+
+    stdenv = if stdenv.isDarwin
+      then overrideGCC stdenv gccApple
+      else stdenv;
+  };
+
+  ffmpeg_1 = callPackage ../development/libraries/ffmpeg/1.x.nix {
+    vpxSupport = !stdenv.isMips;
+  };
+
+  ffmpeg_2 = callPackage ../development/libraries/ffmpeg/2.x.nix { };
+
+  ffmpeg = ffmpeg_2;
+
+  ffms = callPackage ../development/libraries/ffms { };
+
+  fftw = callPackage ../development/libraries/fftw { };
+  fftwSinglePrec = fftw.override { precision = "single"; };
+  fftwFloat = fftwSinglePrec; # the configure option is just an alias
+
+  flann = callPackage ../development/libraries/flann { };
+
+  flite = callPackage ../development/libraries/flite { };
+
+  fltk13 = callPackage ../development/libraries/fltk/fltk13.nix { };
+
+  fltk20 = callPackage ../development/libraries/fltk { };
+
+  fmod = callPackage ../development/libraries/fmod { };
+
+  freeimage = callPackage ../development/libraries/freeimage { };
+
+  freetts = callPackage ../development/libraries/freetts { };
+
+  cfitsio = callPackage ../development/libraries/cfitsio { };
+
+  fontconfig = callPackage ../development/libraries/fontconfig { };
+
+  makeFontsConf = let fontconfig_ = fontconfig; in {fontconfig ? fontconfig_, fontDirectories}:
+    import ../development/libraries/fontconfig/make-fonts-conf.nix {
+      inherit runCommand libxslt fontconfig fontDirectories;
+    };
+
+  freealut = callPackage ../development/libraries/freealut { };
+
+  freeglut = callPackage ../development/libraries/freeglut { };
+
+  freetype = callPackage ../development/libraries/freetype { };
+
+  frei0r = callPackage ../development/libraries/frei0r { };
+
+  fribidi = callPackage ../development/libraries/fribidi { };
+
+  funambol = callPackage ../development/libraries/funambol { };
+
+  fam = gamin;
+
+  gamin = callPackage ../development/libraries/gamin { };
+
+  ganv = callPackage ../development/libraries/ganv { };
+
+  gav = callPackage ../games/gav { };
+
+  gsb = callPackage ../games/gsb { };
+
+  gdome2 = callPackage ../development/libraries/gdome2 {
+    inherit (gnome) gtkdoc;
+  };
+
+  gdbm = callPackage ../development/libraries/gdbm { };
+
+  gegl = callPackage ../development/libraries/gegl {
+    #  avocodec avformat librsvg
+  };
+
+  gegl_0_0_22 = callPackage ../development/libraries/gegl/0_0_22.nix {
+    #  avocodec avformat librsvg
+    libpng = libpng12;
+  };
+
+  geoclue = callPackage ../development/libraries/geoclue {};
+
+  geoclue2 = callPackage ../development/libraries/geoclue/2.0.nix {};
+
+  geoip = callPackage ../development/libraries/geoip { };
+
+  geoipjava = callPackage ../development/libraries/java/geoipjava { };
+
+  geos = callPackage ../development/libraries/geos { };
+
+  gettext = gettext_0_18;
+
+  gettext_0_17 = callPackage ../development/libraries/gettext/0.17.nix { };
+  gettext_0_18 = callPackage ../development/libraries/gettext { };
+
+  gd = callPackage ../development/libraries/gd { };
+
+  gdal = callPackage ../development/libraries/gdal { };
+
+  ggz_base_libs = callPackage ../development/libraries/ggz_base_libs {};
+
+  giblib = callPackage ../development/libraries/giblib { };
+
+  libgit2 = callPackage ../development/libraries/git2 { };
+
+  glew = callPackage ../development/libraries/glew { };
+
+  glfw = glfw3;
+  glfw2 = callPackage ../development/libraries/glfw/2.x.nix { };
+  glfw3 = callPackage ../development/libraries/glfw/3.x.nix { };
+
+  glibc = callPackage ../development/libraries/glibc/2.19 {
+    kernelHeaders = linuxHeaders;
+    installLocales = config.glibc.locales or false;
+    machHeaders = null;
+    hurdHeaders = null;
+    gccCross = null;
+  };
+
+  glibc_memusage = callPackage ../development/libraries/glibc/2.19 {
+    kernelHeaders = linuxHeaders;
+    installLocales = false;
+    withGd = true;
+  };
+
+  glibcCross = forceNativeDrv (makeOverridable (import ../development/libraries/glibc/2.19)
+    (let crossGNU = crossSystem != null && crossSystem.config == "i586-pc-gnu";
+     in {
+       inherit stdenv fetchurl;
+       gccCross = gccCrossStageStatic;
+       kernelHeaders = if crossGNU then gnu.hurdHeaders else linuxHeadersCross;
+       installLocales = config.glibc.locales or false;
+     }
+     // lib.optionalAttrs crossGNU {
+        inherit (gnu) machHeaders hurdHeaders libpthreadHeaders mig;
+        inherit fetchgit;
+      }));
+
+
+  # We can choose:
+  libcCrossChooser = name : if name == "glibc" then glibcCross
+    else if name == "uclibc" then uclibcCross
+    else if name == "msvcrt" then windows.mingw_w64
+    else if name == "libSystem" then darwin.xcode
+    else throw "Unknown libc";
+
+  libcCross = assert crossSystem != null; libcCrossChooser crossSystem.libc;
+
+  eglibc = callPackage ../development/libraries/eglibc {
+    kernelHeaders = linuxHeaders;
+    installLocales = config.glibc.locales or false;
+  };
+
+  glibcLocales = callPackage ../development/libraries/glibc/2.19/locales.nix { };
+
+  glibcInfo = callPackage ../development/libraries/glibc/2.19/info.nix { };
+
+  glibc_multi = callPackage ../development/libraries/glibc/2.19/multi.nix {
+    inherit glibc;
+    glibc32 = (import ./all-packages.nix {system = "i686-linux";}).glibc;
+  };
+
+  glm = callPackage ../development/libraries/glm { };
+
+  glog = callPackage ../development/libraries/glog { };
+
+  gloox = callPackage ../development/libraries/gloox { };
+
+  glpk = callPackage ../development/libraries/glpk { };
+
+  glsurf = callPackage ../applications/science/math/glsurf {
+    inherit (ocamlPackages) lablgl findlib camlimages ocaml_mysql mlgmp;
+    libpng = libpng12;
+    giflib = giflib_4_1;
+  };
+
+  gmime = callPackage ../development/libraries/gmime { };
+
+  gmm = callPackage ../development/libraries/gmm { };
+
+  gmp = gmp5;
+  gmp5 = gmp51;
+
+  gmpxx = appendToName "with-cxx" (gmp.override { cxx = true; });
+
+  # The GHC bootstrap binaries link against libgmp.so.3, which is in GMP 4.x.
+  gmp4 = callPackage ../development/libraries/gmp/4.3.2.nix { };
+
+  gmp51 = callPackage ../development/libraries/gmp/5.1.x.nix { };
+
+  #GMP ex-satellite, so better keep it near gmp
+  mpfr = callPackage ../development/libraries/mpfr/default.nix { };
+
+  gobjectIntrospection = callPackage ../development/libraries/gobject-introspection { };
+
+  goocanvas = callPackage ../development/libraries/goocanvas { };
+
+  google-gflags = callPackage ../development/libraries/google-gflags { };
+
+  gperftools = callPackage ../development/libraries/gperftools { };
+
+  gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer {
+    callPackage = pkgs.newScope (pkgs // { libav = pkgs.libav_10; });
+  });
+
+  gst_all = {
+    inherit (pkgs) gstreamer gnonlin gst_python qt_gstreamer;
+    gstPluginsBase = pkgs.gst_plugins_base;
+    gstPluginsBad = pkgs.gst_plugins_bad;
+    gstPluginsGood = pkgs.gst_plugins_good;
+    gstPluginsUgly = pkgs.gst_plugins_ugly;
+    gstFfmpeg = pkgs.gst_ffmpeg;
+  };
+
+  gstreamer = callPackage ../development/libraries/gstreamer/legacy/gstreamer {
+    bison = bison2;
+  };
+
+  gst_plugins_base = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-base {};
+
+  gst_plugins_good = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-good {};
+
+  gst_plugins_bad = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-bad {};
+
+  gst_plugins_ugly = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-ugly {};
+
+  gst_ffmpeg = callPackage ../development/libraries/gstreamer/legacy/gst-ffmpeg {
+    ffmpeg = ffmpeg_0_10;
+  };
+
+  gst_python = callPackage ../development/libraries/gstreamer/legacy/gst-python {};
+
+  gstreamermm = callPackage ../development/libraries/gstreamer/legacy/gstreamermm { };
+
+  gnonlin = callPackage ../development/libraries/gstreamer/legacy/gnonlin {};
+
+  gusb = callPackage ../development/libraries/gusb {
+    inherit (gnome) gtkdoc;
+  };
+
+  qt_gstreamer = callPackage ../development/libraries/gstreamer/legacy/qt-gstreamer {};
+
+  gnet = callPackage ../development/libraries/gnet { };
+
+  gnu-efi = callPackage ../development/libraries/gnu-efi { };
+
+  gnutls = gnutls32;
+
+  gnutls31 = callPackage ../development/libraries/gnutls/3.1.nix {
+    guileBindings = config.gnutls.guile or false;
+  };
+
+  gnutls32 = callPackage ../development/libraries/gnutls/3.2.nix {
+    guileBindings = config.gnutls.guile or false;
+  };
+
+  gnutls_with_guile = lowPrio (gnutls.override { guileBindings = true; });
+
+  gpac = callPackage ../applications/video/gpac { };
+
+  gpgme = callPackage ../development/libraries/gpgme {
+    gnupg1 = gnupg1orig;
+  };
+
+  grantlee = callPackage ../development/libraries/grantlee { };
+
+  gsasl = callPackage ../development/libraries/gsasl { };
+
+  gsl = callPackage ../development/libraries/gsl { };
+
+  gsm = callPackage ../development/libraries/gsm {};
+
+  gsoap = callPackage ../development/libraries/gsoap { };
+
+  gss = callPackage ../development/libraries/gss { };
+
+  gtkimageview = callPackage ../development/libraries/gtkimageview { };
+
+  gtkmathview = callPackage ../development/libraries/gtkmathview { };
+
+  gtkLibs = {
+    inherit (pkgs) glib glibmm atk atkmm cairo pango pangomm gdk_pixbuf gtk
+      gtkmm;
+  };
+
+  glib = callPackage ../development/libraries/glib { };
+  glib-tested = glib.override { doCheck = true; }; # checked version separate to break cycles
+  glibmm = callPackage ../development/libraries/glibmm { };
+
+  glib_networking = callPackage ../development/libraries/glib-networking {};
+
+  atk = callPackage ../development/libraries/atk { };
+  atkmm = callPackage ../development/libraries/atkmm { };
+
+  pixman = callPackage ../development/libraries/pixman { };
+
+  cairo = callPackage ../development/libraries/cairo {
+    glSupport = config.cairo.gl or (stdenv.isLinux &&
+      !stdenv.isArm && !stdenv.isMips);
+  };
+  cairomm = callPackage ../development/libraries/cairomm { };
+
+  pango = callPackage ../development/libraries/pango { };
+  pangomm = callPackage ../development/libraries/pangomm { };
+
+  pangox_compat = callPackage ../development/libraries/pangox-compat { };
+
+  gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf {
+    # workaround signal 10 in gdk_pixbuf tests
+    stdenv = if stdenv.isDarwin
+      then clangStdenv
+      else stdenv;
+  };
+
+  gtk2 = callPackage ../development/libraries/gtk+/2.x.nix {
+    cupsSupport = config.gtk2.cups or stdenv.isLinux;
+  };
+
+  gtk3 = callPackage ../development/libraries/gtk+/3.x.nix { };
+
+  gtk = pkgs.gtk2;
+
+  gtkmm = callPackage ../development/libraries/gtkmm/2.x.nix { };
+  gtkmm3 = callPackage ../development/libraries/gtkmm/3.x.nix { };
+
+  gtkmozembedsharp = callPackage ../development/libraries/gtkmozembed-sharp {
+    gtksharp = gtksharp2;
+  };
+
+  gtksharp1 = callPackage ../development/libraries/gtk-sharp-1 {
+    inherit (gnome) libglade libgtkhtml gtkhtml
+              libgnomecanvas libgnomeui libgnomeprint
+              libgnomeprintui GConf;
+  };
+
+  gtksharp2 = callPackage ../development/libraries/gtk-sharp-2 {
+    inherit (gnome) libglade libgtkhtml gtkhtml
+              libgnomecanvas libgnomeui libgnomeprint
+              libgnomeprintui GConf gnomepanel;
+  };
+
+  gtksourceviewsharp = callPackage ../development/libraries/gtksourceview-sharp {
+    inherit (gnome) gtksourceview;
+    gtksharp = gtksharp2;
+  };
+
+  gtkspell = callPackage ../development/libraries/gtkspell { };
+
+  gtkspell3 = callPackage ../development/libraries/gtkspell/3.nix { };
+
+  gts = callPackage ../development/libraries/gts { };
+
+  gvfs = callPackage ../development/libraries/gvfs { gconf = gnome.GConf; };
+
+  gwenhywfar = callPackage ../development/libraries/gwenhywfar { };
+
+  hamlib = callPackage ../development/libraries/hamlib { };
+
+  # TODO : Add MIT Kerberos and let admin choose.
+  kerberos = heimdal;
+
+  heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { };
+
+  harfbuzz = callPackage ../development/libraries/harfbuzz { };
+
+  hawknl = callPackage ../development/libraries/hawknl { };
+
+  herqq = callPackage ../development/libraries/herqq { };
+
+  hspell = callPackage ../development/libraries/hspell { };
+
+  hspellDicts = callPackage ../development/libraries/hspell/dicts.nix { };
+
+  hsqldb = callPackage ../development/libraries/java/hsqldb { };
+
+  http-parser = callPackage ../development/libraries/http-parser { inherit (pythonPackages) gyp; };
+
+  hunspell = callPackage ../development/libraries/hunspell { };
+
+  hwloc = callPackage ../development/libraries/hwloc {
+    inherit (xlibs) libX11;
+  };
+
+  hydraAntLogger = callPackage ../development/libraries/java/hydra-ant-logger { };
+
+  icu = callPackage ../development/libraries/icu { };
+
+  id3lib = callPackage ../development/libraries/id3lib { };
+
+  iksemel = callPackage ../development/libraries/iksemel { };
+
+  ilbc = callPackage ../development/libraries/ilbc { };
+
+  ilixi = callPackage ../development/libraries/ilixi { };
+
+  ilmbase = callPackage ../development/libraries/ilmbase { };
+
+  imlib = callPackage ../development/libraries/imlib {
+    libpng = libpng12;
+  };
+
+  imlib2 = callPackage ../development/libraries/imlib2 { };
+
+  incrtcl = callPackage ../development/libraries/incrtcl { };
+
+  indilib = callPackage ../development/libraries/indilib { };
+
+  iniparser = callPackage ../development/libraries/iniparser { };
+
+  intltool = callPackage ../development/tools/misc/intltool { };
+
+  irrlicht3843 = callPackage ../development/libraries/irrlicht { };
+
+  isocodes = callPackage ../development/libraries/iso-codes { };
+
+  itk = callPackage ../development/libraries/itk { };
+
+  jamp = builderDefsPackage ../games/jamp {
+    inherit mesa SDL SDL_image SDL_mixer;
+  };
+
+  jasper = callPackage ../development/libraries/jasper { };
+
+  jama = callPackage ../development/libraries/jama { };
+
+  jansson = callPackage ../development/libraries/jansson { };
+
+  jbig2dec = callPackage ../development/libraries/jbig2dec { };
+
+  jetty_gwt = callPackage ../development/libraries/java/jetty-gwt { };
+
+  jetty_util = callPackage ../development/libraries/java/jetty-util { };
+
+  json_glib = callPackage ../development/libraries/json-glib { };
+
+  json-c-0-11 = callPackage ../development/libraries/json-c/0.11.nix { }; # vulnerable
+  json_c = callPackage ../development/libraries/json-c { };
+
+  jsoncpp = callPackage ../development/libraries/jsoncpp { };
+
+  libjson = callPackage ../development/libraries/libjson { };
+
+  judy = callPackage ../development/libraries/judy { };
+
+  keybinder = callPackage ../development/libraries/keybinder {
+    automake = automake111x;
+    lua = lua5_1;
+  };
+
+  keybinder3 = callPackage ../development/libraries/keybinder3 {
+    automake = automake111x;
+    lua = lua5_1;
+  };
+
+  krb5 = callPackage ../development/libraries/kerberos/krb5.nix { };
+
+  lcms = lcms1;
+
+  lcms1 = callPackage ../development/libraries/lcms { };
+
+  lcms2 = callPackage ../development/libraries/lcms2 { };
+
+  lensfun = callPackage ../development/libraries/lensfun { };
+
+  lesstif = callPackage ../development/libraries/lesstif { };
+
+  lesstif93 = callPackage ../development/libraries/lesstif-0.93 { };
+
+  leveldb = callPackage ../development/libraries/leveldb { };
+
+  levmar = callPackage ../development/libraries/levmar { };
+
+  leptonica = callPackage ../development/libraries/leptonica {
+    libpng = libpng12;
+  };
+
+  lgi = callPackage ../development/libraries/lgi {
+    lua = lua5_1;
+  };
+
+  lib3ds = callPackage ../development/libraries/lib3ds { };
+
+  libaacs = callPackage ../development/libraries/libaacs { };
+
+  libaal = callPackage ../development/libraries/libaal { };
+
+  libao = callPackage ../development/libraries/libao {
+    usePulseAudio = config.pulseaudio or true;
+  };
+
+  libarchive = callPackage ../development/libraries/libarchive { };
+
+  libass = callPackage ../development/libraries/libass { };
+
+  libassuan1 = callPackage ../development/libraries/libassuan1 { };
+
+  libassuan = callPackage ../development/libraries/libassuan { };
+
+  libassuan2_1 = callPackage ../development/libraries/libassuan/git.nix { };
+
+  libatomic_ops = callPackage ../development/libraries/libatomic_ops {};
+
+  libav = libav_10;
+  libav_all = callPackage ../development/libraries/libav { };
+  inherit (libav_all) libav_0_8 libav_9 libav_10;
+
+  libavc1394 = callPackage ../development/libraries/libavc1394 { };
+
+  libbluedevil = callPackage ../development/libraries/libbluedevil { };
+
+  libbluray = callPackage ../development/libraries/libbluray { };
+
+  libbs2b = callPackage ../development/libraries/audio/libbs2b { };
+
+  libcaca = callPackage ../development/libraries/libcaca { };
+
+  libcanberra = callPackage ../development/libraries/libcanberra { };
+  libcanberra_gtk3 = libcanberra.override { gtk = gtk3; };
+  libcanberra_kde = if (config.kde_runtime.libcanberraWithoutGTK or true)
+    then libcanberra.override { gtk = null; }
+    else libcanberra;
+
+  libcello = callPackage ../development/libraries/libcello {};
+
+  libcdaudio = callPackage ../development/libraries/libcdaudio { };
+
+  libcddb = callPackage ../development/libraries/libcddb { };
+
+  libcdio = callPackage ../development/libraries/libcdio { };
+  libcdio082 = callPackage ../development/libraries/libcdio/0.82.nix { };
+
+  libcdr = callPackage ../development/libraries/libcdr { lcms = lcms2; };
+
+  libchamplain = callPackage ../development/libraries/libchamplain {
+    inherit (gnome) libsoup;
+  };
+
+  libchamplain_0_6 = callPackage ../development/libraries/libchamplain/0.6.nix {};
+
+  libchop = callPackage ../development/libraries/libchop { };
+
+  libcm = callPackage ../development/libraries/libcm { };
+
+  inherit (gnome3) libcroco;
+
+  libcangjie = callPackage ../development/libraries/libcangjie { };
+
+  libcredis = callPackage ../development/libraries/libcredis { };
+
+  libctemplate = callPackage ../development/libraries/libctemplate { };
+
+  libcue = callPackage ../development/libraries/libcue { };
+
+  libdaemon = callPackage ../development/libraries/libdaemon { };
+
+  libdbi = callPackage ../development/libraries/libdbi { };
+
+  libdbiDriversBase = callPackage ../development/libraries/libdbi-drivers {
+    mysql = null;
+    sqlite = null;
+  };
+
+  libdbiDrivers = libdbiDriversBase.override {
+    inherit sqlite mysql;
+  };
+
+  libdbusmenu_qt = callPackage ../development/libraries/libdbusmenu-qt { };
+
+  libdc1394 = callPackage ../development/libraries/libdc1394 { };
+
+  libdc1394avt = callPackage ../development/libraries/libdc1394avt { };
+
+  libdevil = callPackage ../development/libraries/libdevil { };
+
+  libdiscid = callPackage ../development/libraries/libdiscid { };
+
+  libdivsufsort = callPackage ../development/libraries/libdivsufsort { };
+
+  libdmtx = callPackage ../development/libraries/libdmtx { };
+
+  libdnet = callPackage ../development/libraries/libdnet { };
+
+  libdrm = callPackage ../development/libraries/libdrm {
+    inherit fetchurl stdenv pkgconfig;
+    inherit (xorg) libpthreadstubs;
+  };
+
+  libdv = callPackage ../development/libraries/libdv { };
+
+  libdvbpsi = callPackage ../development/libraries/libdvbpsi { };
+
+  libdwg = callPackage ../development/libraries/libdwg { };
+
+  libdvdcss = callPackage ../development/libraries/libdvdcss { };
+
+  libdvdnav = callPackage ../development/libraries/libdvdnav { };
+
+  libdvdread = callPackage ../development/libraries/libdvdread { };
+
+  libdwarf = callPackage ../development/libraries/libdwarf { };
+
+  libeatmydata = callPackage ../development/libraries/libeatmydata { };
+
+  libebml = callPackage ../development/libraries/libebml { };
+
+  libedit = callPackage ../development/libraries/libedit { };
+
+  libelf = callPackage ../development/libraries/libelf { };
+
+  libfm = callPackage ../development/libraries/libfm { };
+
+  libgadu = callPackage ../development/libraries/libgadu { };
+
+  libgdata = gnome3.libgdata;
+
+  libgig = callPackage ../development/libraries/libgig { };
+
+  libgnome_keyring = callPackage ../development/libraries/libgnome-keyring { };
+  libgnome_keyring3 = gnome3.libgnome_keyring;
+
+  libgnurl = callPackage ../development/libraries/libgnurl { };
+
+  libseccomp = callPackage ../development/libraries/libseccomp { };
+
+  libsecret = callPackage ../development/libraries/libsecret { };
+
+  libserialport = callPackage ../development/libraries/libserialport { };
+
+  libgtop = callPackage ../development/libraries/libgtop {};
+
+  liblo = callPackage ../development/libraries/liblo { };
+
+  liblrdf = librdf;
+
+  liblscp = callPackage ../development/libraries/liblscp { };
+
+  libe-book = callPackage ../development/libraries/libe-book {};
+
+  libev = builderDefsPackage ../development/libraries/libev { };
+
+  libevent14 = callPackage ../development/libraries/libevent/1.4.nix { };
+  libevent = callPackage ../development/libraries/libevent { };
+
+  libewf = callPackage ../development/libraries/libewf { };
+
+  libexif = callPackage ../development/libraries/libexif { };
+
+  libexosip = callPackage ../development/libraries/exosip {};
+
+  libexosip_3 = callPackage ../development/libraries/exosip/3.x.nix {
+    libosip = libosip_3;
+  };
+
+  libextractor = callPackage ../development/libraries/libextractor {
+    libmpeg2 = mpeg2dec;
+  };
+
+  libexttextcat = callPackage ../development/libraries/libexttextcat {};
+
+  libf2c = callPackage ../development/libraries/libf2c {};
+
+  libfixposix = callPackage ../development/libraries/libfixposix {};
+
+  libffcall = builderDefsPackage (import ../development/libraries/libffcall) {
+    inherit fetchcvs;
+  };
+
+  libffi = callPackage ../development/libraries/libffi { };
+
+  libftdi = callPackage ../development/libraries/libftdi { };
+
+  libftdi1 = callPackage ../development/libraries/libftdi/1.x.nix { };
+
+  libgcrypt = callPackage ../development/libraries/libgcrypt { };
+
+  libgcrypt_1_6 = lowPrio (callPackage ../development/libraries/libgcrypt/1.6.nix { });
+
+  libgdiplus = callPackage ../development/libraries/libgdiplus { };
+
+  libgksu = callPackage ../development/libraries/libgksu { };
+
+  libgpgerror = callPackage ../development/libraries/libgpg-error { };
+
+  libgphoto2 = callPackage ../development/libraries/libgphoto2 { };
+
+  libgphoto2_4 = callPackage ../development/libraries/libgphoto2/2.4.nix { };
+
+  libgpod = callPackage ../development/libraries/libgpod {
+    inherit (pkgs.pythonPackages) mutagen;
+  };
+
+  libharu = callPackage ../development/libraries/libharu { };
+
+  libical = callPackage ../development/libraries/libical { };
+
+  libicns = callPackage ../development/libraries/libicns { };
+
+  libimobiledevice = callPackage ../development/libraries/libimobiledevice { };
+
+  libiodbc = callPackage ../development/libraries/libiodbc {
+    useGTK = config.libiodbc.gtk or false;
+  };
+
+  libivykis = callPackage ../development/libraries/libivykis { };
+
+  liblastfmSF = callPackage ../development/libraries/liblastfmSF { };
+
+  liblastfm = callPackage ../development/libraries/liblastfm { };
+
+  liblqr1 = callPackage ../development/libraries/liblqr-1 { };
+
+  liblockfile = callPackage ../development/libraries/liblockfile { };
+
+  liblogging = callPackage ../development/libraries/liblogging { };
+
+  libmcrypt = callPackage ../development/libraries/libmcrypt {};
+
+  libmhash = callPackage ../development/libraries/libmhash {};
+
+  libmodbus = callPackage ../development/libraries/libmodbus {};
+
+  libmtp = callPackage ../development/libraries/libmtp { };
+
+  libmsgpack = callPackage ../development/libraries/libmsgpack { };
+
+  libnatspec = callPackage ../development/libraries/libnatspec { };
+
+  libnfc = callPackage ../development/libraries/libnfc { };
+
+  libnfsidmap = callPackage ../development/libraries/libnfsidmap { };
+
+  libnice = callPackage ../development/libraries/libnice { };
+
+  liboping = callPackage ../development/libraries/liboping { };
+
+  libplist = callPackage ../development/libraries/libplist { };
+
+  libQGLViewer = callPackage ../development/libraries/libqglviewer { };
+
+  libre = callPackage ../development/libraries/libre {};
+  librem = callPackage ../development/libraries/librem {};
+
+  libresample = callPackage ../development/libraries/libresample {};
+
+  librevenge = callPackage ../development/libraries/librevenge {};
+
+  librevisa = callPackage ../development/libraries/librevisa { };
+
+  libsamplerate = callPackage ../development/libraries/libsamplerate { };
+
+  libspectre = callPackage ../development/libraries/libspectre { };
+
+  libgsf = callPackage ../development/libraries/libgsf { };
+
+  libiconv = callPackage ../development/libraries/libiconv { };
+
+  libiconvOrEmpty = if libiconvOrNull == null then [] else [libiconv];
+
+  libiconvOrNull =
+    if gcc.libc or null != null || stdenv.isGlibc
+    then null
+    else libiconv;
+
+  # The logic behind this attribute is broken: libiconvOrNull==null does
+  # NOT imply libiconv=glibc! On Darwin, for example, we have a native
+  # libiconv library which is not glibc.
+  libiconvOrLibc = if libiconvOrNull == null then gcc.libc else libiconv;
+
+  # On non-GNU systems we need GNU Gettext for libintl.
+  libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux) gettext;
+
+  libid3tag = callPackage ../development/libraries/libid3tag { };
+
+  libidn = callPackage ../development/libraries/libidn { };
+
+  libiec61883 = callPackage ../development/libraries/libiec61883 { };
+
+  libinfinity = callPackage ../development/libraries/libinfinity {
+    inherit (gnome) gtkdoc;
+  };
+
+  libiptcdata = callPackage ../development/libraries/libiptcdata { };
+
+  libjpeg_original = callPackage ../development/libraries/libjpeg { };
+  libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo { };
+  libjpeg = if (stdenv.isLinux) then libjpeg_turbo else libjpeg_original; # some problems, both on FreeBSD and Darwin
+
+  libjpeg62 = callPackage ../development/libraries/libjpeg/62.nix {
+    libtool = libtool_1_5;
+  };
+
+  libjson_rpc_cpp = callPackage ../development/libraries/libjson-rpc-cpp { };
+
+  libkate = callPackage ../development/libraries/libkate { };
+
+  libksba = callPackage ../development/libraries/libksba { };
+
+  libmad = callPackage ../development/libraries/libmad { };
+
+  libmatchbox = callPackage ../development/libraries/libmatchbox { };
+
+  libmatthew_java = callPackage ../development/libraries/java/libmatthew-java { };
+
+  libmatroska = callPackage ../development/libraries/libmatroska { };
+
+  libmcs = callPackage ../development/libraries/libmcs { };
+
+  libmemcached = callPackage ../development/libraries/libmemcached { };
+
+  libmicrohttpd = callPackage ../development/libraries/libmicrohttpd { };
+
+  libmikmod = callPackage ../development/libraries/libmikmod {
+    # resolve the "stray '@' in program" errors
+    stdenv = if stdenv.isDarwin
+      then overrideGCC stdenv gccApple
+      else stdenv;
+  };
+
+  libmilter = callPackage ../development/libraries/libmilter { };
+
+  libmkv = callPackage ../development/libraries/libmkv { };
+
+  libmms = callPackage ../development/libraries/libmms { };
+
+  libmowgli = callPackage ../development/libraries/libmowgli { };
+
+  libmng = callPackage ../development/libraries/libmng { };
+
+  libmnl = callPackage ../development/libraries/libmnl { };
+
+  libmodplug = callPackage ../development/libraries/libmodplug {};
+
+  libmpcdec = callPackage ../development/libraries/libmpcdec { };
+
+  libmp3splt = callPackage ../development/libraries/libmp3splt { };
+
+  libmrss = callPackage ../development/libraries/libmrss { };
+
+  libmsn = callPackage ../development/libraries/libmsn { };
+
+  libmspack = callPackage ../development/libraries/libmspack { };
+
+  libmusclecard = callPackage ../development/libraries/libmusclecard { };
+
+  libmusicbrainz2 = callPackage ../development/libraries/libmusicbrainz/2.x.nix { };
+
+  libmusicbrainz3 = callPackage ../development/libraries/libmusicbrainz { };
+
+  libmusicbrainz5 = callPackage ../development/libraries/libmusicbrainz/5.x.nix { };
+
+  libmusicbrainz = libmusicbrainz3;
+
+  libmwaw = callPackage ../development/libraries/libmwaw { };
+
+  libmx = callPackage ../development/libraries/libmx { };
+
+  libnet = callPackage ../development/libraries/libnet { };
+
+  libnetfilter_conntrack = callPackage ../development/libraries/libnetfilter_conntrack { };
+
+  libnetfilter_queue = callPackage ../development/libraries/libnetfilter_queue { };
+
+  libnfnetlink = callPackage ../development/libraries/libnfnetlink { };
+
+  libnftnl = callPackage ../development/libraries/libnftnl { };
+
+  libnih = callPackage ../development/libraries/libnih { };
+
+  libnova = callPackage ../development/libraries/libnova { };
+
+  libnxml = callPackage ../development/libraries/libnxml { };
+
+  libodfgen = callPackage ../development/libraries/libodfgen { };
+
+  libofa = callPackage ../development/libraries/libofa { };
+
+  libofx = callPackage ../development/libraries/libofx { };
+
+  libogg = callPackage ../development/libraries/libogg { };
+
+  liboggz = callPackage ../development/libraries/liboggz { };
+
+  liboil = callPackage ../development/libraries/liboil { };
+
+  liboop = callPackage ../development/libraries/liboop { };
+
+  libopus = callPackage ../development/libraries/libopus { };
+
+  libosinfo = callPackage ../development/libraries/libosinfo {};
+
+  libosip = callPackage ../development/libraries/osip {};
+
+  libosip_3 = callPackage ../development/libraries/osip/3.nix {};
+
+  libotr = callPackage ../development/libraries/libotr {
+    libgcrypt = libgcrypt_1_6;
+  };
+
+  libotr_3_2 = callPackage ../development/libraries/libotr/3.2.nix { };
+
+  libp11 = callPackage ../development/libraries/libp11 { };
+
+  libpar2 = callPackage ../development/libraries/libpar2 { };
+
+  libpcap = callPackage ../development/libraries/libpcap { };
+
+  libpipeline = callPackage ../development/libraries/libpipeline { };
+
+  libpng = callPackage ../development/libraries/libpng { };
+  libpng_apng = libpng.override { apngSupport = true; };
+  libpng12 = callPackage ../development/libraries/libpng/12.nix { };
+  libpng15 = callPackage ../development/libraries/libpng/15.nix { };
+
+  libpaper = callPackage ../development/libraries/libpaper { };
+
+  libproxy = callPackage ../development/libraries/libproxy {
+    stdenv = if stdenv.isDarwin
+      then overrideGCC stdenv gcc
+      else stdenv;
+  };
+
+  libpseudo = callPackage ../development/libraries/libpseudo { };
+
+  libpwquality = callPackage ../development/libraries/libpwquality { };
+
+  libqalculate = callPackage ../development/libraries/libqalculate { };
+
+  librsvg = callPackage ../development/libraries/librsvg {
+    gtk2 = null; gtk3 = null; # neither gtk version by default
+  };
+
+  librsync = callPackage ../development/libraries/librsync { };
+
+  libsearpc = callPackage ../development/libraries/libsearpc { };
+
+  libsigcxx = callPackage ../development/libraries/libsigcxx { };
+
+  libsigcxx12 = callPackage ../development/libraries/libsigcxx/1.2.nix { };
+
+  libsigsegv = callPackage ../development/libraries/libsigsegv { };
+
+  # To bootstrap SBCL, I need CLisp 2.44.1; it needs libsigsegv 2.5
+  libsigsegv_25 = callPackage ../development/libraries/libsigsegv/2.5.nix { };
+
+  libsndfile = callPackage ../development/libraries/libsndfile { };
+
+  libsodium = callPackage ../development/libraries/libsodium { };
+
+  libsoup = callPackage ../development/libraries/libsoup { };
+
+  libssh = callPackage ../development/libraries/libssh { };
+
+  libssh2 = callPackage ../development/libraries/libssh2 { };
+
+  libstartup_notification = callPackage ../development/libraries/startup-notification { };
+
+  libspatialindex = callPackage ../development/libraries/libspatialindex { };
+
+  libspatialite = callPackage ../development/libraries/libspatialite { };
+
+  libtar = callPackage ../development/libraries/libtar { };
+
+  libtasn1 = callPackage ../development/libraries/libtasn1 { };
+
+  libtheora = callPackage ../development/libraries/libtheora { };
+
+  libtiff = callPackage ../development/libraries/libtiff { };
+
+  libtiger = callPackage ../development/libraries/libtiger { };
+
+  libtommath = callPackage ../development/libraries/libtommath { };
+
+  libtorrentRasterbar = callPackage ../development/libraries/libtorrent-rasterbar {
+    # fix "unrecognized option -arch" error
+    stdenv = if stdenv.isDarwin
+      then clangStdenv
+      else stdenv;
+  };
+
+  libtoxcore = callPackage ../development/libraries/libtoxcore { };
+
+  libtsm = callPackage ../development/libraries/libtsm { };
+
+  libtunepimp = callPackage ../development/libraries/libtunepimp { };
+
+  libtxc_dxtn = callPackage ../development/libraries/libtxc_dxtn { };
+
+  libtxc_dxtn_s2tc = callPackage ../development/libraries/libtxc_dxtn_s2tc { };
+
+  libgeotiff = callPackage ../development/libraries/libgeotiff { };
+
+  libunistring = callPackage ../development/libraries/libunistring { };
+
+  libupnp = callPackage ../development/libraries/pupnp { };
+
+  giflib = callPackage ../development/libraries/giflib { };
+  giflib_4_1 = callPackage ../development/libraries/giflib/4.1.nix { };
+
+  libungif = callPackage ../development/libraries/giflib/libungif.nix { };
+
+  libunibreak = callPackage ../development/libraries/libunibreak { };
+
+  libunique = callPackage ../development/libraries/libunique/default.nix { };
+
+  liburcu = callPackage ../development/libraries/liburcu { };
+
+  libusb = callPackage ../development/libraries/libusb {};
+
+  libusb1 = callPackage ../development/libraries/libusb1 {
+    stdenv = if stdenv.isDarwin
+      then clangStdenv
+      else stdenv;
+  };
+
+  libunwind = callPackage ../development/libraries/libunwind { };
+
+  libuvVersions = callPackage ../development/libraries/libuv { };
+
+  libv4l = lowPrio (v4l_utils.override {
+    withQt4 = false;
+  });
+
+  libva = callPackage ../development/libraries/libva { };
+
+  libvdpau = callPackage ../development/libraries/libvdpau { };
+
+  libvirt = callPackage ../development/libraries/libvirt { };
+
+  libvirt-glib = callPackage ../development/libraries/libvirt-glib { };
+
+  libvisio = callPackage ../development/libraries/libvisio { };
+
+  libvisual = callPackage ../development/libraries/libvisual { };
+
+  libvncserver = callPackage ../development/libraries/libvncserver {};
+
+  libviper = callPackage ../development/libraries/libviper { };
+
+  libvpx = callPackage ../development/libraries/libvpx { };
+
+  libvterm = callPackage ../development/libraries/libvterm { };
+
+  libvorbis = callPackage ../development/libraries/libvorbis { };
+
+  libwebp = callPackage ../development/libraries/libwebp { };
+
+  libwmf = callPackage ../development/libraries/libwmf { };
+
+  libwnck = libwnck2;
+  libwnck2 = callPackage ../development/libraries/libwnck { };
+  libwnck3 = callPackage ../development/libraries/libwnck/3.x.nix { };
+
+  libwpd = callPackage ../development/libraries/libwpd { };
+
+  libwpd_08 = callPackage ../development/libraries/libwpd/0.8.nix { };
+
+  libwpg = callPackage ../development/libraries/libwpg { };
+
+  libx86 = builderDefsPackage ../development/libraries/libx86 {};
+
+  libxdg_basedir = callPackage ../development/libraries/libxdg-basedir { };
+
+  libxkbcommon = callPackage ../development/libraries/libxkbcommon { };
+
+  libxklavier = callPackage ../development/libraries/libxklavier { };
+
+  libxmi = callPackage ../development/libraries/libxmi { };
+
+  libxml2 = callPackage ../development/libraries/libxml2 {
+    pythonSupport = false;
+  };
+
+  libxml2Python = lowPrio (libxml2.override {
+    pythonSupport = true;
+  });
+
+  libxmlxx = callPackage ../development/libraries/libxmlxx { };
+
+  libxmp = callPackage ../development/libraries/libxmp { };
+
+  libxslt = callPackage ../development/libraries/libxslt { };
+
+  libixp_for_wmii = lowPrio (import ../development/libraries/libixp_for_wmii {
+    inherit fetchurl stdenv;
+  });
+
+  libyaml = callPackage ../development/libraries/libyaml { };
+
+  libyamlcpp = callPackage ../development/libraries/libyaml-cpp { };
+  libyamlcpp03 = callPackage ../development/libraries/libyaml-cpp/0.3.x.nix { };
+
+  libyubikey = callPackage ../development/libraries/libyubikey {};
+
+  libzip = callPackage ../development/libraries/libzip { };
+
+  libzdb = callPackage ../development/libraries/libzdb { };
+
+  libzrtpcpp = callPackage ../development/libraries/libzrtpcpp { };
+  libzrtpcpp_1_6 = callPackage ../development/libraries/libzrtpcpp/1.6.nix {
+    ccrtp = ccrtp_1_8;
+  };
+
+  libwacom = callPackage ../development/libraries/libwacom { };
+
+  lightning = callPackage ../development/libraries/lightning { };
+
+  lirc = callPackage ../development/libraries/lirc { };
+
+  liquidfun = callPackage ../development/libraries/liquidfun { };
+
+  liquidwar = builderDefsPackage ../games/liquidwar {
+    inherit (xlibs) xproto libX11 libXrender;
+    inherit gmp mesa libjpeg
+      expat gettext perl
+      SDL SDL_image SDL_mixer SDL_ttf
+      curl sqlite
+      libogg libvorbis libcaca csound cunit
+      ;
+    guile = guile_1_8;
+    libpng = libpng15; # 0.0.13 needs libpng 1.2--1.5
+  };
+
+  log4cpp = callPackage ../development/libraries/log4cpp { };
+
+  log4cxx = callPackage ../development/libraries/log4cxx { };
+
+  log4cplus = callPackage ../development/libraries/log4cplus { };
+
+  loudmouth = callPackage ../development/libraries/loudmouth { };
+
+  lzo = callPackage ../development/libraries/lzo { };
+
+  mdds_0_7_1 = callPackage ../development/libraries/mdds/0.7.1.nix { };
+  mdds = callPackage ../development/libraries/mdds { };
+
+  # failed to build
+  mediastreamer = callPackage ../development/libraries/mediastreamer { };
+
+  menu-cache = callPackage ../development/libraries/menu-cache { };
+
+  mesaSupported = lib.elem system lib.platforms.mesaPlatforms;
+
+  mesaDarwinOr = alternative: if stdenv.isDarwin
+    then callPackage ../development/libraries/mesa-darwin { }
+    else alternative;
+  mesa_noglu = mesaDarwinOr (callPackage ../development/libraries/mesa {
+    # makes it slower, but during runtime we link against just mesa_drivers
+    # through /run/opengl-driver*, which is overriden according to config.grsecurity
+    grsecEnabled = true;
+  });
+  mesa_glu =  mesaDarwinOr (callPackage ../development/libraries/mesa-glu { });
+  mesa_drivers = mesaDarwinOr (
+    let mo = mesa_noglu.override {
+      grsecEnabled = config.grsecurity or false;
+    };
+    in mo.drivers
+  );
+  mesa = mesaDarwinOr (buildEnv {
+    name = "mesa-${mesa_noglu.version}";
+    paths = [ mesa_noglu mesa_glu ];
+  });
+
+  metaEnvironment = recurseIntoAttrs (let callPackage = newScope pkgs.metaEnvironment; in rec {
+    sdfLibrary    = callPackage ../development/libraries/sdf-library { aterm = aterm28; };
+    toolbuslib    = callPackage ../development/libraries/toolbuslib { aterm = aterm28; inherit (windows) w32api; };
+    cLibrary      = callPackage ../development/libraries/c-library { aterm = aterm28; };
+    errorSupport  = callPackage ../development/libraries/error-support { aterm = aterm28; };
+    ptSupport     = callPackage ../development/libraries/pt-support { aterm = aterm28; };
+    ptableSupport = callPackage ../development/libraries/ptable-support { aterm = aterm28; };
+    configSupport = callPackage ../development/libraries/config-support { aterm = aterm28; };
+    asfSupport    = callPackage ../development/libraries/asf-support { aterm = aterm28; };
+    tideSupport   = callPackage ../development/libraries/tide-support { aterm = aterm28; };
+    rstoreSupport = callPackage ../development/libraries/rstore-support { aterm = aterm28; };
+    sdfSupport    = callPackage ../development/libraries/sdf-support { aterm = aterm28; };
+    sglr          = callPackage ../development/libraries/sglr { aterm = aterm28; };
+    ascSupport    = callPackage ../development/libraries/asc-support { aterm = aterm28; };
+    pgen          = callPackage ../development/libraries/pgen { aterm = aterm28; };
+  });
+
+  ming = callPackage ../development/libraries/ming { };
+
+  minizip = callPackage ../development/libraries/minizip { };
+
+  minmay = callPackage ../development/libraries/minmay { };
+
+  miro = callPackage ../applications/video/miro {
+    inherit (pythonPackages) pywebkitgtk pysqlite pycurl mutagen;
+  };
+
+  mkvtoolnix = callPackage ../applications/video/mkvtoolnix { };
+
+  mlt-qt4 = callPackage ../development/libraries/mlt {
+    qt = qt4;
+    SDL = SDL_pulseaudio;
+  };
+
+  mlt-qt5 = callPackage ../development/libraries/mlt {
+    qt = qt5;
+    SDL = SDL_pulseaudio;
+  };
+
+  movit = callPackage ../development/libraries/movit { };
+
+  mps = callPackage ../development/libraries/mps { };
+
+  libmpeg2 = callPackage ../development/libraries/libmpeg2 { };
+
+  mpeg2dec = libmpeg2;
+
+  msilbc = callPackage ../development/libraries/msilbc { };
+
+  mp4v2 = callPackage ../development/libraries/mp4v2 { };
+
+  mpc = callPackage ../development/libraries/mpc { };
+
+  mpich2 = callPackage ../development/libraries/mpich2 { };
+
+  mtdev = callPackage ../development/libraries/mtdev { };
+
+  mtpfs = callPackage ../tools/filesystems/mtpfs { };
+
+  mu = callPackage ../tools/networking/mu {
+    texinfo = texinfo4;
+  };
+
+  muparser = callPackage ../development/libraries/muparser { };
+
+  mygpoclient = callPackage ../development/python-modules/mygpoclient { };
+
+  mygui = callPackage ../development/libraries/mygui {};
+
+  myguiSvn = callPackage ../development/libraries/mygui/svn.nix {};
+
+  mysocketw = callPackage ../development/libraries/mysocketw { };
+
+  mythes = callPackage ../development/libraries/mythes { };
+
+  nanomsg = callPackage ../development/libraries/nanomsg { };
+
+  ncurses = callPackage ../development/libraries/ncurses {
+    unicode = system != "i686-cygwin";
+  };
+
+  neon = callPackage ../development/libraries/neon {
+    compressionSupport = true;
+    sslSupport = true;
+  };
+
+  nethack = builderDefsPackage (import ../games/nethack) {
+    inherit ncurses flex bison;
+  };
+
+  nettle = callPackage ../development/libraries/nettle { };
+
+  newt = callPackage ../development/libraries/newt { };
+
+  nix-plugins = callPackage ../development/libraries/nix-plugins {
+    nix = pkgs.nixUnstable;
+  };
+
+  nspr = callPackage ../development/libraries/nspr { };
+
+  nss = lowPrio (callPackage ../development/libraries/nss { });
+
+  nssTools = callPackage ../development/libraries/nss {
+    includeTools = true;
+  };
+
+  ntrack = callPackage ../development/libraries/ntrack { };
+
+  nvidia-texture-tools = callPackage ../development/libraries/nvidia-texture-tools { };
+
+  ode = builderDefsPackage (import ../development/libraries/ode) { };
+
+  ogre = callPackage ../development/libraries/ogre {};
+
+  ogrepaged = callPackage ../development/libraries/ogrepaged { };
+
+  oniguruma = callPackage ../development/libraries/oniguruma { };
+
+  openal = callPackage ../development/libraries/openal { };
+
+  # added because I hope that it has been easier to compile on x86 (for blender)
+  openalSoft = callPackage ../development/libraries/openal-soft { };
+
+  openbabel = callPackage ../development/libraries/openbabel { };
+
+  opencascade = callPackage ../development/libraries/opencascade { };
+
+  opencascade_6_5 = callPackage ../development/libraries/opencascade/6.5.nix {
+    automake = automake111x;
+    ftgl = ftgl212;
+  };
+
+  opencascade_oce = callPackage ../development/libraries/opencascade/oce.nix { };
+
+  opencsg = callPackage ../development/libraries/opencsg { };
+
+  openct = callPackage ../development/libraries/openct { };
+
+  opencv = callPackage ../development/libraries/opencv { };
+
+  opencv_2_1 = callPackage ../development/libraries/opencv/2.1.nix {
+    libpng = libpng12;
+  };
+
+  # this ctl version is needed by openexr_viewers
+  openexr_ctl = callPackage ../development/libraries/openexr_ctl { };
+
+  openexr = callPackage ../development/libraries/openexr { };
+
+  openldap = callPackage ../development/libraries/openldap {
+    stdenv = if stdenv.isDarwin
+      then clangStdenv
+      else stdenv;
+  };
+
+  openlierox = callPackage ../games/openlierox { };
+
+  libopensc_dnie = callPackage ../development/libraries/libopensc-dnie { };
+
+  opencolorio = callPackage ../development/libraries/opencolorio { };
+
+  ois = callPackage ../development/libraries/ois {};
+
+  opal = callPackage ../development/libraries/opal {};
+
+  openjpeg = callPackage ../development/libraries/openjpeg { lcms = lcms2; };
+
+  openscenegraph = callPackage ../development/libraries/openscenegraph {
+    giflib = giflib_4_1;
+    ffmpeg = ffmpeg_0_10;
+  };
+
+  openspades = callPackage ../games/openspades {};
+
+  libressl = callPackage ../development/libraries/libressl { };
+
+  boringssl = callPackage ../development/libraries/boringssl { };
+
+  openssl = callPackage ../development/libraries/openssl {
+    fetchurl = fetchurlBoot;
+    cryptodevHeaders = linuxPackages.cryptodev.override {
+      fetchurl = fetchurlBoot;
+      onlyHeaders = true;
+    };
+  };
+
+  ortp = callPackage ../development/libraries/ortp {
+    srtp = srtp_linphone;
+  };
+
+  p11_kit = callPackage ../development/libraries/p11-kit { };
+
+  paperkey = callPackage ../tools/security/paperkey { };
+
+  pangoxsl = callPackage ../development/libraries/pangoxsl { };
+
+  pcl = callPackage ../development/libraries/pcl {
+    vtk = vtkWithQt4;
+  };
+
+  pcre = callPackage ../development/libraries/pcre {
+    unicodeSupport = config.pcre.unicode or true;
+  };
+
+  pdf2xml = callPackage ../development/libraries/pdf2xml {} ;
+
+  phonon = callPackage ../development/libraries/phonon { };
+
+  phonon_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer { };
+
+  phonon_backend_vlc = callPackage ../development/libraries/phonon-backend-vlc { };
+
+  physfs = callPackage ../development/libraries/physfs { };
+
+  pkcs11helper = callPackage ../development/libraries/pkcs11helper { };
+
+  plib = callPackage ../development/libraries/plib { };
+
+  pocketsphinx = callPackage ../development/libraries/pocketsphinx { };
+
+  podofo = callPackage ../development/libraries/podofo { };
+
+  polkit = callPackage ../development/libraries/polkit {
+    spidermonkey = spidermonkey_185;
+  };
+
+  polkit_qt_1 = callPackage ../development/libraries/polkit-qt-1 { };
+
+  policykit = callPackage ../development/libraries/policykit { };
+
+  poppler = callPackage ../development/libraries/poppler { lcms = lcms2; };
+  popplerQt4 = poppler.poppler_qt4;
+
+  popt = callPackage ../development/libraries/popt { };
+
+  portaudio = callPackage ../development/libraries/portaudio {
+    # resolves a variety of compile-time errors
+    stdenv = if stdenv.isDarwin
+      then clangStdenv
+      else stdenv;
+  };
+
+  portaudioSVN = callPackage ../development/libraries/portaudio/svn-head.nix { };
+
+  portmidi = callPackage ../development/libraries/portmidi {};
+
+  prison = callPackage ../development/libraries/prison { };
+
+  proj = callPackage ../development/libraries/proj { };
+
+  postgis = callPackage ../development/libraries/postgis { };
+
+  protobuf = callPackage ../development/libraries/protobuf { };
+
+  protobufc = callPackage ../development/libraries/protobufc { };
+
+  pth = callPackage ../development/libraries/pth { };
+
+  ptlib = callPackage ../development/libraries/ptlib {};
+
+  re2 = callPackage ../development/libraries/re2 { };
+
+  qca2 = callPackage ../development/libraries/qca2 {};
+
+  qca2_ossl = callPackage ../development/libraries/qca2/ossl.nix {};
+
+  qimageblitz = callPackage ../development/libraries/qimageblitz {};
+
+  qjson = callPackage ../development/libraries/qjson { };
+
+  qoauth = callPackage ../development/libraries/qoauth { };
+
+  qt3 = callPackage ../development/libraries/qt-3 {
+    openglSupport = mesaSupported;
+    libpng = libpng12;
+  };
+
+  qt4 = pkgs.kde4.qt4;
+
+  qt48 = callPackage ../development/libraries/qt-4.x/4.8 {
+    # GNOME dependencies are not used unless gtkStyle == true
+    mesa = mesa_noglu;
+    inherit (pkgs.gnome) libgnomeui GConf gnome_vfs;
+    cups = if stdenv.isLinux then cups else null;
+
+    # resolve unrecognised flag '-fconstant-cfstrings' errors
+    stdenv = if stdenv.isDarwin
+      then clangStdenv
+      else stdenv;
+  };
+
+  qt48Full = qt48.override {
+    docs = true;
+    demos = true;
+    examples = true;
+    developerBuild = true;
+  };
+
+  qt4SDK = qtcreator.override {
+    sdkBuild = true;
+    qtLib = qt48Full;
+  };
+
+  qt53Full = qt53.override {
+    buildDocs = true;
+    buildExamples = true;
+    buildTests = true;
+    developerBuild = true;
+  };
+
+  qt53 = callPackage ../development/libraries/qt-5/qt-5.3.nix {
+    mesa = mesa_noglu;
+    cups = if stdenv.isLinux then cups else null;
+    # GNOME dependencies are not used unless gtkStyle == true
+    inherit (gnome) libgnomeui GConf gnome_vfs;
+    bison = bison2; # error: too few arguments to function 'int yylex(...
+  };
+
+  qt5 = callPackage ../development/libraries/qt-5 {
+    mesa = mesa_noglu;
+    cups = if stdenv.isLinux then cups else null;
+    # GNOME dependencies are not used unless gtkStyle == true
+    inherit (gnome) libgnomeui GConf gnome_vfs;
+    bison = bison2; # error: too few arguments to function 'int yylex(...
+  };
+
+  qt5Full = qt5.override {
+    buildDocs = true;
+    buildExamples = true;
+    buildTests = true;
+    developerBuild = true;
+  };
+
+  qt5SDK = qtcreator.override {
+    sdkBuild = true;
+    qtLib = qt5Full;
+  };
+
+  qtcreator = callPackage ../development/qtcreator {
+    qtLib = qt48.override { developerBuild = true; };
+  };
+
+  qtscriptgenerator = callPackage ../development/libraries/qtscriptgenerator { };
+
+  quesoglc = callPackage ../development/libraries/quesoglc { };
+
+  qwt = callPackage ../development/libraries/qwt {};
+
+  qwt6 = callPackage ../development/libraries/qwt/6.nix { };
+
+  rabbitmq-c = callPackage ../development/libraries/rabbitmq-c {};
+
+  rabbitmq-java-client = callPackage ../development/libraries/rabbitmq-java-client {};
+
+  raul = callPackage ../development/libraries/audio/raul { };
+
+  readline = readline6; # 6.2 works, 6.3 breaks python, parted
+
+  readline4 = callPackage ../development/libraries/readline/readline4.nix { };
+
+  readline5 = callPackage ../development/libraries/readline/readline5.nix { };
+
+  readline6 = callPackage ../development/libraries/readline/readline6.nix { };
+
+  readline63 = callPackage ../development/libraries/readline/readline6.3.nix { };
+
+  librdf_raptor = callPackage ../development/libraries/librdf/raptor.nix { };
+
+  librdf_raptor2 = callPackage ../development/libraries/librdf/raptor2.nix { };
+
+  librdf_rasqal = callPackage ../development/libraries/librdf/rasqal.nix { };
+
+  librdf_redland = callPackage ../development/libraries/librdf/redland.nix { };
+
+  librdf = callPackage ../development/libraries/librdf { };
+
+  lilv = callPackage ../development/libraries/audio/lilv { };
+
+  lv2 = callPackage ../development/libraries/audio/lv2 { };
+
+  lvtk = callPackage ../development/libraries/audio/lvtk { };
+
+  qrupdate = callPackage ../development/libraries/qrupdate { };
+
+  redland = pkgs.librdf_redland;
+
+  rhino = callPackage ../development/libraries/java/rhino {
+    javac = gcj;
+    jvm = gcj;
+  };
+
+  rlog = callPackage ../development/libraries/rlog { };
+
+  rubberband = callPackage ../development/libraries/rubberband {
+    fftw = fftwSinglePrec;
+    inherit (vamp) vampSDK;
+  };
+
+  sbc = callPackage ../development/libraries/sbc { };
+
+  schroedinger = callPackage ../development/libraries/schroedinger { };
+
+  SDL = callPackage ../development/libraries/SDL {
+    openglSupport = mesaSupported;
+    alsaSupport = (!stdenv.isDarwin);
+    x11Support = true;
+    pulseaudioSupport = stdenv.isDarwin; # better go through ALSA
+
+    # resolve the unrecognized -fpascal-strings option error
+    stdenv = if stdenv.isDarwin
+      then clangStdenv
+      else stdenv;
+  };
+
+  # Fixes major problems with choppy sound in MLT / Kdenlive / Shotcut
+  SDL_pulseaudio = SDL.override { pulseaudioSupport = true; };
+
+  SDL_gfx = callPackage ../development/libraries/SDL_gfx { };
+
+  SDL_image = callPackage ../development/libraries/SDL_image {
+    # provide an Objective-C compiler
+    stdenv = if stdenv.isDarwin
+      then clangStdenv
+      else stdenv;
+  };
+
+  SDL_mixer = callPackage ../development/libraries/SDL_mixer { };
+
+  SDL_net = callPackage ../development/libraries/SDL_net { };
+
+  SDL_sound = callPackage ../development/libraries/SDL_sound { };
+
+  SDL_ttf = callPackage ../development/libraries/SDL_ttf { };
+
+  SDL2 = callPackage ../development/libraries/SDL2 {
+    openglSupport = mesaSupported;
+    alsaSupport = true;
+    x11Support = true;
+    pulseaudioSupport = false; # better go through ALSA
+  };
+
+  SDL2_image = callPackage ../development/libraries/SDL2_image { };
+
+  SDL2_mixer = callPackage ../development/libraries/SDL2_mixer { };
+
+  SDL2_net = callPackage ../development/libraries/SDL2_net { };
+
+  SDL2_gfx = callPackage ../development/libraries/SDL2_gfx { };
+
+  serd = callPackage ../development/libraries/serd {};
+
+  serf = callPackage ../development/libraries/serf {};
+
+  silgraphite = callPackage ../development/libraries/silgraphite {};
+  graphite2 = callPackage ../development/libraries/silgraphite/graphite2.nix {};
+
+  simgear = callPackage ../development/libraries/simgear { };
+
+  sfml_git = callPackage ../development/libraries/sfml { };
+
+  skalibs = callPackage ../development/libraries/skalibs { };
+
+  slang = callPackage ../development/libraries/slang { };
+
+  slibGuile = callPackage ../development/libraries/slib {
+    scheme = guile_1_8;
+    texinfo = texinfo4; # otherwise erros: must be after `@defun' to use `@defunx'
+  };
+
+  smpeg = callPackage ../development/libraries/smpeg { };
+
+  snack = callPackage ../development/libraries/snack {
+        # optional
+  };
+
+  snappy = callPackage ../development/libraries/snappy { };
+
+  sodium = callPackage ../development/libraries/sodium {};
+
+  sofia_sip = callPackage ../development/libraries/sofia-sip { };
+
+  soprano = callPackage ../development/libraries/soprano { };
+
+  soqt = callPackage ../development/libraries/soqt { };
+
+  sord = callPackage ../development/libraries/sord {};
+
+  spandsp = callPackage ../development/libraries/spandsp {};
+
+  speechd = callPackage ../development/libraries/speechd { };
+
+  speech_tools = callPackage ../development/libraries/speech-tools {};
+
+  speex = callPackage ../development/libraries/speex { };
+
+  sphinxbase = callPackage ../development/libraries/sphinxbase { };
+
+  spice = callPackage ../development/libraries/spice {
+    celt = celt_0_5_1;
+    inherit (xlibs) libXrandr libXfixes libXext libXrender libXinerama;
+    inherit (pythonPackages) pyparsing;
+  };
+
+  spice_gtk = callPackage ../development/libraries/spice-gtk { };
+
+  spice_protocol = callPackage ../development/libraries/spice-protocol { };
+
+  sratom = callPackage ../development/libraries/audio/sratom { };
+
+  srtp = callPackage ../development/libraries/srtp {};
+
+  srtp_linphone = callPackage ../development/libraries/srtp/linphone.nix { };
+
+  sqlite = lowPrio (callPackage ../development/libraries/sqlite {
+    readline = null;
+    ncurses = null;
+  });
+
+  sqliteInteractive = appendToName "interactive" (sqlite.override {
+    inherit readline ncurses;
+  });
+
+  sqlcipher = lowPrio (callPackage ../development/libraries/sqlcipher {
+    readline = null;
+    ncurses = null;
+  });
+
+  stfl = callPackage ../development/libraries/stfl {
+    stdenv = if stdenv.isDarwin
+      then overrideGCC stdenv gccApple
+      else stdenv;
+  };
+
+  stlink = callPackage ../development/tools/misc/stlink { };
+
+  steghide = callPackage ../tools/security/steghide {};
+
+  stepmania = callPackage ../games/stepmania {};
+
+  stlport = callPackage ../development/libraries/stlport { };
+
+  strigi = callPackage ../development/libraries/strigi { clucene_core = clucene_core_2; };
+
+  subtitleeditor = callPackage ../applications/video/subtitleeditor { };
+
+  suil = callPackage ../development/libraries/audio/suil { };
+
+  suitesparse = callPackage ../development/libraries/suitesparse { };
+
+  sutils = callPackage ../tools/misc/sutils { };
+
+  sword = callPackage ../development/libraries/sword { };
+
+  szip = callPackage ../development/libraries/szip { };
+
+  t1lib = callPackage ../development/libraries/t1lib { };
+
+  taglib = callPackage ../development/libraries/taglib { };
+
+  taglib_extras = callPackage ../development/libraries/taglib-extras { };
+
+  talloc = callPackage ../development/libraries/talloc { };
+
+  tclap = callPackage ../development/libraries/tclap {};
+
+  tclgpg = callPackage ../development/libraries/tclgpg { };
+
+  tcllib = callPackage ../development/libraries/tcllib { };
+
+  tcltls = callPackage ../development/libraries/tcltls { };
+
+  tdb = callPackage ../development/libraries/tdb { };
+
+  tecla = callPackage ../development/libraries/tecla { };
+
+  telepathy_glib = callPackage ../development/libraries/telepathy/glib { };
+
+  telepathy_farstream = callPackage ../development/libraries/telepathy/farstream {};
+
+  telepathy_qt = callPackage ../development/libraries/telepathy/qt { };
+
+  thrift = callPackage ../development/libraries/thrift { };
+
+  tinyxml = tinyxml2;
+
+  tinyxml2 = callPackage ../development/libraries/tinyxml/2.6.2.nix { };
+
+  tk = callPackage ../development/libraries/tk { };
+
+  tnt = callPackage ../development/libraries/tnt { };
+
+  tokyocabinet = callPackage ../development/libraries/tokyo-cabinet { };
+  tokyotyrant = callPackage ../development/libraries/tokyo-tyrant { };
+
+  tremor = callPackage ../development/libraries/tremor { };
+
+  unicap = callPackage ../development/libraries/unicap {};
+
+  tsocks = callPackage ../development/libraries/tsocks { };
+
+  unixODBC = callPackage ../development/libraries/unixODBC { };
+
+  unixODBCDrivers = recurseIntoAttrs (import ../development/libraries/unixODBCDrivers {
+    inherit fetchurl stdenv unixODBC glibc libtool openssl zlib;
+    inherit postgresql mysql sqlite;
+  });
+
+  urt = callPackage ../development/libraries/urt { };
+
+  ustr = callPackage ../development/libraries/ustr { };
+
+  usbredir = callPackage ../development/libraries/usbredir {
+    libusb = libusb1;
+  };
+
+  ucommon = callPackage ../development/libraries/ucommon { };
+
+  v8 = callPackage ../development/libraries/v8 {
+    inherit (pythonPackages) gyp;
+  };
+
+  vaapiIntel = callPackage ../development/libraries/vaapi-intel { };
+
+  vaapiVdpau = callPackage ../development/libraries/vaapi-vdpau { };
+
+  vamp = callPackage ../development/libraries/audio/vamp { };
+
+  vcdimager = callPackage ../development/libraries/vcdimager { };
+
+  vigra = callPackage ../development/libraries/vigra {
+    inherit (pkgs.pythonPackages) numpy;
+  };
+
+  vlock = callPackage ../misc/screensavers/vlock { };
+
+  vmime = callPackage ../development/libraries/vmime { };
+
+  vrpn = callPackage ../development/libraries/vrpn { };
+
+  vtk = callPackage ../development/libraries/vtk { };
+
+  vtkWithQt4 = vtk.override { qtLib = qt4; };
+
+  vxl = callPackage ../development/libraries/vxl {
+    libpng = libpng12;
+  };
+
+  wayland = callPackage ../development/libraries/wayland { };
+
+  webkit = webkitgtk;
+
+  webkitgtk = callPackage ../development/libraries/webkitgtk {
+    harfbuzz = harfbuzz.override {
+      withIcu = true;
+    };
+    gst-plugins-base = gst_all_1.gst-plugins-base;
+  };
+
+  webkitgtk2 = webkitgtk.override {
+    withGtk2 = true;
+    enableIntrospection = false;
+  };
+
+  wildmidi = callPackage ../development/libraries/wildmidi { };
+
+  wvstreams = callPackage ../development/libraries/wvstreams { };
+
+  wxGTK = wxGTK28;
+
+  wxGTK28 = callPackage ../development/libraries/wxGTK-2.8 {
+    inherit (gnome) GConf;
+    withMesa = lib.elem system lib.platforms.mesaPlatforms;
+  };
+
+  wxGTK29 = callPackage ../development/libraries/wxGTK-2.9/default.nix {
+    inherit (gnome) GConf;
+    withMesa = lib.elem system lib.platforms.mesaPlatforms;
+
+    # use for Objective-C++ compiler
+    stdenv = if stdenv.isDarwin
+      then clangStdenv
+      else stdenv;
+  };
+
+  wxGTK30 = callPackage ../development/libraries/wxGTK-3.0/default.nix {
+    inherit (gnome) GConf;
+    withMesa = lib.elem system lib.platforms.mesaPlatforms;
+
+    # use for Objective-C++ compiler
+    stdenv = if stdenv.isDarwin
+      then clangStdenv
+      else stdenv;
+  };
+
+  wtk = callPackage ../development/libraries/wtk { };
+
+  x264 = callPackage ../development/libraries/x264 { };
+
+  xapian = callPackage ../development/libraries/xapian { };
+
+  xapianBindings = callPackage ../development/libraries/xapian/bindings {  # TODO perl php Java, tcl, C#, python
+  };
+
+  xapian10 = callPackage ../development/libraries/xapian/1.0.x.nix { };
+
+  xapianBindings10 = callPackage ../development/libraries/xapian/bindings/1.0.x.nix {  # TODO perl php Java, tcl, C#, python
+  };
+
+  Xaw3d = callPackage ../development/libraries/Xaw3d { };
+
+  xbase = callPackage ../development/libraries/xbase { };
+
+  xcb-util-cursor = callPackage ../development/libraries/xcb-util-cursor { };
+
+  xdo = callPackage ../tools/misc/xdo { };
+
+  xineLib = callPackage ../development/libraries/xine-lib {
+    ffmpeg = ffmpeg_1;
+  };
+
+  xautolock = callPackage ../misc/screensavers/xautolock { };
+
+  xercesc = callPackage ../development/libraries/xercesc {};
+
+  xlibsWrapper = callPackage ../development/libraries/xlibs-wrapper {
+    packages = [
+      freetype fontconfig xlibs.xproto xlibs.libX11 xlibs.libXt
+      xlibs.libXft xlibs.libXext xlibs.libSM xlibs.libICE
+      xlibs.xextproto
+    ];
+  };
+
+  xmlrpc_c = callPackage ../development/libraries/xmlrpc-c { };
+
+  xmlsec = callPackage ../development/libraries/xmlsec { };
+
+  xvidcore = callPackage ../development/libraries/xvidcore { };
+
+  xylib = callPackage ../development/libraries/xylib { };
+
+  yajl = callPackage ../development/libraries/yajl { };
+
+  zangband = builderDefsPackage (import ../games/zangband) {
+    inherit ncurses flex bison autoconf automake m4 coreutils;
+  };
+
+  zeitgeist = callPackage ../development/libraries/zeitgeist { };
+
+  zlib = callPackage ../development/libraries/zlib {
+    fetchurl = fetchurlBoot;
+  };
+
+  zlibStatic = lowPrio (appendToName "static" (callPackage ../development/libraries/zlib {
+    static = true;
+  }));
+
+  zeromq2 = callPackage ../development/libraries/zeromq/2.x.nix {};
+  zeromq3 = callPackage ../development/libraries/zeromq/3.x.nix {};
+  zeromq4 = callPackage ../development/libraries/zeromq/4.x.nix {};
+
+  zziplib = callPackage ../development/libraries/zziplib { };
+
+
+  ### DEVELOPMENT / LIBRARIES / JAVA
+
+  atermjava = callPackage ../development/libraries/java/aterm {
+    stdenv = overrideInStdenv stdenv [gnumake380];
+  };
+
+  commonsFileUpload = callPackage ../development/libraries/java/jakarta-commons/file-upload { };
+
+  fastjar = callPackage ../development/tools/java/fastjar { };
+
+  httpunit = callPackage ../development/libraries/java/httpunit { };
+
+  gwtdragdrop = callPackage ../development/libraries/java/gwt-dragdrop { };
+
+  gwtwidgets = callPackage ../development/libraries/java/gwt-widgets { };
+
+  jakartabcel = callPackage ../development/libraries/java/jakarta-bcel {
+    regexp = jakartaregexp;
+  };
+
+  jakartaregexp = callPackage ../development/libraries/java/jakarta-regexp { };
+
+  javaCup = callPackage ../development/libraries/java/cup { };
+
+  javasvn = callPackage ../development/libraries/java/javasvn { };
+
+  jclasslib = callPackage ../development/tools/java/jclasslib { };
+
+  jdom = callPackage ../development/libraries/java/jdom { };
+
+  jflex = callPackage ../development/libraries/java/jflex { };
+
+  jjtraveler = callPackage ../development/libraries/java/jjtraveler {
+    stdenv = overrideInStdenv stdenv [gnumake380];
+  };
+
+  junit = callPackage ../development/libraries/java/junit { antBuild = releaseTools.antBuild; };
+
+  junixsocket = callPackage ../development/libraries/java/junixsocket { };
+
+  jzmq = callPackage ../development/libraries/java/jzmq { };
+
+  lucene = callPackage ../development/libraries/java/lucene { };
+
+  mockobjects = callPackage ../development/libraries/java/mockobjects { };
+
+  saxon = callPackage ../development/libraries/java/saxon { };
+
+  saxonb = callPackage ../development/libraries/java/saxon/default8.nix { };
+
+  sharedobjects = callPackage ../development/libraries/java/shared-objects {
+    stdenv = overrideInStdenv stdenv [gnumake380];
+  };
+
+  smack = callPackage ../development/libraries/java/smack { };
+
+  swt = callPackage ../development/libraries/java/swt {
+    inherit (gnome) libsoup;
+  };
+
+
+  ### DEVELOPMENT / LIBRARIES / JAVASCRIPT
+
+  jquery_ui = callPackage ../development/libraries/javascript/jquery-ui { };
+
+  yuicompressor = callPackage ../development/tools/yuicompressor { };
+
+  ### DEVELOPMENT / LISP MODULES
+
+  asdf = callPackage ../development/lisp-modules/asdf {
+    texLive = null;
+  };
+
+  clwrapperFunction = callPackage ../development/lisp-modules/clwrapper;
+
+  wrapLisp = lisp: clwrapperFunction { inherit lisp; };
+
+  lispPackagesFor = clwrapper: callPackage ../development/lisp-modules/lisp-packages.nix {
+    inherit clwrapper;
+  };
+
+  lispPackagesClisp = lispPackagesFor (wrapLisp clisp);
+  lispPackagesSBCL = lispPackagesFor (wrapLisp sbcl);
+  lispPackages = recurseIntoAttrs lispPackagesSBCL;
+
+
+  ### DEVELOPMENT / PERL MODULES
+
+  buildPerlPackage = import ../development/perl-modules/generic perl;
+
+  perlPackages = recurseIntoAttrs (import ./perl-packages.nix {
+    inherit pkgs;
+    overrides = (config.perlPackageOverrides or (p: {})) pkgs;
+  });
+
+  perl514Packages = import ./perl-packages.nix {
+    pkgs = pkgs // {
+      perl = perl514;
+      buildPerlPackage = import ../development/perl-modules/generic perl514;
+    };
+    overrides = (config.perl514PackageOverrides or (p: {})) pkgs;
+  };
+
+  perlXMLParser = perlPackages.XMLParser;
+
+  ack = perlPackages.ack;
+
+  perlArchiveCpio = perlPackages.ArchiveCpio;
+
+  perlcritic = perlPackages.PerlCritic;
+
+  planetary_annihilation = callPackage ../games/planetaryannihilation { };
+
+
+  ### DEVELOPMENT / PYTHON MODULES
+
+  # python function with default python interpreter
+  buildPythonPackage = pythonPackages.buildPythonPackage;
+
+  # `nix-env -i python-nose` installs for 2.7, the default python.
+  # Therefore we do not recurse into attributes here, in contrast to
+  # python27Packages. `nix-env -iA python26Packages.nose` works
+  # regardless.
+  python26Packages = import ./python-packages.nix {
+    inherit pkgs;
+    python = python26;
+  };
+
+  python27Packages = lib.hiPrioSet (recurseIntoAttrs (import ./python-packages.nix {
+    inherit pkgs;
+    python = python27;
+  }));
+
+  python32Packages = import ./python-packages.nix {
+    inherit pkgs;
+    python = python32;
+  };
+
+  python33Packages = recurseIntoAttrs (import ./python-packages.nix {
+    inherit pkgs;
+    python = python33;
+  });
+
+  python34Packages = recurseIntoAttrs (import ./python-packages.nix {
+    inherit pkgs;
+    python = python34;
+  });
+
+  pypyPackages = recurseIntoAttrs (import ./python-packages.nix {
+    inherit pkgs;
+    python = pypy;
+  });
+
+  foursuite = callPackage ../development/python-modules/4suite { };
+
+  bsddb3 = callPackage ../development/python-modules/bsddb3 { };
+
+  ecdsa = callPackage ../development/python-modules/ecdsa { };
+
+  numeric = callPackage ../development/python-modules/numeric { };
+
+  pil = pythonPackages.pil;
+
+  psyco = callPackage ../development/python-modules/psyco { };
+
+  pycairo = pythonPackages.pycairo;
+
+  pycapnp = pythonPackages.pycapnp;
+
+  pycrypto = pythonPackages.pycrypto;
+
+  pycups = callPackage ../development/python-modules/pycups { };
+
+  pyexiv2 = callPackage ../development/python-modules/pyexiv2 { };
+
+  pygame = callPackage ../development/python-modules/pygame { };
+
+  pygobject = pythonPackages.pygobject;
+
+  pygobject3 = pythonPackages.pygobject3;
+
+  pygtk = pythonPackages.pygtk;
+
+  pyGtkGlade = pythonPackages.pyGtkGlade;
+
+  pylint = callPackage ../development/python-modules/pylint { };
+
+  pyopenssl = builderDefsPackage (import ../development/python-modules/pyopenssl) {
+    inherit python openssl;
+  };
+
+  rhpl = callPackage ../development/python-modules/rhpl { };
+
+  sip = callPackage ../development/python-modules/sip { };
+
+  pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix {
+    stdenv = if stdenv.isDarwin
+      then clangStdenv
+      else stdenv;
+  };
+
+  pysideApiextractor = callPackage ../development/python-modules/pyside/apiextractor.nix { };
+
+  pysideGeneratorrunner = callPackage ../development/python-modules/pyside/generatorrunner.nix { };
+
+  pyside = callPackage ../development/python-modules/pyside { };
+
+  pysideTools = callPackage ../development/python-modules/pyside/tools.nix { };
+
+  pysideShiboken = callPackage ../development/python-modules/pyside/shiboken.nix { };
+
+  pyx = callPackage ../development/python-modules/pyx { };
+
+  pyxml = callPackage ../development/python-modules/pyxml { };
+
+  rbtools = callPackage ../development/python-modules/rbtools { };
+
+  setuptools = pythonPackages.setuptools;
+
+  slowaes = callPackage ../development/python-modules/slowaes { };
+
+  wxPython = pythonPackages.wxPython;
+  wxPython28 = pythonPackages.wxPython28;
+
+  twisted = pythonPackages.twisted;
+
+  ZopeInterface = pythonPackages.zope_interface;
+
+  ### DEVELOPMENT / R MODULES
+
+  R = callPackage ../applications/science/math/R {
+    inherit (xlibs) libX11 libXt;
+    texLive = texLiveAggregationFun { paths = [ texLive texLiveExtra ]; };
+    withRecommendedPackages = false;
+  };
+
+  rWrapper = callPackage ../development/r-modules/wrapper.nix {
+    # Those packages are usually installed as part of the R build.
+    recommendedPackages = with rPackages; [ MASS lattice Matrix nlme
+      survival boot cluster codetools foreign KernSmooth rpart class
+      nnet spatial mgcv ];
+    # Override this attribute to register additional libraries.
+    packages = [];
+  };
+
+  rPackages = import ../development/r-modules/cran-packages.nix {
+    inherit pkgs;
+    overrides = (config.rPackageOverrides or (p: {})) pkgs;
+  };
+
+  ### SERVERS
+
+  rdf4store = callPackage ../servers/http/4store { };
+
+  apacheHttpd = pkgs.apacheHttpd_2_2;
+
+  apacheHttpd_2_2 = callPackage ../servers/http/apache-httpd/2.2.nix {
+    sslSupport = true;
+  };
+
+  apacheHttpd_2_4 = lowPrio (callPackage ../servers/http/apache-httpd/2.4.nix {
+    sslSupport = true;
+  });
+
+  apcupsd = callPackage ../servers/apcupsd { };
+
+  sabnzbd = callPackage ../servers/sabnzbd { };
+
+  bind = callPackage ../servers/dns/bind { };
+
+  bird = callPackage ../servers/bird { };
+
+  couchdb = callPackage ../servers/http/couchdb {
+    spidermonkey = spidermonkey_185;
+    python = python27;
+    sphinx = python27Packages.sphinx;
+    erlang = erlangR16;
+  };
+
+  dico = callPackage ../servers/dico { };
+
+  dict = callPackage ../servers/dict {
+      libmaa = callPackage ../servers/dict/libmaa.nix {};
+  };
+
+  dictdDBs = recurseIntoAttrs (import ../servers/dict/dictd-db.nix {
+    inherit builderDefs;
+  });
+
+  dictDBCollector = import ../servers/dict/dictd-db-collector.nix {
+    inherit stdenv lib dict;
+  };
+
+  dictdWiktionary = callPackage ../servers/dict/dictd-wiktionary.nix {};
+
+  dictdWordnet = callPackage ../servers/dict/dictd-wordnet.nix {};
+
+  diod = callPackage ../servers/diod { };
+
+  dovecot = dovecot21;
+
+  dovecot21 = callPackage ../servers/mail/dovecot { };
+
+  dovecot22 = callPackage ../servers/mail/dovecot/2.2.x.nix { };
+
+  dovecot_pigeonhole = callPackage ../servers/mail/dovecot-pigeonhole { };
+
+  etcd = callPackage ../servers/etcd { };
+
+  ejabberd = callPackage ../servers/xmpp/ejabberd {
+    erlang = erlangR16;
+  };
+
+  elasticmq = callPackage ../servers/elasticmq { };
+
+  etcdctl = callPackage ../development/tools/etcdctl { };
+
+  fcgiwrap = callPackage ../servers/fcgiwrap { };
+
+  felix = callPackage ../servers/felix { };
+
+  felix_remoteshell = callPackage ../servers/felix/remoteshell.nix { };
+
+  fingerd_bsd = callPackage ../servers/fingerd/bsd-fingerd { };
+
+  firebird = callPackage ../servers/firebird { icu = null; };
+  firebirdSuper = callPackage ../servers/firebird { superServer = true; };
+
+  fleet = callPackage ../servers/fleet { };
+
+  freepops = callPackage ../servers/mail/freepops { };
+
+  freeswitch = callPackage ../servers/sip/freeswitch { };
+
+  ghostOne = callPackage ../servers/games/ghost-one {
+    boost = boost144.override { taggedLayout = true; };
+  };
+
+  ircdHybrid = callPackage ../servers/irc/ircd-hybrid { };
+
+  jboss = callPackage ../servers/http/jboss { };
+
+  jboss_mysql_jdbc = callPackage ../servers/http/jboss/jdbc/mysql { };
+
+  jetty = callPackage ../servers/http/jetty { };
+
+  jetty61 = callPackage ../servers/http/jetty/6.1 { };
+
+  joseki = callPackage ../servers/http/joseki {};
+
+  leafnode = callPackage ../servers/news/leafnode { };
+
+  lighttpd = callPackage ../servers/http/lighttpd { };
+
+  mailman = callPackage ../servers/mail/mailman { };
+
+  mediatomb = callPackage ../servers/mediatomb { };
+
+  memcached = callPackage ../servers/memcached {};
+
+  mod_dnssd = callPackage ../servers/http/apache-modules/mod_dnssd/default.nix { };
+
+  mod_evasive = callPackage ../servers/http/apache-modules/mod_evasive { };
+
+  mod_python = callPackage ../servers/http/apache-modules/mod_python { };
+
+  mod_fastcgi = callPackage ../servers/http/apache-modules/mod_fastcgi { };
+
+  mod_wsgi = callPackage ../servers/http/apache-modules/mod_wsgi { };
+
+  mpd = callPackage ../servers/mpd {
+    aacSupport    = config.mpd.aacSupport or true;
+    ffmpegSupport = config.mpd.ffmpegSupport or true;
+  };
+
+  mpd_clientlib = callPackage ../servers/mpd/clientlib.nix { };
+
+  miniHttpd = callPackage ../servers/http/mini-httpd {};
+
+  mlmmj = callPackage ../servers/mail/mlmmj { };
+
+  myserver = callPackage ../servers/http/myserver { };
+
+  nginx = callPackage ../servers/http/nginx {
+    rtmp        = true;
+    fullWebDAV  = true;
+    syslog      = true;
+    moreheaders = true;
+  };
+
+  ngircd = callPackage ../servers/irc/ngircd { };
+
+  nix-binary-cache = callPackage ../servers/http/nix-binary-cache {};
+
+  nsd = callPackage ../servers/dns/nsd { };
+
+  nsq = callPackage ../servers/nsq { };
+
+  openresty = callPackage ../servers/http/openresty { };
+
+  opensmtpd = callPackage ../servers/mail/opensmtpd { };
+
+  petidomo = callPackage ../servers/mail/petidomo { };
+
+  popa3d = callPackage ../servers/mail/popa3d { };
+
+  postfix = callPackage ../servers/mail/postfix { };
+
+  postfix211 = callPackage ../servers/mail/postfix/2.11.nix { };
+
+  pulseaudio = callPackage ../servers/pulseaudio {
+    gconf = gnome.GConf;
+    # The following are disabled in the default build, because if this
+    # functionality is desired, they are only needed in the PulseAudio
+    # server.
+    bluez = null;
+    avahi = null;
+  };
+  pulseaudioFull = pulseaudio.override {
+    bluez = bluez5;
+    avahi = avahi;
+    jackaudioSupport = true;
+    x11Support = true;
+  };
+
+  tomcat_connectors = callPackage ../servers/http/apache-modules/tomcat-connectors { };
+
+  pies = callPackage ../servers/pies { };
+
+  portmap = callPackage ../servers/portmap { };
+
+  rpcbind = callPackage ../servers/rpcbind { };
+
+  #monetdb = callPackage ../servers/sql/monetdb { };
+
+  mariadb = callPackage ../servers/sql/mariadb {};
+
+  mongodb = callPackage ../servers/nosql/mongodb { };
+
+  riak = callPackage ../servers/nosql/riak/1.3.1.nix { };
+
+  influxdb = callPackage ../servers/nosql/influxdb { };
+
+  mysql51 = import ../servers/sql/mysql/5.1.x.nix {
+    inherit fetchurl ncurses zlib perl openssl stdenv;
+    ps = procps; /* !!! Linux only */
+  };
+
+  mysql55 = callPackage ../servers/sql/mysql/5.5.x.nix { };
+
+  mysql = mysql51;
+
+  mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { };
+
+  nagios = callPackage ../servers/monitoring/nagios { };
+
+  munin = callPackage ../servers/monitoring/munin { };
+
+  nagiosPluginsOfficial = callPackage ../servers/monitoring/nagios/plugins/official-2.x.nix { };
+
+  neo4j = callPackage ../servers/nosql/neo4j { };
+
+  net_snmp = callPackage ../servers/monitoring/net-snmp { };
+
+  riemann = callPackage ../servers/monitoring/riemann { };
+
+  oidentd = callPackage ../servers/identd/oidentd { };
+
+  openfire = callPackage ../servers/xmpp/openfire { };
+
+  oracleXE = callPackage ../servers/sql/oracle-xe { };
+
+  OVMF = callPackage ../applications/virtualization/OVMF { };
+
+  postgresql = postgresql92;
+
+  postgresql84 = callPackage ../servers/sql/postgresql/8.4.x.nix { };
+
+  postgresql90 = callPackage ../servers/sql/postgresql/9.0.x.nix { };
+
+  postgresql91 = callPackage ../servers/sql/postgresql/9.1.x.nix { };
+
+  postgresql92 = callPackage ../servers/sql/postgresql/9.2.x.nix { };
+
+  postgresql93 = callPackage ../servers/sql/postgresql/9.3.x.nix { };
+
+  postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { };
+
+  psqlodbc = callPackage ../servers/sql/postgresql/psqlodbc { };
+
+  pyIRCt = builderDefsPackage (import ../servers/xmpp/pyIRCt) {
+    inherit xmpppy pythonIRClib python makeWrapper;
+  };
+
+  pyMAILt = builderDefsPackage (import ../servers/xmpp/pyMAILt) {
+    inherit xmpppy python makeWrapper fetchcvs;
+  };
+
+  qpid-cpp = callPackage ../servers/amqp/qpid-cpp { };
+
+  rabbitmq_server = callPackage ../servers/amqp/rabbitmq-server { };
+
+  radius = callPackage ../servers/radius { };
+
+  redis = callPackage ../servers/nosql/redis { };
+
+  redstore = callPackage ../servers/http/redstore { };
+
+  restund = callPackage ../servers/restund {};
+
+  rethinkdb = callPackage ../servers/nosql/rethinkdb { };
+
+  rippled = callPackage ../servers/rippled { };
+
+  s6 = callPackage ../servers/s6 { };
+
+  spamassassin = callPackage ../servers/mail/spamassassin {
+    inherit (perlPackages) HTMLParser NetDNS NetAddrIP DBFile
+      HTTPDate MailDKIM LWP IOSocketSSL;
+  };
+
+  samba = callPackage ../servers/samba { };
+
+  # A lightweight Samba, useful for non-Linux-based OSes.
+  samba_light = lowPrio (callPackage ../servers/samba {
+    pam = null;
+    fam = null;
+    cups = null;
+    acl = null;
+    openldap = null;
+    # libunwind 1.0.1 is not ported to GNU/Hurd.
+    libunwind = null;
+  });
+
+  serfdom = callPackage ../servers/serfdom { };
+
+  seyren = callPackage ../servers/monitoring/seyren { };
+
+  shishi = callPackage ../servers/shishi { };
+
+  sipwitch = callPackage ../servers/sip/sipwitch { };
+
+  spawn_fcgi = callPackage ../servers/http/spawn-fcgi { };
+
+  squids = recurseIntoAttrs( import ../servers/squid/squids.nix {
+    inherit fetchurl stdenv perl lib composableDerivation
+      openldap pam db cyrus_sasl kerberos libcap expat libxml2 libtool
+      openssl;
+  });
+  squid = squids.squid31; # has ipv6 support
+
+  thttpd = callPackage ../servers/http/thttpd { };
+
+  storm = callPackage ../servers/computing/storm { };
+
+  tomcat5 = callPackage ../servers/http/tomcat/5.0.nix { };
+
+  tomcat6 = callPackage ../servers/http/tomcat/6.0.nix { };
+
+  tomcat7 = callPackage ../servers/http/tomcat/7.0.nix { };
+	
+  tomcat8 = callPackage ../servers/http/tomcat/8.0.nix { };
+
+  tomcat_mysql_jdbc = callPackage ../servers/http/tomcat/jdbc/mysql { };
+
+  axis2 = callPackage ../servers/http/tomcat/axis2 { };
+
+  unifi = callPackage ../servers/unifi { };
+
+  virtuoso6 = callPackage ../servers/sql/virtuoso/6.x.nix { };
+
+  virtuoso7 = callPackage ../servers/sql/virtuoso/7.x.nix { };
+
+  virtuoso = virtuoso6;
+
+  vsftpd = callPackage ../servers/ftp/vsftpd { };
+
+  winstone = callPackage ../servers/http/winstone { };
+
+  xinetd = callPackage ../servers/xinetd { };
+
+  zookeeper = callPackage ../servers/zookeeper { };
+
+  xquartz = callPackage ../servers/x11/xquartz { };
+  quartz-wm = callPackage ../servers/x11/quartz-wm { stdenv = clangStdenv; };
+
+  xorg = recurseIntoAttrs (import ../servers/x11/xorg/default.nix {
+    inherit clangStdenv fetchurl fetchgit fetchpatch stdenv pkgconfig intltool freetype fontconfig
+      libxslt expat libpng zlib perl mesa_drivers spice_protocol
+      dbus libuuid openssl gperf m4
+      autoconf automake libtool xmlto asciidoc flex bison python mtdev pixman;
+    mesa = mesa_noglu;
+    udev = if stdenv.isLinux then udev else null;
+    libdrm = if stdenv.isLinux then libdrm else null;
+  } // {
+    xf86videointel-testing = callPackage ../servers/x11/xorg/xf86-video-intel-testing.nix { };
+  });
+
+  xorgReplacements = callPackage ../servers/x11/xorg/replacements.nix { };
+
+  xorgVideoUnichrome = callPackage ../servers/x11/xorg/unichrome/default.nix { };
+
+  yaws = callPackage ../servers/http/yaws { };
+
+  zabbix = recurseIntoAttrs (import ../servers/monitoring/zabbix {
+    inherit fetchurl stdenv pkgconfig postgresql curl openssl zlib;
+  });
+
+  zabbix20 = callPackage ../servers/monitoring/zabbix/2.0.nix { };
+  zabbix22 = callPackage ../servers/monitoring/zabbix/2.2.nix { };
+
+
+  ### OS-SPECIFIC
+
+  afuse = callPackage ../os-specific/linux/afuse { };
+
+  amdUcode = callPackage ../os-specific/linux/microcode/amd.nix { };
+
+  autofs5 = callPackage ../os-specific/linux/autofs/autofs-v5.nix { };
+
+  _915resolution = callPackage ../os-specific/linux/915resolution { };
+
+  nfsUtils = callPackage ../os-specific/linux/nfs-utils { };
+
+  acpi = callPackage ../os-specific/linux/acpi { };
+
+  acpid = callPackage ../os-specific/linux/acpid { };
+
+  acpitool = callPackage ../os-specific/linux/acpitool { };
+
+  alienfx = callPackage ../os-specific/linux/alienfx { };
+
+  alsaLib = callPackage ../os-specific/linux/alsa-lib { };
+
+  alsaPlugins = callPackage ../os-specific/linux/alsa-plugins {
+    jack2 = null;
+  };
+
+  alsaPluginWrapper = callPackage ../os-specific/linux/alsa-plugins/wrapper.nix { };
+
+  alsaUtils = callPackage ../os-specific/linux/alsa-utils { };
+  alsaOss = callPackage ../os-specific/linux/alsa-oss { };
+
+  microcode2ucode = callPackage ../os-specific/linux/microcode/converter.nix { };
+
+  microcodeIntel = callPackage ../os-specific/linux/microcode/intel.nix { };
+
+  apparmor = callPackage ../os-specific/linux/apparmor {
+    inherit (perlPackages) LocaleGettext TermReadKey RpcXML;
+    bison = bison2;
+  };
+
+  atop = callPackage ../os-specific/linux/atop { };
+
+  audit = callPackage ../os-specific/linux/audit { };
+
+  b43Firmware_5_1_138 = callPackage ../os-specific/linux/firmware/b43-firmware/5.1.138.nix { };
+
+  b43FirmwareCutter = callPackage ../os-specific/linux/firmware/b43-firmware-cutter { };
+
+  batctl = callPackage ../os-specific/linux/batman-adv/batctl.nix { };
+
+  bluez4 = callPackage ../os-specific/linux/bluez {
+    pygobject = pygobject3;
+  };
+
+  bluez5 = lowPrio (callPackage ../os-specific/linux/bluez/bluez5.nix { });
+
+  bluez = bluez4;
+
+  inherit (pythonPackages) bedup;
+
+  beret = callPackage ../games/beret { };
+
+  bridge_utils = callPackage ../os-specific/linux/bridge-utils { };
+
+  busybox = callPackage ../os-specific/linux/busybox { };
+
+  checkpolicy = callPackage ../os-specific/linux/checkpolicy { };
+
+  checksec = callPackage ../os-specific/linux/checksec { };
+
+  cifs_utils = callPackage ../os-specific/linux/cifs-utils { };
+
+  conky = callPackage ../os-specific/linux/conky {
+    mpdSupport   = config.conky.mpdSupport   or true;
+    x11Support   = config.conky.x11Support   or false;
+    xdamage      = config.conky.xdamage      or false;
+    wireless     = config.conky.wireless     or false;
+    luaSupport   = config.conky.luaSupport   or false;
+    rss          = config.conky.rss          or false;
+    weatherMetar = config.conky.weatherMetar or false;
+    weatherXoap  = config.conky.weatherXoap  or false;
+  };
+
+  cpufrequtils = callPackage ../os-specific/linux/cpufrequtils { };
+
+  cryopid = callPackage ../os-specific/linux/cryopid { };
+
+  criu = callPackage ../os-specific/linux/criu { };
+
+  cryptsetup = callPackage ../os-specific/linux/cryptsetup { };
+
+  cramfsswap = callPackage ../os-specific/linux/cramfsswap { };
+
+  darwin = rec {
+    cctools = forceNativeDrv (callPackage ../os-specific/darwin/cctools-port {
+      cross = assert crossSystem != null; crossSystem;
+      inherit maloader;
+      xctoolchain = xcode.toolchain;
+    });
+
+    maloader = callPackage ../os-specific/darwin/maloader {
+      inherit opencflite;
+    };
+
+    opencflite = callPackage ../os-specific/darwin/opencflite {};
+
+    xcode = callPackage ../os-specific/darwin/xcode {};
+  };
+
+  devicemapper = lvm2;
+
+  disk_indicator = callPackage ../os-specific/linux/disk-indicator { };
+
+  dmidecode = callPackage ../os-specific/linux/dmidecode { };
+
+  dmtcp = callPackage ../os-specific/linux/dmtcp { };
+
+  dietlibc = callPackage ../os-specific/linux/dietlibc { };
+
+  directvnc = builderDefsPackage ../os-specific/linux/directvnc {
+    inherit libjpeg pkgconfig zlib directfb;
+    inherit (xlibs) xproto;
+  };
+
+  dmraid = callPackage ../os-specific/linux/dmraid {
+    devicemapper = devicemapper.override {enable_dmeventd = true;};
+  };
+
+  drbd = callPackage ../os-specific/linux/drbd { };
+
+  dstat = callPackage ../os-specific/linux/dstat {
+    # pythonFull includes the "curses" standard library module, for pretty
+    # dstat color output
+    python = pythonFull;
+  };
+
+  libossp_uuid = callPackage ../development/libraries/libossp-uuid { };
+
+  libuuid =
+    if crossSystem != null && crossSystem.config == "i586-pc-gnu"
+    then (utillinux // {
+      crossDrv = lib.overrideDerivation utillinux.crossDrv (args: {
+        # `libblkid' fails to build on GNU/Hurd.
+        configureFlags = args.configureFlags
+          + " --disable-libblkid --disable-mount --disable-libmount"
+          + " --disable-fsck --enable-static --disable-partx";
+        doCheck = false;
+        CPPFLAGS =                    # ugly hack for ugly software!
+          lib.concatStringsSep " "
+            (map (v: "-D${v}=4096")
+                 [ "PATH_MAX" "MAXPATHLEN" "MAXHOSTNAMELEN" ]);
+      });
+    })
+    else if stdenv.isLinux
+    then utillinux
+    else null;
+
+  e3cfsprogs = callPackage ../os-specific/linux/e3cfsprogs { };
+
+  ebtables = callPackage ../os-specific/linux/ebtables { };
+
+  eject = utillinux;
+
+  ffado = callPackage ../os-specific/linux/ffado { };
+
+  fbterm = callPackage ../os-specific/linux/fbterm { };
+
+  firejail = callPackage ../os-specific/linux/firejail {};
+
+  fuse = callPackage ../os-specific/linux/fuse { };
+
+  fxload = callPackage ../os-specific/linux/fxload { };
+
+  gfxtablet = callPackage ../os-specific/linux/gfxtablet {};
+
+  gpm = callPackage ../servers/gpm { };
+
+  gradm = callPackage ../os-specific/linux/gradm {
+    flex = flex_2_5_35;
+  };
+
+  hdparm = callPackage ../os-specific/linux/hdparm { };
+
+  hibernate = callPackage ../os-specific/linux/hibernate { };
+
+  hostapd = callPackage ../os-specific/linux/hostapd { };
+
+  htop =
+    if stdenv.isLinux then
+      callPackage ../os-specific/linux/htop { }
+    else if stdenv.isDarwin then
+      callPackage ../os-specific/darwin/htop { }
+    else null;
+
+  # GNU/Hurd core packages.
+  gnu = recurseIntoAttrs (callPackage ../os-specific/gnu {
+    inherit platform crossSystem;
+  });
+
+  hwdata = callPackage ../os-specific/linux/hwdata { };
+
+  i7z = callPackage ../os-specific/linux/i7z { };
+
+  ifplugd = callPackage ../os-specific/linux/ifplugd { };
+
+  iomelt = callPackage ../os-specific/linux/iomelt { };
+
+  iotop = callPackage ../os-specific/linux/iotop { };
+
+  iproute = callPackage ../os-specific/linux/iproute { };
+
+  iputils = callPackage ../os-specific/linux/iputils {
+    sp = spCompat;
+    inherit (perlPackages) SGMLSpm;
+  };
+
+  iptables = callPackage ../os-specific/linux/iptables { };
+
+  iw = callPackage ../os-specific/linux/iw { };
+
+  jujuutils = callPackage ../os-specific/linux/jujuutils { };
+
+  kbd = callPackage ../os-specific/linux/kbd { };
+
+  kmscon = callPackage ../os-specific/linux/kmscon { };
+
+  latencytop = callPackage ../os-specific/linux/latencytop { };
+
+  ldm = callPackage ../os-specific/linux/ldm { };
+
+  libaio = callPackage ../os-specific/linux/libaio { };
+
+  libatasmart = callPackage ../os-specific/linux/libatasmart { };
+
+  libcgroup = callPackage ../os-specific/linux/libcgroup { };
+
+  libnl = callPackage ../os-specific/linux/libnl { };
+  libnl_3_2_19 = callPackage ../os-specific/linux/libnl/3.2.19.nix { };
+
+  linuxConsoleTools = callPackage ../os-specific/linux/consoletools { };
+
+  # -- Linux kernel expressions ------------------------------------------------
+
+  linuxHeaders = linuxHeaders_3_7;
+
+  linuxHeaders24Cross = forceNativeDrv (import ../os-specific/linux/kernel-headers/2.4.nix {
+    inherit stdenv fetchurl perl;
+    cross = assert crossSystem != null; crossSystem;
+  });
+
+  linuxHeaders26Cross = forceNativeDrv (import ../os-specific/linux/kernel-headers/2.6.32.nix {
+    inherit stdenv fetchurl perl;
+    cross = assert crossSystem != null; crossSystem;
+  });
+
+  linuxHeaders_3_7 = callPackage ../os-specific/linux/kernel-headers/3.7.nix { };
+
+  linuxHeaders_3_14 = callPackage ../os-specific/linux/kernel-headers/3.14.nix { };
+
+  # We can choose:
+  linuxHeadersCrossChooser = ver : if ver == "2.4" then linuxHeaders24Cross
+    else if ver == "2.6" then linuxHeaders26Cross
+    else throw "Unknown linux kernel version";
+
+  linuxHeadersCross = assert crossSystem != null;
+    linuxHeadersCrossChooser crossSystem.platform.kernelMajor;
+
+  kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { };
+
+  linux_3_2 = makeOverridable (import ../os-specific/linux/kernel/linux-3.2.nix) {
+    inherit fetchurl stdenv perl buildLinux;
+    kernelPatches = [];
+  };
+
+  linux_3_4 = makeOverridable (import ../os-specific/linux/kernel/linux-3.4.nix) {
+    inherit fetchurl stdenv perl buildLinux;
+    kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips")
+      [ kernelPatches.mips_fpureg_emu
+        kernelPatches.mips_fpu_sigill
+      ];
+  };
+
+  linux_3_6_rpi = makeOverridable (import ../os-specific/linux/kernel/linux-rpi-3.6.nix) {
+    inherit fetchurl stdenv perl buildLinux;
+  };
+
+  linux_3_10 = makeOverridable (import ../os-specific/linux/kernel/linux-3.10.nix) {
+    inherit fetchurl stdenv perl buildLinux;
+    kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips")
+      [ kernelPatches.mips_fpureg_emu
+        kernelPatches.mips_fpu_sigill
+        kernelPatches.mips_ext3_n32
+      ];
+  };
+
+  linux_3_12 = makeOverridable (import ../os-specific/linux/kernel/linux-3.12.nix) {
+    inherit fetchurl stdenv perl buildLinux;
+    kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips")
+      [ kernelPatches.mips_fpureg_emu
+        kernelPatches.mips_fpu_sigill
+        kernelPatches.mips_ext3_n32
+      ];
+  };
+
+  linux_3_14 = makeOverridable (import ../os-specific/linux/kernel/linux-3.14.nix) {
+    inherit fetchurl stdenv perl buildLinux;
+    kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips")
+      [ kernelPatches.mips_fpureg_emu
+        kernelPatches.mips_fpu_sigill
+        kernelPatches.mips_ext3_n32
+      ];
+  };
+
+  linux_3_15 = makeOverridable (import ../os-specific/linux/kernel/linux-3.15.nix) {
+    inherit fetchurl stdenv perl buildLinux;
+    kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips")
+      [ kernelPatches.mips_fpureg_emu
+        kernelPatches.mips_fpu_sigill
+        kernelPatches.mips_ext3_n32
+      ];
+  };
+
+  linux_3_16 = makeOverridable (import ../os-specific/linux/kernel/linux-3.16.nix) {
+    inherit fetchurl stdenv perl buildLinux;
+    kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips")
+      [ kernelPatches.mips_fpureg_emu
+        kernelPatches.mips_fpu_sigill
+        kernelPatches.mips_ext3_n32
+      ];
+  };
+
+  linux_testing = makeOverridable (import ../os-specific/linux/kernel/linux-testing.nix) {
+    inherit fetchurl stdenv perl buildLinux;
+    kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips")
+      [ kernelPatches.mips_fpureg_emu
+        kernelPatches.mips_fpu_sigill
+        kernelPatches.mips_ext3_n32
+      ];
+  };
+
+  /* grsec configuration
+
+     We build several flavors of 'default' grsec kernels. These are
+     built by default with Hydra. If the user selects a matching
+     'default' flavor, then the pre-canned package set can be
+     chosen. Typically, users will make very basic choices like
+     'security' + 'server' or 'performance' + 'desktop' with
+     virtualisation support. These will then be picked.
+
+     Note: Xen guest kernels are included for e.g. NixOps deployments
+     to EC2, where Xen is the Hypervisor.
+  */
+
+  grFlavors = import ../build-support/grsecurity/flavors.nix;
+
+  mkGrsecurity = opts:
+    (import ../build-support/grsecurity {
+      grsecOptions = opts;
+      inherit pkgs lib;
+    });
+
+  grKernel  = opts: (mkGrsecurity opts).grsecKernel;
+  grPackage = opts: recurseIntoAttrs (mkGrsecurity opts).grsecPackage;
+
+  # Stable kernels
+  linux_grsec_stable_desktop    = grKernel grFlavors.linux_grsec_stable_desktop;
+  linux_grsec_stable_server     = grKernel grFlavors.linux_grsec_stable_server;
+  linux_grsec_stable_server_xen = grKernel grFlavors.linux_grsec_stable_server_xen;
+
+  # Testing kernels
+  linux_grsec_testing_desktop = grKernel grFlavors.linux_grsec_testing_desktop;
+  linux_grsec_testing_server  = grKernel grFlavors.linux_grsec_testing_server;
+  linux_grsec_testing_server_xen = grKernel grFlavors.linux_grsec_testing_server_xen;
+
+  /* Linux kernel modules are inherently tied to a specific kernel.  So
+     rather than provide specific instances of those packages for a
+     specific kernel, we have a function that builds those packages
+     for a specific kernel.  This function can then be called for
+     whatever kernel you're using. */
+
+  linuxPackagesFor = kernel: self: let callPackage = newScope self; in {
+    inherit kernel;
+
+    acpi_call = callPackage ../os-specific/linux/acpi-call {};
+
+    batman_adv = callPackage ../os-specific/linux/batman-adv {};
+
+    bbswitch = callPackage ../os-specific/linux/bbswitch {};
+
+    ati_drivers_x11 = callPackage ../os-specific/linux/ati-drivers { };
+
+    blcr = callPackage ../os-specific/linux/blcr { };
+
+    cryptodev = callPackage ../os-specific/linux/cryptodev { };
+
+    cpupower = callPackage ../os-specific/linux/cpupower { };
+
+    e1000e = callPackage ../os-specific/linux/e1000e {};
+
+    v4l2loopback = callPackage ../os-specific/linux/v4l2loopback { };
+
+    frandom = callPackage ../os-specific/linux/frandom { };
+
+    ktap = callPackage ../os-specific/linux/ktap { };
+
+    lttng-modules = callPackage ../os-specific/linux/lttng-modules { };
+
+    broadcom_sta = callPackage ../os-specific/linux/broadcom-sta/default.nix { };
+
+    nvidiabl = callPackage ../os-specific/linux/nvidiabl { };
+
+    nvidia_x11 = callPackage ../os-specific/linux/nvidia-x11 { };
+
+    nvidia_x11_legacy173 = callPackage ../os-specific/linux/nvidia-x11/legacy173.nix { };
+    nvidia_x11_legacy304 = callPackage ../os-specific/linux/nvidia-x11/legacy304.nix { };
+
+    openafsClient = callPackage ../servers/openafs-client { };
+
+    openiscsi = callPackage ../os-specific/linux/open-iscsi { };
+
+    wis_go7007 = callPackage ../os-specific/linux/wis-go7007 { };
+
+    kernelHeaders = callPackage ../os-specific/linux/kernel-headers { };
+
+    klibc = callPackage ../os-specific/linux/klibc { };
+
+    klibcShrunk = lowPrio (callPackage ../os-specific/linux/klibc/shrunk.nix { });
+
+
+    /* compiles but has to be integrated into the kernel somehow
+       Let's have it uncommented and finish it..
+    */
+    ndiswrapper = callPackage ../os-specific/linux/ndiswrapper { };
+
+    netatop = callPackage ../os-specific/linux/netatop { };
+
+    perf = callPackage ../os-specific/linux/kernel/perf.nix { };
+
+    psmouse_alps = callPackage ../os-specific/linux/psmouse-alps { };
+
+    spl = callPackage ../os-specific/linux/spl { };
+    spl_git = callPackage ../os-specific/linux/spl/git.nix { };
+
+    sysdig = callPackage ../os-specific/linux/sysdig {};
+
+    tp_smapi = callPackage ../os-specific/linux/tp_smapi { };
+
+    v86d = callPackage ../os-specific/linux/v86d { };
+
+    virtualbox = callPackage ../applications/virtualization/virtualbox {
+      stdenv = stdenv_32bit;
+      inherit (gnome) libIDL;
+      enableExtensionPack = config.virtualbox.enableExtensionPack or false;
+    };
+
+    virtualboxGuestAdditions = callPackage ../applications/virtualization/virtualbox/guest-additions { };
+
+    zfs = callPackage ../os-specific/linux/zfs { };
+    zfs_git = callPackage ../os-specific/linux/zfs/git.nix { };
+  };
+
+  # The current default kernel / kernel modules.
+  linux = linuxPackages.kernel;
+  linuxPackages = linuxPackages_3_12;
+
+  # Update this when adding the newest kernel major version!
+  linux_latest = pkgs.linux_3_16;
+  linuxPackages_latest = pkgs.linuxPackages_3_16;
+
+  # Build the kernel modules for the some of the kernels.
+  linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 linuxPackages_3_2);
+  linuxPackages_3_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4 linuxPackages_3_4);
+  linuxPackages_3_6_rpi = linuxPackagesFor pkgs.linux_3_6_rpi linuxPackages_3_6_rpi;
+  linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10 linuxPackages_3_10);
+  linuxPackages_3_10_tuxonice = linuxPackagesFor pkgs.linux_3_10_tuxonice linuxPackages_3_10_tuxonice;
+  linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12);
+  linuxPackages_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_14 linuxPackages_3_14);
+  linuxPackages_3_15 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_15 linuxPackages_3_15);
+  linuxPackages_3_16 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_16 linuxPackages_3_16);
+  linuxPackages_testing = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing linuxPackages_testing);
+
+  # grsecurity flavors
+  # Stable kernels
+  linuxPackages_grsec_stable_desktop    = grPackage grFlavors.linux_grsec_stable_desktop;
+  linuxPackages_grsec_stable_server     = grPackage grFlavors.linux_grsec_stable_server;
+  linuxPackages_grsec_stable_server_xen = grPackage grFlavors.linux_grsec_stable_server_xen;
+
+  # Testing kernels
+  linuxPackages_grsec_testing_desktop = grPackage grFlavors.linux_grsec_testing_desktop;
+  linuxPackages_grsec_testing_server  = grPackage grFlavors.linux_grsec_testing_server;
+  linuxPackages_grsec_testing_server_xen = grPackage grFlavors.linux_grsec_testing_server_xen;
+
+  # A function to build a manually-configured kernel
+  linuxManualConfig = pkgs.buildLinux;
+  buildLinux = import ../os-specific/linux/kernel/manual-config.nix {
+    inherit (pkgs) stdenv runCommand nettools bc perl kmod writeTextFile ubootChooser;
+  };
+
+  keyutils = callPackage ../os-specific/linux/keyutils { };
+
+  libselinux = callPackage ../os-specific/linux/libselinux { };
+
+  libsemanage = callPackage ../os-specific/linux/libsemanage { };
+
+  libraw = callPackage ../development/libraries/libraw { };
+
+  libraw1394 = callPackage ../development/libraries/libraw1394 { };
+
+  libsexy = callPackage ../development/libraries/libsexy { };
+
+  libsepol = callPackage ../os-specific/linux/libsepol { };
+
+  libsmbios = callPackage ../os-specific/linux/libsmbios { };
+
+  lm_sensors = callPackage ../os-specific/linux/lm-sensors { };
+
+  lockdep = callPackage ../os-specific/linux/lockdep { };
+
+  lsiutil = callPackage ../os-specific/linux/lsiutil { };
+
+  kmod = callPackage ../os-specific/linux/kmod { };
+
+  kmod-blacklist-ubuntu = callPackage ../os-specific/linux/kmod-blacklist-ubuntu { };
+
+  kvm = qemu_kvm;
+
+  libcap = callPackage ../os-specific/linux/libcap { };
+
+  libcap_progs = callPackage ../os-specific/linux/libcap/progs.nix { };
+
+  libcap_pam = callPackage ../os-specific/linux/libcap/pam.nix { };
+
+  libcap_manpages = callPackage ../os-specific/linux/libcap/man.nix { };
+
+  libcap_ng = callPackage ../os-specific/linux/libcap-ng { };
+
+  libnscd = callPackage ../os-specific/linux/libnscd { };
+
+  libnotify = callPackage ../development/libraries/libnotify { };
+
+  libvolume_id = callPackage ../os-specific/linux/libvolume_id { };
+
+  lsscsi = callPackage ../os-specific/linux/lsscsi { };
+
+  lvm2 = callPackage ../os-specific/linux/lvm2 { };
+
+  mdadm = callPackage ../os-specific/linux/mdadm { };
+
+  mingetty = callPackage ../os-specific/linux/mingetty { };
+
+  module_init_tools = callPackage ../os-specific/linux/module-init-tools { };
+
+  aggregateModules = modules:
+    callPackage ../os-specific/linux/kmod/aggregator.nix {
+      inherit modules;
+    };
+
+  multipath_tools = callPackage ../os-specific/linux/multipath-tools { };
+
+  musl = callPackage ../os-specific/linux/musl { };
+
+  nettools = callPackage ../os-specific/linux/net-tools { };
+
+  neverball = callPackage ../games/neverball {
+    libpng = libpng15;
+  };
+
+  nftables = callPackage ../os-specific/linux/nftables { };
+
+  numactl = callPackage ../os-specific/linux/numactl { };
+
+  gocode = callPackage ../development/tools/gocode { };
+
+  gogoclient = callPackage ../os-specific/linux/gogoclient { };
+
+  nss_ldap = callPackage ../os-specific/linux/nss_ldap { };
+
+  pam = callPackage ../os-specific/linux/pam { };
+
+  # pam_bioapi ( see http://www.thinkwiki.org/wiki/How_to_enable_the_fingerprint_reader )
+
+  pam_ccreds = callPackage ../os-specific/linux/pam_ccreds { };
+
+  pam_console = callPackage ../os-specific/linux/pam_console {
+    libtool = libtool_1_5;
+  };
+
+  pam_devperm = callPackage ../os-specific/linux/pam_devperm { };
+
+  pam_krb5 = callPackage ../os-specific/linux/pam_krb5 { };
+
+  pam_ldap = callPackage ../os-specific/linux/pam_ldap { };
+
+  pam_login = callPackage ../os-specific/linux/pam_login { };
+
+  pam_ssh_agent_auth = callPackage ../os-specific/linux/pam_ssh_agent_auth { };
+
+  pam_usb = callPackage ../os-specific/linux/pam_usb { };
+
+  paxctl = callPackage ../os-specific/linux/paxctl { };
+
+  pax-utils = callPackage ../os-specific/linux/pax-utils { };
+
+  pcmciaUtils = callPackage ../os-specific/linux/pcmciautils {
+    firmware = config.pcmciaUtils.firmware or [];
+    config = config.pcmciaUtils.config or null;
+  };
+
+  plymouth = callPackage ../os-specific/linux/plymouth {
+    automake = automake113x;
+  };
+
+  pmount = callPackage ../os-specific/linux/pmount { };
+
+  pmutils = callPackage ../os-specific/linux/pm-utils { };
+
+  pmtools = callPackage ../os-specific/linux/pmtools { };
+
+  policycoreutils = callPackage ../os-specific/linux/policycoreutils { };
+
+  powertop = callPackage ../os-specific/linux/powertop { };
+
+  prayer = callPackage ../servers/prayer { };
+
+  procps = procps-ng;
+
+  procps-old = lowPrio (callPackage ../os-specific/linux/procps { });
+
+  procps-ng = callPackage ../os-specific/linux/procps-ng { };
+
+  watch = callPackage ../os-specific/linux/procps/watch.nix { };
+
+  qemu_kvm = lowPrio (qemu.override { x86Only = true; });
+
+  firmwareLinuxNonfree = callPackage ../os-specific/linux/firmware/firmware-linux-nonfree { };
+
+  radeontools = callPackage ../os-specific/linux/radeontools { };
+
+  raspberrypifw = callPackage ../os-specific/linux/firmware/raspberrypi {};
+
+  regionset = callPackage ../os-specific/linux/regionset { };
+
+  rfkill = callPackage ../os-specific/linux/rfkill { };
+
+  rfkill_udev = callPackage ../os-specific/linux/rfkill/udev.nix { };
+
+  rtkit = callPackage ../os-specific/linux/rtkit { };
+
+  sdparm = callPackage ../os-specific/linux/sdparm { };
+
+  sepolgen = callPackage ../os-specific/linux/sepolgen { };
+
+  setools = callPackage ../os-specific/linux/setools { };
+
+  shadow = callPackage ../os-specific/linux/shadow { };
+
+  statifier = builderDefsPackage (import ../os-specific/linux/statifier) { };
+
+  sysdig = callPackage ../os-specific/linux/sysdig {
+    kernel = null;
+  }; # pkgs.sysdig is a client, for a driver look at linuxPackagesFor
+
+  sysfsutils = callPackage ../os-specific/linux/sysfsutils { };
+
+  sysprof = callPackage ../development/tools/profiling/sysprof {
+    inherit (gnome) libglade;
+  };
+
+  # Provided with sysfsutils.
+  libsysfs = sysfsutils;
+  systool = sysfsutils;
+
+  sysklogd = callPackage ../os-specific/linux/sysklogd { };
+
+  syslinux = callPackage ../os-specific/linux/syslinux { };
+
+  sysstat = callPackage ../os-specific/linux/sysstat { };
+
+  systemd = callPackage ../os-specific/linux/systemd {
+    linuxHeaders = linuxHeaders_3_14;
+  };
+
+  systemtap = callPackage ../development/tools/profiling/systemtap {
+    inherit (gnome) libglademm;
+  };
+
+  # In nixos, you can set systemd.package = pkgs.systemd_with_lvm2 to get
+  # LVM2 working in systemd.
+  systemd_with_lvm2 = pkgs.lib.overrideDerivation pkgs.systemd (p: {
+      name = p.name + "-with-lvm2";
+      postInstall = p.postInstall + ''
+        cp "${pkgs.lvm2}/lib/systemd/system-generators/"* $out/lib/systemd/system-generators
+      '';
+  });
+
+  sysvinit = callPackage ../os-specific/linux/sysvinit { };
+
+  sysvtools = callPackage ../os-specific/linux/sysvinit {
+    withoutInitTools = true;
+  };
+
+  # FIXME: `tcp-wrapper' is actually not OS-specific.
+  tcp_wrappers = callPackage ../os-specific/linux/tcp-wrappers { };
+
+  trackballs = callPackage ../games/trackballs {
+    debug = false;
+    guile = guile_1_8;
+  };
+
+  tunctl = callPackage ../os-specific/linux/tunctl { };
+
+  ubootChooser = name : if name == "upstream" then ubootUpstream
+    else if name == "sheevaplug" then ubootSheevaplug
+    else if name == "guruplug" then ubootGuruplug
+    else if name == "nanonote" then ubootNanonote
+    else throw "Unknown uboot";
+
+  ubootUpstream = callPackage ../misc/uboot { };
+
+  ubootSheevaplug = callPackage ../misc/uboot/sheevaplug.nix { };
+
+  ubootNanonote = callPackage ../misc/uboot/nanonote.nix { };
+
+  ubootGuruplug = callPackage ../misc/uboot/guruplug.nix { };
+
+  uclibc = callPackage ../os-specific/linux/uclibc { };
+
+  uclibcCross = lowPrio (callPackage ../os-specific/linux/uclibc {
+    inherit fetchurl stdenv libiconv;
+    linuxHeaders = linuxHeadersCross;
+    gccCross = gccCrossStageStatic;
+    cross = assert crossSystem != null; crossSystem;
+  });
+
+  udev145 = callPackage ../os-specific/linux/udev/145.nix { };
+  udev = pkgs.systemd;
+
+  udisks1 = callPackage ../os-specific/linux/udisks/1-default.nix { };
+  udisks2 = callPackage ../os-specific/linux/udisks/2-default.nix { };
+  udisks = udisks1;
+
+  udisks_glue = callPackage ../os-specific/linux/udisks-glue { };
+
+  untie = callPackage ../os-specific/linux/untie { };
+
+  upower = callPackage ../os-specific/linux/upower { };
+
+  upower_99 = callPackage ../os-specific/linux/upower/0.99.nix { };
+
+  upstart = callPackage ../os-specific/linux/upstart { };
+
+  usbutils = callPackage ../os-specific/linux/usbutils { };
+
+  usermount = callPackage ../os-specific/linux/usermount { };
+
+  utillinux = lowPrio (callPackage ../os-specific/linux/util-linux {
+    ncurses = null;
+    perl = null;
+  });
+
+  utillinuxCurses = utillinux.override {
+    inherit ncurses perl;
+  };
+
+  v4l_utils = callPackage ../os-specific/linux/v4l-utils {
+    withQt4 = true;
+  };
+
+  windows = rec {
+    cygwinSetup = callPackage ../os-specific/windows/cygwin-setup { };
+
+    jom = callPackage ../os-specific/windows/jom { };
+
+    w32api = callPackage ../os-specific/windows/w32api {
+      gccCross = gccCrossStageStatic;
+      binutilsCross = binutilsCross;
+    };
+
+    w32api_headers = w32api.override {
+      onlyHeaders = true;
+    };
+
+    mingw_runtime = callPackage ../os-specific/windows/mingwrt {
+      gccCross = gccCrossMingw2;
+      binutilsCross = binutilsCross;
+    };
+
+    mingw_runtime_headers = mingw_runtime.override {
+      onlyHeaders = true;
+    };
+
+    mingw_headers1 = buildEnv {
+      name = "mingw-headers-1";
+      paths = [ w32api_headers mingw_runtime_headers ];
+    };
+
+    mingw_headers2 = buildEnv {
+      name = "mingw-headers-2";
+      paths = [ w32api mingw_runtime_headers ];
+    };
+
+    mingw_headers3 = buildEnv {
+      name = "mingw-headers-3";
+      paths = [ w32api mingw_runtime ];
+    };
+
+    mingw_w64 = callPackage ../os-specific/windows/mingw-w64 {
+      gccCross = gccCrossStageStatic;
+      binutilsCross = binutilsCross;
+    };
+
+    mingw_w64_headers = callPackage ../os-specific/windows/mingw-w64 {
+      onlyHeaders = true;
+    };
+
+    mingw_w64_pthreads = callPackage ../os-specific/windows/mingw-w64 {
+      onlyPthreads = true;
+    };
+
+    pthreads = callPackage ../os-specific/windows/pthread-w32 {
+      mingw_headers = mingw_headers3;
+    };
+
+    wxMSW = callPackage ../os-specific/windows/wxMSW-2.8 { };
+  };
+
+  wesnoth = callPackage ../games/wesnoth {
+    lua = lua5;
+  };
+
+  wirelesstools = callPackage ../os-specific/linux/wireless-tools { };
+
+  wpa_supplicant = callPackage ../os-specific/linux/wpa_supplicant { };
+
+  wpa_supplicant_gui = callPackage ../os-specific/linux/wpa_supplicant/gui.nix { };
+
+  xf86_input_mtrack = callPackage ../os-specific/linux/xf86-input-mtrack {
+    inherit (xorg) utilmacros xproto inputproto xorgserver;
+  };
+
+  xf86_input_multitouch =
+    callPackage ../os-specific/linux/xf86-input-multitouch { };
+
+  xf86_input_wacom = callPackage ../os-specific/linux/xf86-input-wacom { };
+
+  xf86_video_nested = callPackage ../os-specific/linux/xf86-video-nested {
+    inherit (xorg) fontsproto renderproto utilmacros xorgserver;
+  };
+
+  xf86_video_nouveau = xorg.xf86videonouveau;
+
+  xmoto = builderDefsPackage (import ../games/xmoto) {
+    inherit chipmunk sqlite curl zlib bzip2 libjpeg libpng
+      freeglut mesa SDL SDL_mixer SDL_image SDL_net SDL_ttf
+      lua5 ode libxdg_basedir libxml2;
+  };
+
+  xorg_sys_opengl = callPackage ../os-specific/linux/opengl/xorg-sys { };
+
+  zd1211fw = callPackage ../os-specific/linux/firmware/zd1211 { };
+
+
+  ### DATA
+
+  andagii = callPackage ../data/fonts/andagii {};
+
+  anonymousPro = callPackage ../data/fonts/anonymous-pro {};
+
+  arkpandora_ttf = builderDefsPackage (import ../data/fonts/arkpandora) { };
+
+  aurulent-sans = callPackage ../data/fonts/aurulent-sans { };
+
+  bakoma_ttf = callPackage ../data/fonts/bakoma-ttf { };
+
+  cacert = callPackage ../data/misc/cacert { };
+
+  cantarell_fonts = callPackage ../data/fonts/cantarell-fonts { };
+
+  comic-neue = callPackage ../data/fonts/comic-neue { };
+
+  corefonts = callPackage ../data/fonts/corefonts { };
+
+  wrapFonts = paths : ((import ../data/fonts/fontWrap) {
+    inherit fetchurl stdenv builderDefs paths;
+    inherit (xorg) mkfontdir mkfontscale;
+  });
+
+  clearlyU = callPackage ../data/fonts/clearlyU { };
+
+  cm_unicode = callPackage ../data/fonts/cm-unicode {};
+
+  dejavu_fonts = callPackage ../data/fonts/dejavu-fonts {
+    inherit (perlPackages) FontTTF;
+  };
+
+  docbook5 = callPackage ../data/sgml+xml/schemas/docbook-5.0 { };
+
+  docbook_sgml_dtd_31 = callPackage ../data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix { };
+
+  docbook_sgml_dtd_41 = callPackage ../data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix { };
+
+  docbook_xml_dtd_412 = callPackage ../data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix { };
+
+  docbook_xml_dtd_42 = callPackage ../data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix { };
+
+  docbook_xml_dtd_43 = callPackage ../data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix { };
+
+  docbook_xml_dtd_45 = callPackage ../data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix { };
+
+  docbook_xml_ebnf_dtd = callPackage ../data/sgml+xml/schemas/xml-dtd/docbook-ebnf { };
+
+  docbook_xml_xslt = docbook_xsl;
+
+  docbook_xsl = callPackage ../data/sgml+xml/stylesheets/xslt/docbook-xsl { };
+
+  docbook5_xsl = docbook_xsl_ns;
+
+  docbook_xsl_ns = callPackage ../data/sgml+xml/stylesheets/xslt/docbook-xsl-ns { };
+
+  dosemu_fonts = callPackage ../data/fonts/dosemu-fonts { };
+
+  eb-garamond = callPackage ../data/fonts/eb-garamond { };
+
+  fira = callPackage ../data/fonts/fira { };
+
+  freefont_ttf = callPackage ../data/fonts/freefont-ttf { };
+
+  freepats = callPackage ../data/misc/freepats { };
+
+  gentium = callPackage ../data/fonts/gentium {};
+
+  gnome_user_docs = callPackage ../data/documentation/gnome-user-docs { };
+
+  inherit (gnome3) gsettings_desktop_schemas;
+
+  hicolor_icon_theme = callPackage ../data/icons/hicolor-icon-theme { };
+
+  inconsolata = callPackage ../data/fonts/inconsolata {};
+
+  ipafont = callPackage ../data/fonts/ipafont {};
+
+  junicode = callPackage ../data/fonts/junicode { };
+
+  kochi-substitute = callPackage ../data/fonts/kochi-substitute {};
+
+  kochi-substitute-naga10 = callPackage ../data/fonts/kochi-substitute-naga10 {};
+
+  liberation_ttf = callPackage ../data/fonts/redhat-liberation-fonts { };
+
+  libertine = builderDefsPackage (import ../data/fonts/libertine) {
+    inherit fetchurl fontforge lib;
+  };
+
+  lmmath = callPackage ../data/fonts/lmodern/lmmath.nix {};
+
+  lmodern = callPackage ../data/fonts/lmodern { };
+
+  lohit-fonts = callPackage ../data/fonts/lohit-fonts { };
+
+  manpages = callPackage ../data/documentation/man-pages { };
+
+  miscfiles = callPackage ../data/misc/miscfiles { };
+
+  mobile_broadband_provider_info = callPackage ../data/misc/mobile-broadband-provider-info { };
+
+  mph_2b_damase = callPackage ../data/fonts/mph-2b-damase { };
+
+  nafees = callPackage ../data/fonts/nafees { };
+
+  oldstandard = callPackage ../data/fonts/oldstandard { };
+
+  opensans-ttf = callPackage ../data/fonts/opensans-ttf { };
+
+  poly = callPackage ../data/fonts/poly { };
+
+  posix_man_pages = callPackage ../data/documentation/man-pages-posix { };
+
+  pthreadmanpages = callPackage ../data/documentation/pthread-man-pages { };
+
+  shared_mime_info = callPackage ../data/misc/shared-mime-info { };
+
+  shared_desktop_ontologies = callPackage ../data/misc/shared-desktop-ontologies { };
+
+  stdmanpages = callPackage ../data/documentation/std-man-pages { };
+
+  symbola = callPackage ../data/fonts/symbola { };
+
+  iana_etc = callPackage ../data/misc/iana-etc { };
+
+  poppler_data = callPackage ../data/misc/poppler-data { };
+
+  r3rs = callPackage ../data/documentation/rnrs/r3rs.nix { };
+
+  r4rs = callPackage ../data/documentation/rnrs/r4rs.nix { };
+
+  r5rs = callPackage ../data/documentation/rnrs/r5rs.nix { };
+
+  source-code-pro = callPackage ../data/fonts/source-code-pro {};
+
+  source-sans-pro = callPackage ../data/fonts/source-sans-pro { };
+
+  source-serif-pro = callPackage ../data/fonts/source-serif-pro { };
+
+  source-han-sans-japanese = callPackage ../data/fonts/source-han-sans/japanese.nix {};
+  source-han-sans-korean = callPackage ../data/fonts/source-han-sans/korean.nix {};
+  source-han-sans-simplified-chinese = callPackage ../data/fonts/source-han-sans/simplified-chinese.nix {};
+  source-han-sans-traditional-chinese = callPackage ../data/fonts/source-han-sans/traditional-chinese.nix {};
+
+  tango-icon-theme = callPackage ../data/icons/tango-icon-theme { };
+
+  themes = name: import (../data/misc/themes + ("/" + name + ".nix")) {
+    inherit fetchurl;
+  };
+
+  theano = callPackage ../data/fonts/theano { };
+
+  tempora_lgc = callPackage ../data/fonts/tempora-lgc { };
+
+  terminus_font = callPackage ../data/fonts/terminus-font { };
+
+  tipa = callPackage ../data/fonts/tipa { };
+
+  ttf_bitstream_vera = callPackage ../data/fonts/ttf-bitstream-vera { };
+
+  tzdata = callPackage ../data/misc/tzdata { };
+
+  ubuntu_font_family = callPackage ../data/fonts/ubuntu-font-family { };
+
+  ucsFonts = callPackage ../data/fonts/ucs-fonts { };
+
+  unifont = callPackage ../data/fonts/unifont { };
+
+  vistafonts = callPackage ../data/fonts/vista-fonts { };
+
+  wqy_microhei = callPackage ../data/fonts/wqy-microhei { };
+
+  wqy_zenhei = callPackage ../data/fonts/wqy-zenhei { };
+
+  xhtml1 = callPackage ../data/sgml+xml/schemas/xml-dtd/xhtml1 { };
+
+  xkeyboard_config = xorg.xkeyboardconfig;
+
+
+  ### APPLICATIONS
+
+  a2jmidid = callPackage ../applications/audio/a2jmidid { };
+
+  aangifte2006 = callPackage_i686 ../applications/taxes/aangifte-2006 { };
+
+  aangifte2007 = callPackage_i686 ../applications/taxes/aangifte-2007 { };
+
+  aangifte2008 = callPackage_i686 ../applications/taxes/aangifte-2008 { };
+
+  aangifte2009 = callPackage_i686 ../applications/taxes/aangifte-2009 { };
+
+  aangifte2010 = callPackage_i686 ../applications/taxes/aangifte-2010 { };
+
+  aangifte2011 = callPackage_i686 ../applications/taxes/aangifte-2011 { };
+
+  aangifte2012 = callPackage_i686 ../applications/taxes/aangifte-2012 { };
+
+  aangifte2013 = callPackage_i686 ../applications/taxes/aangifte-2013 { };
+
+  abcde = callPackage ../applications/audio/abcde {
+    inherit (perlPackages) DigestSHA MusicBrainz MusicBrainzDiscID;
+    libcdio = libcdio082;
+  };
+
+  abiword = callPackage ../applications/office/abiword {
+    inherit (gnome) libglade libgnomecanvas;
+  };
+
+  abook = callPackage ../applications/misc/abook { };
+
+  adobe-reader = callPackage_i686 ../applications/misc/adobe-reader { };
+
+  aewan = callPackage ../applications/editors/aewan { };
+
+  alchemy = callPackage ../applications/graphics/alchemy { };
+
+  ams-lv2 = callPackage ../applications/audio/ams-lv2 { };
+
+  amsn = callPackage ../applications/networking/instant-messengers/amsn { };
+
+  antiword = callPackage ../applications/office/antiword {};
+
+  ardour = ardour3;
+
+  ardour3 =  lowPrio (callPackage ../applications/audio/ardour {
+    inherit (gnome) libgnomecanvas libgnomecanvasmm;
+  });
+
+  arora = callPackage ../applications/networking/browsers/arora { };
+
+  atom = callPackage ../applications/editors/atom {
+    gconf = gnome.GConf;
+  };
+
+  aseprite = callPackage ../applications/editors/aseprite {
+    giflib = giflib_4_1;
+  };
+
+  audacious = callPackage ../applications/audio/audacious { };
+
+  audacity = callPackage ../applications/audio/audacity {
+    ffmpeg = ffmpeg_0_10;
+  };
+
+  milkytracker = callPackage ../applications/audio/milkytracker { };
+
+  aumix = callPackage ../applications/audio/aumix {
+    gtkGUI = false;
+  };
+
+  autopanosiftc = callPackage ../applications/graphics/autopanosiftc { };
+
+  avidemux = callPackage ../applications/video/avidemux { };
+
+  avogadro = callPackage ../applications/science/chemistry/avogadro {
+    eigen = eigen2;
+  };
+
+  avrdudess = callPackage ../applications/misc/avrdudess { };
+
+  avxsynth = callPackage ../applications/video/avxsynth { };
+
+  awesome-3-4 = callPackage ../applications/window-managers/awesome/3.4.nix {
+    lua = lua5;
+    cairo = cairo.override { xcbSupport = true; };
+  };
+  awesome-3-5 = callPackage ../applications/window-managers/awesome {
+    lua   = lua5_1;
+    cairo = cairo.override { xcbSupport = true; };
+  };
+  awesome = awesome-3-5;
+
+  inherit (gnome3) baobab;
+
+  backintime-common = callPackage ../applications/networking/sync/backintime/common.nix { };
+
+  backintime-gnome = callPackage ../applications/networking/sync/backintime/gnome.nix { };
+
+  backintime = backintime-gnome;
+
+  bar = callPackage ../applications/window-managers/bar { };
+
+  baresip = callPackage ../applications/networking/instant-messengers/baresip {
+    ffmpeg = ffmpeg_1;
+  };
+
+  batik = callPackage ../applications/graphics/batik { };
+
+  bazaar = callPackage ../applications/version-management/bazaar { };
+
+  bazaarTools = builderDefsPackage (import ../applications/version-management/bazaar/tools.nix) {
+    inherit bazaar;
+  };
+
+  beast = callPackage ../applications/audio/beast {
+    inherit (gnome) libgnomecanvas libart_lgpl;
+    guile = guile_1_8;
+  };
+
+  bibletime = callPackage ../applications/misc/bibletime { };
+
+  bitcoin = callPackage ../applications/misc/bitcoin {};
+  bitcoind = callPackage ../applications/misc/bitcoin { gui = false; };
+
+  altcoins = recurseIntoAttrs (
+    callPackage ../applications/misc/bitcoin/altcoins.nix {}
+  );
+
+  bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee {
+    gnutls = gnutls;
+    libotr = libotr_3_2;
+  };
+
+  blender = callPackage  ../applications/misc/blender {
+    python = python34;
+  };
+
+  bristol = callPackage ../applications/audio/bristol { };
+
+  bspwm = callPackage ../applications/window-managers/bspwm { };
+
+  bvi = callPackage ../applications/editors/bvi { };
+
+  calf = callPackage ../applications/audio/calf {
+      inherit (gnome) libglade;
+  };
+
+  calibre = callPackage ../applications/misc/calibre {
+    inherit (pythonPackages) pyqt5 sip_4_16;
+  };
+
+  camlistore = callPackage ../applications/misc/camlistore { };
+
+  carrier = builderDefsPackage (import ../applications/networking/instant-messengers/carrier/2.5.0.nix) {
+    inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 openssl nss
+      gtkspell aspell gettext ncurses avahi dbus dbus_glib python
+      libtool automake autoconf gstreamer;
+    inherit gtk glib;
+    inherit (gnome) startupnotification GConf ;
+    inherit (xlibs) libXScrnSaver scrnsaverproto libX11 xproto kbproto;
+  };
+  funpidgin = carrier;
+
+  cc1394 = callPackage ../applications/video/cc1394 { };
+
+  cddiscid = callPackage ../applications/audio/cd-discid { };
+
+  cdparanoia = cdparanoiaIII;
+
+  cdparanoiaIII = callPackage ../applications/audio/cdparanoia { };
+
+  cdrtools = callPackage ../applications/misc/cdrtools { };
+
+  centerim = callPackage ../applications/networking/instant-messengers/centerim { };
+
+  cgit = callPackage ../applications/version-management/git-and-tools/cgit { };
+
+  cgminer = callPackage ../applications/misc/cgminer {
+    amdappsdk = amdappsdk28;
+  };
+
+  chatzilla = callPackage ../applications/networking/irc/chatzilla { };
+
+  chromium = callPackage ../applications/networking/browsers/chromium {
+    channel = "stable";
+    pulseSupport = config.pulseaudio or true;
+    enablePepperFlash = config.chromium.enablePepperFlash or false;
+    enablePepperPDF = config.chromium.enablePepperPDF or false;
+  };
+
+  chromiumBeta = lowPrio (chromium.override { channel = "beta"; });
+
+  chromiumDev = lowPrio (chromium.override { channel = "dev"; });
+
+  cinelerra = callPackage ../applications/video/cinelerra { };
+
+  clipit = callPackage ../applications/misc/clipit { };
+
+  cmus = callPackage ../applications/audio/cmus { };
+
+  compiz = callPackage ../applications/window-managers/compiz {
+    inherit (gnome) GConf ORBit2 metacity;
+    boost = boost149; # https://bugs.launchpad.net/compiz/+bug/1131864
+  };
+
+  coriander = callPackage ../applications/video/coriander {
+    inherit (gnome) libgnomeui GConf;
+  };
+
+  csound = callPackage ../applications/audio/csound { };
+
+  cinepaint = callPackage ../applications/graphics/cinepaint {
+    fltk = fltk13;
+    libpng = libpng12;
+  };
+
+  codeblocks = callPackage ../applications/editors/codeblocks { };
+  codeblocksFull = callPackage ../applications/editors/codeblocks { contribPlugins = true; };
+
+  codeville = builderDefsPackage (import ../applications/version-management/codeville/0.8.0.nix) {
+    inherit makeWrapper;
+    python = pythonFull;
+  };
+
+  comical = callPackage ../applications/graphics/comical { };
+
+  conkeror = callPackage ../applications/networking/browsers/conkeror { };
+
+  conkerorWrapper = wrapFirefox {
+    browser = conkeror;
+    browserName = "conkeror";
+    desktopName = "Conkeror";
+  };
+
+  cuneiform = builderDefsPackage (import ../tools/graphics/cuneiform) {
+    inherit cmake patchelf;
+    imagemagick = imagemagick;
+  };
+
+  cvs = callPackage ../applications/version-management/cvs { };
+
+  cvsps = callPackage ../applications/version-management/cvsps { };
+
+  cvs2svn = callPackage ../applications/version-management/cvs2svn { };
+
+  d4x = callPackage ../applications/misc/d4x { };
+
+  darcs = with haskellPackages_ghc783; callPackage ../applications/version-management/darcs {
+    cabal = cabal.override {
+      extension = self : super : {
+        isLibrary = false;
+        configureFlags = "-f-library " + super.configureFlags or "";
+      };
+    };
+  };
+
+  darktable = callPackage ../applications/graphics/darktable {
+    inherit (gnome) GConf libglade;
+  };
+
+  dd-agent = callPackage ../tools/networking/dd-agent { inherit (pythonPackages) tornado; };
+
+  dia = callPackage ../applications/graphics/dia {
+    inherit (pkgs.gnome) libart_lgpl libgnomeui;
+  };
+
+  diffuse = callPackage ../applications/version-management/diffuse { };
+
+  distrho = callPackage ../applications/audio/distrho {};
+
+  djvulibre = callPackage ../applications/misc/djvulibre { };
+
+  djvu2pdf = callPackage ../tools/typesetting/djvu2pdf { };
+
+  djview = callPackage ../applications/graphics/djview { };
+  djview4 = pkgs.djview;
+
+  dmenu = callPackage ../applications/misc/dmenu {
+    enableXft = config.dmenu.enableXft or false;
+  };
+
+  dmtx = builderDefsPackage (import ../tools/graphics/dmtx) {
+    inherit libpng libtiff libjpeg imagemagick librsvg
+      pkgconfig bzip2 zlib libtool freetype fontconfig
+      ghostscript jasper xz;
+    inherit (xlibs) libX11;
+  };
+
+  docker = callPackage ../applications/virtualization/docker { };
+
+  doodle = callPackage ../applications/search/doodle { };
+
+  dunst = callPackage ../applications/misc/dunst { };
+
+  dvb_apps  = callPackage ../applications/video/dvb-apps { };
+
+  dvdauthor = callPackage ../applications/video/dvdauthor { };
+
+  dwb = callPackage ../applications/networking/browsers/dwb { dconf = gnome3.dconf; };
+
+  dwbWrapper = wrapFirefox
+    { browser = dwb; browserName = "dwb"; desktopName = "dwb";
+    };
+
+  dwm = callPackage ../applications/window-managers/dwm {
+    patches = config.dwm.patches or [];
+  };
+
+  dzen2 = callPackage ../applications/window-managers/dzen2 { };
+
+  eaglemode = callPackage ../applications/misc/eaglemode { };
+
+  eclipses = recurseIntoAttrs (callPackage ../applications/editors/eclipse { });
+
+  ed = callPackage ../applications/editors/ed { };
+
+  ekho = callPackage ../applications/audio/ekho { };
+
+  electrum = callPackage ../applications/misc/electrum { };
+
+  elinks = callPackage ../applications/networking/browsers/elinks { };
+
+  elvis = callPackage ../applications/editors/elvis { };
+
+  emacs = emacs24;
+
+  emacs24 = callPackage ../applications/editors/emacs-24 {
+    # use override to enable additional features
+    libXaw = xlibs.libXaw;
+    Xaw3d = null;
+    gconf = null;
+    librsvg = null;
+    alsaLib = null;
+    imagemagick = null;
+  };
+
+  emacs24-nox = lowPrio (appendToName "nox" (emacs24.override {
+    withX = false;
+  }));
+
+  emacs24Macport = lowPrio (callPackage ../applications/editors/emacs-24/macport.nix {
+    stdenv = pkgs.clangStdenv;
+  });
+
+  emacsPackages = emacs: self: let callPackage = newScope self; in rec {
+    inherit emacs;
+
+    autoComplete = callPackage ../applications/editors/emacs-modes/auto-complete { };
+
+    bbdb = callPackage ../applications/editors/emacs-modes/bbdb { };
+
+    bbdb3 = callPackage ../applications/editors/emacs-modes/bbdb/3.nix {};
+
+    cedet = callPackage ../applications/editors/emacs-modes/cedet { };
+
+    calfw = callPackage ../applications/editors/emacs-modes/calfw { };
+
+    coffee = callPackage ../applications/editors/emacs-modes/coffee { };
+
+    colorTheme = callPackage ../applications/editors/emacs-modes/color-theme { };
+
+    colorThemeSolarized = callPackage ../applications/editors/emacs-modes/color-theme-solarized { };
+
+    cryptol = callPackage ../applications/editors/emacs-modes/cryptol { };
+
+    cua = callPackage ../applications/editors/emacs-modes/cua { };
+
+    darcsum = callPackage ../applications/editors/emacs-modes/darcsum { };
+
+    # ecb = callPackage ../applications/editors/emacs-modes/ecb { };
+
+    jabber = callPackage ../applications/editors/emacs-modes/jabber { };
+
+    emacsClangCompleteAsync = callPackage ../applications/editors/emacs-modes/emacs-clang-complete-async { };
+
+    emacsSessionManagement = callPackage ../applications/editors/emacs-modes/session-management-for-emacs { };
+
+    emacsw3m = callPackage ../applications/editors/emacs-modes/emacs-w3m { };
+
+    emms = callPackage ../applications/editors/emacs-modes/emms { };
+
+    ess = callPackage ../applications/editors/emacs-modes/ess { };
+
+    flymakeCursor = callPackage ../applications/editors/emacs-modes/flymake-cursor { };
+
+    gh = callPackage ../applications/editors/emacs-modes/gh { };
+
+    graphvizDot = callPackage ../applications/editors/emacs-modes/graphviz-dot { };
+
+    gist = callPackage ../applications/editors/emacs-modes/gist { };
+
+    idris = callPackage ../applications/editors/emacs-modes/idris { };
+
+    jade = callPackage ../applications/editors/emacs-modes/jade { };
+
+    jdee = callPackage ../applications/editors/emacs-modes/jdee {
+      # Requires Emacs 23, for `avl-tree'.
+    };
+
+    js2 = callPackage ../applications/editors/emacs-modes/js2 { };
+
+    stratego = callPackage ../applications/editors/emacs-modes/stratego { };
+
+    haskellMode = callPackage ../applications/editors/emacs-modes/haskell { };
+
+    ocamlMode = callPackage ../applications/editors/emacs-modes/ocaml { };
+
+    structuredHaskellMode = callPackage ../applications/editors/emacs-modes/structured-haskell-mode {
+      inherit (haskellPackages) cabal haskellSrcExts;
+    };
+
+    tuaregMode = callPackage ../applications/editors/emacs-modes/tuareg { };
+
+    hol_light_mode = callPackage ../applications/editors/emacs-modes/hol_light { };
+
+    htmlize = callPackage ../applications/editors/emacs-modes/htmlize { };
+
+    logito = callPackage ../applications/editors/emacs-modes/logito { };
+
+    loremIpsum = callPackage ../applications/editors/emacs-modes/lorem-ipsum { };
+
+    magit = callPackage ../applications/editors/emacs-modes/magit { };
+
+    maudeMode = callPackage ../applications/editors/emacs-modes/maude { };
+
+    metaweblog = callPackage ../applications/editors/emacs-modes/metaweblog { };
+
+    notmuch = lowPrio (callPackage ../applications/networking/mailreaders/notmuch { });
+
+    offlineimap = callPackage ../applications/editors/emacs-modes/offlineimap {};
+
+    # This is usually a newer version of Org-Mode than that found in GNU Emacs, so
+    # we want it to have higher precedence.
+    org = hiPrio (callPackage ../applications/editors/emacs-modes/org { });
+
+    org2blog = callPackage ../applications/editors/emacs-modes/org2blog { };
+
+    pcache = callPackage ../applications/editors/emacs-modes/pcache { };
+
+    phpMode = callPackage ../applications/editors/emacs-modes/php { };
+
+    prologMode = callPackage ../applications/editors/emacs-modes/prolog { };
+
+    proofgeneral_4_2 = callPackage ../applications/editors/emacs-modes/proofgeneral/4.2.nix {
+      texinfo = texinfo4 ;
+      texLive = pkgs.texLiveAggregationFun {
+        paths = [ pkgs.texLive pkgs.texLiveCMSuper ];
+      };
+    };
+    proofgeneral_4_3_pre = callPackage ../applications/editors/emacs-modes/proofgeneral/4.3pre.nix {
+      texinfo = texinfo4 ;
+      texLive = pkgs.texLiveAggregationFun {
+        paths = [ pkgs.texLive pkgs.texLiveCMSuper ];
+      };
+    };
+    proofgeneral = self.proofgeneral_4_2;
+
+    quack = callPackage ../applications/editors/emacs-modes/quack { };
+
+    rectMark = callPackage ../applications/editors/emacs-modes/rect-mark { };
+
+    remember = callPackage ../applications/editors/emacs-modes/remember { };
+
+    rudel = callPackage ../applications/editors/emacs-modes/rudel { };
+
+    sbtMode = callPackage ../applications/editors/emacs-modes/sbt-mode { };
+
+    scalaMode1 = callPackage ../applications/editors/emacs-modes/scala-mode/v1.nix { };
+    scalaMode2 = callPackage ../applications/editors/emacs-modes/scala-mode/v2.nix { };
+
+    sunriseCommander = callPackage ../applications/editors/emacs-modes/sunrise-commander { };
+
+    writeGood = callPackage ../applications/editors/emacs-modes/writegood { };
+
+    xmlRpc = callPackage ../applications/editors/emacs-modes/xml-rpc { };
+  };
+
+  emacs24Packages = recurseIntoAttrs (emacsPackages emacs24 pkgs.emacs24Packages);
+
+  inherit (gnome3) empathy;
+
+  epdfview = callPackage ../applications/misc/epdfview { };
+
+  inherit (gnome3) epiphany;
+
+  espeak = callPackage ../applications/audio/espeak { };
+
+  espeakedit = callPackage ../applications/audio/espeak/edit.nix { };
+
+  esniper = callPackage ../applications/networking/esniper { };
+
+  etherape = callPackage ../applications/networking/sniffers/etherape {
+    inherit (gnome) gnomedocutils libgnome libglade libgnomeui scrollkeeper;
+  };
+
+  evilvte = callPackage ../applications/misc/evilvte {
+    configH = config.evilvte.config or "";
+  };
+
+  evopedia = callPackage ../applications/misc/evopedia { };
+
+  keepassx = callPackage ../applications/misc/keepassx { };
+  keepassx2 = callPackage ../applications/misc/keepassx/2.0.nix { };
+
+  inherit (gnome3) evince;
+  evolution_data_server = gnome3.evolution_data_server;
+
+  keepass = callPackage ../applications/misc/keepass { };
+
+  exrdisplay = callPackage ../applications/graphics/exrdisplay {
+    fltk = fltk20;
+  };
+
+  fbpanel = callPackage ../applications/window-managers/fbpanel { };
+
+  fbreader = callPackage ../applications/misc/fbreader { };
+
+  fetchmail = import ../applications/misc/fetchmail {
+    inherit stdenv fetchurl openssl;
+  };
+
+  fldigi = callPackage ../applications/audio/fldigi { };
+
+  fluidsynth = callPackage ../applications/audio/fluidsynth { };
+
+  fossil = callPackage ../applications/version-management/fossil { };
+
+  fribid = callPackage ../applications/networking/browsers/mozilla-plugins/fribid { };
+
+  fvwm = callPackage ../applications/window-managers/fvwm { };
+
+  geany = callPackage ../applications/editors/geany { };
+
+  gksu = callPackage ../applications/misc/gksu { };
+
+  gnuradio = callPackage ../applications/misc/gnuradio {
+    inherit (pythonPackages) lxml numpy scipy matplotlib pyopengl;
+    fftw = fftwFloat;
+  };
+
+  gnuradio-osmosdr = callPackage ../applications/misc/gnuradio-osmosdr { };
+
+  goldendict = callPackage ../applications/misc/goldendict { };
+
+  google-musicmanager = callPackage ../applications/audio/google-musicmanager { };
+
+  gpicview = callPackage ../applications/graphics/gpicview { };
+
+  gqrx = callPackage ../applications/misc/gqrx { };
+
+  grass = import ../applications/misc/grass {
+    inherit (xlibs) libXmu libXext libXp libX11 libXt libSM libICE libXpm
+      libXaw libXrender;
+    inherit config composableDerivation stdenv fetchurl
+      lib flex bison cairo fontconfig
+      gdal zlib ncurses gdbm proj pkgconfig swig
+      blas liblapack libjpeg libpng mysql unixODBC mesa postgresql python
+      readline sqlite tcl tk libtiff freetype makeWrapper wxGTK;
+    fftw = fftwSinglePrec;
+    ffmpeg = ffmpeg_0_10;
+    motif = lesstif;
+    opendwg = libdwg;
+    wxPython = wxPython28;
+  };
+
+  grip = callPackage ../applications/misc/grip {
+    inherit (gnome) libgnome libgnomeui vte;
+  };
+
+  gtimelog = pythonPackages.gtimelog;
+
+  inherit (gnome3) gucharmap;
+
+  guitarix = callPackage ../applications/audio/guitarix {
+    fftw = fftwSinglePrec;
+  };
+
+  photivo = callPackage ../applications/graphics/photivo { };
+
+  wavesurfer = callPackage ../applications/misc/audio/wavesurfer { };
+
+  wireshark = callPackage ../applications/networking/sniffers/wireshark { };
+
+  wvdial = callPackage ../os-specific/linux/wvdial { };
+
+  fbida = callPackage ../applications/graphics/fbida { };
+
+  fdupes = callPackage ../tools/misc/fdupes { };
+
+  feh = callPackage ../applications/graphics/feh { };
+
+  filezilla = callPackage ../applications/networking/ftp/filezilla { };
+
+  firefox13Pkgs = callPackage ../applications/networking/browsers/firefox/13.0.nix {
+    inherit (gnome) libIDL;
+  };
+
+  firefox13Wrapper = wrapFirefox { browser = firefox13Pkgs.firefox; };
+
+  firefox30Pkgs = callPackage ../applications/networking/browsers/firefox/30.nix {
+    inherit (gnome) libIDL;
+    inherit (pythonPackages) pysqlite;
+    libpng = libpng_apng;
+  };
+
+  firefox = callPackage ../applications/networking/browsers/firefox {
+    inherit (gnome) libIDL;
+    inherit (pythonPackages) pysqlite;
+  };
+
+  firefoxWrapper = wrapFirefox { browser = pkgs.firefox; };
+
+  firefox-bin = callPackage ../applications/networking/browsers/firefox-bin {
+    gconf = pkgs.gnome.GConf;
+    inherit (pkgs.gnome) libgnome libgnomeui;
+    inherit (pkgs.xlibs) libX11 libXScrnSaver libXext
+      libXinerama libXrender libXt;
+  };
+
+  flac = callPackage ../applications/audio/flac { };
+
+  flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer-11 {
+    debug = config.flashplayer.debug or false;
+  };
+
+  fluxbox = callPackage ../applications/window-managers/fluxbox { };
+
+  freecad = callPackage ../applications/graphics/freecad {
+    opencascade = opencascade_6_5;
+    inherit (pythonPackages) matplotlib pycollada;
+  };
+
+  freemind = callPackage ../applications/misc/freemind {
+    jdk = jdk;
+    jre = jdk;
+  };
+
+  freenet = callPackage ../applications/networking/p2p/freenet { };
+
+  freepv = callPackage ../applications/graphics/freepv { };
+
+  xfontsel = callPackage ../applications/misc/xfontsel { };
+  xlsfonts = callPackage ../applications/misc/xlsfonts { };
+
+  freerdp = callPackage ../applications/networking/remote/freerdp {
+    ffmpeg = ffmpeg_1;
+  };
+
+  freerdpUnstable = callPackage ../applications/networking/remote/freerdp/unstable.nix { };
+
+  freicoin = callPackage ../applications/misc/freicoin { };
+
+  fspot = callPackage ../applications/graphics/f-spot {
+    inherit (gnome) libgnome libgnomeui;
+    gtksharp = gtksharp1;
+  };
+
+  fuze = callPackage ../applications/networking/instant-messengers/fuze {};
+
+  gcolor2 = callPackage ../applications/graphics/gcolor2 { };
+
+  get_iplayer = callPackage ../applications/misc/get_iplayer {};
+
+  gimp_2_8 = callPackage ../applications/graphics/gimp/2.8.nix {
+    inherit (gnome) libart_lgpl;
+    webkit = null;
+    lcms = lcms2;
+    wrapPython = pythonPackages.wrapPython;
+  };
+
+  gimp = gimp_2_8;
+
+  gimpPlugins = recurseIntoAttrs (import ../applications/graphics/gimp/plugins {
+    inherit pkgs gimp;
+  });
+
+  gitAndTools = recurseIntoAttrs (import ../applications/version-management/git-and-tools {
+    inherit pkgs;
+  });
+  git = gitAndTools.git;
+  gitFull = gitAndTools.gitFull;
+  gitSVN = gitAndTools.gitSVN;
+
+  gitRepo = callPackage ../applications/version-management/git-repo {
+    python = python27;
+  };
+
+  gitolite = callPackage ../applications/version-management/gitolite { };
+
+  inherit (gnome3) gitg;
+
+  giv = callPackage ../applications/graphics/giv {
+    pcre = pcre.override { unicodeSupport = true; };
+  };
+
+  gmrun = callPackage ../applications/misc/gmrun {};
+
+  gnucash = callPackage ../applications/office/gnucash {
+    inherit (gnome2) libgnomeui libgtkhtml gtkhtml libbonoboui libgnomeprint libglade libart_lgpl;
+    gconf = gnome2.GConf;
+    guile = guile_1_8;
+    slibGuile = slibGuile.override { scheme = guile_1_8; };
+    goffice = goffice_0_8;
+  };
+
+  goffice_0_8 = callPackage ../desktops/gnome-3/3.10/misc/goffice/0.8.nix {
+    inherit (gnome2) libglade libgnomeui;
+    gconf = gnome2.GConf;
+    libart = gnome2.libart_lgpl;
+  }; # latest version: gnome3.goffice
+
+  ideas = recurseIntoAttrs (  (callPackage ../applications/editors/idea { })
+                           // (callPackage ../applications/editors/idea/pycharm.nix { }));
+
+  libquvi = callPackage ../applications/video/quvi/library.nix { };
+
+  mi2ly = callPackage ../applications/audio/mi2ly {};
+
+  praat = callPackage ../applications/audio/praat { };
+
+  quvi = callPackage ../applications/video/quvi/tool.nix { };
+
+  quvi_scripts = callPackage ../applications/video/quvi/scripts.nix { };
+
+  qjackctl = callPackage ../applications/audio/qjackctl { };
+
+  gkrellm = callPackage ../applications/misc/gkrellm { };
+
+  gmu = callPackage ../applications/audio/gmu { };
+
+  gnash = callPackage ../applications/video/gnash {
+    inherit (gnome) gtkglext;
+  };
+
+  gnome_mplayer = callPackage ../applications/video/gnome-mplayer {
+    inherit (gnome) GConf;
+  };
+
+  gnumeric = callPackage ../applications/office/gnumeric {
+    inherit (gnome3) goffice gnome_icon_theme;
+  };
+
+  gnunet = callPackage ../applications/networking/p2p/gnunet {
+    libgcrypt = libgcrypt_1_6;
+  };
+
+  gnunet_svn = lowPrio (callPackage ../applications/networking/p2p/gnunet/svn.nix {
+    libgcrypt = libgcrypt_1_6;
+  });
+
+  gocr = callPackage ../applications/graphics/gocr { };
+
+  gobby5 = callPackage ../applications/editors/gobby {
+    inherit (gnome) gtksourceview;
+  };
+
+  gphoto2 = callPackage ../applications/misc/gphoto2 { };
+
+  gphoto2fs = builderDefsPackage ../applications/misc/gphoto2/gphotofs.nix {
+    inherit libgphoto2 fuse pkgconfig glib libtool;
+  };
+
+  graphicsmagick = callPackage ../applications/graphics/graphicsmagick { };
+  graphicsmagick_q16 = callPackage ../applications/graphics/graphicsmagick { quantumdepth = 16; };
+
+  graphicsmagick137 = callPackage ../applications/graphics/graphicsmagick/1.3.7.nix {
+    libpng = libpng12;
+  };
+
+  gtkpod = callPackage ../applications/audio/gtkpod {
+    inherit (gnome) libglade;
+  };
+
+  jbidwatcher = callPackage ../applications/misc/jbidwatcher {
+    java = if stdenv.isLinux then jre else jdk;
+  };
+
+  qrdecode = builderDefsPackage (import ../tools/graphics/qrdecode) {
+    libpng = libpng12;
+    opencv = opencv_2_1;
+  };
+
+  qrencode = callPackage ../tools/graphics/qrencode { };
+
+  gecko_mediaplayer = callPackage ../applications/networking/browsers/mozilla-plugins/gecko-mediaplayer {
+    inherit (gnome) GConf;
+    browser = firefox;
+  };
+
+  geeqie = callPackage ../applications/graphics/geeqie { };
+
+  gigedit = callPackage ../applications/audio/gigedit { };
+
+  gqview = callPackage ../applications/graphics/gqview { };
+
+  gmpc = callPackage ../applications/audio/gmpc { };
+
+  gmtk = callPackage ../applications/networking/browsers/mozilla-plugins/gmtk {
+    inherit (gnome) GConf;
+  };
+
+  googleearth = callPackage_i686 ../applications/misc/googleearth { };
+
+  google_talk_plugin = callPackage ../applications/networking/browsers/mozilla-plugins/google-talk-plugin {
+    libpng = libpng12;
+  };
+
+  gosmore = builderDefsPackage ../applications/misc/gosmore {
+    inherit fetchsvn curl pkgconfig libxml2 gtk;
+  };
+
+  gpsbabel = callPackage ../applications/misc/gpsbabel { };
+
+  gpscorrelate = callPackage ../applications/misc/gpscorrelate { };
+
+  gpsd = callPackage ../servers/gpsd { };
+
+  guitone = callPackage ../applications/version-management/guitone {
+    graphviz = graphviz_2_32;
+  };
+
+  gv = callPackage ../applications/misc/gv { };
+
+  guvcview = callPackage ../os-specific/linux/guvcview { };
+
+  hello = callPackage ../applications/misc/hello/ex-2 { };
+
+  herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { };
+
+  hexchat = callPackage ../applications/networking/irc/hexchat { };
+
+  hexedit = callPackage ../applications/editors/hexedit { };
+
+  hipchat = callPackage ../applications/networking/instant-messengers/hipchat { };
+
+  homebank = callPackage ../applications/office/homebank { };
+
+  htmldoc = callPackage ../applications/misc/htmldoc {
+    fltk = fltk13;
+  };
+
+  hugin = callPackage ../applications/graphics/hugin { };
+
+  hydrogen = callPackage ../applications/audio/hydrogen { };
+
+  i3 = callPackage ../applications/window-managers/i3 { };
+
+  i3lock = callPackage ../applications/window-managers/i3/lock.nix {
+    inherit (xorg) libxkbfile;
+    cairo = cairo.override { xcbSupport = true; };
+  };
+
+  i3minator = callPackage ../tools/misc/i3minator { };
+
+  i3status = callPackage ../applications/window-managers/i3/status.nix { };
+
+  i810switch = callPackage ../os-specific/linux/i810switch { };
+
+  icewm = callPackage ../applications/window-managers/icewm { };
+
+  id3v2 = callPackage ../applications/audio/id3v2 { };
+
+  ifenslave = callPackage ../os-specific/linux/ifenslave { };
+
+  ii = callPackage ../applications/networking/irc/ii { };
+
+  ike = callPackage ../applications/ike { };
+
+  ikiwiki = callPackage ../applications/misc/ikiwiki {
+    inherit (perlPackages) TextMarkdown URI HTMLParser HTMLScrubber
+      HTMLTemplate TimeDate CGISession DBFile CGIFormBuilder LocaleGettext
+      RpcXML XMLSimple PerlMagick YAML YAMLLibYAML HTMLTree Filechdir
+      AuthenPassphrase NetOpenIDConsumer LWPxParanoidAgent CryptSSLeay;
+  };
+
+  imagemagick = callPackage ../applications/graphics/ImageMagick {
+    tetex = null;
+    librsvg = null;
+  };
+
+  imagemagickBig = lowPrio (callPackage ../applications/graphics/ImageMagick { });
+
+  # Impressive, formerly known as "KeyJNote".
+  impressive = callPackage ../applications/office/impressive {
+    # XXX These are the PyOpenGL dependencies, which we need here.
+    inherit (pythonPackages) pyopengl;
+  };
+
+  inferno = callPackage_i686 ../applications/inferno { };
+
+  inkscape = callPackage ../applications/graphics/inkscape {
+    inherit (pythonPackages) lxml;
+    lcms = lcms2;
+  };
+
+  ion3 = callPackage ../applications/window-managers/ion-3 {
+    lua = lua5;
+  };
+
+  ipe = callPackage ../applications/graphics/ipe { };
+
+  iptraf = callPackage ../applications/networking/iptraf { };
+
+  irssi = callPackage ../applications/networking/irc/irssi {
+    # compile with gccApple on darwin to support the -no-cpp-precompile flag
+    stdenv = if stdenv.isDarwin
+      then stdenvAdapters.overrideGCC stdenv gccApple
+      else stdenv;
+  };
+
+  irssi_fish = callPackage ../applications/networking/irc/irssi/fish { };
+
+  irssi_otr = callPackage ../applications/networking/irc/irssi/otr { };
+
+  bip = callPackage ../applications/networking/irc/bip { };
+
+  jack_capture = callPackage ../applications/audio/jack-capture { };
+
+  jack_oscrolloscope = callPackage ../applications/audio/jack-oscrolloscope { };
+
+  jack_rack = callPackage ../applications/audio/jack-rack { };
+
+  jackmeter = callPackage ../applications/audio/jackmeter { };
+
+  jalv = callPackage ../applications/audio/jalv { };
+
+  jedit = callPackage ../applications/editors/jedit { };
+
+  jigdo = callPackage ../applications/misc/jigdo { };
+
+  jitsi = callPackage ../applications/networking/instant-messengers/jitsi { };
+
+  joe = callPackage ../applications/editors/joe { };
+
+  jbrout = callPackage ../applications/graphics/jbrout {
+    inherit (pythonPackages) lxml;
+  };
+
+  jwm = callPackage ../applications/window-managers/jwm { };
+
+  k3d = callPackage ../applications/graphics/k3d {
+    inherit (pkgs.gnome2) gtkglext;
+  };
+
+  keepnote = callPackage ../applications/office/keepnote {
+    pygtk = pyGtkGlade;
+  };
+
+  kermit = callPackage ../tools/misc/kermit { };
+
+  keymon = callPackage ../applications/video/key-mon { };
+
+  kino = callPackage ../applications/video/kino {
+    inherit (gnome) libglade;
+  };
+
+  koji = callPackage ../tools/package-management/koji { };
+
+  lame = callPackage ../applications/audio/lame { };
+
+  larswm = callPackage ../applications/window-managers/larswm { };
+
+  lash = callPackage ../applications/audio/lash { };
+
+  ladspaH = callPackage ../applications/audio/ladspa-plugins/ladspah.nix { };
+
+  ladspaPlugins = callPackage ../applications/audio/ladspa-plugins {
+    fftw = fftwSinglePrec;
+  };
+
+  caps = callPackage ../applications/audio/caps { };
+
+  lastwatch = callPackage ../applications/audio/lastwatch { };
+
+  lastfmsubmitd = callPackage ../applications/audio/lastfmsubmitd { };
+
+  lbdb = callPackage ../tools/misc/lbdb { };
+
+  lci = callPackage ../applications/science/logic/lci {};
+
+  ldcpp = callPackage ../applications/networking/p2p/ldcpp {
+    inherit (gnome) libglade;
+  };
+
+  librecad = callPackage ../applications/misc/librecad { };
+
+  librecad2 = callPackage ../applications/misc/librecad/2.0.nix { };
+
+  libreoffice = callPackage ../applications/office/libreoffice {
+    inherit (perlPackages) ArchiveZip CompressZlib;
+    inherit (gnome) GConf ORBit2 gnome_vfs;
+    zip = zip.override { enableNLS = false; };
+    boost = boost155;
+    jdk = openjdk;
+    fontsConf = makeFontsConf {
+      fontDirectories = [
+        freefont_ttf xorg.fontmiscmisc xorg.fontbhttf
+      ];
+    };
+    clucene_core = clucene_core_2;
+    lcms = lcms2;
+    harfbuzz = harfbuzz.override {
+      withIcu = true; withGraphite2 = true;
+    };
+  };
+
+  liferea = callPackage ../applications/networking/newsreaders/liferea { };
+
+  lingot = callPackage ../applications/audio/lingot {
+    inherit (gnome) libglade;
+  };
+
+  links = callPackage ../applications/networking/browsers/links { };
+
+  ledger = callPackage ../applications/office/ledger/2.6.3.nix { };
+  ledger3 = callPackage ../applications/office/ledger/3.0.nix { };
+
+  lighttable = callPackage ../applications/editors/lighttable {};
+
+  links2 = callPackage ../applications/networking/browsers/links2 { };
+
+  linphone = callPackage ../applications/networking/instant-messengers/linphone rec {
+    inherit (gnome) libglade;
+    libexosip = libexosip_3;
+    libosip = libosip_3;
+  };
+
+  linuxsampler = callPackage ../applications/audio/linuxsampler {
+    bison = bison2;
+  };
+
+  llpp = callPackage ../applications/misc/llpp { inherit (ocamlPackages) lablgl; };
+
+  lmms = callPackage ../applications/audio/lmms { };
+
+  lrzsz = callPackage ../tools/misc/lrzsz { };
+
+  luminanceHDR = callPackage ../applications/graphics/luminance-hdr { };
+
+  lxdvdrip = callPackage ../applications/video/lxdvdrip { };
+
+  handbrake = callPackage ../applications/video/handbrake { };
+
+  lilyterm = callPackage ../applications/misc/lilyterm {
+    inherit (gnome) vte;
+    gtk = gtk2;
+  };
+
+  lynx = callPackage ../applications/networking/browsers/lynx { };
+
+  lyx = callPackage ../applications/misc/lyx { };
+
+  makeself = callPackage ../applications/misc/makeself { };
+
+  matchbox = callPackage ../applications/window-managers/matchbox { };
+
+  mcpp = callPackage ../development/compilers/mcpp { };
+
+  mda_lv2 = callPackage ../applications/audio/mda-lv2 { };
+
+  meld = callPackage ../applications/version-management/meld {
+    inherit (gnome) scrollkeeper;
+    pygtk = pyGtkGlade;
+  };
+
+  mcomix = callPackage ../applications/graphics/mcomix { };
+
+  mercurial = callPackage ../applications/version-management/mercurial {
+    inherit (pythonPackages) curses docutils;
+    guiSupport = false; # use mercurialFull to get hgk GUI
+  };
+
+  mercurialFull = appendToName "full" (pkgs.mercurial.override { guiSupport = true; });
+
+  merkaartor = callPackage ../applications/misc/merkaartor { };
+
+  meshlab = callPackage ../applications/graphics/meshlab { };
+
+  mhwaveedit = callPackage ../applications/audio/mhwaveedit {};
+
+  mid2key = callPackage ../applications/audio/mid2key { };
+
+  midori = callPackage ../applications/networking/browsers/midori { };
+
+  midoriWrapper = wrapFirefox
+    { browser = midori; browserName = "midori"; desktopName = "Midori";
+      icon = "${midori}/share/icons/hicolor/22x22/apps/midori.png";
+    };
+
+  mikmod = callPackage ../applications/audio/mikmod { };
+
+  minicom = callPackage ../tools/misc/minicom { };
+
+  minimodem = callPackage ../applications/audio/minimodem { };
+
+  minidjvu = callPackage ../applications/graphics/minidjvu { };
+
+  mirage = callPackage ../applications/graphics/mirage {};
+
+  mixxx = callPackage ../applications/audio/mixxx {
+    inherit (vamp) vampSDK;
+  };
+
+  mmex = callPackage ../applications/office/mmex { };
+
+  moc = callPackage ../applications/audio/moc { };
+
+  monkeysAudio = callPackage ../applications/audio/monkeys-audio { };
+
+  monodevelop = callPackage ../applications/editors/monodevelop {
+    inherit (gnome) gnome_vfs libbonobo libglade libgnome GConf;
+    mozilla = firefox;
+    gtksharp = gtksharp2;
+  };
+
+  monodoc = callPackage ../applications/editors/monodoc {
+    gtksharp = gtksharp1;
+  };
+
+  monotone = callPackage ../applications/version-management/monotone {
+    lua = lua5;
+    boost = boost149;
+  };
+
+  monotoneViz = builderDefsPackage (import ../applications/version-management/monotone-viz/mtn-head.nix) {
+    inherit ocaml graphviz pkgconfig autoconf automake libtool glib gtk;
+    inherit (ocamlPackages) lablgtk;
+    inherit (gnome) libgnomecanvas;
+  };
+
+  mopidy = callPackage ../applications/audio/mopidy { };
+
+  mopidy-spotify = callPackage ../applications/audio/mopidy-spotify { };
+
+  mopidy-moped = callPackage ../applications/audio/mopidy-moped { };
+
+  mozilla = callPackage ../applications/networking/browsers/mozilla {
+    inherit (gnome) libIDL;
+  };
+
+  mozplugger = builderDefsPackage (import ../applications/networking/browsers/mozilla-plugins/mozplugger) {
+    inherit firefox;
+    inherit (xlibs) libX11 xproto;
+  };
+
+  easytag = callPackage ../applications/audio/easytag { };
+
+  mp3info = callPackage ../applications/audio/mp3info { };
+
+  mp3splt = callPackage ../applications/audio/mp3splt { };
+
+  mpc123 = callPackage ../applications/audio/mpc123 { };
+
+  mpg123 = callPackage ../applications/audio/mpg123 { };
+
+  mpg321 = callPackage ../applications/audio/mpg321 { };
+
+  mpc_cli = callPackage ../applications/audio/mpc { };
+
+  ncmpc = callPackage ../applications/audio/ncmpc { };
+
+  ncmpcpp = callPackage ../applications/audio/ncmpcpp { };
+
+  normalize = callPackage ../applications/audio/normalize { };
+
+  mplayer = callPackage ../applications/video/mplayer {
+    pulseSupport = config.pulseaudio or false;
+    vdpauSupport = config.mplayer.vdpauSupport or false;
+  };
+
+  mplayer2 = callPackage ../applications/video/mplayer2 {
+    ffmpeg = libav_9; # see https://trac.macports.org/ticket/44386
+  };
+
+  MPlayerPlugin = browser:
+    import ../applications/networking/browsers/mozilla-plugins/mplayerplug-in {
+      inherit browser;
+      inherit fetchurl stdenv pkgconfig gettext;
+      inherit (xlibs) libXpm;
+      # !!! should depend on MPlayer
+    };
+
+  mpv = callPackage ../applications/video/mpv {
+    lua = lua5_1;
+    bs2bSupport = config.mpv.bs2bSupport or true;
+    quviSupport = config.mpv.quviSupport or false;
+    cacaSupport = config.mpv.cacaSupport or true;
+    vaapiSupport = config.mpv.vaapiSupport or false;
+  };
+
+  mrxvt = callPackage ../applications/misc/mrxvt { };
+
+  multisync = callPackage ../applications/misc/multisync {
+    inherit (gnome) ORBit2 libbonobo libgnomeui GConf;
+  };
+
+  mumble = callPackage ../applications/networking/mumble {
+    avahi = avahi.override {
+      withLibdnssdCompat = true;
+    };
+    jackSupport = config.mumble.jackSupport or false;
+    speechdSupport = config.mumble.speechdSupport or false;
+  };
+
+  murmur = callPackage ../applications/networking/mumble/murmur.nix {
+    avahi = avahi.override {
+      withLibdnssdCompat = true;
+    };
+    iceSupport = config.murmur.iceSupport or true;
+  };
+
+  mutt = callPackage ../applications/networking/mailreaders/mutt { };
+
+  namecoin = callPackage ../applications/misc/namecoin { };
+  namecoinqt = callPackage ../applications/misc/namecoin/qt.nix { };
+
+  pcmanfm = callPackage ../applications/misc/pcmanfm { };
+
+  ruby_gpgme = callPackage ../development/libraries/ruby_gpgme {
+    ruby = ruby19;
+    hoe = rubyLibs.hoe;
+  };
+
+  ruby_ncursesw_sup = callPackage ../development/libraries/ruby_ncursesw_sup { };
+
+  shotcut = callPackage ../applications/video/shotcut { mlt = mlt-qt5; };
+
+  smplayer = callPackage ../applications/video/smplayer { };
+
+  sup = with rubyLibs; callPackage ../applications/networking/mailreaders/sup {
+    ruby = ruby19.override {
+      cursesSupport = true;
+    };
+
+    inherit gettext highline iconv locale lockfile
+      text trollop xapian_ruby which;
+
+    rmail_sup = ""; # missing
+    unicode = "";
+
+    # See https://github.com/NixOS/nixpkgs/issues/1804 and
+    # https://github.com/NixOS/nixpkgs/issues/2146
+    bundler = pkgs.lib.overrideDerivation pkgs.rubyLibs.bundler (
+      oldAttrs: {
+        dontPatchShebangs = 1;
+      }
+    );
+    chronic      = chronic;
+    gpgme        = ruby_gpgme;
+    mime_types   = mime_types;
+    ncursesw_sup = ruby_ncursesw_sup;
+    rake         = rake;
+  };
+
+  synfigstudio = callPackage ../applications/graphics/synfigstudio {
+    fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf ]; };
+  };
+
+  sxhkd = callPackage ../applications/window-managers/sxhkd { };
+
+  msmtp = callPackage ../applications/networking/msmtp { };
+
+  imapfilter = callPackage ../applications/networking/mailreaders/imapfilter.nix {
+    lua = lua5;
+ };
+
+  mupdf = callPackage ../applications/misc/mupdf { };
+
+  mypaint = callPackage ../applications/graphics/mypaint { };
+
+  mythtv = callPackage ../applications/video/mythtv { };
+
+  tvtime = callPackage ../applications/video/tvtime {
+    kernel = linux;
+  };
+
+  nano = callPackage ../applications/editors/nano { };
+
+  nanoblogger = callPackage ../applications/misc/nanoblogger { };
+
+  navipowm = callPackage ../applications/misc/navipowm { };
+
+  navit = callPackage ../applications/misc/navit { };
+
+  netbeans = callPackage ../applications/editors/netbeans { };
+
+  ncdu = callPackage ../tools/misc/ncdu { };
+
+  ncdc = callPackage ../applications/networking/p2p/ncdc { };
+
+  nedit = callPackage ../applications/editors/nedit {
+    motif = lesstif;
+  };
+
+  netsurfBrowser = netsurf.browser;
+  netsurf = recurseIntoAttrs (import ../applications/networking/browsers/netsurf { inherit pkgs; });
+
+  notmuch = callPackage ../applications/networking/mailreaders/notmuch {
+    # use emacsPackages.notmuch if you want emacs support
+    emacs = null;
+  };
+
+  nova = callPackage ../applications/virtualization/nova { };
+
+  novaclient = callPackage ../applications/virtualization/nova/client.nix { };
+
+  nspluginwrapper = callPackage ../applications/networking/browsers/mozilla-plugins/nspluginwrapper {};
+
+  nvi = callPackage ../applications/editors/nvi { };
+
+  nvpy = callPackage ../applications/editors/nvpy { };
+
+  obconf = callPackage ../tools/X11/obconf {
+    inherit (gnome) libglade;
+  };
+
+  ocrad = callPackage ../applications/graphics/ocrad { };
+
+  offrss = callPackage ../applications/networking/offrss { };
+
+  ogmtools = callPackage ../applications/video/ogmtools { };
+
+  omxplayer = callPackage ../applications/video/omxplayer { };
+
+  oneteam = callPackage ../applications/networking/instant-messengers/oneteam {};
+
+  openbox = callPackage ../applications/window-managers/openbox { };
+
+  openimageio = callPackage ../applications/graphics/openimageio { };
+
+  openjump = callPackage ../applications/misc/openjump { };
+
+  openscad = callPackage ../applications/graphics/openscad {};
+
+  opera = callPackage ../applications/networking/browsers/opera {
+    inherit (pkgs.kde4) kdelibs;
+  };
+
+  opusfile = callPackage ../applications/audio/opusfile { };
+
+  opusTools = callPackage ../applications/audio/opus-tools { };
+
+  pamixer = callPackage ../applications/audio/pamixer { };
+
+  pan = callPackage ../applications/networking/newsreaders/pan {
+    spellChecking = false;
+  };
+
+  panotools = callPackage ../applications/graphics/panotools { };
+
+  pavucontrol = callPackage ../applications/audio/pavucontrol { };
+
+  paraview = callPackage ../applications/graphics/paraview { };
+
+  pencil = callPackage ../applications/graphics/pencil { };
+
+  petrifoo = callPackage ../applications/audio/petrifoo {
+    inherit (gnome) libgnomecanvas;
+  };
+
+  pdftk = callPackage ../tools/typesetting/pdftk { };
+  pdfgrep  = callPackage ../tools/typesetting/pdfgrep { };
+
+  pianobar = callPackage ../applications/audio/pianobar { };
+
+  pianobooster = callPackage ../applications/audio/pianobooster { };
+
+  picard = callPackage ../applications/audio/picard { };
+
+  picocom = callPackage ../tools/misc/picocom { };
+
+  pidgin = callPackage ../applications/networking/instant-messengers/pidgin {
+    openssl = if config.pidgin.openssl or true then openssl else null;
+    gnutls = if config.pidgin.gnutls or false then gnutls else null;
+    libgcrypt = if config.pidgin.gnutls or false then libgcrypt else null;
+    startupnotification = libstartup_notification;
+  };
+
+  pidginlatex = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-latex {
+    imagemagick = imagemagickBig;
+  };
+
+  pidginlatexSF = builderDefsPackage
+    (import ../applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/pidgin-latex-sf.nix)
+    {
+      inherit pkgconfig pidgin texLive imagemagick which glib gtk;
+    };
+
+  pidginmsnpecan = callPackage ../applications/networking/instant-messengers/pidgin-plugins/msn-pecan { };
+
+  pidginotr = callPackage ../applications/networking/instant-messengers/pidgin-plugins/otr { };
+
+  pidginsipe = callPackage ../applications/networking/instant-messengers/pidgin-plugins/sipe { };
+
+  toxprpl = callPackage ../applications/networking/instant-messengers/pidgin-plugins/tox-prpl { };
+
+  pinfo = callPackage ../applications/misc/pinfo { };
+
+  pinta = callPackage ../applications/graphics/pinta {
+    gtksharp = gtksharp2;
+  };
+
+  pommed = callPackage ../os-specific/linux/pommed {
+    inherit (xorg) libXpm;
+  };
+
+  potrace = callPackage ../applications/graphics/potrace {};
+
+  posterazor = callPackage ../applications/misc/posterazor { };
+
+  pqiv = callPackage ../applications/graphics/pqiv { };
+
+  qiv = callPackage ../applications/graphics/qiv { };
+
+  processing = callPackage ../applications/graphics/processing { inherit (xorg) libXxf86vm; };
+
+  # perhaps there are better apps for this task? It's how I had configured my preivous system.
+  # And I don't want to rewrite all rules
+  procmail = callPackage ../applications/misc/procmail { };
+
+  pstree = callPackage ../applications/misc/pstree { };
+
+  pulseview = callPackage ../applications/science/electronics/pulseview { };
+
+  puredata = callPackage ../applications/audio/puredata { };
+
+  pythonmagick = callPackage ../applications/graphics/PythonMagick { };
+
+  qbittorrent = callPackage ../applications/networking/p2p/qbittorrent { };
+
+  eiskaltdcpp = callPackage ../applications/networking/p2p/eiskaltdcpp { };
+
+  qemu = callPackage ../applications/virtualization/qemu { };
+
+  qmmp = callPackage ../applications/audio/qmmp { };
+
+  qsampler = callPackage ../applications/audio/qsampler { };
+
+  qsynth = callPackage ../applications/audio/qsynth { };
+
+  qtpfsgui = callPackage ../applications/graphics/qtpfsgui { };
+
+  qtractor = callPackage ../applications/audio/qtractor { };
+
+  quodlibet = callPackage ../applications/audio/quodlibet {
+    inherit (pythonPackages) mutagen;
+  };
+
+  quodlibet-with-gst-plugins = callPackage ../applications/audio/quodlibet {
+    inherit (pythonPackages) mutagen;
+    withGstPlugins = true;
+    gst_plugins_bad = null;
+  };
+
+  rakarrack = callPackage ../applications/audio/rakarrack {
+    inherit (xorg) libXpm libXft;
+    fltk = fltk13;
+  };
+
+  rapcad = callPackage ../applications/graphics/rapcad {};
+
+  rapidsvn = callPackage ../applications/version-management/rapidsvn { };
+
+  ratpoison = callPackage ../applications/window-managers/ratpoison { };
+
+  rawtherapee = callPackage ../applications/graphics/rawtherapee {
+    fftw = fftwSinglePrec;
+  };
+
+  rcs = callPackage ../applications/version-management/rcs { };
+
+  rdesktop = callPackage ../applications/networking/remote/rdesktop { };
+
+  recode = callPackage ../tools/text/recode { };
+
+  retroshare = callPackage ../applications/networking/p2p/retroshare {
+    qt = qt4;
+  };
+
+  retroshare06 = lowPrio (callPackage ../applications/networking/p2p/retroshare/0.6.nix {
+    qt = qt4;
+  });
+
+  rsync = callPackage ../applications/networking/sync/rsync {
+    enableACLs = !(stdenv.isDarwin || stdenv.isSunOS || stdenv.isFreeBSD);
+    enableCopyDevicesPatch = (config.rsync.enableCopyDevicesPatch or false);
+  };
+
+  rtl-sdr = callPackage ../applications/misc/rtl-sdr { };
+
+  rubyripper = callPackage ../applications/audio/rubyripper {};
+
+  rxvt = callPackage ../applications/misc/rxvt { };
+
+  # = urxvt
+  rxvt_unicode = callPackage ../applications/misc/rxvt_unicode {
+    perlSupport = true;
+    gdkPixbufSupport = true;
+    unicode3Support = true;
+  };
+
+  sakura = callPackage ../applications/misc/sakura {
+    inherit (gnome) vte;
+  };
+
+  sbagen = callPackage ../applications/misc/sbagen { };
+
+  scite = callPackage ../applications/editors/scite { };
+
+  scribus = callPackage ../applications/office/scribus {
+    inherit (gnome) libart_lgpl;
+  };
+
+  seafile-client = callPackage ../applications/networking/seafile-client { };
+
+  seeks = callPackage ../tools/networking/p2p/seeks {
+    opencv = opencv_2_1;
+  };
+
+  seg3d = callPackage ../applications/graphics/seg3d {
+    wxGTK = wxGTK28.override { unicode = false; };
+  };
+
+  seq24 = callPackage ../applications/audio/seq24 { };
+
+  setbfree = callPackage ../applications/audio/setbfree { };
+
+  sflphone = callPackage ../applications/networking/instant-messengers/sflphone {
+    gtk = gtk3;
+  };
+
+  siproxd = callPackage ../applications/networking/siproxd { };
+
+  skype = callPackage_i686 ../applications/networking/instant-messengers/skype { };
+
+  skype4pidgin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/skype4pidgin { };
+
+  skype_call_recorder = callPackage ../applications/networking/instant-messengers/skype-call-recorder { };
+
+  slrn = callPackage ../applications/networking/newsreaders/slrn { };
+
+  spideroak = callPackage ../applications/networking/spideroak { };
+
+  ssvnc = callPackage ../applications/networking/remote/ssvnc { };
+
+  st = callPackage ../applications/misc/st {
+    conf = config.st.conf or null;
+  };
+
+  stella = callPackage ../misc/emulators/stella { };
+  
+  linuxstopmotion = callPackage ../applications/video/linuxstopmotion { };
+
+  sweethome3d = recurseIntoAttrs (  (callPackage ../applications/misc/sweethome3d { })
+                                 // (callPackage ../applications/misc/sweethome3d/editors.nix {
+                                      sweethome3dApp = sweethome3d.application;
+                                    })
+                                 );
+
+  sxiv = callPackage ../applications/graphics/sxiv { };
+
+  bittorrentSync = callPackage ../applications/networking/bittorrentsync { };
+
+  dropbox = callPackage ../applications/networking/dropbox { };
+
+  dropbox-cli = callPackage ../applications/networking/dropbox-cli { };
+
+  lightdm = callPackage ../applications/display-managers/lightdm { };
+
+  lightdm_gtk_greeter = callPackage ../applications/display-managers/lightdm-gtk-greeter { };
+
+  # slic3r 0.9.10b says: "Running Slic3r under Perl >= 5.16 is not supported nor recommended"
+  slic3r = callPackage ../applications/misc/slic3r {
+    perlPackages = perl514Packages;
+    perl = perl514;
+  };
+
+  curaengine = callPackage ../applications/misc/curaengine { };
+
+  cura = callPackage ../applications/misc/cura { };
+
+  printrun = callPackage ../applications/misc/printrun { };
+
+  slim = callPackage ../applications/display-managers/slim {
+    libpng = libpng12;
+  };
+
+  smartdeblur = callPackage ../applications/graphics/smartdeblur { };
+
+  snd = callPackage ../applications/audio/snd { };
+
+  shntool = callPackage ../applications/audio/shntool { };
+
+  sonic_visualiser = callPackage ../applications/audio/sonic-visualiser {
+    inherit (pkgs.vamp) vampSDK;
+    inherit (pkgs.xlibs) libX11;
+    fftw = pkgs.fftwSinglePrec;
+  };
+
+  sox = callPackage ../applications/misc/audio/sox { };
+
+  soxr = callPackage ../applications/misc/audio/soxr { };
+
+  spotify = callPackage ../applications/audio/spotify {
+    inherit (gnome) GConf;
+    libpng = libpng12;
+  };
+
+  libspotify = callPackage ../development/libraries/libspotify {
+    apiKey = config.libspotify.apiKey or null;
+  };
+
+  stalonetray = callPackage ../applications/window-managers/stalonetray {};
+
+  stp = callPackage ../applications/science/logic/stp {};
+
+  stumpwm = lispPackages.stumpwm;
+
+  sublime = callPackage ../applications/editors/sublime { };
+
+  sublime3 = lowPrio (callPackage ../applications/editors/sublime3 { });
+
+  subversion = callPackage ../applications/version-management/subversion/default.nix {
+    bdbSupport = true;
+    httpServer = false;
+    httpSupport = true;
+    pythonBindings = false;
+    perlBindings = false;
+    javahlBindings = false;
+    saslSupport = false;
+    httpd = apacheHttpd;
+    sasl = cyrus_sasl;
+  };
+
+  subversionClient = appendToName "client" (subversion.override {
+    bdbSupport = false;
+    perlBindings = true;
+    pythonBindings = true;
+  });
+
+  surf = callPackage ../applications/misc/surf {
+    webkit = webkitgtk2;
+  };
+
+  svk = perlPackages.SVK;
+
+  swh_lv2 = callPackage ../applications/audio/swh-lv2 { };
+
+  sylpheed = callPackage ../applications/networking/mailreaders/sylpheed {
+    sslSupport = true;
+    gpgSupport = true;
+  };
+
+  symlinks = callPackage ../tools/system/symlinks { };
+
+  syncthing = callPackage ../applications/networking/syncthing { };
+
+  # linux only by now
+  synergy = callPackage ../applications/misc/synergy { };
+
+  tabbed = callPackage ../applications/window-managers/tabbed { };
+
+  tahoelafs = callPackage ../tools/networking/p2p/tahoe-lafs {
+    inherit (pythonPackages) twisted foolscap simplejson nevow zfec
+      pycryptopp sqlite3 darcsver setuptoolsTrial setuptoolsDarcs
+      numpy pyasn1 mock;
+  };
+
+  tailor = builderDefsPackage (import ../applications/version-management/tailor) {
+    inherit makeWrapper python;
+  };
+
+  tangogps = callPackage ../applications/misc/tangogps {
+    gconf = gnome.GConf;
+  };
+
+  teamspeak_client = callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { };
+  teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { };
+
+  taskjuggler = callPackage ../applications/misc/taskjuggler { };
+
+  taskwarrior = callPackage ../applications/misc/taskwarrior { };
+
+  taskserver = callPackage ../servers/misc/taskserver { };
+
+  telegram-cli = callPackage ../applications/networking/instant-messengers/telegram-cli/default.nix { };
+
+  telepathy_gabble = callPackage ../applications/networking/instant-messengers/telepathy/gabble { };
+
+  telepathy_haze = callPackage ../applications/networking/instant-messengers/telepathy/haze {};
+
+  telepathy_logger = callPackage ../applications/networking/instant-messengers/telepathy/logger {};
+
+  telepathy_mission_control = callPackage ../applications/networking/instant-messengers/telepathy/mission-control { };
+
+  telepathy_rakia = callPackage ../applications/networking/instant-messengers/telepathy/rakia { };
+
+  telepathy_salut = callPackage ../applications/networking/instant-messengers/telepathy/salut {};
+
+  terminator = callPackage ../applications/misc/terminator {
+    vte = gnome.vte.override { pythonSupport = true; };
+    inherit (pythonPackages) notify;
+  };
+
+  tesseract = callPackage ../applications/graphics/tesseract { };
+
+  thinkingRock = callPackage ../applications/misc/thinking-rock { };
+
+  thunderbird = callPackage ../applications/networking/mailreaders/thunderbird {
+    inherit (gnome) libIDL;
+    inherit (pythonPackages) pysqlite;
+    libpng = libpng_apng;
+  };
+
+  thunderbird-bin = callPackage ../applications/networking/mailreaders/thunderbird-bin {
+    gconf = pkgs.gnome.GConf;
+    inherit (pkgs.gnome) libgnome libgnomeui;
+    inherit (pkgs.xlibs) libX11 libXScrnSaver libXext
+      libXinerama libXrender libXt;
+  };
+
+  tig = gitAndTools.tig;
+
+  tilda = callPackage ../applications/misc/tilda {
+    vte = gnome3.vte;
+    gtk = gtk3;
+  };
+
+  timidity = callPackage ../tools/misc/timidity { };
+
+  tint2 = callPackage ../applications/misc/tint2 { };
+
+  tkcvs = callPackage ../applications/version-management/tkcvs { };
+
+  tla = callPackage ../applications/version-management/arch { };
+
+  todo-txt-cli = callPackage ../applications/office/todo.txt-cli { };
+
+  torchat = callPackage ../applications/networking/instant-messengers/torchat {
+    wrapPython = pythonPackages.wrapPython;
+  };
+
+  toxic = callPackage ../applications/networking/instant-messengers/toxic { };
+
+  transcode = callPackage ../applications/audio/transcode { };
+
+  transmission = callPackage ../applications/networking/p2p/transmission { };
+  transmission_gtk = transmission.override { enableGTK3 = true; };
+
+  transmission_remote_gtk = callPackage ../applications/networking/p2p/transmission-remote-gtk {};
+
+  trayer = callPackage ../applications/window-managers/trayer { };
+
+  tree = callPackage ../tools/system/tree {};
+
+  tribler = callPackage ../applications/networking/p2p/tribler { };
+
+  twister = callPackage ../applications/networking/p2p/twister { };
+
+  twmn = callPackage ../applications/misc/twmn { };
+
+  twinkle = callPackage ../applications/networking/instant-messengers/twinkle { };
+
+  umurmur = callPackage ../applications/networking/umurmur { };
+
+  unison = callPackage ../applications/networking/sync/unison {
+    inherit (ocamlPackages) lablgtk;
+    enableX11 = config.unison.enableX11 or true;
+  };
+
+  uucp = callPackage ../tools/misc/uucp { };
+
+  uvccapture = callPackage ../applications/video/uvccapture { };
+
+  uwimap = callPackage ../tools/networking/uwimap { };
+
+  uzbl = callPackage ../applications/networking/browsers/uzbl {
+    webkit = webkitgtk2;
+  };
+
+  uTox = callPackage ../applications/networking/instant-messengers/utox { };
+
+  vanitygen = callPackage ../applications/misc/vanitygen { };
+
+  vbindiff = callPackage ../applications/editors/vbindiff { };
+
+  vcprompt = callPackage ../applications/version-management/vcprompt { };
+
+  vdpauinfo = callPackage ../tools/X11/vdpauinfo { };
+
+  veracity = callPackage ../applications/version-management/veracity {};
+
+  viewMtn = builderDefsPackage (import ../applications/version-management/viewmtn/0.10.nix)
+  {
+    inherit monotone cheetahTemplate highlight ctags
+      makeWrapper graphviz which python;
+    flup = pythonPackages.flup;
+  };
+
+  vim = callPackage ../applications/editors/vim { };
+
+  macvim = callPackage ../applications/editors/vim/macvim.nix { };
+
+  vimHugeX = vim_configurable;
+
+  vim_configurable = callPackage ../applications/editors/vim/configurable.nix {
+    inherit (pkgs) fetchurl fetchhg stdenv ncurses pkgconfig gettext
+      composableDerivation lib config glib gtk python perl tcl ruby;
+    inherit (pkgs.xlibs) libX11 libXext libSM libXpm libXt libXaw libXau libXmu
+      libICE;
+
+    features = "huge"; # one of  tiny, small, normal, big or huge
+    lua = pkgs.lua5;
+    gui = config.vim.gui or "auto";
+
+    # optional features by flags
+    flags = [ "python" "X11" ]; # only flag "X11" by now
+
+    # so that we can use gccApple if we're building on darwin
+    inherit stdenvAdapters gccApple;
+  };
+
+  vimNox = lowPrio (vim_configurable.override { source = "vim-nox"; });
+
+  qvim = lowPrio (callPackage ../applications/editors/vim/qvim.nix {
+    inherit (pkgs) fetchgit stdenv ncurses pkgconfig gettext
+      composableDerivation lib config python perl tcl ruby qt4;
+    inherit (pkgs.xlibs) libX11 libXext libSM libXpm libXt libXaw libXau libXmu
+      libICE;
+
+    inherit (pkgs) stdenvAdapters gccApple;
+
+    features = "huge"; # one of  tiny, small, normal, big or huge
+    lua = pkgs.lua5;
+    flags = [ "python" "X11" ]; # only flag "X11" by now
+  });
+
+  vimpc = callPackage ../applications/audio/vimpc { };
+
+  virtviewer = callPackage ../applications/virtualization/virt-viewer {
+    gtkvnc = gtkvnc.override { enableGTK3 = true; };
+    spice_gtk = spice_gtk.override { enableGTK3 = true; };
+  };
+  virtmanager = callPackage ../applications/virtualization/virt-manager {
+    inherit (gnome) gnome_python;
+    vte = gnome3.vte;
+    dconf = gnome3.dconf;
+    gtkvnc = gtkvnc.override { enableGTK3 = true; };
+    spice_gtk = spice_gtk.override { enableGTK3 = true; };
+  };
+
+  virtinst = callPackage ../applications/virtualization/virtinst {};
+
+  virtualgl = callPackage ../tools/X11/virtualgl { };
+
+  bumblebee = callPackage ../tools/X11/bumblebee { };
+
+  vkeybd = callPackage ../applications/audio/vkeybd {
+    inherit (xlibs) libX11;
+  };
+
+  vlc = callPackage ../applications/video/vlc { };
+
+  vmpk = callPackage ../applications/audio/vmpk { };
+
+  vnstat = callPackage ../applications/networking/vnstat { };
+
+  vorbisTools = callPackage ../applications/audio/vorbis-tools { };
+
+  vue = callPackage ../applications/misc/vue {
+    jre = icedtea7_jre;
+  };
+
+  vwm = callPackage ../applications/window-managers/vwm { };
+
+  vym = callPackage ../applications/misc/vym { };
+
+  w3m = callPackage ../applications/networking/browsers/w3m {
+    graphicsSupport = false;
+  };
+
+  weechat = callPackage ../applications/networking/irc/weechat { };
+
+  weechatDevel = lowPrio (callPackage ../applications/networking/irc/weechat/devel.nix { });
+
+  weston = callPackage ../applications/window-managers/weston { };
+
+  windowmaker = callPackage ../applications/window-managers/windowmaker { };
+
+  winswitch = callPackage ../tools/X11/winswitch { };
+
+  wings = callPackage ../applications/graphics/wings {
+    erlang = erlangR14;
+    esdl = esdl.override { erlang = erlangR14; };
+  };
+
+  wmname = callPackage ../applications/misc/wmname { };
+
+  wmctrl = callPackage ../tools/X11/wmctrl { };
+
+  # I'm keen on wmiimenu only  >wmii-3.5 no longer has it...
+  wmiimenu = import ../applications/window-managers/wmii31 {
+    libixp = libixp_for_wmii;
+    inherit fetchurl /* fetchhg */ stdenv gawk;
+    inherit (xlibs) libX11;
+  };
+
+  wmiiSnap = import ../applications/window-managers/wmii {
+    libixp = libixp_for_wmii;
+    inherit fetchurl /* fetchhg */ stdenv gawk;
+    inherit (xlibs) libX11 xextproto libXt libXext;
+    includeUnpack = config.stdenv.includeUnpack or false;
+  };
+
+  wordnet = callPackage ../applications/misc/wordnet { };
+
+  wrapFirefox =
+    { browser, browserName ? "firefox", desktopName ? "Firefox", nameSuffix ? ""
+    , icon ? "${browser}/lib/${browser.name}/browser/icons/mozicon128.png" }:
+    let
+      cfg = stdenv.lib.attrByPath [ browserName ] {} config;
+      enableAdobeFlash = cfg.enableAdobeFlash or false;
+      enableGnash = cfg.enableGnash or false;
+    in
+    import ../applications/networking/browsers/firefox/wrapper.nix {
+      inherit stdenv lib makeWrapper makeDesktopItem browser browserName desktopName nameSuffix icon;
+      plugins =
+         assert !(enableGnash && enableAdobeFlash);
+         ([ ]
+          ++ lib.optional enableGnash gnash
+          ++ lib.optional enableAdobeFlash flashplayer
+          ++ lib.optional (cfg.enableDjvu or false) (djview4)
+          ++ lib.optional (cfg.enableMPlayer or false) (MPlayerPlugin browser)
+          ++ lib.optional (cfg.enableGeckoMediaPlayer or false) gecko_mediaplayer
+          ++ lib.optional (supportsJDK && cfg.jre or false && jrePlugin ? mozillaPlugin) jrePlugin
+          ++ lib.optional (cfg.enableGoogleTalkPlugin or false) google_talk_plugin
+          ++ lib.optional (cfg.enableFriBIDPlugin or false) fribid
+          ++ lib.optional (cfg.enableGnomeExtensions or false) gnome3.gnome_shell
+         );
+      libs = [ gstreamer gst_plugins_base ] ++ lib.optionals (cfg.enableQuakeLive or false)
+             (with xlibs; [ stdenv.gcc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]);
+      gtk_modules = [ libcanberra ];
+    };
+
+  wxhexeditor = callPackage ../applications/editors/wxhexeditor { };
+
+  x11vnc = callPackage ../tools/X11/x11vnc { };
+
+  x2vnc = callPackage ../tools/X11/x2vnc { };
+
+  xaos = builderDefsPackage (import ../applications/graphics/xaos) {
+    inherit (xlibs) libXt libX11 libXext xextproto xproto;
+    inherit gsl aalib zlib intltool gettext perl;
+    libpng = libpng12;
+  };
+
+  xara = callPackage ../applications/graphics/xara { };
+
+  xawtv = callPackage ../applications/video/xawtv { };
+
+  xbindkeys = callPackage ../tools/X11/xbindkeys { };
+
+  xbmc = callPackage ../applications/video/xbmc {
+    ffmpeg = ffmpeg_1;
+  };
+
+  xca = callPackage ../applications/misc/xca { };
+
+  xcalib = callPackage ../tools/X11/xcalib { };
+
+  xcape = callPackage ../tools/X11/xcape { };
+
+  xchainkeys = callPackage ../tools/X11/xchainkeys { };
+
+  xchat = callPackage ../applications/networking/irc/xchat { };
+
+  xchm = callPackage ../applications/misc/xchm { };
+
+  xcompmgr = callPackage ../applications/window-managers/xcompmgr { };
+
+  compton = callPackage ../applications/window-managers/compton { };
+
+  xdaliclock = callPackage ../tools/misc/xdaliclock {};
+
+  xdg-user-dirs = callPackage ../tools/X11/xdg-user-dirs { };
+
+  xdg_utils = callPackage ../tools/X11/xdg-utils { };
+
+  xdotool = callPackage ../tools/X11/xdotool { };
+
+  xen = callPackage ../applications/virtualization/xen {
+    stdenv = overrideGCC stdenv gcc45;
+  };
+
+  xfe = callPackage ../applications/misc/xfe {
+    fox = fox_1_6;
+  };
+
+  xfig = callPackage ../applications/graphics/xfig { };
+
+  xineUI = callPackage ../applications/video/xine-ui { };
+
+  xneur_0_13 = callPackage ../applications/misc/xneur { };
+
+  xneur_0_8 = callPackage ../applications/misc/xneur/0.8.nix { };
+
+  xneur = xneur_0_13;
+
+  gxneur = callPackage ../applications/misc/gxneur  {
+    inherit (gnome) libglade GConf;
+  };
+
+  xournal = callPackage ../applications/graphics/xournal {
+    inherit (gnome) libgnomeprint libgnomeprintui libgnomecanvas;
+  };
+
+  xpdf = callPackage ../applications/misc/xpdf {
+    motif = lesstif;
+    base14Fonts = "${ghostscript}/share/ghostscript/fonts";
+  };
+
+  xkb_switch = callPackage ../tools/X11/xkb-switch { };
+
+  libxpdf = callPackage ../applications/misc/xpdf/libxpdf.nix { };
+
+  xpra = callPackage ../tools/X11/xpra { };
+
+  xrestop = callPackage ../tools/X11/xrestop { };
+
+  xscreensaver = callPackage ../misc/screensavers/xscreensaver {
+    inherit (gnome) libglade;
+  };
+
+  xsynth_dssi = callPackage ../applications/audio/xsynth-dssi { };
+
+  xterm = callPackage ../applications/misc/xterm { };
+
+  finalterm = callPackage ../applications/misc/finalterm { };
+
+  xtrace = callPackage ../tools/X11/xtrace { };
+
+  xlaunch = callPackage ../tools/X11/xlaunch { };
+
+  xmacro = callPackage ../tools/X11/xmacro { };
+
+  xmove = callPackage ../applications/misc/xmove { };
+
+  xmp = callPackage ../applications/audio/xmp { };
+
+  xnee = callPackage ../tools/X11/xnee { };
+
+  xvidcap = callPackage ../applications/video/xvidcap {
+    inherit (gnome) scrollkeeper libglade;
+  };
+
+  yate = callPackage ../applications/misc/yate { };
+
+  inherit (gnome3) yelp;
+
+  qgis = callPackage ../applications/misc/qgis {};
+
+  qtbitcointrader = callPackage ../applications/misc/qtbitcointrader { };
+
+  ykpers = callPackage ../applications/misc/ykpers {};
+
+  yoshimi = callPackage ../applications/audio/yoshimi {
+    fltk = fltk13;
+  };
+
+  zathuraCollection = recurseIntoAttrs
+    (let callPackage = newScope pkgs.zathuraCollection; in
+      import ../applications/misc/zathura {
+        inherit callPackage pkgs fetchurl;
+        useMupdf = config.zathura.useMupdf or false;
+      });
+
+  zathura = zathuraCollection.zathuraWrapper;
+
+  zed = callPackage ../applications/editors/zed { };
+
+  zeroc_ice = callPackage ../development/libraries/zeroc-ice { };
+
+  girara = callPackage ../applications/misc/girara {
+    gtk = gtk3;
+  };
+
+  zgrviewer = callPackage ../applications/graphics/zgrviewer {};
+
+  zim = callPackage ../applications/office/zim {
+    pygtk = pyGtkGlade;
+  };
+  
+  zotero = callPackage ../applications/office/zotero {
+    xulrunner = xulrunner_30;
+  };
+
+  zynaddsubfx = callPackage ../applications/audio/zynaddsubfx { };
+
+
+  ### GAMES
+
+  alienarena = callPackage ../games/alienarena { };
+
+  andyetitmoves = if stdenv.isLinux then callPackage ../games/andyetitmoves {} else null;
+
+  anki = callPackage ../games/anki { };
+
+  asc = callPackage ../games/asc {
+    lua = lua5;
+    libsigcxx = libsigcxx12;
+  };
+
+  astromenace = callPackage ../games/astromenace { };
+
+  atanks = callPackage ../games/atanks {};
+
+  ballAndPaddle = callPackage ../games/ball-and-paddle {
+    guile = guile_1_8;
+  };
+
+  bitsnbots = callPackage ../games/bitsnbots {
+    lua = lua5;
+  };
+
+  blackshades = callPackage ../games/blackshades { };
+
+  blackshadeselite = callPackage ../games/blackshadeselite { };
+
+  blobby = callPackage ../games/blobby { };
+
+  bsdgames = callPackage ../games/bsdgames { };
+
+  btanks = callPackage ../games/btanks { };
+
+  bzflag = callPackage ../games/bzflag { };
+
+  castle_combat = callPackage ../games/castle-combat { };
+
+  chessdb = callPackage ../games/chessdb { };
+
+  construoBase = lowPrio (callPackage ../games/construo {
+    mesa = null;
+    freeglut = null;
+  });
+
+  construo = construoBase.override {
+    inherit mesa freeglut;
+  };
+
+  crack_attack = callPackage ../games/crack-attack { };
+
+  crafty = callPackage ../games/crafty { };
+  craftyFull = appendToName "full" (crafty.override { fullVariant = true; });
+
+  crrcsim = callPackage ../games/crrcsim {};
+
+  dhewm3 = callPackage ../games/dhewm3 {};
+
+  drumkv1 = callPackage ../applications/audio/drumkv1 { };
+
+  dwarf_fortress = callPackage_i686 ../games/dwarf-fortress {
+    SDL_image = pkgsi686Linux.SDL_image.override {
+      libpng = pkgsi686Linux.libpng12;
+    };
+  };
+
+  dwarf_fortress_2014 = callPackage_i686 ../games/dwarf-fortress/df2014.nix {
+    SDL_image = pkgsi686Linux.SDL_image.override {
+      libpng = pkgsi686Linux.libpng12;
+    };
+  };
+
+  dwarf_fortress_modable = appendToName "moddable" (dwarf_fortress.override {
+    copyDataDirectory = true;
+  });
+
+  dwarf_fortress_2014_modable = appendToName "moddable" (dwarf_fortress_2014.override {
+    copyDataDirectory = true;
+  });
+
+  dwarf-therapist = callPackage ../games/dwarf-therapist { };
+
+  d1x_rebirth = callPackage ../games/d1x-rebirth { };
+
+  d2x_rebirth = callPackage ../games/d2x-rebirth { };
+
+  eboard = callPackage ../games/eboard { };
+
+  eduke32 = callPackage ../games/eduke32 { };
+
+  egoboo = callPackage ../games/egoboo { };
+
+  exult = callPackage ../games/exult { };
+
+  flightgear = callPackage ../games/flightgear { };
+
+  freeciv = callPackage ../games/freeciv { };
+
+  freeciv_gtk = callPackage ../games/freeciv {
+    gtkClient = true;
+    sdlClient = false;
+  };
+
+  freedink = callPackage ../games/freedink { };
+
+  fsg = callPackage ../games/fsg {
+    wxGTK = wxGTK28.override { unicode = false; };
+  };
+
+  gemrb = callPackage ../games/gemrb { };
+
+  gl117 = callPackage ../games/gl-117 {};
+
+  glestae = callPackage ../games/glestae {};
+
+  globulation2 = callPackage ../games/globulation {};
+
+  gltron = callPackage ../games/gltron { };
+
+  gnuchess = callPackage ../games/gnuchess { };
+
+  gnugo = callPackage ../games/gnugo { };
+
+  gparted = callPackage ../tools/misc/gparted { };
+
+  gsmartcontrol = callPackage ../tools/misc/gsmartcontrol {
+    inherit (gnome) libglademm;
+  };
+
+  gtypist = callPackage ../games/gtypist { };
+
+  hexen = callPackage ../games/hexen { };
+
+  icbm3d = callPackage ../games/icbm3d { };
+
+  ingen = callPackage ../applications/audio/ingen { };
+
+  instead = callPackage ../games/instead {
+    lua = lua5;
+  };
+
+  kobodeluxe = callPackage ../games/kobodeluxe { };
+
+  lincity = builderDefsPackage (import ../games/lincity) {
+    inherit (xlibs) libX11 libXext xextproto
+      libICE libSM xproto;
+    inherit libpng zlib;
+  };
+
+  lincity_ng = callPackage ../games/lincity/ng.nix {};
+
+  mars = callPackage ../games/mars { };
+
+  micropolis = callPackage ../games/micropolis { };
+
+  mnemosyne = callPackage ../games/mnemosyne {
+    inherit (pythonPackages) matplotlib cherrypy sqlite3;
+  };
+
+  naev = callPackage ../games/naev { };
+
+  nexuiz = callPackage ../games/nexuiz { };
+
+  njam = callPackage ../games/njam { };
+
+  oilrush = callPackage ../games/oilrush { };
+
+  openra = callPackage ../games/openra { };
+
+  openttd = callPackage ../games/openttd {
+    zlib = zlibStatic;
+  };
+
+  opentyrian = callPackage ../games/opentyrian { };
+
+  openxcom = callPackage ../games/openxcom { };
+
+  pingus = callPackage ../games/pingus {};
+
+  pioneers = callPackage ../games/pioneers { };
+
+  pong3d = callPackage ../games/pong3d { };
+
+  prboom = callPackage ../games/prboom { };
+
+  quake3demo = callPackage ../games/quake3/wrapper {
+    name = "quake3-demo-${quake3game.name}";
+    description = "Demo of Quake 3 Arena, a classic first-person shooter";
+    game = quake3game;
+    paks = [quake3demodata];
+  };
+
+  quake3demodata = callPackage ../games/quake3/demo { };
+
+  quake3game = callPackage ../games/quake3/game { };
+
+  quantumminigolf = callPackage ../games/quantumminigolf {};
+
+  racer = callPackage ../games/racer { };
+
+  residualvm = callPackage ../games/residualvm {
+    openglSupport = mesaSupported;
+  };
+
+  rigsofrods = callPackage ../games/rigsofrods {
+    mygui = myguiSvn;
+  };
+
+  rili = callPackage ../games/rili { };
+
+  rogue = callPackage ../games/rogue { };
+
+  samplv1 = callPackage ../applications/audio/samplv1 { };
+
+  sauerbraten = callPackage ../games/sauerbraten {};
+
+  scid = callPackage ../games/scid { };
+
+  scummvm = callPackage ../games/scummvm { };
+
+  scorched3d = callPackage ../games/scorched3d { };
+
+  sdlmame = callPackage ../games/sdlmame { };
+
+  sgtpuzzles = builderDefsPackage (import ../games/sgt-puzzles) {
+    inherit pkgconfig fetchsvn perl gtk;
+    inherit (xlibs) libX11;
+  };
+
+  simutrans = callPackage ../games/simutrans { };
+
+  soi = callPackage ../games/soi {};
+
+  # You still can override by passing more arguments.
+  spaceOrbit = callPackage ../games/orbit { };
+
+  spring = callPackage ../games/spring { };
+
+  springLobby = callPackage ../games/spring/springlobby.nix { };
+
+  stardust = callPackage ../games/stardust {};
+
+  steam = callPackage_i686 ../games/steam {};
+
+  steamChrootEnv = callPackage_i686 ../games/steam/chrootenv.nix {
+    zenity = gnome2.zenity;
+  };
+
+  stuntrally = callPackage ../games/stuntrally { };
+
+  superTux = callPackage ../games/super-tux { };
+
+  superTuxKart = callPackage ../games/super-tux-kart { };
+
+  synthv1 = callPackage ../applications/audio/synthv1 { };
+
+  tbe = callPackage ../games/the-butterfly-effect {};
+
+  teetertorture = callPackage ../games/teetertorture { };
+
+  teeworlds = callPackage ../games/teeworlds { };
+
+  tennix = callPackage ../games/tennix { };
+
+  tibia = callPackage ../games/tibia { };
+
+  tintin = callPackage ../games/tintin { };
+
+  tpm = callPackage ../games/thePenguinMachine { };
+
+  tremulous = callPackage ../games/tremulous { };
+
+  speed_dreams = callPackage ../games/speed-dreams {
+    # Torcs wants to make shared libraries linked with plib libraries (it provides static).
+    # i686 is the only platform I know than can do that linking without plib built with -fPIC
+    plib = plib.override { enablePIC = !stdenv.isi686; };
+    libpng = libpng12;
+  };
+
+  torcs = callPackage ../games/torcs {
+    # Torcs wants to make shared libraries linked with plib libraries (it provides static).
+    # i686 is the only platform I know than can do that linking without plib built with -fPIC
+    plib = plib.override { enablePIC = !stdenv.isi686; };
+  };
+
+  trigger = callPackage ../games/trigger { };
+
+  typespeed = callPackage ../games/typespeed { };
+
+  ufoai = callPackage ../games/ufoai { };
+
+  ultimatestunts = callPackage ../games/ultimatestunts { };
+
+  ultrastardx = callPackage ../games/ultrastardx {
+    ffmpeg = ffmpeg_0_6;
+    lua = lua5;
+  };
+
+  unvanquished = callPackage ../games/unvanquished { };
+
+  uqm = callPackage ../games/uqm { };
+
+  urbanterror = callPackage ../games/urbanterror { };
+
+  ut2004demo = callPackage ../games/ut2004demo { };
+
+  vdrift = callPackage ../games/vdrift { };
+
+  vectoroids = callPackage ../games/vectoroids { };
+
+  vessel = callPackage_i686 ../games/vessel { };
+
+  warmux = callPackage ../games/warmux { };
+
+  warsow = callPackage ../games/warsow {
+    libjpeg = libjpeg62;
+  };
+
+  warzone2100 = callPackage ../games/warzone2100 { };
+
+  widelands = callPackage ../games/widelands {
+    lua = lua5_1;
+  };
+
+  worldofgoo_demo = callPackage ../games/worldofgoo {
+    demo = true;
+  };
+
+  worldofgoo = callPackage ../games/worldofgoo { };
+
+  xboard =  callPackage ../games/xboard { };
+
+  xconq = callPackage ../games/xconq {};
+
+  # TODO: the corresponding nix file is missing
+  # xracer = callPackage ../games/xracer { };
+
+  xonotic = callPackage ../games/xonotic { };
+
+  xskat = callPackage ../games/xskat { };
+
+  xsokoban = builderDefsPackage (import ../games/xsokoban) {
+    inherit (xlibs) libX11 xproto libXpm libXt;
+  };
+
+  zdoom = callPackage ../games/zdoom { };
+
+  zod = callPackage ../games/zod { };
+
+  zoom = callPackage ../games/zoom { };
+
+  keen4 = callPackage ../games/keen4 { };
+
+  zeroad = callPackage ../games/0ad { };
+
+  ### DESKTOP ENVIRONMENTS
+
+  cinnamon = recurseIntoAttrs rec {
+    callPackage = newScope pkgs.cinnamon;
+    inherit (gnome3) gnome_common libgnomekbd gnome-menus zenity;
+
+    muffin = callPackage ../desktops/cinnamon/muffin.nix { } ;
+
+    cinnamon-control-center = callPackage ../desktops/cinnamon/cinnamon-control-center.nix{ };
+
+    cinnamon-settings-daemon = callPackage ../desktops/cinnamon/cinnamon-settings-daemon.nix{ };
+
+    cinnamon-session = callPackage ../desktops/cinnamon/cinnamon-session.nix{ } ;
+
+    cinnamon-desktop = callPackage ../desktops/cinnamon/cinnamon-desktop.nix { };
+
+    cinnamon-translations = callPackage ../desktops/cinnamon/cinnamon-translations.nix { };
+
+    cjs = callPackage ../desktops/cinnamon/cjs.nix { };
+  };
+
+  enlightenment = callPackage ../desktops/enlightenment { };
+
+  e17 = recurseIntoAttrs (
+    let callPackage = newScope pkgs.e17; in
+    import ../desktops/e17 { inherit callPackage pkgs; }
+  );
+
+  e18 = recurseIntoAttrs (
+    let callPackage = newScope pkgs.e18; in
+    import ../desktops/e18 { inherit callPackage pkgs; }
+  );
+
+  gnome2 = callPackage ../desktops/gnome-2 {
+    callPackage = pkgs.newScope pkgs.gnome2;
+    self = pkgs.gnome2;
+  }  // pkgs.gtkLibs // {
+    # Backwards compatibility;
+    inherit (pkgs) libsoup libwnck gtk_doc gnome_doc_utils;
+  };
+
+  gnome3 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.10 {
+    callPackage = pkgs.newScope pkgs.gnome3;
+    self = pkgs.gnome3;
+  });
+
+  gnome3_12 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.12 {
+    callPackage = pkgs.newScope pkgs.gnome3_12;
+  });
+
+  gnome = recurseIntoAttrs gnome2;
+
+  hsetroot = callPackage ../tools/X11/hsetroot { };
+
+  kakasi = callPackage ../tools/text/kakasi { };
+
+  kde4 = recurseIntoAttrs pkgs.kde412;
+
+  kde4_next = recurseIntoAttrs( lib.lowPrioSet pkgs.kde412 );
+
+  kde412 = kdePackagesFor (pkgs.kde412 // {
+      eigen = eigen2;
+      libusb = libusb1;
+      libcanberra = libcanberra_kde;
+    }) ../desktops/kde-4.12;
+
+  kdePackagesFor = self: dir:
+    let callPackageOrig = callPackage; in
+    let
+      callPackage = newScope self;
+      kde4 = callPackageOrig dir {
+        inherit callPackage callPackageOrig;
+      };
+    in kde4 // {
+      inherit kde4;
+
+      wrapper = callPackage ../build-support/kdewrapper {};
+
+      recurseForRelease = true;
+
+      akunambol = callPackage ../applications/networking/sync/akunambol { };
+
+      amarok = callPackage ../applications/audio/amarok { };
+
+      bangarang = callPackage ../applications/video/bangarang { };
+
+      basket = callPackage ../applications/office/basket { };
+
+      bluedevil = callPackage ../tools/bluetooth/bluedevil { };
+
+      calligra = callPackage ../applications/office/calligra { };
+
+      colord-kde = callPackage ../tools/misc/colord-kde { };
+
+      digikam = if builtins.compareVersions "4.9" kde4.release == 1 then
+          callPackage ../applications/graphics/digikam/2.nix { }
+        else
+          callPackage ../applications/graphics/digikam { };
+
+      eventlist = callPackage ../applications/office/eventlist {};
+
+      k3b = callPackage ../applications/misc/k3b { };
+
+      kadu = callPackage ../applications/networking/instant-messengers/kadu { };
+
+      kbibtex = callPackage ../applications/office/kbibtex { };
+
+      kde_gtk_config = callPackage ../tools/misc/kde-gtk-config { };
+
+      kde_wacomtablet = callPackage ../applications/misc/kde-wacomtablet { };
+
+      kdeconnect = callPackage ../applications/misc/kdeconnect { };
+
+      kdenlive = callPackage ../applications/video/kdenlive { mlt = mlt-qt4; };
+
+      kdesvn = callPackage ../applications/version-management/kdesvn { };
+
+      kdevelop = callPackage ../applications/editors/kdevelop { };
+
+      kdevplatform = callPackage ../development/libraries/kdevplatform { };
+
+      kdiff3 = callPackage ../tools/text/kdiff3 { };
+
+      kile = callPackage ../applications/editors/kile { };
+
+      kmplayer = callPackage ../applications/video/kmplayer { };
+
+      kmymoney = callPackage ../applications/office/kmymoney { };
+
+      kipi_plugins = callPackage ../applications/graphics/kipi-plugins { };
+
+      konversation = callPackage ../applications/networking/irc/konversation { };
+
+      kvirc = callPackage ../applications/networking/irc/kvirc { };
+
+      krename = callPackage ../applications/misc/krename { };
+
+      krusader = callPackage ../applications/misc/krusader { };
+
+      ksshaskpass = callPackage ../tools/security/ksshaskpass {};
+
+      ktorrent = callPackage ../applications/networking/p2p/ktorrent { };
+
+      kuickshow = callPackage ../applications/graphics/kuickshow { };
+
+      libalkimia = callPackage ../development/libraries/libalkimia { };
+
+      libktorrent = callPackage ../development/libraries/libktorrent { };
+
+      libkvkontakte = callPackage ../development/libraries/libkvkontakte { };
+
+      liblikeback = callPackage ../development/libraries/liblikeback { };
+
+      libmm-qt = callPackage ../development/libraries/libmm-qt { };
+
+      libnm-qt = callPackage ../development/libraries/libnm-qt { };
+
+      networkmanagement = callPackage ../tools/networking/networkmanagement { };
+
+      partitionManager = callPackage ../tools/misc/partition-manager { };
+
+      plasma-nm = callPackage ../tools/networking/plasma-nm { };
+
+      polkit_kde_agent = callPackage ../tools/security/polkit-kde-agent { };
+
+      psi = callPackage ../applications/networking/instant-messengers/psi { };
+
+      qtcurve = callPackage ../misc/themes/qtcurve { };
+
+      quassel = callPackage ../applications/networking/irc/quassel { dconf = gnome3.dconf; };
+
+      quasselWithoutKDE = (self.quassel.override {
+        withKDE = false;
+        tag = "-without-kde";
+      });
+
+      quasselDaemon = (self.quassel.override {
+        monolithic = false;
+        daemon = true;
+        tag = "-daemon";
+      });
+
+      quasselClient = (self.quassel.override {
+        monolithic = false;
+        client = true;
+        tag = "-client";
+      });
+
+      quasselClientWithoutKDE = (self.quasselClient.override {
+        withKDE = false;
+        tag = "-client-without-kde";
+      });
+
+      rekonq = callPackage ../applications/networking/browsers/rekonq { };
+
+      kwebkitpart = callPackage ../applications/networking/browsers/kwebkitpart { };
+
+      rsibreak = callPackage ../applications/misc/rsibreak { };
+
+      semnotes = callPackage ../applications/misc/semnotes { };
+
+      skrooge = callPackage ../applications/office/skrooge { };
+
+      telepathy = callPackage ../applications/networking/instant-messengers/telepathy/kde {};
+
+      yakuake = callPackage ../applications/misc/yakuake { };
+
+      zanshin = callPackage ../applications/office/zanshin { };
+
+      kwooty = callPackage ../applications/networking/newsreaders/kwooty { };
+    };
+
+  redshift = callPackage ../applications/misc/redshift {
+    inherit (xorg) libX11 libXrandr libxcb randrproto libXxf86vm
+      xf86vidmodeproto;
+    inherit (gnome) GConf;
+    inherit (pythonPackages) pyxdg;
+    geoclue = geoclue2;
+  };
+
+  oxygen_gtk = callPackage ../misc/themes/gtk2/oxygen-gtk { };
+
+  gtk_engines = callPackage ../misc/themes/gtk2/gtk-engines { };
+
+  gtk-engine-murrine = callPackage ../misc/themes/gtk2/gtk-engine-murrine { };
+
+  gnome_themes_standard = gnome3.gnome_themes_standard;
+
+  mate-icon-theme = callPackage ../misc/themes/mate-icon-theme { };
+
+  mate-themes = callPackage ../misc/themes/mate-themes { };
+
+  xfce = xfce4_10;
+  xfce4_10 = recurseIntoAttrs (import ../desktops/xfce { inherit pkgs newScope; });
+
+
+  ### SCIENCE
+
+  ### SCIENCE/GEOMETRY
+
+  drgeo = builderDefsPackage (import ../applications/science/geometry/drgeo) {
+    inherit (gnome) libglade;
+    inherit libxml2 perl intltool libtool pkgconfig gtk;
+    guile = guile_1_8;
+  };
+
+  tetgen = callPackage ../applications/science/geometry/tetgen { };
+
+
+  ### SCIENCE/BIOLOGY
+
+  alliance = callPackage ../applications/science/electronics/alliance {
+    motif = lesstif;
+  };
+
+  arb = callPackage ../applications/science/biology/arb {
+    lesstif = lesstif93;
+  };
+
+  archimedes = callPackage ../applications/science/electronics/archimedes { };
+
+  biolib = callPackage ../development/libraries/science/biology/biolib { };
+
+  emboss = callPackage ../applications/science/biology/emboss { };
+
+  mrbayes = callPackage ../applications/science/biology/mrbayes { };
+
+  ncbiCTools = builderDefsPackage ../development/libraries/ncbi {
+    inherit tcsh mesa lesstif;
+    inherit (xlibs) libX11 libXaw xproto libXt libSM libICE
+      libXmu libXext;
+  };
+
+  ncbi_tools = callPackage ../applications/science/biology/ncbi-tools { };
+
+  paml = callPackage ../applications/science/biology/paml { };
+
+  pal2nal = callPackage ../applications/science/biology/pal2nal { };
+
+  plink = callPackage ../applications/science/biology/plink/default.nix { };
+
+
+  ### SCIENCE/MATH
+
+  arpack = callPackage ../development/libraries/science/math/arpack { };
+
+  atlas = callPackage ../development/libraries/science/math/atlas {
+    # The build process measures CPU capabilities and optimizes the
+    # library to perform best on that particular machine. That is a
+    # great feature, but it's of limited use with pre-built binaries
+    # coming from a central build farm.
+    tolerateCpuTimingInaccuracy = true;
+  };
+
+  blas = callPackage ../development/libraries/science/math/blas { };
+
+  content = builderDefsPackage ../applications/science/math/content {
+    inherit mesa lesstif;
+    inherit (xlibs) libX11 libXaw xproto libXt libSM libICE
+      libXmu libXext libXcursor;
+  };
+
+  jags = callPackage ../applications/science/math/jags { };
+
+  liblapack = callPackage ../development/libraries/science/math/liblapack { };
+  liblapack_3_5_0 = callPackage ../development/libraries/science/math/liblapack/3.5.0.nix { };
+
+  liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { };
+
+  # julia is pinned to specific versions of openblas, so keep old versions
+  # until they aren't needed. The un-versioned attribute may continue to track
+  # upstream development.
+  openblas = callPackage ../development/libraries/science/math/openblas {
+    liblapack = liblapack_3_5_0;
+  };
+  openblas_0_2_10 = callPackage ../development/libraries/science/math/openblas/0.2.10.nix {
+    liblapack = liblapack_3_5_0;
+  };
+  openblas_0_2_2 = callPackage ../development/libraries/science/math/openblas/0.2.2.nix { };
+
+  mathematica = callPackage ../applications/science/math/mathematica { };
+
+  sage = callPackage ../applications/science/math/sage { };
+
+  ### SCIENCE/MOLECULAR-DYNAMICS
+
+  gromacs = callPackage ../applications/science/molecular-dynamics/gromacs {
+    singlePrec = true;
+    fftw = fftwSinglePrec;
+    cmake = cmakeCurses;
+  };
+
+  gromacsDouble = lowPrio (callPackage ../applications/science/molecular-dynamics/gromacs {
+    singlePrec = false;
+    fftw = fftw;
+    cmake = cmakeCurses;
+  });
+
+
+  ### SCIENCE/LOGIC
+
+  abc-verifier = callPackage ../applications/science/logic/abc {};
+
+  alt-ergo = callPackage ../applications/science/logic/alt-ergo {};
+
+  coq = callPackage ../applications/science/logic/coq {
+    inherit (ocamlPackages) findlib lablgtk;
+    camlp5 = ocamlPackages.camlp5_transitional;
+  };
+
+  coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix {
+    inherit (ocamlPackages) findlib lablgtk;
+    camlp5 = ocamlPackages.camlp5_transitional;
+  };
+
+  coq_8_3 = callPackage ../applications/science/logic/coq/8.3.nix {
+    inherit (ocamlPackages) findlib lablgtk;
+    camlp5 = ocamlPackages.camlp5_transitional;
+  };
+
+  cvc3 = callPackage ../applications/science/logic/cvc3 {};
+
+  ekrhyper = callPackage ../applications/science/logic/ekrhyper {};
+
+  eprover = callPackage ../applications/science/logic/eprover {
+    texLive = texLiveAggregationFun {
+      paths = [
+        texLive texLiveExtra
+      ];
+    };
+  };
+
+  ginac = callPackage ../applications/science/math/ginac { };
+
+  hol = callPackage ../applications/science/logic/hol { };
+
+  hol_light = callPackage ../applications/science/logic/hol_light {
+    inherit (ocamlPackages) findlib;
+    camlp5 = ocamlPackages.camlp5_strict;
+  };
+
+  isabelle = import ../applications/science/logic/isabelle {
+    inherit (pkgs) stdenv fetchurl nettools perl polyml;
+    inherit (pkgs.emacs24Packages) proofgeneral;
+  };
+
+  iprover = callPackage ../applications/science/logic/iprover {};
+
+  leo2 = callPackage ../applications/science/logic/leo2 {};
+
+  logisim = callPackage ../applications/science/logic/logisim {};
+
+  ltl2ba = callPackage ../applications/science/logic/ltl2ba {};
+
+  matita = callPackage ../applications/science/logic/matita {
+    ocaml = ocaml_3_11_2;
+    inherit (ocamlPackages_3_11_2) findlib lablgtk ocaml_expat gmetadom ocaml_http
+            lablgtkmathview ocaml_mysql ocaml_sqlite3 ocamlnet camlzip ocaml_pcre;
+    ulex08 = ocamlPackages_3_11_2.ulex08.override { camlp5 = ocamlPackages_3_11_2.camlp5_5_transitional; };
+  };
+
+  matita_130312 = lowPrio (callPackage ../applications/science/logic/matita/130312.nix {
+    inherit (ocamlPackages) findlib lablgtk ocaml_expat gmetadom ocaml_http
+            ocaml_mysql ocamlnet ulex08 camlzip ocaml_pcre;
+  });
+
+  minisat = callPackage ../applications/science/logic/minisat {};
+
+  opensmt = callPackage ../applications/science/logic/opensmt { };
+
+  otter = callPackage ../applications/science/logic/otter {};
+
+  picosat = callPackage ../applications/science/logic/picosat {};
+
+  prooftree = callPackage ../applications/science/logic/prooftree {
+    inherit (ocamlPackages) findlib lablgtk;
+    camlp5 = ocamlPackages.camlp5_transitional;
+  };
+
+  prover9 = callPackage ../applications/science/logic/prover9 { };
+
+  satallax = callPackage ../applications/science/logic/satallax {};
+
+  spass = callPackage ../applications/science/logic/spass {};
+
+  ssreflect = callPackage ../applications/science/logic/ssreflect {
+    camlp5 = ocamlPackages.camlp5_transitional;
+  };
+
+  tptp = callPackage ../applications/science/logic/tptp {};
+
+  twelf = callPackage ../applications/science/logic/twelf {
+    smlnj = if stdenv.isDarwin
+      then smlnjBootstrap
+      else smlnj;
+  };
+
+  verifast = callPackage ../applications/science/logic/verifast {};
+
+  why3 = callPackage ../applications/science/logic/why3 {};
+
+  yices = callPackage ../applications/science/logic/yices {};
+
+  z3 = callPackage ../applications/science/logic/z3 {};
+
+  boolector   = boolector15;
+  boolector15 = callPackage ../applications/science/logic/boolector {};
+  boolector16 = lowPrio (callPackage ../applications/science/logic/boolector {
+    useV16 = true;
+  });
+
+  ### SCIENCE / ELECTRONICS
+
+  eagle = callPackage_i686 ../applications/science/electronics/eagle { };
+
+  caneda = callPackage ../applications/science/electronics/caneda { };
+
+  gtkwave = callPackage ../applications/science/electronics/gtkwave { };
+
+  kicad = callPackage ../applications/science/electronics/kicad {
+    wxGTK = wxGTK29;
+  };
+
+  ngspice = callPackage ../applications/science/electronics/ngspice { };
+
+  qucs = callPackage ../applications/science/electronics/qucs { };
+
+  xoscope = callPackage ../applications/science/electronics/xoscope { };
+
+
+  ### SCIENCE / MATH
+
+  ecm = callPackage ../applications/science/math/ecm { };
+
+  eukleides = callPackage ../applications/science/math/eukleides {
+    texinfo = texinfo4;
+  };
+
+  fricas = callPackage ../applications/science/math/fricas { };
+
+  gap = callPackage ../applications/science/math/gap { };
+
+  maxima = callPackage ../applications/science/math/maxima { };
+
+  wxmaxima = callPackage ../applications/science/math/wxmaxima { };
+
+  pari = callPackage ../applications/science/math/pari {};
+
+  pspp = callPackage ../applications/science/math/pssp {
+    inherit (gnome) libglade gtksourceview;
+  };
+
+  singular = callPackage ../applications/science/math/singular {};
+
+  scilab = callPackage ../applications/science/math/scilab {
+    withXaw3d = false;
+    withTk = true;
+    withGtk = false;
+    withOCaml = true;
+    withX = true;
+  };
+
+  msieve = callPackage ../applications/science/math/msieve { };
+
+  weka = callPackage ../applications/science/math/weka { };
+
+  yad = callPackage ../tools/misc/yad { };
+
+  yacas = callPackage ../applications/science/math/yacas { };
+
+  speedcrunch = callPackage ../applications/science/math/speedcrunch {
+    qt = qt4;
+    cmake = cmakeCurses;
+  };
+
+
+  ### SCIENCE / MISC
+
+  boinc = callPackage ../applications/science/misc/boinc { };
+
+  celestia = callPackage ../applications/science/astronomy/celestia {
+    lua = lua5_1;
+    inherit (xlibs) libXmu;
+    inherit (pkgs.gnome) gtkglext;
+  };
+
+  fityk = callPackage ../applications/science/misc/fityk { };
+
+  gravit = callPackage ../applications/science/astronomy/gravit { };
+
+  golly = callPackage ../applications/science/misc/golly { };
+
+  megam = callPackage ../applications/science/misc/megam { };
+
+  root = callPackage ../applications/science/misc/root { };
+
+  simgrid = callPackage ../applications/science/misc/simgrid { };
+
+  spyder = callPackage ../applications/science/spyder {
+    inherit (pythonPackages) pyflakes rope sphinx numpy scipy matplotlib; # recommended
+    inherit (pythonPackages) ipython pep8; # optional
+    inherit pylint;
+  };
+
+  stellarium = callPackage ../applications/science/astronomy/stellarium { };
+
+  tulip = callPackage ../applications/science/misc/tulip { };
+
+  vite = callPackage ../applications/science/misc/vite { };
+
+  xplanet = callPackage ../applications/science/astronomy/xplanet { };
+
+  ### MISC
+
+  atari800 = callPackage ../misc/emulators/atari800 { };
+
+  ataripp = callPackage ../misc/emulators/atari++ { };
+
+  auctex = callPackage ../tools/typesetting/tex/auctex { };
+
+  beep = callPackage ../misc/beep { };
+
+  cups = callPackage ../misc/cups { libusb = libusb1; };
+
+  cups_pdf_filter = callPackage ../misc/cups/pdf-filter.nix { };
+
+  gutenprint = callPackage ../misc/drivers/gutenprint { };
+
+  gutenprintBin = callPackage ../misc/drivers/gutenprint/bin.nix { };
+
+  cupsBjnp = callPackage ../misc/cups/drivers/cups-bjnp { };
+
+  darcnes = callPackage ../misc/emulators/darcnes { };
+
+  dbacl = callPackage ../tools/misc/dbacl { };
+
+  dblatex = callPackage ../tools/typesetting/tex/dblatex {
+    enableAllFeatures = false;
+  };
+
+  dblatexFull = appendToName "full" (dblatex.override {
+    enableAllFeatures = true;
+  });
+
+  dosbox = callPackage ../misc/emulators/dosbox { };
+
+  dpkg = callPackage ../tools/package-management/dpkg { };
+
+  ekiga = newScope pkgs.gnome ../applications/networking/instant-messengers/ekiga { };
+
+  emulationstation = callPackage ../misc/emulators/emulationstation { };
+
+  electricsheep = callPackage ../misc/screensavers/electricsheep { };
+
+  fakenes = callPackage ../misc/emulators/fakenes { };
+
+  fceux = callPackage ../misc/emulators/fceux { };
+
+  foldingathome = callPackage ../misc/foldingathome { };
+
+  foo2zjs = callPackage ../misc/drivers/foo2zjs {};
+
+  foomatic_filters = callPackage ../misc/drivers/foomatic-filters {};
+
+  freestyle = callPackage ../misc/freestyle { };
+
+  gajim = callPackage ../applications/networking/instant-messengers/gajim { };
+
+  gammu = callPackage ../applications/misc/gammu { };
+
+  gensgs = callPackage_i686 ../misc/emulators/gens-gs { };
+
+  ghostscript = callPackage ../misc/ghostscript {
+    x11Support = false;
+    cupsSupport = config.ghostscript.cups or (!stdenv.isDarwin);
+    gnuFork = config.ghostscript.gnu or false;
+  };
+
+  ghostscriptX = appendToName "with-X" (ghostscript.override {
+    x11Support = true;
+  });
+
+  guix = callPackage ../tools/package-management/guix { };
+
+  gxemul = callPackage ../misc/gxemul { };
+
+  hatari = callPackage ../misc/emulators/hatari { };
+
+  hplip = callPackage ../misc/drivers/hplip { };
+
+  hplipWithPlugin = hplip.override { withPlugin = true; };
+
+  # using the new configuration style proposal which is unstable
+  jack1 = callPackage ../misc/jackaudio/jack1.nix { };
+
+  jack2 = callPackage ../misc/jackaudio { };
+
+  keynav = callPackage ../tools/X11/keynav { };
+
+  lazylist = callPackage ../tools/typesetting/tex/lazylist { };
+
+  lilypond = callPackage ../misc/lilypond { guile = guile_1_8; };
+
+  martyr = callPackage ../development/libraries/martyr { };
+
+  maven = maven3;
+  maven3 = callPackage ../misc/maven { jdk = openjdk; };
+
+  mess = callPackage ../misc/emulators/mess {
+    inherit (pkgs.gnome) GConf;
+  };
+
+  mupen64plus = callPackage ../misc/emulators/mupen64plus { };
+
+  mupen64plus1_5 = callPackage ../misc/emulators/mupen64plus/1.5.nix { };
+
+  nix = nixStable;
+
+  nixStable = callPackage ../tools/package-management/nix {
+    storeDir = config.nix.storeDir or "/nix/store";
+    stateDir = config.nix.stateDir or "/nix/var";
+  };
+
+  nixUnstable = callPackage ../tools/package-management/nix/unstable.nix {
+    storeDir = config.nix.storeDir or "/nix/store";
+    stateDir = config.nix.stateDir or "/nix/var";
+  };
+
+  nixops = callPackage ../tools/package-management/nixops { };
+
+  nix-prefetch-scripts = callPackage ../tools/package-management/nix-prefetch-scripts { };
+
+  nix-repl = callPackage ../tools/package-management/nix-repl { };
+
+  nut = callPackage ../applications/misc/nut { };
+
+  solfege = callPackage ../misc/solfege {
+      pysqlite = pkgs.pythonPackages.sqlite3;
+  };
+
+  disnix = callPackage ../tools/package-management/disnix { };
+
+  dysnomia = callPackage ../tools/package-management/disnix/dysnomia {
+    enableApacheWebApplication = config.disnix.enableApacheWebApplication or false;
+    enableAxis2WebService = config.disnix.enableAxis2WebService or false;
+    enableEjabberdDump = config.disnix.enableEjabberdDump or false;
+    enableMySQLDatabase = config.disnix.enableMySQLDatabase or false;
+    enablePostgreSQLDatabase = config.disnix.enablePostgreSQLDatabase or false;
+    enableSubversionRepository = config.disnix.enableSubversionRepository or false;
+    enableTomcatWebApplication = config.disnix.enableTomcatWebApplication or false;
+  };
+
+  disnixos = callPackage ../tools/package-management/disnix/disnixos { };
+
+  DisnixWebService = callPackage ../tools/package-management/disnix/DisnixWebService { };
+
+  latex2html = callPackage ../tools/typesetting/tex/latex2html/default.nix {
+    tex = tetex;
+  };
+
+  lkproof = callPackage ../tools/typesetting/tex/lkproof { };
+
+  mysqlWorkbench = newScope gnome ../applications/misc/mysql-workbench {
+    lua = lua5;
+    inherit (pythonPackages) pexpect paramiko;
+  };
+
+  robomongo = callPackage ../applications/misc/robomongo { };
+
+  opkg = callPackage ../tools/package-management/opkg { };
+
+  pgadmin = callPackage ../applications/misc/pgadmin { };
+
+  pgf = pgf2;
+
+  # Keep the old PGF since some documents don't render properly with
+  # the new one.
+  pgf1 = callPackage ../tools/typesetting/tex/pgf/1.x.nix { };
+
+  pgf2 = callPackage ../tools/typesetting/tex/pgf/2.x.nix { };
+
+  pgfplots = callPackage ../tools/typesetting/tex/pgfplots { };
+
+  pjsip = callPackage ../applications/networking/pjsip { };
+
+  polytable = callPackage ../tools/typesetting/tex/polytable { };
+
+  PPSSPP = callPackage ../misc/emulators/ppsspp { };
+
+  uae = callPackage ../misc/emulators/uae { };
+
+  putty = callPackage ../applications/networking/remote/putty { };
+
+  retroarch = callPackage ../misc/emulators/retroarch { };
+
+  rssglx = callPackage ../misc/screensavers/rss-glx { };
+
+  xlockmore = callPackage ../misc/screensavers/xlockmore { };
+
+  samsungUnifiedLinuxDriver = import ../misc/cups/drivers/samsung {
+    inherit fetchurl stdenv;
+    inherit cups ghostscript glibc patchelf;
+    gcc = import ../development/compilers/gcc/4.4 {
+      inherit stdenv fetchurl gmp mpfr noSysDirs gettext which;
+      texinfo = texinfo4;
+      profiledCompiler = true;
+    };
+  };
+
+  saneBackends = callPackage ../applications/graphics/sane/backends.nix {
+    gt68xxFirmware = config.sane.gt68xxFirmware or null;
+    snapscanFirmware = config.sane.snapscanFirmware or null;
+    hotplugSupport = config.sane.hotplugSupport or true;
+    libusb = libusb1;
+  };
+
+  saneBackendsGit = callPackage ../applications/graphics/sane/backends-git.nix {
+    gt68xxFirmware = config.sane.gt68xxFirmware or null;
+    snapscanFirmware = config.sane.snapscanFirmware or null;
+    hotplugSupport = config.sane.hotplugSupport or true;
+  };
+
+  mkSaneConfig = callPackage ../applications/graphics/sane/config.nix { };
+
+  saneFrontends = callPackage ../applications/graphics/sane/frontends.nix { };
+
+  seafile-shared = callPackage ../misc/seafile-shared { };
+
+  slock = callPackage ../misc/screensavers/slock { };
+
+  sourceAndTags = import ../misc/source-and-tags {
+    inherit pkgs stdenv unzip lib ctags;
+    hasktags = haskellPackages.hasktags;
+  };
+
+  splix = callPackage ../misc/cups/drivers/splix { };
+
+  streamripper = callPackage ../applications/audio/streamripper { };
+
+  sqsh = callPackage ../development/tools/sqsh { };
+
+  tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; };
+
+  tex4ht = callPackage ../tools/typesetting/tex/tex4ht { };
+
+  texFunctions = import ../tools/typesetting/tex/nix pkgs;
+
+  texLive = builderDefsPackage (import ../tools/typesetting/tex/texlive) {
+    inherit builderDefs zlib bzip2 ncurses libpng ed lesstif ruby potrace
+      gd t1lib freetype icu perl expat curl xz pkgconfig zziplib texinfo
+      libjpeg bison python fontconfig flex poppler libpaper graphite2
+      makeWrapper;
+    inherit (xlibs) libXaw libX11 xproto libXt libXpm
+      libXmu libXext xextproto libSM libICE;
+    ghostscript = ghostscriptX;
+    harfbuzz = harfbuzz.override {
+      withIcu = true; withGraphite2 = true;
+    };
+  };
+
+  texLiveFull = lib.setName "texlive-full" (texLiveAggregationFun {
+    paths = [ texLive texLiveExtra lmodern texLiveCMSuper texLiveLatexXColor
+              texLivePGF texLiveBeamer texLiveModerncv tipa tex4ht texinfo
+              texLiveModerntimeline ];
+  });
+
+  /* Look in configurations/misc/raskin.nix for usage example (around revisions
+  where TeXLive was added)
+
+  (texLiveAggregationFun {
+    paths = [texLive texLiveExtra texLiveCMSuper
+      texLiveBeamer
+    ];
+  })
+
+  You need to use texLiveAggregationFun to regenerate, say, ls-R (TeX-related file list)
+  Just installing a few packages doesn't work.
+  */
+  texLiveAggregationFun = params:
+    builderDefsPackage (import ../tools/typesetting/tex/texlive/aggregate.nix)
+      ({inherit poppler perl makeWrapper;} // params);
+
+  texDisser = callPackage ../tools/typesetting/tex/disser {};
+
+  texLiveContext = builderDefsPackage (import ../tools/typesetting/tex/texlive/context.nix) {
+    inherit texLive;
+  };
+
+  texLiveExtra = builderDefsPackage (import ../tools/typesetting/tex/texlive/extra.nix) {
+    inherit texLive xz;
+  };
+
+  texLiveCMSuper = builderDefsPackage (import ../tools/typesetting/tex/texlive/cm-super.nix) {
+    inherit texLive;
+  };
+
+  texLiveLatexXColor = builderDefsPackage (import ../tools/typesetting/tex/texlive/xcolor.nix) {
+    inherit texLive;
+  };
+
+  texLivePGF = builderDefsPackage (import ../tools/typesetting/tex/texlive/pgf.nix) {
+    inherit texLiveLatexXColor texLive;
+  };
+
+  texLiveBeamer = builderDefsPackage (import ../tools/typesetting/tex/texlive/beamer.nix) {
+    inherit texLiveLatexXColor texLivePGF texLive;
+  };
+
+  texLiveModerncv = builderDefsPackage (import ../tools/typesetting/tex/texlive/moderncv.nix) {
+    inherit texLive unzip;
+  };
+
+  texLiveModerntimeline = builderDefsPackage (import ../tools/typesetting/tex/texlive/moderntimeline.nix) {
+    inherit texLive unzip;
+  };
+
+  thermald = callPackage ../tools/system/thermald { };
+
+  thinkfan = callPackage ../tools/system/thinkfan { };
+
+  vice = callPackage ../misc/emulators/vice {
+    libX11 = xlibs.libX11;
+    giflib = giflib_4_1;
+  };
+
+  viewnior = callPackage ../applications/graphics/viewnior { };
+
+  vimPlugins = recurseIntoAttrs (callPackage ../misc/vim-plugins { });
+
+  vimprobable2 = callPackage ../applications/networking/browsers/vimprobable2 {
+    webkit = webkitgtk2;
+  };
+
+  vimprobable2Wrapper = wrapFirefox
+    { browser = vimprobable2; browserName = "vimprobable2"; desktopName = "Vimprobable2";
+    };
+
+  vimb = callPackage ../applications/networking/browsers/vimb {
+    webkit = webkitgtk2;
+  };
+
+  vimbWrapper = wrapFirefox {
+    browser = vimb;
+    browserName = "vimb";
+    desktopName = "Vimb";
+  };
+
+  VisualBoyAdvance = callPackage ../misc/emulators/VisualBoyAdvance { };
+
+  # Wine cannot be built in 64-bit; use a 32-bit build instead.
+  wineStable = callPackage_i686 ../misc/emulators/wine/stable.nix {
+    bison = bison2;
+  };
+
+  wineUnstable = lowPrio (callPackage_i686 ../misc/emulators/wine/unstable.nix {
+    bison = bison2;
+  });
+
+  wine = wineStable;
+
+  winetricks = callPackage ../misc/emulators/wine/winetricks.nix {
+    inherit (gnome2) zenity;
+  };
+
+  wxmupen64plus = callPackage ../misc/emulators/wxmupen64plus { };
+
+  x2x = callPackage ../tools/X11/x2x { };
+
+  xboxdrv = callPackage ../misc/drivers/xboxdrv { };
+
+  xinput_calibrator = callPackage ../tools/X11/xinput_calibrator {
+    inherit (xlibs) libXi inputproto;
+  };
+
+  xosd = callPackage ../misc/xosd { };
+
+  xsane = callPackage ../applications/graphics/sane/xsane.nix {
+    libpng = libpng12;
+    saneBackends = saneBackends;
+  };
+
+  yafc = callPackage ../applications/networking/yafc { };
+
+  yandex-disk = callPackage ../tools/filesystems/yandex-disk { };
+
+  myEnvFun = import ../misc/my-env {
+    inherit substituteAll pkgs;
+    inherit (stdenv) mkDerivation;
+  };
+
+  # patoline requires a rather large ocaml compilation environment.
+  # this is why it is build as an environment and not just a normal package.
+  # remark : the emacs mode is also installed, but you have to adjust your load-path.
+  PatolineEnv = pack: myEnvFun {
+      name = "patoline";
+      buildInputs = [ stdenv ncurses mesa freeglut libzip gcc
+                                   pack.ocaml pack.findlib pack.camomile
+                                   pack.dypgen pack.ocaml_sqlite3 pack.camlzip
+                                   pack.lablgtk pack.camlimages pack.ocaml_cairo
+                                   pack.lablgl pack.ocamlnet pack.cryptokit
+                                   pack.ocaml_pcre pack.patoline
+                                   ];
+    # this is to circumvent the bug with libgcc_s.so.1 which is
+    # not found when using thread
+    extraCmds = ''
+       LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${gcc.gcc}/lib
+       export LD_LIBRARY_PATH
+    '';
+  };
+
+  patoline = PatolineEnv ocamlPackages_4_00_1;
+
+  znc = callPackage ../applications/networking/znc { };
+
+  zncModules = recurseIntoAttrs (
+    callPackage ../applications/networking/znc/modules.nix { }
+  );
+
+  zsnes = callPackage_i686 ../misc/emulators/zsnes { };
+
+  snes9x-gtk = callPackage ../misc/emulators/snes9x-gtk { };
+
+  higan = callPackage ../misc/emulators/higan { };
+
+  misc = import ../misc/misc.nix { inherit pkgs stdenv; };
+
+  bullet = callPackage ../development/libraries/bullet {};
+
+  dart = callPackage ../development/interpreters/dart { };
+
+  httrack = callPackage ../tools/backup/httrack { };
+
+  mg = callPackage ../applications/editors/mg { };
+
+
+  # Attributes for backward compatibility.
+  adobeReader = adobe-reader;
+  asciidocFull = asciidoc-full;  # added 2014-06-22
+  lttngTools = lttng-tools;  # added 2014-07-31
+  lttngUst = lttng-ust;  # added 2014-07-31
+
+
+}; in self; in pkgs

From df3061295e6a48920400936917e60755fc5d4769 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 3 Sep 2014 11:09:05 +0400
Subject: [PATCH 1190/1453] Specify correct version for Symbola

---
 pkgs/data/fonts/symbola/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/data/fonts/symbola/default.nix b/pkgs/data/fonts/symbola/default.nix
index b324e52d0212..70375a22bae5 100644
--- a/pkgs/data/fonts/symbola/default.nix
+++ b/pkgs/data/fonts/symbola/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "symbola-7.12";
+  name = "symbola-7.17";
 
   src = fetchurl {
     url = "http://users.teilar.gr/~g1951d/Symbola.zip";

From d48a7a17df09248112efccf2a166b75bb7b2021e Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 28 Aug 2014 15:27:20 -0700
Subject: [PATCH 1191/1453] nixos/network-interfaces: Sanitize sys-subsystem
 device names

Currently, nixos will allow for interface names with special characters
such as the hyphen to be used. This presents a problem when using
systemd device names as the namespace paths are separated using hyphens.
Within systemd, if a device name has a hyphen it should be replaced with
the escape sequence \x2d.

This patch sanitizes all interface names before they are used in a
systemd device string.
---
 nixos/modules/tasks/network-interfaces.nix | 29 +++++++++++++---------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index ca7a5ab77add..868039177d87 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -1,6 +1,7 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, utils, ... }:
 
 with lib;
+with utils;
 
 let
 
@@ -10,6 +11,10 @@ let
   hasSits = cfg.sits != { };
   hasBonds = cfg.bonds != { };
 
+  # We must escape interfaces due to the systemd interpretation
+  subsystemDevice = interface:
+    "sys-subsystem-net-devices-${escapeSystemdPath interface}.device";
+
   addrOpts = v:
     assert v == 4 || v == 6;
     {
@@ -603,8 +608,8 @@ in
           nameValuePair "${i.name}-cfg"
           { description = "Configuration of ${i.name}";
             wantedBy = [ "network-interfaces.target" ];
-            bindsTo = [ "sys-subsystem-net-devices-${i.name}.device" ];
-            after = [ "sys-subsystem-net-devices-${i.name}.device" ];
+            bindsTo = [ (subsystemDevice i.name) ];
+            after = [ (subsystemDevice i.name) ];
             serviceConfig.Type = "oneshot";
             serviceConfig.RemainAfterExit = true;
             path = [ pkgs.iproute pkgs.gawk ];
@@ -684,7 +689,7 @@ in
           { description = "Virtual Network Interface ${i.name}";
             requires = [ "dev-net-tun.device" ];
             after = [ "dev-net-tun.device" ];
-            wantedBy = [ "network.target" "sys-subsystem-net-devices-${i.name}.device" ];
+            wantedBy = [ "network.target" (subsystemDevice i.name) ];
             path = [ pkgs.iproute ];
             serviceConfig = {
               Type = "oneshot";
@@ -702,10 +707,10 @@ in
 
         createBridgeDevice = n: v: nameValuePair "${n}-netdev"
           (let
-            deps = map (i: "sys-subsystem-net-devices-${i}.device") v.interfaces;
+            deps = map subsystemDevice v.interfaces;
           in
           { description = "Bridge Interface ${n}";
-            wantedBy = [ "network.target" "sys-subsystem-net-devices-${n}.device" ];
+            wantedBy = [ "network.target" (subsystemDevice n) ];
             bindsTo = deps;
             after = deps;
             serviceConfig.Type = "oneshot";
@@ -742,10 +747,10 @@ in
 
         createBondDevice = n: v: nameValuePair "${n}-netdev"
           (let
-            deps = map (i: "sys-subsystem-net-devices-${i}.device") v.interfaces;
+            deps = map subsystemDevice v.interfaces;
           in
           { description = "Bond Interface ${n}";
-            wantedBy = [ "network.target" "sys-subsystem-net-devices-${n}.device" ];
+            wantedBy = [ "network.target" (subsystemDevice n) ];
             bindsTo = deps;
             after = deps;
             serviceConfig.Type = "oneshot";
@@ -781,10 +786,10 @@ in
 
         createSitDevice = n: v: nameValuePair "${n}-netdev"
           (let
-            deps = optional (v.dev != null) "sys-subsystem-net-devices-${v.dev}.device";
+            deps = optional (v.dev != null) (subsystemDevice v.dev);
           in
           { description = "6-to-4 Tunnel Interface ${n}";
-            wantedBy = [ "network.target" "sys-subsystem-net-devices-${n}.device" ];
+            wantedBy = [ "network.target" (subsystemDevice n) ];
             bindsTo = deps;
             after = deps;
             serviceConfig.Type = "oneshot";
@@ -807,10 +812,10 @@ in
 
         createVlanDevice = n: v: nameValuePair "${n}-netdev"
           (let
-            deps = [ "sys-subsystem-net-devices-${v.interface}.device" ];
+            deps = [ (subsystemDevice v.interface) ];
           in
           { description = "Vlan Interface ${n}";
-            wantedBy = [ "network.target" "sys-subsystem-net-devices-${n}.device" ];
+            wantedBy = [ "network.target" (subsystemDevice n) ];
             bindsTo = deps;
             after = deps;
             serviceConfig.Type = "oneshot";

From 18c5119f18d7ef9f3053e05b2b41f1c006e99994 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 3 Sep 2014 11:36:37 +0400
Subject: [PATCH 1192/1453] Fix maintainers entry

---
 pkgs/applications/misc/vym/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/vym/default.nix b/pkgs/applications/misc/vym/default.nix
index c23be51c3e80..c2dc9aed44a8 100644
--- a/pkgs/applications/misc/vym/default.nix
+++ b/pkgs/applications/misc/vym/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://www.insilmaril.de/vym/;
     license = stdenv.lib.licenses.gpl2;
-    maintainer = stdenv.lib.maintainers.AndersonTorres;
+    maintainer = [ stdenv.lib.maintainers.AndersonTorres ];
     platforms = stdenv.lib.platforms.linux;
   };
 }

From 4dac1990d7c5f7bd7a512872d1420d86bf4acc54 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Wed, 3 Sep 2014 11:47:47 +0400
Subject: [PATCH 1193/1453]  FME: New Package #3695

---
 pkgs/applications/misc/fme/default.nix |    34 +
 pkgs/top-level/all-packages.nix        |     5 +
 pkgs/top-level/all-packages.nix.orig   | 11653 -----------------------
 3 files changed, 39 insertions(+), 11653 deletions(-)
 create mode 100644 pkgs/applications/misc/fme/default.nix
 delete mode 100644 pkgs/top-level/all-packages.nix.orig

diff --git a/pkgs/applications/misc/fme/default.nix b/pkgs/applications/misc/fme/default.nix
new file mode 100644
index 000000000000..93abd13da0ca
--- /dev/null
+++ b/pkgs/applications/misc/fme/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, pkgconfig, autoconf, automake, gettext
+, fluxbox, bc, gtkmm, glibmm, libglademm, libsigcxx
+}:
+
+stdenv.mkDerivation rec{
+
+  name = "fme-${version}";
+  version = "1.1.3";
+  
+  src = fetchurl {
+    url = "https://github.com/rdehouss/fme/archive/v${version}.tar.gz";
+    sha256 = "d1c81a6a38c0faad02943ad65d6d0314bd205c6de841669a2efe43e4c503e63d";
+  };
+
+  buildInputs = [ pkgconfig autoconf automake gettext fluxbox bc gtkmm glibmm libglademm libsigcxx ];
+
+  preConfigure = ''
+    ./autogen.sh
+  '';
+
+  meta = {
+    description = "Editor for Fluxbox menus";
+    longDescription = ''
+      Fluxbox Menu Editor is a menu editor for the Window Manager Fluxbox written in C++
+      with the libraries Gtkmm, Glibmm, libglademm and gettext for internationalization.
+      Its user-friendly interface will help you to edit, delete, move (Drag and Drop)
+      a row, a submenu, etc very easily.
+    '';
+    homepage = https://github.com/rdehouss/fme/;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.AndersonTorres ];
+    platforms = stdenv.lib.platforms.linux;    
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b74625535228..15d4061b29d7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8844,6 +8844,11 @@ let
 
   fluxbox = callPackage ../applications/window-managers/fluxbox { };
 
+  fme = callPackage ../applications/misc/fme {
+    inherit (gnome) libglademm;
+    inherit pkgconfig autoconf automake gettext;
+  };
+
   freecad = callPackage ../applications/graphics/freecad {
     opencascade = opencascade_6_5;
     inherit (pythonPackages) matplotlib pycollada;
diff --git a/pkgs/top-level/all-packages.nix.orig b/pkgs/top-level/all-packages.nix.orig
deleted file mode 100644
index 6e5caa3af9ed..000000000000
--- a/pkgs/top-level/all-packages.nix.orig
+++ /dev/null
@@ -1,11653 +0,0 @@
-/* This file composes the Nix Packages collection.  That is, it
-   imports the functions that build the various packages, and calls
-   them with appropriate arguments.  The result is a set of all the
-   packages in the Nix Packages collection for some particular
-   platform. */
-
-
-{ # The system (e.g., `i686-linux') for which to build the packages.
-  system ? builtins.currentSystem
-
-, # The standard environment to use.  Only used for bootstrapping.  If
-  # null, the default standard environment is used.
-  bootStdenv ? null
-
-, # Non-GNU/Linux OSes are currently "impure" platforms, with their libc
-  # outside of the store.  Thus, GCC, GFortran, & co. must always look for
-  # files in standard system directories (/usr/include, etc.)
-  noSysDirs ? (system != "x86_64-darwin"
-               && system != "x86_64-freebsd" && system != "i686-freebsd"
-               && system != "x86_64-kfreebsd-gnu")
-
-  # More flags for the bootstrapping of stdenv.
-, gccWithCC ? true
-, gccWithProfiling ? true
-
-, # Allow a configuration attribute set to be passed in as an
-  # argument.  Otherwise, it's read from $NIXPKGS_CONFIG or
-  # ~/.nixpkgs/config.nix.
-  config ? null
-
-, crossSystem ? null
-, platform ? null
-}:
-
-
-let config_ = config; platform_ = platform; in # rename the function arguments
-
-let
-
-  lib = import ../../lib;
-
-  # The contents of the configuration file found at $NIXPKGS_CONFIG or
-  # $HOME/.nixpkgs/config.nix.
-  # for NIXOS (nixos-rebuild): use nixpkgs.config option
-  config =
-    let
-      toPath = builtins.toPath;
-      getEnv = x: if builtins ? getEnv then builtins.getEnv x else "";
-      pathExists = name:
-        builtins ? pathExists && builtins.pathExists (toPath name);
-
-      configFile = getEnv "NIXPKGS_CONFIG";
-      homeDir = getEnv "HOME";
-      configFile2 = homeDir + "/.nixpkgs/config.nix";
-
-      configExpr =
-        if config_ != null then config_
-        else if configFile != "" && pathExists configFile then import (toPath configFile)
-        else if homeDir != "" && pathExists configFile2 then import (toPath configFile2)
-        else {};
-
-    in
-      # allow both:
-      # { /* the config */ } and
-      # { pkgs, ... } : { /* the config */ }
-      if builtins.isFunction configExpr
-        then configExpr { inherit pkgs; }
-        else configExpr;
-
-  # Allow setting the platform in the config file. Otherwise, let's use a reasonable default (pc)
-
-  platformAuto = let
-      platforms = (import ./platforms.nix);
-    in
-      if system == "armv6l-linux" then platforms.raspberrypi
-      else if system == "armv5tel-linux" then platforms.sheevaplug
-      else if system == "mips64el-linux" then platforms.fuloong2f_n32
-      else if system == "x86_64-linux" then platforms.pc64
-      else if system == "i686-linux" then platforms.pc32
-      else platforms.pcBase;
-
-  platform = if platform_ != null then platform_
-    else config.platform or platformAuto;
-
-  # Helper functions that are exported through `pkgs'.
-  helperFunctions =
-    stdenvAdapters //
-    (import ../build-support/trivial-builders.nix { inherit (pkgs) stdenv; inherit (pkgs.xorg) lndir; });
-
-  stdenvAdapters =
-    import ../stdenv/adapters.nix pkgs;
-
-
-  # Allow packages to be overriden globally via the `packageOverrides'
-  # configuration option, which must be a function that takes `pkgs'
-  # as an argument and returns a set of new or overriden packages.
-  # The `packageOverrides' function is called with the *original*
-  # (un-overriden) set of packages, allowing packageOverrides
-  # attributes to refer to the original attributes (e.g. "foo =
-  # ... pkgs.foo ...").
-  pkgs = applyGlobalOverrides (config.packageOverrides or (pkgs: {}));
-
-
-  # Return the complete set of packages, after applying the overrides
-  # returned by the `overrider' function (see above).  Warning: this
-  # function is very expensive!
-  applyGlobalOverrides = overrider:
-    let
-      # Call the overrider function.  We don't want stdenv overrides
-      # in the case of cross-building, or otherwise the basic
-      # overrided packages will not be built with the crossStdenv
-      # adapter.
-      overrides = overrider pkgsOrig //
-        (lib.optionalAttrs (pkgsOrig.stdenv ? overrides && crossSystem == null) (pkgsOrig.stdenv.overrides pkgsOrig));
-
-      # The un-overriden packages, passed to `overrider'.
-      pkgsOrig = pkgsFun pkgs {};
-
-      # The overriden, final packages.
-      pkgs = pkgsFun pkgs overrides;
-    in pkgs;
-
-
-  # The package compositions.  Yes, this isn't properly indented.
-  pkgsFun = pkgs: overrides:
-    with helperFunctions;
-    let defaultScope = pkgs // pkgs.xorg; self = self_ // overrides;
-    self_ = with self; helperFunctions // {
-
-  # Make some arguments passed to all-packages.nix available
-  inherit system platform;
-
-  # Allow callPackage to fill in the pkgs argument
-  inherit pkgs;
-
-
-  # We use `callPackage' to be able to omit function arguments that
-  # can be obtained from `pkgs' or `pkgs.xorg' (i.e. `defaultScope').
-  # Use `newScope' for sets of packages in `pkgs' (see e.g. `gnome'
-  # below).
-  callPackage = newScope {};
-
-  newScope = extra: lib.callPackageWith (defaultScope // extra);
-
-
-  # Override system. This is useful to build i686 packages on x86_64-linux.
-  forceSystem = system: kernel: (import ./all-packages.nix) {
-    inherit system;
-    platform = platform // { kernelArch = kernel; };
-    inherit bootStdenv noSysDirs gccWithCC gccWithProfiling config
-      crossSystem;
-  };
-
-
-  # Used by wine, firefox with debugging version of Flash, ...
-  pkgsi686Linux = forceSystem "i686-linux" "i386";
-
-  callPackage_i686 = lib.callPackageWith (pkgsi686Linux // pkgsi686Linux.xorg);
-
-
-  # For convenience, allow callers to get the path to Nixpkgs.
-  path = ../..;
-
-
-  ### Symbolic names.
-
-  x11 = xlibsWrapper;
-
-  # `xlibs' is the set of X library components.  This used to be the
-  # old modular X llibraries project (called `xlibs') but now it's just
-  # the set of packages in the modular X.org tree (which also includes
-  # non-library components like the server, drivers, fonts, etc.).
-  xlibs = xorg // {xlibs = xlibsWrapper;};
-
-
-  ### Helper functions.
-
-  inherit lib config stdenvAdapters;
-
-  inherit (lib) lowPrio hiPrio appendToName makeOverridable;
-  inherit (misc) versionedDerivation;
-
-  # Applying this to an attribute set will cause nix-env to look
-  # inside the set for derivations.
-  recurseIntoAttrs = attrs: attrs // { recurseForDerivations = true; };
-
-  builderDefs = lib.composedArgsAndFun (import ../build-support/builder-defs/builder-defs.nix) {
-    inherit stringsWithDeps lib stdenv writeScript
-      fetchurl fetchmtn fetchgit;
-  };
-
-  builderDefsPackage = builderDefs.builderDefsPackage builderDefs;
-
-  stringsWithDeps = lib.stringsWithDeps;
-
-
-  ### Nixpkgs maintainer tools
-
-  nix-generate-from-cpan = callPackage ../../maintainers/scripts/nix-generate-from-cpan.nix { };
-
-  nixpkgs-lint = callPackage ../../maintainers/scripts/nixpkgs-lint.nix { };
-
-
-  ### STANDARD ENVIRONMENT
-
-
-  allStdenvs = import ../stdenv {
-    inherit system platform config;
-    allPackages = args: import ./all-packages.nix ({ inherit config system; } // args);
-  };
-
-  defaultStdenv = allStdenvs.stdenv // { inherit platform; };
-
-  stdenvCross = lowPrio (makeStdenvCross defaultStdenv crossSystem binutilsCross gccCrossStageFinal);
-
-  stdenv =
-    if bootStdenv != null then (bootStdenv // {inherit platform;}) else
-      if crossSystem != null then
-        stdenvCross
-      else
-        let
-            changer = config.replaceStdenv or null;
-        in if changer != null then
-          changer {
-            # We import again all-packages to avoid recursivities.
-            pkgs = import ./all-packages.nix {
-              # We remove packageOverrides to avoid recursivities
-              config = removeAttrs config [ "replaceStdenv" ];
-            };
-          }
-      else
-        defaultStdenv;
-
-  stdenvApple = stdenvAdapters.overrideGCC allStdenvs.stdenvNative gccApple;
-
-  forceNativeDrv = drv : if crossSystem == null then drv else
-    (drv // { crossDrv = drv.nativeDrv; });
-
-  # A stdenv capable of building 32-bit binaries.  On x86_64-linux,
-  # it uses GCC compiled with multilib support; on i686-linux, it's
-  # just the plain stdenv.
-  stdenv_32bit = lowPrio (
-    if system == "x86_64-linux" then
-      overrideGCC stdenv gcc48_multi
-    else
-      stdenv);
-
-
-  ### BUILD SUPPORT
-
-  attrSetToDir = arg: import ../build-support/upstream-updater/attrset-to-dir.nix {
-    inherit writeTextFile stdenv lib;
-    theAttrSet = arg;
-  };
-
-  autoreconfHook = makeSetupHook
-    { substitutions = { inherit autoconf automake libtool; }; }
-    ../build-support/setup-hooks/autoreconf.sh;
-
-  buildEnv = import ../build-support/buildenv {
-    inherit (pkgs) runCommand perl;
-  };
-
-  buildFHSChrootEnv = import ../build-support/build-fhs-chrootenv {
-    inherit stdenv glibc glibcLocales gcc coreutils diffutils findutils;
-    inherit gnused gnugrep gnutar gzip bzip2 bashInteractive xz shadow gawk;
-    inherit less buildEnv;
-  };
-
-  dotnetenv = import ../build-support/dotnetenv {
-    inherit stdenv;
-    dotnetfx = dotnetfx40;
-  };
-
-  scatterOutputHook = makeSetupHook {} ../build-support/setup-hooks/scatter_output.sh;
-
-  vsenv = callPackage ../build-support/vsenv {
-    vs = vs90wrapper;
-  };
-
-  fetchbower = import ../build-support/fetchbower {
-    inherit stdenv git;
-    inherit (nodePackages) fetch-bower;
-  };
-
-  fetchbzr = import ../build-support/fetchbzr {
-    inherit stdenv bazaar;
-  };
-
-  fetchcvs = import ../build-support/fetchcvs {
-    inherit stdenv cvs;
-  };
-
-  fetchdarcs = import ../build-support/fetchdarcs {
-    inherit stdenv darcs nix;
-  };
-
-  fetchgit = import ../build-support/fetchgit {
-    inherit stdenv git cacert;
-  };
-
-  fetchgitPrivate = import ../build-support/fetchgit/private.nix {
-    inherit fetchgit writeScript openssh stdenv;
-  };
-
-  fetchgitrevision = import ../build-support/fetchgitrevision runCommand git;
-
-  fetchmtn = callPackage ../build-support/fetchmtn (config.fetchmtn or {});
-
-  packer = callPackage ../development/tools/packer { };
-
-  fetchpatch = callPackage ../build-support/fetchpatch { };
-
-  fetchsvn = import ../build-support/fetchsvn {
-    inherit stdenv subversion openssh;
-    sshSupport = true;
-  };
-
-  fetchsvnrevision = import ../build-support/fetchsvnrevision runCommand subversion;
-
-  fetchsvnssh = import ../build-support/fetchsvnssh {
-    inherit stdenv subversion openssh expect;
-    sshSupport = true;
-  };
-
-  fetchhg = import ../build-support/fetchhg {
-    inherit stdenv mercurial nix;
-  };
-
-  # `fetchurl' downloads a file from the network.
-  fetchurl = import ../build-support/fetchurl {
-    inherit curl stdenv;
-  };
-
-  # A wrapper around fetchurl that generates miror://gnome URLs automatically
-  fetchurlGnome = callPackage ../build-support/fetchurl/gnome.nix { };
-
-  # fetchurlBoot is used for curl and its dependencies in order to
-  # prevent a cyclic dependency (curl depends on curl.tar.bz2,
-  # curl.tar.bz2 depends on fetchurl, fetchurl depends on curl).  It
-  # uses the curl from the previous bootstrap phase (e.g. a statically
-  # linked curl in the case of stdenv-linux).
-  fetchurlBoot = stdenv.fetchurlBoot;
-
-  fetchzip = import ../build-support/fetchzip { inherit lib fetchurl unzip; };
-
-  fetchFromGitHub = { owner, repo, rev, sha256 }: fetchzip {
-    name = "${repo}-${rev}-src";
-    url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz";
-    inherit sha256;
-  };
-
-  resolveMirrorURLs = {url}: fetchurl {
-    showURLs = true;
-    inherit url;
-  };
-
-  libredirect = callPackage ../build-support/libredirect { };
-
-  makeDesktopItem = import ../build-support/make-desktopitem {
-    inherit stdenv;
-  };
-
-  makeAutostartItem = import ../build-support/make-startupitem {
-    inherit stdenv;
-    inherit lib;
-  };
-
-  makeInitrd = {contents, compressor ? "gzip -9"}:
-    import ../build-support/kernel/make-initrd.nix {
-      inherit stdenv perl perlArchiveCpio cpio contents ubootChooser compressor;
-    };
-
-  makeWrapper = makeSetupHook { } ../build-support/setup-hooks/make-wrapper.sh;
-
-  makeModulesClosure = { kernel, rootModules, allowMissing ? false }:
-    import ../build-support/kernel/modules-closure.nix {
-      inherit stdenv kmod kernel nukeReferences rootModules allowMissing;
-    };
-
-  pathsFromGraph = ../build-support/kernel/paths-from-graph.pl;
-
-  srcOnly = args: (import ../build-support/src-only) ({inherit stdenv; } // args);
-
-  substituteAll = import ../build-support/substitute/substitute-all.nix {
-    inherit stdenv;
-  };
-
-  replaceDependency = import ../build-support/replace-dependency.nix {
-    inherit runCommand nix lib;
-  };
-
-  nukeReferences = callPackage ../build-support/nuke-references/default.nix { };
-
-  vmTools = import ../build-support/vm/default.nix {
-    inherit pkgs;
-  };
-
-  releaseTools = import ../build-support/release/default.nix {
-    inherit pkgs;
-  };
-
-  composableDerivation = (import ../../lib/composable-derivation.nix) {
-    inherit pkgs lib;
-  };
-
-  platforms = import ./platforms.nix;
-
-  setJavaClassPath = makeSetupHook { } ../build-support/setup-hooks/set-java-classpath.sh;
-
-  fixDarwinDylibNames = makeSetupHook { } ../build-support/setup-hooks/fix-darwin-dylib-names.sh;
-
-  keepBuildTree = makeSetupHook { } ../build-support/setup-hooks/keep-build-tree.sh;
-
-  enableGCOVInstrumentation = makeSetupHook { } ../build-support/setup-hooks/enable-coverage-instrumentation.sh;
-
-  makeGCOVReport = makeSetupHook
-    { deps = [ pkgs.lcov pkgs.enableGCOVInstrumentation ]; }
-    ../build-support/setup-hooks/make-coverage-analysis-report.sh;
-
-
-  ### TOOLS
-
-  abduco = callPackage ../tools/misc/abduco { };
-
-  acct = callPackage ../tools/system/acct { };
-
-  acoustidFingerprinter = callPackage ../tools/audio/acoustid-fingerprinter {
-    ffmpeg = ffmpeg_1;
-  };
-
-  actdiag = pythonPackages.actdiag;
-
-  adom = callPackage ../games/adom { };
-
-  aefs = callPackage ../tools/filesystems/aefs { };
-
-  aegisub = callPackage ../applications/video/aegisub {
-    wxGTK = wxGTK30;
-    lua = lua5_1;
-  };
-
-  aespipe = callPackage ../tools/security/aespipe { };
-
-  aescrypt = callPackage ../tools/misc/aescrypt { };
-
-  ahcpd = callPackage ../tools/networking/ahcpd { };
-
-  aircrackng = callPackage ../tools/networking/aircrack-ng { };
-
-  analog = callPackage ../tools/admin/analog {};
-
-  apktool = callPackage ../development/tools/apktool {
-    buildTools = androidenv.buildTools;
-  };
-
-  apt-offline = callPackage ../tools/misc/apt-offline { };
-
-  archivemount = callPackage ../tools/filesystems/archivemount { };
-
-  arandr = callPackage ../tools/X11/arandr { };
-
-  arcanist = callPackage ../development/tools/misc/arcanist {};
-
-  arduino_core = callPackage ../development/arduino/arduino-core {
-    jdk = jdk;
-    jre = jdk;
-  };
-
-  argyllcms = callPackage ../tools/graphics/argyllcms {};
-
-  arp-scan = callPackage ../tools/misc/arp-scan { };
-
-  ascii = callPackage ../tools/text/ascii { };
-
-  asymptote = builderDefsPackage ../tools/graphics/asymptote {
-    inherit freeglut ghostscriptX imagemagick fftw boehmgc
-      mesa ncurses readline gsl libsigsegv python zlib perl
-      texinfo xz;
-    texLive = texLiveAggregationFun {
-      paths = [ texLive texLiveExtra texLiveCMSuper ];
-    };
-  };
-
-  awscli = callPackage ../tools/admin/awscli { };
-
-  ec2_api_tools = callPackage ../tools/virtualization/ec2-api-tools { };
-
-  ec2_ami_tools = callPackage ../tools/virtualization/ec2-ami-tools { };
-
-  altermime = callPackage ../tools/networking/altermime {};
-
-  amule = callPackage ../tools/networking/p2p/amule { };
-
-  amuleDaemon = appendToName "daemon" (amule.override {
-    monolithic = false;
-    daemon = true;
-  });
-
-  amuleGui = appendToName "gui" (amule.override {
-    monolithic = false;
-    client = true;
-  });
-
-  androidenv = import ../development/mobile/androidenv {
-    inherit pkgs;
-    pkgs_i686 = pkgsi686Linux;
-  };
-
-  apg = callPackage ../tools/security/apg { };
-
-  grc = callPackage ../tools/misc/grc { };
-
-  otool = callPackage ../os-specific/darwin/otool { };
-
-  pass = callPackage ../tools/security/pass {
-    gnupg = gnupg1compat;
-  };
-
-  setfile = callPackage ../os-specific/darwin/setfile { };
-
-  install_name_tool = callPackage ../os-specific/darwin/install_name_tool { };
-
-  xcodeenv = callPackage ../development/mobile/xcodeenv { };
-
-  titaniumenv = callPackage ../development/mobile/titaniumenv {
-    inherit pkgs;
-    pkgs_i686 = pkgsi686Linux;
-  };
-
-  inherit (androidenv) androidsdk_4_4 androidndk;
-
-  aria2 = callPackage ../tools/networking/aria2 { };
-  aria = aria2;
-
-  at = callPackage ../tools/system/at { };
-
-  atftp = callPackage ../tools/networking/atftp {};
-
-  autogen = callPackage ../development/tools/misc/autogen { };
-
-  autojump = callPackage ../tools/misc/autojump { };
-
-  autorandr = callPackage ../tools/misc/autorandr {
-    inherit (xorg) xrandr xdpyinfo;
-  };
-
-  avahi = callPackage ../development/libraries/avahi {
-    qt4Support = config.avahi.qt4Support or false;
-  };
-
-  aws = callPackage ../tools/virtualization/aws { };
-
-  aws_mturk_clt = callPackage ../tools/misc/aws-mturk-clt { };
-
-  axel = callPackage ../tools/networking/axel { };
-
-  azureus = callPackage ../tools/networking/p2p/azureus { };
-
-  basex = callPackage ../tools/text/xml/basex { };
-
-  babeld = callPackage ../tools/networking/babeld { };
-
-  badvpn = callPackage ../tools/networking/badvpn {};
-
-  banner = callPackage ../games/banner {};
-
-  barcode = callPackage ../tools/graphics/barcode {};
-
-  bc = callPackage ../tools/misc/bc { };
-
-  bcache-tools = callPackage ../tools/filesystems/bcache-tools { };
-
-  bchunk = callPackage ../tools/cd-dvd/bchunk { };
-
-  bfr = callPackage ../tools/misc/bfr { };
-
-  bindfs = callPackage ../tools/filesystems/bindfs { };
-
-  bitbucket-cli = pythonPackages.bitbucket-cli;
-
-  blockdiag = pythonPackages.blockdiag;
-
-  bmon = callPackage ../tools/misc/bmon { };
-
-  bochs = callPackage ../applications/virtualization/bochs { wxSupport = false; };
-
-  boomerang = callPackage ../development/tools/boomerang { };
-
-  bootchart = callPackage ../tools/system/bootchart { };
-
-  bro = callPackage ../applications/networking/ids/bro { };
-
-  bsod = callPackage ../misc/emulators/bsod { };
-
-  btrfsProgs = callPackage ../tools/filesystems/btrfsprogs { };
-
-  bwm_ng = callPackage ../tools/networking/bwm-ng { };
-
-  byobu = callPackage ../tools/misc/byobu { };
-
-  capstone = callPackage ../development/libraries/capstone { };
-
-  catdoc = callPackage ../tools/text/catdoc { };
-
-  ccnet = callPackage ../tools/networking/ccnet { };
-
-  consul = callPackage ../servers/consul { };
-  consul_ui = callPackage ../servers/consul/ui.nix { };
-
-  chntpw = callPackage ../tools/security/chntpw { };
-
-  coprthr = callPackage ../development/libraries/coprthr {
-    flex = flex_2_5_35;
-  };
-
-  crawl = callPackage ../games/crawl { lua = lua5; };
-
-  cv = callPackage ../tools/misc/cv { };
-
-  direnv = callPackage ../tools/misc/direnv { };
-
-  ditaa = callPackage ../tools/graphics/ditaa { };
-
-  dlx = callPackage ../misc/emulators/dlx { };
-
-  eggdrop = callPackage ../tools/networking/eggdrop { };
-
-  enca = callPackage ../tools/text/enca { };
-
-  fasd = callPackage ../tools/misc/fasd {
-    inherit (haskellPackages) pandoc;
-  };
-
-  fop = callPackage ../tools/typesetting/fop { };
-
-  mcrl = callPackage ../tools/misc/mcrl { };
-
-  mcrl2 = callPackage ../tools/misc/mcrl2 { };
-
-  mpdcron = callPackage ../tools/audio/mpdcron { };
-
-  syslogng = callPackage ../tools/system/syslog-ng { };
-
-  syslogng_incubator = callPackage ../tools/system/syslog-ng-incubator { };
-
-  rsyslog = callPackage ../tools/system/rsyslog { };
-
-  mcrypt = callPackage ../tools/misc/mcrypt { };
-
-  mcelog = callPackage ../os-specific/linux/mcelog { };
-
-  apparix = callPackage ../tools/misc/apparix { };
-
-  appdata-tools = callPackage ../tools/misc/appdata-tools { };
-
-  asciidoc = callPackage ../tools/typesetting/asciidoc {
-    inherit (pythonPackages) matplotlib numpy aafigure recursivePthLoader;
-    enableStandardFeatures = false;
-  };
-
-  asciidoc-full = appendToName "full" (asciidoc.override {
-    inherit (pythonPackages) pygments;
-    enableStandardFeatures = true;
-  });
-
-  autossh = callPackage ../tools/networking/autossh { };
-
-  bacula = callPackage ../tools/backup/bacula { };
-
-  beanstalkd = callPackage ../servers/beanstalkd { };
-
-  bgs = callPackage ../tools/X11/bgs { };
-
-  biber = callPackage ../tools/typesetting/biber {
-    inherit (perlPackages)
-      autovivification BusinessISBN BusinessISMN BusinessISSN ConfigAutoConf
-      DataCompare DataDump DateSimple EncodeEUCJPASCII EncodeHanExtra EncodeJIS2K
-      ExtUtilsLibBuilder FileSlurp IPCRun3 Log4Perl LWPProtocolHttps ListAllUtils
-      ListMoreUtils ModuleBuild MozillaCA ReadonlyXS RegexpCommon TextBibTeX
-      UnicodeCollate UnicodeLineBreak URI XMLLibXMLSimple XMLLibXSLT XMLWriter;
-  };
-
-  bibtextools = callPackage ../tools/typesetting/bibtex-tools {
-    inherit (strategoPackages016) strategoxt sdf;
-  };
-
-  bittorrent = callPackage ../tools/networking/p2p/bittorrent {
-    gui = true;
-  };
-
-  bittornado = callPackage ../tools/networking/p2p/bit-tornado { };
-
-  blueman = callPackage ../tools/bluetooth/blueman {
-    inherit (pythonPackages) notify;
-  };
-
-  bmrsa = builderDefsPackage (import ../tools/security/bmrsa/11.nix) {
-    inherit unzip;
-  };
-
-  bogofilter = callPackage ../tools/misc/bogofilter { };
-
-  bsdiff = callPackage ../tools/compression/bsdiff { };
-
-  btar = callPackage ../tools/backup/btar { };
-
-  bud = callPackage ../tools/networking/bud {
-    inherit (pythonPackages) gyp;
-  };
-
-  bup = callPackage ../tools/backup/bup {
-    inherit (pythonPackages) pyxattr pylibacl setuptools fuse;
-    inherit (haskellPackages) pandoc;
-    par2Support = (config.bup.par2Support or false);
-  };
-
-  ori = callPackage ../tools/backup/ori { };
-
-  atool = callPackage ../tools/archivers/atool { };
-
-  bzip2 = callPackage ../tools/compression/bzip2 { };
-
-  cabextract = callPackage ../tools/archivers/cabextract { };
-
-  cadaver = callPackage ../tools/networking/cadaver { };
-
-  cantata = callPackage ../applications/audio/cantata { };
-
-  can-utils = callPackage ../os-specific/linux/can-utils { };
-
-  ccid = callPackage ../tools/security/ccid { };
-
-  ccrypt = callPackage ../tools/security/ccrypt { };
-
-  cdecl = callPackage ../development/tools/cdecl { };
-
-  cdrdao = callPackage ../tools/cd-dvd/cdrdao { };
-
-  cdrkit = callPackage ../tools/cd-dvd/cdrkit { };
-
-  ceph = callPackage ../tools/filesystems/ceph { };
-
-  cfdg = builderDefsPackage ../tools/graphics/cfdg {
-    inherit libpng bison flex ffmpeg;
-  };
-
-  checkinstall = callPackage ../tools/package-management/checkinstall { };
-
-  cheetahTemplate = builderDefsPackage (import ../tools/text/cheetah-template/2.0.1.nix) {
-    inherit makeWrapper python;
-  };
-
-  chkrootkit = callPackage ../tools/security/chkrootkit { };
-
-  chrony = callPackage ../tools/networking/chrony { };
-
-  chunkfs = callPackage ../tools/filesystems/chunkfs { };
-
-  chunksync = callPackage ../tools/backup/chunksync { };
-
-  cjdns = callPackage ../tools/networking/cjdns { };
-
-  cksfv = callPackage ../tools/networking/cksfv { };
-
-  clementine = callPackage ../applications/audio/clementine { };
-
-  ciopfs = callPackage ../tools/filesystems/ciopfs { };
-
-  colord = callPackage ../tools/misc/colord { };
-
-  colord-gtk = callPackage ../tools/misc/colord-gtk { };
-
-  colordiff = callPackage ../tools/text/colordiff { };
-
-  concurrencykit = callPackage ../development/libraries/concurrencykit { };
-
-  connect = callPackage ../tools/networking/connect { };
-
-  conspy = callPackage ../os-specific/linux/conspy {};
-
-  connman = callPackage ../tools/networking/connman { };
-
-  connmanui = callPackage ../tools/networking/connmanui { };
-
-  convertlit = callPackage ../tools/text/convertlit { };
-
-  collectd = callPackage ../tools/system/collectd { };
-
-  colormake = callPackage ../development/tools/build-managers/colormake { };
-
-  cowsay = callPackage ../tools/misc/cowsay { };
-
-  cpuminer = callPackage ../tools/misc/cpuminer { };
-
-  cpuminer-multi = callPackage ../tools/misc/cpuminer-multi { };
-
-  cuetools = callPackage ../tools/cd-dvd/cuetools { };
-
-  unifdef = callPackage ../development/tools/misc/unifdef { };
-
-  "unionfs-fuse" = callPackage ../tools/filesystems/unionfs-fuse { };
-
-  usb_modeswitch = callPackage ../development/tools/misc/usb-modeswitch { };
-
-  anthy = callPackage ../tools/inputmethods/anthy { };
-
-  biosdevname = callPackage ../tools/networking/biosdevname { };
-
-  clamav = callPackage ../tools/security/clamav { };
-
-  cloc = callPackage ../tools/misc/cloc {
-    inherit (perlPackages) perl AlgorithmDiff RegexpCommon;
-  };
-
-  cloog = callPackage ../development/libraries/cloog { };
-
-  cloogppl = callPackage ../development/libraries/cloog-ppl { };
-
-  convmv = callPackage ../tools/misc/convmv { };
-
-  cool-old-term = callPackage ../applications/misc/cool-old-term { };
-
-  coreutils = callPackage ../tools/misc/coreutils
-    {
-      # TODO: Add ACL support for cross-Linux.
-      aclSupport = crossSystem == null && stdenv.isLinux;
-    };
-
-  cpio = callPackage ../tools/archivers/cpio { };
-
-  cromfs = callPackage ../tools/archivers/cromfs { };
-
-  cron = callPackage ../tools/system/cron { };
-
-  cudatoolkit5 = callPackage ../development/compilers/cudatoolkit/5.5.nix {
-    python = python26;
-  };
-
-  cudatoolkit6 = callPackage ../development/compilers/cudatoolkit/6.0.nix {
-    python = python26;
-  };
-
-  cudatoolkit = cudatoolkit5;
-
-  curl = callPackage ../tools/networking/curl rec {
-    fetchurl = fetchurlBoot;
-    zlibSupport = true;
-    sslSupport = zlibSupport;
-    scpSupport = zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin;
-  };
-
-  curl3 = callPackage ../tools/networking/curl/7.15.nix rec {
-    zlibSupport = true;
-    sslSupport = zlibSupport;
-  };
-
-  cunit = callPackage ../tools/misc/cunit { };
-
-  curlftpfs = callPackage ../tools/filesystems/curlftpfs { };
-
-  cutter = callPackage ../tools/networking/cutter { };
-
-  dadadodo = builderDefsPackage (import ../tools/text/dadadodo) { };
-
-  daq = callPackage ../applications/networking/ids/daq { };
-
-  dar = callPackage ../tools/archivers/dar { };
-
-  davfs2 = callPackage ../tools/filesystems/davfs2 { };
-
-  dbench = callPackage ../development/tools/misc/dbench { };
-
-  dcraw = callPackage ../tools/graphics/dcraw { };
-
-  debian_devscripts = callPackage ../tools/misc/debian-devscripts {
-    inherit (perlPackages) CryptSSLeay LWP TimeDate DBFile FileDesktopEntry;
-  };
-
-  debootstrap = callPackage ../tools/misc/debootstrap { };
-
-  detox = callPackage ../tools/misc/detox { };
-
-  ddclient = callPackage ../tools/networking/ddclient { };
-
-  dd_rescue = callPackage ../tools/system/dd_rescue { };
-
-  ddrescue = callPackage ../tools/system/ddrescue { };
-
-  deluge = pythonPackages.deluge;
-
-  desktop_file_utils = callPackage ../tools/misc/desktop-file-utils { };
-
-  despotify = callPackage ../development/libraries/despotify { };
-
-  dev86 = callPackage ../development/compilers/dev86 { };
-
-  dnsmasq = callPackage ../tools/networking/dnsmasq { };
-
-  dnstop = callPackage ../tools/networking/dnstop { };
-
-  dhcp = callPackage ../tools/networking/dhcp { };
-
-  dhcpcd = callPackage ../tools/networking/dhcpcd { };
-
-  di = callPackage ../tools/system/di { };
-
-  diffstat = callPackage ../tools/text/diffstat { };
-
-  diffutils = callPackage ../tools/text/diffutils { };
-
-  wgetpaste = callPackage ../tools/text/wgetpaste { };
-
-  dirmngr = callPackage ../tools/security/dirmngr { };
-
-  disper = callPackage ../tools/misc/disper { };
-
-  dmd = callPackage ../development/compilers/dmd { };
-
-  dmg2img = callPackage ../tools/misc/dmg2img { };
-
-  docbook2odf = callPackage ../tools/typesetting/docbook2odf {
-    inherit (perlPackages) PerlMagick;
-  };
-
-  docbook2x = callPackage ../tools/typesetting/docbook2x {
-    inherit (perlPackages) XMLSAX XMLParser XMLNamespaceSupport;
-  };
-
-  dosfstools = callPackage ../tools/filesystems/dosfstools { };
-
-  dotnetfx35 = callPackage ../development/libraries/dotnetfx35 { };
-
-  dotnetfx40 = callPackage ../development/libraries/dotnetfx40 { };
-
-  dolphinEmu = callPackage ../misc/emulators/dolphin-emu { };
-  dolphinEmuMaster = callPackage ../misc/emulators/dolphin-emu/master.nix { };
-
-  dropbear = callPackage ../tools/networking/dropbear { };
-
-  dtach = callPackage ../tools/misc/dtach { };
-
-  duo-unix = callPackage ../tools/security/duo-unix { };
-
-  duplicity = callPackage ../tools/backup/duplicity {
-    inherit (pythonPackages) boto lockfile;
-    gnupg = gnupg1;
-  };
-
-  duply = callPackage ../tools/backup/duply { };
-
-  dvdplusrwtools = callPackage ../tools/cd-dvd/dvd+rw-tools { };
-
-  dvgrab = callPackage ../tools/video/dvgrab { };
-
-  dvtm = callPackage ../tools/misc/dvtm { };
-
-  e2fsprogs = callPackage ../tools/filesystems/e2fsprogs { };
-
-  easyrsa = callPackage ../tools/networking/easyrsa { };
-
-  ebook_tools = callPackage ../tools/text/ebook-tools { };
-
-  ecryptfs = callPackage ../tools/security/ecryptfs { };
-
-  editres = callPackage ../tools/graphics/editres {
-    inherit (xlibs) libXt libXaw;
-    inherit (xorg) utilmacros;
-  };
-
-  edk2 = callPackage ../development/compilers/edk2 { };
-
-  emscripten = callPackage ../development/compilers/emscripten { };
-
-  emscriptenfastcomp = callPackage ../development/compilers/emscripten-fastcomp { };
-
-  efibootmgr = callPackage ../tools/system/efibootmgr { };
-
-  efivar = callPackage ../tools/system/efivar { };
-
-  evemu = callPackage ../tools/system/evemu { };
-
-  elasticsearch = callPackage ../servers/search/elasticsearch { };
-
-  elasticsearchPlugins = recurseIntoAttrs (
-    callPackage ../servers/search/elasticsearch/plugins.nix { }
-  );
-
-  emv = callPackage ../tools/misc/emv { };
-
-  enblendenfuse = callPackage ../tools/graphics/enblend-enfuse { };
-
-  encfs = callPackage ../tools/filesystems/encfs { };
-
-  enscript = callPackage ../tools/text/enscript { };
-
-  ethtool = callPackage ../tools/misc/ethtool { };
-
-  ettercap = callPackage ../applications/networking/sniffers/ettercap { };
-
-  euca2ools = callPackage ../tools/virtualization/euca2ools { pythonPackages = python26Packages; };
-
-  evtest = callPackage ../applications/misc/evtest { };
-
-  exempi = callPackage ../development/libraries/exempi { };
-
-  execline = callPackage ../tools/misc/execline { };
-
-  exercism = callPackage ../development/tools/exercism { };
-
-  exif = callPackage ../tools/graphics/exif { };
-
-  exiftags = callPackage ../tools/graphics/exiftags { };
-
-  extundelete = callPackage ../tools/filesystems/extundelete { };
-
-  expect = callPackage ../tools/misc/expect { };
-
-  f2fs-tools = callPackage ../tools/filesystems/f2fs-tools { };
-
-  fabric = pythonPackages.fabric;
-
-  fail2ban = callPackage ../tools/security/fail2ban {
-    systemd = systemd.override {
-      pythonSupport = true;
-    };
-  };
-
-  fakeroot = callPackage ../tools/system/fakeroot { };
-
-  fakechroot = callPackage ../tools/system/fakechroot { };
-
-  fcitx = callPackage ../tools/inputmethods/fcitx { };
-
-  fcron = callPackage ../tools/system/fcron { };
-
-  fdm = callPackage ../tools/networking/fdm {};
-
-  figlet = callPackage ../tools/misc/figlet { };
-
-  file = callPackage ../tools/misc/file { };
-
-  filegive = callPackage ../tools/networking/filegive { };
-
-  fileschanged = callPackage ../tools/misc/fileschanged { };
-
-  findutils = callPackage ../tools/misc/findutils { };
-
-  finger_bsd = callPackage ../tools/networking/bsd-finger { };
-
-  fio = callPackage ../tools/system/fio { };
-
-  flashtool = callPackage_i686 ../development/mobile/flashtool {
-    platformTools = androidenv.platformTools;
-  };
-
-  flashrom = callPackage ../tools/misc/flashrom { };
-
-  flpsed = callPackage ../applications/editors/flpsed { };
-
-  flvstreamer = callPackage ../tools/networking/flvstreamer { };
-
-  libbsd = callPackage ../development/libraries/libbsd { };
-
-  lprof = callPackage ../tools/graphics/lprof { };
-
-  fdk_aac = callPackage ../development/libraries/fdk-aac { };
-
-  flvtool2 = callPackage ../tools/video/flvtool2 { };
-
-  fontforge = lowPrio (callPackage ../tools/misc/fontforge { });
-
-  fontforgeX = callPackage ../tools/misc/fontforge {
-    withX11 = true;
-  };
-
-  forktty = callPackage ../os-specific/linux/forktty {};
-
-  fortune = callPackage ../tools/misc/fortune { };
-
-  fox = callPackage ../development/libraries/fox/default.nix {
-    libpng = libpng12;
-  };
-
-  fox_1_6 = callPackage ../development/libraries/fox/fox-1.6.nix { };
-
-  fping = callPackage ../tools/networking/fping {};
-
-  fprot = callPackage ../tools/security/fprot { };
-
-  freeipmi = callPackage ../tools/system/freeipmi {};
-
-  freetalk = callPackage ../applications/networking/instant-messengers/freetalk {
-    guile = guile_1_8;
-  };
-
-  freetds = callPackage ../development/libraries/freetds { };
-
-  ftgl = callPackage ../development/libraries/ftgl { };
-
-  ftgl212 = callPackage ../development/libraries/ftgl/2.1.2.nix { };
-
-  fuppes = callPackage ../tools/networking/fuppes {
-    ffmpeg = ffmpeg_0_6_90;
-  };
-
-  fsfs = callPackage ../tools/filesystems/fsfs { };
-
-  fuse_zip = callPackage ../tools/filesystems/fuse-zip { };
-
-  fuse_exfat = callPackage ../tools/filesystems/fuse-exfat { };
-
-  dos2unix = callPackage ../tools/text/dos2unix { };
-
-  uni2ascii = callPackage ../tools/text/uni2ascii { };
-
-  g500-control = callPackage ../tools/misc/g500-control { };
-
-  galculator = callPackage ../applications/misc/galculator {
-    gtk = gtk3;
-  };
-
-  gawk = callPackage ../tools/text/gawk { };
-
-  gawkInteractive = appendToName "interactive"
-    (gawk.override { readlineSupport = true; });
-
-  gbdfed = callPackage ../tools/misc/gbdfed {
-    gtk = gtk2;
-  };
-
-  gdmap = callPackage ../tools/system/gdmap { };
-
-  genext2fs = callPackage ../tools/filesystems/genext2fs { };
-
-  gengetopt = callPackage ../development/tools/misc/gengetopt { };
-
-  getmail = callPackage ../tools/networking/getmail { };
-
-  getopt = callPackage ../tools/misc/getopt { };
-
-  gftp = callPackage ../tools/networking/gftp { };
-
-  gifsicle = callPackage ../tools/graphics/gifsicle { };
-
-  glusterfs = callPackage ../tools/filesystems/glusterfs { };
-
-  glmark2 = callPackage ../tools/graphics/glmark2 { };
-
-  glxinfo = callPackage ../tools/graphics/glxinfo { };
-
-  gmvault = callPackage ../tools/networking/gmvault { };
-
-  gnokii = builderDefsPackage (import ../tools/misc/gnokii) {
-    inherit intltool perl gettext libusb pkgconfig bluez readline pcsclite
-      libical gtk glib;
-    inherit (xorg) libXpm;
-  };
-
-  gnufdisk = callPackage ../tools/system/fdisk {
-    guile = guile_1_8;
-  };
-
-  gnugrep = callPackage ../tools/text/gnugrep {
-    libiconv = libiconvOrNull;
-  };
-
-  gnulib = callPackage ../development/tools/gnulib { };
-
-  gnupatch = callPackage ../tools/text/gnupatch { };
-
-  gnupg1orig = callPackage ../tools/security/gnupg1 { };
-
-  gnupg1compat = callPackage ../tools/security/gnupg1compat { };
-
-  # use config.packageOverrides if you prefer original gnupg1
-  gnupg1 = gnupg1compat;
-
-  gnupg = callPackage ../tools/security/gnupg { libusb = libusb1; };
-
-  gnupg2_1 = lowPrio (callPackage ../tools/security/gnupg/git.nix {
-    libassuan = libassuan2_1;
-  });
-
-  gnuplot = callPackage ../tools/graphics/gnuplot { };
-
-  gnuplot_qt = gnuplot.override { withQt = true; };
-
-  # must have AquaTerm installed separately
-  gnuplot_aquaterm = gnuplot.override { aquaterm = true; };
-
-  gnused = callPackage ../tools/text/gnused { };
-
-  gnutar = callPackage ../tools/archivers/gnutar { };
-
-  gnuvd = callPackage ../tools/misc/gnuvd { };
-
-  goaccess = callPackage ../tools/misc/goaccess { };
-
-  googleAuthenticator = callPackage ../os-specific/linux/google-authenticator { };
-
-  gource = callPackage ../applications/version-management/gource {};
-
-  gpodder = callPackage ../applications/audio/gpodder { };
-
-  gptfdisk = callPackage ../tools/system/gptfdisk { };
-
-  grafana = callPackage ../development/tools/misc/grafana { };
-
-  grafx2 = callPackage ../applications/graphics/grafx2 {};
-
-  graphviz = callPackage ../tools/graphics/graphviz { };
-
-  /* Readded by Michael Raskin. There are programs in the wild
-   * that do want 2.0 but not 2.22. Please give a day's notice for
-   * objections before removal. The feature is integer coordinates
-   */
-  graphviz_2_0 = callPackage ../tools/graphics/graphviz/2.0.nix { };
-  
-  /* Readded by Michael Raskin. There are programs in the wild
-   * that do want 2.32 but not 2.0 or 2.36. Please give a day's notice for
-   * objections before removal. The feature is libgraph.
-   */
-  graphviz_2_32 = callPackage ../tools/graphics/graphviz/2.32.nix { };
-
-  grive = callPackage ../tools/filesystems/grive {
-    json_c = json-c-0-11; # won't configure with 0.12; others are vulnerable
-  };
-
-  groff = callPackage ../tools/text/groff {
-    ghostscript = null;
-  };
-
-  grub = callPackage_i686 ../tools/misc/grub {
-    buggyBiosCDSupport = config.grub.buggyBiosCDSupport or true;
-  };
-
-  grub2 = callPackage ../tools/misc/grub/2.0x.nix { };
-
-  grub2_efi = grub2.override { efiSupport = true; };
-
-  grub2_zfs = grub2.override { zfsSupport = true; };
-
-  gssdp = callPackage ../development/libraries/gssdp {
-    inherit (gnome) libsoup;
-  };
-
-  gt5 = callPackage ../tools/system/gt5 { };
-
-  gtest = callPackage ../development/libraries/gtest {};
-  gmock = callPackage ../development/libraries/gmock {};
-
-  gtkdatabox = callPackage ../development/libraries/gtkdatabox {};
-
-  gtkgnutella = callPackage ../tools/networking/p2p/gtk-gnutella { };
-
-  gtkvnc = callPackage ../tools/admin/gtk-vnc {};
-
-  gtmess = callPackage ../applications/networking/instant-messengers/gtmess { };
-
-  gummiboot = callPackage ../tools/misc/gummiboot { };
-
-  gupnp = callPackage ../development/libraries/gupnp {
-    inherit (gnome) libsoup;
-  };
-
-  gupnp_av = callPackage ../development/libraries/gupnp-av {};
-
-  gupnp_igd = callPackage ../development/libraries/gupnp-igd {};
-
-  gupnptools = callPackage ../tools/networking/gupnp-tools {};
-
-  gvpe = builderDefsPackage ../tools/networking/gvpe {
-    inherit openssl gmp nettools iproute;
-  };
-
-  gvolicon = callPackage ../tools/audio/gvolicon {};
-
-  gzip = callPackage ../tools/compression/gzip { };
-
-  gzrt = callPackage ../tools/compression/gzrt { };
-
-  partclone = callPackage ../tools/backup/partclone { };
-
-  partimage = callPackage ../tools/backup/partimage { };
-
-  pigz = callPackage ../tools/compression/pigz { };
-
-  haproxy = callPackage ../tools/networking/haproxy { };
-
-  haveged = callPackage ../tools/security/haveged { };
-
-  hawkthorne = callPackage ../games/hawkthorne { love = love_0_9; };
-
-  hardlink = callPackage ../tools/system/hardlink { };
-
-  hashcat = callPackage ../tools/security/hashcat { };
-
-  halibut = callPackage ../tools/typesetting/halibut { };
-
-  hddtemp = callPackage ../tools/misc/hddtemp { };
-
-  hdf5 = callPackage ../tools/misc/hdf5 {
-    szip = null;
-    mpi = null;
-  };
-
-  hdf5-mpi = hdf5.override {
-    szip = null;
-    mpi = pkgs.openmpi;
-  };
-
-  heimdall = callPackage ../tools/misc/heimdall { };
-
-  hevea = callPackage ../tools/typesetting/hevea { };
-
-  highlight = callPackage ../tools/text/highlight {
-    lua = lua5;
-  };
-
-  host = callPackage ../tools/networking/host { };
-
-  hping = callPackage ../tools/networking/hping { };
-
-  httpie = callPackage ../tools/networking/httpie { };
-
-  httpfs2 = callPackage ../tools/filesystems/httpfs { };
-
-  # FIXME: This Hydra snapshot is outdated and depends on the `nixPerl',
-  # which no longer exists.
-  #
-  # hydra = callPackage ../development/tools/misc/hydra {
-  #   nix = nixUnstable;
-  # };
-
-  iasl = callPackage ../development/compilers/iasl { };
-
-  icecast = callPackage ../servers/icecast { };
-
-  icoutils = callPackage ../tools/graphics/icoutils { };
-
-  idutils = callPackage ../tools/misc/idutils { };
-
-  idle3tools = callPackage ../tools/system/idle3tools { };
-
-  iftop = callPackage ../tools/networking/iftop { };
-
-  imapproxy = callPackage ../tools/networking/imapproxy { };
-
-  imapsync = callPackage ../tools/networking/imapsync {
-    inherit (perlPackages) MailIMAPClient;
-  };
-
-  inadyn = callPackage ../tools/networking/inadyn { };
-
-  inetutils = callPackage ../tools/networking/inetutils { };
-
-  ioping = callPackage ../tools/system/ioping {};
-
-  iodine = callPackage ../tools/networking/iodine { };
-
-  iperf = callPackage ../tools/networking/iperf { };
-
-  ipmitool = callPackage ../tools/system/ipmitool {
-    static = false;
-  };
-
-  ipmiutil = callPackage ../tools/system/ipmiutil {};
-
-  ised = callPackage ../tools/misc/ised {};
-
-  isl = callPackage ../development/libraries/isl { };
-  isl_0_12 = callPackage ../development/libraries/isl/0.12.2.nix { };
-
-  isync = callPackage ../tools/networking/isync { };
-
-  jd-gui = callPackage_i686 ../tools/security/jd-gui { };
-
-  jdiskreport = callPackage ../tools/misc/jdiskreport { };
-
-  jfsrec = callPackage ../tools/filesystems/jfsrec {
-    boost = boost144;
-  };
-
-  jfsutils = callPackage ../tools/filesystems/jfsutils { };
-
-  jhead = callPackage ../tools/graphics/jhead { };
-
-  jing = callPackage ../tools/text/xml/jing { };
-
-  jmtpfs = callPackage ../tools/filesystems/jmtpfs { };
-
-  jnettop = callPackage ../tools/networking/jnettop { };
-
-  jq = callPackage ../development/tools/jq {};
-
-  jscoverage = callPackage ../development/tools/misc/jscoverage { };
-
-  jwhois = callPackage ../tools/networking/jwhois { };
-
-  kazam = callPackage ../applications/video/kazam { };
-
-  kalibrate-rtl = callPackage ../tools/misc/kalibrate-rtl { };
-
-  kexectools = callPackage ../os-specific/linux/kexectools { };
-
-  keychain = callPackage ../tools/misc/keychain { };
-
-  kismet = callPackage ../applications/networking/sniffers/kismet { };
-
-  less = callPackage ../tools/misc/less { };
-
-  lockfileProgs = callPackage ../tools/misc/lockfile-progs { };
-
-  logstash = callPackage ../tools/misc/logstash { };
-
-  logstash-forwarder = callPackage ../tools/misc/logstash-forwarder { };
-
-  kippo = callPackage ../servers/kippo { };
-
-  klavaro = callPackage ../games/klavaro {};
-
-  kzipmix = callPackage_i686 ../tools/compression/kzipmix { };
-
-  minidlna = callPackage ../tools/networking/minidlna {
-    ffmpeg = ffmpeg_0_10;
-  };
-
-  mmv = callPackage ../tools/misc/mmv { };
-
-  most = callPackage ../tools/misc/most { };
-
-  multitail = callPackage ../tools/misc/multitail { };
-
-  netperf = callPackage ../applications/networking/netperf { };
-
-  ninka = callPackage ../development/tools/misc/ninka { };
-
-  nodejs = callPackage ../development/web/nodejs {};
-
-  nodePackages = recurseIntoAttrs (import ./node-packages.nix {
-    inherit pkgs stdenv nodejs fetchurl fetchgit;
-    neededNatives = [python] ++ lib.optional (lib.elem system lib.platforms.linux) utillinux;
-    self = pkgs.nodePackages;
-  });
-
-  ldapvi = callPackage ../tools/misc/ldapvi { };
-
-  ldns = callPackage ../development/libraries/ldns { };
-
-  lftp = callPackage ../tools/networking/lftp { };
-
-  libconfig = callPackage ../development/libraries/libconfig { };
-
-  libee = callPackage ../development/libraries/libee { };
-
-  libestr = callPackage ../development/libraries/libestr { };
-
-  libevdev = callPackage ../development/libraries/libevdev { };
-
-  liboauth = callPackage ../development/libraries/liboauth { };
-
-  libtirpc = callPackage ../development/libraries/ti-rpc { };
-
-  libshout = callPackage ../development/libraries/libshout { };
-
-  libqmi = callPackage ../development/libraries/libqmi { };
-
-  libmbim = callPackage ../development/libraries/libmbim { };
-
-  libtorrent = callPackage ../tools/networking/p2p/libtorrent { };
-
-  logcheck = callPackage ../tools/system/logcheck {
-    inherit (perlPackages) mimeConstruct;
-  };
-
-  logrotate = callPackage ../tools/system/logrotate { };
-
-  logstalgia = callPackage ../tools/graphics/logstalgia {};
-
-  lout = callPackage ../tools/typesetting/lout { };
-
-  lrzip = callPackage ../tools/compression/lrzip { };
-
-  # lsh installs `bin/nettle-lfib-stream' and so does Nettle.  Give the
-  # former a lower priority than Nettle.
-  lsh = lowPrio (callPackage ../tools/networking/lsh { });
-
-  lshw = callPackage ../tools/system/lshw { };
-
-  lxc = callPackage ../os-specific/linux/lxc { };
-
-  lzip = callPackage ../tools/compression/lzip { };
-
-  lzma = xz;
-
-  xz = callPackage ../tools/compression/xz { };
-
-  lzop = callPackage ../tools/compression/lzop { };
-
-  maildrop = callPackage ../tools/networking/maildrop { };
-
-  mailpile = callPackage ../applications/networking/mailreaders/mailpile { };
-
-  mailutils = callPackage ../tools/networking/mailutils {
-    guile = guile_1_8;
-  };
-
-  mairix = callPackage ../tools/text/mairix { };
-
-  makemkv = callPackage ../applications/video/makemkv { };
-
-  man = callPackage ../tools/misc/man { };
-
-  man_db = callPackage ../tools/misc/man-db { };
-
-  memtest86 = callPackage ../tools/misc/memtest86 { };
-
-  memtest86plus = callPackage ../tools/misc/memtest86+ { };
-
-  meo = callPackage ../tools/security/meo { };
-
-  mc = callPackage ../tools/misc/mc { };
-
-  mcabber = callPackage ../applications/networking/instant-messengers/mcabber { };
-
-  mcron = callPackage ../tools/system/mcron {
-    guile = guile_1_8;
-  };
-
-  mdbtools = callPackage ../tools/misc/mdbtools { };
-
-  mdbtools_git = callPackage ../tools/misc/mdbtools/git.nix {
-    inherit (gnome) scrollkeeper;
-  };
-
-  mednafen = callPackage ../misc/emulators/mednafen { };
-
-  mednafen-server = callPackage ../misc/emulators/mednafen/server.nix { };
-
-  megacli = callPackage ../tools/misc/megacli { };
-
-  megatools = callPackage ../tools/networking/megatools { };
-
-  mfcuk = callPackage ../tools/security/mfcuk { };
-
-  minecraft = callPackage ../games/minecraft { };
-
-  minecraft-server = callPackage ../games/minecraft-server { };
-
-  minetest = callPackage ../games/minetest {
-    libpng = libpng12;
-  };
-
-  miniupnpc = callPackage ../tools/networking/miniupnpc { };
-
-  miniupnpd = callPackage ../tools/networking/miniupnpd { };
-
-  minixml = callPackage ../development/libraries/minixml { };
-
-  mjpegtools = callPackage ../tools/video/mjpegtools { };
-
-  mkcue = callPackage ../tools/cd-dvd/mkcue { };
-
-  mkpasswd = callPackage ../tools/security/mkpasswd { };
-
-  mktemp = callPackage ../tools/security/mktemp { };
-
-  mktorrent = callPackage ../tools/misc/mktorrent { };
-
-  modemmanager = callPackage ../tools/networking/modemmanager {};
-
-  monit = callPackage ../tools/system/monit { };
-
-  mosh = callPackage ../tools/networking/mosh {
-    boost = boostHeaders;
-    inherit (perlPackages) IOTty;
-  };
-
-  mpage = callPackage ../tools/text/mpage { };
-
-  mr = callPackage ../applications/version-management/mr { };
-
-  mscgen = callPackage ../tools/graphics/mscgen { };
-
-  msf = builderDefsPackage (import ../tools/security/metasploit/3.1.nix) {
-    inherit ruby makeWrapper;
-  };
-
-  mssys = callPackage ../tools/misc/mssys { };
-
-  mtdutils = callPackage ../tools/filesystems/mtdutils { };
-
-  mtools = callPackage ../tools/filesystems/mtools { };
-
-  mtr = callPackage ../tools/networking/mtr {};
-
-  multitran = recurseIntoAttrs (let callPackage = newScope pkgs.multitran; in rec {
-    multitrandata = callPackage ../tools/text/multitran/data { };
-
-    libbtree = callPackage ../tools/text/multitran/libbtree { };
-
-    libmtsupport = callPackage ../tools/text/multitran/libmtsupport { };
-
-    libfacet = callPackage ../tools/text/multitran/libfacet { };
-
-    libmtquery = callPackage ../tools/text/multitran/libmtquery { };
-
-    mtutils = callPackage ../tools/text/multitran/mtutils { };
-  });
-
-  munge = callPackage ../tools/security/munge { };
-
-  muscleframework = callPackage ../tools/security/muscleframework { };
-
-  muscletool = callPackage ../tools/security/muscletool { };
-
-  mysql2pgsql = callPackage ../tools/misc/mysql2pgsql { };
-
-  namazu = callPackage ../tools/text/namazu { };
-
-  nbd = callPackage ../tools/networking/nbd { };
-
-  ndjbdns = callPackage ../tools/networking/ndjbdns { };
-
-  netatalk = callPackage ../tools/filesystems/netatalk { };
-
-  netcdf = callPackage ../development/libraries/netcdf { };
-
-  nc6 = callPackage ../tools/networking/nc6 { };
-
-  ncat = callPackage ../tools/networking/ncat { };
-
-  ncftp = callPackage ../tools/networking/ncftp { };
-
-  ncompress = callPackage ../tools/compression/ncompress { };
-
-  ndisc6 = callPackage ../tools/networking/ndisc6 { };
-
-  netboot = callPackage ../tools/networking/netboot {};
-
-  netcat = callPackage ../tools/networking/netcat { };
-
-  netcat-openbsd = callPackage ../tools/networking/netcat-openbsd { };
-
-  nethogs = callPackage ../tools/networking/nethogs { };
-
-  netkittftp = callPackage ../tools/networking/netkit/tftp { };
-
-  netpbm = callPackage ../tools/graphics/netpbm { };
-
-  netrw = callPackage ../tools/networking/netrw { };
-
-  netselect = callPackage ../tools/networking/netselect { };
-
-  networkmanager = callPackage ../tools/networking/network-manager { };
-
-  networkmanager_openvpn = callPackage ../tools/networking/network-manager/openvpn.nix { };
-
-  networkmanager_pptp = callPackage ../tools/networking/network-manager/pptp.nix { };
-
-  networkmanager_vpnc = callPackage ../tools/networking/network-manager/vpnc.nix { };
-
-  networkmanager_openconnect = callPackage ../tools/networking/network-manager/openconnect.nix { };
-
-  networkmanagerapplet = newScope gnome ../tools/networking/network-manager-applet { dconf = gnome3.dconf; };
-
-  newsbeuter = callPackage ../applications/networking/feedreaders/newsbeuter { };
-
-  newsbeuter-dev = callPackage ../applications/networking/feedreaders/newsbeuter/dev.nix { };
-
-  ngrep = callPackage ../tools/networking/ngrep { };
-
-  ngrok = callPackage ../tools/misc/ngrok { };
-
-  mpack = callPackage ../tools/networking/mpack { };
-
-  pa_applet = callPackage ../tools/audio/pa-applet { };
-
-  pnmixer = callPackage ../tools/audio/pnmixer { };
-
-  nifskope = callPackage ../tools/graphics/nifskope { };
-
-  nilfs_utils = callPackage ../tools/filesystems/nilfs-utils {};
-
-  nitrogen = callPackage ../tools/X11/nitrogen {};
-
-  nlopt = callPackage ../development/libraries/nlopt {};
-
-  npapi_sdk = callPackage ../development/libraries/npapi-sdk {};
-
-  npth = callPackage ../development/libraries/npth {};
-
-  nmap = callPackage ../tools/security/nmap { };
-
-  nmap_graphical = callPackage ../tools/security/nmap {
-    inherit (pythonPackages) pysqlite;
-    graphicalSupport = true;
-  };
-
-  notbit = callPackage ../applications/networking/notbit { };
-
-  nox = callPackage ../tools/package-management/nox {
-    pythonPackages = python3Packages;
-    nix = nixUnstable;
-  };
-
-  nss_pam_ldapd = callPackage ../tools/networking/nss-pam-ldapd {};
-
-  ntfs3g = callPackage ../tools/filesystems/ntfs-3g { };
-
-  # ntfsprogs are merged into ntfs-3g
-  ntfsprogs = pkgs.ntfs3g;
-
-  ntop = callPackage ../tools/networking/ntop { };
-
-  ntopng = callPackage ../tools/networking/ntopng { };
-
-  ntp = callPackage ../tools/networking/ntp { };
-
-  numdiff = callPackage ../tools/text/numdiff { };
-
-  nssmdns = callPackage ../tools/networking/nss-mdns { };
-
-  nwdiag = pythonPackages.nwdiag;
-
-  nylon = callPackage ../tools/networking/nylon { };
-
-  nzbget = callPackage ../tools/networking/nzbget { };
-
-  oathToolkit = callPackage ../tools/security/oath-toolkit { };
-
-  obex_data_server = callPackage ../tools/bluetooth/obex-data-server { };
-
-  obexd = callPackage ../tools/bluetooth/obexd { };
-
-  obexfs = callPackage ../tools/bluetooth/obexfs { };
-
-  obexftp = callPackage ../tools/bluetooth/obexftp { };
-
-  obnam = callPackage ../tools/backup/obnam { };
-
-  odt2txt = callPackage ../tools/text/odt2txt { };
-
-  offlineimap = callPackage ../tools/networking/offlineimap {
-    inherit (pythonPackages) sqlite3;
-  };
-
-  opendbx = callPackage ../development/libraries/opendbx { };
-
-  opendkim = callPackage ../development/libraries/opendkim { };
-
-  opendylan = callPackage ../development/compilers/opendylan {
-    opendylan-bootstrap = opendylan_bin;
-  };
-
-  opendylan_bin = callPackage ../development/compilers/opendylan/bin.nix { };
-
-  openjade = callPackage ../tools/text/sgml/openjade { };
-
-  openntpd = callPackage ../tools/networking/openntpd { };
-
-  openobex = callPackage ../tools/bluetooth/openobex { };
-
-  openopc = callPackage ../tools/misc/openopc {
-    pythonFull = python27Full.override {
-      extraLibs = [ python27Packages.pyro3 ];
-    };
-  };
-
-  openresolv = callPackage ../tools/networking/openresolv { };
-
-  opensc = callPackage ../tools/security/opensc { };
-
-  opensc_dnie_wrapper = callPackage ../tools/security/opensc-dnie-wrapper { };
-
-  openssh =
-    callPackage ../tools/networking/openssh {
-      hpnSupport = false;
-      withKerberos = false;
-      etcDir = "/etc/ssh";
-      pam = if stdenv.isLinux then pam else null;
-    };
-
-  openssh_hpn = pkgs.appendToName "with-hpn" (openssh.override { hpnSupport = true; });
-
-  openssh_with_kerberos = pkgs.appendToName "with-kerberos" (openssh.override { withKerberos = true; });
-
-  opensp = callPackage ../tools/text/sgml/opensp { };
-
-  spCompat = callPackage ../tools/text/sgml/opensp/compat.nix { };
-
-  openvpn = callPackage ../tools/networking/openvpn { };
-
-  openvpn_learnaddress = callPackage ../tools/networking/openvpn/openvpn_learnaddress.nix { };
-
-  openvswitch = callPackage ../os-specific/linux/openvswitch { };
-
-  optipng = callPackage ../tools/graphics/optipng {
-    libpng = libpng12;
-  };
-
-  oslrd = callPackage ../tools/networking/oslrd { };
-
-  ossec = callPackage ../tools/security/ossec {};
-
-  otpw = callPackage ../os-specific/linux/otpw { };
-
-  p7zip = callPackage ../tools/archivers/p7zip { };
-
-  pal = callPackage ../tools/misc/pal { };
-
-  panomatic = callPackage ../tools/graphics/panomatic { };
-
-  par2cmdline = callPackage ../tools/networking/par2cmdline { };
-
-  parallel = callPackage ../tools/misc/parallel { };
-
-  parcellite = callPackage ../tools/misc/parcellite { };
-
-  patchutils = callPackage ../tools/text/patchutils { };
-
-  parted = callPackage ../tools/misc/parted { hurd = null; };
-
-  pitivi = callPackage ../applications/video/pitivi {
-    gst = gst_all_1;
-    clutter-gtk = clutter_gtk;
-    inherit (gnome3) gnome_icon_theme gnome_icon_theme_symbolic;
-  };
-
-  p0f = callPackage ../tools/security/p0f { };
-
-  pngout = callPackage ../tools/graphics/pngout { };
-
-  hurdPartedCross =
-    if crossSystem != null && crossSystem.config == "i586-pc-gnu"
-    then (makeOverridable
-            ({ hurd }:
-              (parted.override {
-                # Needs the Hurd's libstore.
-                inherit hurd;
-
-                # The Hurd wants a libparted.a.
-                enableStatic = true;
-
-                gettext = null;
-                readline = null;
-                devicemapper = null;
-              }).crossDrv)
-           { hurd = gnu.hurdCrossIntermediate; })
-    else null;
-
-  ipsecTools = callPackage ../os-specific/linux/ipsec-tools { flex = flex_2_5_35; };
-
-  patch = gnupatch;
-
-  pbzip2 = callPackage ../tools/compression/pbzip2 { };
-
-  pciutils = callPackage ../tools/system/pciutils { };
-
-  pcsclite = callPackage ../tools/security/pcsclite { };
-
-  pdf2djvu = callPackage ../tools/typesetting/pdf2djvu { };
-
-  pdfjam = callPackage ../tools/typesetting/pdfjam { };
-
-  jbig2enc = callPackage ../tools/graphics/jbig2enc { };
-
-  pdfread = callPackage ../tools/graphics/pdfread { };
-
-  briss = callPackage ../tools/graphics/briss { };
-
-  bully = callPackage ../tools/networking/bully { };
-
-  pdnsd = callPackage ../tools/networking/pdnsd { };
-
-  peco = callPackage ../tools/text/peco { };
-
-  pg_top = callPackage ../tools/misc/pg_top { };
-
-  pdsh = callPackage ../tools/networking/pdsh {
-    rsh = true;          # enable internal rsh implementation
-    ssh = openssh;
-  };
-
-  pfstools = callPackage ../tools/graphics/pfstools { };
-
-  philter = callPackage ../tools/networking/philter { };
-
-  pinentry = callPackage ../tools/security/pinentry { };
-
-  pius = callPackage ../tools/security/pius { };
-
-  pk2cmd = callPackage ../tools/misc/pk2cmd { };
-
-  plantuml = callPackage ../tools/misc/plantuml { };
-
-  plan9port = callPackage ../tools/system/plan9port { };
-
-  ploticus = callPackage ../tools/graphics/ploticus {
-    libpng = libpng12;
-  };
-
-  plotutils = callPackage ../tools/graphics/plotutils { };
-
-  plowshare = callPackage ../tools/misc/plowshare { };
-
-  pngcrush = callPackage ../tools/graphics/pngcrush { };
-
-  pngnq = callPackage ../tools/graphics/pngnq { };
-
-  pngtoico = callPackage ../tools/graphics/pngtoico {
-    libpng = libpng12;
-  };
-
-  pngquant = callPackage ../tools/graphics/pngquant { };
-
-  podiff = callPackage ../tools/text/podiff { };
-
-  poedit = callPackage ../tools/text/poedit { };
-
-  polipo = callPackage ../servers/polipo { };
-
-  polkit_gnome = callPackage ../tools/security/polkit-gnome { };
-
-  ponysay = callPackage ../tools/misc/ponysay { };
-
-  povray = callPackage ../tools/graphics/povray { };
-
-  ppl = callPackage ../development/libraries/ppl { };
-
-  ppp = callPackage ../tools/networking/ppp { };
-
-  pptp = callPackage ../tools/networking/pptp {};
-
-  prey-bash-client = callPackage ../tools/security/prey { };
-
-  projectm = callPackage ../applications/audio/projectm { };
-
-  proxychains = callPackage ../tools/networking/proxychains { };
-
-  proxytunnel = callPackage ../tools/misc/proxytunnel { };
-
-  cntlm = callPackage ../tools/networking/cntlm { };
-
-  pastebinit = callPackage ../tools/misc/pastebinit { };
-
-  psmisc = callPackage ../os-specific/linux/psmisc { };
-
-  pstoedit = callPackage ../tools/graphics/pstoedit { };
-
-  pv = callPackage ../tools/misc/pv { };
-
-  pwgen = callPackage ../tools/security/pwgen { };
-
-  pwnat = callPackage ../tools/networking/pwnat { };
-
-  pycangjie = callPackage ../development/python-modules/pycangjie { };
-
-  pydb = callPackage ../development/tools/pydb { };
-
-  pystringtemplate = callPackage ../development/python-modules/stringtemplate { };
-
-  pythonDBus = dbus_python;
-
-  pythonIRClib = builderDefsPackage (import ../development/python-modules/irclib) {
-    inherit python;
-  };
-
-  pythonSexy = builderDefsPackage (import ../development/python-modules/libsexy) {
-    inherit python libsexy pkgconfig libxml2 pygtk pango gtk glib;
-  };
-
-  openmpi = callPackage ../development/libraries/openmpi { };
-
-  qhull = callPackage ../development/libraries/qhull { };
-
-  qjoypad = callPackage ../tools/misc/qjoypad { };
-
-  qshowdiff = callPackage ../tools/text/qshowdiff { };
-
-  quilt = callPackage ../development/tools/quilt { };
-
-  radvd = callPackage ../tools/networking/radvd { };
-
-  ranger = callPackage ../applications/misc/ranger { };
-
-  privateer = callPackage ../games/privateer { };
-
-  rtmpdump = callPackage ../tools/video/rtmpdump { };
-
-  reaverwps = callPackage ../tools/networking/reaver-wps {};
-
-  recutils = callPackage ../tools/misc/recutils { };
-
-  recoll = callPackage ../applications/search/recoll { };
-
-  reiser4progs = callPackage ../tools/filesystems/reiser4progs { };
-
-  reiserfsprogs = callPackage ../tools/filesystems/reiserfsprogs { };
-
-  relfs = callPackage ../tools/filesystems/relfs {
-    inherit (gnome) gnome_vfs GConf;
-  };
-
-  remarkjs = callPackage ../development/web/remarkjs { };
-
-  remind = callPackage ../tools/misc/remind { };
-
-  remmina = callPackage ../applications/networking/remote/remmina {};
-
-  renameutils = callPackage ../tools/misc/renameutils { };
-
-  replace = callPackage ../tools/text/replace { };
-
-  reptyr = callPackage ../os-specific/linux/reptyr {};
-
-  rdiff_backup = callPackage ../tools/backup/rdiff-backup { };
-
-  rdmd = callPackage ../development/compilers/rdmd { };
-
-  rhash = callPackage ../tools/security/rhash { };
-
-  riemann_c_client = callPackage ../tools/misc/riemann-c-client { };
-
-  ripmime = callPackage ../tools/networking/ripmime {};
-
-  rkflashtool = callPackage ../tools/misc/rkflashtool { };
-
-  rmlint = callPackage ../tools/misc/rmlint {};
-
-  rng_tools = callPackage ../tools/security/rng-tools { };
-
-  rsnapshot = callPackage ../tools/backup/rsnapshot {
-    # For the `logger' command, we can use either `utillinux' or
-    # GNU Inetutils.  The latter is more portable.
-    logger = inetutils;
-  };
-
-  rlwrap = callPackage ../tools/misc/rlwrap { };
-
-  rockbox_utility = callPackage ../tools/misc/rockbox-utility { };
-
-  rpPPPoE = builderDefsPackage (import ../tools/networking/rp-pppoe) {
-    inherit ppp;
-  };
-
-  rpm = callPackage ../tools/package-management/rpm { };
-
-  rrdtool = callPackage ../tools/misc/rrdtool { };
-
-  rtorrent = callPackage ../tools/networking/p2p/rtorrent { };
-
-  rubber = callPackage ../tools/typesetting/rubber { };
-
-  rxp = callPackage ../tools/text/xml/rxp { };
-
-  rzip = callPackage ../tools/compression/rzip { };
-
-  s3backer = callPackage ../tools/filesystems/s3backer { };
-
-  s3cmd = callPackage ../tools/networking/s3cmd { };
-
-  s3cmd_15_pre_81e3842f7a = lowPrio (callPackage ../tools/networking/s3cmd/git.nix { });
-
-  s3sync = callPackage ../tools/networking/s3sync {
-    ruby = ruby18;
-  };
-
-  s6Dns = callPackage ../tools/networking/s6-dns { };
-
-  s6LinuxUtils = callPackage ../os-specific/linux/s6-linux-utils { };
-
-  s6Networking = callPackage ../tools/networking/s6-networking { };
-
-  s6PortableUtils = callPackage ../tools/misc/s6-portable-utils { };
-
-  sablotron = callPackage ../tools/text/xml/sablotron { };
-
-  safecopy = callPackage ../tools/system/safecopy { };
-
-  salut_a_toi = callPackage ../applications/networking/instant-messengers/salut-a-toi {};
-
-  samplicator = callPackage ../tools/networking/samplicator { };
-
-  screen = callPackage ../tools/misc/screen { };
-
-  scrot = callPackage ../tools/graphics/scrot { };
-
-  scrypt = callPackage ../tools/security/scrypt { };
-
-  sdcv = callPackage ../applications/misc/sdcv { };
-
-  sec = callPackage ../tools/admin/sec { };
-
-  seccure = callPackage ../tools/security/seccure { };
-
-  setserial = builderDefsPackage (import ../tools/system/setserial) {
-    inherit groff;
-  };
-
-  seqdiag = pythonPackages.seqdiag;
-
-  screenfetch = callPackage ../tools/misc/screenfetch { };
-
-  sg3_utils = callPackage ../tools/system/sg3_utils { };
-
-  sharutils = callPackage ../tools/archivers/sharutils { };
-
-  shotwell = callPackage ../applications/graphics/shotwell { };
-
-  shebangfix = callPackage ../tools/misc/shebangfix { };
-
-  shellinabox = callPackage ../servers/shellinabox { };
-
-  siege = callPackage ../tools/networking/siege {};
-
-  silc_client = callPackage ../applications/networking/instant-messengers/silc-client { };
-
-  silc_server = callPackage ../servers/silc-server { };
-
-  silver-searcher = callPackage ../tools/text/silver-searcher { };
-
-  simplescreenrecorder = callPackage ../applications/video/simplescreenrecorder { };
-
-  sleuthkit = callPackage ../tools/system/sleuthkit {};
-
-  slimrat = callPackage ../tools/networking/slimrat {
-    inherit (perlPackages) WWWMechanize LWP;
-  };
-
-  slsnif = callPackage ../tools/misc/slsnif { };
-
-  smartmontools = callPackage ../tools/system/smartmontools { };
-
-  smbldaptools = callPackage ../tools/networking/smbldaptools {
-    inherit (perlPackages) NetLDAP CryptSmbHash DigestSHA1;
-  };
-
-  smbnetfs = callPackage ../tools/filesystems/smbnetfs {};
-
-  snort = callPackage ../applications/networking/ids/snort { };
-
-  snx = callPackage_i686 ../tools/networking/snx {
-    inherit (pkgsi686Linux) pam gcc33;
-    inherit (pkgsi686Linux.xlibs) libX11;
-  };
-
-  solr = callPackage ../servers/search/solr { };
-
-  sparsehash = callPackage ../development/libraries/sparsehash { };
-
-  spiped = callPackage ../tools/networking/spiped { };
-
-  sproxy = haskellPackages.callPackage ../tools/networking/sproxy { };
-
-  sproxy-web = haskellPackages.callPackage ../tools/networking/sproxy-web { };
-
-  stardict = callPackage ../applications/misc/stardict/stardict.nix {
-    inherit (gnome) libgnomeui scrollkeeper;
-  };
-
-  storebrowse = callPackage ../tools/system/storebrowse { };
-
-  fusesmb = callPackage ../tools/filesystems/fusesmb { };
-
-  sl = callPackage ../tools/misc/sl { };
-
-  socat = callPackage ../tools/networking/socat { };
-
-  socat2pre = lowPrio (callPackage ../tools/networking/socat/2.x.nix { });
-
-  sourceHighlight = callPackage ../tools/text/source-highlight {
-    # Boost 1.54 causes the "test_regexranges" test to fail
-    boost = boost149;
-  };
-
-  spaceFM = callPackage ../applications/misc/spacefm { };
-
-  squashfsTools = callPackage ../tools/filesystems/squashfs { };
-
-  sshfsFuse = callPackage ../tools/filesystems/sshfs-fuse { };
-
-  sshuttle = callPackage ../tools/security/sshuttle { };
-
-  sudo = callPackage ../tools/security/sudo { };
-
-  suidChroot = builderDefsPackage (import ../tools/system/suid-chroot) { };
-
-  super = callPackage ../tools/security/super { };
-
-  ssdeep = callPackage ../tools/security/ssdeep { };
-
-  ssmtp = callPackage ../tools/networking/ssmtp {
-    tlsSupport = true;
-  };
-
-  ssss = callPackage ../tools/security/ssss { };
-
-  storeBackup = callPackage ../tools/backup/store-backup { };
-
-  stow = callPackage ../tools/misc/stow { };
-
-  stun = callPackage ../tools/networking/stun { };
-
-  stunnel = callPackage ../tools/networking/stunnel { };
-
-  su = shadow.su;
-
-  surfraw = callPackage ../tools/networking/surfraw { };
-
-  swec = callPackage ../tools/networking/swec {
-    inherit (perlPackages) LWP URI HTMLParser HTTPServerSimple Parent;
-  };
-
-  svnfs = callPackage ../tools/filesystems/svnfs { };
-
-  sysbench = callPackage ../development/tools/misc/sysbench {};
-
-  system_config_printer = callPackage ../tools/misc/system-config-printer {
-    libxml2 = libxml2Python;
-   };
-
-  sitecopy = callPackage ../tools/networking/sitecopy { };
-
-  stricat = callPackage ../tools/security/stricat { };
-
-  privoxy = callPackage ../tools/networking/privoxy { };
-
-  t1utils = callPackage ../tools/misc/t1utils { };
-
-  tarsnap = callPackage ../tools/backup/tarsnap { };
-
-  tcpcrypt = callPackage ../tools/security/tcpcrypt { };
-
-  tboot = callPackage ../tools/security/tboot { };
-
-  tcl2048 = callPackage ../games/tcl2048 { };
-
-  tcpdump = callPackage ../tools/networking/tcpdump { };
-
-  tcpflow = callPackage ../tools/networking/tcpflow { };
-
-  teamviewer = callPackage_i686 ../applications/networking/remote/teamviewer { };
-
-  # Work In Progress: it doesn't start unless running a daemon as root
-  teamviewer8 = lowPrio (callPackage_i686 ../applications/networking/remote/teamviewer/8.nix { });
-
-  telnet = callPackage ../tools/networking/telnet { };
-
-  texmacs = callPackage ../applications/editors/texmacs {
-    tex = texLive; /* tetex is also an option */
-    extraFonts = true;
-    guile = guile_1_8;
-  };
-
-  texmaker = callPackage ../applications/editors/texmaker { };
-
-  texstudio = callPackage ../applications/editors/texstudio { };
-
-  tiled-qt = callPackage ../applications/editors/tiled-qt { qt = qt4; };
-
-  tinc = callPackage ../tools/networking/tinc { };
-
-  tiny8086 = callPackage ../applications/virtualization/8086tiny { };
-
-  tmpwatch = callPackage ../tools/misc/tmpwatch  { };
-
-  tmux = callPackage ../tools/misc/tmux { };
-
-  tor = callPackage ../tools/security/tor { };
-
-  torbutton = callPackage ../tools/security/torbutton { };
-
-  torbrowser = callPackage ../tools/security/tor/torbrowser.nix { };
-
-  torsocks = callPackage ../tools/security/tor/torsocks.nix { };
-
-  tpm-quote-tools = callPackage ../tools/security/tpm-quote-tools { };
-
-  tpm-tools = callPackage ../tools/security/tpm-tools { };
-
-  trickle = callPackage ../tools/networking/trickle {};
-
-  trousers = callPackage ../tools/security/trousers { };
-
-  ttf2pt1 = callPackage ../tools/misc/ttf2pt1 { };
-
-  ttysnoop = callPackage ../os-specific/linux/ttysnoop {};
-
-  twitterBootstrap = callPackage ../development/web/twitter-bootstrap {};
-
-  txt2man = callPackage ../tools/misc/txt2man { };
-
-  ucl = callPackage ../development/libraries/ucl { };
-
-  ucspi-tcp = callPackage ../tools/networking/ucspi-tcp { };
-
-  udftools = callPackage ../tools/filesystems/udftools {};
-
-  udptunnel = callPackage ../tools/networking/udptunnel { };
-
-  ufraw = callPackage ../applications/graphics/ufraw { };
-
-  unetbootin = callPackage ../tools/cd-dvd/unetbootin { };
-
-  unfs3 = callPackage ../servers/unfs3 { };
-
-  unoconv = callPackage ../tools/text/unoconv { };
-
-  upx = callPackage ../tools/compression/upx { };
-
-  urlview = callPackage ../applications/misc/urlview {};
-
-  usbmuxd = callPackage ../tools/misc/usbmuxd {};
-
-  vacuum = callPackage ../applications/networking/instant-messengers/vacuum {};
-
-  volatility = callPackage ../tools/security/volatility { };
-
-  vidalia = callPackage ../tools/security/vidalia { };
-
-  vbetool = builderDefsPackage ../tools/system/vbetool {
-    inherit pciutils libx86 zlib;
-  };
-
-  vde2 = callPackage ../tools/networking/vde2 { };
-
-  vboot_reference = callPackage ../tools/system/vboot_reference { };
-
-  vcsh = callPackage ../applications/version-management/vcsh { };
-
-  verilog = callPackage ../applications/science/electronics/verilog {};
-
-  vfdecrypt = callPackage ../tools/misc/vfdecrypt { };
-
-  vifm = callPackage ../applications/misc/vifm { };
-
-  viking = callPackage ../applications/misc/viking {
-    inherit (gnome) scrollkeeper;
-  };
-
-  vnc2flv = callPackage ../tools/video/vnc2flv {};
-
-  vncrec = builderDefsPackage ../tools/video/vncrec {
-    inherit (xlibs) imake libX11 xproto gccmakedep libXt
-      libXmu libXaw libXext xextproto libSM libICE libXpm
-      libXp;
-  };
-
-  vobcopy = callPackage ../tools/cd-dvd/vobcopy { };
-
-  vobsub2srt = callPackage ../tools/cd-dvd/vobsub2srt { };
-
-  vorbisgain = callPackage ../tools/misc/vorbisgain { };
-
-  vpnc = callPackage ../tools/networking/vpnc { };
-
-  openconnect = callPackage ../tools/networking/openconnect.nix { };
-
-  vtun = callPackage ../tools/networking/vtun { };
-
-  wal_e = callPackage ../tools/backup/wal-e { };
-
-  watchman = callPackage ../development/tools/watchman { };
-
-  wbox = callPackage ../tools/networking/wbox {};
-
-  welkin = callPackage ../tools/graphics/welkin {};
-
-  testdisk = callPackage ../tools/misc/testdisk { };
-
-  htmlTidy = callPackage ../tools/text/html-tidy { };
-
-  html-xml-utils = callPackage ../tools/text/xml/html-xml-utils { };
-
-  tftp_hpa = callPackage ../tools/networking/tftp-hpa {};
-
-  tigervnc = callPackage ../tools/admin/tigervnc {
-    fontDirectories = [ xorg.fontadobe75dpi xorg.fontmiscmisc xorg.fontcursormisc
-      xorg.fontbhlucidatypewriter75dpi ];
-    inherit (xorg) xorgserver;
-    fltk = fltk13;
-  };
-
-  tightvnc = callPackage ../tools/admin/tightvnc {
-    fontDirectories = [ xorg.fontadobe75dpi xorg.fontmiscmisc xorg.fontcursormisc
-      xorg.fontbhlucidatypewriter75dpi ];
-  };
-
-  time = callPackage ../tools/misc/time { };
-
-  tkabber = callPackage ../applications/networking/instant-messengers/tkabber { };
-
-  qfsm = callPackage ../applications/science/electronics/qfsm { };
-
-  tkgate = callPackage ../applications/science/electronics/tkgate/1.x.nix {
-    inherit (xlibs) libX11 imake xproto gccmakedep;
-  };
-
-  # The newer package is low-priority because it segfaults at startup.
-  tkgate2 = lowPrio (callPackage ../applications/science/electronics/tkgate/2.x.nix {
-    inherit (xlibs) libX11;
-  });
-
-  tm = callPackage ../tools/system/tm { };
-
-  trang = callPackage ../tools/text/xml/trang { };
-
-  tre = callPackage ../development/libraries/tre { };
-
-  ts = callPackage ../tools/system/ts { };
-
-  transfig = callPackage ../tools/graphics/transfig {
-    libpng = libpng12;
-  };
-
-  truecrypt = callPackage ../applications/misc/truecrypt {
-    wxGUI = config.truecrypt.wxGUI or true;
-  };
-
-  ttmkfdir = callPackage ../tools/misc/ttmkfdir { };
-
-  uim = callPackage ../tools/inputmethods/uim {
-    inherit (pkgs.kde4) kdelibs;
-  };
-
-  uhub = callPackage ../servers/uhub { };
-
-  unclutter = callPackage ../tools/misc/unclutter { };
-
-  unbound = callPackage ../tools/networking/unbound { };
-
-  units = callPackage ../tools/misc/units { };
-
-  unrar = callPackage ../tools/archivers/unrar { };
-
-  xar = callPackage ../tools/compression/xar { };
-
-  xarchive = callPackage ../tools/archivers/xarchive { };
-
-  xarchiver = callPackage ../tools/archivers/xarchiver { };
-
-  xcruiser = callPackage ../applications/misc/xcruiser { };
-
-  unarj = callPackage ../tools/archivers/unarj { };
-
-  unshield = callPackage ../tools/archivers/unshield { };
-
-  unzip = callPackage ../tools/archivers/unzip { };
-
-  unzipNLS = lowPrio (unzip.override { enableNLS = true; });
-
-  uptimed = callPackage ../tools/system/uptimed { };
-
-  urlwatch = callPackage ../tools/networking/urlwatch { };
-
-  varnish = callPackage ../servers/varnish { };
-
-  varnish2 = callPackage ../servers/varnish/2.1.nix { };
-
-  venus = callPackage ../tools/misc/venus {
-    python = python27;
-  };
-
-  vlan = callPackage ../tools/networking/vlan { };
-
-  wakelan = callPackage ../tools/networking/wakelan { };
-
-  wavemon = callPackage ../tools/networking/wavemon { };
-
-  w3cCSSValidator = callPackage ../tools/misc/w3c-css-validator {
-    tomcat = tomcat6;
-  };
-
-  wdfs = callPackage ../tools/filesystems/wdfs { };
-
-  wdiff = callPackage ../tools/text/wdiff { };
-
-  webalizer = callPackage ../tools/networking/webalizer { };
-
-  webdruid = builderDefsPackage ../tools/admin/webdruid {
-    inherit zlib libpng freetype gd which
-      libxml2 geoip;
-  };
-
-  weighttp = callPackage ../tools/networking/weighttp { };
-
-  wget = callPackage ../tools/networking/wget {
-    inherit (perlPackages) LWP;
-  };
-
-  which = callPackage ../tools/system/which { };
-
-  wicd = callPackage ../tools/networking/wicd { };
-
-  wkhtmltopdf = callPackage ../tools/graphics/wkhtmltopdf { };
-
-  wv = callPackage ../tools/misc/wv { };
-
-  wv2 = callPackage ../tools/misc/wv2 { };
-
-  x86info = callPackage ../os-specific/linux/x86info { };
-
-  x11_ssh_askpass = callPackage ../tools/networking/x11-ssh-askpass { };
-
-  xbursttools = assert stdenv ? glibc; import ../tools/misc/xburst-tools {
-    inherit stdenv fetchgit autoconf automake confuse pkgconfig libusb libusb1;
-    # It needs a cross compiler for mipsel to build the firmware it will
-    # load into the Ben Nanonote
-    gccCross =
-      let
-        pkgsCross = (import ./all-packages.nix) {
-          inherit system;
-          inherit bootStdenv noSysDirs gccWithCC gccWithProfiling config;
-          # Ben Nanonote system
-          crossSystem = {
-            config = "mipsel-unknown-linux";
-            bigEndian = true;
-            arch = "mips";
-            float = "soft";
-            withTLS = true;
-            libc = "uclibc";
-            platform = {
-              name = "ben_nanonote";
-              kernelMajor = "2.6";
-              # It's not a bcm47xx processor, but for the headers this should work
-              kernelHeadersBaseConfig = "bcm47xx_defconfig";
-              kernelArch = "mips";
-            };
-            gcc = {
-              arch = "mips32";
-            };
-          };
-        };
-      in
-        pkgsCross.gccCrossStageStatic;
-  };
-
-  xclip = callPackage ../tools/misc/xclip { };
-
-  xtitle = callPackage ../tools/misc/xtitle { };
-
-  xdelta = callPackage ../tools/compression/xdelta { };
-
-  xdummy = callPackage ../tools/misc/xdummy { };
-
-  xfsprogs = callPackage ../tools/filesystems/xfsprogs { };
-
-  xmlroff = callPackage ../tools/typesetting/xmlroff {
-    inherit (gnome) libgnomeprint;
-  };
-
-  xmlstarlet = callPackage ../tools/text/xml/xmlstarlet { };
-
-  xmlto = callPackage ../tools/typesetting/xmlto { };
-
-  xmltv = callPackage ../tools/misc/xmltv { };
-
-  xmpppy = builderDefsPackage (import ../development/python-modules/xmpppy) {
-    inherit python setuptools;
-  };
-
-  xorriso = callPackage ../tools/cd-dvd/xorriso { };
-
-  xpf = callPackage ../tools/text/xml/xpf {
-    libxml2 = libxml2Python;
-  };
-
-  xsel = callPackage ../tools/misc/xsel { };
-
-  xtreemfs = callPackage ../tools/filesystems/xtreemfs {};
-
-  xvfb_run = callPackage ../tools/misc/xvfb-run { inherit (texFunctions) fontsConf; };
-
-  youtubeDL = callPackage ../tools/misc/youtube-dl { };
-
-  zbar = callPackage ../tools/graphics/zbar {
-    pygtk = lib.overrideDerivation pygtk (x: {
-      gtk = gtk2;
-    });
-  };
-
-  zdelta = callPackage ../tools/compression/zdelta { };
-
-  zfstools = callPackage ../tools/filesystems/zfstools {
-    zfs = linuxPackages.zfs;
-  };
-
-  zile = callPackage ../applications/editors/zile { };
-
-  zip = callPackage ../tools/archivers/zip { };
-
-  zpaq = callPackage ../tools/archivers/zpaq { };
-  zpaqd = callPackage ../tools/archivers/zpaq/zpaqd.nix { };
-
-  zsync = callPackage ../tools/compression/zsync { };
-
-
-  ### SHELLS
-
-  bash = lowPrio (callPackage ../shells/bash {
-    texinfo = null;
-  });
-
-  bashInteractive = appendToName "interactive" (callPackage ../shells/bash {
-    interactive = true;
-    readline = readline63; # Includes many vi mode fixes
-  });
-
-  bashCompletion = callPackage ../shells/bash-completion { };
-
-  dash = callPackage ../shells/dash { };
-
-  fish = callPackage ../shells/fish {
-    python = python27Full;
-  };
-
-  tcsh = callPackage ../shells/tcsh { };
-
-  rush = callPackage ../shells/rush { };
-
-  zsh = callPackage ../shells/zsh { };
-
-
-  ### DEVELOPMENT / COMPILERS
-
-  abc =
-    abcPatchable [];
-
-  abcPatchable = patches :
-    import ../development/compilers/abc/default.nix {
-      inherit stdenv fetchurl patches jre apacheAnt;
-      javaCup = callPackage ../development/libraries/java/cup { };
-    };
-
-  aldor = callPackage ../development/compilers/aldor { };
-
-  aliceml = callPackage ../development/compilers/aliceml { };
-
-  aspectj = callPackage ../development/compilers/aspectj { };
-
-  ats = callPackage ../development/compilers/ats { };
-  ats2 = callPackage ../development/compilers/ats2 { };
-
-  avra = callPackage ../development/compilers/avra { };
-
-  bigloo = callPackage ../development/compilers/bigloo { };
-
-  chicken = callPackage ../development/compilers/chicken { };
-
-  ccl = builderDefsPackage ../development/compilers/ccl {};
-
-  clang = wrapClang llvmPackages.clang;
-
-  clang_34 = wrapClang llvmPackages_34.clang;
-  clang_33 = wrapClang (clangUnwrapped llvm_33 ../development/compilers/llvm/3.3/clang.nix);
-
-  clangAnalyzer = callPackage ../development/tools/analysis/clang-analyzer {
-    clang = clang_34;
-    llvmPackages = llvmPackages_34;
-  };
-
-  clangUnwrapped = llvm: pkg: callPackage pkg {
-    stdenv = if stdenv.isDarwin then stdenvApple else stdenv;
-    inherit llvm;
-  };
-
-  clangSelf = clangWrapSelf llvmPackagesSelf.clang;
-
-  clangWrapSelf = build: (import ../build-support/clang-wrapper) {
-    clang = build;
-    stdenv = clangStdenv;
-    libc = glibc;
-    binutils = binutils;
-    shell = bash;
-    inherit libcxx coreutils zlib;
-    nativeTools = false;
-    nativeLibc = false;
-  };
-
-  #Use this instead of stdenv to build with clang
-  clangStdenv = lowPrio (stdenvAdapters.overrideGCC stdenv clang);
-  libcxxStdenv = stdenvAdapters.overrideGCC stdenv (clangWrapSelf llvmPackages.clang);
-
-  clean = callPackage ../development/compilers/clean { };
-
-  closurecompiler = callPackage ../development/compilers/closure { };
-
-  cmucl_binary = callPackage ../development/compilers/cmucl/binary.nix { };
-
-  compcert = callPackage ../development/compilers/compcert {};
-
-  cryptol1 = lowPrio (callPackage ../development/compilers/cryptol/1.8.x.nix {});
-  cryptol2 = with haskellPackages_ghc763; callPackage ../development/compilers/cryptol/2.0.x.nix {
-    Cabal = Cabal_1_18_1_3;
-    cabalInstall = cabalInstall_1_18_0_3;
-    process = process_1_2_0_0;
-  };
-
-  cython = pythonPackages.cython;
-  cython3 = python3Packages.cython;
-
-  dylan = callPackage ../development/compilers/gwydion-dylan {
-    dylan = callPackage ../development/compilers/gwydion-dylan/binary.nix {  };
-  };
-
-  ecl = callPackage ../development/compilers/ecl { };
-
-  eql = callPackage ../development/compilers/eql {};
-
-  adobe_flex_sdk = callPackage ../development/compilers/adobe-flex-sdk { };
-
-  fpc = callPackage ../development/compilers/fpc { };
-
-  gambit = callPackage ../development/compilers/gambit { };
-
-  gcc = gcc48;
-
-  gcc33 = wrapGCC (import ../development/compilers/gcc/3.3 {
-    inherit fetchurl stdenv noSysDirs;
-  });
-
-  gcc34 = wrapGCC (import ../development/compilers/gcc/3.4 {
-    inherit fetchurl stdenv noSysDirs;
-  });
-
-  gcc48_realCross = lib.addMetaAttrs { hydraPlatforms = []; }
-    (callPackage ../development/compilers/gcc/4.8 {
-      inherit noSysDirs;
-      binutilsCross = binutilsCross;
-      libcCross = libcCross;
-      profiledCompiler = false;
-      enableMultilib = false;
-      crossStageStatic = false;
-      cross = assert crossSystem != null; crossSystem;
-    });
-
-  gcc_realCross = gcc48_realCross;
-
-  gccCrossStageStatic = let
-      libcCross1 =
-        if stdenv.cross.libc == "msvcrt" then windows.mingw_w64_headers
-        else if stdenv.cross.libc == "libSystem" then darwin.xcode
-        else null;
-    in
-      wrapGCCCross {
-      gcc = forceNativeDrv (lib.addMetaAttrs { hydraPlatforms = []; } (
-        gcc_realCross.override {
-          crossStageStatic = true;
-          langCC = false;
-          libcCross = libcCross1;
-          enableShared = false;
-        }));
-      libc = libcCross1;
-      binutils = binutilsCross;
-      cross = assert crossSystem != null; crossSystem;
-  };
-
-  # Only needed for mingw builds
-  gccCrossMingw2 = wrapGCCCross {
-    gcc = gccCrossStageStatic.gcc;
-    libc = windows.mingw_headers2;
-    binutils = binutilsCross;
-    cross = assert crossSystem != null; crossSystem;
-  };
-
-  gccCrossStageFinal = wrapGCCCross {
-    gcc = forceNativeDrv (gcc_realCross.override {
-      libpthreadCross =
-        # FIXME: Don't explicitly refer to `i586-pc-gnu'.
-        if crossSystem != null && crossSystem.config == "i586-pc-gnu"
-        then gnu.libpthreadCross
-        else null;
-
-      # XXX: We have troubles cross-compiling libstdc++ on MinGW (see
-      # <http://hydra.nixos.org/build/4268232>), so don't even try.
-      langCC = (crossSystem == null
-                || crossSystem.config != "i686-pc-mingw32");
-     });
-    libc = libcCross;
-    binutils = binutilsCross;
-    cross = assert crossSystem != null; crossSystem;
-  };
-
-  gcc44 = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc/4.4) {
-    inherit fetchurl stdenv gmp mpfr /* ppl cloogppl */
-      gettext which noSysDirs;
-    texinfo = texinfo4;
-    profiledCompiler = true;
-  }));
-
-  gcc45 = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.5 {
-    inherit fetchurl stdenv gmp mpfr mpc libelf zlib perl
-      gettext which noSysDirs;
-    texinfo = texinfo4;
-
-    ppl = null;
-    cloogppl = null;
-
-    # bootstrapping a profiled compiler does not work in the sheevaplug:
-    # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944
-    profiledCompiler = !stdenv.isArm;
-
-    # When building `gcc.crossDrv' (a "Canadian cross", with host == target
-    # and host != build), `cross' must be null but the cross-libc must still
-    # be passed.
-    cross = null;
-    libcCross = if crossSystem != null then libcCross else null;
-    libpthreadCross =
-      if crossSystem != null && crossSystem.config == "i586-pc-gnu"
-      then gnu.libpthreadCross
-      else null;
-  }));
-
-  gcc46 = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.6 {
-    inherit noSysDirs;
-
-    ppl = null;
-    cloog = null;
-
-    # bootstrapping a profiled compiler does not work in the sheevaplug:
-    # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944
-    profiledCompiler = false;
-
-    # When building `gcc.crossDrv' (a "Canadian cross", with host == target
-    # and host != build), `cross' must be null but the cross-libc must still
-    # be passed.
-    cross = null;
-    libcCross = if crossSystem != null then libcCross else null;
-    libpthreadCross =
-      if crossSystem != null && crossSystem.config == "i586-pc-gnu"
-      then gnu.libpthreadCross
-      else null;
-    texinfo = texinfo413;
-  }));
-
-  gcc48 = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.8 {
-    inherit noSysDirs;
-
-    # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion
-    profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64));
-
-    # When building `gcc.crossDrv' (a "Canadian cross", with host == target
-    # and host != build), `cross' must be null but the cross-libc must still
-    # be passed.
-    cross = null;
-    libcCross = if crossSystem != null then libcCross else null;
-    libpthreadCross =
-      if crossSystem != null && crossSystem.config == "i586-pc-gnu"
-      then gnu.libpthreadCross
-      else null;
-  }));
-
-  gcc48_multi =
-    if system == "x86_64-linux" then lowPrio (
-      wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi (gcc48.gcc.override {
-        stdenv = overrideGCC stdenv (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi gcc.gcc);
-        profiledCompiler = false;
-        enableMultilib = true;
-      }))
-    else throw "Multilib gcc not supported on ‘${system}’";
-
-  gcc48_debug = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.8 {
-    stripped = false;
-
-    inherit noSysDirs;
-    cross = null;
-    libcCross = null;
-    binutilsCross = null;
-  }));
-
-  gcc49 = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.9 {
-    inherit noSysDirs;
-
-    # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion
-    profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64));
-
-    # When building `gcc.crossDrv' (a "Canadian cross", with host == target
-    # and host != build), `cross' must be null but the cross-libc must still
-    # be passed.
-    cross = null;
-    libcCross = if crossSystem != null then libcCross else null;
-    libpthreadCross =
-      if crossSystem != null && crossSystem.config == "i586-pc-gnu"
-      then gnu.libpthreadCross
-      else null;
-  }));
-
-  gccApple =
-    assert stdenv.isDarwin;
-    wrapGCC (makeOverridable (import ../development/compilers/gcc/4.2-apple64) {
-      inherit fetchurl noSysDirs;
-      profiledCompiler = true;
-      # Since it fails to build with GCC 4.6, build it with the "native"
-      # Apple-GCC.
-      stdenv = allStdenvs.stdenvNative;
-    });
-
-  gfortran = gfortran48;
-
-  gfortran48 = wrapGCC (gcc48.gcc.override {
-    name = "gfortran";
-    langFortran = true;
-    langCC = false;
-    langC = false;
-    profiledCompiler = false;
-  });
-
-  gcj = gcj48;
-
-  gcj48 = wrapGCC (gcc48.gcc.override {
-    name = "gcj";
-    langJava = true;
-    langFortran = false;
-    langCC = false;
-    langC = false;
-    profiledCompiler = false;
-    inherit zip unzip zlib boehmgc gettext pkgconfig perl;
-    inherit gtk;
-    inherit (gnome) libart_lgpl;
-    inherit (xlibs) libX11 libXt libSM libICE libXtst libXi libXrender
-      libXrandr xproto renderproto xextproto inputproto randrproto;
-  });
-
-  gnat = gnat45;
-
-  gnat45 = wrapGCC (gcc45.gcc.override {
-    name = "gnat";
-    langCC = false;
-    langC = true;
-    langAda = true;
-    profiledCompiler = false;
-    inherit gnatboot;
-    # We can't use the ppl stuff, because we would have
-    # libstdc++ problems.
-    cloogppl = null;
-    ppl = null;
-  });
-
-  gnat46 = wrapGCC (gcc46.gcc.override {
-    name = "gnat";
-    langCC = false;
-    langC = true;
-    langAda = true;
-    profiledCompiler = false;
-    gnatboot = gnat45;
-    # We can't use the ppl stuff, because we would have
-    # libstdc++ problems.
-    ppl = null;
-    cloog = null;
-  });
-
-  gnatboot = wrapGCC (import ../development/compilers/gnatboot {
-    inherit fetchurl stdenv;
-  });
-
-  gccgo = gccgo48;
-
-  gccgo48 = wrapGCC (gcc48.gcc.override {
-    name = "gccgo";
-    langCC = true; #required for go.
-    langC = true;
-    langGo = true;
-  });
-
-  ghdl = wrapGCC (import ../development/compilers/gcc/4.3 {
-    inherit stdenv fetchurl gmp mpfr noSysDirs gnat;
-    texinfo = texinfo4;
-    name = "ghdl";
-    langVhdl = true;
-    langCC = false;
-    langC = false;
-    profiledCompiler = false;
-    enableMultilib = false;
-  });
-
-  ghdl_mcode = callPackage ../development/compilers/ghdl { };
-
-  gcl = builderDefsPackage ../development/compilers/gcl {
-    inherit mpfr m4 binutils fetchcvs emacs zlib which
-      texinfo;
-    gmp = gmp4;
-    inherit (xlibs) libX11 xproto inputproto libXi
-      libXext xextproto libXt libXaw libXmu;
-    inherit stdenv;
-    texLive = texLiveAggregationFun {
-      paths = [
-        texLive texLiveExtra
-      ];
-    };
-  };
-
-  jhc = callPackage ../development/compilers/jhc {
-    inherit (haskellPackages_ghc763) ghc binary zlib utf8String readline fgl
-      regexCompat HsSyck random;
-  };
-
-  gcc-arm-embedded-4_7 = callPackage_i686 ../development/compilers/gcc-arm-embedded {
-    version = "4.7-2013q3-20130916";
-    releaseType = "update";
-    sha256 = "1bd9bi9q80xn2rpy0rn1vvj70rh15kb7dmah0qs4q2rv78fqj40d";
-  };
-  gcc-arm-embedded-4_8 = callPackage_i686 ../development/compilers/gcc-arm-embedded {
-    version = "4.8-2014q1-20140314";
-    releaseType = "update";
-    sha256 = "ce92859550819d4a3d1a6e2672ea64882b30afa2c08cf67fa8e1d93788c2c577";
-  };
-  gcc-arm-embedded = gcc-arm-embedded-4_8;
-
-  # Haskell and GHC
-
-  # Import Haskell infrastructure.
-
-  haskell = let pkgs_       = pkgs // { gmp = gmp.override { withStatic = true; }; };
-                callPackage = newScope pkgs_;
-                newScope    = extra: lib.callPackageWith (pkgs_ // pkgs_.xorg // extra);
-            in callPackage ./haskell-defaults.nix { pkgs = pkgs_; inherit callPackage newScope; };
-
-  # Available GHC versions.
-
-  # For several compiler versions, we export a large set of Haskell-related
-  # packages.
-
-  # NOTE (recurseIntoAttrs): After discussion, we originally decided to
-  # enable it for all GHC versions. However, this is getting too much,
-  # particularly in connection with Hydra builds for all these packages.
-  # So we enable it for selected versions only. We build all ghcs, though
-
-  ghc = recurseIntoAttrs (lib.mapAttrs' (name: value:
-    lib.nameValuePair (builtins.substring (builtins.stringLength "packages_") (builtins.stringLength name) name) value.ghc
-  ) (lib.filterAttrs (name: value:
-    builtins.substring 0 (builtins.stringLength "packages_") name == "packages_"
-  ) haskell));
-
-  haskellPackages = haskellPackages_ghc783;
-  haskellPlatform = haskellPlatformPackages."2013_2_0_0";
-
-  haskellPackages_ghc6104 = haskell.packages_ghc6104;
-  haskellPackages_ghc6123 = haskell.packages_ghc6123;
-  haskellPackages_ghc704  = haskell.packages_ghc704;
-  haskellPackages_ghc722  = haskell.packages_ghc722;
-  haskellPackages_ghc742  = haskell.packages_ghc742;
-  haskellPackages_ghc763  = haskell.packages_ghc763;
-  haskellPackages_ghc783_no_profiling = recurseIntoAttrs haskell.packages_ghc783.noProfiling;
-  haskellPackages_ghc783_profiling    = recurseIntoAttrs haskell.packages_ghc783.profiling;
-  haskellPackages_ghc783              = recurseIntoAttrs haskell.packages_ghc783.highPrio;
-  haskellPackages_ghcHEAD = haskell.packages_ghcHEAD;
-
-  haskellPlatformPackages = recurseIntoAttrs (import ../development/libraries/haskell/haskell-platform { inherit pkgs; });
-
-  haxe = callPackage ../development/compilers/haxe { };
-
-  hhvm = callPackage ../development/compilers/hhvm { };
-  hiphopvm = hhvm; /* Compatibility alias */
-
-  falcon = builderDefsPackage (import ../development/interpreters/falcon) {
-    inherit cmake;
-  };
-
-  fsharp = callPackage ../development/compilers/fsharp {};
-
-  go_1_0 = callPackage ../development/compilers/go { };
-
-  go_1_1 =
-    if stdenv.isDarwin then
-      callPackage ../development/compilers/go/1.1-darwin.nix { }
-    else
-      callPackage ../development/compilers/go/1.1.nix { };
-
-  go_1_2 = callPackage ../development/compilers/go/1.2.nix { };
-
-  go_1_3 = callPackage ../development/compilers/go/1.3.nix { };
-
-  go = go_1_3;
-
-  gox = callPackage ../development/compilers/go/gox.nix { };
-
-  gprolog = callPackage ../development/compilers/gprolog { };
-
-  gwt240 = callPackage ../development/compilers/gwt/2.4.0.nix { };
-
-  icedtea7_jdk = callPackage ../development/compilers/icedtea rec {
-    jdk = openjdk;
-    jdkPath = "${openjdk}/lib/openjdk";
-  } // { outputs = [ "out" ]; };
-
-  icedtea7_jre = (lib.setName "icedtea7-${lib.getVersion pkgs.icedtea7_jdk.jre}" (lib.addMetaAttrs
-    { description = "Free Java runtime environment based on OpenJDK 7.0 and the IcedTea project"; }
-    pkgs.icedtea7_jdk.jre)) // { outputs = [ "jre" ]; };
-
-  icedtea7_web = callPackage ../development/compilers/icedtea-web {
-    jdk = "${icedtea7_jdk}/lib/icedtea";
-  };
-
-  ikarus = callPackage ../development/compilers/ikarus { };
-
-  hugs = callPackage ../development/compilers/hugs { };
-
-  path64 = callPackage ../development/compilers/path64 { };
-
-  openjdk =
-    if stdenv.isDarwin then
-      callPackage ../development/compilers/openjdk-darwin { }
-    else
-      let
-        openjdkBootstrap = callPackage ../development/compilers/openjdk/bootstrap.nix { };
-      in (callPackage ../development/compilers/openjdk {
-        jdk = openjdkBootstrap;
-      }) // { outputs = [ "out" ]; };
-
-  # FIXME: Need a way to set per-output meta attributes.
-  openjre = (lib.setName "openjre-${lib.getVersion pkgs.openjdk.jre}" (lib.addMetaAttrs
-    { description = "The open-source Java Runtime Environment"; }
-    pkgs.openjdk.jre)) // { outputs = [ "jre" ]; };
-
-  jdk = if stdenv.isDarwin || stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"
-    then pkgs.openjdk
-    else pkgs.oraclejdk;
-  jre = if stdenv.isDarwin || stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"
-    then pkgs.openjre
-    else pkgs.oraclejre;
-
-  oraclejdk = pkgs.jdkdistro true false;
-
-  oraclejdk7 = pkgs.oraclejdk7distro true false;
-
-  oraclejdk8 = pkgs.oraclejdk8distro true false;
-
-  oraclejre = lowPrio (pkgs.jdkdistro false false);
-
-  oraclejre7 = lowPrio (pkgs.oraclejdk7distro false false);
-
-  oraclejre8 = lowPrio (pkgs.oraclejdk8distro false false);
-
-  jrePlugin = lowPrio (pkgs.jdkdistro false true);
-
-  supportsJDK =
-    system == "i686-linux" ||
-    system == "x86_64-linux";
-
-  jdkdistro = installjdk: pluginSupport:
-    assert supportsJDK;
-    (if pluginSupport then appendToName "with-plugin" else x: x)
-      (callPackage ../development/compilers/oraclejdk/jdk6-linux.nix { });
-
-  oraclejdk7distro = installjdk: pluginSupport:
-    assert supportsJDK;
-    (if pluginSupport then appendToName "with-plugin" else x: x)
-      (callPackage ../development/compilers/oraclejdk/jdk7-linux.nix { inherit installjdk; });
-
-  oraclejdk8distro = installjdk: pluginSupport:
-    assert supportsJDK;
-    (if pluginSupport then appendToName "with-plugin" else x: x)
-      (callPackage ../development/compilers/oraclejdk/jdk8-linux.nix { inherit installjdk; });
-
-  jikes = callPackage ../development/compilers/jikes { };
-
-  juliaGit = callPackage ../development/compilers/julia/git-20131013.nix {
-    liblapack = liblapack.override {shared = true;};
-    llvm = llvm_33;
-    openblas = openblas_0_2_2;
-  };
-  julia021 = callPackage ../development/compilers/julia/0.2.1.nix {
-    liblapack = liblapack.override {shared = true;};
-    llvm = llvm_33;
-    openblas = openblas_0_2_2;
-  };
-  julia030 = let
-    liblapack = liblapack_3_5_0.override {shared = true;};
-  in callPackage ../development/compilers/julia/0.3.0.nix {
-    inherit liblapack;
-    suitesparse = suitesparse.override {
-      inherit liblapack;
-    };
-    llvm = llvm_34;
-    openblas = openblas_0_2_10;
-  };
-  julia = julia030;
-
-  lazarus = builderDefsPackage (import ../development/compilers/fpc/lazarus.nix) {
-    inherit makeWrapper gtk glib pango atk gdk_pixbuf;
-    inherit (xlibs) libXi inputproto libX11 xproto libXext xextproto;
-    fpc = fpc;
-  };
-
-  lessc = callPackage ../development/compilers/lessc { };
-
-  llvm = llvmPackages.llvm;
-
-  llvm_34 = llvmPackages_34.llvm;
-  llvm_33 = llvm_v ../development/compilers/llvm/3.3/llvm.nix;
-
-  llvm_v = path: callPackage path {
-    stdenv = if stdenv.isDarwin then stdenvApple else stdenv;
-  };
-
-  llvmPackages = if !stdenv.isDarwin then llvmPackages_34 else llvmPackages_34 // {
-    # until someone solves build problems with _34
-    llvm = llvm_33;
-    clang = clang_33;
-  };
-
-  llvmPackages_34 = recurseIntoAttrs (import ../development/compilers/llvm/3.4 {
-    inherit stdenv newScope fetchurl;
-    isl = isl_0_12;
-  });
-  llvmPackagesSelf = import ../development/compilers/llvm/3.4 { inherit newScope fetchurl; isl = isl_0_12; stdenv = libcxxStdenv; };
-
-  manticore = callPackage ../development/compilers/manticore { };
-
-  mentorToolchains = recurseIntoAttrs (
-    callPackage_i686 ../development/compilers/mentor {}
-  );
-
-  mercury = callPackage ../development/compilers/mercury { };
-
-  mitscheme = callPackage ../development/compilers/mit-scheme { };
-
-  mlton = callPackage ../development/compilers/mlton { };
-
-  mono = callPackage ../development/compilers/mono {
-    inherit (xlibs) libX11;
-  };
-
-  monoDLLFixer = callPackage ../build-support/mono-dll-fixer { };
-
-  mozart = callPackage ../development/compilers/mozart { };
-
-  neko = callPackage ../development/compilers/neko { };
-
-  nasm = callPackage ../development/compilers/nasm { };
-
-  nvidia_cg_toolkit = callPackage ../development/compilers/nvidia-cg-toolkit { };
-
-  ocaml = ocamlPackages.ocaml;
-
-  ocaml_3_08_0 = callPackage ../development/compilers/ocaml/3.08.0.nix { };
-
-  ocaml_3_10_0 = callPackage ../development/compilers/ocaml/3.10.0.nix { };
-
-  ocaml_3_11_2 = callPackage ../development/compilers/ocaml/3.11.2.nix { };
-
-  ocaml_3_12_1 = callPackage ../development/compilers/ocaml/3.12.1.nix { };
-
-  ocaml_4_00_1 = callPackage ../development/compilers/ocaml/4.00.1.nix { };
-
-  ocaml_4_01_0 = callPackage ../development/compilers/ocaml/4.01.0.nix { };
-
-  orc = callPackage ../development/compilers/orc { };
-
-  metaocaml_3_09 = callPackage ../development/compilers/ocaml/metaocaml-3.09.nix { };
-
-  ber_metaocaml_003 = callPackage ../development/compilers/ocaml/ber-metaocaml-003.nix { };
-
-  mkOcamlPackages = ocaml: self: let callPackage = newScope self; in rec {
-    inherit ocaml;
-
-    camlidl = callPackage ../development/tools/ocaml/camlidl { };
-
-    camlp5_5_strict = callPackage ../development/tools/ocaml/camlp5/5.15.nix { };
-
-    camlp5_5_transitional = callPackage ../development/tools/ocaml/camlp5/5.15.nix {
-      transitional = true;
-    };
-
-    camlp5_6_strict = callPackage ../development/tools/ocaml/camlp5 { };
-
-    camlp5_6_transitional = callPackage ../development/tools/ocaml/camlp5 {
-      transitional = true;
-    };
-
-    camlp5_strict = camlp5_6_strict;
-
-    camlp5_transitional = camlp5_6_transitional;
-
-    camlzip = callPackage ../development/ocaml-modules/camlzip { };
-
-    camomile_0_8_2 = callPackage ../development/ocaml-modules/camomile/0.8.2.nix { };
-    camomile = callPackage ../development/ocaml-modules/camomile { };
-
-    camlimages = callPackage ../development/ocaml-modules/camlimages {
-      libpng = libpng12;
-      giflib = giflib_4_1;
-    };
-
-    biniou = callPackage ../development/ocaml-modules/biniou { };
-
-    ocaml_cairo = callPackage ../development/ocaml-modules/ocaml-cairo { };
-
-    cmdliner = callPackage ../development/ocaml-modules/cmdliner { };
-
-    cppo = callPackage ../development/tools/ocaml/cppo { };
-
-    cryptokit = callPackage ../development/ocaml-modules/cryptokit { };
-
-    csv = callPackage ../development/ocaml-modules/csv { };
-
-    deriving = callPackage ../development/tools/ocaml/deriving { };
-
-    easy-format = callPackage ../development/ocaml-modules/easy-format { };
-
-    findlib = callPackage ../development/tools/ocaml/findlib { };
-
-    javalib = callPackage ../development/ocaml-modules/javalib {
-      extlib = ocaml_extlib_maximal;
-    };
-
-    dypgen = callPackage ../development/ocaml-modules/dypgen { };
-
-    patoline = callPackage ../tools/typesetting/patoline { };
-
-    gmetadom = callPackage ../development/ocaml-modules/gmetadom { };
-
-    lablgl = callPackage ../development/ocaml-modules/lablgl { };
-
-    lablgtk = callPackage ../development/ocaml-modules/lablgtk {
-      inherit (gnome) libgnomecanvas libglade gtksourceview;
-    };
-
-    lablgtkmathview = callPackage ../development/ocaml-modules/lablgtkmathview {
-      gtkmathview = callPackage ../development/libraries/gtkmathview { };
-    };
-
-    lambdaTerm = callPackage ../development/ocaml-modules/lambda-term { };
-
-    menhir = callPackage ../development/ocaml-modules/menhir { };
-
-    merlin = callPackage ../development/tools/ocaml/merlin { };
-
-    mldonkey = callPackage ../applications/networking/p2p/mldonkey { };
-
-    mlgmp =  callPackage ../development/ocaml-modules/mlgmp { };
-
-    ocaml_batteries = callPackage ../development/ocaml-modules/batteries { };
-
-    ocaml_cryptgps = callPackage ../development/ocaml-modules/cryptgps { };
-
-    ocaml_data_notation = callPackage ../development/ocaml-modules/odn { };
-
-    ocaml_expat = callPackage ../development/ocaml-modules/expat { };
-
-    ocamlgraph = callPackage ../development/ocaml-modules/ocamlgraph { };
-
-    ocaml_http = callPackage ../development/ocaml-modules/http { };
-
-    ocamlify = callPackage ../development/tools/ocaml/ocamlify { };
-
-    ocaml_lwt = callPackage ../development/ocaml-modules/lwt { };
-
-    ocamlmod = callPackage ../development/tools/ocaml/ocamlmod { };
-
-    ocaml_mysql = callPackage ../development/ocaml-modules/mysql { };
-
-    ocamlnet = callPackage ../development/ocaml-modules/ocamlnet { };
-
-    ocaml_oasis = callPackage ../development/tools/ocaml/oasis { };
-
-    ocaml_pcre = callPackage ../development/ocaml-modules/pcre {
-      inherit pcre;
-    };
-
-    ocaml_react = callPackage ../development/ocaml-modules/react { };
-
-    ocamlsdl= callPackage ../development/ocaml-modules/ocamlsdl { };
-
-    ocaml_sqlite3 = callPackage ../development/ocaml-modules/sqlite3 { };
-
-    ocaml_ssl = callPackage ../development/ocaml-modules/ssl { };
-
-    ocaml_text = callPackage ../development/ocaml-modules/ocaml-text { };
-
-    ounit = callPackage ../development/ocaml-modules/ounit { };
-
-    ulex = callPackage ../development/ocaml-modules/ulex { };
-
-    ulex08 = callPackage ../development/ocaml-modules/ulex/0.8 {
-      camlp5 = camlp5_transitional;
-    };
-
-    ocaml_typeconv = callPackage ../development/ocaml-modules/typeconv { };
-
-    ocaml_typeconv_3_0_5 = callPackage ../development/ocaml-modules/typeconv/3.0.5.nix { };
-
-    ocaml_sexplib = callPackage ../development/ocaml-modules/sexplib { };
-
-    ocaml_extlib = callPackage ../development/ocaml-modules/extlib { };
-    ocaml_extlib_maximal = callPackage ../development/ocaml-modules/extlib {
-      minimal = false;
-    };
-
-    pycaml = callPackage ../development/ocaml-modules/pycaml { };
-
-    opam_1_0_0 = callPackage ../development/tools/ocaml/opam/1.0.0.nix { };
-    opam_1_1 = callPackage ../development/tools/ocaml/opam/1.1.nix { };
-    opam = opam_1_1;
-
-    utop = callPackage ../development/tools/ocaml/utop { };
-
-    sawja = callPackage ../development/ocaml-modules/sawja { };
-
-    uucd = callPackage ../development/ocaml-modules/uucd { };
-    uunf = callPackage ../development/ocaml-modules/uunf { };
-    uutf = callPackage ../development/ocaml-modules/uutf { };
-    xmlm = callPackage ../development/ocaml-modules/xmlm { };
-
-    yojson = callPackage ../development/ocaml-modules/yojson { };
-
-    zarith = callPackage ../development/ocaml-modules/zarith { };
-
-    zed = callPackage ../development/ocaml-modules/zed { };
-
-  };
-
-  ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0;
-  ocamlPackages_3_10_0 = mkOcamlPackages ocaml_3_10_0 pkgs.ocamlPackages_3_10_0;
-  ocamlPackages_3_11_2 = mkOcamlPackages ocaml_3_11_2 pkgs.ocamlPackages_3_11_2;
-  ocamlPackages_3_12_1 = mkOcamlPackages ocaml_3_12_1 pkgs.ocamlPackages_3_12_1;
-  ocamlPackages_4_00_1 = mkOcamlPackages ocaml_4_00_1 pkgs.ocamlPackages_4_00_1;
-  ocamlPackages_4_01_0 = mkOcamlPackages ocaml_4_01_0 pkgs.ocamlPackages_4_01_0;
-  ocamlPackages_latest = ocamlPackages_4_01_0;
-
-  ocaml_make = callPackage ../development/ocaml-modules/ocamlmake { };
-
-  opa = let callPackage = newScope pkgs.ocamlPackages_4_00_1; in callPackage ../development/compilers/opa { };
-
-  ocamlnat = let callPackage = newScope pkgs.ocamlPackages_3_12_1; in callPackage ../development/ocaml-modules/ocamlnat { };
-
-  qcmm = callPackage ../development/compilers/qcmm {
-    lua   = lua4;
-    ocaml = ocaml_3_08_0;
-  };
-
-  roadsend = callPackage ../development/compilers/roadsend { };
-
-  rustc       = callPackage ../development/compilers/rustc/0.11.nix {};
-  rustcMaster = callPackage ../development/compilers/rustc/head.nix {};
-
-  rust = rustc;
-
-
-  sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {};
-  sbcl = callPackage ../development/compilers/sbcl {
-    clisp = clisp;
-  };
-
-  scala_2_9 = callPackage ../development/compilers/scala/2.9.nix { };
-  scala_2_10 = callPackage ../development/compilers/scala/2.10.nix { };
-  scala_2_11 = callPackage ../development/compilers/scala { };
-  scala = scala_2_11;
-
-  sdcc = callPackage ../development/compilers/sdcc { };
-
-  smlnjBootstrap = callPackage ../development/compilers/smlnj/bootstrap.nix { };
-  smlnj = callPackage_i686 ../development/compilers/smlnj { };
-
-  stalin = callPackage ../development/compilers/stalin { };
-
-  strategoPackages = recurseIntoAttrs strategoPackages018;
-
-  strategoPackages016 = callPackage ../development/compilers/strategoxt/0.16.nix {
-    stdenv = overrideInStdenv stdenv [gnumake380];
-  };
-
-  strategoPackages017 = callPackage ../development/compilers/strategoxt/0.17.nix {
-    readline = readline5;
-  };
-
-  strategoPackages018 = callPackage ../development/compilers/strategoxt/0.18.nix {
-    readline = readline5;
-  };
-
-  metaBuildEnv = callPackage ../development/compilers/meta-environment/meta-build-env { };
-
-  swiProlog = callPackage ../development/compilers/swi-prolog { };
-
-  tbb = callPackage ../development/libraries/tbb { };
-
-  tinycc = callPackage ../development/compilers/tinycc { };
-
-  urweb = callPackage ../development/compilers/urweb { };
-
-  vala = callPackage ../development/compilers/vala/default.nix { };
-
-  visualcpp = callPackage ../development/compilers/visual-c++ { };
-
-  vs90wrapper = callPackage ../development/compilers/vs90wrapper { };
-
-  webdsl = callPackage ../development/compilers/webdsl { };
-
-  win32hello = callPackage ../development/compilers/visual-c++/test { };
-
-  wrapGCCWith = gccWrapper: glibc: baseGCC: gccWrapper {
-    nativeTools = stdenv ? gcc && stdenv.gcc.nativeTools;
-    nativeLibc = stdenv ? gcc && stdenv.gcc.nativeLibc;
-    nativePrefix = if stdenv ? gcc then stdenv.gcc.nativePrefix else "";
-    gcc = baseGCC;
-    libc = glibc;
-    shell = bash;
-    inherit stdenv binutils coreutils zlib;
-  };
-
-  wrapClangWith = clangWrapper: glibc: baseClang: clangWrapper {
-    nativeTools = stdenv.gcc.nativeTools or false;
-    nativeLibc = stdenv.gcc.nativeLibc or false;
-    nativePrefix = stdenv.gcc.nativePrefix or "";
-    clang = baseClang;
-    libc = glibc;
-    shell = bash;
-    binutils = stdenv.gcc.binutils;
-    inherit stdenv coreutils zlib;
-  };
-
-  wrapClang = wrapClangWith (makeOverridable (import ../build-support/clang-wrapper)) glibc;
-
-  wrapGCC = wrapGCCWith (makeOverridable (import ../build-support/gcc-wrapper)) glibc;
-
-  wrapGCCCross =
-    {gcc, libc, binutils, cross, shell ? "", name ? "gcc-cross-wrapper"}:
-
-    forceNativeDrv (import ../build-support/gcc-cross-wrapper {
-      nativeTools = false;
-      nativeLibc = false;
-      noLibc = (libc == null);
-      inherit stdenv gcc binutils libc shell name cross;
-    });
-
-  # prolog
-  yap = callPackage ../development/compilers/yap { };
-
-  yasm = callPackage ../development/compilers/yasm { };
-
-
-  ### DEVELOPMENT / INTERPRETERS
-
-  acl2 = builderDefsPackage ../development/interpreters/acl2 {
-    inherit sbcl;
-  };
-
-  angelscript = callPackage ../development/interpreters/angelscript {};
-
-  clisp = callPackage ../development/interpreters/clisp { };
-
-  # compatibility issues in 2.47 - at list 2.44.1 is known good
-  # for sbcl bootstrap
-  clisp_2_44_1 = callPackage ../development/interpreters/clisp/2.44.1.nix {
-    libsigsegv = libsigsegv_25;
-  };
-
-  clojure = callPackage ../development/interpreters/clojure { };
-
-  clooj = callPackage ../development/interpreters/clojure/clooj.nix { };
-
-  erlangR14 = callPackage ../development/interpreters/erlang/R14.nix { };
-  erlangR15 = callPackage ../development/interpreters/erlang/R15.nix { };
-  erlangR16 = callPackage ../development/interpreters/erlang/R16.nix { };
-  erlangR16_odbc = callPackage ../development/interpreters/erlang/R16.nix { odbcSupport = true; };
-  erlangR17 = callPackage ../development/interpreters/erlang/R17.nix { };
-  erlangR17_odbc = callPackage ../development/interpreters/erlang/R17.nix { odbcSupport = true; };
-  erlang = erlangR17;
-  erlang_odbc = erlangR17_odbc;
-
-  rebar = callPackage ../development/tools/build-managers/rebar { };
-
-  elixir = callPackage ../development/interpreters/elixir { };
-
-  groovy = callPackage ../development/interpreters/groovy { };
-
-  guile_1_8 = callPackage ../development/interpreters/guile/1.8.nix { };
-
-  guile_2_0 = callPackage ../development/interpreters/guile { };
-
-  guile = guile_2_0;
-
-  hadoop = callPackage ../applications/networking/cluster/hadoop { };
-
-  io = callPackage ../development/interpreters/io { };
-
-  j = callPackage ../development/interpreters/j {};
-
-  jmeter = callPackage ../applications/networking/jmeter {};
-
-  davmail = callPackage ../applications/networking/davmail {};
-
-  lxappearance = callPackage ../applications/misc/lxappearance {};
-
-  kona = callPackage ../development/interpreters/kona {};
-
-  love = callPackage ../development/interpreters/love {lua=lua5;};
-  love_luajit = callPackage ../development/interpreters/love {lua=luajit;};
-  love_0_9 = callPackage ../development/interpreters/love/0.9.nix { };
-
-  lua4 = callPackage ../development/interpreters/lua-4 { };
-  lua5_0 = callPackage ../development/interpreters/lua-5/5.0.3.nix { };
-  lua5_1 = callPackage ../development/interpreters/lua-5/5.1.nix { };
-  lua5_2 = callPackage ../development/interpreters/lua-5/5.2.nix { };
-  lua5_2_compat = callPackage ../development/interpreters/lua-5/5.2.nix {
-    compat = true;
-  };
-  lua5 = lua5_1;
-  lua = lua5;
-
-  lua5_sockets = callPackage ../development/interpreters/lua-5/sockets.nix {};
-  lua5_expat = callPackage ../development/interpreters/lua-5/expat.nix {};
-  lua5_filesystem = callPackage ../development/interpreters/lua-5/filesystem.nix {};
-  lua5_sec = callPackage ../development/interpreters/lua-5/sec.nix {};
-
-  luarocks = callPackage ../development/tools/misc/luarocks {
-     lua = lua5;
-  };
-
-  luajit = callPackage ../development/interpreters/luajit {};
-
-  lush2 = callPackage ../development/interpreters/lush {};
-
-  maude = callPackage ../development/interpreters/maude {
-    bison = bison2;
-    flex = flex_2_5_35;
-  };
-
-  mesos = callPackage ../applications/networking/cluster/mesos {
-    sasl = cyrus_sasl;
-    automake = automake114x;
-    inherit (pythonPackages) python boto setuptools distutils-cfg wrapPython;
-    pythonProtobuf = pythonPackages.protobuf;
-  };
-
-  octave = callPackage ../development/interpreters/octave {
-    fltk = fltk13;
-    qt = null;
-    ghostscript = null;
-    llvm = null;
-    hdf5 = null;
-    glpk = null;
-    suitesparse = null;
-    openjdk = null;
-    gnuplot = null;
-    readline = readline63;
-  };
-  octaveFull = (lowPrio (callPackage ../development/interpreters/octave {
-    fltk = fltk13;
-    qt = qt4;
-  }));
-
-  # mercurial (hg) bleeding edge version
-  octaveHG = callPackage ../development/interpreters/octave/hg.nix { };
-
-  ocropus = callPackage ../applications/misc/ocropus { };
-
-  perl514 = callPackage ../development/interpreters/perl/5.14 { };
-
-  perl516 = callPackage ../development/interpreters/perl/5.16 {
-    fetchurl = fetchurlBoot;
-  };
-
-  perl520 = callPackage ../development/interpreters/perl/5.20 { };
-
-  perl = if system != "i686-cygwin" then perl516 else sysPerl;
-
-  php = php54;
-
-  phpPackages = recurseIntoAttrs (import ./php-packages.nix {
-    inherit php pkgs;
-  });
-
-  php53 = callPackage ../development/interpreters/php/5.3.nix { };
-
-  php_fpm53 = callPackage ../development/interpreters/php/5.3.nix {
-    config = config // {
-      php = (config.php or {}) // {
-        fpm = true;
-        apxs2 = false;
-      };
-    };
-  };
-
-  php54 = callPackage ../development/interpreters/php/5.4.nix { };
-
-  picolisp = callPackage ../development/interpreters/picolisp {};
-
-  pltScheme = racket; # just to be sure
-
-  polyml = callPackage ../development/compilers/polyml { };
-
-  pure = callPackage ../development/interpreters/pure {
-    llvm = llvm_33 ;
-  };
-
-  python = python2;
-  python2 = python27;
-  python3 = python34;
-
-  # pythonPackages further below, but assigned here because they need to be in sync
-  pythonPackages = python2Packages;
-  python2Packages = python27Packages;
-  python3Packages = python34Packages;
-
-  pythonFull = python2Full;
-  python2Full = python27Full;
-
-  python26 = callPackage ../development/interpreters/python/2.6 { db = db47; };
-  python27 = callPackage ../development/interpreters/python/2.7 { };
-  python32 = callPackage ../development/interpreters/python/3.2 { };
-  python33 = callPackage ../development/interpreters/python/3.3 { };
-  python34 = hiPrio (callPackage ../development/interpreters/python/3.4 { });
-
-  pypy = callPackage ../development/interpreters/pypy/2.3 { };
-
-  python26Full = callPackage ../development/interpreters/python/wrapper.nix {
-    extraLibs = [];
-    postBuild = "";
-    python = python26;
-    inherit (python26Packages) recursivePthLoader;
-  };
-  python27Full = callPackage ../development/interpreters/python/wrapper.nix {
-    extraLibs = [];
-    postBuild = "";
-    python = python27;
-    inherit (python27Packages) recursivePthLoader;
-  };
-
-  pythonDocs = recurseIntoAttrs (import ../development/interpreters/python/docs {
-    inherit stdenv fetchurl lib;
-  });
-
-  pythonLinkmeWrapper = callPackage ../development/interpreters/python/python-linkme-wrapper.nix { };
-
-  pypi2nix = python27Packages.pypi2nix;
-
-  pyrex = pyrex095;
-
-  pyrex095 = callPackage ../development/interpreters/pyrex/0.9.5.nix { };
-
-  pyrex096 = callPackage ../development/interpreters/pyrex/0.9.6.nix { };
-
-  qi = callPackage ../development/compilers/qi { };
-
-  racket = callPackage ../development/interpreters/racket { };
-
-  rakudo = callPackage ../development/interpreters/rakudo { };
-
-  rascal = callPackage ../development/interpreters/rascal { };
-
-  regina = callPackage ../development/interpreters/regina { };
-
-  renpy = callPackage ../development/interpreters/renpy {
-    wrapPython = pythonPackages.wrapPython;
-  };
-
-  ruby18 = callPackage ../development/interpreters/ruby/ruby-18.nix { };
-  ruby19 = callPackage ../development/interpreters/ruby/ruby-19.nix { };
-  ruby2 = lowPrio (callPackage ../development/interpreters/ruby/ruby-2.0.nix { });
-  ruby21 = callPackage ../development/interpreters/ruby/ruby-2.1.2.nix { };
-
-  ruby = ruby19;
-
-  rubyLibs = recurseIntoAttrs (callPackage ../development/interpreters/ruby/libs.nix { });
-
-  rake = rubyLibs.rake;
-
-  rubySqlite3 = callPackage ../development/ruby-modules/sqlite3 { };
-
-  rubygemsFun = ruby: builderDefsPackage (import ../development/interpreters/ruby/rubygems.nix) {
-    inherit ruby makeWrapper;
-  };
-  rubygems = hiPrio (rubygemsFun ruby);
-
-  rq = callPackage ../applications/networking/cluster/rq { };
-
-  scsh = callPackage ../development/interpreters/scsh { };
-
-  scheme48 = callPackage ../development/interpreters/scheme48 { };
-
-  self = callPackage_i686 ../development/interpreters/self { };
-
-  spark = callPackage ../applications/networking/cluster/spark { };
-
-  spidermonkey = callPackage ../development/interpreters/spidermonkey { };
-  spidermonkey_1_8_0rc1 = callPackage ../development/interpreters/spidermonkey/1.8.0-rc1.nix { };
-  spidermonkey_185 = callPackage ../development/interpreters/spidermonkey/185-1.0.0.nix { };
-  spidermonkey_17 = callPackage ../development/interpreters/spidermonkey/17.0.nix { };
-  spidermonkey_24 = callPackage ../development/interpreters/spidermonkey/24.2.nix { };
-
-  supercollider = callPackage ../development/interpreters/supercollider {
-    qt = qt4;
-    fftw = fftwSinglePrec;
-  };
-
-  supercollider_scel = supercollider.override { useSCEL = true; };
-
-  sysPerl = callPackage ../development/interpreters/perl/sys-perl { };
-
-  tcl = callPackage ../development/interpreters/tcl { };
-
-  xulrunner = callPackage ../development/interpreters/xulrunner {
-    inherit (gnome) libIDL;
-    inherit (pythonPackages) pysqlite;
-  };
-
-  xulrunner_30 = firefox30Pkgs.xulrunner;
-
-
-  ### DEVELOPMENT / MISC
-
-  amdadlsdk = callPackage ../development/misc/amdadl-sdk { };
-
-  amdappsdk26 = callPackage ../development/misc/amdapp-sdk {
-    version = "2.6";
-  };
-
-  amdappsdk27 = callPackage ../development/misc/amdapp-sdk {
-    version = "2.7";
-  };
-
-  amdappsdk28 = callPackage ../development/misc/amdapp-sdk {
-    version = "2.8";
-  };
-
-  amdappsdk = amdappsdk28;
-
-  amdappsdkFull = callPackage ../development/misc/amdapp-sdk {
-    version = "2.8";
-    samples = true;
-  };
-
-  avrgcclibc = callPackage ../development/misc/avr-gcc-with-avr-libc {
-    gcc = gcc46;
-    stdenv = overrideGCC stdenv gcc46;
-  };
-
-  avr8burnomat = callPackage ../development/misc/avr8-burn-omat { };
-
-  sourceFromHead = import ../build-support/source-from-head-fun.nix {
-    inherit config;
-  };
-
-  ecj = callPackage ../development/eclipse/ecj { };
-
-  jdtsdk = callPackage ../development/eclipse/jdt-sdk { };
-
-  jruby165 = callPackage ../development/interpreters/jruby { };
-
-  guileCairo = callPackage ../development/guile-modules/guile-cairo { };
-
-  guileGnome = callPackage ../development/guile-modules/guile-gnome {
-    gconf = gnome.GConf;
-    inherit (gnome) gnome_vfs libglade libgnome libgnomecanvas libgnomeui;
-  };
-
-  guile_lib = callPackage ../development/guile-modules/guile-lib { };
-
-  guile_ncurses = callPackage ../development/guile-modules/guile-ncurses { };
-
-  guile-xcb = callPackage ../development/guile-modules/guile-xcb { };
-
-  pharo-vm = callPackage_i686 ../development/pharo/vm { };
-
-  srecord = callPackage ../development/tools/misc/srecord { };
-
-  windowssdk = (
-    import ../development/misc/windows-sdk {
-      inherit fetchurl stdenv cabextract;
-    });
-
-
-  ### DEVELOPMENT / TOOLS
-
-  ansible = callPackage ../tools/system/ansible { };
-
-  antlr = callPackage ../development/tools/parsing/antlr/2.7.7.nix { };
-
-  antlr3 = callPackage ../development/tools/parsing/antlr { };
-
-  ant = apacheAnt;
-
-  apacheAnt = callPackage ../development/tools/build-managers/apache-ant { };
-
-  astyle = callPackage ../development/tools/misc/astyle { };
-
-  autobuild = callPackage ../development/tools/misc/autobuild { };
-
-  autoconf = callPackage ../development/tools/misc/autoconf { };
-
-  autoconf213 = callPackage ../development/tools/misc/autoconf/2.13.nix { };
-
-  autocutsel = callPackage ../tools/X11/autocutsel{ };
-
-  automake = automake112x;
-
-  automake111x = callPackage ../development/tools/misc/automake/automake-1.11.x.nix { };
-
-  automake112x = callPackage ../development/tools/misc/automake/automake-1.12.x.nix { };
-
-  automake113x = callPackage ../development/tools/misc/automake/automake-1.13.x.nix { };
-
-  automake114x = callPackage ../development/tools/misc/automake/automake-1.14.x.nix { };
-
-  automoc4 = callPackage ../development/tools/misc/automoc4 { };
-
-  avrdude = callPackage ../development/tools/misc/avrdude { };
-
-  avarice = callPackage ../development/tools/misc/avarice { };
-
-  babeltrace = callPackage ../development/tools/misc/babeltrace { };
-
-  bam = callPackage ../development/tools/build-managers/bam {};
-
-  binutils = callPackage ../development/tools/misc/binutils {
-    inherit noSysDirs;
-  };
-
-  binutils_nogold = lowPrio (callPackage ../development/tools/misc/binutils {
-    inherit noSysDirs;
-    gold = false;
-  });
-
-  binutilsCross =
-    if crossSystem != null && crossSystem.libc == "libSystem" then darwin.cctools
-    else lowPrio (forceNativeDrv (import ../development/tools/misc/binutils {
-      inherit stdenv fetchurl zlib bison;
-      noSysDirs = true;
-      cross = assert crossSystem != null; crossSystem;
-    }));
-
-  bison2 = callPackage ../development/tools/parsing/bison/2.x.nix { };
-  bison3 = callPackage ../development/tools/parsing/bison/3.x.nix { };
-  bison = bison3;
-
-  bossa = callPackage ../development/tools/misc/bossa {
-    wxGTK = wxGTK30;
-  };
-
-  buildbot = callPackage ../development/tools/build-managers/buildbot {
-    inherit (pythonPackages) twisted jinja2 sqlalchemy sqlalchemy_migrate;
-    dateutil = pythonPackages.dateutil_1_5;
-  };
-
-  buildbotSlave = callPackage ../development/tools/build-managers/buildbot-slave {
-    inherit (pythonPackages) twisted;
-  };
-
-  byacc = callPackage ../development/tools/parsing/byacc { };
-
-  casperjs = callPackage ../development/tools/casperjs { };
-
-  cbrowser = callPackage ../development/tools/misc/cbrowser { };
-
-  ccache = callPackage ../development/tools/misc/ccache { };
-
-  # Wrapper that works as gcc or g++
-  # It can be used by setting in nixpkgs config like this, for example:
-  #    replaceStdenv = { pkgs }: pkgs.ccacheStdenv;
-  # But if you build in chroot, you should have that path in chroot
-  # If instantiated directly, it will use the HOME/.ccache as cache directory.
-  # You can use an override in packageOverrides to set extraConfig:
-  #    packageOverrides = pkgs: {
-  #     ccacheWrapper = pkgs.ccacheWrapper.override {
-  #       extraConfig = ''
-  #         CCACHE_COMPRESS=1
-  #         CCACHE_DIR=/bin/.ccache
-  #       '';
-  #     };
-  #
-  ccacheWrapper = makeOverridable ({ extraConfig ? "" }:
-     wrapGCC (ccache.links extraConfig)) {};
-  ccacheStdenv = lowPrio (overrideGCC stdenv ccacheWrapper);
-
-  cccc = callPackage ../development/tools/analysis/cccc { };
-
-  cgdb = callPackage ../development/tools/misc/cgdb { };
-
-  chromedriver = callPackage ../development/tools/selenium/chromedriver { gconf = gnome.GConf; };
-
-  chrpath = callPackage ../development/tools/misc/chrpath { };
-
-  "cl-launch" = callPackage ../development/tools/misc/cl-launch {};
-
-  complexity = callPackage ../development/tools/misc/complexity { };
-
-  ctags = callPackage ../development/tools/misc/ctags { };
-
-  ctagsWrapped = import ../development/tools/misc/ctags/wrapped.nix {
-    inherit pkgs ctags writeScriptBin;
-  };
-
-  cmake = callPackage ../development/tools/build-managers/cmake { };
-
-  cmake264 = callPackage ../development/tools/build-managers/cmake/264.nix { };
-
-  cmakeCurses = cmake.override { useNcurses = true; };
-
-  cmakeWithGui = cmakeCurses.override { useQt4 = true; };
-
-  coccinelle = callPackage ../development/tools/misc/coccinelle { };
-
-  framac = callPackage ../development/tools/analysis/frama-c { };
-
-  cppi = callPackage ../development/tools/misc/cppi { };
-
-  cproto = callPackage ../development/tools/misc/cproto { };
-
-  cflow = callPackage ../development/tools/misc/cflow { };
-
-  cov-build = callPackage ../development/tools/analysis/cov-build {};
-
-  cppcheck = callPackage ../development/tools/analysis/cppcheck { };
-
-  cscope = callPackage ../development/tools/misc/cscope { };
-
-  csslint = callPackage ../development/web/csslint { };
-
-  libcxx = callPackage ../development/libraries/libc++ { stdenv = pkgs.clangStdenv; };
-  libcxxabi = callPackage ../development/libraries/libc++abi { stdenv = pkgs.clangStdenv; };
-
-  libsigrok = callPackage ../development/tools/libsigrok { };
-
-  libsigrokdecode = callPackage ../development/tools/libsigrokdecode { };
-
-  dejagnu = callPackage ../development/tools/misc/dejagnu { };
-
-  dfeet = callPackage ../development/tools/misc/d-feet {
-    inherit (pythonPackages) pep8;
-  };
-
-  dfu-programmer = callPackage ../development/tools/misc/dfu-programmer { };
-
-  ddd = callPackage ../development/tools/misc/ddd { };
-
-  distcc = callPackage ../development/tools/misc/distcc { };
-
-  # distccWrapper: wrapper that works as gcc or g++
-  # It can be used by setting in nixpkgs config like this, for example:
-  #    replaceStdenv = { pkgs }: pkgs.distccStdenv;
-  # But if you build in chroot, a default 'nix' will create
-  # a new net namespace, and won't have network access.
-  # You can use an override in packageOverrides to set extraConfig:
-  #    packageOverrides = pkgs: {
-  #     distccWrapper = pkgs.distccWrapper.override {
-  #       extraConfig = ''
-  #         DISTCC_HOSTS="myhost1 myhost2"
-  #       '';
-  #     };
-  #
-  distccWrapper = makeOverridable ({ extraConfig ? "" }:
-     wrapGCC (distcc.links extraConfig)) {};
-  distccStdenv = lowPrio (overrideGCC stdenv distccWrapper);
-
-  distccMasquerade = callPackage ../development/tools/misc/distcc/masq.nix {
-    gccRaw = gcc.gcc;
-    binutils = binutils;
-  };
-
-  docutils = builderDefsPackage (import ../development/tools/documentation/docutils) {
-    inherit python pil makeWrapper;
-  };
-
-  doxygen = callPackage ../development/tools/documentation/doxygen {
-    qt4 = null;
-  };
-
-  doxygen_gui = lowPrio (doxygen.override { inherit qt4; });
-
-  drush = callPackage ../development/tools/misc/drush { };
-
-  eggdbus = callPackage ../development/tools/misc/eggdbus { };
-
-  elfutils = callPackage ../development/tools/misc/elfutils { };
-
-  epm = callPackage ../development/tools/misc/epm { };
-
-  emma = callPackage ../development/tools/analysis/emma { };
-
-  findbugs = callPackage ../development/tools/analysis/findbugs { };
-
-  pmd = callPackage ../development/tools/analysis/pmd { };
-
-  jdepend = callPackage ../development/tools/analysis/jdepend { };
-
-  checkstyle = callPackage ../development/tools/analysis/checkstyle { };
-
-  flex_2_5_35 = callPackage ../development/tools/parsing/flex/2.5.35.nix { };
-  flex_2_5_39 = callPackage ../development/tools/parsing/flex/2.5.39.nix { };
-  flex = flex_2_5_39;
-
-  m4 = gnum4;
-
-  global = callPackage ../development/tools/misc/global { };
-
-  gnome_doc_utils = callPackage ../development/tools/documentation/gnome-doc-utils {};
-
-  gnum4 = callPackage ../development/tools/misc/gnum4 { };
-
-  gnumake380 = callPackage ../development/tools/build-managers/gnumake/3.80 { };
-  gnumake381 = callPackage ../development/tools/build-managers/gnumake/3.81 { };
-  gnumake382 = callPackage ../development/tools/build-managers/gnumake/3.82 { };
-  gnumake40  = callPackage ../development/tools/build-managers/gnumake/4.0  { };
-  gnumake = gnumake382;
-
-  gob2 = callPackage ../development/tools/misc/gob2 { };
-
-  gradle = callPackage ../development/tools/build-managers/gradle { };
-
-  gperf = callPackage ../development/tools/misc/gperf { };
-
-  gtk_doc = callPackage ../development/tools/documentation/gtk-doc { };
-
-  gtkdialog = callPackage ../development/tools/misc/gtkdialog { };
-
-  guileLint = callPackage ../development/tools/guile/guile-lint { };
-
-  gwrap = callPackage ../development/tools/guile/g-wrap { };
-
-  help2man = callPackage ../development/tools/misc/help2man {
-    inherit (perlPackages) LocaleGettext;
-  };
-
-  hyenae = callPackage ../tools/networking/hyenae { };
-
-  ibus = callPackage ../development/libraries/ibus { };
-
-  iconnamingutils = callPackage ../development/tools/misc/icon-naming-utils {
-    inherit (perlPackages) XMLSimple;
-  };
-
-  indent = callPackage ../development/tools/misc/indent { };
-
-  ino = callPackage ../development/arduino/ino { };
-
-  inotifyTools = callPackage ../development/tools/misc/inotify-tools { };
-
-  intel-gpu-tools = callPackage ../development/tools/misc/intel-gpu-tools {
-    inherit (xorg) libpciaccess dri2proto libX11 libXext libXv libXrandr;
-  };
-
-  ired = callPackage ../development/tools/analysis/radare/ired.nix { };
-
-  itstool = callPackage ../development/tools/misc/itstool { };
-
-  jam = callPackage ../development/tools/build-managers/jam { };
-
-  jikespg = callPackage ../development/tools/parsing/jikespg { };
-
-  jenkins = callPackage ../development/tools/continuous-integration/jenkins { };
-
-  lcov = callPackage ../development/tools/analysis/lcov { };
-
-  leiningen = callPackage ../development/tools/build-managers/leiningen { };
-
-  libtool = libtool_2;
-
-  libtool_1_5 = callPackage ../development/tools/misc/libtool { };
-
-  libtool_2 = callPackage ../development/tools/misc/libtool/libtool2.nix { };
-
-  lsof = callPackage ../development/tools/misc/lsof { };
-
-  ltrace = callPackage ../development/tools/misc/ltrace { };
-
-  lttng-tools = callPackage ../development/tools/misc/lttng-tools { };
-
-  lttng-ust = callPackage ../development/tools/misc/lttng-ust { };
-
-  lttv = callPackage ../development/tools/misc/lttv { };
-
-  mk = callPackage ../development/tools/build-managers/mk { };
-
-  neoload = callPackage ../development/tools/neoload {
-    licenseAccepted = (config.neoload.accept_license or false);
-  };
-
-  ninja = callPackage ../development/tools/build-managers/ninja { };
-
-  nixbang = callPackage ../development/tools/misc/nixbang {
-      pythonPackages = python3Packages;
-  };
-
-  node_webkit = callPackage ../development/tools/node-webkit {
-    gconf = pkgs.gnome.GConf;
-  };
-
-  noweb = callPackage ../development/tools/literate-programming/noweb { };
-
-  omake = callPackage ../development/tools/ocaml/omake { };
-  omake_rc1 = callPackage ../development/tools/ocaml/omake/0.9.8.6-rc1.nix { };
-
-  opengrok = callPackage ../development/tools/misc/opengrok { };
-
-  openocd = callPackage ../development/tools/misc/openocd { };
-
-  oprofile = callPackage ../development/tools/profiling/oprofile { };
-
-  patchelf = callPackage ../development/tools/misc/patchelf { };
-
-  peg = callPackage ../development/tools/parsing/peg { };
-
-  phantomjs = callPackage ../development/tools/phantomjs {
-    stdenv = if stdenv.isDarwin
-      then overrideGCC stdenv gccApple
-      else stdenv;
-  };
-
-  pmccabe = callPackage ../development/tools/misc/pmccabe { };
-
-  /* Make pkgconfig always return a nativeDrv, never a proper crossDrv,
-     because most usage of pkgconfig as buildInput (inheritance of
-     pre-cross nixpkgs) means using it using as nativeBuildInput
-     cross_renaming: we should make all programs use pkgconfig as
-     nativeBuildInput after the renaming.
-     */
-  pkgconfig = forceNativeDrv (callPackage ../development/tools/misc/pkgconfig { });
-  pkgconfigUpstream = lowPrio (pkgconfig.override { vanilla = true; });
-
-  prelink = callPackage ../development/tools/misc/prelink { };
-
-  premake3 = callPackage ../development/tools/misc/premake/3.nix { };
-
-  premake4 = callPackage ../development/tools/misc/premake { };
-
-  premake = premake4;
-
-  pstack = callPackage ../development/tools/misc/gdb/pstack.nix { };
-
-  radare = callPackage ../development/tools/analysis/radare {
-    inherit (gnome) vte;
-    lua = lua5;
-    useX11 = config.radare.useX11 or false;
-    pythonBindings = config.radare.pythonBindings or false;
-    rubyBindings = config.radare.rubyBindings or false;
-    luaBindings = config.radare.luaBindings or false;
-  };
-
-  ragel = callPackage ../development/tools/parsing/ragel { };
-
-  re2c = callPackage ../development/tools/parsing/re2c { };
-
-  remake = callPackage ../development/tools/build-managers/remake { };
-
-  saleae-logic = callPackage ../development/tools/misc/saleae-logic { };
-
-  # couldn't find the source yet
-  seleniumRCBin = callPackage ../development/tools/selenium/remote-control {
-    jre = jdk;
-  };
-
-  selenium-server-standalone = callPackage ../development/tools/selenium/server { };
-
-  scons = callPackage ../development/tools/build-managers/scons { };
-
-  simpleBuildTool = callPackage ../development/tools/build-managers/simple-build-tool { };
-
-  sigrok-cli = callPackage ../development/tools/sigrok-cli { };
-
-  slimerjs = callPackage ../development/tools/slimerjs {};
-
-  sloccount = callPackage ../development/tools/misc/sloccount { };
-
-  smatch = callPackage ../development/tools/analysis/smatch {
-    buildllvmsparse = false;
-    buildc2xml = false;
-  };
-
-  smc = callPackage ../tools/misc/smc { };
-
-  sparse = callPackage ../development/tools/analysis/sparse { };
-
-  speedtest_cli = callPackage ../tools/networking/speedtest-cli { };
-
-  spin = callPackage ../development/tools/analysis/spin { };
-
-  splint = callPackage ../development/tools/analysis/splint {
-    flex = flex_2_5_35;
-  };
-
-  stm32flash = callPackage ../development/tools/misc/stm32flash { };
-
-  strace = callPackage ../development/tools/misc/strace { };
-
-  swig = callPackage ../development/tools/misc/swig { };
-
-  swig2 = callPackage ../development/tools/misc/swig/2.x.nix { };
-
-  swig3 = callPackage ../development/tools/misc/swig/3.x.nix { };
-
-  swigWithJava = swig;
-
-  swfmill = callPackage ../tools/video/swfmill { };
-
-  swftools = callPackage ../tools/video/swftools { };
-
-  tcptrack = callPackage ../development/tools/misc/tcptrack { };
-
-  teensy-loader = callPackage ../development/tools/misc/teensy { };
-
-  texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { };
-  texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { };
-  texinfo4 = texinfo413;
-  texinfo = texinfo5;
-  texinfoInteractive = appendToName "interactive" (
-    texinfo.override { interactive = true; }
-  );
-
-  texi2html = callPackage ../development/tools/misc/texi2html { };
-
-  uhd = callPackage ../development/tools/misc/uhd { };
-
-  uisp = callPackage ../development/tools/misc/uisp { };
-
-  uncrustify = callPackage ../development/tools/misc/uncrustify { };
-
-  vagrant = callPackage ../development/tools/vagrant {
-    ruby = ruby2;
-  };
-
-  gdb = callPackage ../development/tools/misc/gdb {
-    hurd = gnu.hurdCross;
-    readline = readline63;
-    inherit (gnu) mig;
-  };
-
-  gdbCross = lowPrio (callPackage ../development/tools/misc/gdb {
-    target = crossSystem;
-  });
-
-  valgrind = callPackage ../development/tools/analysis/valgrind {
-    stdenv =
-      # On Darwin, Valgrind 3.7.0 expects Apple's GCC (for
-      # `__private_extern'.)
-      if stdenv.isDarwin
-      then overrideGCC stdenv gccApple
-      else stdenv;
-  };
-
-  valkyrie = callPackage ../development/tools/analysis/valkyrie { };
-
-  xc3sprog = callPackage ../development/tools/misc/xc3sprog { };
-
-  xmlindent = callPackage ../development/web/xmlindent {};
-
-  xpwn = callPackage ../development/mobile/xpwn {};
-
-  xxdiff = callPackage ../development/tools/misc/xxdiff {
-    bison = bison2;
-  };
-
-  yacc = bison;
-
-  yodl = callPackage ../development/tools/misc/yodl { };
-
-
-  ### DEVELOPMENT / LIBRARIES
-
-  a52dec = callPackage ../development/libraries/a52dec { };
-
-  aacskeys = callPackage ../development/libraries/aacskeys { };
-
-  aalib = callPackage ../development/libraries/aalib { };
-
-  accountsservice = callPackage ../development/libraries/accountsservice { };
-
-  acl = callPackage ../development/libraries/acl { };
-
-  activemq = callPackage ../development/libraries/apache-activemq { };
-
-  adns = callPackage ../development/libraries/adns { };
-
-  afflib = callPackage ../development/libraries/afflib {};
-
-  agg = callPackage ../development/libraries/agg { };
-
-  allegro = callPackage ../development/libraries/allegro {};
-  allegro5 = callPackage ../development/libraries/allegro/5.nix {};
-  allegro5unstable = callPackage
-    ../development/libraries/allegro/5-unstable.nix {};
-
-  amrnb = callPackage ../development/libraries/amrnb { };
-
-  amrwb = callPackage ../development/libraries/amrwb { };
-
-  apr = callPackage ../development/libraries/apr { };
-
-  aprutil = callPackage ../development/libraries/apr-util {
-    bdbSupport = true;
-  };
-
-  asio = callPackage ../development/libraries/asio { };
-
-  aspell = callPackage ../development/libraries/aspell { };
-
-  aspellDicts = recurseIntoAttrs (import ../development/libraries/aspell/dictionaries.nix {
-    inherit fetchurl stdenv aspell which;
-  });
-
-  aterm = aterm25;
-
-  aterm25 = callPackage ../development/libraries/aterm/2.5.nix { };
-
-  aterm28 = lowPrio (callPackage ../development/libraries/aterm/2.8.nix { });
-
-  attica = callPackage ../development/libraries/attica { };
-
-  attr = callPackage ../development/libraries/attr { };
-
-  at_spi2_core = callPackage ../development/libraries/at-spi2-core { };
-
-  at_spi2_atk = callPackage ../development/libraries/at-spi2-atk { };
-
-  aqbanking = callPackage ../development/libraries/aqbanking { };
-
-  aubio = callPackage ../development/libraries/aubio { };
-
-  audiofile = callPackage ../development/libraries/audiofile { };
-
-  babl_0_0_22 = callPackage ../development/libraries/babl/0_0_22.nix { };
-
-  babl = callPackage ../development/libraries/babl { };
-
-  beecrypt = callPackage ../development/libraries/beecrypt { };
-
-  boehmgc = callPackage ../development/libraries/boehm-gc { };
-
-  boolstuff = callPackage ../development/libraries/boolstuff { };
-
-  boost144 = callPackage ../development/libraries/boost/1.44.nix { };
-  boost149 = callPackage ../development/libraries/boost/1.49.nix { };
-  boost155 = callPackage ../development/libraries/boost/1.55.nix { };
-  boost = boost155;
-
-  boostHeaders = callPackage ../development/libraries/boost/header-only-wrapper.nix { };
-
-  botan = callPackage ../development/libraries/botan { };
-  botanUnstable = callPackage ../development/libraries/botan/unstable.nix { };
-
-  box2d = callPackage ../development/libraries/box2d { };
-  box2d_2_0_1 = callPackage ../development/libraries/box2d/2.0.1.nix { };
-
-  buddy = callPackage ../development/libraries/buddy { };
-
-  bwidget = callPackage ../development/libraries/bwidget { };
-
-  c-ares = callPackage ../development/libraries/c-ares {
-    fetchurl = fetchurlBoot;
-  };
-
-  caelum = callPackage ../development/libraries/caelum { };
-
-  capnproto = callPackage ../development/libraries/capnproto { };
-
-  scmccid = callPackage ../development/libraries/scmccid { };
-
-  ccrtp = callPackage ../development/libraries/ccrtp { };
-  ccrtp_1_8 = callPackage ../development/libraries/ccrtp/1.8.nix { };
-
-  celt = callPackage ../development/libraries/celt {};
-  celt_0_7 = callPackage ../development/libraries/celt/0.7.nix {};
-  celt_0_5_1 = callPackage ../development/libraries/celt/0.5.1.nix {};
-
-  cgal = callPackage ../development/libraries/CGAL {};
-
-  cgui = callPackage ../development/libraries/cgui {};
-
-  check = callPackage ../development/libraries/check { };
-
-  chipmunk = builderDefsPackage (import ../development/libraries/chipmunk) {
-    inherit cmake freeglut mesa;
-    inherit (xlibs) libX11 xproto inputproto libXi libXmu;
-  };
-
-  chmlib = callPackage ../development/libraries/chmlib { };
-
-  chromaprint = callPackage ../development/libraries/chromaprint { };
-
-  cil = callPackage ../development/libraries/cil { };
-
-  cilaterm = callPackage ../development/libraries/cil-aterm {
-    stdenv = overrideInStdenv stdenv [gnumake380];
-  };
-
-  clanlib = callPackage ../development/libraries/clanlib { };
-
-  classads = callPackage ../development/libraries/classads { };
-
-  classpath = callPackage ../development/libraries/java/classpath {
-    javac = gcj;
-    jvm = gcj;
-    gconf = gnome.GConf;
-  };
-
-  clearsilver = callPackage ../development/libraries/clearsilver { };
-
-  cln = callPackage ../development/libraries/cln { };
-
-  clppcre = builderDefsPackage (import ../development/libraries/cl-ppcre) { };
-
-  clucene_core_2 = callPackage ../development/libraries/clucene-core/2.x.nix { };
-
-  clucene_core_1 = callPackage ../development/libraries/clucene-core { };
-
-  clucene_core = clucene_core_1;
-
-  clutter = callPackage ../development/libraries/clutter { };
-
-  clutter_1_18 = callPackage ../development/libraries/clutter/1.18.nix {
-    cogl = cogl_1_18;
-  };
-
-  clutter-gst = callPackage ../development/libraries/clutter-gst { };
-
-  clutter_gtk = callPackage ../development/libraries/clutter-gtk { };
-  clutter_gtk_0_10 = callPackage ../development/libraries/clutter-gtk/0.10.8.nix { };
-
-  cminpack = callPackage ../development/libraries/cminpack { };
-
-  cogl = callPackage ../development/libraries/cogl { };
-
-  cogl_1_18 = callPackage ../development/libraries/cogl/1.18.nix { };
-
-  coin3d = callPackage ../development/libraries/coin3d { };
-
-  commoncpp2 = callPackage ../development/libraries/commoncpp2 { };
-
-  confuse = callPackage ../development/libraries/confuse { };
-
-  coredumper = callPackage ../development/libraries/coredumper { };
-
-  ctl = callPackage ../development/libraries/ctl { };
-
-  cpp-netlib = callPackage ../development/libraries/cpp-netlib { };
-
-  cppunit = callPackage ../development/libraries/cppunit { };
-
-  cppnetlib = callPackage ../development/libraries/cppnetlib {
-    boost = boostHeaders;
-  };
-
-  cracklib = callPackage ../development/libraries/cracklib { };
-
-  cryptopp = callPackage ../development/libraries/crypto++ { };
-
-  cyrus_sasl = callPackage ../development/libraries/cyrus-sasl { };
-
-  # Make bdb5 the default as it is the last release under the custom
-  # bsd-like license
-  db = db5;
-  db4 = db48;
-  db44 = callPackage ../development/libraries/db/db-4.4.nix { };
-  db45 = callPackage ../development/libraries/db/db-4.5.nix { };
-  db47 = callPackage ../development/libraries/db/db-4.7.nix { };
-  db48 = callPackage ../development/libraries/db/db-4.8.nix { };
-  db5 = db53;
-  db53 = callPackage ../development/libraries/db/db-5.3.nix { };
-  db6 = db60;
-  db60 = callPackage ../development/libraries/db/db-6.0.nix { };
-
-  dbus = callPackage ../development/libraries/dbus { };
-  dbus_cplusplus  = callPackage ../development/libraries/dbus-cplusplus { };
-  dbus_glib       = callPackage ../development/libraries/dbus-glib { };
-  dbus_java       = callPackage ../development/libraries/java/dbus-java { };
-  dbus_python     = callPackage ../development/python-modules/dbus { };
-
-  # Should we deprecate these? Currently there are many references.
-  dbus_tools = pkgs.dbus.tools;
-  dbus_libs = pkgs.dbus.libs;
-  dbus_daemon = pkgs.dbus.daemon;
-
-  dhex = callPackage ../applications/editors/dhex { };
-
-  dclib = callPackage ../development/libraries/dclib { };
-
-  dillo = callPackage ../applications/networking/browsers/dillo {
-    fltk = fltk13;
-  };
-
-  directfb = callPackage ../development/libraries/directfb { };
-
-  dotconf = callPackage ../development/libraries/dotconf { };
-
-  dssi = callPackage ../development/libraries/dssi {};
-
-  dragonegg = llvmPackages.dragonegg;
-
-  dxflib = callPackage ../development/libraries/dxflib {};
-
-  eigen = callPackage ../development/libraries/eigen {};
-
-  eigen2 = callPackage ../development/libraries/eigen/2.0.nix {};
-
-  enchant = callPackage ../development/libraries/enchant { };
-
-  enet = callPackage ../development/libraries/enet { };
-
-  enginepkcs11 = callPackage ../development/libraries/enginepkcs11 { };
-
-  epoxy = callPackage ../development/libraries/epoxy {
-    inherit (xorg) utilmacros libX11;
-  };
-
-  esdl = callPackage ../development/libraries/esdl { };
-
-  exiv2 = callPackage ../development/libraries/exiv2 { };
-
-  expat = callPackage ../development/libraries/expat { };
-
-  extremetuxracer = callPackage ../games/extremetuxracer {
-    libpng = libpng12;
-  };
-
-  eventlog = callPackage ../development/libraries/eventlog { };
-
-  facile = callPackage ../development/libraries/facile { };
-
-  faac = callPackage ../development/libraries/faac { };
-
-  faad2 = callPackage ../development/libraries/faad2 { };
-
-  farsight2 = callPackage ../development/libraries/farsight2 { };
-
-  farstream = callPackage ../development/libraries/farstream {
-    inherit (gst_all_1)
-      gstreamer gst-plugins-base gst-python gst-plugins-good gst-plugins-bad
-      gst-libav;
-  };
-
-  fcgi = callPackage ../development/libraries/fcgi { };
-
-  ffmpeg_0_6 = callPackage ../development/libraries/ffmpeg/0.6.nix {
-    vpxSupport = !stdenv.isMips;
-  };
-
-  ffmpeg_0_6_90 = callPackage ../development/libraries/ffmpeg/0.6.90.nix {
-    vpxSupport = !stdenv.isMips;
-  };
-
-  ffmpeg_0_10 = callPackage ../development/libraries/ffmpeg/0.10.nix {
-    vpxSupport = !stdenv.isMips;
-
-    stdenv = if stdenv.isDarwin
-      then overrideGCC stdenv gccApple
-      else stdenv;
-  };
-
-  ffmpeg_1 = callPackage ../development/libraries/ffmpeg/1.x.nix {
-    vpxSupport = !stdenv.isMips;
-  };
-
-  ffmpeg_2 = callPackage ../development/libraries/ffmpeg/2.x.nix { };
-
-  ffmpeg = ffmpeg_2;
-
-  ffms = callPackage ../development/libraries/ffms { };
-
-  fftw = callPackage ../development/libraries/fftw { };
-  fftwSinglePrec = fftw.override { precision = "single"; };
-  fftwFloat = fftwSinglePrec; # the configure option is just an alias
-
-  flann = callPackage ../development/libraries/flann { };
-
-  flite = callPackage ../development/libraries/flite { };
-
-  fltk13 = callPackage ../development/libraries/fltk/fltk13.nix { };
-
-  fltk20 = callPackage ../development/libraries/fltk { };
-
-  fmod = callPackage ../development/libraries/fmod { };
-
-  freeimage = callPackage ../development/libraries/freeimage { };
-
-  freetts = callPackage ../development/libraries/freetts { };
-
-  cfitsio = callPackage ../development/libraries/cfitsio { };
-
-  fontconfig = callPackage ../development/libraries/fontconfig { };
-
-  makeFontsConf = let fontconfig_ = fontconfig; in {fontconfig ? fontconfig_, fontDirectories}:
-    import ../development/libraries/fontconfig/make-fonts-conf.nix {
-      inherit runCommand libxslt fontconfig fontDirectories;
-    };
-
-  freealut = callPackage ../development/libraries/freealut { };
-
-  freeglut = callPackage ../development/libraries/freeglut { };
-
-  freetype = callPackage ../development/libraries/freetype { };
-
-  frei0r = callPackage ../development/libraries/frei0r { };
-
-  fribidi = callPackage ../development/libraries/fribidi { };
-
-  funambol = callPackage ../development/libraries/funambol { };
-
-  fam = gamin;
-
-  gamin = callPackage ../development/libraries/gamin { };
-
-  ganv = callPackage ../development/libraries/ganv { };
-
-  gav = callPackage ../games/gav { };
-
-  gsb = callPackage ../games/gsb { };
-
-  gdome2 = callPackage ../development/libraries/gdome2 {
-    inherit (gnome) gtkdoc;
-  };
-
-  gdbm = callPackage ../development/libraries/gdbm { };
-
-  gegl = callPackage ../development/libraries/gegl {
-    #  avocodec avformat librsvg
-  };
-
-  gegl_0_0_22 = callPackage ../development/libraries/gegl/0_0_22.nix {
-    #  avocodec avformat librsvg
-    libpng = libpng12;
-  };
-
-  geoclue = callPackage ../development/libraries/geoclue {};
-
-  geoclue2 = callPackage ../development/libraries/geoclue/2.0.nix {};
-
-  geoip = callPackage ../development/libraries/geoip { };
-
-  geoipjava = callPackage ../development/libraries/java/geoipjava { };
-
-  geos = callPackage ../development/libraries/geos { };
-
-  gettext = gettext_0_18;
-
-  gettext_0_17 = callPackage ../development/libraries/gettext/0.17.nix { };
-  gettext_0_18 = callPackage ../development/libraries/gettext { };
-
-  gd = callPackage ../development/libraries/gd { };
-
-  gdal = callPackage ../development/libraries/gdal { };
-
-  ggz_base_libs = callPackage ../development/libraries/ggz_base_libs {};
-
-  giblib = callPackage ../development/libraries/giblib { };
-
-  libgit2 = callPackage ../development/libraries/git2 { };
-
-  glew = callPackage ../development/libraries/glew { };
-
-  glfw = glfw3;
-  glfw2 = callPackage ../development/libraries/glfw/2.x.nix { };
-  glfw3 = callPackage ../development/libraries/glfw/3.x.nix { };
-
-  glibc = callPackage ../development/libraries/glibc/2.19 {
-    kernelHeaders = linuxHeaders;
-    installLocales = config.glibc.locales or false;
-    machHeaders = null;
-    hurdHeaders = null;
-    gccCross = null;
-  };
-
-  glibc_memusage = callPackage ../development/libraries/glibc/2.19 {
-    kernelHeaders = linuxHeaders;
-    installLocales = false;
-    withGd = true;
-  };
-
-  glibcCross = forceNativeDrv (makeOverridable (import ../development/libraries/glibc/2.19)
-    (let crossGNU = crossSystem != null && crossSystem.config == "i586-pc-gnu";
-     in {
-       inherit stdenv fetchurl;
-       gccCross = gccCrossStageStatic;
-       kernelHeaders = if crossGNU then gnu.hurdHeaders else linuxHeadersCross;
-       installLocales = config.glibc.locales or false;
-     }
-     // lib.optionalAttrs crossGNU {
-        inherit (gnu) machHeaders hurdHeaders libpthreadHeaders mig;
-        inherit fetchgit;
-      }));
-
-
-  # We can choose:
-  libcCrossChooser = name : if name == "glibc" then glibcCross
-    else if name == "uclibc" then uclibcCross
-    else if name == "msvcrt" then windows.mingw_w64
-    else if name == "libSystem" then darwin.xcode
-    else throw "Unknown libc";
-
-  libcCross = assert crossSystem != null; libcCrossChooser crossSystem.libc;
-
-  eglibc = callPackage ../development/libraries/eglibc {
-    kernelHeaders = linuxHeaders;
-    installLocales = config.glibc.locales or false;
-  };
-
-  glibcLocales = callPackage ../development/libraries/glibc/2.19/locales.nix { };
-
-  glibcInfo = callPackage ../development/libraries/glibc/2.19/info.nix { };
-
-  glibc_multi = callPackage ../development/libraries/glibc/2.19/multi.nix {
-    inherit glibc;
-    glibc32 = (import ./all-packages.nix {system = "i686-linux";}).glibc;
-  };
-
-  glm = callPackage ../development/libraries/glm { };
-
-  glog = callPackage ../development/libraries/glog { };
-
-  gloox = callPackage ../development/libraries/gloox { };
-
-  glpk = callPackage ../development/libraries/glpk { };
-
-  glsurf = callPackage ../applications/science/math/glsurf {
-    inherit (ocamlPackages) lablgl findlib camlimages ocaml_mysql mlgmp;
-    libpng = libpng12;
-    giflib = giflib_4_1;
-  };
-
-  gmime = callPackage ../development/libraries/gmime { };
-
-  gmm = callPackage ../development/libraries/gmm { };
-
-  gmp = gmp5;
-  gmp5 = gmp51;
-
-  gmpxx = appendToName "with-cxx" (gmp.override { cxx = true; });
-
-  # The GHC bootstrap binaries link against libgmp.so.3, which is in GMP 4.x.
-  gmp4 = callPackage ../development/libraries/gmp/4.3.2.nix { };
-
-  gmp51 = callPackage ../development/libraries/gmp/5.1.x.nix { };
-
-  #GMP ex-satellite, so better keep it near gmp
-  mpfr = callPackage ../development/libraries/mpfr/default.nix { };
-
-  gobjectIntrospection = callPackage ../development/libraries/gobject-introspection { };
-
-  goocanvas = callPackage ../development/libraries/goocanvas { };
-
-  google-gflags = callPackage ../development/libraries/google-gflags { };
-
-  gperftools = callPackage ../development/libraries/gperftools { };
-
-  gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer {
-    callPackage = pkgs.newScope (pkgs // { libav = pkgs.libav_10; });
-  });
-
-  gst_all = {
-    inherit (pkgs) gstreamer gnonlin gst_python qt_gstreamer;
-    gstPluginsBase = pkgs.gst_plugins_base;
-    gstPluginsBad = pkgs.gst_plugins_bad;
-    gstPluginsGood = pkgs.gst_plugins_good;
-    gstPluginsUgly = pkgs.gst_plugins_ugly;
-    gstFfmpeg = pkgs.gst_ffmpeg;
-  };
-
-  gstreamer = callPackage ../development/libraries/gstreamer/legacy/gstreamer {
-    bison = bison2;
-  };
-
-  gst_plugins_base = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-base {};
-
-  gst_plugins_good = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-good {};
-
-  gst_plugins_bad = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-bad {};
-
-  gst_plugins_ugly = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-ugly {};
-
-  gst_ffmpeg = callPackage ../development/libraries/gstreamer/legacy/gst-ffmpeg {
-    ffmpeg = ffmpeg_0_10;
-  };
-
-  gst_python = callPackage ../development/libraries/gstreamer/legacy/gst-python {};
-
-  gstreamermm = callPackage ../development/libraries/gstreamer/legacy/gstreamermm { };
-
-  gnonlin = callPackage ../development/libraries/gstreamer/legacy/gnonlin {};
-
-  gusb = callPackage ../development/libraries/gusb {
-    inherit (gnome) gtkdoc;
-  };
-
-  qt_gstreamer = callPackage ../development/libraries/gstreamer/legacy/qt-gstreamer {};
-
-  gnet = callPackage ../development/libraries/gnet { };
-
-  gnu-efi = callPackage ../development/libraries/gnu-efi { };
-
-  gnutls = gnutls32;
-
-  gnutls31 = callPackage ../development/libraries/gnutls/3.1.nix {
-    guileBindings = config.gnutls.guile or false;
-  };
-
-  gnutls32 = callPackage ../development/libraries/gnutls/3.2.nix {
-    guileBindings = config.gnutls.guile or false;
-  };
-
-  gnutls_with_guile = lowPrio (gnutls.override { guileBindings = true; });
-
-  gpac = callPackage ../applications/video/gpac { };
-
-  gpgme = callPackage ../development/libraries/gpgme {
-    gnupg1 = gnupg1orig;
-  };
-
-  grantlee = callPackage ../development/libraries/grantlee { };
-
-  gsasl = callPackage ../development/libraries/gsasl { };
-
-  gsl = callPackage ../development/libraries/gsl { };
-
-  gsm = callPackage ../development/libraries/gsm {};
-
-  gsoap = callPackage ../development/libraries/gsoap { };
-
-  gss = callPackage ../development/libraries/gss { };
-
-  gtkimageview = callPackage ../development/libraries/gtkimageview { };
-
-  gtkmathview = callPackage ../development/libraries/gtkmathview { };
-
-  gtkLibs = {
-    inherit (pkgs) glib glibmm atk atkmm cairo pango pangomm gdk_pixbuf gtk
-      gtkmm;
-  };
-
-  glib = callPackage ../development/libraries/glib { };
-  glib-tested = glib.override { doCheck = true; }; # checked version separate to break cycles
-  glibmm = callPackage ../development/libraries/glibmm { };
-
-  glib_networking = callPackage ../development/libraries/glib-networking {};
-
-  atk = callPackage ../development/libraries/atk { };
-  atkmm = callPackage ../development/libraries/atkmm { };
-
-  pixman = callPackage ../development/libraries/pixman { };
-
-  cairo = callPackage ../development/libraries/cairo {
-    glSupport = config.cairo.gl or (stdenv.isLinux &&
-      !stdenv.isArm && !stdenv.isMips);
-  };
-  cairomm = callPackage ../development/libraries/cairomm { };
-
-  pango = callPackage ../development/libraries/pango { };
-  pangomm = callPackage ../development/libraries/pangomm { };
-
-  pangox_compat = callPackage ../development/libraries/pangox-compat { };
-
-  gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf {
-    # workaround signal 10 in gdk_pixbuf tests
-    stdenv = if stdenv.isDarwin
-      then clangStdenv
-      else stdenv;
-  };
-
-  gtk2 = callPackage ../development/libraries/gtk+/2.x.nix {
-    cupsSupport = config.gtk2.cups or stdenv.isLinux;
-  };
-
-  gtk3 = callPackage ../development/libraries/gtk+/3.x.nix { };
-
-  gtk = pkgs.gtk2;
-
-  gtkmm = callPackage ../development/libraries/gtkmm/2.x.nix { };
-  gtkmm3 = callPackage ../development/libraries/gtkmm/3.x.nix { };
-
-  gtkmozembedsharp = callPackage ../development/libraries/gtkmozembed-sharp {
-    gtksharp = gtksharp2;
-  };
-
-  gtksharp1 = callPackage ../development/libraries/gtk-sharp-1 {
-    inherit (gnome) libglade libgtkhtml gtkhtml
-              libgnomecanvas libgnomeui libgnomeprint
-              libgnomeprintui GConf;
-  };
-
-  gtksharp2 = callPackage ../development/libraries/gtk-sharp-2 {
-    inherit (gnome) libglade libgtkhtml gtkhtml
-              libgnomecanvas libgnomeui libgnomeprint
-              libgnomeprintui GConf gnomepanel;
-  };
-
-  gtksourceviewsharp = callPackage ../development/libraries/gtksourceview-sharp {
-    inherit (gnome) gtksourceview;
-    gtksharp = gtksharp2;
-  };
-
-  gtkspell = callPackage ../development/libraries/gtkspell { };
-
-  gtkspell3 = callPackage ../development/libraries/gtkspell/3.nix { };
-
-  gts = callPackage ../development/libraries/gts { };
-
-  gvfs = callPackage ../development/libraries/gvfs { gconf = gnome.GConf; };
-
-  gwenhywfar = callPackage ../development/libraries/gwenhywfar { };
-
-  hamlib = callPackage ../development/libraries/hamlib { };
-
-  # TODO : Add MIT Kerberos and let admin choose.
-  kerberos = heimdal;
-
-  heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { };
-
-  harfbuzz = callPackage ../development/libraries/harfbuzz { };
-
-  hawknl = callPackage ../development/libraries/hawknl { };
-
-  herqq = callPackage ../development/libraries/herqq { };
-
-  hspell = callPackage ../development/libraries/hspell { };
-
-  hspellDicts = callPackage ../development/libraries/hspell/dicts.nix { };
-
-  hsqldb = callPackage ../development/libraries/java/hsqldb { };
-
-  http-parser = callPackage ../development/libraries/http-parser { inherit (pythonPackages) gyp; };
-
-  hunspell = callPackage ../development/libraries/hunspell { };
-
-  hwloc = callPackage ../development/libraries/hwloc {
-    inherit (xlibs) libX11;
-  };
-
-  hydraAntLogger = callPackage ../development/libraries/java/hydra-ant-logger { };
-
-  icu = callPackage ../development/libraries/icu { };
-
-  id3lib = callPackage ../development/libraries/id3lib { };
-
-  iksemel = callPackage ../development/libraries/iksemel { };
-
-  ilbc = callPackage ../development/libraries/ilbc { };
-
-  ilixi = callPackage ../development/libraries/ilixi { };
-
-  ilmbase = callPackage ../development/libraries/ilmbase { };
-
-  imlib = callPackage ../development/libraries/imlib {
-    libpng = libpng12;
-  };
-
-  imlib2 = callPackage ../development/libraries/imlib2 { };
-
-  incrtcl = callPackage ../development/libraries/incrtcl { };
-
-  indilib = callPackage ../development/libraries/indilib { };
-
-  iniparser = callPackage ../development/libraries/iniparser { };
-
-  intltool = callPackage ../development/tools/misc/intltool { };
-
-  irrlicht3843 = callPackage ../development/libraries/irrlicht { };
-
-  isocodes = callPackage ../development/libraries/iso-codes { };
-
-  itk = callPackage ../development/libraries/itk { };
-
-  jamp = builderDefsPackage ../games/jamp {
-    inherit mesa SDL SDL_image SDL_mixer;
-  };
-
-  jasper = callPackage ../development/libraries/jasper { };
-
-  jama = callPackage ../development/libraries/jama { };
-
-  jansson = callPackage ../development/libraries/jansson { };
-
-  jbig2dec = callPackage ../development/libraries/jbig2dec { };
-
-  jetty_gwt = callPackage ../development/libraries/java/jetty-gwt { };
-
-  jetty_util = callPackage ../development/libraries/java/jetty-util { };
-
-  json_glib = callPackage ../development/libraries/json-glib { };
-
-  json-c-0-11 = callPackage ../development/libraries/json-c/0.11.nix { }; # vulnerable
-  json_c = callPackage ../development/libraries/json-c { };
-
-  jsoncpp = callPackage ../development/libraries/jsoncpp { };
-
-  libjson = callPackage ../development/libraries/libjson { };
-
-  judy = callPackage ../development/libraries/judy { };
-
-  keybinder = callPackage ../development/libraries/keybinder {
-    automake = automake111x;
-    lua = lua5_1;
-  };
-
-  keybinder3 = callPackage ../development/libraries/keybinder3 {
-    automake = automake111x;
-    lua = lua5_1;
-  };
-
-  krb5 = callPackage ../development/libraries/kerberos/krb5.nix { };
-
-  lcms = lcms1;
-
-  lcms1 = callPackage ../development/libraries/lcms { };
-
-  lcms2 = callPackage ../development/libraries/lcms2 { };
-
-  lensfun = callPackage ../development/libraries/lensfun { };
-
-  lesstif = callPackage ../development/libraries/lesstif { };
-
-  lesstif93 = callPackage ../development/libraries/lesstif-0.93 { };
-
-  leveldb = callPackage ../development/libraries/leveldb { };
-
-  levmar = callPackage ../development/libraries/levmar { };
-
-  leptonica = callPackage ../development/libraries/leptonica {
-    libpng = libpng12;
-  };
-
-  lgi = callPackage ../development/libraries/lgi {
-    lua = lua5_1;
-  };
-
-  lib3ds = callPackage ../development/libraries/lib3ds { };
-
-  libaacs = callPackage ../development/libraries/libaacs { };
-
-  libaal = callPackage ../development/libraries/libaal { };
-
-  libao = callPackage ../development/libraries/libao {
-    usePulseAudio = config.pulseaudio or true;
-  };
-
-  libarchive = callPackage ../development/libraries/libarchive { };
-
-  libass = callPackage ../development/libraries/libass { };
-
-  libassuan1 = callPackage ../development/libraries/libassuan1 { };
-
-  libassuan = callPackage ../development/libraries/libassuan { };
-
-  libassuan2_1 = callPackage ../development/libraries/libassuan/git.nix { };
-
-  libatomic_ops = callPackage ../development/libraries/libatomic_ops {};
-
-  libav = libav_10;
-  libav_all = callPackage ../development/libraries/libav { };
-  inherit (libav_all) libav_0_8 libav_9 libav_10;
-
-  libavc1394 = callPackage ../development/libraries/libavc1394 { };
-
-  libbluedevil = callPackage ../development/libraries/libbluedevil { };
-
-  libbluray = callPackage ../development/libraries/libbluray { };
-
-  libbs2b = callPackage ../development/libraries/audio/libbs2b { };
-
-  libcaca = callPackage ../development/libraries/libcaca { };
-
-  libcanberra = callPackage ../development/libraries/libcanberra { };
-  libcanberra_gtk3 = libcanberra.override { gtk = gtk3; };
-  libcanberra_kde = if (config.kde_runtime.libcanberraWithoutGTK or true)
-    then libcanberra.override { gtk = null; }
-    else libcanberra;
-
-  libcello = callPackage ../development/libraries/libcello {};
-
-  libcdaudio = callPackage ../development/libraries/libcdaudio { };
-
-  libcddb = callPackage ../development/libraries/libcddb { };
-
-  libcdio = callPackage ../development/libraries/libcdio { };
-  libcdio082 = callPackage ../development/libraries/libcdio/0.82.nix { };
-
-  libcdr = callPackage ../development/libraries/libcdr { lcms = lcms2; };
-
-  libchamplain = callPackage ../development/libraries/libchamplain {
-    inherit (gnome) libsoup;
-  };
-
-  libchamplain_0_6 = callPackage ../development/libraries/libchamplain/0.6.nix {};
-
-  libchop = callPackage ../development/libraries/libchop { };
-
-  libcm = callPackage ../development/libraries/libcm { };
-
-  inherit (gnome3) libcroco;
-
-  libcangjie = callPackage ../development/libraries/libcangjie { };
-
-  libcredis = callPackage ../development/libraries/libcredis { };
-
-  libctemplate = callPackage ../development/libraries/libctemplate { };
-
-  libcue = callPackage ../development/libraries/libcue { };
-
-  libdaemon = callPackage ../development/libraries/libdaemon { };
-
-  libdbi = callPackage ../development/libraries/libdbi { };
-
-  libdbiDriversBase = callPackage ../development/libraries/libdbi-drivers {
-    mysql = null;
-    sqlite = null;
-  };
-
-  libdbiDrivers = libdbiDriversBase.override {
-    inherit sqlite mysql;
-  };
-
-  libdbusmenu_qt = callPackage ../development/libraries/libdbusmenu-qt { };
-
-  libdc1394 = callPackage ../development/libraries/libdc1394 { };
-
-  libdc1394avt = callPackage ../development/libraries/libdc1394avt { };
-
-  libdevil = callPackage ../development/libraries/libdevil { };
-
-  libdiscid = callPackage ../development/libraries/libdiscid { };
-
-  libdivsufsort = callPackage ../development/libraries/libdivsufsort { };
-
-  libdmtx = callPackage ../development/libraries/libdmtx { };
-
-  libdnet = callPackage ../development/libraries/libdnet { };
-
-  libdrm = callPackage ../development/libraries/libdrm {
-    inherit fetchurl stdenv pkgconfig;
-    inherit (xorg) libpthreadstubs;
-  };
-
-  libdv = callPackage ../development/libraries/libdv { };
-
-  libdvbpsi = callPackage ../development/libraries/libdvbpsi { };
-
-  libdwg = callPackage ../development/libraries/libdwg { };
-
-  libdvdcss = callPackage ../development/libraries/libdvdcss { };
-
-  libdvdnav = callPackage ../development/libraries/libdvdnav { };
-
-  libdvdread = callPackage ../development/libraries/libdvdread { };
-
-  libdwarf = callPackage ../development/libraries/libdwarf { };
-
-  libeatmydata = callPackage ../development/libraries/libeatmydata { };
-
-  libebml = callPackage ../development/libraries/libebml { };
-
-  libedit = callPackage ../development/libraries/libedit { };
-
-  libelf = callPackage ../development/libraries/libelf { };
-
-  libfm = callPackage ../development/libraries/libfm { };
-
-  libgadu = callPackage ../development/libraries/libgadu { };
-
-  libgdata = gnome3.libgdata;
-
-  libgig = callPackage ../development/libraries/libgig { };
-
-  libgnome_keyring = callPackage ../development/libraries/libgnome-keyring { };
-  libgnome_keyring3 = gnome3.libgnome_keyring;
-
-  libgnurl = callPackage ../development/libraries/libgnurl { };
-
-  libseccomp = callPackage ../development/libraries/libseccomp { };
-
-  libsecret = callPackage ../development/libraries/libsecret { };
-
-  libserialport = callPackage ../development/libraries/libserialport { };
-
-  libgtop = callPackage ../development/libraries/libgtop {};
-
-  liblo = callPackage ../development/libraries/liblo { };
-
-  liblrdf = librdf;
-
-  liblscp = callPackage ../development/libraries/liblscp { };
-
-  libe-book = callPackage ../development/libraries/libe-book {};
-
-  libev = builderDefsPackage ../development/libraries/libev { };
-
-  libevent14 = callPackage ../development/libraries/libevent/1.4.nix { };
-  libevent = callPackage ../development/libraries/libevent { };
-
-  libewf = callPackage ../development/libraries/libewf { };
-
-  libexif = callPackage ../development/libraries/libexif { };
-
-  libexosip = callPackage ../development/libraries/exosip {};
-
-  libexosip_3 = callPackage ../development/libraries/exosip/3.x.nix {
-    libosip = libosip_3;
-  };
-
-  libextractor = callPackage ../development/libraries/libextractor {
-    libmpeg2 = mpeg2dec;
-  };
-
-  libexttextcat = callPackage ../development/libraries/libexttextcat {};
-
-  libf2c = callPackage ../development/libraries/libf2c {};
-
-  libfixposix = callPackage ../development/libraries/libfixposix {};
-
-  libffcall = builderDefsPackage (import ../development/libraries/libffcall) {
-    inherit fetchcvs;
-  };
-
-  libffi = callPackage ../development/libraries/libffi { };
-
-  libftdi = callPackage ../development/libraries/libftdi { };
-
-  libftdi1 = callPackage ../development/libraries/libftdi/1.x.nix { };
-
-  libgcrypt = callPackage ../development/libraries/libgcrypt { };
-
-  libgcrypt_1_6 = lowPrio (callPackage ../development/libraries/libgcrypt/1.6.nix { });
-
-  libgdiplus = callPackage ../development/libraries/libgdiplus { };
-
-  libgksu = callPackage ../development/libraries/libgksu { };
-
-  libgpgerror = callPackage ../development/libraries/libgpg-error { };
-
-  libgphoto2 = callPackage ../development/libraries/libgphoto2 { };
-
-  libgphoto2_4 = callPackage ../development/libraries/libgphoto2/2.4.nix { };
-
-  libgpod = callPackage ../development/libraries/libgpod {
-    inherit (pkgs.pythonPackages) mutagen;
-  };
-
-  libharu = callPackage ../development/libraries/libharu { };
-
-  libical = callPackage ../development/libraries/libical { };
-
-  libicns = callPackage ../development/libraries/libicns { };
-
-  libimobiledevice = callPackage ../development/libraries/libimobiledevice { };
-
-  libiodbc = callPackage ../development/libraries/libiodbc {
-    useGTK = config.libiodbc.gtk or false;
-  };
-
-  libivykis = callPackage ../development/libraries/libivykis { };
-
-  liblastfmSF = callPackage ../development/libraries/liblastfmSF { };
-
-  liblastfm = callPackage ../development/libraries/liblastfm { };
-
-  liblqr1 = callPackage ../development/libraries/liblqr-1 { };
-
-  liblockfile = callPackage ../development/libraries/liblockfile { };
-
-  liblogging = callPackage ../development/libraries/liblogging { };
-
-  libmcrypt = callPackage ../development/libraries/libmcrypt {};
-
-  libmhash = callPackage ../development/libraries/libmhash {};
-
-  libmodbus = callPackage ../development/libraries/libmodbus {};
-
-  libmtp = callPackage ../development/libraries/libmtp { };
-
-  libmsgpack = callPackage ../development/libraries/libmsgpack { };
-
-  libnatspec = callPackage ../development/libraries/libnatspec { };
-
-  libnfc = callPackage ../development/libraries/libnfc { };
-
-  libnfsidmap = callPackage ../development/libraries/libnfsidmap { };
-
-  libnice = callPackage ../development/libraries/libnice { };
-
-  liboping = callPackage ../development/libraries/liboping { };
-
-  libplist = callPackage ../development/libraries/libplist { };
-
-  libQGLViewer = callPackage ../development/libraries/libqglviewer { };
-
-  libre = callPackage ../development/libraries/libre {};
-  librem = callPackage ../development/libraries/librem {};
-
-  libresample = callPackage ../development/libraries/libresample {};
-
-  librevenge = callPackage ../development/libraries/librevenge {};
-
-  librevisa = callPackage ../development/libraries/librevisa { };
-
-  libsamplerate = callPackage ../development/libraries/libsamplerate { };
-
-  libspectre = callPackage ../development/libraries/libspectre { };
-
-  libgsf = callPackage ../development/libraries/libgsf { };
-
-  libiconv = callPackage ../development/libraries/libiconv { };
-
-  libiconvOrEmpty = if libiconvOrNull == null then [] else [libiconv];
-
-  libiconvOrNull =
-    if gcc.libc or null != null || stdenv.isGlibc
-    then null
-    else libiconv;
-
-  # The logic behind this attribute is broken: libiconvOrNull==null does
-  # NOT imply libiconv=glibc! On Darwin, for example, we have a native
-  # libiconv library which is not glibc.
-  libiconvOrLibc = if libiconvOrNull == null then gcc.libc else libiconv;
-
-  # On non-GNU systems we need GNU Gettext for libintl.
-  libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux) gettext;
-
-  libid3tag = callPackage ../development/libraries/libid3tag { };
-
-  libidn = callPackage ../development/libraries/libidn { };
-
-  libiec61883 = callPackage ../development/libraries/libiec61883 { };
-
-  libinfinity = callPackage ../development/libraries/libinfinity {
-    inherit (gnome) gtkdoc;
-  };
-
-  libiptcdata = callPackage ../development/libraries/libiptcdata { };
-
-  libjpeg_original = callPackage ../development/libraries/libjpeg { };
-  libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo { };
-  libjpeg = if (stdenv.isLinux) then libjpeg_turbo else libjpeg_original; # some problems, both on FreeBSD and Darwin
-
-  libjpeg62 = callPackage ../development/libraries/libjpeg/62.nix {
-    libtool = libtool_1_5;
-  };
-
-  libjson_rpc_cpp = callPackage ../development/libraries/libjson-rpc-cpp { };
-
-  libkate = callPackage ../development/libraries/libkate { };
-
-  libksba = callPackage ../development/libraries/libksba { };
-
-  libmad = callPackage ../development/libraries/libmad { };
-
-  libmatchbox = callPackage ../development/libraries/libmatchbox { };
-
-  libmatthew_java = callPackage ../development/libraries/java/libmatthew-java { };
-
-  libmatroska = callPackage ../development/libraries/libmatroska { };
-
-  libmcs = callPackage ../development/libraries/libmcs { };
-
-  libmemcached = callPackage ../development/libraries/libmemcached { };
-
-  libmicrohttpd = callPackage ../development/libraries/libmicrohttpd { };
-
-  libmikmod = callPackage ../development/libraries/libmikmod {
-    # resolve the "stray '@' in program" errors
-    stdenv = if stdenv.isDarwin
-      then overrideGCC stdenv gccApple
-      else stdenv;
-  };
-
-  libmilter = callPackage ../development/libraries/libmilter { };
-
-  libmkv = callPackage ../development/libraries/libmkv { };
-
-  libmms = callPackage ../development/libraries/libmms { };
-
-  libmowgli = callPackage ../development/libraries/libmowgli { };
-
-  libmng = callPackage ../development/libraries/libmng { };
-
-  libmnl = callPackage ../development/libraries/libmnl { };
-
-  libmodplug = callPackage ../development/libraries/libmodplug {};
-
-  libmpcdec = callPackage ../development/libraries/libmpcdec { };
-
-  libmp3splt = callPackage ../development/libraries/libmp3splt { };
-
-  libmrss = callPackage ../development/libraries/libmrss { };
-
-  libmsn = callPackage ../development/libraries/libmsn { };
-
-  libmspack = callPackage ../development/libraries/libmspack { };
-
-  libmusclecard = callPackage ../development/libraries/libmusclecard { };
-
-  libmusicbrainz2 = callPackage ../development/libraries/libmusicbrainz/2.x.nix { };
-
-  libmusicbrainz3 = callPackage ../development/libraries/libmusicbrainz { };
-
-  libmusicbrainz5 = callPackage ../development/libraries/libmusicbrainz/5.x.nix { };
-
-  libmusicbrainz = libmusicbrainz3;
-
-  libmwaw = callPackage ../development/libraries/libmwaw { };
-
-  libmx = callPackage ../development/libraries/libmx { };
-
-  libnet = callPackage ../development/libraries/libnet { };
-
-  libnetfilter_conntrack = callPackage ../development/libraries/libnetfilter_conntrack { };
-
-  libnetfilter_queue = callPackage ../development/libraries/libnetfilter_queue { };
-
-  libnfnetlink = callPackage ../development/libraries/libnfnetlink { };
-
-  libnftnl = callPackage ../development/libraries/libnftnl { };
-
-  libnih = callPackage ../development/libraries/libnih { };
-
-  libnova = callPackage ../development/libraries/libnova { };
-
-  libnxml = callPackage ../development/libraries/libnxml { };
-
-  libodfgen = callPackage ../development/libraries/libodfgen { };
-
-  libofa = callPackage ../development/libraries/libofa { };
-
-  libofx = callPackage ../development/libraries/libofx { };
-
-  libogg = callPackage ../development/libraries/libogg { };
-
-  liboggz = callPackage ../development/libraries/liboggz { };
-
-  liboil = callPackage ../development/libraries/liboil { };
-
-  liboop = callPackage ../development/libraries/liboop { };
-
-  libopus = callPackage ../development/libraries/libopus { };
-
-  libosinfo = callPackage ../development/libraries/libosinfo {};
-
-  libosip = callPackage ../development/libraries/osip {};
-
-  libosip_3 = callPackage ../development/libraries/osip/3.nix {};
-
-  libotr = callPackage ../development/libraries/libotr {
-    libgcrypt = libgcrypt_1_6;
-  };
-
-  libotr_3_2 = callPackage ../development/libraries/libotr/3.2.nix { };
-
-  libp11 = callPackage ../development/libraries/libp11 { };
-
-  libpar2 = callPackage ../development/libraries/libpar2 { };
-
-  libpcap = callPackage ../development/libraries/libpcap { };
-
-  libpipeline = callPackage ../development/libraries/libpipeline { };
-
-  libpng = callPackage ../development/libraries/libpng { };
-  libpng_apng = libpng.override { apngSupport = true; };
-  libpng12 = callPackage ../development/libraries/libpng/12.nix { };
-  libpng15 = callPackage ../development/libraries/libpng/15.nix { };
-
-  libpaper = callPackage ../development/libraries/libpaper { };
-
-  libproxy = callPackage ../development/libraries/libproxy {
-    stdenv = if stdenv.isDarwin
-      then overrideGCC stdenv gcc
-      else stdenv;
-  };
-
-  libpseudo = callPackage ../development/libraries/libpseudo { };
-
-  libpwquality = callPackage ../development/libraries/libpwquality { };
-
-  libqalculate = callPackage ../development/libraries/libqalculate { };
-
-  librsvg = callPackage ../development/libraries/librsvg {
-    gtk2 = null; gtk3 = null; # neither gtk version by default
-  };
-
-  librsync = callPackage ../development/libraries/librsync { };
-
-  libsearpc = callPackage ../development/libraries/libsearpc { };
-
-  libsigcxx = callPackage ../development/libraries/libsigcxx { };
-
-  libsigcxx12 = callPackage ../development/libraries/libsigcxx/1.2.nix { };
-
-  libsigsegv = callPackage ../development/libraries/libsigsegv { };
-
-  # To bootstrap SBCL, I need CLisp 2.44.1; it needs libsigsegv 2.5
-  libsigsegv_25 = callPackage ../development/libraries/libsigsegv/2.5.nix { };
-
-  libsndfile = callPackage ../development/libraries/libsndfile { };
-
-  libsodium = callPackage ../development/libraries/libsodium { };
-
-  libsoup = callPackage ../development/libraries/libsoup { };
-
-  libssh = callPackage ../development/libraries/libssh { };
-
-  libssh2 = callPackage ../development/libraries/libssh2 { };
-
-  libstartup_notification = callPackage ../development/libraries/startup-notification { };
-
-  libspatialindex = callPackage ../development/libraries/libspatialindex { };
-
-  libspatialite = callPackage ../development/libraries/libspatialite { };
-
-  libtar = callPackage ../development/libraries/libtar { };
-
-  libtasn1 = callPackage ../development/libraries/libtasn1 { };
-
-  libtheora = callPackage ../development/libraries/libtheora { };
-
-  libtiff = callPackage ../development/libraries/libtiff { };
-
-  libtiger = callPackage ../development/libraries/libtiger { };
-
-  libtommath = callPackage ../development/libraries/libtommath { };
-
-  libtorrentRasterbar = callPackage ../development/libraries/libtorrent-rasterbar {
-    # fix "unrecognized option -arch" error
-    stdenv = if stdenv.isDarwin
-      then clangStdenv
-      else stdenv;
-  };
-
-  libtoxcore = callPackage ../development/libraries/libtoxcore { };
-
-  libtsm = callPackage ../development/libraries/libtsm { };
-
-  libtunepimp = callPackage ../development/libraries/libtunepimp { };
-
-  libtxc_dxtn = callPackage ../development/libraries/libtxc_dxtn { };
-
-  libtxc_dxtn_s2tc = callPackage ../development/libraries/libtxc_dxtn_s2tc { };
-
-  libgeotiff = callPackage ../development/libraries/libgeotiff { };
-
-  libunistring = callPackage ../development/libraries/libunistring { };
-
-  libupnp = callPackage ../development/libraries/pupnp { };
-
-  giflib = callPackage ../development/libraries/giflib { };
-  giflib_4_1 = callPackage ../development/libraries/giflib/4.1.nix { };
-
-  libungif = callPackage ../development/libraries/giflib/libungif.nix { };
-
-  libunibreak = callPackage ../development/libraries/libunibreak { };
-
-  libunique = callPackage ../development/libraries/libunique/default.nix { };
-
-  liburcu = callPackage ../development/libraries/liburcu { };
-
-  libusb = callPackage ../development/libraries/libusb {};
-
-  libusb1 = callPackage ../development/libraries/libusb1 {
-    stdenv = if stdenv.isDarwin
-      then clangStdenv
-      else stdenv;
-  };
-
-  libunwind = callPackage ../development/libraries/libunwind { };
-
-  libuvVersions = callPackage ../development/libraries/libuv { };
-
-  libv4l = lowPrio (v4l_utils.override {
-    withQt4 = false;
-  });
-
-  libva = callPackage ../development/libraries/libva { };
-
-  libvdpau = callPackage ../development/libraries/libvdpau { };
-
-  libvirt = callPackage ../development/libraries/libvirt { };
-
-  libvirt-glib = callPackage ../development/libraries/libvirt-glib { };
-
-  libvisio = callPackage ../development/libraries/libvisio { };
-
-  libvisual = callPackage ../development/libraries/libvisual { };
-
-  libvncserver = callPackage ../development/libraries/libvncserver {};
-
-  libviper = callPackage ../development/libraries/libviper { };
-
-  libvpx = callPackage ../development/libraries/libvpx { };
-
-  libvterm = callPackage ../development/libraries/libvterm { };
-
-  libvorbis = callPackage ../development/libraries/libvorbis { };
-
-  libwebp = callPackage ../development/libraries/libwebp { };
-
-  libwmf = callPackage ../development/libraries/libwmf { };
-
-  libwnck = libwnck2;
-  libwnck2 = callPackage ../development/libraries/libwnck { };
-  libwnck3 = callPackage ../development/libraries/libwnck/3.x.nix { };
-
-  libwpd = callPackage ../development/libraries/libwpd { };
-
-  libwpd_08 = callPackage ../development/libraries/libwpd/0.8.nix { };
-
-  libwpg = callPackage ../development/libraries/libwpg { };
-
-  libx86 = builderDefsPackage ../development/libraries/libx86 {};
-
-  libxdg_basedir = callPackage ../development/libraries/libxdg-basedir { };
-
-  libxkbcommon = callPackage ../development/libraries/libxkbcommon { };
-
-  libxklavier = callPackage ../development/libraries/libxklavier { };
-
-  libxmi = callPackage ../development/libraries/libxmi { };
-
-  libxml2 = callPackage ../development/libraries/libxml2 {
-    pythonSupport = false;
-  };
-
-  libxml2Python = lowPrio (libxml2.override {
-    pythonSupport = true;
-  });
-
-  libxmlxx = callPackage ../development/libraries/libxmlxx { };
-
-  libxmp = callPackage ../development/libraries/libxmp { };
-
-  libxslt = callPackage ../development/libraries/libxslt { };
-
-  libixp_for_wmii = lowPrio (import ../development/libraries/libixp_for_wmii {
-    inherit fetchurl stdenv;
-  });
-
-  libyaml = callPackage ../development/libraries/libyaml { };
-
-  libyamlcpp = callPackage ../development/libraries/libyaml-cpp { };
-  libyamlcpp03 = callPackage ../development/libraries/libyaml-cpp/0.3.x.nix { };
-
-  libyubikey = callPackage ../development/libraries/libyubikey {};
-
-  libzip = callPackage ../development/libraries/libzip { };
-
-  libzdb = callPackage ../development/libraries/libzdb { };
-
-  libzrtpcpp = callPackage ../development/libraries/libzrtpcpp { };
-  libzrtpcpp_1_6 = callPackage ../development/libraries/libzrtpcpp/1.6.nix {
-    ccrtp = ccrtp_1_8;
-  };
-
-  libwacom = callPackage ../development/libraries/libwacom { };
-
-  lightning = callPackage ../development/libraries/lightning { };
-
-  lirc = callPackage ../development/libraries/lirc { };
-
-  liquidfun = callPackage ../development/libraries/liquidfun { };
-
-  liquidwar = builderDefsPackage ../games/liquidwar {
-    inherit (xlibs) xproto libX11 libXrender;
-    inherit gmp mesa libjpeg
-      expat gettext perl
-      SDL SDL_image SDL_mixer SDL_ttf
-      curl sqlite
-      libogg libvorbis libcaca csound cunit
-      ;
-    guile = guile_1_8;
-    libpng = libpng15; # 0.0.13 needs libpng 1.2--1.5
-  };
-
-  log4cpp = callPackage ../development/libraries/log4cpp { };
-
-  log4cxx = callPackage ../development/libraries/log4cxx { };
-
-  log4cplus = callPackage ../development/libraries/log4cplus { };
-
-  loudmouth = callPackage ../development/libraries/loudmouth { };
-
-  lzo = callPackage ../development/libraries/lzo { };
-
-  mdds_0_7_1 = callPackage ../development/libraries/mdds/0.7.1.nix { };
-  mdds = callPackage ../development/libraries/mdds { };
-
-  # failed to build
-  mediastreamer = callPackage ../development/libraries/mediastreamer { };
-
-  menu-cache = callPackage ../development/libraries/menu-cache { };
-
-  mesaSupported = lib.elem system lib.platforms.mesaPlatforms;
-
-  mesaDarwinOr = alternative: if stdenv.isDarwin
-    then callPackage ../development/libraries/mesa-darwin { }
-    else alternative;
-  mesa_noglu = mesaDarwinOr (callPackage ../development/libraries/mesa {
-    # makes it slower, but during runtime we link against just mesa_drivers
-    # through /run/opengl-driver*, which is overriden according to config.grsecurity
-    grsecEnabled = true;
-  });
-  mesa_glu =  mesaDarwinOr (callPackage ../development/libraries/mesa-glu { });
-  mesa_drivers = mesaDarwinOr (
-    let mo = mesa_noglu.override {
-      grsecEnabled = config.grsecurity or false;
-    };
-    in mo.drivers
-  );
-  mesa = mesaDarwinOr (buildEnv {
-    name = "mesa-${mesa_noglu.version}";
-    paths = [ mesa_noglu mesa_glu ];
-  });
-
-  metaEnvironment = recurseIntoAttrs (let callPackage = newScope pkgs.metaEnvironment; in rec {
-    sdfLibrary    = callPackage ../development/libraries/sdf-library { aterm = aterm28; };
-    toolbuslib    = callPackage ../development/libraries/toolbuslib { aterm = aterm28; inherit (windows) w32api; };
-    cLibrary      = callPackage ../development/libraries/c-library { aterm = aterm28; };
-    errorSupport  = callPackage ../development/libraries/error-support { aterm = aterm28; };
-    ptSupport     = callPackage ../development/libraries/pt-support { aterm = aterm28; };
-    ptableSupport = callPackage ../development/libraries/ptable-support { aterm = aterm28; };
-    configSupport = callPackage ../development/libraries/config-support { aterm = aterm28; };
-    asfSupport    = callPackage ../development/libraries/asf-support { aterm = aterm28; };
-    tideSupport   = callPackage ../development/libraries/tide-support { aterm = aterm28; };
-    rstoreSupport = callPackage ../development/libraries/rstore-support { aterm = aterm28; };
-    sdfSupport    = callPackage ../development/libraries/sdf-support { aterm = aterm28; };
-    sglr          = callPackage ../development/libraries/sglr { aterm = aterm28; };
-    ascSupport    = callPackage ../development/libraries/asc-support { aterm = aterm28; };
-    pgen          = callPackage ../development/libraries/pgen { aterm = aterm28; };
-  });
-
-  ming = callPackage ../development/libraries/ming { };
-
-  minizip = callPackage ../development/libraries/minizip { };
-
-  minmay = callPackage ../development/libraries/minmay { };
-
-  miro = callPackage ../applications/video/miro {
-    inherit (pythonPackages) pywebkitgtk pysqlite pycurl mutagen;
-  };
-
-  mkvtoolnix = callPackage ../applications/video/mkvtoolnix { };
-
-  mlt-qt4 = callPackage ../development/libraries/mlt {
-    qt = qt4;
-    SDL = SDL_pulseaudio;
-  };
-
-  mlt-qt5 = callPackage ../development/libraries/mlt {
-    qt = qt5;
-    SDL = SDL_pulseaudio;
-  };
-
-  movit = callPackage ../development/libraries/movit { };
-
-  mps = callPackage ../development/libraries/mps { };
-
-  libmpeg2 = callPackage ../development/libraries/libmpeg2 { };
-
-  mpeg2dec = libmpeg2;
-
-  msilbc = callPackage ../development/libraries/msilbc { };
-
-  mp4v2 = callPackage ../development/libraries/mp4v2 { };
-
-  mpc = callPackage ../development/libraries/mpc { };
-
-  mpich2 = callPackage ../development/libraries/mpich2 { };
-
-  mtdev = callPackage ../development/libraries/mtdev { };
-
-  mtpfs = callPackage ../tools/filesystems/mtpfs { };
-
-  mu = callPackage ../tools/networking/mu {
-    texinfo = texinfo4;
-  };
-
-  muparser = callPackage ../development/libraries/muparser { };
-
-  mygpoclient = callPackage ../development/python-modules/mygpoclient { };
-
-  mygui = callPackage ../development/libraries/mygui {};
-
-  myguiSvn = callPackage ../development/libraries/mygui/svn.nix {};
-
-  mysocketw = callPackage ../development/libraries/mysocketw { };
-
-  mythes = callPackage ../development/libraries/mythes { };
-
-  nanomsg = callPackage ../development/libraries/nanomsg { };
-
-  ncurses = callPackage ../development/libraries/ncurses {
-    unicode = system != "i686-cygwin";
-  };
-
-  neon = callPackage ../development/libraries/neon {
-    compressionSupport = true;
-    sslSupport = true;
-  };
-
-  nethack = builderDefsPackage (import ../games/nethack) {
-    inherit ncurses flex bison;
-  };
-
-  nettle = callPackage ../development/libraries/nettle { };
-
-  newt = callPackage ../development/libraries/newt { };
-
-  nix-plugins = callPackage ../development/libraries/nix-plugins {
-    nix = pkgs.nixUnstable;
-  };
-
-  nspr = callPackage ../development/libraries/nspr { };
-
-  nss = lowPrio (callPackage ../development/libraries/nss { });
-
-  nssTools = callPackage ../development/libraries/nss {
-    includeTools = true;
-  };
-
-  ntrack = callPackage ../development/libraries/ntrack { };
-
-  nvidia-texture-tools = callPackage ../development/libraries/nvidia-texture-tools { };
-
-  ode = builderDefsPackage (import ../development/libraries/ode) { };
-
-  ogre = callPackage ../development/libraries/ogre {};
-
-  ogrepaged = callPackage ../development/libraries/ogrepaged { };
-
-  oniguruma = callPackage ../development/libraries/oniguruma { };
-
-  openal = callPackage ../development/libraries/openal { };
-
-  # added because I hope that it has been easier to compile on x86 (for blender)
-  openalSoft = callPackage ../development/libraries/openal-soft { };
-
-  openbabel = callPackage ../development/libraries/openbabel { };
-
-  opencascade = callPackage ../development/libraries/opencascade { };
-
-  opencascade_6_5 = callPackage ../development/libraries/opencascade/6.5.nix {
-    automake = automake111x;
-    ftgl = ftgl212;
-  };
-
-  opencascade_oce = callPackage ../development/libraries/opencascade/oce.nix { };
-
-  opencsg = callPackage ../development/libraries/opencsg { };
-
-  openct = callPackage ../development/libraries/openct { };
-
-  opencv = callPackage ../development/libraries/opencv { };
-
-  opencv_2_1 = callPackage ../development/libraries/opencv/2.1.nix {
-    libpng = libpng12;
-  };
-
-  # this ctl version is needed by openexr_viewers
-  openexr_ctl = callPackage ../development/libraries/openexr_ctl { };
-
-  openexr = callPackage ../development/libraries/openexr { };
-
-  openldap = callPackage ../development/libraries/openldap {
-    stdenv = if stdenv.isDarwin
-      then clangStdenv
-      else stdenv;
-  };
-
-  openlierox = callPackage ../games/openlierox { };
-
-  libopensc_dnie = callPackage ../development/libraries/libopensc-dnie { };
-
-  opencolorio = callPackage ../development/libraries/opencolorio { };
-
-  ois = callPackage ../development/libraries/ois {};
-
-  opal = callPackage ../development/libraries/opal {};
-
-  openjpeg = callPackage ../development/libraries/openjpeg { lcms = lcms2; };
-
-  openscenegraph = callPackage ../development/libraries/openscenegraph {
-    giflib = giflib_4_1;
-    ffmpeg = ffmpeg_0_10;
-  };
-
-  openspades = callPackage ../games/openspades {};
-
-  libressl = callPackage ../development/libraries/libressl { };
-
-  boringssl = callPackage ../development/libraries/boringssl { };
-
-  openssl = callPackage ../development/libraries/openssl {
-    fetchurl = fetchurlBoot;
-    cryptodevHeaders = linuxPackages.cryptodev.override {
-      fetchurl = fetchurlBoot;
-      onlyHeaders = true;
-    };
-  };
-
-  ortp = callPackage ../development/libraries/ortp {
-    srtp = srtp_linphone;
-  };
-
-  p11_kit = callPackage ../development/libraries/p11-kit { };
-
-  paperkey = callPackage ../tools/security/paperkey { };
-
-  pangoxsl = callPackage ../development/libraries/pangoxsl { };
-
-  pcl = callPackage ../development/libraries/pcl {
-    vtk = vtkWithQt4;
-  };
-
-  pcre = callPackage ../development/libraries/pcre {
-    unicodeSupport = config.pcre.unicode or true;
-  };
-
-  pdf2xml = callPackage ../development/libraries/pdf2xml {} ;
-
-  phonon = callPackage ../development/libraries/phonon { };
-
-  phonon_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer { };
-
-  phonon_backend_vlc = callPackage ../development/libraries/phonon-backend-vlc { };
-
-  physfs = callPackage ../development/libraries/physfs { };
-
-  pkcs11helper = callPackage ../development/libraries/pkcs11helper { };
-
-  plib = callPackage ../development/libraries/plib { };
-
-  pocketsphinx = callPackage ../development/libraries/pocketsphinx { };
-
-  podofo = callPackage ../development/libraries/podofo { };
-
-  polkit = callPackage ../development/libraries/polkit {
-    spidermonkey = spidermonkey_185;
-  };
-
-  polkit_qt_1 = callPackage ../development/libraries/polkit-qt-1 { };
-
-  policykit = callPackage ../development/libraries/policykit { };
-
-  poppler = callPackage ../development/libraries/poppler { lcms = lcms2; };
-  popplerQt4 = poppler.poppler_qt4;
-
-  popt = callPackage ../development/libraries/popt { };
-
-  portaudio = callPackage ../development/libraries/portaudio {
-    # resolves a variety of compile-time errors
-    stdenv = if stdenv.isDarwin
-      then clangStdenv
-      else stdenv;
-  };
-
-  portaudioSVN = callPackage ../development/libraries/portaudio/svn-head.nix { };
-
-  portmidi = callPackage ../development/libraries/portmidi {};
-
-  prison = callPackage ../development/libraries/prison { };
-
-  proj = callPackage ../development/libraries/proj { };
-
-  postgis = callPackage ../development/libraries/postgis { };
-
-  protobuf = callPackage ../development/libraries/protobuf { };
-
-  protobufc = callPackage ../development/libraries/protobufc { };
-
-  pth = callPackage ../development/libraries/pth { };
-
-  ptlib = callPackage ../development/libraries/ptlib {};
-
-  re2 = callPackage ../development/libraries/re2 { };
-
-  qca2 = callPackage ../development/libraries/qca2 {};
-
-  qca2_ossl = callPackage ../development/libraries/qca2/ossl.nix {};
-
-  qimageblitz = callPackage ../development/libraries/qimageblitz {};
-
-  qjson = callPackage ../development/libraries/qjson { };
-
-  qoauth = callPackage ../development/libraries/qoauth { };
-
-  qt3 = callPackage ../development/libraries/qt-3 {
-    openglSupport = mesaSupported;
-    libpng = libpng12;
-  };
-
-  qt4 = pkgs.kde4.qt4;
-
-  qt48 = callPackage ../development/libraries/qt-4.x/4.8 {
-    # GNOME dependencies are not used unless gtkStyle == true
-    mesa = mesa_noglu;
-    inherit (pkgs.gnome) libgnomeui GConf gnome_vfs;
-    cups = if stdenv.isLinux then cups else null;
-
-    # resolve unrecognised flag '-fconstant-cfstrings' errors
-    stdenv = if stdenv.isDarwin
-      then clangStdenv
-      else stdenv;
-  };
-
-  qt48Full = qt48.override {
-    docs = true;
-    demos = true;
-    examples = true;
-    developerBuild = true;
-  };
-
-  qt4SDK = qtcreator.override {
-    sdkBuild = true;
-    qtLib = qt48Full;
-  };
-
-  qt53Full = qt53.override {
-    buildDocs = true;
-    buildExamples = true;
-    buildTests = true;
-    developerBuild = true;
-  };
-
-  qt53 = callPackage ../development/libraries/qt-5/qt-5.3.nix {
-    mesa = mesa_noglu;
-    cups = if stdenv.isLinux then cups else null;
-    # GNOME dependencies are not used unless gtkStyle == true
-    inherit (gnome) libgnomeui GConf gnome_vfs;
-    bison = bison2; # error: too few arguments to function 'int yylex(...
-  };
-
-  qt5 = callPackage ../development/libraries/qt-5 {
-    mesa = mesa_noglu;
-    cups = if stdenv.isLinux then cups else null;
-    # GNOME dependencies are not used unless gtkStyle == true
-    inherit (gnome) libgnomeui GConf gnome_vfs;
-    bison = bison2; # error: too few arguments to function 'int yylex(...
-  };
-
-  qt5Full = qt5.override {
-    buildDocs = true;
-    buildExamples = true;
-    buildTests = true;
-    developerBuild = true;
-  };
-
-  qt5SDK = qtcreator.override {
-    sdkBuild = true;
-    qtLib = qt5Full;
-  };
-
-  qtcreator = callPackage ../development/qtcreator {
-    qtLib = qt48.override { developerBuild = true; };
-  };
-
-  qtscriptgenerator = callPackage ../development/libraries/qtscriptgenerator { };
-
-  quesoglc = callPackage ../development/libraries/quesoglc { };
-
-  qwt = callPackage ../development/libraries/qwt {};
-
-  qwt6 = callPackage ../development/libraries/qwt/6.nix { };
-
-  rabbitmq-c = callPackage ../development/libraries/rabbitmq-c {};
-
-  rabbitmq-java-client = callPackage ../development/libraries/rabbitmq-java-client {};
-
-  raul = callPackage ../development/libraries/audio/raul { };
-
-  readline = readline6; # 6.2 works, 6.3 breaks python, parted
-
-  readline4 = callPackage ../development/libraries/readline/readline4.nix { };
-
-  readline5 = callPackage ../development/libraries/readline/readline5.nix { };
-
-  readline6 = callPackage ../development/libraries/readline/readline6.nix { };
-
-  readline63 = callPackage ../development/libraries/readline/readline6.3.nix { };
-
-  librdf_raptor = callPackage ../development/libraries/librdf/raptor.nix { };
-
-  librdf_raptor2 = callPackage ../development/libraries/librdf/raptor2.nix { };
-
-  librdf_rasqal = callPackage ../development/libraries/librdf/rasqal.nix { };
-
-  librdf_redland = callPackage ../development/libraries/librdf/redland.nix { };
-
-  librdf = callPackage ../development/libraries/librdf { };
-
-  lilv = callPackage ../development/libraries/audio/lilv { };
-
-  lv2 = callPackage ../development/libraries/audio/lv2 { };
-
-  lvtk = callPackage ../development/libraries/audio/lvtk { };
-
-  qrupdate = callPackage ../development/libraries/qrupdate { };
-
-  redland = pkgs.librdf_redland;
-
-  rhino = callPackage ../development/libraries/java/rhino {
-    javac = gcj;
-    jvm = gcj;
-  };
-
-  rlog = callPackage ../development/libraries/rlog { };
-
-  rubberband = callPackage ../development/libraries/rubberband {
-    fftw = fftwSinglePrec;
-    inherit (vamp) vampSDK;
-  };
-
-  sbc = callPackage ../development/libraries/sbc { };
-
-  schroedinger = callPackage ../development/libraries/schroedinger { };
-
-  SDL = callPackage ../development/libraries/SDL {
-    openglSupport = mesaSupported;
-    alsaSupport = (!stdenv.isDarwin);
-    x11Support = true;
-    pulseaudioSupport = stdenv.isDarwin; # better go through ALSA
-
-    # resolve the unrecognized -fpascal-strings option error
-    stdenv = if stdenv.isDarwin
-      then clangStdenv
-      else stdenv;
-  };
-
-  # Fixes major problems with choppy sound in MLT / Kdenlive / Shotcut
-  SDL_pulseaudio = SDL.override { pulseaudioSupport = true; };
-
-  SDL_gfx = callPackage ../development/libraries/SDL_gfx { };
-
-  SDL_image = callPackage ../development/libraries/SDL_image {
-    # provide an Objective-C compiler
-    stdenv = if stdenv.isDarwin
-      then clangStdenv
-      else stdenv;
-  };
-
-  SDL_mixer = callPackage ../development/libraries/SDL_mixer { };
-
-  SDL_net = callPackage ../development/libraries/SDL_net { };
-
-  SDL_sound = callPackage ../development/libraries/SDL_sound { };
-
-  SDL_ttf = callPackage ../development/libraries/SDL_ttf { };
-
-  SDL2 = callPackage ../development/libraries/SDL2 {
-    openglSupport = mesaSupported;
-    alsaSupport = true;
-    x11Support = true;
-    pulseaudioSupport = false; # better go through ALSA
-  };
-
-  SDL2_image = callPackage ../development/libraries/SDL2_image { };
-
-  SDL2_mixer = callPackage ../development/libraries/SDL2_mixer { };
-
-  SDL2_net = callPackage ../development/libraries/SDL2_net { };
-
-  SDL2_gfx = callPackage ../development/libraries/SDL2_gfx { };
-
-  serd = callPackage ../development/libraries/serd {};
-
-  serf = callPackage ../development/libraries/serf {};
-
-  silgraphite = callPackage ../development/libraries/silgraphite {};
-  graphite2 = callPackage ../development/libraries/silgraphite/graphite2.nix {};
-
-  simgear = callPackage ../development/libraries/simgear { };
-
-  sfml_git = callPackage ../development/libraries/sfml { };
-
-  skalibs = callPackage ../development/libraries/skalibs { };
-
-  slang = callPackage ../development/libraries/slang { };
-
-  slibGuile = callPackage ../development/libraries/slib {
-    scheme = guile_1_8;
-    texinfo = texinfo4; # otherwise erros: must be after `@defun' to use `@defunx'
-  };
-
-  smpeg = callPackage ../development/libraries/smpeg { };
-
-  snack = callPackage ../development/libraries/snack {
-        # optional
-  };
-
-  snappy = callPackage ../development/libraries/snappy { };
-
-  sodium = callPackage ../development/libraries/sodium {};
-
-  sofia_sip = callPackage ../development/libraries/sofia-sip { };
-
-  soprano = callPackage ../development/libraries/soprano { };
-
-  soqt = callPackage ../development/libraries/soqt { };
-
-  sord = callPackage ../development/libraries/sord {};
-
-  spandsp = callPackage ../development/libraries/spandsp {};
-
-  speechd = callPackage ../development/libraries/speechd { };
-
-  speech_tools = callPackage ../development/libraries/speech-tools {};
-
-  speex = callPackage ../development/libraries/speex { };
-
-  sphinxbase = callPackage ../development/libraries/sphinxbase { };
-
-  spice = callPackage ../development/libraries/spice {
-    celt = celt_0_5_1;
-    inherit (xlibs) libXrandr libXfixes libXext libXrender libXinerama;
-    inherit (pythonPackages) pyparsing;
-  };
-
-  spice_gtk = callPackage ../development/libraries/spice-gtk { };
-
-  spice_protocol = callPackage ../development/libraries/spice-protocol { };
-
-  sratom = callPackage ../development/libraries/audio/sratom { };
-
-  srtp = callPackage ../development/libraries/srtp {};
-
-  srtp_linphone = callPackage ../development/libraries/srtp/linphone.nix { };
-
-  sqlite = lowPrio (callPackage ../development/libraries/sqlite {
-    readline = null;
-    ncurses = null;
-  });
-
-  sqliteInteractive = appendToName "interactive" (sqlite.override {
-    inherit readline ncurses;
-  });
-
-  sqlcipher = lowPrio (callPackage ../development/libraries/sqlcipher {
-    readline = null;
-    ncurses = null;
-  });
-
-  stfl = callPackage ../development/libraries/stfl {
-    stdenv = if stdenv.isDarwin
-      then overrideGCC stdenv gccApple
-      else stdenv;
-  };
-
-  stlink = callPackage ../development/tools/misc/stlink { };
-
-  steghide = callPackage ../tools/security/steghide {};
-
-  stepmania = callPackage ../games/stepmania {};
-
-  stlport = callPackage ../development/libraries/stlport { };
-
-  strigi = callPackage ../development/libraries/strigi { clucene_core = clucene_core_2; };
-
-  subtitleeditor = callPackage ../applications/video/subtitleeditor { };
-
-  suil = callPackage ../development/libraries/audio/suil { };
-
-  suitesparse = callPackage ../development/libraries/suitesparse { };
-
-  sutils = callPackage ../tools/misc/sutils { };
-
-  sword = callPackage ../development/libraries/sword { };
-
-  szip = callPackage ../development/libraries/szip { };
-
-  t1lib = callPackage ../development/libraries/t1lib { };
-
-  taglib = callPackage ../development/libraries/taglib { };
-
-  taglib_extras = callPackage ../development/libraries/taglib-extras { };
-
-  talloc = callPackage ../development/libraries/talloc { };
-
-  tclap = callPackage ../development/libraries/tclap {};
-
-  tclgpg = callPackage ../development/libraries/tclgpg { };
-
-  tcllib = callPackage ../development/libraries/tcllib { };
-
-  tcltls = callPackage ../development/libraries/tcltls { };
-
-  tdb = callPackage ../development/libraries/tdb { };
-
-  tecla = callPackage ../development/libraries/tecla { };
-
-  telepathy_glib = callPackage ../development/libraries/telepathy/glib { };
-
-  telepathy_farstream = callPackage ../development/libraries/telepathy/farstream {};
-
-  telepathy_qt = callPackage ../development/libraries/telepathy/qt { };
-
-  thrift = callPackage ../development/libraries/thrift { };
-
-  tinyxml = tinyxml2;
-
-  tinyxml2 = callPackage ../development/libraries/tinyxml/2.6.2.nix { };
-
-  tk = callPackage ../development/libraries/tk { };
-
-  tnt = callPackage ../development/libraries/tnt { };
-
-  tokyocabinet = callPackage ../development/libraries/tokyo-cabinet { };
-  tokyotyrant = callPackage ../development/libraries/tokyo-tyrant { };
-
-  tremor = callPackage ../development/libraries/tremor { };
-
-  unicap = callPackage ../development/libraries/unicap {};
-
-  tsocks = callPackage ../development/libraries/tsocks { };
-
-  unixODBC = callPackage ../development/libraries/unixODBC { };
-
-  unixODBCDrivers = recurseIntoAttrs (import ../development/libraries/unixODBCDrivers {
-    inherit fetchurl stdenv unixODBC glibc libtool openssl zlib;
-    inherit postgresql mysql sqlite;
-  });
-
-  urt = callPackage ../development/libraries/urt { };
-
-  ustr = callPackage ../development/libraries/ustr { };
-
-  usbredir = callPackage ../development/libraries/usbredir {
-    libusb = libusb1;
-  };
-
-  ucommon = callPackage ../development/libraries/ucommon { };
-
-  v8 = callPackage ../development/libraries/v8 {
-    inherit (pythonPackages) gyp;
-  };
-
-  vaapiIntel = callPackage ../development/libraries/vaapi-intel { };
-
-  vaapiVdpau = callPackage ../development/libraries/vaapi-vdpau { };
-
-  vamp = callPackage ../development/libraries/audio/vamp { };
-
-  vcdimager = callPackage ../development/libraries/vcdimager { };
-
-  vigra = callPackage ../development/libraries/vigra {
-    inherit (pkgs.pythonPackages) numpy;
-  };
-
-  vlock = callPackage ../misc/screensavers/vlock { };
-
-  vmime = callPackage ../development/libraries/vmime { };
-
-  vrpn = callPackage ../development/libraries/vrpn { };
-
-  vtk = callPackage ../development/libraries/vtk { };
-
-  vtkWithQt4 = vtk.override { qtLib = qt4; };
-
-  vxl = callPackage ../development/libraries/vxl {
-    libpng = libpng12;
-  };
-
-  wayland = callPackage ../development/libraries/wayland { };
-
-  webkit = webkitgtk;
-
-  webkitgtk = callPackage ../development/libraries/webkitgtk {
-    harfbuzz = harfbuzz.override {
-      withIcu = true;
-    };
-    gst-plugins-base = gst_all_1.gst-plugins-base;
-  };
-
-  webkitgtk2 = webkitgtk.override {
-    withGtk2 = true;
-    enableIntrospection = false;
-  };
-
-  wildmidi = callPackage ../development/libraries/wildmidi { };
-
-  wvstreams = callPackage ../development/libraries/wvstreams { };
-
-  wxGTK = wxGTK28;
-
-  wxGTK28 = callPackage ../development/libraries/wxGTK-2.8 {
-    inherit (gnome) GConf;
-    withMesa = lib.elem system lib.platforms.mesaPlatforms;
-  };
-
-  wxGTK29 = callPackage ../development/libraries/wxGTK-2.9/default.nix {
-    inherit (gnome) GConf;
-    withMesa = lib.elem system lib.platforms.mesaPlatforms;
-
-    # use for Objective-C++ compiler
-    stdenv = if stdenv.isDarwin
-      then clangStdenv
-      else stdenv;
-  };
-
-  wxGTK30 = callPackage ../development/libraries/wxGTK-3.0/default.nix {
-    inherit (gnome) GConf;
-    withMesa = lib.elem system lib.platforms.mesaPlatforms;
-
-    # use for Objective-C++ compiler
-    stdenv = if stdenv.isDarwin
-      then clangStdenv
-      else stdenv;
-  };
-
-  wtk = callPackage ../development/libraries/wtk { };
-
-  x264 = callPackage ../development/libraries/x264 { };
-
-  xapian = callPackage ../development/libraries/xapian { };
-
-  xapianBindings = callPackage ../development/libraries/xapian/bindings {  # TODO perl php Java, tcl, C#, python
-  };
-
-  xapian10 = callPackage ../development/libraries/xapian/1.0.x.nix { };
-
-  xapianBindings10 = callPackage ../development/libraries/xapian/bindings/1.0.x.nix {  # TODO perl php Java, tcl, C#, python
-  };
-
-  Xaw3d = callPackage ../development/libraries/Xaw3d { };
-
-  xbase = callPackage ../development/libraries/xbase { };
-
-  xcb-util-cursor = callPackage ../development/libraries/xcb-util-cursor { };
-
-  xdo = callPackage ../tools/misc/xdo { };
-
-  xineLib = callPackage ../development/libraries/xine-lib {
-    ffmpeg = ffmpeg_1;
-  };
-
-  xautolock = callPackage ../misc/screensavers/xautolock { };
-
-  xercesc = callPackage ../development/libraries/xercesc {};
-
-  xlibsWrapper = callPackage ../development/libraries/xlibs-wrapper {
-    packages = [
-      freetype fontconfig xlibs.xproto xlibs.libX11 xlibs.libXt
-      xlibs.libXft xlibs.libXext xlibs.libSM xlibs.libICE
-      xlibs.xextproto
-    ];
-  };
-
-  xmlrpc_c = callPackage ../development/libraries/xmlrpc-c { };
-
-  xmlsec = callPackage ../development/libraries/xmlsec { };
-
-  xvidcore = callPackage ../development/libraries/xvidcore { };
-
-  xylib = callPackage ../development/libraries/xylib { };
-
-  yajl = callPackage ../development/libraries/yajl { };
-
-  zangband = builderDefsPackage (import ../games/zangband) {
-    inherit ncurses flex bison autoconf automake m4 coreutils;
-  };
-
-  zeitgeist = callPackage ../development/libraries/zeitgeist { };
-
-  zlib = callPackage ../development/libraries/zlib {
-    fetchurl = fetchurlBoot;
-  };
-
-  zlibStatic = lowPrio (appendToName "static" (callPackage ../development/libraries/zlib {
-    static = true;
-  }));
-
-  zeromq2 = callPackage ../development/libraries/zeromq/2.x.nix {};
-  zeromq3 = callPackage ../development/libraries/zeromq/3.x.nix {};
-  zeromq4 = callPackage ../development/libraries/zeromq/4.x.nix {};
-
-  zziplib = callPackage ../development/libraries/zziplib { };
-
-
-  ### DEVELOPMENT / LIBRARIES / JAVA
-
-  atermjava = callPackage ../development/libraries/java/aterm {
-    stdenv = overrideInStdenv stdenv [gnumake380];
-  };
-
-  commonsFileUpload = callPackage ../development/libraries/java/jakarta-commons/file-upload { };
-
-  fastjar = callPackage ../development/tools/java/fastjar { };
-
-  httpunit = callPackage ../development/libraries/java/httpunit { };
-
-  gwtdragdrop = callPackage ../development/libraries/java/gwt-dragdrop { };
-
-  gwtwidgets = callPackage ../development/libraries/java/gwt-widgets { };
-
-  jakartabcel = callPackage ../development/libraries/java/jakarta-bcel {
-    regexp = jakartaregexp;
-  };
-
-  jakartaregexp = callPackage ../development/libraries/java/jakarta-regexp { };
-
-  javaCup = callPackage ../development/libraries/java/cup { };
-
-  javasvn = callPackage ../development/libraries/java/javasvn { };
-
-  jclasslib = callPackage ../development/tools/java/jclasslib { };
-
-  jdom = callPackage ../development/libraries/java/jdom { };
-
-  jflex = callPackage ../development/libraries/java/jflex { };
-
-  jjtraveler = callPackage ../development/libraries/java/jjtraveler {
-    stdenv = overrideInStdenv stdenv [gnumake380];
-  };
-
-  junit = callPackage ../development/libraries/java/junit { antBuild = releaseTools.antBuild; };
-
-  junixsocket = callPackage ../development/libraries/java/junixsocket { };
-
-  jzmq = callPackage ../development/libraries/java/jzmq { };
-
-  lucene = callPackage ../development/libraries/java/lucene { };
-
-  mockobjects = callPackage ../development/libraries/java/mockobjects { };
-
-  saxon = callPackage ../development/libraries/java/saxon { };
-
-  saxonb = callPackage ../development/libraries/java/saxon/default8.nix { };
-
-  sharedobjects = callPackage ../development/libraries/java/shared-objects {
-    stdenv = overrideInStdenv stdenv [gnumake380];
-  };
-
-  smack = callPackage ../development/libraries/java/smack { };
-
-  swt = callPackage ../development/libraries/java/swt {
-    inherit (gnome) libsoup;
-  };
-
-
-  ### DEVELOPMENT / LIBRARIES / JAVASCRIPT
-
-  jquery_ui = callPackage ../development/libraries/javascript/jquery-ui { };
-
-  yuicompressor = callPackage ../development/tools/yuicompressor { };
-
-  ### DEVELOPMENT / LISP MODULES
-
-  asdf = callPackage ../development/lisp-modules/asdf {
-    texLive = null;
-  };
-
-  clwrapperFunction = callPackage ../development/lisp-modules/clwrapper;
-
-  wrapLisp = lisp: clwrapperFunction { inherit lisp; };
-
-  lispPackagesFor = clwrapper: callPackage ../development/lisp-modules/lisp-packages.nix {
-    inherit clwrapper;
-  };
-
-  lispPackagesClisp = lispPackagesFor (wrapLisp clisp);
-  lispPackagesSBCL = lispPackagesFor (wrapLisp sbcl);
-  lispPackages = recurseIntoAttrs lispPackagesSBCL;
-
-
-  ### DEVELOPMENT / PERL MODULES
-
-  buildPerlPackage = import ../development/perl-modules/generic perl;
-
-  perlPackages = recurseIntoAttrs (import ./perl-packages.nix {
-    inherit pkgs;
-    overrides = (config.perlPackageOverrides or (p: {})) pkgs;
-  });
-
-  perl514Packages = import ./perl-packages.nix {
-    pkgs = pkgs // {
-      perl = perl514;
-      buildPerlPackage = import ../development/perl-modules/generic perl514;
-    };
-    overrides = (config.perl514PackageOverrides or (p: {})) pkgs;
-  };
-
-  perlXMLParser = perlPackages.XMLParser;
-
-  ack = perlPackages.ack;
-
-  perlArchiveCpio = perlPackages.ArchiveCpio;
-
-  perlcritic = perlPackages.PerlCritic;
-
-  planetary_annihilation = callPackage ../games/planetaryannihilation { };
-
-
-  ### DEVELOPMENT / PYTHON MODULES
-
-  # python function with default python interpreter
-  buildPythonPackage = pythonPackages.buildPythonPackage;
-
-  # `nix-env -i python-nose` installs for 2.7, the default python.
-  # Therefore we do not recurse into attributes here, in contrast to
-  # python27Packages. `nix-env -iA python26Packages.nose` works
-  # regardless.
-  python26Packages = import ./python-packages.nix {
-    inherit pkgs;
-    python = python26;
-  };
-
-  python27Packages = lib.hiPrioSet (recurseIntoAttrs (import ./python-packages.nix {
-    inherit pkgs;
-    python = python27;
-  }));
-
-  python32Packages = import ./python-packages.nix {
-    inherit pkgs;
-    python = python32;
-  };
-
-  python33Packages = recurseIntoAttrs (import ./python-packages.nix {
-    inherit pkgs;
-    python = python33;
-  });
-
-  python34Packages = recurseIntoAttrs (import ./python-packages.nix {
-    inherit pkgs;
-    python = python34;
-  });
-
-  pypyPackages = recurseIntoAttrs (import ./python-packages.nix {
-    inherit pkgs;
-    python = pypy;
-  });
-
-  foursuite = callPackage ../development/python-modules/4suite { };
-
-  bsddb3 = callPackage ../development/python-modules/bsddb3 { };
-
-  ecdsa = callPackage ../development/python-modules/ecdsa { };
-
-  numeric = callPackage ../development/python-modules/numeric { };
-
-  pil = pythonPackages.pil;
-
-  psyco = callPackage ../development/python-modules/psyco { };
-
-  pycairo = pythonPackages.pycairo;
-
-  pycapnp = pythonPackages.pycapnp;
-
-  pycrypto = pythonPackages.pycrypto;
-
-  pycups = callPackage ../development/python-modules/pycups { };
-
-  pyexiv2 = callPackage ../development/python-modules/pyexiv2 { };
-
-  pygame = callPackage ../development/python-modules/pygame { };
-
-  pygobject = pythonPackages.pygobject;
-
-  pygobject3 = pythonPackages.pygobject3;
-
-  pygtk = pythonPackages.pygtk;
-
-  pyGtkGlade = pythonPackages.pyGtkGlade;
-
-  pylint = callPackage ../development/python-modules/pylint { };
-
-  pyopenssl = builderDefsPackage (import ../development/python-modules/pyopenssl) {
-    inherit python openssl;
-  };
-
-  rhpl = callPackage ../development/python-modules/rhpl { };
-
-  sip = callPackage ../development/python-modules/sip { };
-
-  pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix {
-    stdenv = if stdenv.isDarwin
-      then clangStdenv
-      else stdenv;
-  };
-
-  pysideApiextractor = callPackage ../development/python-modules/pyside/apiextractor.nix { };
-
-  pysideGeneratorrunner = callPackage ../development/python-modules/pyside/generatorrunner.nix { };
-
-  pyside = callPackage ../development/python-modules/pyside { };
-
-  pysideTools = callPackage ../development/python-modules/pyside/tools.nix { };
-
-  pysideShiboken = callPackage ../development/python-modules/pyside/shiboken.nix { };
-
-  pyx = callPackage ../development/python-modules/pyx { };
-
-  pyxml = callPackage ../development/python-modules/pyxml { };
-
-  rbtools = callPackage ../development/python-modules/rbtools { };
-
-  setuptools = pythonPackages.setuptools;
-
-  slowaes = callPackage ../development/python-modules/slowaes { };
-
-  wxPython = pythonPackages.wxPython;
-  wxPython28 = pythonPackages.wxPython28;
-
-  twisted = pythonPackages.twisted;
-
-  ZopeInterface = pythonPackages.zope_interface;
-
-  ### DEVELOPMENT / R MODULES
-
-  R = callPackage ../applications/science/math/R {
-    inherit (xlibs) libX11 libXt;
-    texLive = texLiveAggregationFun { paths = [ texLive texLiveExtra ]; };
-    withRecommendedPackages = false;
-  };
-
-  rWrapper = callPackage ../development/r-modules/wrapper.nix {
-    # Those packages are usually installed as part of the R build.
-    recommendedPackages = with rPackages; [ MASS lattice Matrix nlme
-      survival boot cluster codetools foreign KernSmooth rpart class
-      nnet spatial mgcv ];
-    # Override this attribute to register additional libraries.
-    packages = [];
-  };
-
-  rPackages = import ../development/r-modules/cran-packages.nix {
-    inherit pkgs;
-    overrides = (config.rPackageOverrides or (p: {})) pkgs;
-  };
-
-  ### SERVERS
-
-  rdf4store = callPackage ../servers/http/4store { };
-
-  apacheHttpd = pkgs.apacheHttpd_2_2;
-
-  apacheHttpd_2_2 = callPackage ../servers/http/apache-httpd/2.2.nix {
-    sslSupport = true;
-  };
-
-  apacheHttpd_2_4 = lowPrio (callPackage ../servers/http/apache-httpd/2.4.nix {
-    sslSupport = true;
-  });
-
-  apcupsd = callPackage ../servers/apcupsd { };
-
-  sabnzbd = callPackage ../servers/sabnzbd { };
-
-  bind = callPackage ../servers/dns/bind { };
-
-  bird = callPackage ../servers/bird { };
-
-  couchdb = callPackage ../servers/http/couchdb {
-    spidermonkey = spidermonkey_185;
-    python = python27;
-    sphinx = python27Packages.sphinx;
-    erlang = erlangR16;
-  };
-
-  dico = callPackage ../servers/dico { };
-
-  dict = callPackage ../servers/dict {
-      libmaa = callPackage ../servers/dict/libmaa.nix {};
-  };
-
-  dictdDBs = recurseIntoAttrs (import ../servers/dict/dictd-db.nix {
-    inherit builderDefs;
-  });
-
-  dictDBCollector = import ../servers/dict/dictd-db-collector.nix {
-    inherit stdenv lib dict;
-  };
-
-  dictdWiktionary = callPackage ../servers/dict/dictd-wiktionary.nix {};
-
-  dictdWordnet = callPackage ../servers/dict/dictd-wordnet.nix {};
-
-  diod = callPackage ../servers/diod { };
-
-  dovecot = dovecot21;
-
-  dovecot21 = callPackage ../servers/mail/dovecot { };
-
-  dovecot22 = callPackage ../servers/mail/dovecot/2.2.x.nix { };
-
-  dovecot_pigeonhole = callPackage ../servers/mail/dovecot-pigeonhole { };
-
-  etcd = callPackage ../servers/etcd { };
-
-  ejabberd = callPackage ../servers/xmpp/ejabberd {
-    erlang = erlangR16;
-  };
-
-  elasticmq = callPackage ../servers/elasticmq { };
-
-  etcdctl = callPackage ../development/tools/etcdctl { };
-
-  fcgiwrap = callPackage ../servers/fcgiwrap { };
-
-  felix = callPackage ../servers/felix { };
-
-  felix_remoteshell = callPackage ../servers/felix/remoteshell.nix { };
-
-  fingerd_bsd = callPackage ../servers/fingerd/bsd-fingerd { };
-
-  firebird = callPackage ../servers/firebird { icu = null; };
-  firebirdSuper = callPackage ../servers/firebird { superServer = true; };
-
-  fleet = callPackage ../servers/fleet { };
-
-  freepops = callPackage ../servers/mail/freepops { };
-
-  freeswitch = callPackage ../servers/sip/freeswitch { };
-
-  ghostOne = callPackage ../servers/games/ghost-one {
-    boost = boost144.override { taggedLayout = true; };
-  };
-
-  ircdHybrid = callPackage ../servers/irc/ircd-hybrid { };
-
-  jboss = callPackage ../servers/http/jboss { };
-
-  jboss_mysql_jdbc = callPackage ../servers/http/jboss/jdbc/mysql { };
-
-  jetty = callPackage ../servers/http/jetty { };
-
-  jetty61 = callPackage ../servers/http/jetty/6.1 { };
-
-  joseki = callPackage ../servers/http/joseki {};
-
-  leafnode = callPackage ../servers/news/leafnode { };
-
-  lighttpd = callPackage ../servers/http/lighttpd { };
-
-  mailman = callPackage ../servers/mail/mailman { };
-
-  mediatomb = callPackage ../servers/mediatomb { };
-
-  memcached = callPackage ../servers/memcached {};
-
-  mod_dnssd = callPackage ../servers/http/apache-modules/mod_dnssd/default.nix { };
-
-  mod_evasive = callPackage ../servers/http/apache-modules/mod_evasive { };
-
-  mod_python = callPackage ../servers/http/apache-modules/mod_python { };
-
-  mod_fastcgi = callPackage ../servers/http/apache-modules/mod_fastcgi { };
-
-  mod_wsgi = callPackage ../servers/http/apache-modules/mod_wsgi { };
-
-  mpd = callPackage ../servers/mpd {
-    aacSupport    = config.mpd.aacSupport or true;
-    ffmpegSupport = config.mpd.ffmpegSupport or true;
-  };
-
-  mpd_clientlib = callPackage ../servers/mpd/clientlib.nix { };
-
-  miniHttpd = callPackage ../servers/http/mini-httpd {};
-
-  mlmmj = callPackage ../servers/mail/mlmmj { };
-
-  myserver = callPackage ../servers/http/myserver { };
-
-  nginx = callPackage ../servers/http/nginx {
-    rtmp        = true;
-    fullWebDAV  = true;
-    syslog      = true;
-    moreheaders = true;
-  };
-
-  ngircd = callPackage ../servers/irc/ngircd { };
-
-  nix-binary-cache = callPackage ../servers/http/nix-binary-cache {};
-
-  nsd = callPackage ../servers/dns/nsd { };
-
-  nsq = callPackage ../servers/nsq { };
-
-  openresty = callPackage ../servers/http/openresty { };
-
-  opensmtpd = callPackage ../servers/mail/opensmtpd { };
-
-  petidomo = callPackage ../servers/mail/petidomo { };
-
-  popa3d = callPackage ../servers/mail/popa3d { };
-
-  postfix = callPackage ../servers/mail/postfix { };
-
-  postfix211 = callPackage ../servers/mail/postfix/2.11.nix { };
-
-  pulseaudio = callPackage ../servers/pulseaudio {
-    gconf = gnome.GConf;
-    # The following are disabled in the default build, because if this
-    # functionality is desired, they are only needed in the PulseAudio
-    # server.
-    bluez = null;
-    avahi = null;
-  };
-  pulseaudioFull = pulseaudio.override {
-    bluez = bluez5;
-    avahi = avahi;
-    jackaudioSupport = true;
-    x11Support = true;
-  };
-
-  tomcat_connectors = callPackage ../servers/http/apache-modules/tomcat-connectors { };
-
-  pies = callPackage ../servers/pies { };
-
-  portmap = callPackage ../servers/portmap { };
-
-  rpcbind = callPackage ../servers/rpcbind { };
-
-  #monetdb = callPackage ../servers/sql/monetdb { };
-
-  mariadb = callPackage ../servers/sql/mariadb {};
-
-  mongodb = callPackage ../servers/nosql/mongodb { };
-
-  riak = callPackage ../servers/nosql/riak/1.3.1.nix { };
-
-  influxdb = callPackage ../servers/nosql/influxdb { };
-
-  mysql51 = import ../servers/sql/mysql/5.1.x.nix {
-    inherit fetchurl ncurses zlib perl openssl stdenv;
-    ps = procps; /* !!! Linux only */
-  };
-
-  mysql55 = callPackage ../servers/sql/mysql/5.5.x.nix { };
-
-  mysql = mysql51;
-
-  mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { };
-
-  nagios = callPackage ../servers/monitoring/nagios { };
-
-  munin = callPackage ../servers/monitoring/munin { };
-
-  nagiosPluginsOfficial = callPackage ../servers/monitoring/nagios/plugins/official-2.x.nix { };
-
-  neo4j = callPackage ../servers/nosql/neo4j { };
-
-  net_snmp = callPackage ../servers/monitoring/net-snmp { };
-
-  riemann = callPackage ../servers/monitoring/riemann { };
-
-  oidentd = callPackage ../servers/identd/oidentd { };
-
-  openfire = callPackage ../servers/xmpp/openfire { };
-
-  oracleXE = callPackage ../servers/sql/oracle-xe { };
-
-  OVMF = callPackage ../applications/virtualization/OVMF { };
-
-  postgresql = postgresql92;
-
-  postgresql84 = callPackage ../servers/sql/postgresql/8.4.x.nix { };
-
-  postgresql90 = callPackage ../servers/sql/postgresql/9.0.x.nix { };
-
-  postgresql91 = callPackage ../servers/sql/postgresql/9.1.x.nix { };
-
-  postgresql92 = callPackage ../servers/sql/postgresql/9.2.x.nix { };
-
-  postgresql93 = callPackage ../servers/sql/postgresql/9.3.x.nix { };
-
-  postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { };
-
-  psqlodbc = callPackage ../servers/sql/postgresql/psqlodbc { };
-
-  pyIRCt = builderDefsPackage (import ../servers/xmpp/pyIRCt) {
-    inherit xmpppy pythonIRClib python makeWrapper;
-  };
-
-  pyMAILt = builderDefsPackage (import ../servers/xmpp/pyMAILt) {
-    inherit xmpppy python makeWrapper fetchcvs;
-  };
-
-  qpid-cpp = callPackage ../servers/amqp/qpid-cpp { };
-
-  rabbitmq_server = callPackage ../servers/amqp/rabbitmq-server { };
-
-  radius = callPackage ../servers/radius { };
-
-  redis = callPackage ../servers/nosql/redis { };
-
-  redstore = callPackage ../servers/http/redstore { };
-
-  restund = callPackage ../servers/restund {};
-
-  rethinkdb = callPackage ../servers/nosql/rethinkdb { };
-
-  rippled = callPackage ../servers/rippled { };
-
-  s6 = callPackage ../servers/s6 { };
-
-  spamassassin = callPackage ../servers/mail/spamassassin {
-    inherit (perlPackages) HTMLParser NetDNS NetAddrIP DBFile
-      HTTPDate MailDKIM LWP IOSocketSSL;
-  };
-
-  samba = callPackage ../servers/samba { };
-
-  # A lightweight Samba, useful for non-Linux-based OSes.
-  samba_light = lowPrio (callPackage ../servers/samba {
-    pam = null;
-    fam = null;
-    cups = null;
-    acl = null;
-    openldap = null;
-    # libunwind 1.0.1 is not ported to GNU/Hurd.
-    libunwind = null;
-  });
-
-  serfdom = callPackage ../servers/serfdom { };
-
-  seyren = callPackage ../servers/monitoring/seyren { };
-
-  shishi = callPackage ../servers/shishi { };
-
-  sipwitch = callPackage ../servers/sip/sipwitch { };
-
-  spawn_fcgi = callPackage ../servers/http/spawn-fcgi { };
-
-  squids = recurseIntoAttrs( import ../servers/squid/squids.nix {
-    inherit fetchurl stdenv perl lib composableDerivation
-      openldap pam db cyrus_sasl kerberos libcap expat libxml2 libtool
-      openssl;
-  });
-  squid = squids.squid31; # has ipv6 support
-
-  thttpd = callPackage ../servers/http/thttpd { };
-
-  storm = callPackage ../servers/computing/storm { };
-
-  tomcat5 = callPackage ../servers/http/tomcat/5.0.nix { };
-
-  tomcat6 = callPackage ../servers/http/tomcat/6.0.nix { };
-
-  tomcat7 = callPackage ../servers/http/tomcat/7.0.nix { };
-	
-  tomcat8 = callPackage ../servers/http/tomcat/8.0.nix { };
-
-  tomcat_mysql_jdbc = callPackage ../servers/http/tomcat/jdbc/mysql { };
-
-  axis2 = callPackage ../servers/http/tomcat/axis2 { };
-
-  unifi = callPackage ../servers/unifi { };
-
-  virtuoso6 = callPackage ../servers/sql/virtuoso/6.x.nix { };
-
-  virtuoso7 = callPackage ../servers/sql/virtuoso/7.x.nix { };
-
-  virtuoso = virtuoso6;
-
-  vsftpd = callPackage ../servers/ftp/vsftpd { };
-
-  winstone = callPackage ../servers/http/winstone { };
-
-  xinetd = callPackage ../servers/xinetd { };
-
-  zookeeper = callPackage ../servers/zookeeper { };
-
-  xquartz = callPackage ../servers/x11/xquartz { };
-  quartz-wm = callPackage ../servers/x11/quartz-wm { stdenv = clangStdenv; };
-
-  xorg = recurseIntoAttrs (import ../servers/x11/xorg/default.nix {
-    inherit clangStdenv fetchurl fetchgit fetchpatch stdenv pkgconfig intltool freetype fontconfig
-      libxslt expat libpng zlib perl mesa_drivers spice_protocol
-      dbus libuuid openssl gperf m4
-      autoconf automake libtool xmlto asciidoc flex bison python mtdev pixman;
-    mesa = mesa_noglu;
-    udev = if stdenv.isLinux then udev else null;
-    libdrm = if stdenv.isLinux then libdrm else null;
-  } // {
-    xf86videointel-testing = callPackage ../servers/x11/xorg/xf86-video-intel-testing.nix { };
-  });
-
-  xorgReplacements = callPackage ../servers/x11/xorg/replacements.nix { };
-
-  xorgVideoUnichrome = callPackage ../servers/x11/xorg/unichrome/default.nix { };
-
-  yaws = callPackage ../servers/http/yaws { };
-
-  zabbix = recurseIntoAttrs (import ../servers/monitoring/zabbix {
-    inherit fetchurl stdenv pkgconfig postgresql curl openssl zlib;
-  });
-
-  zabbix20 = callPackage ../servers/monitoring/zabbix/2.0.nix { };
-  zabbix22 = callPackage ../servers/monitoring/zabbix/2.2.nix { };
-
-
-  ### OS-SPECIFIC
-
-  afuse = callPackage ../os-specific/linux/afuse { };
-
-  amdUcode = callPackage ../os-specific/linux/microcode/amd.nix { };
-
-  autofs5 = callPackage ../os-specific/linux/autofs/autofs-v5.nix { };
-
-  _915resolution = callPackage ../os-specific/linux/915resolution { };
-
-  nfsUtils = callPackage ../os-specific/linux/nfs-utils { };
-
-  acpi = callPackage ../os-specific/linux/acpi { };
-
-  acpid = callPackage ../os-specific/linux/acpid { };
-
-  acpitool = callPackage ../os-specific/linux/acpitool { };
-
-  alienfx = callPackage ../os-specific/linux/alienfx { };
-
-  alsaLib = callPackage ../os-specific/linux/alsa-lib { };
-
-  alsaPlugins = callPackage ../os-specific/linux/alsa-plugins {
-    jack2 = null;
-  };
-
-  alsaPluginWrapper = callPackage ../os-specific/linux/alsa-plugins/wrapper.nix { };
-
-  alsaUtils = callPackage ../os-specific/linux/alsa-utils { };
-  alsaOss = callPackage ../os-specific/linux/alsa-oss { };
-
-  microcode2ucode = callPackage ../os-specific/linux/microcode/converter.nix { };
-
-  microcodeIntel = callPackage ../os-specific/linux/microcode/intel.nix { };
-
-  apparmor = callPackage ../os-specific/linux/apparmor {
-    inherit (perlPackages) LocaleGettext TermReadKey RpcXML;
-    bison = bison2;
-  };
-
-  atop = callPackage ../os-specific/linux/atop { };
-
-  audit = callPackage ../os-specific/linux/audit { };
-
-  b43Firmware_5_1_138 = callPackage ../os-specific/linux/firmware/b43-firmware/5.1.138.nix { };
-
-  b43FirmwareCutter = callPackage ../os-specific/linux/firmware/b43-firmware-cutter { };
-
-  batctl = callPackage ../os-specific/linux/batman-adv/batctl.nix { };
-
-  bluez4 = callPackage ../os-specific/linux/bluez {
-    pygobject = pygobject3;
-  };
-
-  bluez5 = lowPrio (callPackage ../os-specific/linux/bluez/bluez5.nix { });
-
-  bluez = bluez4;
-
-  inherit (pythonPackages) bedup;
-
-  beret = callPackage ../games/beret { };
-
-  bridge_utils = callPackage ../os-specific/linux/bridge-utils { };
-
-  busybox = callPackage ../os-specific/linux/busybox { };
-
-  checkpolicy = callPackage ../os-specific/linux/checkpolicy { };
-
-  checksec = callPackage ../os-specific/linux/checksec { };
-
-  cifs_utils = callPackage ../os-specific/linux/cifs-utils { };
-
-  conky = callPackage ../os-specific/linux/conky {
-    mpdSupport   = config.conky.mpdSupport   or true;
-    x11Support   = config.conky.x11Support   or false;
-    xdamage      = config.conky.xdamage      or false;
-    wireless     = config.conky.wireless     or false;
-    luaSupport   = config.conky.luaSupport   or false;
-    rss          = config.conky.rss          or false;
-    weatherMetar = config.conky.weatherMetar or false;
-    weatherXoap  = config.conky.weatherXoap  or false;
-  };
-
-  cpufrequtils = callPackage ../os-specific/linux/cpufrequtils { };
-
-  cryopid = callPackage ../os-specific/linux/cryopid { };
-
-  criu = callPackage ../os-specific/linux/criu { };
-
-  cryptsetup = callPackage ../os-specific/linux/cryptsetup { };
-
-  cramfsswap = callPackage ../os-specific/linux/cramfsswap { };
-
-  darwin = rec {
-    cctools = forceNativeDrv (callPackage ../os-specific/darwin/cctools-port {
-      cross = assert crossSystem != null; crossSystem;
-      inherit maloader;
-      xctoolchain = xcode.toolchain;
-    });
-
-    maloader = callPackage ../os-specific/darwin/maloader {
-      inherit opencflite;
-    };
-
-    opencflite = callPackage ../os-specific/darwin/opencflite {};
-
-    xcode = callPackage ../os-specific/darwin/xcode {};
-  };
-
-  devicemapper = lvm2;
-
-  disk_indicator = callPackage ../os-specific/linux/disk-indicator { };
-
-  dmidecode = callPackage ../os-specific/linux/dmidecode { };
-
-  dmtcp = callPackage ../os-specific/linux/dmtcp { };
-
-  dietlibc = callPackage ../os-specific/linux/dietlibc { };
-
-  directvnc = builderDefsPackage ../os-specific/linux/directvnc {
-    inherit libjpeg pkgconfig zlib directfb;
-    inherit (xlibs) xproto;
-  };
-
-  dmraid = callPackage ../os-specific/linux/dmraid {
-    devicemapper = devicemapper.override {enable_dmeventd = true;};
-  };
-
-  drbd = callPackage ../os-specific/linux/drbd { };
-
-  dstat = callPackage ../os-specific/linux/dstat {
-    # pythonFull includes the "curses" standard library module, for pretty
-    # dstat color output
-    python = pythonFull;
-  };
-
-  libossp_uuid = callPackage ../development/libraries/libossp-uuid { };
-
-  libuuid =
-    if crossSystem != null && crossSystem.config == "i586-pc-gnu"
-    then (utillinux // {
-      crossDrv = lib.overrideDerivation utillinux.crossDrv (args: {
-        # `libblkid' fails to build on GNU/Hurd.
-        configureFlags = args.configureFlags
-          + " --disable-libblkid --disable-mount --disable-libmount"
-          + " --disable-fsck --enable-static --disable-partx";
-        doCheck = false;
-        CPPFLAGS =                    # ugly hack for ugly software!
-          lib.concatStringsSep " "
-            (map (v: "-D${v}=4096")
-                 [ "PATH_MAX" "MAXPATHLEN" "MAXHOSTNAMELEN" ]);
-      });
-    })
-    else if stdenv.isLinux
-    then utillinux
-    else null;
-
-  e3cfsprogs = callPackage ../os-specific/linux/e3cfsprogs { };
-
-  ebtables = callPackage ../os-specific/linux/ebtables { };
-
-  eject = utillinux;
-
-  ffado = callPackage ../os-specific/linux/ffado { };
-
-  fbterm = callPackage ../os-specific/linux/fbterm { };
-
-  firejail = callPackage ../os-specific/linux/firejail {};
-
-  fuse = callPackage ../os-specific/linux/fuse { };
-
-  fxload = callPackage ../os-specific/linux/fxload { };
-
-  gfxtablet = callPackage ../os-specific/linux/gfxtablet {};
-
-  gpm = callPackage ../servers/gpm { };
-
-  gradm = callPackage ../os-specific/linux/gradm {
-    flex = flex_2_5_35;
-  };
-
-  hdparm = callPackage ../os-specific/linux/hdparm { };
-
-  hibernate = callPackage ../os-specific/linux/hibernate { };
-
-  hostapd = callPackage ../os-specific/linux/hostapd { };
-
-  htop =
-    if stdenv.isLinux then
-      callPackage ../os-specific/linux/htop { }
-    else if stdenv.isDarwin then
-      callPackage ../os-specific/darwin/htop { }
-    else null;
-
-  # GNU/Hurd core packages.
-  gnu = recurseIntoAttrs (callPackage ../os-specific/gnu {
-    inherit platform crossSystem;
-  });
-
-  hwdata = callPackage ../os-specific/linux/hwdata { };
-
-  i7z = callPackage ../os-specific/linux/i7z { };
-
-  ifplugd = callPackage ../os-specific/linux/ifplugd { };
-
-  iomelt = callPackage ../os-specific/linux/iomelt { };
-
-  iotop = callPackage ../os-specific/linux/iotop { };
-
-  iproute = callPackage ../os-specific/linux/iproute { };
-
-  iputils = callPackage ../os-specific/linux/iputils {
-    sp = spCompat;
-    inherit (perlPackages) SGMLSpm;
-  };
-
-  iptables = callPackage ../os-specific/linux/iptables { };
-
-  iw = callPackage ../os-specific/linux/iw { };
-
-  jujuutils = callPackage ../os-specific/linux/jujuutils { };
-
-  kbd = callPackage ../os-specific/linux/kbd { };
-
-  kmscon = callPackage ../os-specific/linux/kmscon { };
-
-  latencytop = callPackage ../os-specific/linux/latencytop { };
-
-  ldm = callPackage ../os-specific/linux/ldm { };
-
-  libaio = callPackage ../os-specific/linux/libaio { };
-
-  libatasmart = callPackage ../os-specific/linux/libatasmart { };
-
-  libcgroup = callPackage ../os-specific/linux/libcgroup { };
-
-  libnl = callPackage ../os-specific/linux/libnl { };
-  libnl_3_2_19 = callPackage ../os-specific/linux/libnl/3.2.19.nix { };
-
-  linuxConsoleTools = callPackage ../os-specific/linux/consoletools { };
-
-  # -- Linux kernel expressions ------------------------------------------------
-
-  linuxHeaders = linuxHeaders_3_7;
-
-  linuxHeaders24Cross = forceNativeDrv (import ../os-specific/linux/kernel-headers/2.4.nix {
-    inherit stdenv fetchurl perl;
-    cross = assert crossSystem != null; crossSystem;
-  });
-
-  linuxHeaders26Cross = forceNativeDrv (import ../os-specific/linux/kernel-headers/2.6.32.nix {
-    inherit stdenv fetchurl perl;
-    cross = assert crossSystem != null; crossSystem;
-  });
-
-  linuxHeaders_3_7 = callPackage ../os-specific/linux/kernel-headers/3.7.nix { };
-
-  linuxHeaders_3_14 = callPackage ../os-specific/linux/kernel-headers/3.14.nix { };
-
-  # We can choose:
-  linuxHeadersCrossChooser = ver : if ver == "2.4" then linuxHeaders24Cross
-    else if ver == "2.6" then linuxHeaders26Cross
-    else throw "Unknown linux kernel version";
-
-  linuxHeadersCross = assert crossSystem != null;
-    linuxHeadersCrossChooser crossSystem.platform.kernelMajor;
-
-  kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { };
-
-  linux_3_2 = makeOverridable (import ../os-specific/linux/kernel/linux-3.2.nix) {
-    inherit fetchurl stdenv perl buildLinux;
-    kernelPatches = [];
-  };
-
-  linux_3_4 = makeOverridable (import ../os-specific/linux/kernel/linux-3.4.nix) {
-    inherit fetchurl stdenv perl buildLinux;
-    kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips")
-      [ kernelPatches.mips_fpureg_emu
-        kernelPatches.mips_fpu_sigill
-      ];
-  };
-
-  linux_3_6_rpi = makeOverridable (import ../os-specific/linux/kernel/linux-rpi-3.6.nix) {
-    inherit fetchurl stdenv perl buildLinux;
-  };
-
-  linux_3_10 = makeOverridable (import ../os-specific/linux/kernel/linux-3.10.nix) {
-    inherit fetchurl stdenv perl buildLinux;
-    kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips")
-      [ kernelPatches.mips_fpureg_emu
-        kernelPatches.mips_fpu_sigill
-        kernelPatches.mips_ext3_n32
-      ];
-  };
-
-  linux_3_12 = makeOverridable (import ../os-specific/linux/kernel/linux-3.12.nix) {
-    inherit fetchurl stdenv perl buildLinux;
-    kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips")
-      [ kernelPatches.mips_fpureg_emu
-        kernelPatches.mips_fpu_sigill
-        kernelPatches.mips_ext3_n32
-      ];
-  };
-
-  linux_3_14 = makeOverridable (import ../os-specific/linux/kernel/linux-3.14.nix) {
-    inherit fetchurl stdenv perl buildLinux;
-    kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips")
-      [ kernelPatches.mips_fpureg_emu
-        kernelPatches.mips_fpu_sigill
-        kernelPatches.mips_ext3_n32
-      ];
-  };
-
-  linux_3_15 = makeOverridable (import ../os-specific/linux/kernel/linux-3.15.nix) {
-    inherit fetchurl stdenv perl buildLinux;
-    kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips")
-      [ kernelPatches.mips_fpureg_emu
-        kernelPatches.mips_fpu_sigill
-        kernelPatches.mips_ext3_n32
-      ];
-  };
-
-  linux_3_16 = makeOverridable (import ../os-specific/linux/kernel/linux-3.16.nix) {
-    inherit fetchurl stdenv perl buildLinux;
-    kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips")
-      [ kernelPatches.mips_fpureg_emu
-        kernelPatches.mips_fpu_sigill
-        kernelPatches.mips_ext3_n32
-      ];
-  };
-
-  linux_testing = makeOverridable (import ../os-specific/linux/kernel/linux-testing.nix) {
-    inherit fetchurl stdenv perl buildLinux;
-    kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips")
-      [ kernelPatches.mips_fpureg_emu
-        kernelPatches.mips_fpu_sigill
-        kernelPatches.mips_ext3_n32
-      ];
-  };
-
-  /* grsec configuration
-
-     We build several flavors of 'default' grsec kernels. These are
-     built by default with Hydra. If the user selects a matching
-     'default' flavor, then the pre-canned package set can be
-     chosen. Typically, users will make very basic choices like
-     'security' + 'server' or 'performance' + 'desktop' with
-     virtualisation support. These will then be picked.
-
-     Note: Xen guest kernels are included for e.g. NixOps deployments
-     to EC2, where Xen is the Hypervisor.
-  */
-
-  grFlavors = import ../build-support/grsecurity/flavors.nix;
-
-  mkGrsecurity = opts:
-    (import ../build-support/grsecurity {
-      grsecOptions = opts;
-      inherit pkgs lib;
-    });
-
-  grKernel  = opts: (mkGrsecurity opts).grsecKernel;
-  grPackage = opts: recurseIntoAttrs (mkGrsecurity opts).grsecPackage;
-
-  # Stable kernels
-  linux_grsec_stable_desktop    = grKernel grFlavors.linux_grsec_stable_desktop;
-  linux_grsec_stable_server     = grKernel grFlavors.linux_grsec_stable_server;
-  linux_grsec_stable_server_xen = grKernel grFlavors.linux_grsec_stable_server_xen;
-
-  # Testing kernels
-  linux_grsec_testing_desktop = grKernel grFlavors.linux_grsec_testing_desktop;
-  linux_grsec_testing_server  = grKernel grFlavors.linux_grsec_testing_server;
-  linux_grsec_testing_server_xen = grKernel grFlavors.linux_grsec_testing_server_xen;
-
-  /* Linux kernel modules are inherently tied to a specific kernel.  So
-     rather than provide specific instances of those packages for a
-     specific kernel, we have a function that builds those packages
-     for a specific kernel.  This function can then be called for
-     whatever kernel you're using. */
-
-  linuxPackagesFor = kernel: self: let callPackage = newScope self; in {
-    inherit kernel;
-
-    acpi_call = callPackage ../os-specific/linux/acpi-call {};
-
-    batman_adv = callPackage ../os-specific/linux/batman-adv {};
-
-    bbswitch = callPackage ../os-specific/linux/bbswitch {};
-
-    ati_drivers_x11 = callPackage ../os-specific/linux/ati-drivers { };
-
-    blcr = callPackage ../os-specific/linux/blcr { };
-
-    cryptodev = callPackage ../os-specific/linux/cryptodev { };
-
-    cpupower = callPackage ../os-specific/linux/cpupower { };
-
-    e1000e = callPackage ../os-specific/linux/e1000e {};
-
-    v4l2loopback = callPackage ../os-specific/linux/v4l2loopback { };
-
-    frandom = callPackage ../os-specific/linux/frandom { };
-
-    ktap = callPackage ../os-specific/linux/ktap { };
-
-    lttng-modules = callPackage ../os-specific/linux/lttng-modules { };
-
-    broadcom_sta = callPackage ../os-specific/linux/broadcom-sta/default.nix { };
-
-    nvidiabl = callPackage ../os-specific/linux/nvidiabl { };
-
-    nvidia_x11 = callPackage ../os-specific/linux/nvidia-x11 { };
-
-    nvidia_x11_legacy173 = callPackage ../os-specific/linux/nvidia-x11/legacy173.nix { };
-    nvidia_x11_legacy304 = callPackage ../os-specific/linux/nvidia-x11/legacy304.nix { };
-
-    openafsClient = callPackage ../servers/openafs-client { };
-
-    openiscsi = callPackage ../os-specific/linux/open-iscsi { };
-
-    wis_go7007 = callPackage ../os-specific/linux/wis-go7007 { };
-
-    kernelHeaders = callPackage ../os-specific/linux/kernel-headers { };
-
-    klibc = callPackage ../os-specific/linux/klibc { };
-
-    klibcShrunk = lowPrio (callPackage ../os-specific/linux/klibc/shrunk.nix { });
-
-
-    /* compiles but has to be integrated into the kernel somehow
-       Let's have it uncommented and finish it..
-    */
-    ndiswrapper = callPackage ../os-specific/linux/ndiswrapper { };
-
-    netatop = callPackage ../os-specific/linux/netatop { };
-
-    perf = callPackage ../os-specific/linux/kernel/perf.nix { };
-
-    psmouse_alps = callPackage ../os-specific/linux/psmouse-alps { };
-
-    spl = callPackage ../os-specific/linux/spl { };
-    spl_git = callPackage ../os-specific/linux/spl/git.nix { };
-
-    sysdig = callPackage ../os-specific/linux/sysdig {};
-
-    tp_smapi = callPackage ../os-specific/linux/tp_smapi { };
-
-    v86d = callPackage ../os-specific/linux/v86d { };
-
-    virtualbox = callPackage ../applications/virtualization/virtualbox {
-      stdenv = stdenv_32bit;
-      inherit (gnome) libIDL;
-      enableExtensionPack = config.virtualbox.enableExtensionPack or false;
-    };
-
-    virtualboxGuestAdditions = callPackage ../applications/virtualization/virtualbox/guest-additions { };
-
-    zfs = callPackage ../os-specific/linux/zfs { };
-    zfs_git = callPackage ../os-specific/linux/zfs/git.nix { };
-  };
-
-  # The current default kernel / kernel modules.
-  linux = linuxPackages.kernel;
-  linuxPackages = linuxPackages_3_12;
-
-  # Update this when adding the newest kernel major version!
-  linux_latest = pkgs.linux_3_16;
-  linuxPackages_latest = pkgs.linuxPackages_3_16;
-
-  # Build the kernel modules for the some of the kernels.
-  linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 linuxPackages_3_2);
-  linuxPackages_3_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4 linuxPackages_3_4);
-  linuxPackages_3_6_rpi = linuxPackagesFor pkgs.linux_3_6_rpi linuxPackages_3_6_rpi;
-  linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10 linuxPackages_3_10);
-  linuxPackages_3_10_tuxonice = linuxPackagesFor pkgs.linux_3_10_tuxonice linuxPackages_3_10_tuxonice;
-  linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12);
-  linuxPackages_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_14 linuxPackages_3_14);
-  linuxPackages_3_15 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_15 linuxPackages_3_15);
-  linuxPackages_3_16 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_16 linuxPackages_3_16);
-  linuxPackages_testing = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing linuxPackages_testing);
-
-  # grsecurity flavors
-  # Stable kernels
-  linuxPackages_grsec_stable_desktop    = grPackage grFlavors.linux_grsec_stable_desktop;
-  linuxPackages_grsec_stable_server     = grPackage grFlavors.linux_grsec_stable_server;
-  linuxPackages_grsec_stable_server_xen = grPackage grFlavors.linux_grsec_stable_server_xen;
-
-  # Testing kernels
-  linuxPackages_grsec_testing_desktop = grPackage grFlavors.linux_grsec_testing_desktop;
-  linuxPackages_grsec_testing_server  = grPackage grFlavors.linux_grsec_testing_server;
-  linuxPackages_grsec_testing_server_xen = grPackage grFlavors.linux_grsec_testing_server_xen;
-
-  # A function to build a manually-configured kernel
-  linuxManualConfig = pkgs.buildLinux;
-  buildLinux = import ../os-specific/linux/kernel/manual-config.nix {
-    inherit (pkgs) stdenv runCommand nettools bc perl kmod writeTextFile ubootChooser;
-  };
-
-  keyutils = callPackage ../os-specific/linux/keyutils { };
-
-  libselinux = callPackage ../os-specific/linux/libselinux { };
-
-  libsemanage = callPackage ../os-specific/linux/libsemanage { };
-
-  libraw = callPackage ../development/libraries/libraw { };
-
-  libraw1394 = callPackage ../development/libraries/libraw1394 { };
-
-  libsexy = callPackage ../development/libraries/libsexy { };
-
-  libsepol = callPackage ../os-specific/linux/libsepol { };
-
-  libsmbios = callPackage ../os-specific/linux/libsmbios { };
-
-  lm_sensors = callPackage ../os-specific/linux/lm-sensors { };
-
-  lockdep = callPackage ../os-specific/linux/lockdep { };
-
-  lsiutil = callPackage ../os-specific/linux/lsiutil { };
-
-  kmod = callPackage ../os-specific/linux/kmod { };
-
-  kmod-blacklist-ubuntu = callPackage ../os-specific/linux/kmod-blacklist-ubuntu { };
-
-  kvm = qemu_kvm;
-
-  libcap = callPackage ../os-specific/linux/libcap { };
-
-  libcap_progs = callPackage ../os-specific/linux/libcap/progs.nix { };
-
-  libcap_pam = callPackage ../os-specific/linux/libcap/pam.nix { };
-
-  libcap_manpages = callPackage ../os-specific/linux/libcap/man.nix { };
-
-  libcap_ng = callPackage ../os-specific/linux/libcap-ng { };
-
-  libnscd = callPackage ../os-specific/linux/libnscd { };
-
-  libnotify = callPackage ../development/libraries/libnotify { };
-
-  libvolume_id = callPackage ../os-specific/linux/libvolume_id { };
-
-  lsscsi = callPackage ../os-specific/linux/lsscsi { };
-
-  lvm2 = callPackage ../os-specific/linux/lvm2 { };
-
-  mdadm = callPackage ../os-specific/linux/mdadm { };
-
-  mingetty = callPackage ../os-specific/linux/mingetty { };
-
-  module_init_tools = callPackage ../os-specific/linux/module-init-tools { };
-
-  aggregateModules = modules:
-    callPackage ../os-specific/linux/kmod/aggregator.nix {
-      inherit modules;
-    };
-
-  multipath_tools = callPackage ../os-specific/linux/multipath-tools { };
-
-  musl = callPackage ../os-specific/linux/musl { };
-
-  nettools = callPackage ../os-specific/linux/net-tools { };
-
-  neverball = callPackage ../games/neverball {
-    libpng = libpng15;
-  };
-
-  nftables = callPackage ../os-specific/linux/nftables { };
-
-  numactl = callPackage ../os-specific/linux/numactl { };
-
-  gocode = callPackage ../development/tools/gocode { };
-
-  gogoclient = callPackage ../os-specific/linux/gogoclient { };
-
-  nss_ldap = callPackage ../os-specific/linux/nss_ldap { };
-
-  pam = callPackage ../os-specific/linux/pam { };
-
-  # pam_bioapi ( see http://www.thinkwiki.org/wiki/How_to_enable_the_fingerprint_reader )
-
-  pam_ccreds = callPackage ../os-specific/linux/pam_ccreds { };
-
-  pam_console = callPackage ../os-specific/linux/pam_console {
-    libtool = libtool_1_5;
-  };
-
-  pam_devperm = callPackage ../os-specific/linux/pam_devperm { };
-
-  pam_krb5 = callPackage ../os-specific/linux/pam_krb5 { };
-
-  pam_ldap = callPackage ../os-specific/linux/pam_ldap { };
-
-  pam_login = callPackage ../os-specific/linux/pam_login { };
-
-  pam_ssh_agent_auth = callPackage ../os-specific/linux/pam_ssh_agent_auth { };
-
-  pam_usb = callPackage ../os-specific/linux/pam_usb { };
-
-  paxctl = callPackage ../os-specific/linux/paxctl { };
-
-  pax-utils = callPackage ../os-specific/linux/pax-utils { };
-
-  pcmciaUtils = callPackage ../os-specific/linux/pcmciautils {
-    firmware = config.pcmciaUtils.firmware or [];
-    config = config.pcmciaUtils.config or null;
-  };
-
-  plymouth = callPackage ../os-specific/linux/plymouth {
-    automake = automake113x;
-  };
-
-  pmount = callPackage ../os-specific/linux/pmount { };
-
-  pmutils = callPackage ../os-specific/linux/pm-utils { };
-
-  pmtools = callPackage ../os-specific/linux/pmtools { };
-
-  policycoreutils = callPackage ../os-specific/linux/policycoreutils { };
-
-  powertop = callPackage ../os-specific/linux/powertop { };
-
-  prayer = callPackage ../servers/prayer { };
-
-  procps = procps-ng;
-
-  procps-old = lowPrio (callPackage ../os-specific/linux/procps { });
-
-  procps-ng = callPackage ../os-specific/linux/procps-ng { };
-
-  watch = callPackage ../os-specific/linux/procps/watch.nix { };
-
-  qemu_kvm = lowPrio (qemu.override { x86Only = true; });
-
-  firmwareLinuxNonfree = callPackage ../os-specific/linux/firmware/firmware-linux-nonfree { };
-
-  radeontools = callPackage ../os-specific/linux/radeontools { };
-
-  raspberrypifw = callPackage ../os-specific/linux/firmware/raspberrypi {};
-
-  regionset = callPackage ../os-specific/linux/regionset { };
-
-  rfkill = callPackage ../os-specific/linux/rfkill { };
-
-  rfkill_udev = callPackage ../os-specific/linux/rfkill/udev.nix { };
-
-  rtkit = callPackage ../os-specific/linux/rtkit { };
-
-  sdparm = callPackage ../os-specific/linux/sdparm { };
-
-  sepolgen = callPackage ../os-specific/linux/sepolgen { };
-
-  setools = callPackage ../os-specific/linux/setools { };
-
-  shadow = callPackage ../os-specific/linux/shadow { };
-
-  statifier = builderDefsPackage (import ../os-specific/linux/statifier) { };
-
-  sysdig = callPackage ../os-specific/linux/sysdig {
-    kernel = null;
-  }; # pkgs.sysdig is a client, for a driver look at linuxPackagesFor
-
-  sysfsutils = callPackage ../os-specific/linux/sysfsutils { };
-
-  sysprof = callPackage ../development/tools/profiling/sysprof {
-    inherit (gnome) libglade;
-  };
-
-  # Provided with sysfsutils.
-  libsysfs = sysfsutils;
-  systool = sysfsutils;
-
-  sysklogd = callPackage ../os-specific/linux/sysklogd { };
-
-  syslinux = callPackage ../os-specific/linux/syslinux { };
-
-  sysstat = callPackage ../os-specific/linux/sysstat { };
-
-  systemd = callPackage ../os-specific/linux/systemd {
-    linuxHeaders = linuxHeaders_3_14;
-  };
-
-  systemtap = callPackage ../development/tools/profiling/systemtap {
-    inherit (gnome) libglademm;
-  };
-
-  # In nixos, you can set systemd.package = pkgs.systemd_with_lvm2 to get
-  # LVM2 working in systemd.
-  systemd_with_lvm2 = pkgs.lib.overrideDerivation pkgs.systemd (p: {
-      name = p.name + "-with-lvm2";
-      postInstall = p.postInstall + ''
-        cp "${pkgs.lvm2}/lib/systemd/system-generators/"* $out/lib/systemd/system-generators
-      '';
-  });
-
-  sysvinit = callPackage ../os-specific/linux/sysvinit { };
-
-  sysvtools = callPackage ../os-specific/linux/sysvinit {
-    withoutInitTools = true;
-  };
-
-  # FIXME: `tcp-wrapper' is actually not OS-specific.
-  tcp_wrappers = callPackage ../os-specific/linux/tcp-wrappers { };
-
-  trackballs = callPackage ../games/trackballs {
-    debug = false;
-    guile = guile_1_8;
-  };
-
-  tunctl = callPackage ../os-specific/linux/tunctl { };
-
-  ubootChooser = name : if name == "upstream" then ubootUpstream
-    else if name == "sheevaplug" then ubootSheevaplug
-    else if name == "guruplug" then ubootGuruplug
-    else if name == "nanonote" then ubootNanonote
-    else throw "Unknown uboot";
-
-  ubootUpstream = callPackage ../misc/uboot { };
-
-  ubootSheevaplug = callPackage ../misc/uboot/sheevaplug.nix { };
-
-  ubootNanonote = callPackage ../misc/uboot/nanonote.nix { };
-
-  ubootGuruplug = callPackage ../misc/uboot/guruplug.nix { };
-
-  uclibc = callPackage ../os-specific/linux/uclibc { };
-
-  uclibcCross = lowPrio (callPackage ../os-specific/linux/uclibc {
-    inherit fetchurl stdenv libiconv;
-    linuxHeaders = linuxHeadersCross;
-    gccCross = gccCrossStageStatic;
-    cross = assert crossSystem != null; crossSystem;
-  });
-
-  udev145 = callPackage ../os-specific/linux/udev/145.nix { };
-  udev = pkgs.systemd;
-
-  udisks1 = callPackage ../os-specific/linux/udisks/1-default.nix { };
-  udisks2 = callPackage ../os-specific/linux/udisks/2-default.nix { };
-  udisks = udisks1;
-
-  udisks_glue = callPackage ../os-specific/linux/udisks-glue { };
-
-  untie = callPackage ../os-specific/linux/untie { };
-
-  upower = callPackage ../os-specific/linux/upower { };
-
-  upower_99 = callPackage ../os-specific/linux/upower/0.99.nix { };
-
-  upstart = callPackage ../os-specific/linux/upstart { };
-
-  usbutils = callPackage ../os-specific/linux/usbutils { };
-
-  usermount = callPackage ../os-specific/linux/usermount { };
-
-  utillinux = lowPrio (callPackage ../os-specific/linux/util-linux {
-    ncurses = null;
-    perl = null;
-  });
-
-  utillinuxCurses = utillinux.override {
-    inherit ncurses perl;
-  };
-
-  v4l_utils = callPackage ../os-specific/linux/v4l-utils {
-    withQt4 = true;
-  };
-
-  windows = rec {
-    cygwinSetup = callPackage ../os-specific/windows/cygwin-setup { };
-
-    jom = callPackage ../os-specific/windows/jom { };
-
-    w32api = callPackage ../os-specific/windows/w32api {
-      gccCross = gccCrossStageStatic;
-      binutilsCross = binutilsCross;
-    };
-
-    w32api_headers = w32api.override {
-      onlyHeaders = true;
-    };
-
-    mingw_runtime = callPackage ../os-specific/windows/mingwrt {
-      gccCross = gccCrossMingw2;
-      binutilsCross = binutilsCross;
-    };
-
-    mingw_runtime_headers = mingw_runtime.override {
-      onlyHeaders = true;
-    };
-
-    mingw_headers1 = buildEnv {
-      name = "mingw-headers-1";
-      paths = [ w32api_headers mingw_runtime_headers ];
-    };
-
-    mingw_headers2 = buildEnv {
-      name = "mingw-headers-2";
-      paths = [ w32api mingw_runtime_headers ];
-    };
-
-    mingw_headers3 = buildEnv {
-      name = "mingw-headers-3";
-      paths = [ w32api mingw_runtime ];
-    };
-
-    mingw_w64 = callPackage ../os-specific/windows/mingw-w64 {
-      gccCross = gccCrossStageStatic;
-      binutilsCross = binutilsCross;
-    };
-
-    mingw_w64_headers = callPackage ../os-specific/windows/mingw-w64 {
-      onlyHeaders = true;
-    };
-
-    mingw_w64_pthreads = callPackage ../os-specific/windows/mingw-w64 {
-      onlyPthreads = true;
-    };
-
-    pthreads = callPackage ../os-specific/windows/pthread-w32 {
-      mingw_headers = mingw_headers3;
-    };
-
-    wxMSW = callPackage ../os-specific/windows/wxMSW-2.8 { };
-  };
-
-  wesnoth = callPackage ../games/wesnoth {
-    lua = lua5;
-  };
-
-  wirelesstools = callPackage ../os-specific/linux/wireless-tools { };
-
-  wpa_supplicant = callPackage ../os-specific/linux/wpa_supplicant { };
-
-  wpa_supplicant_gui = callPackage ../os-specific/linux/wpa_supplicant/gui.nix { };
-
-  xf86_input_mtrack = callPackage ../os-specific/linux/xf86-input-mtrack {
-    inherit (xorg) utilmacros xproto inputproto xorgserver;
-  };
-
-  xf86_input_multitouch =
-    callPackage ../os-specific/linux/xf86-input-multitouch { };
-
-  xf86_input_wacom = callPackage ../os-specific/linux/xf86-input-wacom { };
-
-  xf86_video_nested = callPackage ../os-specific/linux/xf86-video-nested {
-    inherit (xorg) fontsproto renderproto utilmacros xorgserver;
-  };
-
-  xf86_video_nouveau = xorg.xf86videonouveau;
-
-  xmoto = builderDefsPackage (import ../games/xmoto) {
-    inherit chipmunk sqlite curl zlib bzip2 libjpeg libpng
-      freeglut mesa SDL SDL_mixer SDL_image SDL_net SDL_ttf
-      lua5 ode libxdg_basedir libxml2;
-  };
-
-  xorg_sys_opengl = callPackage ../os-specific/linux/opengl/xorg-sys { };
-
-  zd1211fw = callPackage ../os-specific/linux/firmware/zd1211 { };
-
-
-  ### DATA
-
-  andagii = callPackage ../data/fonts/andagii {};
-
-  anonymousPro = callPackage ../data/fonts/anonymous-pro {};
-
-  arkpandora_ttf = builderDefsPackage (import ../data/fonts/arkpandora) { };
-
-  aurulent-sans = callPackage ../data/fonts/aurulent-sans { };
-
-  bakoma_ttf = callPackage ../data/fonts/bakoma-ttf { };
-
-  cacert = callPackage ../data/misc/cacert { };
-
-  cantarell_fonts = callPackage ../data/fonts/cantarell-fonts { };
-
-  comic-neue = callPackage ../data/fonts/comic-neue { };
-
-  corefonts = callPackage ../data/fonts/corefonts { };
-
-  wrapFonts = paths : ((import ../data/fonts/fontWrap) {
-    inherit fetchurl stdenv builderDefs paths;
-    inherit (xorg) mkfontdir mkfontscale;
-  });
-
-  clearlyU = callPackage ../data/fonts/clearlyU { };
-
-  cm_unicode = callPackage ../data/fonts/cm-unicode {};
-
-  dejavu_fonts = callPackage ../data/fonts/dejavu-fonts {
-    inherit (perlPackages) FontTTF;
-  };
-
-  docbook5 = callPackage ../data/sgml+xml/schemas/docbook-5.0 { };
-
-  docbook_sgml_dtd_31 = callPackage ../data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix { };
-
-  docbook_sgml_dtd_41 = callPackage ../data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix { };
-
-  docbook_xml_dtd_412 = callPackage ../data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix { };
-
-  docbook_xml_dtd_42 = callPackage ../data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix { };
-
-  docbook_xml_dtd_43 = callPackage ../data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix { };
-
-  docbook_xml_dtd_45 = callPackage ../data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix { };
-
-  docbook_xml_ebnf_dtd = callPackage ../data/sgml+xml/schemas/xml-dtd/docbook-ebnf { };
-
-  docbook_xml_xslt = docbook_xsl;
-
-  docbook_xsl = callPackage ../data/sgml+xml/stylesheets/xslt/docbook-xsl { };
-
-  docbook5_xsl = docbook_xsl_ns;
-
-  docbook_xsl_ns = callPackage ../data/sgml+xml/stylesheets/xslt/docbook-xsl-ns { };
-
-  dosemu_fonts = callPackage ../data/fonts/dosemu-fonts { };
-
-  eb-garamond = callPackage ../data/fonts/eb-garamond { };
-
-  fira = callPackage ../data/fonts/fira { };
-
-  freefont_ttf = callPackage ../data/fonts/freefont-ttf { };
-
-  freepats = callPackage ../data/misc/freepats { };
-
-  gentium = callPackage ../data/fonts/gentium {};
-
-  gnome_user_docs = callPackage ../data/documentation/gnome-user-docs { };
-
-  inherit (gnome3) gsettings_desktop_schemas;
-
-  hicolor_icon_theme = callPackage ../data/icons/hicolor-icon-theme { };
-
-  inconsolata = callPackage ../data/fonts/inconsolata {};
-
-  ipafont = callPackage ../data/fonts/ipafont {};
-
-  junicode = callPackage ../data/fonts/junicode { };
-
-  kochi-substitute = callPackage ../data/fonts/kochi-substitute {};
-
-  kochi-substitute-naga10 = callPackage ../data/fonts/kochi-substitute-naga10 {};
-
-  liberation_ttf = callPackage ../data/fonts/redhat-liberation-fonts { };
-
-  libertine = builderDefsPackage (import ../data/fonts/libertine) {
-    inherit fetchurl fontforge lib;
-  };
-
-  lmmath = callPackage ../data/fonts/lmodern/lmmath.nix {};
-
-  lmodern = callPackage ../data/fonts/lmodern { };
-
-  lohit-fonts = callPackage ../data/fonts/lohit-fonts { };
-
-  manpages = callPackage ../data/documentation/man-pages { };
-
-  miscfiles = callPackage ../data/misc/miscfiles { };
-
-  mobile_broadband_provider_info = callPackage ../data/misc/mobile-broadband-provider-info { };
-
-  mph_2b_damase = callPackage ../data/fonts/mph-2b-damase { };
-
-  nafees = callPackage ../data/fonts/nafees { };
-
-  oldstandard = callPackage ../data/fonts/oldstandard { };
-
-  opensans-ttf = callPackage ../data/fonts/opensans-ttf { };
-
-  poly = callPackage ../data/fonts/poly { };
-
-  posix_man_pages = callPackage ../data/documentation/man-pages-posix { };
-
-  pthreadmanpages = callPackage ../data/documentation/pthread-man-pages { };
-
-  shared_mime_info = callPackage ../data/misc/shared-mime-info { };
-
-  shared_desktop_ontologies = callPackage ../data/misc/shared-desktop-ontologies { };
-
-  stdmanpages = callPackage ../data/documentation/std-man-pages { };
-
-  symbola = callPackage ../data/fonts/symbola { };
-
-  iana_etc = callPackage ../data/misc/iana-etc { };
-
-  poppler_data = callPackage ../data/misc/poppler-data { };
-
-  r3rs = callPackage ../data/documentation/rnrs/r3rs.nix { };
-
-  r4rs = callPackage ../data/documentation/rnrs/r4rs.nix { };
-
-  r5rs = callPackage ../data/documentation/rnrs/r5rs.nix { };
-
-  source-code-pro = callPackage ../data/fonts/source-code-pro {};
-
-  source-sans-pro = callPackage ../data/fonts/source-sans-pro { };
-
-  source-serif-pro = callPackage ../data/fonts/source-serif-pro { };
-
-  source-han-sans-japanese = callPackage ../data/fonts/source-han-sans/japanese.nix {};
-  source-han-sans-korean = callPackage ../data/fonts/source-han-sans/korean.nix {};
-  source-han-sans-simplified-chinese = callPackage ../data/fonts/source-han-sans/simplified-chinese.nix {};
-  source-han-sans-traditional-chinese = callPackage ../data/fonts/source-han-sans/traditional-chinese.nix {};
-
-  tango-icon-theme = callPackage ../data/icons/tango-icon-theme { };
-
-  themes = name: import (../data/misc/themes + ("/" + name + ".nix")) {
-    inherit fetchurl;
-  };
-
-  theano = callPackage ../data/fonts/theano { };
-
-  tempora_lgc = callPackage ../data/fonts/tempora-lgc { };
-
-  terminus_font = callPackage ../data/fonts/terminus-font { };
-
-  tipa = callPackage ../data/fonts/tipa { };
-
-  ttf_bitstream_vera = callPackage ../data/fonts/ttf-bitstream-vera { };
-
-  tzdata = callPackage ../data/misc/tzdata { };
-
-  ubuntu_font_family = callPackage ../data/fonts/ubuntu-font-family { };
-
-  ucsFonts = callPackage ../data/fonts/ucs-fonts { };
-
-  unifont = callPackage ../data/fonts/unifont { };
-
-  vistafonts = callPackage ../data/fonts/vista-fonts { };
-
-  wqy_microhei = callPackage ../data/fonts/wqy-microhei { };
-
-  wqy_zenhei = callPackage ../data/fonts/wqy-zenhei { };
-
-  xhtml1 = callPackage ../data/sgml+xml/schemas/xml-dtd/xhtml1 { };
-
-  xkeyboard_config = xorg.xkeyboardconfig;
-
-
-  ### APPLICATIONS
-
-  a2jmidid = callPackage ../applications/audio/a2jmidid { };
-
-  aangifte2006 = callPackage_i686 ../applications/taxes/aangifte-2006 { };
-
-  aangifte2007 = callPackage_i686 ../applications/taxes/aangifte-2007 { };
-
-  aangifte2008 = callPackage_i686 ../applications/taxes/aangifte-2008 { };
-
-  aangifte2009 = callPackage_i686 ../applications/taxes/aangifte-2009 { };
-
-  aangifte2010 = callPackage_i686 ../applications/taxes/aangifte-2010 { };
-
-  aangifte2011 = callPackage_i686 ../applications/taxes/aangifte-2011 { };
-
-  aangifte2012 = callPackage_i686 ../applications/taxes/aangifte-2012 { };
-
-  aangifte2013 = callPackage_i686 ../applications/taxes/aangifte-2013 { };
-
-  abcde = callPackage ../applications/audio/abcde {
-    inherit (perlPackages) DigestSHA MusicBrainz MusicBrainzDiscID;
-    libcdio = libcdio082;
-  };
-
-  abiword = callPackage ../applications/office/abiword {
-    inherit (gnome) libglade libgnomecanvas;
-  };
-
-  abook = callPackage ../applications/misc/abook { };
-
-  adobe-reader = callPackage_i686 ../applications/misc/adobe-reader { };
-
-  aewan = callPackage ../applications/editors/aewan { };
-
-  alchemy = callPackage ../applications/graphics/alchemy { };
-
-  ams-lv2 = callPackage ../applications/audio/ams-lv2 { };
-
-  amsn = callPackage ../applications/networking/instant-messengers/amsn { };
-
-  antiword = callPackage ../applications/office/antiword {};
-
-  ardour = ardour3;
-
-  ardour3 =  lowPrio (callPackage ../applications/audio/ardour {
-    inherit (gnome) libgnomecanvas libgnomecanvasmm;
-  });
-
-  arora = callPackage ../applications/networking/browsers/arora { };
-
-  atom = callPackage ../applications/editors/atom {
-    gconf = gnome.GConf;
-  };
-
-  aseprite = callPackage ../applications/editors/aseprite {
-    giflib = giflib_4_1;
-  };
-
-  audacious = callPackage ../applications/audio/audacious { };
-
-  audacity = callPackage ../applications/audio/audacity {
-    ffmpeg = ffmpeg_0_10;
-  };
-
-  milkytracker = callPackage ../applications/audio/milkytracker { };
-
-  aumix = callPackage ../applications/audio/aumix {
-    gtkGUI = false;
-  };
-
-  autopanosiftc = callPackage ../applications/graphics/autopanosiftc { };
-
-  avidemux = callPackage ../applications/video/avidemux { };
-
-  avogadro = callPackage ../applications/science/chemistry/avogadro {
-    eigen = eigen2;
-  };
-
-  avrdudess = callPackage ../applications/misc/avrdudess { };
-
-  avxsynth = callPackage ../applications/video/avxsynth { };
-
-  awesome-3-4 = callPackage ../applications/window-managers/awesome/3.4.nix {
-    lua = lua5;
-    cairo = cairo.override { xcbSupport = true; };
-  };
-  awesome-3-5 = callPackage ../applications/window-managers/awesome {
-    lua   = lua5_1;
-    cairo = cairo.override { xcbSupport = true; };
-  };
-  awesome = awesome-3-5;
-
-  inherit (gnome3) baobab;
-
-  backintime-common = callPackage ../applications/networking/sync/backintime/common.nix { };
-
-  backintime-gnome = callPackage ../applications/networking/sync/backintime/gnome.nix { };
-
-  backintime = backintime-gnome;
-
-  bar = callPackage ../applications/window-managers/bar { };
-
-  baresip = callPackage ../applications/networking/instant-messengers/baresip {
-    ffmpeg = ffmpeg_1;
-  };
-
-  batik = callPackage ../applications/graphics/batik { };
-
-  bazaar = callPackage ../applications/version-management/bazaar { };
-
-  bazaarTools = builderDefsPackage (import ../applications/version-management/bazaar/tools.nix) {
-    inherit bazaar;
-  };
-
-  beast = callPackage ../applications/audio/beast {
-    inherit (gnome) libgnomecanvas libart_lgpl;
-    guile = guile_1_8;
-  };
-
-  bibletime = callPackage ../applications/misc/bibletime { };
-
-  bitcoin = callPackage ../applications/misc/bitcoin {};
-  bitcoind = callPackage ../applications/misc/bitcoin { gui = false; };
-
-  altcoins = recurseIntoAttrs (
-    callPackage ../applications/misc/bitcoin/altcoins.nix {}
-  );
-
-  bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee {
-    gnutls = gnutls;
-    libotr = libotr_3_2;
-  };
-
-  blender = callPackage  ../applications/misc/blender {
-    python = python34;
-  };
-
-  bristol = callPackage ../applications/audio/bristol { };
-
-  bspwm = callPackage ../applications/window-managers/bspwm { };
-
-  bvi = callPackage ../applications/editors/bvi { };
-
-  calf = callPackage ../applications/audio/calf {
-      inherit (gnome) libglade;
-  };
-
-  calibre = callPackage ../applications/misc/calibre {
-    inherit (pythonPackages) pyqt5 sip_4_16;
-  };
-
-  camlistore = callPackage ../applications/misc/camlistore { };
-
-  carrier = builderDefsPackage (import ../applications/networking/instant-messengers/carrier/2.5.0.nix) {
-    inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 openssl nss
-      gtkspell aspell gettext ncurses avahi dbus dbus_glib python
-      libtool automake autoconf gstreamer;
-    inherit gtk glib;
-    inherit (gnome) startupnotification GConf ;
-    inherit (xlibs) libXScrnSaver scrnsaverproto libX11 xproto kbproto;
-  };
-  funpidgin = carrier;
-
-  cc1394 = callPackage ../applications/video/cc1394 { };
-
-  cddiscid = callPackage ../applications/audio/cd-discid { };
-
-  cdparanoia = cdparanoiaIII;
-
-  cdparanoiaIII = callPackage ../applications/audio/cdparanoia { };
-
-  cdrtools = callPackage ../applications/misc/cdrtools { };
-
-  centerim = callPackage ../applications/networking/instant-messengers/centerim { };
-
-  cgit = callPackage ../applications/version-management/git-and-tools/cgit { };
-
-  cgminer = callPackage ../applications/misc/cgminer {
-    amdappsdk = amdappsdk28;
-  };
-
-  chatzilla = callPackage ../applications/networking/irc/chatzilla { };
-
-  chromium = callPackage ../applications/networking/browsers/chromium {
-    channel = "stable";
-    pulseSupport = config.pulseaudio or true;
-    enablePepperFlash = config.chromium.enablePepperFlash or false;
-    enablePepperPDF = config.chromium.enablePepperPDF or false;
-  };
-
-  chromiumBeta = lowPrio (chromium.override { channel = "beta"; });
-
-  chromiumDev = lowPrio (chromium.override { channel = "dev"; });
-
-  cinelerra = callPackage ../applications/video/cinelerra { };
-
-  clipit = callPackage ../applications/misc/clipit { };
-
-  cmus = callPackage ../applications/audio/cmus { };
-
-  compiz = callPackage ../applications/window-managers/compiz {
-    inherit (gnome) GConf ORBit2 metacity;
-    boost = boost149; # https://bugs.launchpad.net/compiz/+bug/1131864
-  };
-
-  coriander = callPackage ../applications/video/coriander {
-    inherit (gnome) libgnomeui GConf;
-  };
-
-  csound = callPackage ../applications/audio/csound { };
-
-  cinepaint = callPackage ../applications/graphics/cinepaint {
-    fltk = fltk13;
-    libpng = libpng12;
-  };
-
-  codeblocks = callPackage ../applications/editors/codeblocks { };
-  codeblocksFull = callPackage ../applications/editors/codeblocks { contribPlugins = true; };
-
-  codeville = builderDefsPackage (import ../applications/version-management/codeville/0.8.0.nix) {
-    inherit makeWrapper;
-    python = pythonFull;
-  };
-
-  comical = callPackage ../applications/graphics/comical { };
-
-  conkeror = callPackage ../applications/networking/browsers/conkeror { };
-
-  conkerorWrapper = wrapFirefox {
-    browser = conkeror;
-    browserName = "conkeror";
-    desktopName = "Conkeror";
-  };
-
-  cuneiform = builderDefsPackage (import ../tools/graphics/cuneiform) {
-    inherit cmake patchelf;
-    imagemagick = imagemagick;
-  };
-
-  cvs = callPackage ../applications/version-management/cvs { };
-
-  cvsps = callPackage ../applications/version-management/cvsps { };
-
-  cvs2svn = callPackage ../applications/version-management/cvs2svn { };
-
-  d4x = callPackage ../applications/misc/d4x { };
-
-  darcs = with haskellPackages_ghc783; callPackage ../applications/version-management/darcs {
-    cabal = cabal.override {
-      extension = self : super : {
-        isLibrary = false;
-        configureFlags = "-f-library " + super.configureFlags or "";
-      };
-    };
-  };
-
-  darktable = callPackage ../applications/graphics/darktable {
-    inherit (gnome) GConf libglade;
-  };
-
-  dd-agent = callPackage ../tools/networking/dd-agent { inherit (pythonPackages) tornado; };
-
-  dia = callPackage ../applications/graphics/dia {
-    inherit (pkgs.gnome) libart_lgpl libgnomeui;
-  };
-
-  diffuse = callPackage ../applications/version-management/diffuse { };
-
-  distrho = callPackage ../applications/audio/distrho {};
-
-  djvulibre = callPackage ../applications/misc/djvulibre { };
-
-  djvu2pdf = callPackage ../tools/typesetting/djvu2pdf { };
-
-  djview = callPackage ../applications/graphics/djview { };
-  djview4 = pkgs.djview;
-
-  dmenu = callPackage ../applications/misc/dmenu {
-    enableXft = config.dmenu.enableXft or false;
-  };
-
-  dmtx = builderDefsPackage (import ../tools/graphics/dmtx) {
-    inherit libpng libtiff libjpeg imagemagick librsvg
-      pkgconfig bzip2 zlib libtool freetype fontconfig
-      ghostscript jasper xz;
-    inherit (xlibs) libX11;
-  };
-
-  docker = callPackage ../applications/virtualization/docker { };
-
-  doodle = callPackage ../applications/search/doodle { };
-
-  dunst = callPackage ../applications/misc/dunst { };
-
-  dvb_apps  = callPackage ../applications/video/dvb-apps { };
-
-  dvdauthor = callPackage ../applications/video/dvdauthor { };
-
-  dwb = callPackage ../applications/networking/browsers/dwb { dconf = gnome3.dconf; };
-
-  dwbWrapper = wrapFirefox
-    { browser = dwb; browserName = "dwb"; desktopName = "dwb";
-    };
-
-  dwm = callPackage ../applications/window-managers/dwm {
-    patches = config.dwm.patches or [];
-  };
-
-  dzen2 = callPackage ../applications/window-managers/dzen2 { };
-
-  eaglemode = callPackage ../applications/misc/eaglemode { };
-
-  eclipses = recurseIntoAttrs (callPackage ../applications/editors/eclipse { });
-
-  ed = callPackage ../applications/editors/ed { };
-
-  ekho = callPackage ../applications/audio/ekho { };
-
-  electrum = callPackage ../applications/misc/electrum { };
-
-  elinks = callPackage ../applications/networking/browsers/elinks { };
-
-  elvis = callPackage ../applications/editors/elvis { };
-
-  emacs = emacs24;
-
-  emacs24 = callPackage ../applications/editors/emacs-24 {
-    # use override to enable additional features
-    libXaw = xlibs.libXaw;
-    Xaw3d = null;
-    gconf = null;
-    librsvg = null;
-    alsaLib = null;
-    imagemagick = null;
-  };
-
-  emacs24-nox = lowPrio (appendToName "nox" (emacs24.override {
-    withX = false;
-  }));
-
-  emacs24Macport = lowPrio (callPackage ../applications/editors/emacs-24/macport.nix {
-    stdenv = pkgs.clangStdenv;
-  });
-
-  emacsPackages = emacs: self: let callPackage = newScope self; in rec {
-    inherit emacs;
-
-    autoComplete = callPackage ../applications/editors/emacs-modes/auto-complete { };
-
-    bbdb = callPackage ../applications/editors/emacs-modes/bbdb { };
-
-    bbdb3 = callPackage ../applications/editors/emacs-modes/bbdb/3.nix {};
-
-    cedet = callPackage ../applications/editors/emacs-modes/cedet { };
-
-    calfw = callPackage ../applications/editors/emacs-modes/calfw { };
-
-    coffee = callPackage ../applications/editors/emacs-modes/coffee { };
-
-    colorTheme = callPackage ../applications/editors/emacs-modes/color-theme { };
-
-    colorThemeSolarized = callPackage ../applications/editors/emacs-modes/color-theme-solarized { };
-
-    cryptol = callPackage ../applications/editors/emacs-modes/cryptol { };
-
-    cua = callPackage ../applications/editors/emacs-modes/cua { };
-
-    darcsum = callPackage ../applications/editors/emacs-modes/darcsum { };
-
-    # ecb = callPackage ../applications/editors/emacs-modes/ecb { };
-
-    jabber = callPackage ../applications/editors/emacs-modes/jabber { };
-
-    emacsClangCompleteAsync = callPackage ../applications/editors/emacs-modes/emacs-clang-complete-async { };
-
-    emacsSessionManagement = callPackage ../applications/editors/emacs-modes/session-management-for-emacs { };
-
-    emacsw3m = callPackage ../applications/editors/emacs-modes/emacs-w3m { };
-
-    emms = callPackage ../applications/editors/emacs-modes/emms { };
-
-    ess = callPackage ../applications/editors/emacs-modes/ess { };
-
-    flymakeCursor = callPackage ../applications/editors/emacs-modes/flymake-cursor { };
-
-    gh = callPackage ../applications/editors/emacs-modes/gh { };
-
-    graphvizDot = callPackage ../applications/editors/emacs-modes/graphviz-dot { };
-
-    gist = callPackage ../applications/editors/emacs-modes/gist { };
-
-    idris = callPackage ../applications/editors/emacs-modes/idris { };
-
-    jade = callPackage ../applications/editors/emacs-modes/jade { };
-
-    jdee = callPackage ../applications/editors/emacs-modes/jdee {
-      # Requires Emacs 23, for `avl-tree'.
-    };
-
-    js2 = callPackage ../applications/editors/emacs-modes/js2 { };
-
-    stratego = callPackage ../applications/editors/emacs-modes/stratego { };
-
-    haskellMode = callPackage ../applications/editors/emacs-modes/haskell { };
-
-    ocamlMode = callPackage ../applications/editors/emacs-modes/ocaml { };
-
-    structuredHaskellMode = callPackage ../applications/editors/emacs-modes/structured-haskell-mode {
-      inherit (haskellPackages) cabal haskellSrcExts;
-    };
-
-    tuaregMode = callPackage ../applications/editors/emacs-modes/tuareg { };
-
-    hol_light_mode = callPackage ../applications/editors/emacs-modes/hol_light { };
-
-    htmlize = callPackage ../applications/editors/emacs-modes/htmlize { };
-
-    logito = callPackage ../applications/editors/emacs-modes/logito { };
-
-    loremIpsum = callPackage ../applications/editors/emacs-modes/lorem-ipsum { };
-
-    magit = callPackage ../applications/editors/emacs-modes/magit { };
-
-    maudeMode = callPackage ../applications/editors/emacs-modes/maude { };
-
-    metaweblog = callPackage ../applications/editors/emacs-modes/metaweblog { };
-
-    notmuch = lowPrio (callPackage ../applications/networking/mailreaders/notmuch { });
-
-    offlineimap = callPackage ../applications/editors/emacs-modes/offlineimap {};
-
-    # This is usually a newer version of Org-Mode than that found in GNU Emacs, so
-    # we want it to have higher precedence.
-    org = hiPrio (callPackage ../applications/editors/emacs-modes/org { });
-
-    org2blog = callPackage ../applications/editors/emacs-modes/org2blog { };
-
-    pcache = callPackage ../applications/editors/emacs-modes/pcache { };
-
-    phpMode = callPackage ../applications/editors/emacs-modes/php { };
-
-    prologMode = callPackage ../applications/editors/emacs-modes/prolog { };
-
-    proofgeneral_4_2 = callPackage ../applications/editors/emacs-modes/proofgeneral/4.2.nix {
-      texinfo = texinfo4 ;
-      texLive = pkgs.texLiveAggregationFun {
-        paths = [ pkgs.texLive pkgs.texLiveCMSuper ];
-      };
-    };
-    proofgeneral_4_3_pre = callPackage ../applications/editors/emacs-modes/proofgeneral/4.3pre.nix {
-      texinfo = texinfo4 ;
-      texLive = pkgs.texLiveAggregationFun {
-        paths = [ pkgs.texLive pkgs.texLiveCMSuper ];
-      };
-    };
-    proofgeneral = self.proofgeneral_4_2;
-
-    quack = callPackage ../applications/editors/emacs-modes/quack { };
-
-    rectMark = callPackage ../applications/editors/emacs-modes/rect-mark { };
-
-    remember = callPackage ../applications/editors/emacs-modes/remember { };
-
-    rudel = callPackage ../applications/editors/emacs-modes/rudel { };
-
-    sbtMode = callPackage ../applications/editors/emacs-modes/sbt-mode { };
-
-    scalaMode1 = callPackage ../applications/editors/emacs-modes/scala-mode/v1.nix { };
-    scalaMode2 = callPackage ../applications/editors/emacs-modes/scala-mode/v2.nix { };
-
-    sunriseCommander = callPackage ../applications/editors/emacs-modes/sunrise-commander { };
-
-    writeGood = callPackage ../applications/editors/emacs-modes/writegood { };
-
-    xmlRpc = callPackage ../applications/editors/emacs-modes/xml-rpc { };
-  };
-
-  emacs24Packages = recurseIntoAttrs (emacsPackages emacs24 pkgs.emacs24Packages);
-
-  inherit (gnome3) empathy;
-
-  epdfview = callPackage ../applications/misc/epdfview { };
-
-  inherit (gnome3) epiphany;
-
-  espeak = callPackage ../applications/audio/espeak { };
-
-  espeakedit = callPackage ../applications/audio/espeak/edit.nix { };
-
-  esniper = callPackage ../applications/networking/esniper { };
-
-  etherape = callPackage ../applications/networking/sniffers/etherape {
-    inherit (gnome) gnomedocutils libgnome libglade libgnomeui scrollkeeper;
-  };
-
-  evilvte = callPackage ../applications/misc/evilvte {
-    configH = config.evilvte.config or "";
-  };
-
-  evopedia = callPackage ../applications/misc/evopedia { };
-
-  keepassx = callPackage ../applications/misc/keepassx { };
-  keepassx2 = callPackage ../applications/misc/keepassx/2.0.nix { };
-
-  inherit (gnome3) evince;
-  evolution_data_server = gnome3.evolution_data_server;
-
-  keepass = callPackage ../applications/misc/keepass { };
-
-  exrdisplay = callPackage ../applications/graphics/exrdisplay {
-    fltk = fltk20;
-  };
-
-  fbpanel = callPackage ../applications/window-managers/fbpanel { };
-
-  fbreader = callPackage ../applications/misc/fbreader { };
-
-  fetchmail = import ../applications/misc/fetchmail {
-    inherit stdenv fetchurl openssl;
-  };
-
-  fldigi = callPackage ../applications/audio/fldigi { };
-
-  fluidsynth = callPackage ../applications/audio/fluidsynth { };
-
-  fossil = callPackage ../applications/version-management/fossil { };
-
-  fribid = callPackage ../applications/networking/browsers/mozilla-plugins/fribid { };
-
-  fvwm = callPackage ../applications/window-managers/fvwm { };
-
-  geany = callPackage ../applications/editors/geany { };
-
-  gksu = callPackage ../applications/misc/gksu { };
-
-  gnuradio = callPackage ../applications/misc/gnuradio {
-    inherit (pythonPackages) lxml numpy scipy matplotlib pyopengl;
-    fftw = fftwFloat;
-  };
-
-  gnuradio-osmosdr = callPackage ../applications/misc/gnuradio-osmosdr { };
-
-  goldendict = callPackage ../applications/misc/goldendict { };
-
-  google-musicmanager = callPackage ../applications/audio/google-musicmanager { };
-
-  gpicview = callPackage ../applications/graphics/gpicview { };
-
-  gqrx = callPackage ../applications/misc/gqrx { };
-
-  grass = import ../applications/misc/grass {
-    inherit (xlibs) libXmu libXext libXp libX11 libXt libSM libICE libXpm
-      libXaw libXrender;
-    inherit config composableDerivation stdenv fetchurl
-      lib flex bison cairo fontconfig
-      gdal zlib ncurses gdbm proj pkgconfig swig
-      blas liblapack libjpeg libpng mysql unixODBC mesa postgresql python
-      readline sqlite tcl tk libtiff freetype makeWrapper wxGTK;
-    fftw = fftwSinglePrec;
-    ffmpeg = ffmpeg_0_10;
-    motif = lesstif;
-    opendwg = libdwg;
-    wxPython = wxPython28;
-  };
-
-  grip = callPackage ../applications/misc/grip {
-    inherit (gnome) libgnome libgnomeui vte;
-  };
-
-  gtimelog = pythonPackages.gtimelog;
-
-  inherit (gnome3) gucharmap;
-
-  guitarix = callPackage ../applications/audio/guitarix {
-    fftw = fftwSinglePrec;
-  };
-
-  photivo = callPackage ../applications/graphics/photivo { };
-
-  wavesurfer = callPackage ../applications/misc/audio/wavesurfer { };
-
-  wireshark = callPackage ../applications/networking/sniffers/wireshark { };
-
-  wvdial = callPackage ../os-specific/linux/wvdial { };
-
-  fbida = callPackage ../applications/graphics/fbida { };
-
-  fdupes = callPackage ../tools/misc/fdupes { };
-
-  feh = callPackage ../applications/graphics/feh { };
-
-  filezilla = callPackage ../applications/networking/ftp/filezilla { };
-
-  firefox13Pkgs = callPackage ../applications/networking/browsers/firefox/13.0.nix {
-    inherit (gnome) libIDL;
-  };
-
-  firefox13Wrapper = wrapFirefox { browser = firefox13Pkgs.firefox; };
-
-  firefox30Pkgs = callPackage ../applications/networking/browsers/firefox/30.nix {
-    inherit (gnome) libIDL;
-    inherit (pythonPackages) pysqlite;
-    libpng = libpng_apng;
-  };
-
-  firefox = callPackage ../applications/networking/browsers/firefox {
-    inherit (gnome) libIDL;
-    inherit (pythonPackages) pysqlite;
-  };
-
-  firefoxWrapper = wrapFirefox { browser = pkgs.firefox; };
-
-  firefox-bin = callPackage ../applications/networking/browsers/firefox-bin {
-    gconf = pkgs.gnome.GConf;
-    inherit (pkgs.gnome) libgnome libgnomeui;
-    inherit (pkgs.xlibs) libX11 libXScrnSaver libXext
-      libXinerama libXrender libXt;
-  };
-
-  flac = callPackage ../applications/audio/flac { };
-
-  flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer-11 {
-    debug = config.flashplayer.debug or false;
-  };
-
-  fluxbox = callPackage ../applications/window-managers/fluxbox { };
-
-  freecad = callPackage ../applications/graphics/freecad {
-    opencascade = opencascade_6_5;
-    inherit (pythonPackages) matplotlib pycollada;
-  };
-
-  freemind = callPackage ../applications/misc/freemind {
-    jdk = jdk;
-    jre = jdk;
-  };
-
-  freenet = callPackage ../applications/networking/p2p/freenet { };
-
-  freepv = callPackage ../applications/graphics/freepv { };
-
-  xfontsel = callPackage ../applications/misc/xfontsel { };
-  xlsfonts = callPackage ../applications/misc/xlsfonts { };
-
-  freerdp = callPackage ../applications/networking/remote/freerdp {
-    ffmpeg = ffmpeg_1;
-  };
-
-  freerdpUnstable = callPackage ../applications/networking/remote/freerdp/unstable.nix { };
-
-  freicoin = callPackage ../applications/misc/freicoin { };
-
-  fspot = callPackage ../applications/graphics/f-spot {
-    inherit (gnome) libgnome libgnomeui;
-    gtksharp = gtksharp1;
-  };
-
-  fuze = callPackage ../applications/networking/instant-messengers/fuze {};
-
-  gcolor2 = callPackage ../applications/graphics/gcolor2 { };
-
-  get_iplayer = callPackage ../applications/misc/get_iplayer {};
-
-  gimp_2_8 = callPackage ../applications/graphics/gimp/2.8.nix {
-    inherit (gnome) libart_lgpl;
-    webkit = null;
-    lcms = lcms2;
-    wrapPython = pythonPackages.wrapPython;
-  };
-
-  gimp = gimp_2_8;
-
-  gimpPlugins = recurseIntoAttrs (import ../applications/graphics/gimp/plugins {
-    inherit pkgs gimp;
-  });
-
-  gitAndTools = recurseIntoAttrs (import ../applications/version-management/git-and-tools {
-    inherit pkgs;
-  });
-  git = gitAndTools.git;
-  gitFull = gitAndTools.gitFull;
-  gitSVN = gitAndTools.gitSVN;
-
-  gitRepo = callPackage ../applications/version-management/git-repo {
-    python = python27;
-  };
-
-  gitolite = callPackage ../applications/version-management/gitolite { };
-
-  inherit (gnome3) gitg;
-
-  giv = callPackage ../applications/graphics/giv {
-    pcre = pcre.override { unicodeSupport = true; };
-  };
-
-  gmrun = callPackage ../applications/misc/gmrun {};
-
-  gnucash = callPackage ../applications/office/gnucash {
-    inherit (gnome2) libgnomeui libgtkhtml gtkhtml libbonoboui libgnomeprint libglade libart_lgpl;
-    gconf = gnome2.GConf;
-    guile = guile_1_8;
-    slibGuile = slibGuile.override { scheme = guile_1_8; };
-    goffice = goffice_0_8;
-  };
-
-  goffice_0_8 = callPackage ../desktops/gnome-3/3.10/misc/goffice/0.8.nix {
-    inherit (gnome2) libglade libgnomeui;
-    gconf = gnome2.GConf;
-    libart = gnome2.libart_lgpl;
-  }; # latest version: gnome3.goffice
-
-  ideas = recurseIntoAttrs (  (callPackage ../applications/editors/idea { })
-                           // (callPackage ../applications/editors/idea/pycharm.nix { }));
-
-  libquvi = callPackage ../applications/video/quvi/library.nix { };
-
-  mi2ly = callPackage ../applications/audio/mi2ly {};
-
-  praat = callPackage ../applications/audio/praat { };
-
-  quvi = callPackage ../applications/video/quvi/tool.nix { };
-
-  quvi_scripts = callPackage ../applications/video/quvi/scripts.nix { };
-
-  qjackctl = callPackage ../applications/audio/qjackctl { };
-
-  gkrellm = callPackage ../applications/misc/gkrellm { };
-
-  gmu = callPackage ../applications/audio/gmu { };
-
-  gnash = callPackage ../applications/video/gnash {
-    inherit (gnome) gtkglext;
-  };
-
-  gnome_mplayer = callPackage ../applications/video/gnome-mplayer {
-    inherit (gnome) GConf;
-  };
-
-  gnumeric = callPackage ../applications/office/gnumeric {
-    inherit (gnome3) goffice gnome_icon_theme;
-  };
-
-  gnunet = callPackage ../applications/networking/p2p/gnunet {
-    libgcrypt = libgcrypt_1_6;
-  };
-
-  gnunet_svn = lowPrio (callPackage ../applications/networking/p2p/gnunet/svn.nix {
-    libgcrypt = libgcrypt_1_6;
-  });
-
-  gocr = callPackage ../applications/graphics/gocr { };
-
-  gobby5 = callPackage ../applications/editors/gobby {
-    inherit (gnome) gtksourceview;
-  };
-
-  gphoto2 = callPackage ../applications/misc/gphoto2 { };
-
-  gphoto2fs = builderDefsPackage ../applications/misc/gphoto2/gphotofs.nix {
-    inherit libgphoto2 fuse pkgconfig glib libtool;
-  };
-
-  graphicsmagick = callPackage ../applications/graphics/graphicsmagick { };
-  graphicsmagick_q16 = callPackage ../applications/graphics/graphicsmagick { quantumdepth = 16; };
-
-  graphicsmagick137 = callPackage ../applications/graphics/graphicsmagick/1.3.7.nix {
-    libpng = libpng12;
-  };
-
-  gtkpod = callPackage ../applications/audio/gtkpod {
-    inherit (gnome) libglade;
-  };
-
-  jbidwatcher = callPackage ../applications/misc/jbidwatcher {
-    java = if stdenv.isLinux then jre else jdk;
-  };
-
-  qrdecode = builderDefsPackage (import ../tools/graphics/qrdecode) {
-    libpng = libpng12;
-    opencv = opencv_2_1;
-  };
-
-  qrencode = callPackage ../tools/graphics/qrencode { };
-
-  gecko_mediaplayer = callPackage ../applications/networking/browsers/mozilla-plugins/gecko-mediaplayer {
-    inherit (gnome) GConf;
-    browser = firefox;
-  };
-
-  geeqie = callPackage ../applications/graphics/geeqie { };
-
-  gigedit = callPackage ../applications/audio/gigedit { };
-
-  gqview = callPackage ../applications/graphics/gqview { };
-
-  gmpc = callPackage ../applications/audio/gmpc { };
-
-  gmtk = callPackage ../applications/networking/browsers/mozilla-plugins/gmtk {
-    inherit (gnome) GConf;
-  };
-
-  googleearth = callPackage_i686 ../applications/misc/googleearth { };
-
-  google_talk_plugin = callPackage ../applications/networking/browsers/mozilla-plugins/google-talk-plugin {
-    libpng = libpng12;
-  };
-
-  gosmore = builderDefsPackage ../applications/misc/gosmore {
-    inherit fetchsvn curl pkgconfig libxml2 gtk;
-  };
-
-  gpsbabel = callPackage ../applications/misc/gpsbabel { };
-
-  gpscorrelate = callPackage ../applications/misc/gpscorrelate { };
-
-  gpsd = callPackage ../servers/gpsd { };
-
-  guitone = callPackage ../applications/version-management/guitone {
-    graphviz = graphviz_2_32;
-  };
-
-  gv = callPackage ../applications/misc/gv { };
-
-  guvcview = callPackage ../os-specific/linux/guvcview { };
-
-  hello = callPackage ../applications/misc/hello/ex-2 { };
-
-  herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { };
-
-  hexchat = callPackage ../applications/networking/irc/hexchat { };
-
-  hexedit = callPackage ../applications/editors/hexedit { };
-
-  hipchat = callPackage ../applications/networking/instant-messengers/hipchat { };
-
-  homebank = callPackage ../applications/office/homebank { };
-
-  htmldoc = callPackage ../applications/misc/htmldoc {
-    fltk = fltk13;
-  };
-
-  hugin = callPackage ../applications/graphics/hugin { };
-
-  hydrogen = callPackage ../applications/audio/hydrogen { };
-
-  i3 = callPackage ../applications/window-managers/i3 { };
-
-  i3lock = callPackage ../applications/window-managers/i3/lock.nix {
-    inherit (xorg) libxkbfile;
-    cairo = cairo.override { xcbSupport = true; };
-  };
-
-  i3minator = callPackage ../tools/misc/i3minator { };
-
-  i3status = callPackage ../applications/window-managers/i3/status.nix { };
-
-  i810switch = callPackage ../os-specific/linux/i810switch { };
-
-  icewm = callPackage ../applications/window-managers/icewm { };
-
-  id3v2 = callPackage ../applications/audio/id3v2 { };
-
-  ifenslave = callPackage ../os-specific/linux/ifenslave { };
-
-  ii = callPackage ../applications/networking/irc/ii { };
-
-  ike = callPackage ../applications/ike { };
-
-  ikiwiki = callPackage ../applications/misc/ikiwiki {
-    inherit (perlPackages) TextMarkdown URI HTMLParser HTMLScrubber
-      HTMLTemplate TimeDate CGISession DBFile CGIFormBuilder LocaleGettext
-      RpcXML XMLSimple PerlMagick YAML YAMLLibYAML HTMLTree Filechdir
-      AuthenPassphrase NetOpenIDConsumer LWPxParanoidAgent CryptSSLeay;
-  };
-
-  imagemagick = callPackage ../applications/graphics/ImageMagick {
-    tetex = null;
-    librsvg = null;
-  };
-
-  imagemagickBig = lowPrio (callPackage ../applications/graphics/ImageMagick { });
-
-  # Impressive, formerly known as "KeyJNote".
-  impressive = callPackage ../applications/office/impressive {
-    # XXX These are the PyOpenGL dependencies, which we need here.
-    inherit (pythonPackages) pyopengl;
-  };
-
-  inferno = callPackage_i686 ../applications/inferno { };
-
-  inkscape = callPackage ../applications/graphics/inkscape {
-    inherit (pythonPackages) lxml;
-    lcms = lcms2;
-  };
-
-  ion3 = callPackage ../applications/window-managers/ion-3 {
-    lua = lua5;
-  };
-
-  ipe = callPackage ../applications/graphics/ipe { };
-
-  iptraf = callPackage ../applications/networking/iptraf { };
-
-  irssi = callPackage ../applications/networking/irc/irssi {
-    # compile with gccApple on darwin to support the -no-cpp-precompile flag
-    stdenv = if stdenv.isDarwin
-      then stdenvAdapters.overrideGCC stdenv gccApple
-      else stdenv;
-  };
-
-  irssi_fish = callPackage ../applications/networking/irc/irssi/fish { };
-
-  irssi_otr = callPackage ../applications/networking/irc/irssi/otr { };
-
-  bip = callPackage ../applications/networking/irc/bip { };
-
-  jack_capture = callPackage ../applications/audio/jack-capture { };
-
-  jack_oscrolloscope = callPackage ../applications/audio/jack-oscrolloscope { };
-
-  jack_rack = callPackage ../applications/audio/jack-rack { };
-
-  jackmeter = callPackage ../applications/audio/jackmeter { };
-
-  jalv = callPackage ../applications/audio/jalv { };
-
-  jedit = callPackage ../applications/editors/jedit { };
-
-  jigdo = callPackage ../applications/misc/jigdo { };
-
-  jitsi = callPackage ../applications/networking/instant-messengers/jitsi { };
-
-  joe = callPackage ../applications/editors/joe { };
-
-  jbrout = callPackage ../applications/graphics/jbrout {
-    inherit (pythonPackages) lxml;
-  };
-
-  jwm = callPackage ../applications/window-managers/jwm { };
-
-  k3d = callPackage ../applications/graphics/k3d {
-    inherit (pkgs.gnome2) gtkglext;
-  };
-
-  keepnote = callPackage ../applications/office/keepnote {
-    pygtk = pyGtkGlade;
-  };
-
-  kermit = callPackage ../tools/misc/kermit { };
-
-  keymon = callPackage ../applications/video/key-mon { };
-
-  kino = callPackage ../applications/video/kino {
-    inherit (gnome) libglade;
-  };
-
-  koji = callPackage ../tools/package-management/koji { };
-
-  lame = callPackage ../applications/audio/lame { };
-
-  larswm = callPackage ../applications/window-managers/larswm { };
-
-  lash = callPackage ../applications/audio/lash { };
-
-  ladspaH = callPackage ../applications/audio/ladspa-plugins/ladspah.nix { };
-
-  ladspaPlugins = callPackage ../applications/audio/ladspa-plugins {
-    fftw = fftwSinglePrec;
-  };
-
-  caps = callPackage ../applications/audio/caps { };
-
-  lastwatch = callPackage ../applications/audio/lastwatch { };
-
-  lastfmsubmitd = callPackage ../applications/audio/lastfmsubmitd { };
-
-  lbdb = callPackage ../tools/misc/lbdb { };
-
-  lci = callPackage ../applications/science/logic/lci {};
-
-  ldcpp = callPackage ../applications/networking/p2p/ldcpp {
-    inherit (gnome) libglade;
-  };
-
-  librecad = callPackage ../applications/misc/librecad { };
-
-  librecad2 = callPackage ../applications/misc/librecad/2.0.nix { };
-
-  libreoffice = callPackage ../applications/office/libreoffice {
-    inherit (perlPackages) ArchiveZip CompressZlib;
-    inherit (gnome) GConf ORBit2 gnome_vfs;
-    zip = zip.override { enableNLS = false; };
-    boost = boost155;
-    jdk = openjdk;
-    fontsConf = makeFontsConf {
-      fontDirectories = [
-        freefont_ttf xorg.fontmiscmisc xorg.fontbhttf
-      ];
-    };
-    clucene_core = clucene_core_2;
-    lcms = lcms2;
-    harfbuzz = harfbuzz.override {
-      withIcu = true; withGraphite2 = true;
-    };
-  };
-
-  liferea = callPackage ../applications/networking/newsreaders/liferea { };
-
-  lingot = callPackage ../applications/audio/lingot {
-    inherit (gnome) libglade;
-  };
-
-  links = callPackage ../applications/networking/browsers/links { };
-
-  ledger = callPackage ../applications/office/ledger/2.6.3.nix { };
-  ledger3 = callPackage ../applications/office/ledger/3.0.nix { };
-
-  lighttable = callPackage ../applications/editors/lighttable {};
-
-  links2 = callPackage ../applications/networking/browsers/links2 { };
-
-  linphone = callPackage ../applications/networking/instant-messengers/linphone rec {
-    inherit (gnome) libglade;
-    libexosip = libexosip_3;
-    libosip = libosip_3;
-  };
-
-  linuxsampler = callPackage ../applications/audio/linuxsampler {
-    bison = bison2;
-  };
-
-  llpp = callPackage ../applications/misc/llpp { inherit (ocamlPackages) lablgl; };
-
-  lmms = callPackage ../applications/audio/lmms { };
-
-  lrzsz = callPackage ../tools/misc/lrzsz { };
-
-  luminanceHDR = callPackage ../applications/graphics/luminance-hdr { };
-
-  lxdvdrip = callPackage ../applications/video/lxdvdrip { };
-
-  handbrake = callPackage ../applications/video/handbrake { };
-
-  lilyterm = callPackage ../applications/misc/lilyterm {
-    inherit (gnome) vte;
-    gtk = gtk2;
-  };
-
-  lynx = callPackage ../applications/networking/browsers/lynx { };
-
-  lyx = callPackage ../applications/misc/lyx { };
-
-  makeself = callPackage ../applications/misc/makeself { };
-
-  matchbox = callPackage ../applications/window-managers/matchbox { };
-
-  mcpp = callPackage ../development/compilers/mcpp { };
-
-  mda_lv2 = callPackage ../applications/audio/mda-lv2 { };
-
-  meld = callPackage ../applications/version-management/meld {
-    inherit (gnome) scrollkeeper;
-    pygtk = pyGtkGlade;
-  };
-
-  mcomix = callPackage ../applications/graphics/mcomix { };
-
-  mercurial = callPackage ../applications/version-management/mercurial {
-    inherit (pythonPackages) curses docutils;
-    guiSupport = false; # use mercurialFull to get hgk GUI
-  };
-
-  mercurialFull = appendToName "full" (pkgs.mercurial.override { guiSupport = true; });
-
-  merkaartor = callPackage ../applications/misc/merkaartor { };
-
-  meshlab = callPackage ../applications/graphics/meshlab { };
-
-  mhwaveedit = callPackage ../applications/audio/mhwaveedit {};
-
-  mid2key = callPackage ../applications/audio/mid2key { };
-
-  midori = callPackage ../applications/networking/browsers/midori { };
-
-  midoriWrapper = wrapFirefox
-    { browser = midori; browserName = "midori"; desktopName = "Midori";
-      icon = "${midori}/share/icons/hicolor/22x22/apps/midori.png";
-    };
-
-  mikmod = callPackage ../applications/audio/mikmod { };
-
-  minicom = callPackage ../tools/misc/minicom { };
-
-  minimodem = callPackage ../applications/audio/minimodem { };
-
-  minidjvu = callPackage ../applications/graphics/minidjvu { };
-
-  mirage = callPackage ../applications/graphics/mirage {};
-
-  mixxx = callPackage ../applications/audio/mixxx {
-    inherit (vamp) vampSDK;
-  };
-
-  mmex = callPackage ../applications/office/mmex { };
-
-  moc = callPackage ../applications/audio/moc { };
-
-  monkeysAudio = callPackage ../applications/audio/monkeys-audio { };
-
-  monodevelop = callPackage ../applications/editors/monodevelop {
-    inherit (gnome) gnome_vfs libbonobo libglade libgnome GConf;
-    mozilla = firefox;
-    gtksharp = gtksharp2;
-  };
-
-  monodoc = callPackage ../applications/editors/monodoc {
-    gtksharp = gtksharp1;
-  };
-
-  monotone = callPackage ../applications/version-management/monotone {
-    lua = lua5;
-    boost = boost149;
-  };
-
-  monotoneViz = builderDefsPackage (import ../applications/version-management/monotone-viz/mtn-head.nix) {
-    inherit ocaml graphviz pkgconfig autoconf automake libtool glib gtk;
-    inherit (ocamlPackages) lablgtk;
-    inherit (gnome) libgnomecanvas;
-  };
-
-  mopidy = callPackage ../applications/audio/mopidy { };
-
-  mopidy-spotify = callPackage ../applications/audio/mopidy-spotify { };
-
-  mopidy-moped = callPackage ../applications/audio/mopidy-moped { };
-
-  mozilla = callPackage ../applications/networking/browsers/mozilla {
-    inherit (gnome) libIDL;
-  };
-
-  mozplugger = builderDefsPackage (import ../applications/networking/browsers/mozilla-plugins/mozplugger) {
-    inherit firefox;
-    inherit (xlibs) libX11 xproto;
-  };
-
-  easytag = callPackage ../applications/audio/easytag { };
-
-  mp3info = callPackage ../applications/audio/mp3info { };
-
-  mp3splt = callPackage ../applications/audio/mp3splt { };
-
-  mpc123 = callPackage ../applications/audio/mpc123 { };
-
-  mpg123 = callPackage ../applications/audio/mpg123 { };
-
-  mpg321 = callPackage ../applications/audio/mpg321 { };
-
-  mpc_cli = callPackage ../applications/audio/mpc { };
-
-  ncmpc = callPackage ../applications/audio/ncmpc { };
-
-  ncmpcpp = callPackage ../applications/audio/ncmpcpp { };
-
-  normalize = callPackage ../applications/audio/normalize { };
-
-  mplayer = callPackage ../applications/video/mplayer {
-    pulseSupport = config.pulseaudio or false;
-    vdpauSupport = config.mplayer.vdpauSupport or false;
-  };
-
-  mplayer2 = callPackage ../applications/video/mplayer2 {
-    ffmpeg = libav_9; # see https://trac.macports.org/ticket/44386
-  };
-
-  MPlayerPlugin = browser:
-    import ../applications/networking/browsers/mozilla-plugins/mplayerplug-in {
-      inherit browser;
-      inherit fetchurl stdenv pkgconfig gettext;
-      inherit (xlibs) libXpm;
-      # !!! should depend on MPlayer
-    };
-
-  mpv = callPackage ../applications/video/mpv {
-    lua = lua5_1;
-    bs2bSupport = config.mpv.bs2bSupport or true;
-    quviSupport = config.mpv.quviSupport or false;
-    cacaSupport = config.mpv.cacaSupport or true;
-    vaapiSupport = config.mpv.vaapiSupport or false;
-  };
-
-  mrxvt = callPackage ../applications/misc/mrxvt { };
-
-  multisync = callPackage ../applications/misc/multisync {
-    inherit (gnome) ORBit2 libbonobo libgnomeui GConf;
-  };
-
-  mumble = callPackage ../applications/networking/mumble {
-    avahi = avahi.override {
-      withLibdnssdCompat = true;
-    };
-    jackSupport = config.mumble.jackSupport or false;
-    speechdSupport = config.mumble.speechdSupport or false;
-  };
-
-  murmur = callPackage ../applications/networking/mumble/murmur.nix {
-    avahi = avahi.override {
-      withLibdnssdCompat = true;
-    };
-    iceSupport = config.murmur.iceSupport or true;
-  };
-
-  mutt = callPackage ../applications/networking/mailreaders/mutt { };
-
-  namecoin = callPackage ../applications/misc/namecoin { };
-  namecoinqt = callPackage ../applications/misc/namecoin/qt.nix { };
-
-  pcmanfm = callPackage ../applications/misc/pcmanfm { };
-
-  ruby_gpgme = callPackage ../development/libraries/ruby_gpgme {
-    ruby = ruby19;
-    hoe = rubyLibs.hoe;
-  };
-
-  ruby_ncursesw_sup = callPackage ../development/libraries/ruby_ncursesw_sup { };
-
-  shotcut = callPackage ../applications/video/shotcut { mlt = mlt-qt5; };
-
-  smplayer = callPackage ../applications/video/smplayer { };
-
-  sup = with rubyLibs; callPackage ../applications/networking/mailreaders/sup {
-    ruby = ruby19.override {
-      cursesSupport = true;
-    };
-
-    inherit gettext highline iconv locale lockfile
-      text trollop xapian_ruby which;
-
-    rmail_sup = ""; # missing
-    unicode = "";
-
-    # See https://github.com/NixOS/nixpkgs/issues/1804 and
-    # https://github.com/NixOS/nixpkgs/issues/2146
-    bundler = pkgs.lib.overrideDerivation pkgs.rubyLibs.bundler (
-      oldAttrs: {
-        dontPatchShebangs = 1;
-      }
-    );
-    chronic      = chronic;
-    gpgme        = ruby_gpgme;
-    mime_types   = mime_types;
-    ncursesw_sup = ruby_ncursesw_sup;
-    rake         = rake;
-  };
-
-  synfigstudio = callPackage ../applications/graphics/synfigstudio {
-    fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf ]; };
-  };
-
-  sxhkd = callPackage ../applications/window-managers/sxhkd { };
-
-  msmtp = callPackage ../applications/networking/msmtp { };
-
-  imapfilter = callPackage ../applications/networking/mailreaders/imapfilter.nix {
-    lua = lua5;
- };
-
-  mupdf = callPackage ../applications/misc/mupdf { };
-
-  mypaint = callPackage ../applications/graphics/mypaint { };
-
-  mythtv = callPackage ../applications/video/mythtv { };
-
-  tvtime = callPackage ../applications/video/tvtime {
-    kernel = linux;
-  };
-
-  nano = callPackage ../applications/editors/nano { };
-
-  nanoblogger = callPackage ../applications/misc/nanoblogger { };
-
-  navipowm = callPackage ../applications/misc/navipowm { };
-
-  navit = callPackage ../applications/misc/navit { };
-
-  netbeans = callPackage ../applications/editors/netbeans { };
-
-  ncdu = callPackage ../tools/misc/ncdu { };
-
-  ncdc = callPackage ../applications/networking/p2p/ncdc { };
-
-  nedit = callPackage ../applications/editors/nedit {
-    motif = lesstif;
-  };
-
-  netsurfBrowser = netsurf.browser;
-  netsurf = recurseIntoAttrs (import ../applications/networking/browsers/netsurf { inherit pkgs; });
-
-  notmuch = callPackage ../applications/networking/mailreaders/notmuch {
-    # use emacsPackages.notmuch if you want emacs support
-    emacs = null;
-  };
-
-  nova = callPackage ../applications/virtualization/nova { };
-
-  novaclient = callPackage ../applications/virtualization/nova/client.nix { };
-
-  nspluginwrapper = callPackage ../applications/networking/browsers/mozilla-plugins/nspluginwrapper {};
-
-  nvi = callPackage ../applications/editors/nvi { };
-
-  nvpy = callPackage ../applications/editors/nvpy { };
-
-  obconf = callPackage ../tools/X11/obconf {
-    inherit (gnome) libglade;
-  };
-
-  ocrad = callPackage ../applications/graphics/ocrad { };
-
-  offrss = callPackage ../applications/networking/offrss { };
-
-  ogmtools = callPackage ../applications/video/ogmtools { };
-
-  omxplayer = callPackage ../applications/video/omxplayer { };
-
-  oneteam = callPackage ../applications/networking/instant-messengers/oneteam {};
-
-  openbox = callPackage ../applications/window-managers/openbox { };
-
-  openimageio = callPackage ../applications/graphics/openimageio { };
-
-  openjump = callPackage ../applications/misc/openjump { };
-
-  openscad = callPackage ../applications/graphics/openscad {};
-
-  opera = callPackage ../applications/networking/browsers/opera {
-    inherit (pkgs.kde4) kdelibs;
-  };
-
-  opusfile = callPackage ../applications/audio/opusfile { };
-
-  opusTools = callPackage ../applications/audio/opus-tools { };
-
-  pamixer = callPackage ../applications/audio/pamixer { };
-
-  pan = callPackage ../applications/networking/newsreaders/pan {
-    spellChecking = false;
-  };
-
-  panotools = callPackage ../applications/graphics/panotools { };
-
-  pavucontrol = callPackage ../applications/audio/pavucontrol { };
-
-  paraview = callPackage ../applications/graphics/paraview { };
-
-  pencil = callPackage ../applications/graphics/pencil { };
-
-  petrifoo = callPackage ../applications/audio/petrifoo {
-    inherit (gnome) libgnomecanvas;
-  };
-
-  pdftk = callPackage ../tools/typesetting/pdftk { };
-  pdfgrep  = callPackage ../tools/typesetting/pdfgrep { };
-
-  pianobar = callPackage ../applications/audio/pianobar { };
-
-  pianobooster = callPackage ../applications/audio/pianobooster { };
-
-  picard = callPackage ../applications/audio/picard { };
-
-  picocom = callPackage ../tools/misc/picocom { };
-
-  pidgin = callPackage ../applications/networking/instant-messengers/pidgin {
-    openssl = if config.pidgin.openssl or true then openssl else null;
-    gnutls = if config.pidgin.gnutls or false then gnutls else null;
-    libgcrypt = if config.pidgin.gnutls or false then libgcrypt else null;
-    startupnotification = libstartup_notification;
-  };
-
-  pidginlatex = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-latex {
-    imagemagick = imagemagickBig;
-  };
-
-  pidginlatexSF = builderDefsPackage
-    (import ../applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/pidgin-latex-sf.nix)
-    {
-      inherit pkgconfig pidgin texLive imagemagick which glib gtk;
-    };
-
-  pidginmsnpecan = callPackage ../applications/networking/instant-messengers/pidgin-plugins/msn-pecan { };
-
-  pidginotr = callPackage ../applications/networking/instant-messengers/pidgin-plugins/otr { };
-
-  pidginsipe = callPackage ../applications/networking/instant-messengers/pidgin-plugins/sipe { };
-
-  toxprpl = callPackage ../applications/networking/instant-messengers/pidgin-plugins/tox-prpl { };
-
-  pinfo = callPackage ../applications/misc/pinfo { };
-
-  pinta = callPackage ../applications/graphics/pinta {
-    gtksharp = gtksharp2;
-  };
-
-  pommed = callPackage ../os-specific/linux/pommed {
-    inherit (xorg) libXpm;
-  };
-
-  potrace = callPackage ../applications/graphics/potrace {};
-
-  posterazor = callPackage ../applications/misc/posterazor { };
-
-  pqiv = callPackage ../applications/graphics/pqiv { };
-
-  qiv = callPackage ../applications/graphics/qiv { };
-
-  processing = callPackage ../applications/graphics/processing { inherit (xorg) libXxf86vm; };
-
-  # perhaps there are better apps for this task? It's how I had configured my preivous system.
-  # And I don't want to rewrite all rules
-  procmail = callPackage ../applications/misc/procmail { };
-
-  pstree = callPackage ../applications/misc/pstree { };
-
-  pulseview = callPackage ../applications/science/electronics/pulseview { };
-
-  puredata = callPackage ../applications/audio/puredata { };
-
-  pythonmagick = callPackage ../applications/graphics/PythonMagick { };
-
-  qbittorrent = callPackage ../applications/networking/p2p/qbittorrent { };
-
-  eiskaltdcpp = callPackage ../applications/networking/p2p/eiskaltdcpp { };
-
-  qemu = callPackage ../applications/virtualization/qemu { };
-
-  qmmp = callPackage ../applications/audio/qmmp { };
-
-  qsampler = callPackage ../applications/audio/qsampler { };
-
-  qsynth = callPackage ../applications/audio/qsynth { };
-
-  qtpfsgui = callPackage ../applications/graphics/qtpfsgui { };
-
-  qtractor = callPackage ../applications/audio/qtractor { };
-
-  quodlibet = callPackage ../applications/audio/quodlibet {
-    inherit (pythonPackages) mutagen;
-  };
-
-  quodlibet-with-gst-plugins = callPackage ../applications/audio/quodlibet {
-    inherit (pythonPackages) mutagen;
-    withGstPlugins = true;
-    gst_plugins_bad = null;
-  };
-
-  rakarrack = callPackage ../applications/audio/rakarrack {
-    inherit (xorg) libXpm libXft;
-    fltk = fltk13;
-  };
-
-  rapcad = callPackage ../applications/graphics/rapcad {};
-
-  rapidsvn = callPackage ../applications/version-management/rapidsvn { };
-
-  ratpoison = callPackage ../applications/window-managers/ratpoison { };
-
-  rawtherapee = callPackage ../applications/graphics/rawtherapee {
-    fftw = fftwSinglePrec;
-  };
-
-  rcs = callPackage ../applications/version-management/rcs { };
-
-  rdesktop = callPackage ../applications/networking/remote/rdesktop { };
-
-  recode = callPackage ../tools/text/recode { };
-
-  retroshare = callPackage ../applications/networking/p2p/retroshare {
-    qt = qt4;
-  };
-
-  retroshare06 = lowPrio (callPackage ../applications/networking/p2p/retroshare/0.6.nix {
-    qt = qt4;
-  });
-
-  rsync = callPackage ../applications/networking/sync/rsync {
-    enableACLs = !(stdenv.isDarwin || stdenv.isSunOS || stdenv.isFreeBSD);
-    enableCopyDevicesPatch = (config.rsync.enableCopyDevicesPatch or false);
-  };
-
-  rtl-sdr = callPackage ../applications/misc/rtl-sdr { };
-
-  rubyripper = callPackage ../applications/audio/rubyripper {};
-
-  rxvt = callPackage ../applications/misc/rxvt { };
-
-  # = urxvt
-  rxvt_unicode = callPackage ../applications/misc/rxvt_unicode {
-    perlSupport = true;
-    gdkPixbufSupport = true;
-    unicode3Support = true;
-  };
-
-  sakura = callPackage ../applications/misc/sakura {
-    inherit (gnome) vte;
-  };
-
-  sbagen = callPackage ../applications/misc/sbagen { };
-
-  scite = callPackage ../applications/editors/scite { };
-
-  scribus = callPackage ../applications/office/scribus {
-    inherit (gnome) libart_lgpl;
-  };
-
-  seafile-client = callPackage ../applications/networking/seafile-client { };
-
-  seeks = callPackage ../tools/networking/p2p/seeks {
-    opencv = opencv_2_1;
-  };
-
-  seg3d = callPackage ../applications/graphics/seg3d {
-    wxGTK = wxGTK28.override { unicode = false; };
-  };
-
-  seq24 = callPackage ../applications/audio/seq24 { };
-
-  setbfree = callPackage ../applications/audio/setbfree { };
-
-  sflphone = callPackage ../applications/networking/instant-messengers/sflphone {
-    gtk = gtk3;
-  };
-
-  siproxd = callPackage ../applications/networking/siproxd { };
-
-  skype = callPackage_i686 ../applications/networking/instant-messengers/skype { };
-
-  skype4pidgin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/skype4pidgin { };
-
-  skype_call_recorder = callPackage ../applications/networking/instant-messengers/skype-call-recorder { };
-
-  slrn = callPackage ../applications/networking/newsreaders/slrn { };
-
-  spideroak = callPackage ../applications/networking/spideroak { };
-
-  ssvnc = callPackage ../applications/networking/remote/ssvnc { };
-
-  st = callPackage ../applications/misc/st {
-    conf = config.st.conf or null;
-  };
-
-  stella = callPackage ../misc/emulators/stella { };
-  
-  linuxstopmotion = callPackage ../applications/video/linuxstopmotion { };
-
-  sweethome3d = recurseIntoAttrs (  (callPackage ../applications/misc/sweethome3d { })
-                                 // (callPackage ../applications/misc/sweethome3d/editors.nix {
-                                      sweethome3dApp = sweethome3d.application;
-                                    })
-                                 );
-
-  sxiv = callPackage ../applications/graphics/sxiv { };
-
-  bittorrentSync = callPackage ../applications/networking/bittorrentsync { };
-
-  dropbox = callPackage ../applications/networking/dropbox { };
-
-  dropbox-cli = callPackage ../applications/networking/dropbox-cli { };
-
-  lightdm = callPackage ../applications/display-managers/lightdm { };
-
-  lightdm_gtk_greeter = callPackage ../applications/display-managers/lightdm-gtk-greeter { };
-
-  # slic3r 0.9.10b says: "Running Slic3r under Perl >= 5.16 is not supported nor recommended"
-  slic3r = callPackage ../applications/misc/slic3r {
-    perlPackages = perl514Packages;
-    perl = perl514;
-  };
-
-  curaengine = callPackage ../applications/misc/curaengine { };
-
-  cura = callPackage ../applications/misc/cura { };
-
-  printrun = callPackage ../applications/misc/printrun { };
-
-  slim = callPackage ../applications/display-managers/slim {
-    libpng = libpng12;
-  };
-
-  smartdeblur = callPackage ../applications/graphics/smartdeblur { };
-
-  snd = callPackage ../applications/audio/snd { };
-
-  shntool = callPackage ../applications/audio/shntool { };
-
-  sonic_visualiser = callPackage ../applications/audio/sonic-visualiser {
-    inherit (pkgs.vamp) vampSDK;
-    inherit (pkgs.xlibs) libX11;
-    fftw = pkgs.fftwSinglePrec;
-  };
-
-  sox = callPackage ../applications/misc/audio/sox { };
-
-  soxr = callPackage ../applications/misc/audio/soxr { };
-
-  spotify = callPackage ../applications/audio/spotify {
-    inherit (gnome) GConf;
-    libpng = libpng12;
-  };
-
-  libspotify = callPackage ../development/libraries/libspotify {
-    apiKey = config.libspotify.apiKey or null;
-  };
-
-  stalonetray = callPackage ../applications/window-managers/stalonetray {};
-
-  stp = callPackage ../applications/science/logic/stp {};
-
-  stumpwm = lispPackages.stumpwm;
-
-  sublime = callPackage ../applications/editors/sublime { };
-
-  sublime3 = lowPrio (callPackage ../applications/editors/sublime3 { });
-
-  subversion = callPackage ../applications/version-management/subversion/default.nix {
-    bdbSupport = true;
-    httpServer = false;
-    httpSupport = true;
-    pythonBindings = false;
-    perlBindings = false;
-    javahlBindings = false;
-    saslSupport = false;
-    httpd = apacheHttpd;
-    sasl = cyrus_sasl;
-  };
-
-  subversionClient = appendToName "client" (subversion.override {
-    bdbSupport = false;
-    perlBindings = true;
-    pythonBindings = true;
-  });
-
-  surf = callPackage ../applications/misc/surf {
-    webkit = webkitgtk2;
-  };
-
-  svk = perlPackages.SVK;
-
-  swh_lv2 = callPackage ../applications/audio/swh-lv2 { };
-
-  sylpheed = callPackage ../applications/networking/mailreaders/sylpheed {
-    sslSupport = true;
-    gpgSupport = true;
-  };
-
-  symlinks = callPackage ../tools/system/symlinks { };
-
-  syncthing = callPackage ../applications/networking/syncthing { };
-
-  # linux only by now
-  synergy = callPackage ../applications/misc/synergy { };
-
-  tabbed = callPackage ../applications/window-managers/tabbed { };
-
-  tahoelafs = callPackage ../tools/networking/p2p/tahoe-lafs {
-    inherit (pythonPackages) twisted foolscap simplejson nevow zfec
-      pycryptopp sqlite3 darcsver setuptoolsTrial setuptoolsDarcs
-      numpy pyasn1 mock;
-  };
-
-  tailor = builderDefsPackage (import ../applications/version-management/tailor) {
-    inherit makeWrapper python;
-  };
-
-  tangogps = callPackage ../applications/misc/tangogps {
-    gconf = gnome.GConf;
-  };
-
-  teamspeak_client = callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { };
-  teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { };
-
-  taskjuggler = callPackage ../applications/misc/taskjuggler { };
-
-  taskwarrior = callPackage ../applications/misc/taskwarrior { };
-
-  taskserver = callPackage ../servers/misc/taskserver { };
-
-  telegram-cli = callPackage ../applications/networking/instant-messengers/telegram-cli/default.nix { };
-
-  telepathy_gabble = callPackage ../applications/networking/instant-messengers/telepathy/gabble { };
-
-  telepathy_haze = callPackage ../applications/networking/instant-messengers/telepathy/haze {};
-
-  telepathy_logger = callPackage ../applications/networking/instant-messengers/telepathy/logger {};
-
-  telepathy_mission_control = callPackage ../applications/networking/instant-messengers/telepathy/mission-control { };
-
-  telepathy_rakia = callPackage ../applications/networking/instant-messengers/telepathy/rakia { };
-
-  telepathy_salut = callPackage ../applications/networking/instant-messengers/telepathy/salut {};
-
-  terminator = callPackage ../applications/misc/terminator {
-    vte = gnome.vte.override { pythonSupport = true; };
-    inherit (pythonPackages) notify;
-  };
-
-  tesseract = callPackage ../applications/graphics/tesseract { };
-
-  thinkingRock = callPackage ../applications/misc/thinking-rock { };
-
-  thunderbird = callPackage ../applications/networking/mailreaders/thunderbird {
-    inherit (gnome) libIDL;
-    inherit (pythonPackages) pysqlite;
-    libpng = libpng_apng;
-  };
-
-  thunderbird-bin = callPackage ../applications/networking/mailreaders/thunderbird-bin {
-    gconf = pkgs.gnome.GConf;
-    inherit (pkgs.gnome) libgnome libgnomeui;
-    inherit (pkgs.xlibs) libX11 libXScrnSaver libXext
-      libXinerama libXrender libXt;
-  };
-
-  tig = gitAndTools.tig;
-
-  tilda = callPackage ../applications/misc/tilda {
-    vte = gnome3.vte;
-    gtk = gtk3;
-  };
-
-  timidity = callPackage ../tools/misc/timidity { };
-
-  tint2 = callPackage ../applications/misc/tint2 { };
-
-  tkcvs = callPackage ../applications/version-management/tkcvs { };
-
-  tla = callPackage ../applications/version-management/arch { };
-
-  todo-txt-cli = callPackage ../applications/office/todo.txt-cli { };
-
-  torchat = callPackage ../applications/networking/instant-messengers/torchat {
-    wrapPython = pythonPackages.wrapPython;
-  };
-
-  toxic = callPackage ../applications/networking/instant-messengers/toxic { };
-
-  transcode = callPackage ../applications/audio/transcode { };
-
-  transmission = callPackage ../applications/networking/p2p/transmission { };
-  transmission_gtk = transmission.override { enableGTK3 = true; };
-
-  transmission_remote_gtk = callPackage ../applications/networking/p2p/transmission-remote-gtk {};
-
-  trayer = callPackage ../applications/window-managers/trayer { };
-
-  tree = callPackage ../tools/system/tree {};
-
-  tribler = callPackage ../applications/networking/p2p/tribler { };
-
-  twister = callPackage ../applications/networking/p2p/twister { };
-
-  twmn = callPackage ../applications/misc/twmn { };
-
-  twinkle = callPackage ../applications/networking/instant-messengers/twinkle { };
-
-  umurmur = callPackage ../applications/networking/umurmur { };
-
-  unison = callPackage ../applications/networking/sync/unison {
-    inherit (ocamlPackages) lablgtk;
-    enableX11 = config.unison.enableX11 or true;
-  };
-
-  uucp = callPackage ../tools/misc/uucp { };
-
-  uvccapture = callPackage ../applications/video/uvccapture { };
-
-  uwimap = callPackage ../tools/networking/uwimap { };
-
-  uzbl = callPackage ../applications/networking/browsers/uzbl {
-    webkit = webkitgtk2;
-  };
-
-  uTox = callPackage ../applications/networking/instant-messengers/utox { };
-
-  vanitygen = callPackage ../applications/misc/vanitygen { };
-
-  vbindiff = callPackage ../applications/editors/vbindiff { };
-
-  vcprompt = callPackage ../applications/version-management/vcprompt { };
-
-  vdpauinfo = callPackage ../tools/X11/vdpauinfo { };
-
-  veracity = callPackage ../applications/version-management/veracity {};
-
-  viewMtn = builderDefsPackage (import ../applications/version-management/viewmtn/0.10.nix)
-  {
-    inherit monotone cheetahTemplate highlight ctags
-      makeWrapper graphviz which python;
-    flup = pythonPackages.flup;
-  };
-
-  vim = callPackage ../applications/editors/vim { };
-
-  macvim = callPackage ../applications/editors/vim/macvim.nix { };
-
-  vimHugeX = vim_configurable;
-
-  vim_configurable = callPackage ../applications/editors/vim/configurable.nix {
-    inherit (pkgs) fetchurl fetchhg stdenv ncurses pkgconfig gettext
-      composableDerivation lib config glib gtk python perl tcl ruby;
-    inherit (pkgs.xlibs) libX11 libXext libSM libXpm libXt libXaw libXau libXmu
-      libICE;
-
-    features = "huge"; # one of  tiny, small, normal, big or huge
-    lua = pkgs.lua5;
-    gui = config.vim.gui or "auto";
-
-    # optional features by flags
-    flags = [ "python" "X11" ]; # only flag "X11" by now
-
-    # so that we can use gccApple if we're building on darwin
-    inherit stdenvAdapters gccApple;
-  };
-
-  vimNox = lowPrio (vim_configurable.override { source = "vim-nox"; });
-
-  qvim = lowPrio (callPackage ../applications/editors/vim/qvim.nix {
-    inherit (pkgs) fetchgit stdenv ncurses pkgconfig gettext
-      composableDerivation lib config python perl tcl ruby qt4;
-    inherit (pkgs.xlibs) libX11 libXext libSM libXpm libXt libXaw libXau libXmu
-      libICE;
-
-    inherit (pkgs) stdenvAdapters gccApple;
-
-    features = "huge"; # one of  tiny, small, normal, big or huge
-    lua = pkgs.lua5;
-    flags = [ "python" "X11" ]; # only flag "X11" by now
-  });
-
-  vimpc = callPackage ../applications/audio/vimpc { };
-
-  virtviewer = callPackage ../applications/virtualization/virt-viewer {
-    gtkvnc = gtkvnc.override { enableGTK3 = true; };
-    spice_gtk = spice_gtk.override { enableGTK3 = true; };
-  };
-  virtmanager = callPackage ../applications/virtualization/virt-manager {
-    inherit (gnome) gnome_python;
-    vte = gnome3.vte;
-    dconf = gnome3.dconf;
-    gtkvnc = gtkvnc.override { enableGTK3 = true; };
-    spice_gtk = spice_gtk.override { enableGTK3 = true; };
-  };
-
-  virtinst = callPackage ../applications/virtualization/virtinst {};
-
-  virtualgl = callPackage ../tools/X11/virtualgl { };
-
-  bumblebee = callPackage ../tools/X11/bumblebee { };
-
-  vkeybd = callPackage ../applications/audio/vkeybd {
-    inherit (xlibs) libX11;
-  };
-
-  vlc = callPackage ../applications/video/vlc { };
-
-  vmpk = callPackage ../applications/audio/vmpk { };
-
-  vnstat = callPackage ../applications/networking/vnstat { };
-
-  vorbisTools = callPackage ../applications/audio/vorbis-tools { };
-
-  vue = callPackage ../applications/misc/vue {
-    jre = icedtea7_jre;
-  };
-
-  vwm = callPackage ../applications/window-managers/vwm { };
-
-  vym = callPackage ../applications/misc/vym { };
-
-  w3m = callPackage ../applications/networking/browsers/w3m {
-    graphicsSupport = false;
-  };
-
-  weechat = callPackage ../applications/networking/irc/weechat { };
-
-  weechatDevel = lowPrio (callPackage ../applications/networking/irc/weechat/devel.nix { });
-
-  weston = callPackage ../applications/window-managers/weston { };
-
-  windowmaker = callPackage ../applications/window-managers/windowmaker { };
-
-  winswitch = callPackage ../tools/X11/winswitch { };
-
-  wings = callPackage ../applications/graphics/wings {
-    erlang = erlangR14;
-    esdl = esdl.override { erlang = erlangR14; };
-  };
-
-  wmname = callPackage ../applications/misc/wmname { };
-
-  wmctrl = callPackage ../tools/X11/wmctrl { };
-
-  # I'm keen on wmiimenu only  >wmii-3.5 no longer has it...
-  wmiimenu = import ../applications/window-managers/wmii31 {
-    libixp = libixp_for_wmii;
-    inherit fetchurl /* fetchhg */ stdenv gawk;
-    inherit (xlibs) libX11;
-  };
-
-  wmiiSnap = import ../applications/window-managers/wmii {
-    libixp = libixp_for_wmii;
-    inherit fetchurl /* fetchhg */ stdenv gawk;
-    inherit (xlibs) libX11 xextproto libXt libXext;
-    includeUnpack = config.stdenv.includeUnpack or false;
-  };
-
-  wordnet = callPackage ../applications/misc/wordnet { };
-
-  wrapFirefox =
-    { browser, browserName ? "firefox", desktopName ? "Firefox", nameSuffix ? ""
-    , icon ? "${browser}/lib/${browser.name}/browser/icons/mozicon128.png" }:
-    let
-      cfg = stdenv.lib.attrByPath [ browserName ] {} config;
-      enableAdobeFlash = cfg.enableAdobeFlash or false;
-      enableGnash = cfg.enableGnash or false;
-    in
-    import ../applications/networking/browsers/firefox/wrapper.nix {
-      inherit stdenv lib makeWrapper makeDesktopItem browser browserName desktopName nameSuffix icon;
-      plugins =
-         assert !(enableGnash && enableAdobeFlash);
-         ([ ]
-          ++ lib.optional enableGnash gnash
-          ++ lib.optional enableAdobeFlash flashplayer
-          ++ lib.optional (cfg.enableDjvu or false) (djview4)
-          ++ lib.optional (cfg.enableMPlayer or false) (MPlayerPlugin browser)
-          ++ lib.optional (cfg.enableGeckoMediaPlayer or false) gecko_mediaplayer
-          ++ lib.optional (supportsJDK && cfg.jre or false && jrePlugin ? mozillaPlugin) jrePlugin
-          ++ lib.optional (cfg.enableGoogleTalkPlugin or false) google_talk_plugin
-          ++ lib.optional (cfg.enableFriBIDPlugin or false) fribid
-          ++ lib.optional (cfg.enableGnomeExtensions or false) gnome3.gnome_shell
-         );
-      libs = [ gstreamer gst_plugins_base ] ++ lib.optionals (cfg.enableQuakeLive or false)
-             (with xlibs; [ stdenv.gcc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]);
-      gtk_modules = [ libcanberra ];
-    };
-
-  wxhexeditor = callPackage ../applications/editors/wxhexeditor { };
-
-  x11vnc = callPackage ../tools/X11/x11vnc { };
-
-  x2vnc = callPackage ../tools/X11/x2vnc { };
-
-  xaos = builderDefsPackage (import ../applications/graphics/xaos) {
-    inherit (xlibs) libXt libX11 libXext xextproto xproto;
-    inherit gsl aalib zlib intltool gettext perl;
-    libpng = libpng12;
-  };
-
-  xara = callPackage ../applications/graphics/xara { };
-
-  xawtv = callPackage ../applications/video/xawtv { };
-
-  xbindkeys = callPackage ../tools/X11/xbindkeys { };
-
-  xbmc = callPackage ../applications/video/xbmc {
-    ffmpeg = ffmpeg_1;
-  };
-
-  xca = callPackage ../applications/misc/xca { };
-
-  xcalib = callPackage ../tools/X11/xcalib { };
-
-  xcape = callPackage ../tools/X11/xcape { };
-
-  xchainkeys = callPackage ../tools/X11/xchainkeys { };
-
-  xchat = callPackage ../applications/networking/irc/xchat { };
-
-  xchm = callPackage ../applications/misc/xchm { };
-
-  xcompmgr = callPackage ../applications/window-managers/xcompmgr { };
-
-  compton = callPackage ../applications/window-managers/compton { };
-
-  xdaliclock = callPackage ../tools/misc/xdaliclock {};
-
-  xdg-user-dirs = callPackage ../tools/X11/xdg-user-dirs { };
-
-  xdg_utils = callPackage ../tools/X11/xdg-utils { };
-
-  xdotool = callPackage ../tools/X11/xdotool { };
-
-  xen = callPackage ../applications/virtualization/xen {
-    stdenv = overrideGCC stdenv gcc45;
-  };
-
-  xfe = callPackage ../applications/misc/xfe {
-    fox = fox_1_6;
-  };
-
-  xfig = callPackage ../applications/graphics/xfig { };
-
-  xineUI = callPackage ../applications/video/xine-ui { };
-
-  xneur_0_13 = callPackage ../applications/misc/xneur { };
-
-  xneur_0_8 = callPackage ../applications/misc/xneur/0.8.nix { };
-
-  xneur = xneur_0_13;
-
-  gxneur = callPackage ../applications/misc/gxneur  {
-    inherit (gnome) libglade GConf;
-  };
-
-  xournal = callPackage ../applications/graphics/xournal {
-    inherit (gnome) libgnomeprint libgnomeprintui libgnomecanvas;
-  };
-
-  xpdf = callPackage ../applications/misc/xpdf {
-    motif = lesstif;
-    base14Fonts = "${ghostscript}/share/ghostscript/fonts";
-  };
-
-  xkb_switch = callPackage ../tools/X11/xkb-switch { };
-
-  libxpdf = callPackage ../applications/misc/xpdf/libxpdf.nix { };
-
-  xpra = callPackage ../tools/X11/xpra { };
-
-  xrestop = callPackage ../tools/X11/xrestop { };
-
-  xscreensaver = callPackage ../misc/screensavers/xscreensaver {
-    inherit (gnome) libglade;
-  };
-
-  xsynth_dssi = callPackage ../applications/audio/xsynth-dssi { };
-
-  xterm = callPackage ../applications/misc/xterm { };
-
-  finalterm = callPackage ../applications/misc/finalterm { };
-
-  xtrace = callPackage ../tools/X11/xtrace { };
-
-  xlaunch = callPackage ../tools/X11/xlaunch { };
-
-  xmacro = callPackage ../tools/X11/xmacro { };
-
-  xmove = callPackage ../applications/misc/xmove { };
-
-  xmp = callPackage ../applications/audio/xmp { };
-
-  xnee = callPackage ../tools/X11/xnee { };
-
-  xvidcap = callPackage ../applications/video/xvidcap {
-    inherit (gnome) scrollkeeper libglade;
-  };
-
-  yate = callPackage ../applications/misc/yate { };
-
-  inherit (gnome3) yelp;
-
-  qgis = callPackage ../applications/misc/qgis {};
-
-  qtbitcointrader = callPackage ../applications/misc/qtbitcointrader { };
-
-  ykpers = callPackage ../applications/misc/ykpers {};
-
-  yoshimi = callPackage ../applications/audio/yoshimi {
-    fltk = fltk13;
-  };
-
-  zathuraCollection = recurseIntoAttrs
-    (let callPackage = newScope pkgs.zathuraCollection; in
-      import ../applications/misc/zathura {
-        inherit callPackage pkgs fetchurl;
-        useMupdf = config.zathura.useMupdf or false;
-      });
-
-  zathura = zathuraCollection.zathuraWrapper;
-
-  zed = callPackage ../applications/editors/zed { };
-
-  zeroc_ice = callPackage ../development/libraries/zeroc-ice { };
-
-  girara = callPackage ../applications/misc/girara {
-    gtk = gtk3;
-  };
-
-  zgrviewer = callPackage ../applications/graphics/zgrviewer {};
-
-  zim = callPackage ../applications/office/zim {
-    pygtk = pyGtkGlade;
-  };
-  
-  zotero = callPackage ../applications/office/zotero {
-    xulrunner = xulrunner_30;
-  };
-
-  zynaddsubfx = callPackage ../applications/audio/zynaddsubfx { };
-
-
-  ### GAMES
-
-  alienarena = callPackage ../games/alienarena { };
-
-  andyetitmoves = if stdenv.isLinux then callPackage ../games/andyetitmoves {} else null;
-
-  anki = callPackage ../games/anki { };
-
-  asc = callPackage ../games/asc {
-    lua = lua5;
-    libsigcxx = libsigcxx12;
-  };
-
-  astromenace = callPackage ../games/astromenace { };
-
-  atanks = callPackage ../games/atanks {};
-
-  ballAndPaddle = callPackage ../games/ball-and-paddle {
-    guile = guile_1_8;
-  };
-
-  bitsnbots = callPackage ../games/bitsnbots {
-    lua = lua5;
-  };
-
-  blackshades = callPackage ../games/blackshades { };
-
-  blackshadeselite = callPackage ../games/blackshadeselite { };
-
-  blobby = callPackage ../games/blobby { };
-
-  bsdgames = callPackage ../games/bsdgames { };
-
-  btanks = callPackage ../games/btanks { };
-
-  bzflag = callPackage ../games/bzflag { };
-
-  castle_combat = callPackage ../games/castle-combat { };
-
-  chessdb = callPackage ../games/chessdb { };
-
-  construoBase = lowPrio (callPackage ../games/construo {
-    mesa = null;
-    freeglut = null;
-  });
-
-  construo = construoBase.override {
-    inherit mesa freeglut;
-  };
-
-  crack_attack = callPackage ../games/crack-attack { };
-
-  crafty = callPackage ../games/crafty { };
-  craftyFull = appendToName "full" (crafty.override { fullVariant = true; });
-
-  crrcsim = callPackage ../games/crrcsim {};
-
-  dhewm3 = callPackage ../games/dhewm3 {};
-
-  drumkv1 = callPackage ../applications/audio/drumkv1 { };
-
-  dwarf_fortress = callPackage_i686 ../games/dwarf-fortress {
-    SDL_image = pkgsi686Linux.SDL_image.override {
-      libpng = pkgsi686Linux.libpng12;
-    };
-  };
-
-  dwarf_fortress_2014 = callPackage_i686 ../games/dwarf-fortress/df2014.nix {
-    SDL_image = pkgsi686Linux.SDL_image.override {
-      libpng = pkgsi686Linux.libpng12;
-    };
-  };
-
-  dwarf_fortress_modable = appendToName "moddable" (dwarf_fortress.override {
-    copyDataDirectory = true;
-  });
-
-  dwarf_fortress_2014_modable = appendToName "moddable" (dwarf_fortress_2014.override {
-    copyDataDirectory = true;
-  });
-
-  dwarf-therapist = callPackage ../games/dwarf-therapist { };
-
-  d1x_rebirth = callPackage ../games/d1x-rebirth { };
-
-  d2x_rebirth = callPackage ../games/d2x-rebirth { };
-
-  eboard = callPackage ../games/eboard { };
-
-  eduke32 = callPackage ../games/eduke32 { };
-
-  egoboo = callPackage ../games/egoboo { };
-
-  exult = callPackage ../games/exult { };
-
-  flightgear = callPackage ../games/flightgear { };
-
-  freeciv = callPackage ../games/freeciv { };
-
-  freeciv_gtk = callPackage ../games/freeciv {
-    gtkClient = true;
-    sdlClient = false;
-  };
-
-  freedink = callPackage ../games/freedink { };
-
-  fsg = callPackage ../games/fsg {
-    wxGTK = wxGTK28.override { unicode = false; };
-  };
-
-  gemrb = callPackage ../games/gemrb { };
-
-  gl117 = callPackage ../games/gl-117 {};
-
-  glestae = callPackage ../games/glestae {};
-
-  globulation2 = callPackage ../games/globulation {};
-
-  gltron = callPackage ../games/gltron { };
-
-  gnuchess = callPackage ../games/gnuchess { };
-
-  gnugo = callPackage ../games/gnugo { };
-
-  gparted = callPackage ../tools/misc/gparted { };
-
-  gsmartcontrol = callPackage ../tools/misc/gsmartcontrol {
-    inherit (gnome) libglademm;
-  };
-
-  gtypist = callPackage ../games/gtypist { };
-
-  hexen = callPackage ../games/hexen { };
-
-  icbm3d = callPackage ../games/icbm3d { };
-
-  ingen = callPackage ../applications/audio/ingen { };
-
-  instead = callPackage ../games/instead {
-    lua = lua5;
-  };
-
-  kobodeluxe = callPackage ../games/kobodeluxe { };
-
-  lincity = builderDefsPackage (import ../games/lincity) {
-    inherit (xlibs) libX11 libXext xextproto
-      libICE libSM xproto;
-    inherit libpng zlib;
-  };
-
-  lincity_ng = callPackage ../games/lincity/ng.nix {};
-
-  mars = callPackage ../games/mars { };
-
-  micropolis = callPackage ../games/micropolis { };
-
-  mnemosyne = callPackage ../games/mnemosyne {
-    inherit (pythonPackages) matplotlib cherrypy sqlite3;
-  };
-
-  naev = callPackage ../games/naev { };
-
-  nexuiz = callPackage ../games/nexuiz { };
-
-  njam = callPackage ../games/njam { };
-
-  oilrush = callPackage ../games/oilrush { };
-
-  openra = callPackage ../games/openra { };
-
-  openttd = callPackage ../games/openttd {
-    zlib = zlibStatic;
-  };
-
-  opentyrian = callPackage ../games/opentyrian { };
-
-  openxcom = callPackage ../games/openxcom { };
-
-  pingus = callPackage ../games/pingus {};
-
-  pioneers = callPackage ../games/pioneers { };
-
-  pong3d = callPackage ../games/pong3d { };
-
-  prboom = callPackage ../games/prboom { };
-
-  quake3demo = callPackage ../games/quake3/wrapper {
-    name = "quake3-demo-${quake3game.name}";
-    description = "Demo of Quake 3 Arena, a classic first-person shooter";
-    game = quake3game;
-    paks = [quake3demodata];
-  };
-
-  quake3demodata = callPackage ../games/quake3/demo { };
-
-  quake3game = callPackage ../games/quake3/game { };
-
-  quantumminigolf = callPackage ../games/quantumminigolf {};
-
-  racer = callPackage ../games/racer { };
-
-  residualvm = callPackage ../games/residualvm {
-    openglSupport = mesaSupported;
-  };
-
-  rigsofrods = callPackage ../games/rigsofrods {
-    mygui = myguiSvn;
-  };
-
-  rili = callPackage ../games/rili { };
-
-  rogue = callPackage ../games/rogue { };
-
-  samplv1 = callPackage ../applications/audio/samplv1 { };
-
-  sauerbraten = callPackage ../games/sauerbraten {};
-
-  scid = callPackage ../games/scid { };
-
-  scummvm = callPackage ../games/scummvm { };
-
-  scorched3d = callPackage ../games/scorched3d { };
-
-  sdlmame = callPackage ../games/sdlmame { };
-
-  sgtpuzzles = builderDefsPackage (import ../games/sgt-puzzles) {
-    inherit pkgconfig fetchsvn perl gtk;
-    inherit (xlibs) libX11;
-  };
-
-  simutrans = callPackage ../games/simutrans { };
-
-  soi = callPackage ../games/soi {};
-
-  # You still can override by passing more arguments.
-  spaceOrbit = callPackage ../games/orbit { };
-
-  spring = callPackage ../games/spring { };
-
-  springLobby = callPackage ../games/spring/springlobby.nix { };
-
-  stardust = callPackage ../games/stardust {};
-
-  steam = callPackage_i686 ../games/steam {};
-
-  steamChrootEnv = callPackage_i686 ../games/steam/chrootenv.nix {
-    zenity = gnome2.zenity;
-  };
-
-  stuntrally = callPackage ../games/stuntrally { };
-
-  superTux = callPackage ../games/super-tux { };
-
-  superTuxKart = callPackage ../games/super-tux-kart { };
-
-  synthv1 = callPackage ../applications/audio/synthv1 { };
-
-  tbe = callPackage ../games/the-butterfly-effect {};
-
-  teetertorture = callPackage ../games/teetertorture { };
-
-  teeworlds = callPackage ../games/teeworlds { };
-
-  tennix = callPackage ../games/tennix { };
-
-  tibia = callPackage ../games/tibia { };
-
-  tintin = callPackage ../games/tintin { };
-
-  tpm = callPackage ../games/thePenguinMachine { };
-
-  tremulous = callPackage ../games/tremulous { };
-
-  speed_dreams = callPackage ../games/speed-dreams {
-    # Torcs wants to make shared libraries linked with plib libraries (it provides static).
-    # i686 is the only platform I know than can do that linking without plib built with -fPIC
-    plib = plib.override { enablePIC = !stdenv.isi686; };
-    libpng = libpng12;
-  };
-
-  torcs = callPackage ../games/torcs {
-    # Torcs wants to make shared libraries linked with plib libraries (it provides static).
-    # i686 is the only platform I know than can do that linking without plib built with -fPIC
-    plib = plib.override { enablePIC = !stdenv.isi686; };
-  };
-
-  trigger = callPackage ../games/trigger { };
-
-  typespeed = callPackage ../games/typespeed { };
-
-  ufoai = callPackage ../games/ufoai { };
-
-  ultimatestunts = callPackage ../games/ultimatestunts { };
-
-  ultrastardx = callPackage ../games/ultrastardx {
-    ffmpeg = ffmpeg_0_6;
-    lua = lua5;
-  };
-
-  unvanquished = callPackage ../games/unvanquished { };
-
-  uqm = callPackage ../games/uqm { };
-
-  urbanterror = callPackage ../games/urbanterror { };
-
-  ut2004demo = callPackage ../games/ut2004demo { };
-
-  vdrift = callPackage ../games/vdrift { };
-
-  vectoroids = callPackage ../games/vectoroids { };
-
-  vessel = callPackage_i686 ../games/vessel { };
-
-  warmux = callPackage ../games/warmux { };
-
-  warsow = callPackage ../games/warsow {
-    libjpeg = libjpeg62;
-  };
-
-  warzone2100 = callPackage ../games/warzone2100 { };
-
-  widelands = callPackage ../games/widelands {
-    lua = lua5_1;
-  };
-
-  worldofgoo_demo = callPackage ../games/worldofgoo {
-    demo = true;
-  };
-
-  worldofgoo = callPackage ../games/worldofgoo { };
-
-  xboard =  callPackage ../games/xboard { };
-
-  xconq = callPackage ../games/xconq {};
-
-  # TODO: the corresponding nix file is missing
-  # xracer = callPackage ../games/xracer { };
-
-  xonotic = callPackage ../games/xonotic { };
-
-  xskat = callPackage ../games/xskat { };
-
-  xsokoban = builderDefsPackage (import ../games/xsokoban) {
-    inherit (xlibs) libX11 xproto libXpm libXt;
-  };
-
-  zdoom = callPackage ../games/zdoom { };
-
-  zod = callPackage ../games/zod { };
-
-  zoom = callPackage ../games/zoom { };
-
-  keen4 = callPackage ../games/keen4 { };
-
-  zeroad = callPackage ../games/0ad { };
-
-  ### DESKTOP ENVIRONMENTS
-
-  cinnamon = recurseIntoAttrs rec {
-    callPackage = newScope pkgs.cinnamon;
-    inherit (gnome3) gnome_common libgnomekbd gnome-menus zenity;
-
-    muffin = callPackage ../desktops/cinnamon/muffin.nix { } ;
-
-    cinnamon-control-center = callPackage ../desktops/cinnamon/cinnamon-control-center.nix{ };
-
-    cinnamon-settings-daemon = callPackage ../desktops/cinnamon/cinnamon-settings-daemon.nix{ };
-
-    cinnamon-session = callPackage ../desktops/cinnamon/cinnamon-session.nix{ } ;
-
-    cinnamon-desktop = callPackage ../desktops/cinnamon/cinnamon-desktop.nix { };
-
-    cinnamon-translations = callPackage ../desktops/cinnamon/cinnamon-translations.nix { };
-
-    cjs = callPackage ../desktops/cinnamon/cjs.nix { };
-  };
-
-  enlightenment = callPackage ../desktops/enlightenment { };
-
-  e17 = recurseIntoAttrs (
-    let callPackage = newScope pkgs.e17; in
-    import ../desktops/e17 { inherit callPackage pkgs; }
-  );
-
-  e18 = recurseIntoAttrs (
-    let callPackage = newScope pkgs.e18; in
-    import ../desktops/e18 { inherit callPackage pkgs; }
-  );
-
-  gnome2 = callPackage ../desktops/gnome-2 {
-    callPackage = pkgs.newScope pkgs.gnome2;
-    self = pkgs.gnome2;
-  }  // pkgs.gtkLibs // {
-    # Backwards compatibility;
-    inherit (pkgs) libsoup libwnck gtk_doc gnome_doc_utils;
-  };
-
-  gnome3 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.10 {
-    callPackage = pkgs.newScope pkgs.gnome3;
-    self = pkgs.gnome3;
-  });
-
-  gnome3_12 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.12 {
-    callPackage = pkgs.newScope pkgs.gnome3_12;
-  });
-
-  gnome = recurseIntoAttrs gnome2;
-
-  hsetroot = callPackage ../tools/X11/hsetroot { };
-
-  kakasi = callPackage ../tools/text/kakasi { };
-
-  kde4 = recurseIntoAttrs pkgs.kde412;
-
-  kde4_next = recurseIntoAttrs( lib.lowPrioSet pkgs.kde412 );
-
-  kde412 = kdePackagesFor (pkgs.kde412 // {
-      eigen = eigen2;
-      libusb = libusb1;
-      libcanberra = libcanberra_kde;
-    }) ../desktops/kde-4.12;
-
-  kdePackagesFor = self: dir:
-    let callPackageOrig = callPackage; in
-    let
-      callPackage = newScope self;
-      kde4 = callPackageOrig dir {
-        inherit callPackage callPackageOrig;
-      };
-    in kde4 // {
-      inherit kde4;
-
-      wrapper = callPackage ../build-support/kdewrapper {};
-
-      recurseForRelease = true;
-
-      akunambol = callPackage ../applications/networking/sync/akunambol { };
-
-      amarok = callPackage ../applications/audio/amarok { };
-
-      bangarang = callPackage ../applications/video/bangarang { };
-
-      basket = callPackage ../applications/office/basket { };
-
-      bluedevil = callPackage ../tools/bluetooth/bluedevil { };
-
-      calligra = callPackage ../applications/office/calligra { };
-
-      colord-kde = callPackage ../tools/misc/colord-kde { };
-
-      digikam = if builtins.compareVersions "4.9" kde4.release == 1 then
-          callPackage ../applications/graphics/digikam/2.nix { }
-        else
-          callPackage ../applications/graphics/digikam { };
-
-      eventlist = callPackage ../applications/office/eventlist {};
-
-      k3b = callPackage ../applications/misc/k3b { };
-
-      kadu = callPackage ../applications/networking/instant-messengers/kadu { };
-
-      kbibtex = callPackage ../applications/office/kbibtex { };
-
-      kde_gtk_config = callPackage ../tools/misc/kde-gtk-config { };
-
-      kde_wacomtablet = callPackage ../applications/misc/kde-wacomtablet { };
-
-      kdeconnect = callPackage ../applications/misc/kdeconnect { };
-
-      kdenlive = callPackage ../applications/video/kdenlive { mlt = mlt-qt4; };
-
-      kdesvn = callPackage ../applications/version-management/kdesvn { };
-
-      kdevelop = callPackage ../applications/editors/kdevelop { };
-
-      kdevplatform = callPackage ../development/libraries/kdevplatform { };
-
-      kdiff3 = callPackage ../tools/text/kdiff3 { };
-
-      kile = callPackage ../applications/editors/kile { };
-
-      kmplayer = callPackage ../applications/video/kmplayer { };
-
-      kmymoney = callPackage ../applications/office/kmymoney { };
-
-      kipi_plugins = callPackage ../applications/graphics/kipi-plugins { };
-
-      konversation = callPackage ../applications/networking/irc/konversation { };
-
-      kvirc = callPackage ../applications/networking/irc/kvirc { };
-
-      krename = callPackage ../applications/misc/krename { };
-
-      krusader = callPackage ../applications/misc/krusader { };
-
-      ksshaskpass = callPackage ../tools/security/ksshaskpass {};
-
-      ktorrent = callPackage ../applications/networking/p2p/ktorrent { };
-
-      kuickshow = callPackage ../applications/graphics/kuickshow { };
-
-      libalkimia = callPackage ../development/libraries/libalkimia { };
-
-      libktorrent = callPackage ../development/libraries/libktorrent { };
-
-      libkvkontakte = callPackage ../development/libraries/libkvkontakte { };
-
-      liblikeback = callPackage ../development/libraries/liblikeback { };
-
-      libmm-qt = callPackage ../development/libraries/libmm-qt { };
-
-      libnm-qt = callPackage ../development/libraries/libnm-qt { };
-
-      networkmanagement = callPackage ../tools/networking/networkmanagement { };
-
-      partitionManager = callPackage ../tools/misc/partition-manager { };
-
-      plasma-nm = callPackage ../tools/networking/plasma-nm { };
-
-      polkit_kde_agent = callPackage ../tools/security/polkit-kde-agent { };
-
-      psi = callPackage ../applications/networking/instant-messengers/psi { };
-
-      qtcurve = callPackage ../misc/themes/qtcurve { };
-
-      quassel = callPackage ../applications/networking/irc/quassel { dconf = gnome3.dconf; };
-
-      quasselWithoutKDE = (self.quassel.override {
-        withKDE = false;
-        tag = "-without-kde";
-      });
-
-      quasselDaemon = (self.quassel.override {
-        monolithic = false;
-        daemon = true;
-        tag = "-daemon";
-      });
-
-      quasselClient = (self.quassel.override {
-        monolithic = false;
-        client = true;
-        tag = "-client";
-      });
-
-      quasselClientWithoutKDE = (self.quasselClient.override {
-        withKDE = false;
-        tag = "-client-without-kde";
-      });
-
-      rekonq = callPackage ../applications/networking/browsers/rekonq { };
-
-      kwebkitpart = callPackage ../applications/networking/browsers/kwebkitpart { };
-
-      rsibreak = callPackage ../applications/misc/rsibreak { };
-
-      semnotes = callPackage ../applications/misc/semnotes { };
-
-      skrooge = callPackage ../applications/office/skrooge { };
-
-      telepathy = callPackage ../applications/networking/instant-messengers/telepathy/kde {};
-
-      yakuake = callPackage ../applications/misc/yakuake { };
-
-      zanshin = callPackage ../applications/office/zanshin { };
-
-      kwooty = callPackage ../applications/networking/newsreaders/kwooty { };
-    };
-
-  redshift = callPackage ../applications/misc/redshift {
-    inherit (xorg) libX11 libXrandr libxcb randrproto libXxf86vm
-      xf86vidmodeproto;
-    inherit (gnome) GConf;
-    inherit (pythonPackages) pyxdg;
-    geoclue = geoclue2;
-  };
-
-  oxygen_gtk = callPackage ../misc/themes/gtk2/oxygen-gtk { };
-
-  gtk_engines = callPackage ../misc/themes/gtk2/gtk-engines { };
-
-  gtk-engine-murrine = callPackage ../misc/themes/gtk2/gtk-engine-murrine { };
-
-  gnome_themes_standard = gnome3.gnome_themes_standard;
-
-  mate-icon-theme = callPackage ../misc/themes/mate-icon-theme { };
-
-  mate-themes = callPackage ../misc/themes/mate-themes { };
-
-  xfce = xfce4_10;
-  xfce4_10 = recurseIntoAttrs (import ../desktops/xfce { inherit pkgs newScope; });
-
-
-  ### SCIENCE
-
-  ### SCIENCE/GEOMETRY
-
-  drgeo = builderDefsPackage (import ../applications/science/geometry/drgeo) {
-    inherit (gnome) libglade;
-    inherit libxml2 perl intltool libtool pkgconfig gtk;
-    guile = guile_1_8;
-  };
-
-  tetgen = callPackage ../applications/science/geometry/tetgen { };
-
-
-  ### SCIENCE/BIOLOGY
-
-  alliance = callPackage ../applications/science/electronics/alliance {
-    motif = lesstif;
-  };
-
-  arb = callPackage ../applications/science/biology/arb {
-    lesstif = lesstif93;
-  };
-
-  archimedes = callPackage ../applications/science/electronics/archimedes { };
-
-  biolib = callPackage ../development/libraries/science/biology/biolib { };
-
-  emboss = callPackage ../applications/science/biology/emboss { };
-
-  mrbayes = callPackage ../applications/science/biology/mrbayes { };
-
-  ncbiCTools = builderDefsPackage ../development/libraries/ncbi {
-    inherit tcsh mesa lesstif;
-    inherit (xlibs) libX11 libXaw xproto libXt libSM libICE
-      libXmu libXext;
-  };
-
-  ncbi_tools = callPackage ../applications/science/biology/ncbi-tools { };
-
-  paml = callPackage ../applications/science/biology/paml { };
-
-  pal2nal = callPackage ../applications/science/biology/pal2nal { };
-
-  plink = callPackage ../applications/science/biology/plink/default.nix { };
-
-
-  ### SCIENCE/MATH
-
-  arpack = callPackage ../development/libraries/science/math/arpack { };
-
-  atlas = callPackage ../development/libraries/science/math/atlas {
-    # The build process measures CPU capabilities and optimizes the
-    # library to perform best on that particular machine. That is a
-    # great feature, but it's of limited use with pre-built binaries
-    # coming from a central build farm.
-    tolerateCpuTimingInaccuracy = true;
-  };
-
-  blas = callPackage ../development/libraries/science/math/blas { };
-
-  content = builderDefsPackage ../applications/science/math/content {
-    inherit mesa lesstif;
-    inherit (xlibs) libX11 libXaw xproto libXt libSM libICE
-      libXmu libXext libXcursor;
-  };
-
-  jags = callPackage ../applications/science/math/jags { };
-
-  liblapack = callPackage ../development/libraries/science/math/liblapack { };
-  liblapack_3_5_0 = callPackage ../development/libraries/science/math/liblapack/3.5.0.nix { };
-
-  liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { };
-
-  # julia is pinned to specific versions of openblas, so keep old versions
-  # until they aren't needed. The un-versioned attribute may continue to track
-  # upstream development.
-  openblas = callPackage ../development/libraries/science/math/openblas {
-    liblapack = liblapack_3_5_0;
-  };
-  openblas_0_2_10 = callPackage ../development/libraries/science/math/openblas/0.2.10.nix {
-    liblapack = liblapack_3_5_0;
-  };
-  openblas_0_2_2 = callPackage ../development/libraries/science/math/openblas/0.2.2.nix { };
-
-  mathematica = callPackage ../applications/science/math/mathematica { };
-
-  sage = callPackage ../applications/science/math/sage { };
-
-  ### SCIENCE/MOLECULAR-DYNAMICS
-
-  gromacs = callPackage ../applications/science/molecular-dynamics/gromacs {
-    singlePrec = true;
-    fftw = fftwSinglePrec;
-    cmake = cmakeCurses;
-  };
-
-  gromacsDouble = lowPrio (callPackage ../applications/science/molecular-dynamics/gromacs {
-    singlePrec = false;
-    fftw = fftw;
-    cmake = cmakeCurses;
-  });
-
-
-  ### SCIENCE/LOGIC
-
-  abc-verifier = callPackage ../applications/science/logic/abc {};
-
-  alt-ergo = callPackage ../applications/science/logic/alt-ergo {};
-
-  coq = callPackage ../applications/science/logic/coq {
-    inherit (ocamlPackages) findlib lablgtk;
-    camlp5 = ocamlPackages.camlp5_transitional;
-  };
-
-  coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix {
-    inherit (ocamlPackages) findlib lablgtk;
-    camlp5 = ocamlPackages.camlp5_transitional;
-  };
-
-  coq_8_3 = callPackage ../applications/science/logic/coq/8.3.nix {
-    inherit (ocamlPackages) findlib lablgtk;
-    camlp5 = ocamlPackages.camlp5_transitional;
-  };
-
-  cvc3 = callPackage ../applications/science/logic/cvc3 {};
-
-  ekrhyper = callPackage ../applications/science/logic/ekrhyper {};
-
-  eprover = callPackage ../applications/science/logic/eprover {
-    texLive = texLiveAggregationFun {
-      paths = [
-        texLive texLiveExtra
-      ];
-    };
-  };
-
-  ginac = callPackage ../applications/science/math/ginac { };
-
-  hol = callPackage ../applications/science/logic/hol { };
-
-  hol_light = callPackage ../applications/science/logic/hol_light {
-    inherit (ocamlPackages) findlib;
-    camlp5 = ocamlPackages.camlp5_strict;
-  };
-
-  isabelle = import ../applications/science/logic/isabelle {
-    inherit (pkgs) stdenv fetchurl nettools perl polyml;
-    inherit (pkgs.emacs24Packages) proofgeneral;
-  };
-
-  iprover = callPackage ../applications/science/logic/iprover {};
-
-  leo2 = callPackage ../applications/science/logic/leo2 {};
-
-  logisim = callPackage ../applications/science/logic/logisim {};
-
-  ltl2ba = callPackage ../applications/science/logic/ltl2ba {};
-
-  matita = callPackage ../applications/science/logic/matita {
-    ocaml = ocaml_3_11_2;
-    inherit (ocamlPackages_3_11_2) findlib lablgtk ocaml_expat gmetadom ocaml_http
-            lablgtkmathview ocaml_mysql ocaml_sqlite3 ocamlnet camlzip ocaml_pcre;
-    ulex08 = ocamlPackages_3_11_2.ulex08.override { camlp5 = ocamlPackages_3_11_2.camlp5_5_transitional; };
-  };
-
-  matita_130312 = lowPrio (callPackage ../applications/science/logic/matita/130312.nix {
-    inherit (ocamlPackages) findlib lablgtk ocaml_expat gmetadom ocaml_http
-            ocaml_mysql ocamlnet ulex08 camlzip ocaml_pcre;
-  });
-
-  minisat = callPackage ../applications/science/logic/minisat {};
-
-  opensmt = callPackage ../applications/science/logic/opensmt { };
-
-  otter = callPackage ../applications/science/logic/otter {};
-
-  picosat = callPackage ../applications/science/logic/picosat {};
-
-  prooftree = callPackage ../applications/science/logic/prooftree {
-    inherit (ocamlPackages) findlib lablgtk;
-    camlp5 = ocamlPackages.camlp5_transitional;
-  };
-
-  prover9 = callPackage ../applications/science/logic/prover9 { };
-
-  satallax = callPackage ../applications/science/logic/satallax {};
-
-  spass = callPackage ../applications/science/logic/spass {};
-
-  ssreflect = callPackage ../applications/science/logic/ssreflect {
-    camlp5 = ocamlPackages.camlp5_transitional;
-  };
-
-  tptp = callPackage ../applications/science/logic/tptp {};
-
-  twelf = callPackage ../applications/science/logic/twelf {
-    smlnj = if stdenv.isDarwin
-      then smlnjBootstrap
-      else smlnj;
-  };
-
-  verifast = callPackage ../applications/science/logic/verifast {};
-
-  why3 = callPackage ../applications/science/logic/why3 {};
-
-  yices = callPackage ../applications/science/logic/yices {};
-
-  z3 = callPackage ../applications/science/logic/z3 {};
-
-  boolector   = boolector15;
-  boolector15 = callPackage ../applications/science/logic/boolector {};
-  boolector16 = lowPrio (callPackage ../applications/science/logic/boolector {
-    useV16 = true;
-  });
-
-  ### SCIENCE / ELECTRONICS
-
-  eagle = callPackage_i686 ../applications/science/electronics/eagle { };
-
-  caneda = callPackage ../applications/science/electronics/caneda { };
-
-  gtkwave = callPackage ../applications/science/electronics/gtkwave { };
-
-  kicad = callPackage ../applications/science/electronics/kicad {
-    wxGTK = wxGTK29;
-  };
-
-  ngspice = callPackage ../applications/science/electronics/ngspice { };
-
-  qucs = callPackage ../applications/science/electronics/qucs { };
-
-  xoscope = callPackage ../applications/science/electronics/xoscope { };
-
-
-  ### SCIENCE / MATH
-
-  ecm = callPackage ../applications/science/math/ecm { };
-
-  eukleides = callPackage ../applications/science/math/eukleides {
-    texinfo = texinfo4;
-  };
-
-  fricas = callPackage ../applications/science/math/fricas { };
-
-  gap = callPackage ../applications/science/math/gap { };
-
-  maxima = callPackage ../applications/science/math/maxima { };
-
-  wxmaxima = callPackage ../applications/science/math/wxmaxima { };
-
-  pari = callPackage ../applications/science/math/pari {};
-
-  pspp = callPackage ../applications/science/math/pssp {
-    inherit (gnome) libglade gtksourceview;
-  };
-
-  singular = callPackage ../applications/science/math/singular {};
-
-  scilab = callPackage ../applications/science/math/scilab {
-    withXaw3d = false;
-    withTk = true;
-    withGtk = false;
-    withOCaml = true;
-    withX = true;
-  };
-
-  msieve = callPackage ../applications/science/math/msieve { };
-
-  weka = callPackage ../applications/science/math/weka { };
-
-  yad = callPackage ../tools/misc/yad { };
-
-  yacas = callPackage ../applications/science/math/yacas { };
-
-  speedcrunch = callPackage ../applications/science/math/speedcrunch {
-    qt = qt4;
-    cmake = cmakeCurses;
-  };
-
-
-  ### SCIENCE / MISC
-
-  boinc = callPackage ../applications/science/misc/boinc { };
-
-  celestia = callPackage ../applications/science/astronomy/celestia {
-    lua = lua5_1;
-    inherit (xlibs) libXmu;
-    inherit (pkgs.gnome) gtkglext;
-  };
-
-  fityk = callPackage ../applications/science/misc/fityk { };
-
-  gravit = callPackage ../applications/science/astronomy/gravit { };
-
-  golly = callPackage ../applications/science/misc/golly { };
-
-  megam = callPackage ../applications/science/misc/megam { };
-
-  root = callPackage ../applications/science/misc/root { };
-
-  simgrid = callPackage ../applications/science/misc/simgrid { };
-
-  spyder = callPackage ../applications/science/spyder {
-    inherit (pythonPackages) pyflakes rope sphinx numpy scipy matplotlib; # recommended
-    inherit (pythonPackages) ipython pep8; # optional
-    inherit pylint;
-  };
-
-  stellarium = callPackage ../applications/science/astronomy/stellarium { };
-
-  tulip = callPackage ../applications/science/misc/tulip { };
-
-  vite = callPackage ../applications/science/misc/vite { };
-
-  xplanet = callPackage ../applications/science/astronomy/xplanet { };
-
-  ### MISC
-
-  atari800 = callPackage ../misc/emulators/atari800 { };
-
-  ataripp = callPackage ../misc/emulators/atari++ { };
-
-  auctex = callPackage ../tools/typesetting/tex/auctex { };
-
-  beep = callPackage ../misc/beep { };
-
-  cups = callPackage ../misc/cups { libusb = libusb1; };
-
-  cups_pdf_filter = callPackage ../misc/cups/pdf-filter.nix { };
-
-  gutenprint = callPackage ../misc/drivers/gutenprint { };
-
-  gutenprintBin = callPackage ../misc/drivers/gutenprint/bin.nix { };
-
-  cupsBjnp = callPackage ../misc/cups/drivers/cups-bjnp { };
-
-  darcnes = callPackage ../misc/emulators/darcnes { };
-
-  dbacl = callPackage ../tools/misc/dbacl { };
-
-  dblatex = callPackage ../tools/typesetting/tex/dblatex {
-    enableAllFeatures = false;
-  };
-
-  dblatexFull = appendToName "full" (dblatex.override {
-    enableAllFeatures = true;
-  });
-
-  dosbox = callPackage ../misc/emulators/dosbox { };
-
-  dpkg = callPackage ../tools/package-management/dpkg { };
-
-  ekiga = newScope pkgs.gnome ../applications/networking/instant-messengers/ekiga { };
-
-  emulationstation = callPackage ../misc/emulators/emulationstation { };
-
-  electricsheep = callPackage ../misc/screensavers/electricsheep { };
-
-  fakenes = callPackage ../misc/emulators/fakenes { };
-
-  fceux = callPackage ../misc/emulators/fceux { };
-
-  foldingathome = callPackage ../misc/foldingathome { };
-
-  foo2zjs = callPackage ../misc/drivers/foo2zjs {};
-
-  foomatic_filters = callPackage ../misc/drivers/foomatic-filters {};
-
-  freestyle = callPackage ../misc/freestyle { };
-
-  gajim = callPackage ../applications/networking/instant-messengers/gajim { };
-
-  gammu = callPackage ../applications/misc/gammu { };
-
-  gensgs = callPackage_i686 ../misc/emulators/gens-gs { };
-
-  ghostscript = callPackage ../misc/ghostscript {
-    x11Support = false;
-    cupsSupport = config.ghostscript.cups or (!stdenv.isDarwin);
-    gnuFork = config.ghostscript.gnu or false;
-  };
-
-  ghostscriptX = appendToName "with-X" (ghostscript.override {
-    x11Support = true;
-  });
-
-  guix = callPackage ../tools/package-management/guix { };
-
-  gxemul = callPackage ../misc/gxemul { };
-
-  hatari = callPackage ../misc/emulators/hatari { };
-
-  hplip = callPackage ../misc/drivers/hplip { };
-
-  hplipWithPlugin = hplip.override { withPlugin = true; };
-
-  # using the new configuration style proposal which is unstable
-  jack1 = callPackage ../misc/jackaudio/jack1.nix { };
-
-  jack2 = callPackage ../misc/jackaudio { };
-
-  keynav = callPackage ../tools/X11/keynav { };
-
-  lazylist = callPackage ../tools/typesetting/tex/lazylist { };
-
-  lilypond = callPackage ../misc/lilypond { guile = guile_1_8; };
-
-  martyr = callPackage ../development/libraries/martyr { };
-
-  maven = maven3;
-  maven3 = callPackage ../misc/maven { jdk = openjdk; };
-
-  mess = callPackage ../misc/emulators/mess {
-    inherit (pkgs.gnome) GConf;
-  };
-
-  mupen64plus = callPackage ../misc/emulators/mupen64plus { };
-
-  mupen64plus1_5 = callPackage ../misc/emulators/mupen64plus/1.5.nix { };
-
-  nix = nixStable;
-
-  nixStable = callPackage ../tools/package-management/nix {
-    storeDir = config.nix.storeDir or "/nix/store";
-    stateDir = config.nix.stateDir or "/nix/var";
-  };
-
-  nixUnstable = callPackage ../tools/package-management/nix/unstable.nix {
-    storeDir = config.nix.storeDir or "/nix/store";
-    stateDir = config.nix.stateDir or "/nix/var";
-  };
-
-  nixops = callPackage ../tools/package-management/nixops { };
-
-  nix-prefetch-scripts = callPackage ../tools/package-management/nix-prefetch-scripts { };
-
-  nix-repl = callPackage ../tools/package-management/nix-repl { };
-
-  nut = callPackage ../applications/misc/nut { };
-
-  solfege = callPackage ../misc/solfege {
-      pysqlite = pkgs.pythonPackages.sqlite3;
-  };
-
-  disnix = callPackage ../tools/package-management/disnix { };
-
-  dysnomia = callPackage ../tools/package-management/disnix/dysnomia {
-    enableApacheWebApplication = config.disnix.enableApacheWebApplication or false;
-    enableAxis2WebService = config.disnix.enableAxis2WebService or false;
-    enableEjabberdDump = config.disnix.enableEjabberdDump or false;
-    enableMySQLDatabase = config.disnix.enableMySQLDatabase or false;
-    enablePostgreSQLDatabase = config.disnix.enablePostgreSQLDatabase or false;
-    enableSubversionRepository = config.disnix.enableSubversionRepository or false;
-    enableTomcatWebApplication = config.disnix.enableTomcatWebApplication or false;
-  };
-
-  disnixos = callPackage ../tools/package-management/disnix/disnixos { };
-
-  DisnixWebService = callPackage ../tools/package-management/disnix/DisnixWebService { };
-
-  latex2html = callPackage ../tools/typesetting/tex/latex2html/default.nix {
-    tex = tetex;
-  };
-
-  lkproof = callPackage ../tools/typesetting/tex/lkproof { };
-
-  mysqlWorkbench = newScope gnome ../applications/misc/mysql-workbench {
-    lua = lua5;
-    inherit (pythonPackages) pexpect paramiko;
-  };
-
-  robomongo = callPackage ../applications/misc/robomongo { };
-
-  opkg = callPackage ../tools/package-management/opkg { };
-
-  pgadmin = callPackage ../applications/misc/pgadmin { };
-
-  pgf = pgf2;
-
-  # Keep the old PGF since some documents don't render properly with
-  # the new one.
-  pgf1 = callPackage ../tools/typesetting/tex/pgf/1.x.nix { };
-
-  pgf2 = callPackage ../tools/typesetting/tex/pgf/2.x.nix { };
-
-  pgfplots = callPackage ../tools/typesetting/tex/pgfplots { };
-
-  pjsip = callPackage ../applications/networking/pjsip { };
-
-  polytable = callPackage ../tools/typesetting/tex/polytable { };
-
-  PPSSPP = callPackage ../misc/emulators/ppsspp { };
-
-  uae = callPackage ../misc/emulators/uae { };
-
-  putty = callPackage ../applications/networking/remote/putty { };
-
-  retroarch = callPackage ../misc/emulators/retroarch { };
-
-  rssglx = callPackage ../misc/screensavers/rss-glx { };
-
-  xlockmore = callPackage ../misc/screensavers/xlockmore { };
-
-  samsungUnifiedLinuxDriver = import ../misc/cups/drivers/samsung {
-    inherit fetchurl stdenv;
-    inherit cups ghostscript glibc patchelf;
-    gcc = import ../development/compilers/gcc/4.4 {
-      inherit stdenv fetchurl gmp mpfr noSysDirs gettext which;
-      texinfo = texinfo4;
-      profiledCompiler = true;
-    };
-  };
-
-  saneBackends = callPackage ../applications/graphics/sane/backends.nix {
-    gt68xxFirmware = config.sane.gt68xxFirmware or null;
-    snapscanFirmware = config.sane.snapscanFirmware or null;
-    hotplugSupport = config.sane.hotplugSupport or true;
-    libusb = libusb1;
-  };
-
-  saneBackendsGit = callPackage ../applications/graphics/sane/backends-git.nix {
-    gt68xxFirmware = config.sane.gt68xxFirmware or null;
-    snapscanFirmware = config.sane.snapscanFirmware or null;
-    hotplugSupport = config.sane.hotplugSupport or true;
-  };
-
-  mkSaneConfig = callPackage ../applications/graphics/sane/config.nix { };
-
-  saneFrontends = callPackage ../applications/graphics/sane/frontends.nix { };
-
-  seafile-shared = callPackage ../misc/seafile-shared { };
-
-  slock = callPackage ../misc/screensavers/slock { };
-
-  sourceAndTags = import ../misc/source-and-tags {
-    inherit pkgs stdenv unzip lib ctags;
-    hasktags = haskellPackages.hasktags;
-  };
-
-  splix = callPackage ../misc/cups/drivers/splix { };
-
-  streamripper = callPackage ../applications/audio/streamripper { };
-
-  sqsh = callPackage ../development/tools/sqsh { };
-
-  tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; };
-
-  tex4ht = callPackage ../tools/typesetting/tex/tex4ht { };
-
-  texFunctions = import ../tools/typesetting/tex/nix pkgs;
-
-  texLive = builderDefsPackage (import ../tools/typesetting/tex/texlive) {
-    inherit builderDefs zlib bzip2 ncurses libpng ed lesstif ruby potrace
-      gd t1lib freetype icu perl expat curl xz pkgconfig zziplib texinfo
-      libjpeg bison python fontconfig flex poppler libpaper graphite2
-      makeWrapper;
-    inherit (xlibs) libXaw libX11 xproto libXt libXpm
-      libXmu libXext xextproto libSM libICE;
-    ghostscript = ghostscriptX;
-    harfbuzz = harfbuzz.override {
-      withIcu = true; withGraphite2 = true;
-    };
-  };
-
-  texLiveFull = lib.setName "texlive-full" (texLiveAggregationFun {
-    paths = [ texLive texLiveExtra lmodern texLiveCMSuper texLiveLatexXColor
-              texLivePGF texLiveBeamer texLiveModerncv tipa tex4ht texinfo
-              texLiveModerntimeline ];
-  });
-
-  /* Look in configurations/misc/raskin.nix for usage example (around revisions
-  where TeXLive was added)
-
-  (texLiveAggregationFun {
-    paths = [texLive texLiveExtra texLiveCMSuper
-      texLiveBeamer
-    ];
-  })
-
-  You need to use texLiveAggregationFun to regenerate, say, ls-R (TeX-related file list)
-  Just installing a few packages doesn't work.
-  */
-  texLiveAggregationFun = params:
-    builderDefsPackage (import ../tools/typesetting/tex/texlive/aggregate.nix)
-      ({inherit poppler perl makeWrapper;} // params);
-
-  texDisser = callPackage ../tools/typesetting/tex/disser {};
-
-  texLiveContext = builderDefsPackage (import ../tools/typesetting/tex/texlive/context.nix) {
-    inherit texLive;
-  };
-
-  texLiveExtra = builderDefsPackage (import ../tools/typesetting/tex/texlive/extra.nix) {
-    inherit texLive xz;
-  };
-
-  texLiveCMSuper = builderDefsPackage (import ../tools/typesetting/tex/texlive/cm-super.nix) {
-    inherit texLive;
-  };
-
-  texLiveLatexXColor = builderDefsPackage (import ../tools/typesetting/tex/texlive/xcolor.nix) {
-    inherit texLive;
-  };
-
-  texLivePGF = builderDefsPackage (import ../tools/typesetting/tex/texlive/pgf.nix) {
-    inherit texLiveLatexXColor texLive;
-  };
-
-  texLiveBeamer = builderDefsPackage (import ../tools/typesetting/tex/texlive/beamer.nix) {
-    inherit texLiveLatexXColor texLivePGF texLive;
-  };
-
-  texLiveModerncv = builderDefsPackage (import ../tools/typesetting/tex/texlive/moderncv.nix) {
-    inherit texLive unzip;
-  };
-
-  texLiveModerntimeline = builderDefsPackage (import ../tools/typesetting/tex/texlive/moderntimeline.nix) {
-    inherit texLive unzip;
-  };
-
-  thermald = callPackage ../tools/system/thermald { };
-
-  thinkfan = callPackage ../tools/system/thinkfan { };
-
-  vice = callPackage ../misc/emulators/vice {
-    libX11 = xlibs.libX11;
-    giflib = giflib_4_1;
-  };
-
-  viewnior = callPackage ../applications/graphics/viewnior { };
-
-  vimPlugins = recurseIntoAttrs (callPackage ../misc/vim-plugins { });
-
-  vimprobable2 = callPackage ../applications/networking/browsers/vimprobable2 {
-    webkit = webkitgtk2;
-  };
-
-  vimprobable2Wrapper = wrapFirefox
-    { browser = vimprobable2; browserName = "vimprobable2"; desktopName = "Vimprobable2";
-    };
-
-  vimb = callPackage ../applications/networking/browsers/vimb {
-    webkit = webkitgtk2;
-  };
-
-  vimbWrapper = wrapFirefox {
-    browser = vimb;
-    browserName = "vimb";
-    desktopName = "Vimb";
-  };
-
-  VisualBoyAdvance = callPackage ../misc/emulators/VisualBoyAdvance { };
-
-  # Wine cannot be built in 64-bit; use a 32-bit build instead.
-  wineStable = callPackage_i686 ../misc/emulators/wine/stable.nix {
-    bison = bison2;
-  };
-
-  wineUnstable = lowPrio (callPackage_i686 ../misc/emulators/wine/unstable.nix {
-    bison = bison2;
-  });
-
-  wine = wineStable;
-
-  winetricks = callPackage ../misc/emulators/wine/winetricks.nix {
-    inherit (gnome2) zenity;
-  };
-
-  wxmupen64plus = callPackage ../misc/emulators/wxmupen64plus { };
-
-  x2x = callPackage ../tools/X11/x2x { };
-
-  xboxdrv = callPackage ../misc/drivers/xboxdrv { };
-
-  xinput_calibrator = callPackage ../tools/X11/xinput_calibrator {
-    inherit (xlibs) libXi inputproto;
-  };
-
-  xosd = callPackage ../misc/xosd { };
-
-  xsane = callPackage ../applications/graphics/sane/xsane.nix {
-    libpng = libpng12;
-    saneBackends = saneBackends;
-  };
-
-  yafc = callPackage ../applications/networking/yafc { };
-
-  yandex-disk = callPackage ../tools/filesystems/yandex-disk { };
-
-  myEnvFun = import ../misc/my-env {
-    inherit substituteAll pkgs;
-    inherit (stdenv) mkDerivation;
-  };
-
-  # patoline requires a rather large ocaml compilation environment.
-  # this is why it is build as an environment and not just a normal package.
-  # remark : the emacs mode is also installed, but you have to adjust your load-path.
-  PatolineEnv = pack: myEnvFun {
-      name = "patoline";
-      buildInputs = [ stdenv ncurses mesa freeglut libzip gcc
-                                   pack.ocaml pack.findlib pack.camomile
-                                   pack.dypgen pack.ocaml_sqlite3 pack.camlzip
-                                   pack.lablgtk pack.camlimages pack.ocaml_cairo
-                                   pack.lablgl pack.ocamlnet pack.cryptokit
-                                   pack.ocaml_pcre pack.patoline
-                                   ];
-    # this is to circumvent the bug with libgcc_s.so.1 which is
-    # not found when using thread
-    extraCmds = ''
-       LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${gcc.gcc}/lib
-       export LD_LIBRARY_PATH
-    '';
-  };
-
-  patoline = PatolineEnv ocamlPackages_4_00_1;
-
-  znc = callPackage ../applications/networking/znc { };
-
-  zncModules = recurseIntoAttrs (
-    callPackage ../applications/networking/znc/modules.nix { }
-  );
-
-  zsnes = callPackage_i686 ../misc/emulators/zsnes { };
-
-  snes9x-gtk = callPackage ../misc/emulators/snes9x-gtk { };
-
-  higan = callPackage ../misc/emulators/higan { };
-
-  misc = import ../misc/misc.nix { inherit pkgs stdenv; };
-
-  bullet = callPackage ../development/libraries/bullet {};
-
-  dart = callPackage ../development/interpreters/dart { };
-
-  httrack = callPackage ../tools/backup/httrack { };
-
-  mg = callPackage ../applications/editors/mg { };
-
-
-  # Attributes for backward compatibility.
-  adobeReader = adobe-reader;
-  asciidocFull = asciidoc-full;  # added 2014-06-22
-  lttngTools = lttng-tools;  # added 2014-07-31
-  lttngUst = lttng-ust;  # added 2014-07-31
-
-
-}; in self; in pkgs

From e23504c0b2849b50c2463ab935cb6decfc40385c Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@immobiliare.it>
Date: Wed, 3 Sep 2014 09:58:10 +0200
Subject: [PATCH 1194/1453] evolution-data-server: update from 3.12.2 to 3.12.5

---
 .../gnome-3/3.12/core/evolution-data-server/default.nix      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/3.12/core/evolution-data-server/default.nix
index b8711f7e563d..2cb1fbe90d45 100644
--- a/pkgs/desktops/gnome-3/3.12/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/evolution-data-server/default.nix
@@ -4,11 +4,11 @@
 
 
 stdenv.mkDerivation rec {
-  name = "evolution-data-server-3.12.2";
+  name = "evolution-data-server-3.12.5";
 
   src = fetchurl {
     url = "mirror://gnome/sources/evolution-data-server/3.12/${name}.tar.xz";
-    sha256 = "91c95e17a8c1cd1086dafcd99a40bdf8f5993770f251f8b0a10e5395e3f5a3b6";
+    sha256 = "d3a2f832f823cb2a41467926dcaec984a15b2cb51ef89cf41267e337ca750811";
   };
 
   buildInputs = with gnome3;
@@ -28,6 +28,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
   };
 
 }

From 1d0c2faf6b42f98d143c5758dfbe6c74b0a01ec5 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@immobiliare.it>
Date: Wed, 3 Sep 2014 10:01:19 +0200
Subject: [PATCH 1195/1453] totem: drop upstream patch after update

---
 .../gnome-3/3.12/core/totem/default.nix       |  2 -
 .../3.12/core/totem/fix_files_loss.patch      | 72 -------------------
 2 files changed, 74 deletions(-)
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/totem/fix_files_loss.patch

diff --git a/pkgs/desktops/gnome-3/3.12/core/totem/default.nix b/pkgs/desktops/gnome-3/3.12/core/totem/default.nix
index 1322fdcaae31..490947519832 100644
--- a/pkgs/desktops/gnome-3/3.12/core/totem/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/totem/default.nix
@@ -39,8 +39,6 @@ stdenv.mkDerivation rec {
     rm $out/share/icons/hicolor/icon-theme.cache
   '';
 
-  patches = [ ./fix_files_loss.patch ];
-
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Videos;
     description = "Movie player for the GNOME desktop based on GStreamer";
diff --git a/pkgs/desktops/gnome-3/3.12/core/totem/fix_files_loss.patch b/pkgs/desktops/gnome-3/3.12/core/totem/fix_files_loss.patch
deleted file mode 100644
index b85ad1efd00e..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/totem/fix_files_loss.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 524c9e39a0ca6f2d1699e6e6d9ba3db1ea80d9f9 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Thu, 15 May 2014 19:28:35 +0200
-Subject: main: Fix potential data loss when removing multiple files
-
-We were using a list of GtkTreePaths and deleting the items one-by-one
-when the user clicked the "Delete" button. But after the first deletion,
-the tree model would have changed, and instead of pointing to the 2nd
-item we wanted to delete, the GtkTreePath would have pointed to another
-item, usually not one that we wanted to delete.
-
-We now use GtkTreeRowReferences, which will always point to the same
-row, as long as it exists.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=729778
-
-diff --git a/src/totem-grilo.c b/src/totem-grilo.c
-index 2133d77..0cff0d6 100644
---- a/src/totem-grilo.c
-+++ b/src/totem-grilo.c
-@@ -2074,7 +2074,8 @@ static void
- delete_foreach (gpointer data,
- 		gpointer user_data)
- {
--	GtkTreePath *path = data;
-+	GtkTreeRowReference *ref = data;
-+	GtkTreePath *path;
- 	GtkTreeModel *view_model = user_data;
- 	GtkTreeIter iter;
- 	GrlSource *source;
-@@ -2085,8 +2086,11 @@ delete_foreach (gpointer data,
- 	GtkTreeModel *model;
- 	GtkTreeIter real_model_iter;
- 
--	if (!gtk_tree_model_get_iter (view_model, &iter, path))
-+	path = gtk_tree_row_reference_get_path (ref);
-+	if (!path || !gtk_tree_model_get_iter (view_model, &iter, path)) {
-+		g_warning ("An item that was scheduled for removal isn't available any more");
- 		return;
-+	}
- 
- 	gtk_tree_model_get (view_model, &iter,
- 			    MODEL_RESULTS_CONTENT, &media,
-@@ -2151,14 +2155,23 @@ delete_cb (TotemSelectionToolbar *bar,
- 	   TotemGrilo            *self)
- {
- 	GtkTreeModel *model;
--	GList *list;
-+	GList *list, *l;
- 
- 	g_signal_handlers_block_by_func (self->priv->browser, "view-selection-changed", self);
- 
- 	model = gd_main_view_get_model (GD_MAIN_VIEW (self->priv->browser));
- 	list = gd_main_view_get_selection (GD_MAIN_VIEW (self->priv->browser));
-+
-+	/* GList of GtkTreePaths to a GList of GtkTreeRowReferences */
-+	for (l = list; l != NULL; l = l->next) {
-+		GtkTreeRowReference *ref;
-+
-+		ref = gtk_tree_row_reference_new (model, l->data);
-+		gtk_tree_path_free (l->data);
-+		l->data = ref;
-+	}
- 	g_list_foreach (list, delete_foreach, model);
--	g_list_free_full (list, (GDestroyNotify) gtk_tree_path_free);
-+	g_list_free_full (list, (GDestroyNotify) gtk_tree_row_reference_free);
- 
- 	g_signal_handlers_unblock_by_func (self->priv->browser, "view-selection-changed", self);
- 
--- 
-cgit v0.10.1
-

From 88d270f62e268c4cd36bc6e181ee885e21167376 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 3 Sep 2014 01:06:04 -0700
Subject: [PATCH 1196/1453] grub2: Add localizations

---
 pkgs/tools/misc/grub/2.0x.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix
index fdb2ae556e8d..e5471a6c404c 100644
--- a/pkgs/tools/misc/grub/2.0x.nix
+++ b/pkgs/tools/misc/grub/2.0x.nix
@@ -22,6 +22,13 @@ let
     url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz";
     sha256 = "0s0qfff6n6282q28nwwblp5x295zd6n71kl43xj40vgvdqxv0fxx";
   };
+
+  po_src = fetchurl {
+    name = "grub-2.02-beta2.tar.gz";
+    url = "http://alpha.gnu.org/gnu/grub/grub-2.02~beta2.tar.gz";
+    sha256 = "1lr9h3xcx0wwrnkxdnkfjwy08j7g7mdlmmbdip2db4zfgi69h0rm";
+  };
+
 in (
 
 assert efiSupport -> canEfi;
@@ -61,7 +68,10 @@ stdenv.mkDerivation rec {
     '';
 
   prePatch =
-    '' sh autogen.sh
+    '' tar zxf ${po_src} grub-2.02~beta2/po
+       rm -rf po
+       mv grub-2.02~beta2/po po
+       sh autogen.sh
        gunzip < "${unifont_bdf}" > "unifont.bdf"
        sed -i "configure" \
            -e "s|/usr/src/unifont.bdf|$PWD/unifont.bdf|g"

From 698170005fe85b993e2acb6f1af46d04153109d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=BCdiger=20Sonderfeld?= <ruediger@c-plusplus.de>
Date: Thu, 21 Aug 2014 00:41:41 +0200
Subject: [PATCH 1197/1453] Add QScintilla.

---
 .../libraries/qscintilla/default.nix          | 47 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 2 files changed, 51 insertions(+)
 create mode 100644 pkgs/development/libraries/qscintilla/default.nix

diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix
new file mode 100644
index 000000000000..c98496e336c4
--- /dev/null
+++ b/pkgs/development/libraries/qscintilla/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchurl, qt }:
+
+stdenv.mkDerivation rec {
+  pname = "qscintilla";
+  version = "2.8.3";
+
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/pyqt/QScintilla2/QScintilla-2.8.3/${name}.tar.gz";
+    sha256 = "fb94e6d61c3ccd4bf167d5f092629e619f7069d42207469458998b761a7cf505";
+  };
+
+  buildInputs = [ qt ];
+
+  preConfigure = ''
+    cd Qt4Qt5
+    sed -i -e "s,\$\$\\[QT_INSTALL_LIBS\\],$out/libs," \
+           -e "s,\$\$\\[QT_INSTALL_HEADERS\\],$out/include/," \
+           -e "s,\$\$\\[QT_INSTALL_TRANSLATIONS\\],$out/share/qt/translations," \
+           -e "s,\$\$\\[QT_INSTALL_DATA\\],$out/share/qt," \
+           qscintilla.pro
+    qmake qscintilla.pro
+  '';
+
+  # TODO PyQt Support.
+
+  meta = {
+    description = "A Qt port of the Scintilla text editing library";
+    longDescription = ''
+      QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ editor
+      control.
+
+      As well as features found in standard text editing components,
+      QScintilla includes features especially useful when editing and
+      debugging source code. These include support for syntax styling,
+      error indicators, code completion and call tips. The selection
+      margin can contain markers like those used in debuggers to
+      indicate breakpoints and the current line. Styling choices are
+      more open than with many editors, allowing the use of
+      proportional fonts, bold and italics, multiple foreground and
+      background colours and multiple fonts.
+    '';
+    homepage = http://www.riverbankcomputing.com/software/qscintilla/intro;
+    license = stdenv.lib.licenses.gpl2; # and gpl3 and commercial
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 597cc4360de7..3cc15a09299f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1979,6 +1979,10 @@ let
 
   qjoypad = callPackage ../tools/misc/qjoypad { };
 
+  qscintilla = callPackage ../development/libraries/qscintilla {
+    qt = qt4;
+  };
+
   qshowdiff = callPackage ../tools/text/qshowdiff { };
 
   quilt = callPackage ../development/tools/quilt { };

From 8abe312cde76ee9c201e08ed45a19d8f774b176f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=BCdiger=20Sonderfeld?= <ruediger@c-plusplus.de>
Date: Thu, 21 Aug 2014 02:08:19 +0200
Subject: [PATCH 1198/1453] octave: Add qscintilla support. #3711

---
 pkgs/development/interpreters/octave/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index eac067da2828..d302a2a6e183 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull
 , libX11, graphicsmagick, pcre, liblapack, pkgconfig, mesa, fltk
 , fftw, fftwSinglePrec, zlib, curl, qrupdate
-, qt ? null, ghostscript ? null, llvm ? null, hdf5 ? null,glpk ? null
+, qt ? null, qscintilla ? null, ghostscript ? null, llvm ? null, hdf5 ? null,glpk ? null
 , suitesparse ? null, gnuplot ? null, openjdk ? null, python ? null
 }:
 
@@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
     graphicsmagick pcre liblapack pkgconfig mesa fltk zlib curl
     fftw fftwSinglePrec qrupdate ]
     ++ (stdenv.lib.optional (qt != null) qt)
+    ++ (stdenv.lib.optional (qscintilla != null) qscintilla)
     ++ (stdenv.lib.optional (ghostscript != null) ghostscript)
     ++ (stdenv.lib.optional (llvm != null) llvm)
     ++ (stdenv.lib.optional (hdf5 != null) hdf5)

From 4efc03f46fca7225d7c6063955f9c0768e70a991 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Wed, 3 Sep 2014 01:09:58 -0700
Subject: [PATCH 1199/1453] Delete nixos/modules/module-list.nix.orig,
 extraneous file

---
 nixos/modules/module-list.nix.orig | 372 -----------------------------
 1 file changed, 372 deletions(-)
 delete mode 100644 nixos/modules/module-list.nix.orig

diff --git a/nixos/modules/module-list.nix.orig b/nixos/modules/module-list.nix.orig
deleted file mode 100644
index 3604753c8804..000000000000
--- a/nixos/modules/module-list.nix.orig
+++ /dev/null
@@ -1,372 +0,0 @@
-[
-  ./config/fonts/corefonts.nix
-  ./config/fonts/fontconfig.nix
-  ./config/fonts/fontdir.nix
-  ./config/fonts/fonts.nix
-  ./config/fonts/ghostscript.nix
-  ./config/gnu.nix
-  ./config/gtk-exe-env.nix
-  ./config/i18n.nix
-  ./config/krb5.nix
-  ./config/ldap.nix
-  ./config/networking.nix
-  ./config/no-x-libs.nix
-  ./config/nsswitch.nix
-  ./config/power-management.nix
-  ./config/pulseaudio.nix
-  ./config/qt-plugin-env.nix
-  ./config/shells-environment.nix
-  ./config/swap.nix
-  ./config/sysctl.nix
-  ./config/system-environment.nix
-  ./config/system-path.nix
-  ./config/timezone.nix
-  ./config/vpnc.nix
-  ./config/unix-odbc-drivers.nix
-  ./config/users-groups.nix
-  ./config/zram.nix
-  ./hardware/all-firmware.nix
-  ./hardware/cpu/amd-microcode.nix
-  ./hardware/cpu/intel-microcode.nix
-  ./hardware/network/b43.nix
-  ./hardware/network/intel-2100bg.nix
-  ./hardware/network/intel-2200bg.nix
-  ./hardware/network/intel-3945abg.nix
-  ./hardware/network/ralink.nix
-  ./hardware/network/rtl8192c.nix
-  ./hardware/opengl.nix
-  ./hardware/pcmcia.nix
-  ./hardware/video/bumblebee.nix
-  ./hardware/video/nvidia.nix
-  ./installer/tools/nixos-checkout.nix
-  ./installer/tools/tools.nix
-  ./misc/assertions.nix
-  ./misc/check-config.nix
-  ./misc/crashdump.nix
-  ./misc/ids.nix
-  ./misc/lib.nix
-  ./misc/locate.nix
-  ./misc/meta.nix
-  ./misc/nixpkgs.nix
-  ./misc/passthru.nix
-  ./misc/version.nix
-  ./programs/atop.nix
-  ./programs/bash/bash.nix
-  ./programs/bash/command-not-found.nix
-  ./programs/blcr.nix
-  ./programs/dconf.nix
-  ./programs/environment.nix
-  ./programs/info.nix
-  ./programs/nano.nix
-  ./programs/screen.nix
-  ./programs/shadow.nix
-  ./programs/shell.nix
-  ./programs/ssh.nix
-  ./programs/ssmtp.nix
-  ./programs/uim.nix
-  ./programs/venus.nix
-  ./programs/wvdial.nix
-  ./programs/freetds.nix
-  ./programs/zsh/zsh.nix
-  ./rename.nix
-  ./security/apparmor.nix
-  ./security/apparmor-suid.nix
-  ./security/ca.nix
-  ./security/duosec.nix
-  ./security/grsecurity.nix
-  ./security/pam.nix
-  ./security/pam_usb.nix
-  ./security/polkit.nix
-  ./security/prey.nix
-  ./security/rngd.nix
-  ./security/rtkit.nix
-  ./security/setuid-wrappers.nix
-  ./security/sudo.nix
-  ./services/amqp/activemq/default.nix
-  ./services/amqp/rabbitmq.nix
-  ./services/audio/alsa.nix
-  ./services/audio/fuppes.nix
-  ./services/audio/mpd.nix
-  ./services/audio/mopidy.nix
-  ./services/backup/almir.nix
-  ./services/backup/bacula.nix
-  ./services/backup/mysql-backup.nix
-  ./services/backup/postgresql-backup.nix
-  ./services/backup/rsnapshot.nix
-  ./services/backup/sitecopy-backup.nix
-  ./services/backup/tarsnap.nix
-  ./services/continuous-integration/jenkins/default.nix
-  ./services/continuous-integration/jenkins/slave.nix
-  ./services/databases/4store-endpoint.nix
-  ./services/databases/4store.nix
-  ./services/databases/couchdb.nix
-  ./services/databases/firebird.nix
-  ./services/databases/influxdb.nix
-  ./services/databases/memcached.nix
-  ./services/databases/monetdb.nix
-  ./services/databases/mongodb.nix
-  ./services/databases/mysql.nix
-  ./services/databases/neo4j.nix 
-  ./services/databases/openldap.nix
-  ./services/databases/postgresql.nix
-  ./services/databases/redis.nix
-  ./services/databases/virtuoso.nix
-  ./services/desktops/accountsservice.nix
-  ./services/desktops/geoclue2.nix
-  ./services/desktops/gnome3/at-spi2-core.nix
-  ./services/desktops/gnome3/evolution-data-server.nix
-  ./services/desktops/gnome3/gnome-documents.nix
-  ./services/desktops/gnome3/gnome-keyring.nix
-  ./services/desktops/gnome3/gnome-online-accounts.nix
-  ./services/desktops/gnome3/gnome-online-miners.nix
-  ./services/desktops/gnome3/gnome-user-share.nix
-  ./services/desktops/gnome3/gvfs.nix
-  ./services/desktops/gnome3/seahorse.nix
-  ./services/desktops/gnome3/sushi.nix
-  ./services/desktops/gnome3/tracker.nix
-  ./services/desktops/telepathy.nix
-  ./services/games/ghost-one.nix
-  ./services/games/minecraft-server.nix
-  ./services/hardware/acpid.nix
-  ./services/hardware/amd-hybrid-graphics.nix
-  ./services/hardware/bluetooth.nix
-  ./services/hardware/nvidia-optimus.nix
-  ./services/hardware/pcscd.nix
-  ./services/hardware/pommed.nix
-  ./services/hardware/sane.nix
-  ./services/hardware/tcsd.nix
-  ./services/hardware/thinkfan.nix
-  ./services/hardware/udev.nix
-  ./services/hardware/udisks2.nix
-  ./services/hardware/upower.nix
-  ./services/logging/klogd.nix
-  ./services/logging/logcheck.nix
-  ./services/logging/logrotate.nix
-  ./services/logging/logstash.nix
-  ./services/logging/rsyslogd.nix
-  ./services/logging/syslogd.nix
-  ./services/logging/syslog-ng.nix
-  ./services/mail/dovecot.nix
-  ./services/mail/freepops.nix
-  ./services/mail/mail.nix
-  ./services/mail/mlmmj.nix
-  ./services/mail/opensmtpd.nix
-  ./services/mail/postfix.nix
-  ./services/mail/spamassassin.nix
-  #./services/misc/autofs.nix
-  ./services/misc/cgminer.nix
-  ./services/misc/dictd.nix
-  ./services/misc/disnix.nix
-  ./services/misc/felix.nix
-  ./services/misc/folding-at-home.nix
-  ./services/misc/gitolite.nix
-  ./services/misc/gpsd.nix
-  ./services/misc/nix-daemon.nix
-  ./services/misc/nix-gc.nix
-  ./services/misc/nixos-manual.nix
-  ./services/misc/nix-ssh-serve.nix
-  ./services/misc/rippled.nix
-  ./services/misc/rogue.nix
-  ./services/misc/siproxd.nix
-  ./services/misc/svnserve.nix
-  ./services/misc/synergy.nix
-  ./services/misc/uhub.nix
-  ./services/misc/zookeeper.nix
-  ./services/monitoring/apcupsd.nix
-  ./services/monitoring/dd-agent.nix
-  ./services/monitoring/graphite.nix
-  ./services/monitoring/monit.nix
-  ./services/monitoring/munin.nix
-  ./services/monitoring/nagios.nix
-  ./services/monitoring/riemann.nix
-  ./services/monitoring/riemann-dash.nix
-  ./services/monitoring/smartd.nix
-  ./services/monitoring/statsd.nix
-  ./services/monitoring/systemhealth.nix
-  ./services/monitoring/ups.nix
-  ./services/monitoring/uptime.nix
-  ./services/monitoring/zabbix-agent.nix
-  ./services/monitoring/zabbix-server.nix
-  ./services/network-filesystems/drbd.nix
-  ./services/network-filesystems/nfsd.nix
-  ./services/network-filesystems/openafs-client/default.nix
-  ./services/network-filesystems/rsyncd.nix
-  ./services/network-filesystems/samba.nix
-  ./services/network-filesystems/diod.nix
-  ./services/networking/amuled.nix
-  ./services/networking/atftpd.nix
-  ./services/networking/avahi-daemon.nix
-  ./services/networking/bind.nix
-  ./services/networking/bitlbee.nix
-  ./services/networking/btsync.nix
-  ./services/networking/chrony.nix
-  ./services/networking/cjdns.nix
-  ./services/networking/cntlm.nix
-  ./services/networking/connman.nix
-  ./services/networking/ddclient.nix
-  ./services/networking/dhcpcd.nix
-  ./services/networking/dhcpd.nix
-  ./services/networking/dnsmasq.nix
-  ./services/networking/ejabberd.nix
-  ./services/networking/firewall.nix
-  ./services/networking/flashpolicyd.nix
-  ./services/networking/freenet.nix
-  ./services/networking/git-daemon.nix
-  ./services/networking/gnunet.nix
-  ./services/networking/gogoclient.nix
-  ./services/networking/gvpe.nix
-  ./services/networking/haproxy.nix
-  ./services/networking/hostapd.nix
-  ./services/networking/ifplugd.nix
-  ./services/networking/iodined.nix
-  ./services/networking/ircd-hybrid/default.nix
-  ./services/networking/kippo.nix
-  ./services/networking/minidlna.nix
-  ./services/networking/murmur.nix
-  ./services/networking/nat.nix
-  ./services/networking/networkmanager.nix
-  ./services/networking/ngircd.nix
-  ./services/networking/notbit.nix
-  ./services/networking/nsd.nix
-  ./services/networking/ntopng.nix
-  ./services/networking/ntpd.nix
-  ./services/networking/oidentd.nix
-  ./services/networking/openfire.nix
-  ./services/networking/openntpd.nix
-  ./services/networking/openvpn.nix
-  ./services/networking/polipo.nix
-  ./services/networking/prayer.nix
-  ./services/networking/privoxy.nix
-  ./services/networking/quassel.nix
-  ./services/networking/radicale.nix
-  ./services/networking/radvd.nix
-  ./services/networking/rdnssd.nix
-  ./services/networking/rpcbind.nix
-  ./services/networking/sabnzbd.nix
-  ./services/networking/searx.nix
-  ./services/networking/spiped.nix
-  ./services/networking/ssh/lshd.nix
-  ./services/networking/ssh/sshd.nix
-  ./services/networking/supybot.nix
-  ./services/networking/syncthing.nix
-  ./services/networking/tcpcrypt.nix
-  ./services/networking/teamspeak3.nix
-  ./services/networking/tftpd.nix
-  ./services/networking/unbound.nix
-  ./services/networking/unifi.nix
-  ./services/networking/vsftpd.nix
-  ./services/networking/wakeonlan.nix
-  ./services/networking/websockify.nix
-  ./services/networking/wicd.nix
-  ./services/networking/wpa_supplicant.nix
-  ./services/networking/xinetd.nix
-  ./services/networking/znc.nix
-  ./services/printing/cupsd.nix
-  ./services/scheduling/atd.nix
-  ./services/scheduling/cron.nix
-  ./services/scheduling/fcron.nix
-  ./services/search/elasticsearch.nix
-  ./services/search/solr.nix
-  ./services/security/clamav.nix
-  ./services/security/fail2ban.nix
-  ./services/security/fprot.nix
-  ./services/security/frandom.nix
-  ./services/security/haveged.nix
-  ./services/security/torify.nix
-  ./services/security/tor.nix
-  ./services/security/torsocks.nix
-  ./services/system/dbus.nix
-  ./services/system/kerberos.nix
-  ./services/system/nscd.nix
-  ./services/system/uptimed.nix
-  ./services/torrent/deluge.nix
-  ./services/torrent/transmission.nix
-  ./services/ttys/agetty.nix
-  ./services/ttys/gpm.nix
-  ./services/ttys/kmscon.nix
-  ./services/web-servers/apache-httpd/default.nix
-  ./services/web-servers/fcgiwrap.nix
-  ./services/web-servers/jboss/default.nix
-  ./services/web-servers/lighttpd/cgit.nix
-  ./services/web-servers/lighttpd/default.nix
-  ./services/web-servers/lighttpd/gitweb.nix
-  ./services/web-servers/nginx/default.nix
-  ./services/web-servers/phpfpm.nix
-  ./services/web-servers/tomcat.nix
-  ./services/web-servers/varnish/default.nix
-  ./services/web-servers/winstone.nix
-  ./services/web-servers/zope2.nix
-  ./services/x11/desktop-managers/default.nix
-  ./services/x11/display-managers/auto.nix
-  ./services/x11/display-managers/default.nix
-  ./services/x11/display-managers/gdm.nix
-  ./services/x11/display-managers/kdm.nix
-  ./services/x11/display-managers/lightdm.nix
-  ./services/x11/display-managers/slim.nix
-  ./services/x11/hardware/multitouch.nix
-  ./services/x11/hardware/synaptics.nix
-  ./services/x11/hardware/wacom.nix
-  ./services/x11/redshift.nix
-  ./services/x11/window-managers/awesome.nix
-  #./services/x11/window-managers/compiz.nix
-  ./services/x11/window-managers/default.nix
-  ./services/x11/window-managers/fluxbox.nix
-  ./services/x11/window-managers/icewm.nix
-  ./services/x11/window-managers/bspwm.nix
-  ./services/x11/window-managers/metacity.nix
-  ./services/x11/window-managers/none.nix
-  ./services/x11/window-managers/twm.nix
-  ./services/x11/window-managers/wmii.nix
-  ./services/x11/window-managers/xmonad.nix
-  ./services/x11/xfs.nix
-  ./services/x11/xserver.nix
-  ./system/activation/activation-script.nix
-  ./system/activation/top-level.nix
-  ./system/boot/emergency-mode.nix
-  ./system/boot/kernel.nix
-  ./system/boot/kexec.nix
-  ./system/boot/loader/efi.nix
-  ./system/boot/loader/generations-dir/generations-dir.nix
-  ./system/boot/loader/grub/grub.nix
-  ./system/boot/loader/grub/memtest.nix
-  ./system/boot/loader/gummiboot/gummiboot.nix
-  ./system/boot/loader/init-script/init-script.nix
-  ./system/boot/loader/raspberrypi/raspberrypi.nix
-  ./system/boot/luksroot.nix
-  ./system/boot/modprobe.nix
-  ./system/boot/shutdown.nix
-  ./system/boot/stage-1.nix
-  ./system/boot/stage-2.nix
-  ./system/boot/systemd.nix
-  ./system/boot/tmp.nix
-  ./system/etc/etc.nix
-  ./system/upstart/upstart.nix
-  ./tasks/cpu-freq.nix
-  ./tasks/encrypted-devices.nix
-  ./tasks/filesystems.nix
-  ./tasks/filesystems/btrfs.nix
-  ./tasks/filesystems/cifs.nix
-  ./tasks/filesystems/ext.nix
-  ./tasks/filesystems/f2fs.nix
-  ./tasks/filesystems/nfs.nix
-  ./tasks/filesystems/reiserfs.nix
-  ./tasks/filesystems/unionfs-fuse.nix
-  ./tasks/filesystems/vfat.nix
-  ./tasks/filesystems/xfs.nix
-  ./tasks/filesystems/zfs.nix
-  ./tasks/kbd.nix
-  ./tasks/lvm.nix
-  ./tasks/network-interfaces.nix
-  ./tasks/scsi-link-power-management.nix
-  ./tasks/swraid.nix
-  ./tasks/trackpoint.nix
-  ./testing/service-runner.nix
-  ./virtualisation/container-config.nix
-  ./virtualisation/containers.nix
-  ./virtualisation/docker.nix
-  ./virtualisation/libvirtd.nix
-  #./virtualisation/nova.nix
-  ./virtualisation/openvswitch.nix
-  ./virtualisation/virtualbox-guest.nix
-  #./virtualisation/xen-dom0.nix
-]

From 56102642fa957ab1c7c3b22675ae0113303097f4 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Tue, 2 Sep 2014 13:16:13 +0200
Subject: [PATCH 1200/1453] pulseaudio: Add pulse-access group, controlling
 access to the system-wide PA daemon

---
 nixos/modules/config/pulseaudio.nix | 21 ++++++++++++++-------
 nixos/modules/misc/ids.nix          |  1 +
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix
index 1b84bbaf10c5..fd29e2357683 100644
--- a/nixos/modules/config/pulseaudio.nix
+++ b/nixos/modules/config/pulseaudio.nix
@@ -10,10 +10,12 @@ let
   systemWide = cfg.enable && cfg.systemWide;
   nonSystemWide = cfg.enable && !cfg.systemWide;
 
-  uid = config.ids.uids.pulseaudio;
-  gid = config.ids.gids.pulseaudio;
+  ids = config.ids;
 
-  stateDir = "/run/pulse";
+  uid = ids.uids.pulseaudio;
+  gid = ids.gids.pulseaudio;
+
+  stateDir = "/var/run/pulse";
 
   # Create pulse/client.conf even if PulseAudio is disabled so
   # that we can disable the autospawn feature in programs that
@@ -138,19 +140,24 @@ in {
         group = "pulse";
         extraGroups = [ "audio" ];
         description = "PulseAudio system service user";
+        home = stateDir;
+        createHome = true;
       };
 
       users.extraGroups.pulse.gid = gid;
 
+      users.extraGroups.pulse-access = {
+        gid = ids.gids.pulse-access;
+        members = with builtins; config.users.extraGroups.audio.members ++ (
+          attrNames(filterAttrs (n: u: elem "audio" u.extraGroups) config.users.extraUsers)
+        );
+      };
+
       systemd.services.pulseaudio = {
         description = "PulseAudio System-Wide Server";
         wantedBy = [ "sound.target" ];
         before = [ "sound.target" ];
         environment.PULSE_RUNTIME_PATH = stateDir;
-        preStart = ''
-          mkdir -p --mode 755 ${stateDir}
-          chown -R pulse:pulse ${stateDir}
-        '';
         serviceConfig = {
           ExecStart = "${cfg.package}/bin/pulseaudio -D --log-level=${cfg.daemon.logLevel} --system --use-pid-file -n --file=${cfg.configFile}";
           PIDFile = "${stateDir}/pid";
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index efd8b253cd4c..d72649cd33d4 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -270,6 +270,7 @@
       riemann = 137;
       riemanndash = 138;
       uhub = 142;
+      pulse-access = 143;
 
       # When adding a gid, make sure it doesn't match an existing uid. And don't use gids above 399!
 

From 2b72edad9b3c2426600b27e48e70f2e038382313 Mon Sep 17 00:00:00 2001
From: Sergey Mironov <grrwlf@gmail.com>
Date: Sun, 30 Mar 2014 00:07:31 +0400
Subject: [PATCH 1201/1453] yandex-disk: fix the url; introduce systemd.service
 #2228

---
 nixos/modules/misc/ids.nix                    |   1 +
 nixos/modules/module-list.nix                 |   1 +
 .../network-filesystems/yandex-disk.nix       | 104 ++++++++++++++++++
 .../tools/filesystems/yandex-disk/default.nix |   6 +-
 4 files changed, 109 insertions(+), 3 deletions(-)
 create mode 100644 nixos/modules/services/network-filesystems/yandex-disk.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index d72649cd33d4..a535a8d7604e 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -150,6 +150,7 @@
       zookeeper = 140;
       dnsmasq = 141;
       uhub = 142;
+      yandexdisk=143;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 7679d3e6ac44..1135534263c6 100755
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -193,6 +193,7 @@
   ./services/network-filesystems/rsyncd.nix
   ./services/network-filesystems/samba.nix
   ./services/network-filesystems/diod.nix
+  ./services/network-filesystems/yandex-disk.nix
   ./services/networking/amuled.nix
   ./services/networking/atftpd.nix
   ./services/networking/avahi-daemon.nix
diff --git a/nixos/modules/services/network-filesystems/yandex-disk.nix b/nixos/modules/services/network-filesystems/yandex-disk.nix
new file mode 100644
index 000000000000..df9626d17c92
--- /dev/null
+++ b/nixos/modules/services/network-filesystems/yandex-disk.nix
@@ -0,0 +1,104 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  cfg = config.services.yandex-disk;
+
+  dir = "/var/lib/yandex-disk";
+
+  u = if cfg.user != null then cfg.user else "yandexdisk";
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.yandex-disk = {
+
+      enable = mkOption {
+        default = false;
+        description = "
+          Whether to enable Yandex-disk client. See https://disk.yandex.ru/
+        ";
+      };
+
+      username = mkOption {
+        default = "";
+        type = types.string;
+        description = ''
+          Your yandex.com login name.
+        '';
+      };
+
+      password = mkOption {
+        default = "";
+        type = types.string;
+        description = ''
+          Your yandex.com password. Warning: it will be world-readable in /nix/store.
+        '';
+      };
+
+      user = mkOption {
+        default = null;
+        description = ''
+          The user the yandex-disk daemon should run as.
+        '';
+      };
+
+      directory = mkOption {
+        default = "/home/Yandex.Disk";
+        description = "The directory to use for Yandex.Disk storage";
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    users.extraUsers = mkIf (cfg.user == null) [ {
+      name = u;
+      uid = config.ids.uids.yandexdisk;
+      group = "nogroup";
+      home = dir;
+    } ];
+
+    systemd.services.yandex-disk = {
+      description = "Yandex-disk server";
+
+      after = [ "network.target" ];
+
+      wantedBy = [ "multi-user.target" ];
+
+      # FIXME: have to specify ${directory} here as well
+      unitConfig.RequiresMountsFor = dir;
+
+      script = ''
+        mkdir -p -m 700 ${dir}
+        chown ${u} ${dir}
+
+        if ! test -d "${cfg.directory}" ; then
+          mkdir -p -m 755 ${cfg.directory} ||
+            exit 1
+        fi
+
+        ${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${u} \
+          -c '${pkgs.yandex-disk}/bin/yandex-disk token -p ${cfg.password} ${cfg.username} ${dir}/token'
+
+        ${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${u} \
+          -c '${pkgs.yandex-disk}/bin/yandex-disk start --no-daemon -a ${dir}/token -d ${cfg.directory}'
+      '';
+
+    };
+  };
+
+}
+
diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix
index c9078a0cb8be..e33f46ea9ccd 100644
--- a/pkgs/tools/filesystems/yandex-disk/default.nix
+++ b/pkgs/tools/filesystems/yandex-disk/default.nix
@@ -6,17 +6,17 @@ let
   p = if stdenv.is64bit then {
       arch = "x86_64";
       gcclib = "${stdenv.gcc.gcc}/lib64";
-      sha256 = "1fmmlvvh97d60n9k08bn4k6ghwr3yhs8sib82025nwpw1sq08vim";
+      sha256 = "09kw7f0qsvx3vx1c1zb117yf3yk7kkz66agspz5xx9b0zh6i82jw";
     }
     else {
       arch = "i386";
       gcclib = "${stdenv.gcc.gcc}/lib";
-      sha256 = "3940420bd9d1fe1ecec1a117bfd9d21d545bca59f5e0a4364304ab808c976f7f";
+      sha256 = "0f2230c91120f05159281b39c620ab6bad6559ce8a17a0874d0a82350ebba426";
     };
 in 
 stdenv.mkDerivation rec {
 
-  name = "yandex-disk-0.1.2.481";
+  name = "yandex-disk-0.1.4.504";
 
   src = fetchurl {
     url = "http://repo.yandex.ru/yandex-disk/rpm/stable/${p.arch}/${name}-1.fedora.${p.arch}.rpm";

From 468f99e946decd62788a20f6523302c1dee98d38 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 3 Sep 2014 11:05:21 +0200
Subject: [PATCH 1202/1453] liquidfun: Don't build on Hydra

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

diff --git a/pkgs/development/libraries/liquidfun/default.nix b/pkgs/development/libraries/liquidfun/default.nix
index 994c013c6319..a4dc7b5e93d1 100644
--- a/pkgs/development/libraries/liquidfun/default.nix
+++ b/pkgs/development/libraries/liquidfun/default.nix
@@ -39,8 +39,8 @@ stdenv.mkDerivation rec {
     [
       qknight
     ];
-    platforms = with stdenv.lib.platforms;
-      linux;
+    platforms = stdenv.lib.platforms.linux;
+    hydraPlatforms = [];
     license = stdenv.lib.licenses.bsd2;
     homepage = https://google.github.io/liquidfun/;
   };

From 428cb0ea7a53f5e6c0bd5eb4206061e24cb49172 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@immobiliare.it>
Date: Wed, 3 Sep 2014 11:25:57 +0200
Subject: [PATCH 1203/1453] sphinxsearch: fix evaluation error

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

diff --git a/pkgs/servers/search/sphinxsearch/default.nix b/pkgs/servers/search/sphinxsearch/default.nix
index 27bbb91fb186..040dace69fb8 100644
--- a/pkgs/servers/search/sphinxsearch/default.nix
+++ b/pkgs/servers/search/sphinxsearch/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, mysql,
-  version = "2.1.9",
+  version = "2.1.9";
   mainSrc = fetchurl {
     url = "http://sphinxsearch.com/files/sphinx-${version}-release.tar.gz";
     sha256 = "00vwxf3zr0g1fq9mls1z2rd8nxw74b76pkl1j466lig1qc5am2b2";

From 0f6d45f6b459a9e198354c636a99747104961a21 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@immobiliare.it>
Date: Wed, 3 Sep 2014 12:02:25 +0200
Subject: [PATCH 1204/1453] sphinxsearch: fix again...

---
 pkgs/servers/search/sphinxsearch/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/search/sphinxsearch/default.nix b/pkgs/servers/search/sphinxsearch/default.nix
index 040dace69fb8..1979da5b2c0c 100644
--- a/pkgs/servers/search/sphinxsearch/default.nix
+++ b/pkgs/servers/search/sphinxsearch/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, mysql,
-  version = "2.1.9";
-  mainSrc = fetchurl {
+  version ? "2.1.9",
+  mainSrc ? fetchurl {
     url = "http://sphinxsearch.com/files/sphinx-${version}-release.tar.gz";
     sha256 = "00vwxf3zr0g1fq9mls1z2rd8nxw74b76pkl1j466lig1qc5am2b2";
   }

From b33b05a8786c0acde43e0fc8d825f9e1db278862 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 3 Sep 2014 12:06:58 +0200
Subject: [PATCH 1205/1453] ocaml-twt: some fixes

---
 pkgs/development/ocaml-modules/twt/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/twt/default.nix b/pkgs/development/ocaml-modules/twt/default.nix
index e2a627aa3609..c06449f68b4c 100644
--- a/pkgs/development/ocaml-modules/twt/default.nix
+++ b/pkgs/development/ocaml-modules/twt/default.nix
@@ -16,9 +16,9 @@ stdenv.mkDerivation {
     mkdir $out/bin
   '';
 
-  installPhase = ''
-    make install PREFIX=$out
-  '';
+  dontBuild = true;
+
+  installFlags = "PREFIX=$(out)";
 
   meta = {
     homepage = http://people.csail.mit.edu/mikelin/ocaml+twt/;

From e5b7b97a67c6418ea4d0f9f01324d50916eebee7 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@immobiliare.it>
Date: Wed, 3 Sep 2014 12:51:10 +0200
Subject: [PATCH 1206/1453] nixos tested: only build on supportedSystems

---
 nixos/release-combined.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 0c72bae35bbc..3a458f5e860b 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -34,7 +34,7 @@ in rec {
       maintainers = [ pkgs.lib.maintainers.eelco pkgs.lib.maintainers.shlevy ];
     };
     constituents =
-      let all = x: [ x.x86_64-linux x.i686-linux ]; in
+      let all = x: map (p: x.${p}) supportedSystems; in
       [ nixos.channel
         (all nixos.manual)
 

From fc434d1f5c12511d48bff5c10a79ca707915b231 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 3 Sep 2014 12:52:08 +0200
Subject: [PATCH 1207/1453] synergy: Update to new upstream version 1.5.1.

Bugfix release, fixing the following bugs:

 - Configuration file paths containing spaces don't work
 - Log path needs to be in quotes on windows
 - Installer fails when Windows Firewall is disabled

http://svn.synergy-project.org/tags/1.5.1/ChangeLog

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/misc/synergy/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix
index 8d914c262212..df4c0ea97ebd 100644
--- a/pkgs/applications/misc/synergy/default.nix
+++ b/pkgs/applications/misc/synergy/default.nix
@@ -6,11 +6,11 @@ assert stdenv.isLinux -> cryptopp != null;
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "synergy-1.5.0";
+  name = "synergy-1.5.1";
 
   src = fetchurl {
-    url = "http://synergy-project.org/files/packages/synergy-1.5.0-r2278-Source.tar.gz";
-    sha256 = "097hk9v01lwzs7ly6ynadxmjh7ad68l5si7w4qmjn6z7l8b61gv6";
+    url = "http://synergy-project.org/files/packages/${name}-r2398-Source.tar.gz";
+    sha256 = "19q8ck15f0jgpbzlm34dzp046wf3iiwa21s1qfyj5sj7xjxwa367";
   };
 
   patches = optional stdenv.isLinux ./cryptopp.patch;

From 46b78bdef4a0701a36d9a48384a2fe4cb0284de7 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@immobiliare.it>
Date: Wed, 3 Sep 2014 13:02:45 +0200
Subject: [PATCH 1208/1453] release: do not process broken packages, we induce
 they don't have platforms at all

---
 pkgs/top-level/release-lib.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix
index e2f5309ced33..0a8e7165d663 100644
--- a/pkgs/top-level/release-lib.nix
+++ b/pkgs/top-level/release-lib.nix
@@ -123,6 +123,8 @@ rec {
       packagesWithMetaPlatform attrSet
     else if attrSet.recurseForRelease or false then
       packagesWithMetaPlatform attrSet
+    else if attrSet.meta.broken or false then
+      []
     else
       attrSet.meta.hydraPlatforms or (attrSet.meta.platforms or []);
 

From ef5b30428f06b53f05c41ede361a7dcf4c3ca9d3 Mon Sep 17 00:00:00 2001
From: Nomen Nescio <nobody@dizum.com>
Date: Wed, 3 Sep 2014 11:05:20 +0200
Subject: [PATCH 1209/1453] baekmuk-ttf: new package

baekmuk-ttf: new package
---
 pkgs/data/fonts/baekmuk-ttf/default.nix | 29 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/data/fonts/baekmuk-ttf/default.nix

diff --git a/pkgs/data/fonts/baekmuk-ttf/default.nix b/pkgs/data/fonts/baekmuk-ttf/default.nix
new file mode 100644
index 000000000000..acd16478fcf5
--- /dev/null
+++ b/pkgs/data/fonts/baekmuk-ttf/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "baekmuk-ttf-2.2";
+
+  src = fetchurl {
+    url = "http://kldp.net/frs/download.php/1429/${name}.tar.gz";
+    sha256 = "08ab7dffb55d5887cc942ce370f5e33b756a55fbb4eaf0b90f244070e8d51882";
+  };
+
+  dontBuild = true;
+
+  installPhase = let
+    fonts_dir = "$out/share/fonts";
+    doc_dir = "$out/share/doc/${name}";
+  in ''
+    mkdir -pv ${fonts_dir}
+    mkdir -pv ${doc_dir}
+    cp ttf/*.ttf ${fonts_dir}
+    cp COPYRIGHT* ${doc_dir}
+  '';
+
+  meta = {
+    description = "Korean font";
+    homepage = "http://kldp.net/projects/baekmuk/";
+    license = "BSD-like";
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fa910a06cb87..fb7edbfd3892 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8055,6 +8055,8 @@ let
 
   aurulent-sans = callPackage ../data/fonts/aurulent-sans { };
 
+  baekmuk-ttf = callPackage ../data/fonts/baekmuk-ttf { };
+
   bakoma_ttf = callPackage ../data/fonts/bakoma-ttf { };
 
   cacert = callPackage ../data/misc/cacert { };

From 66ee6e03e7963b0de6ae7e35eb334f6a2fd75944 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Wed, 3 Sep 2014 13:24:47 +0200
Subject: [PATCH 1210/1453] pulseaudio: Use group audio instead of pulse-access

---
 nixos/modules/config/pulseaudio.nix |  7 -------
 nixos/modules/misc/ids.nix          |  1 -
 pkgs/servers/pulseaudio/default.nix | 13 +++++++++----
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix
index fd29e2357683..fb5715022b78 100644
--- a/nixos/modules/config/pulseaudio.nix
+++ b/nixos/modules/config/pulseaudio.nix
@@ -146,13 +146,6 @@ in {
 
       users.extraGroups.pulse.gid = gid;
 
-      users.extraGroups.pulse-access = {
-        gid = ids.gids.pulse-access;
-        members = with builtins; config.users.extraGroups.audio.members ++ (
-          attrNames(filterAttrs (n: u: elem "audio" u.extraGroups) config.users.extraUsers)
-        );
-      };
-
       systemd.services.pulseaudio = {
         description = "PulseAudio System-Wide Server";
         wantedBy = [ "sound.target" ];
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index a535a8d7604e..37531ad1cdfd 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -271,7 +271,6 @@
       riemann = 137;
       riemanndash = 138;
       uhub = 142;
-      pulse-access = 143;
 
       # When adding a gid, make sure it doesn't match an existing uid. And don't use gids above 399!
 
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index a918007b47c6..de262af095cb 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -45,10 +45,15 @@ stdenv.mkDerivation rec {
        -e "s|chmod r+s |true |"
   '';
 
-  configureFlags =
-    [ "--disable-solaris" "--disable-jack" "--disable-oss-output"
-      "--disable-oss-wrapper" "--localstatedir=/var" "--sysconfdir=/etc" ]
-    ++ stdenv.lib.optional jackaudioSupport "--enable-jack"
+  configureFlags = [
+    "--disable-solaris"
+    "--disable-jack"
+    "--disable-oss-output"
+    "--disable-oss-wrapper"
+    "--localstatedir=/var"
+    "--sysconfdir=/etc"
+    "--with-access-group=audio"
+  ] ++ stdenv.lib.optional jackaudioSupport "--enable-jack"
     ++ stdenv.lib.optional stdenv.isDarwin "--with-mac-sysroot=/";
 
   enableParallelBuilding = true;

From 03ff6450b96f5b7516a86549c86f4d81e605ecc9 Mon Sep 17 00:00:00 2001
From: Tom Fitzhenry <tom@tom-fitzhenry.me.uk>
Date: Wed, 3 Sep 2014 12:31:01 +0100
Subject: [PATCH 1211/1453] keepassx: update to 2.0-alpha6

---
 pkgs/applications/misc/keepassx/2.0.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/keepassx/2.0.nix b/pkgs/applications/misc/keepassx/2.0.nix
index 1a79af7cb577..c39c72398f7b 100644
--- a/pkgs/applications/misc/keepassx/2.0.nix
+++ b/pkgs/applications/misc/keepassx/2.0.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, cmake, libgcrypt, qt4, xlibs, ... }:
 
 stdenv.mkDerivation {
-  name = "keepassx2-2.0alpha5";
+  name = "keepassx2-2.0alpha6";
   src = fetchurl {
-    url = "https://github.com/keepassx/keepassx/archive/2.0-alpha5.tar.gz";
-    sha256 = "1vxj306zhrr38mvsy3vpjlg6d0xwlcvsi3l69nhhwzkccsc4smfm";
+    url = "https://github.com/keepassx/keepassx/archive/2.0-alpha6.tar.gz";
+    sha256 = "592f9995b13c4f84724fb24a0078162246397eedccd467daaf0fd3608151f2b0";
   };
 
   buildInputs = [ cmake libgcrypt qt4 xlibs.libXtst ];

From fe3f7716f0494fd0170f307e1a8a5e00fa3e6d2f Mon Sep 17 00:00:00 2001
From: Strahinja Popovic <stralep@gmail.com>
Date: Thu, 17 Jul 2014 12:51:17 +0200
Subject: [PATCH 1212/1453] Enabled access to binaries of needed tools, and
 worker daemons can be enabled for phabricator #3306

---
 nixos/modules/module-list.nix                 |  1 +
 nixos/modules/services/misc/phd.nix           | 52 ++++++++++++++++
 .../web-servers/apache-httpd/phabricator.nix  | 61 +++++++++++--------
 nixos/tests/phabricator.nix                   |  7 +++
 pkgs/misc/phabricator/default.nix             | 28 +++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 6 files changed, 125 insertions(+), 26 deletions(-)
 create mode 100644 nixos/modules/services/misc/phd.nix
 create mode 100644 pkgs/misc/phabricator/default.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 1135534263c6..2d977e38a12f 100755
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -165,6 +165,7 @@
   ./services/misc/nix-gc.nix
   ./services/misc/nixos-manual.nix
   ./services/misc/nix-ssh-serve.nix
+  ./services/misc/phd.nix
   ./services/misc/rippled.nix
   ./services/misc/rogue.nix
   ./services/misc/siproxd.nix
diff --git a/nixos/modules/services/misc/phd.nix b/nixos/modules/services/misc/phd.nix
new file mode 100644
index 000000000000..888247275ac6
--- /dev/null
+++ b/nixos/modules/services/misc/phd.nix
@@ -0,0 +1,52 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.phd;
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.phd = {
+
+      enable = mkOption {
+        default = false;
+        description = "
+          Enable daemons for phabricator.
+        ";
+      };
+
+    };
+
+  };
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    systemd.services.phd = {
+      path = [ pkgs.phabricator pkgs.php pkgs.mercurial pkgs.git pkgs.subversion ];
+
+      after = [ "httpd.service" ];
+      wantedBy = [ "multi-user.target" ];
+
+      serviceConfig = {
+        ExecStart = "${pkgs.phabricator}/phabricator/bin/phd start";
+        ExecStop = "${pkgs.phabricator}/phabricator/bin/phd start";
+        User = "wwwrun";
+        RestartSec = "30s";
+        Restart = "always";
+        StartLimitInterval = "1m";
+      };
+    };
+
+  };
+
+}
diff --git a/nixos/modules/services/web-servers/apache-httpd/phabricator.nix b/nixos/modules/services/web-servers/apache-httpd/phabricator.nix
index c7a9bdf68c56..e4e3aac8d411 100644
--- a/nixos/modules/services/web-servers/apache-httpd/phabricator.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/phabricator.nix
@@ -1,35 +1,30 @@
 { config, lib, pkgs, ... }:
+
+with lib;
+
 let
-  phabricatorRoot = pkgs.stdenv.mkDerivation rec {
-    version = "2014-05-12";
-    name = "phabricator-${version}";
-    srcLibphutil = pkgs.fetchgit {
-        url = git://github.com/facebook/libphutil.git;
-        rev = "2f3b5a1cf6ea464a0250d4b1c653a795a90d2716";
-        sha256 = "9598cec400984dc149162f1e648814a54ea0cd34fcd529973dc83f5486fdd9fd";
-    };
-    srcArcanist = pkgs.fetchgit {
-        url = git://github.com/facebook/arcanist.git;
-        rev = "54c377448db8dbc40f0ca86d43c837d30e493485";
-        sha256 = "086db3c0d1154fbad23e7c6def31fd913384ee20247b329515838b669c3028e0";
-    };
-    srcPhabricator = pkgs.fetchgit {
-        url = git://github.com/facebook/phabricator.git;
-        rev = "1644ef185ecf1e9fca3eb6b16351ef46b19d110f";
-        sha256 = "e1135e4ba76d53f48aad4161563035414ed7e878f39a8a34a875a01b41b2a084";
-    };
-    
-    buildCommand = ''
-      mkdir -p $out
-      cp -R ${srcLibphutil} $out/libphutil
-      cp -R ${srcArcanist} $out/arcanist
-      cp -R ${srcPhabricator} $out/phabricator
-    '';
-  };
+  phabricatorRoot = pkgs.phabricator;
 in {
+
   enablePHP = true;
   extraApacheModules = [ "mod_rewrite" ];
   DocumentRoot = "${phabricatorRoot}/phabricator/webroot";
+
+  options = {
+      git = mkOption {
+          default = true;
+          description = "Enable git repositories.";
+      };
+      mercurial = mkOption {
+          default = true;
+          description = "Enable mercurial repositories.";
+      };
+      subversion = mkOption {
+          default = true;
+          description = "Enable subversion repositories.";
+      };
+  };
+
   extraConfig = ''
       DocumentRoot ${phabricatorRoot}/phabricator/webroot
 
@@ -38,4 +33,18 @@ in {
       RewriteRule ^/favicon.ico - [L,QSA]
       RewriteRule ^(.*)$ /index.php?__path__=$1 [B,L,QSA]
   '';
+
+  extraServerPath = [
+      "${pkgs.which}"
+      "${pkgs.diffutils}"
+      ] ++
+      (if config.mercurial then ["${pkgs.mercurial}"] else []) ++
+      (if config.subversion then ["${pkgs.subversion}"] else []) ++
+      (if config.git then ["${pkgs.git}"] else []);
+
+  startupScript = pkgs.writeScript "activatePhabricator" ''
+      mkdir -p /var/repo
+      chown wwwrun /var/repo
+  '';
+
 }
diff --git a/nixos/tests/phabricator.nix b/nixos/tests/phabricator.nix
index 53038474c91a..0fe31f66502d 100644
--- a/nixos/tests/phabricator.nix
+++ b/nixos/tests/phabricator.nix
@@ -32,9 +32,16 @@ import ./make-test.nix ({ pkgs, ... }: {
             }];
           };
 
+          phd = {
+            enable = true;
+          };
+
           mysql = {
             enable = true;
             package = pkgs.mysql;
+            extraOptions = ''
+              sql_mode=STRICT_ALL_TABLES
+            '';
           };
         };
 
diff --git a/pkgs/misc/phabricator/default.nix b/pkgs/misc/phabricator/default.nix
new file mode 100644
index 000000000000..3162dd0079d0
--- /dev/null
+++ b/pkgs/misc/phabricator/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchgit, pkgs, ...  }:
+
+stdenv.mkDerivation rec {
+  version = "2014-07-16";
+  name = "phabricator-${version}";
+  srcLibphutil = pkgs.fetchgit {
+      url = git://github.com/facebook/libphutil.git;
+      rev = "48a04395363d6c1dd9f66057bd11fd70d4665ba9";
+      sha256 = "d570d2c1e68471c2eda35b8722d8083bcc13163fbd5c944529464f2c7b55a2e5";
+  };
+  srcArcanist = pkgs.fetchgit {
+      url = git://github.com/facebook/arcanist.git;
+      rev = "97501da16416fbfdc6e84bd60abcbf5ad9506225";
+      sha256 = "9031c4ae228bdc986131e0c93c98fb73290bb0e297be1ec32f22ab09cdacafa3";
+  };
+  srcPhabricator = pkgs.fetchgit {
+      url = git://github.com/phacility/phabricator.git;
+      rev = "7ac5abb97934f7399b67762aa98f59f667711bf3";
+      sha256 = "6a1d449597ae4432e40a3e6cdb14e3a5a8a40e019f3930493064c35911f2adcc";
+  };
+
+  buildCommand = ''
+    mkdir -p $out
+    cp -R ${srcLibphutil} $out/libphutil
+    cp -R ${srcArcanist} $out/arcanist
+    cp -R ${srcPhabricator} $out/phabricator
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fb7edbfd3892..69ce2d19e586 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11421,6 +11421,8 @@ let
 
   pgfplots = callPackage ../tools/typesetting/tex/pgfplots { };
 
+  phabricator = callPackage ../misc/phabricator { };
+
   pjsip = callPackage ../applications/networking/pjsip { };
 
   polytable = callPackage ../tools/typesetting/tex/polytable { };

From 94a131b95aa79d702ea7bdf82721f2c35f3dd5a5 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 3 Sep 2014 15:47:53 +0400
Subject: [PATCH 1213/1453] Fix forgotten unit entry

---
 nixos/modules/services/misc/phd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/phd.nix b/nixos/modules/services/misc/phd.nix
index 888247275ac6..e605ce5de16e 100644
--- a/nixos/modules/services/misc/phd.nix
+++ b/nixos/modules/services/misc/phd.nix
@@ -39,7 +39,7 @@ in
 
       serviceConfig = {
         ExecStart = "${pkgs.phabricator}/phabricator/bin/phd start";
-        ExecStop = "${pkgs.phabricator}/phabricator/bin/phd start";
+        ExecStop = "${pkgs.phabricator}/phabricator/bin/phd stop";
         User = "wwwrun";
         RestartSec = "30s";
         Restart = "always";

From 8c0b08d7050a1f1fbb6c5e3d64354b5c9083a761 Mon Sep 17 00:00:00 2001
From: Danyil Bohdan <danyil.bohdan@gmail.com>
Date: Sun, 31 Aug 2014 16:43:53 +0300
Subject: [PATCH 1214/1453] add python package 'jsonwatch'

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a3018b8e15f3..df5b694e251d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2263,6 +2263,34 @@ rec {
     };
   };
 
+  jsonwatch = buildPythonPackage rec {
+    name = "jsonwatch-0.2.0";
+
+    disabled = isPyPy;
+
+    src = fetchurl {
+      url = "https://github.com/dbohdan/jsonwatch/archive/v0.2.0.tar.gz";
+      sha256 = "04b616ef97b9d8c3887004995420e52b72a4e0480a92dbf60aa6c50317261e06";
+    };
+
+    propagatedBuildInputs = [ six ];
+
+    meta = {
+      description = "Like watch -d but for JSON";
+      longDescription = ''
+        jsonwatch is a command line utility with which you can track changes in
+        JSON data delivered by a shell command or a web (HTTP/HTTPS) API.
+        jsonwatch requests data from the designated source repeatedly at a set
+        interval and displays the differences when the data changes. It is
+        similar in its behavior to how watch(1) with the -d switch works
+        for plain-text data.
+      '';
+      homepage = "https://github.com/dbohdan/jsonwatch";
+      license = stdenv.lib.licenses.mit;
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
   logilab_astng = buildPythonPackage rec {
     name = "logilab-astng-0.24.3";
 
@@ -2752,7 +2780,7 @@ rec {
 
   random2 = pythonPackages.buildPythonPackage rec {
     name = "random2-1.0.1";
-    
+
     doCheck = !isPyPy;
 
     src = fetchurl {

From 24fed22cff76974c62d0699e79fafbd9e8d49cc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 3 Sep 2014 13:41:16 +0200
Subject: [PATCH 1215/1453] pypyPackages.jsonwatch: comment why it's disabled

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index df5b694e251d..ed334d27e0e6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2266,7 +2266,7 @@ rec {
   jsonwatch = buildPythonPackage rec {
     name = "jsonwatch-0.2.0";
 
-    disabled = isPyPy;
+    disabled = isPyPy; # doesn't find setuptools
 
     src = fetchurl {
       url = "https://github.com/dbohdan/jsonwatch/archive/v0.2.0.tar.gz";

From e552fbf521231e13d82f89701bfc9a940be341dd Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 2 Sep 2014 20:00:35 +0200
Subject: [PATCH 1216/1453] gcc/gcj: Update antlr dep to 4.4

Version 3.1.3 is no longer available for download.
---
 pkgs/development/compilers/gcc/4.8/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 2fb8f9d73b5e..7101d4e585e6 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -84,8 +84,8 @@ let version = "4.8.3";
     # Antlr (optional) allows the Java `gjdoc' tool to be built.  We want a
     # binary distribution here to allow the whole chain to be bootstrapped.
     javaAntlr = fetchurl {
-      url = http://www.antlr.org/download/antlr-3.1.3.jar;
-      sha256 = "1f41j0y4kjydl71lqlvr73yagrs2jsg1fjymzjz66mjy7al5lh09";
+      url = http://www.antlr.org/download/antlr-4.4-complete.jar;
+      sha256 = "02lda2imivsvsis8rnzmbrbp8rh1kb8vmq4i67pqhkwz7lf8y6dz";
     };
 
     xlibs = [

From a224d1f9baf6344875954fdc40bcbada5d48b717 Mon Sep 17 00:00:00 2001
From: Josh Cartwright <joshc@eso.teric.us>
Date: Wed, 3 Sep 2014 03:44:36 +0200
Subject: [PATCH 1217/1453] Add proggyfonts collection

The Proggy Fonts are a font collection intended for fixed-width uses
like programming languages.

Signed-off-by: Josh Cartwright <joshc@eso.teric.us>
---
 pkgs/data/fonts/proggyfonts/default.nix | 40 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/data/fonts/proggyfonts/default.nix

diff --git a/pkgs/data/fonts/proggyfonts/default.nix b/pkgs/data/fonts/proggyfonts/default.nix
new file mode 100644
index 000000000000..1c41a92bf96c
--- /dev/null
+++ b/pkgs/data/fonts/proggyfonts/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, mkfontdir, mkfontscale }:
+
+# adapted from https://aur.archlinux.org/packages/proggyfonts/
+
+stdenv.mkDerivation rec {
+  name = "proggyfonts-0.1";
+
+  src = fetchurl {
+    url = "http://kaictl.net/software/${name}.tar.gz";
+    sha256 = "1plcm1sjpa3hdqhhin48fq6zmz3ndm4md72916hd8ff0w6596q0n";
+  };
+
+  buildInputs = [ mkfontdir mkfontscale ];
+
+  installPhase =
+    ''
+      mkdir -p $out/share/doc/$name $out/share/fonts/misc $out/share/fonts/truetype
+
+      cp Licence.txt $out/share/doc/$name/LICENSE
+
+      for f in *.pcf; do
+        gzip -c "$f" > $out/share/fonts/misc/"$f".gz
+      done
+      cp *.bdf $out/share/fonts/misc
+      cp *.ttf $out/share/fonts/truetype
+
+      for f in misc truetype; do
+        cd $out/share/fonts/$f
+        mkfontscale
+        mkfontdir
+      done
+    '';
+
+  meta = with stdenv.lib; {
+    homepage = http://upperbounds.net;
+    description = "A set of fixed-width screen fonts that are designed for code listings";
+    license = licenses.mit;
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b58114113bb5..c46c1409063b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8115,6 +8115,8 @@ let
 
   posix_man_pages = callPackage ../data/documentation/man-pages-posix { };
 
+  proggyfonts = callPackage ../data/fonts/proggyfonts { };
+
   pthreadmanpages = callPackage ../data/documentation/pthread-man-pages { };
 
   shared_mime_info = callPackage ../data/misc/shared-mime-info { };

From 83c968fa2caf30c7c512d8b18d84bb8edda3114e Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@immobiliare.it>
Date: Wed, 3 Sep 2014 17:00:13 +0200
Subject: [PATCH 1218/1453] Add new kgraphviewer and massif-visualizer packages

I chose the unstable versions because the stable versions
seemed too outdated to me. They work with kde 4.12 anyway.
---
 .../graphics/kgraphviewer/default.nix         | 21 +++++++++++++++++++
 .../analysis/massif-visualizer/default.nix    | 20 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++++
 3 files changed, 45 insertions(+)
 create mode 100644 pkgs/applications/graphics/kgraphviewer/default.nix
 create mode 100644 pkgs/development/tools/analysis/massif-visualizer/default.nix

diff --git a/pkgs/applications/graphics/kgraphviewer/default.nix b/pkgs/applications/graphics/kgraphviewer/default.nix
new file mode 100644
index 000000000000..21caf8f80028
--- /dev/null
+++ b/pkgs/applications/graphics/kgraphviewer/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, kdelibs, automoc4, boost, pkgconfig, graphviz, gettext }:
+
+stdenv.mkDerivation rec {
+  name = "kgraphviewer-${version}";
+  version = "2.1.90";
+
+  src = fetchurl {
+    url = "mirror://kde/unstable/kgraphviewer/${version}/src/${name}.tar.xz";
+    sha256 = "13zhjs57xavzrj4nrlqs35n35ihvzij7hgbszf5fhlp2a4d4rrqs";
+  };
+
+  buildInputs = [ kdelibs automoc4 boost pkgconfig graphviz gettext ];
+
+  meta = with stdenv.lib; {
+    description = "A Graphviz dot graph viewer for KDE";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+}
+
diff --git a/pkgs/development/tools/analysis/massif-visualizer/default.nix b/pkgs/development/tools/analysis/massif-visualizer/default.nix
new file mode 100644
index 000000000000..e21f5ed15e9e
--- /dev/null
+++ b/pkgs/development/tools/analysis/massif-visualizer/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, kdelibs, kgraphviewer, gettext }:
+
+stdenv.mkDerivation rec {
+  name = "massif-visualizer-${version}";
+  version = "0.3.90";
+
+  src = fetchurl {
+    url = "mirror://kde/unstable/massif-visualizer/${version}/src/${name}.tar.xz";
+    sha256 = "9940fa90137ca5eef08b9ec220825fadbf03db423a670a2c7fe3edab271d9922";
+  };
+
+  buildInputs = [ kdelibs kgraphviewer gettext ];
+
+  meta = with stdenv.lib; {
+    description = "Tool that visualizes massif data generated by valgrind";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7833a2de1d16..c8ac81b3a5f9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10821,6 +10821,8 @@ let
 
       kdiff3 = callPackage ../tools/text/kdiff3 { };
 
+      kgraphviewer = callPackage ../applications/graphics/kgraphviewer { };
+
       kile = callPackage ../applications/editors/kile { };
 
       kmplayer = callPackage ../applications/video/kmplayer { };
@@ -10855,6 +10857,8 @@ let
 
       libnm-qt = callPackage ../development/libraries/libnm-qt { };
 
+      massif-visualizer = callPackage ../development/tools/analysis/massif-visualizer { }; 
+
       networkmanagement = callPackage ../tools/networking/networkmanagement { };
 
       partitionManager = callPackage ../tools/misc/partition-manager { };

From 46623bfc151449a24d34da8c8d7085910efe5918 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 3 Sep 2014 17:03:37 +0200
Subject: [PATCH 1219/1453] Remove copy-com.nix from the module list

This is proprietary software, and NixOS is intended as a free software
distribution. We currently don't have a mechanism like allowUnfree for
NixOS modules, so it's better to leave out modules for such
packages. Of couse, they can still be activated by doing:

  imports = [ <nixpkgs/nixos/services/networking/copy-com.nix ];
---
 nixos/modules/module-list.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 2d977e38a12f..b39fbcece592 100755
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -205,7 +205,6 @@
   ./services/networking/cjdns.nix
   ./services/networking/cntlm.nix
   ./services/networking/connman.nix
-  ./services/networking/copy-com.nix
   ./services/networking/ddclient.nix
   ./services/networking/dhcpcd.nix
   ./services/networking/dhcpd.nix

From 3e841ef642abaa806192e83c4cf96f67a758f296 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 3 Sep 2014 20:03:03 +0400
Subject: [PATCH 1220/1453] Fixing comment case

---
 nixos/modules/services/networking/dnsmasq.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/dnsmasq.nix b/nixos/modules/services/networking/dnsmasq.nix
index 31d57a648bfa..5c68dd89fb12 100644
--- a/nixos/modules/services/networking/dnsmasq.nix
+++ b/nixos/modules/services/networking/dnsmasq.nix
@@ -46,7 +46,7 @@ in
         default = [];
         example = [ "8.8.8.8" "8.8.4.4" ];
         description = ''
-          The dns servers which dnsmasq should query.
+          The DNS servers which dnsmasq should query.
         '';
       };
 

From e5194e5aea464e916cd77d4ce935e96f06e73aa0 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Wed, 3 Sep 2014 18:24:51 +0200
Subject: [PATCH 1221/1453] docker: fix docker not finding dockerinit

---
 pkgs/applications/virtualization/docker/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index f4d329221ff3..37550c2fe1fd 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -22,9 +22,9 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
-    install -Dm755 ./bundles/${version}/dynbinary/docker-${version} $out/bin/docker
-    install -Dm755 ./bundles/${version}/dynbinary/dockerinit-${version} $out/bin/dockerinit
-    wrapProgram $out/bin/docker --prefix PATH : "${iproute}/sbin:sbin:${lxc}/bin:${iptables}/sbin:${e2fsprogs}/sbin"
+    install -Dm755 ./bundles/${version}/dynbinary/docker-${version} $out/libexec/docker/docker
+    install -Dm755 ./bundles/${version}/dynbinary/dockerinit-${version} $out/libexec/docker/dockerinit
+    makeWrapper $out/libexec/docker/docker $out/bin/docker --prefix PATH : "${iproute}/sbin:sbin:${lxc}/bin:${iptables}/sbin:${e2fsprogs}/sbin"
 
     # systemd
     install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service

From 1b63a1b75e5d7e1f84c3d7222ca504f6394a3a8b Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 3 Sep 2014 09:26:44 -0700
Subject: [PATCH 1222/1453] nixos/iso-image: Fix grub-mkimage requiring a
 prefix

---
 nixos/modules/installer/cd-dvd/iso-image.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
index 623cfdedd269..22f31c460802 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -11,7 +11,7 @@ let
   # The Grub image.
   grubImage = pkgs.runCommand "grub_eltorito" {}
     ''
-      ${pkgs.grub2}/bin/grub-mkimage -O i386-pc -o tmp biosdisk iso9660 help linux linux16 chain png jpeg echo gfxmenu reboot
+      ${pkgs.grub2}/bin/grub-mkimage -p /boot/grub -O i386-pc -o tmp biosdisk iso9660 help linux linux16 chain png jpeg echo gfxmenu reboot
       cat ${pkgs.grub2}/lib/grub/*/cdboot.img tmp > $out
     ''; # */
 

From eee8fd89b34b40532f90ab6d87214130abfa0e02 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 3 Sep 2014 09:29:22 -0700
Subject: [PATCH 1223/1453] nixos/install-grub: Correct store path for search

---
 nixos/modules/system/boot/loader/grub/install-grub.pl | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index 668e74a9722e..2dad8b36db32 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -122,7 +122,7 @@ sub GrubFs {
                 # Based on the type pull in the identifier from the system
                 my ($status, @devInfo) = runCommand("blkid -o export @{[$fs->device]}");
                 if ($status != 0) {
-                    die "Failed to get blkid info for @{[$fs->device]}";
+                    die "Failed to get blkid info for @{[$fs->mount]} on @{[$fs->device]}";
                 }
                 my @matches = join("", @devInfo) =~ m/@{[uc $fsIdentifier]}=([^\n]*)/;
                 if ($#matches != 0) {
@@ -164,8 +164,7 @@ sub GrubFs {
     return Grub->new(path => $path, search => $search);
 }
 my $grubBoot = GrubFs("/boot");
-# FIXME: Should be /nix/store, but this fails in the installer
-my $grubStore = GrubFs("/nix");
+my $grubStore = GrubFs("/nix/store");
 
 # Generate the header.
 my $conf .= "# Automatically generated.  DO NOT EDIT THIS FILE!\n";
@@ -244,7 +243,7 @@ mkpath("/boot/kernels", 0, 0755) if $copyKernels;
 
 sub copyToKernelsDir {
     my ($path) = @_;
-    return $grubStore->path . substr($path, length("/nix")) unless $copyKernels;
+    return $grubStore->path . substr($path, length("/nix/store")) unless $copyKernels;
     $path =~ /\/nix\/store\/(.*)/ or die;
     my $name = $1; $name =~ s/\//-/g;
     my $dst = "/boot/kernels/$name";

From 00ad13428416ef2c46d058166ee76c965609065f Mon Sep 17 00:00:00 2001
From: Nathan Bijnens <nathan@nathan.gs>
Date: Tue, 26 Aug 2014 20:56:54 +0200
Subject: [PATCH 1224/1453] Mesos: services

---
 nixos/modules/module-list.nix                |   2 +
 nixos/modules/services/misc/mesos-master.nix | 103 +++++++++++++++++++
 nixos/modules/services/misc/mesos-slave.nix  |  93 +++++++++++++++++
 3 files changed, 198 insertions(+)
 create mode 100644 nixos/modules/services/misc/mesos-master.nix
 create mode 100644 nixos/modules/services/misc/mesos-slave.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index b39fbcece592..61a98ca12ffb 100755
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -161,6 +161,8 @@
   ./services/misc/folding-at-home.nix
   ./services/misc/gitolite.nix
   ./services/misc/gpsd.nix
+  ./services/misc/mesos-master.nix
+  ./services/misc/mesos-slave.nix
   ./services/misc/nix-daemon.nix
   ./services/misc/nix-gc.nix
   ./services/misc/nixos-manual.nix
diff --git a/nixos/modules/services/misc/mesos-master.nix b/nixos/modules/services/misc/mesos-master.nix
new file mode 100644
index 000000000000..bdf88d427c5d
--- /dev/null
+++ b/nixos/modules/services/misc/mesos-master.nix
@@ -0,0 +1,103 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.mesos.master;
+  
+in {
+
+  options.services.mesos = {
+    
+    master = {
+      enable = mkOption {
+        description = "Whether to enable the Mesos Master.";
+        default = false;
+        type = types.uniq types.bool;
+      };
+
+      port = mkOption {
+        description = "Mesos Master port";
+        default = 5050;
+        type = types.int;
+      };
+
+      zk = mkOption {
+        description = ''
+          ZooKeeper URL (used for leader election amongst masters).
+          May be one of:
+            zk://host1:port1,host2:port2,.../mesos
+            zk://username:password@host1:port1,host2:port2,.../mesos
+        '';
+        type = types.str;
+      };
+      
+      workDir = mkOption {
+        description = "The Mesos work directory.";
+        default = "/var/lib/mesos/master";
+        type = types.str;
+      };
+      
+      extraCmdLineOptions = mkOption {
+        description = ''
+	  Extra command line options for Mesos Master.
+	  
+	  See https://mesos.apache.org/documentation/latest/configuration/
+	'';
+        default = [ "" ];
+        type = types.listOf types.string;
+        example = [ "--credentials=VALUE" ];
+      };
+      
+      quorum = mkOption {
+        description = ''
+          The size of the quorum of replicas when using 'replicated_log' based
+          registry. It is imperative to set this value to be a majority of
+          masters i.e., quorum > (number of masters)/2.
+          
+          If 0 will fall back to --registry=in_memory.
+        '';
+        default = 0;
+        type = types.int;
+      };
+      
+      logLevel = mkOption {
+        description = ''
+          The logging level used. Possible values:
+            'INFO', 'WARNING', 'ERROR'
+        '';
+        default = "INFO";
+        type = types.str;
+      };
+
+    };
+
+
+  };
+
+
+  config = mkIf cfg.enable {
+    systemd.services.mesos-master = {
+      description = "Mesos Master";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network-interfaces.target" ];
+      serviceConfig = {
+	ExecStart = ''
+	  ${pkgs.mesos}/bin/mesos-master \
+	    --port=${toString cfg.port} \
+	    --zk=${cfg.zk} \
+	    ${if cfg.quorum == 0 then "--registry=in_memory" else "--registry=replicated_log --quorum=${cfg.quorum}"} \
+	    --work_dir=${cfg.workDir} \
+	    --logging_level=${cfg.logLevel} \
+	    ${toString cfg.extraCmdLineOptions}
+	'';
+	PermissionsStartOnly = true;
+      };
+      preStart = ''
+	mkdir -m 0700 -p ${cfg.workDir}
+      '';
+    };
+  };
+  
+}
+
diff --git a/nixos/modules/services/misc/mesos-slave.nix b/nixos/modules/services/misc/mesos-slave.nix
new file mode 100644
index 000000000000..e9a898167161
--- /dev/null
+++ b/nixos/modules/services/misc/mesos-slave.nix
@@ -0,0 +1,93 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.mesos.slave;
+  
+in {
+
+  options.services.mesos = {
+    slave = {
+      enable = mkOption {
+        description = "Whether to enable the Mesos Slave.";
+        default = false;
+        type = types.uniq types.bool;
+      };
+
+      port = mkOption {
+        description = "Mesos Slave port";
+        default = 5051;
+        type = types.int;
+      };
+
+      master = mkOption {
+        description = ''
+          May be one of:
+            zk://host1:port1,host2:port2,.../path
+            zk://username:password@host1:port1,host2:port2,.../path
+        '';
+        type = types.str;
+      };
+      
+      withHadoop = mkOption {
+	description = "Add the HADOOP_HOME to the slave.";
+	default = false;
+	type = types.bool;
+      };
+      
+      workDir = mkOption {
+        description = "The Mesos work directory.";
+        default = "/var/lib/mesos/slave";
+        type = types.str;
+      };
+      
+      extraCmdLineOptions = mkOption {
+        description = ''
+	  Extra command line options for Mesos Slave.
+	  
+	  See https://mesos.apache.org/documentation/latest/configuration/
+	'';
+        default = [ "" ];
+        type = types.listOf types.string;
+        example = [ "--gc_delay=3days" ];
+      };
+      
+      logLevel = mkOption {
+        description = ''
+          The logging level used. Possible values:
+            'INFO', 'WARNING', 'ERROR'
+        '';
+        default = "INFO";
+        type = types.str;
+      };
+
+    };
+
+  };
+
+
+  config = mkIf cfg.enable {
+    systemd.services.mesos-slave = {
+      description = "Mesos Slave";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network-interfaces.target" ];
+      serviceConfig = {
+	ExecStart = ''
+	  ${pkgs.mesos}/bin/mesos-slave \
+	    --port=${toString cfg.port} \
+	    --master=${cfg.master} \
+	    ${optionalString cfg.withHadoop "--hadoop-home=${pkgs.hadoop}"} \
+	    --work_dir=${cfg.workDir} \
+	    --logging_level=${cfg.logLevel} \
+	    ${toString cfg.extraCmdLineOptions}
+	'';
+	PermissionsStartOnly = true;
+      };
+      preStart = ''
+	mkdir -m 0700 -p ${cfg.workDir}
+      '';
+    };
+  };
+  
+}
\ No newline at end of file

From 46cdc2e017fed885a453abd36b289b767e943759 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 3 Sep 2014 21:48:15 +0400
Subject: [PATCH 1225/1453] Allow git checkouts to have custom name

---
 pkgs/build-support/fetchgit/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix
index a17daf9a2c57..c52a26b7165d 100644
--- a/pkgs/build-support/fetchgit/default.nix
+++ b/pkgs/build-support/fetchgit/default.nix
@@ -1,5 +1,7 @@
 {stdenv, git, cacert}:
-{url, rev ? "HEAD", md5 ? "", sha256 ? "", leaveDotGit ? false, fetchSubmodules ? true}:
+{url, rev ? "HEAD", md5 ? "", sha256 ? "", leaveDotGit ? false, fetchSubmodules ? true
+, name ? "git-export"
+}:
 
 /* NOTE:
    fetchgit has one problem: git fetch only works for refs.
@@ -26,7 +28,7 @@
 assert md5 != "" || sha256 != "";
 
 stdenv.mkDerivation {
-  name = "git-export";
+  inherit name;
   builder = ./builder.sh;
   fetcher = ./nix-prefetch-git;
   buildInputs = [git];

From b37af08c3d60a17f19a1799033150fad7109601e Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 3 Sep 2014 21:54:15 +0400
Subject: [PATCH 1226/1453] Update mdbtools-git to latest

---
 pkgs/tools/misc/mdbtools/git.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/mdbtools/git.nix b/pkgs/tools/misc/mdbtools/git.nix
index 2805514965ea..b97af331093b 100644
--- a/pkgs/tools/misc/mdbtools/git.nix
+++ b/pkgs/tools/misc/mdbtools/git.nix
@@ -3,12 +3,13 @@
   scrollkeeper}:
 
 stdenv.mkDerivation {
-  name = "mdbtools-git";
+  name = "mdbtools-git-2014-07-25";
 
   src = fetchgit {
     url = "http://github.com/brianb/mdbtools.git";
-    rev = "dfd752ec022097ee1e0999173aa604d8a0c0ca8b";
-    sha256 = "0ibj36yxlhwjgi7cj170lwpbzdbgidkq5p8raa59v76bdrxwmb0n";
+    rev = "9ab40e83e6789015c965c92bdb62f92f8cdd0dbd";
+    sha256 = "18j1a9y9xhl7hhx30zvmx2n4w7dc8c7sdr6722sf3mh5230mvv59";
+    name = "mdbtools-git-export";
   };
 
   buildInputs = [glib readline bison flex pkgconfig libiconv autoconf automake

From 71086542eee808093db5bc7be5c45a6c46a4409f Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 3 Sep 2014 22:49:09 +0400
Subject: [PATCH 1227/1453] Fix radre for now by not using libewf and update it
 to latest

---
 pkgs/development/tools/analysis/radare/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/analysis/radare/default.nix b/pkgs/development/tools/analysis/radare/default.nix
index 2ab8c05ebf85..3c83f0e9d495 100644
--- a/pkgs/development/tools/analysis/radare/default.nix
+++ b/pkgs/development/tools/analysis/radare/default.nix
@@ -12,15 +12,15 @@ let
   optional = stdenv.lib.optional;
 in
 stdenv.mkDerivation rec {
-  name = "radare-1.5";
+  name = "radare-1.5.2";
 
   src = fetchurl {
     url = "http://radare.org/get/${name}.tar.gz";
-    sha256 = "1r0c9cc7z9likma8zicp2pbv2y85vjjmnk0k45wdhbvhgqh6il1h";
+    sha256 = "1qdrmcnzfvfvqb27c7pknwm8jl2hqa6c4l66wzyddwlb8yjm46hd";
   };
 
 
-  buildInputs = [pkgconfig readline libusb libewf perl]
+  buildInputs = [pkgconfig readline libusb perl]
     ++ optional useX11 [gtkdialog vte gtk]
     ++ optional rubyBindings [ruby]
     ++ optional pythonBindings [python]

From 068d1696df9944fcae50cc333dfff7a8f26a4e1b Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 3 Sep 2014 23:01:39 +0400
Subject: [PATCH 1228/1453] Add radare2

---
 .../tools/analysis/radare2/default.nix        | 39 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  9 +++++
 2 files changed, 48 insertions(+)
 create mode 100644 pkgs/development/tools/analysis/radare2/default.nix

diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix
new file mode 100644
index 000000000000..7e199c29aed9
--- /dev/null
+++ b/pkgs/development/tools/analysis/radare2/default.nix
@@ -0,0 +1,39 @@
+{stdenv, fetchurl, pkgconfig, libusb, readline, libewf, perl, zlib, openssl,
+gtk ? null, vte ? null, gtkdialog ? null,
+python ? null,
+ruby ? null,
+lua ? null,
+useX11, rubyBindings, pythonBindings, luaBindings}:
+
+assert useX11 -> (gtk != null && vte != null && gtkdialog != null);
+assert rubyBindings -> ruby != null;
+assert pythonBindings -> python != null;
+
+let 
+  optional = stdenv.lib.optional;
+in
+stdenv.mkDerivation rec {
+  version = "0.9.7";
+  name = "radare2-${version}";
+
+  src = fetchurl {
+    url = "http://radare.org/get/${name}.tar.xz";
+    sha256 = "01sdsnbvx1qzyradj03sg24rk2bi9x58m40r0aqj8skv92c87s7l";
+  };
+
+
+  buildInputs = [pkgconfig readline libusb libewf perl zlib openssl]
+    ++ optional useX11 [gtkdialog vte gtk]
+    ++ optional rubyBindings [ruby]
+    ++ optional pythonBindings [python]
+    ++ optional luaBindings [lua];
+
+  meta = {
+    description = "Free advanced command line hexadecimal editor";
+    homepage = http://radare.org/;
+    license = stdenv.lib.licenses.gpl2Plus;
+    maintainers = with stdenv.lib.maintainers; [raskin];
+    platforms = with stdenv.lib.platforms; linux;
+    inherit version;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e27c19dd0e44..6561ef69d9ea 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4242,6 +4242,15 @@ let
     rubyBindings = config.radare.rubyBindings or false;
     luaBindings = config.radare.luaBindings or false;
   };
+  radare2 = callPackage ../development/tools/analysis/radare2 {
+    inherit (gnome) vte;
+    lua = lua5;
+    useX11 = config.radare.useX11 or false;
+    pythonBindings = config.radare.pythonBindings or false;
+    rubyBindings = config.radare.rubyBindings or false;
+    luaBindings = config.radare.luaBindings or false;
+  };
+
 
   ragel = callPackage ../development/tools/parsing/ragel { };
 

From 9a30ea90f0a9ffd56b75134a2fe5f0e95530eae5 Mon Sep 17 00:00:00 2001
From: William Roe <willroe@gmail.com>
Date: Wed, 3 Sep 2014 20:14:57 +0100
Subject: [PATCH 1229/1453] Elixir and rebar aren't Linux-specific tools

Widen platform support to all unix
---
 pkgs/development/interpreters/elixir/default.nix        | 2 +-
 pkgs/development/tools/build-managers/rebar/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix
index 59629eb2f59c..0e4b5a6d9b63 100644
--- a/pkgs/development/interpreters/elixir/default.nix
+++ b/pkgs/development/interpreters/elixir/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation {
     '';
 
     license = licenses.epl10;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = [ maintainers.the-kenny ];
   };
 }
diff --git a/pkgs/development/tools/build-managers/rebar/default.nix b/pkgs/development/tools/build-managers/rebar/default.nix
index d10d9d6d1a3a..d62ae35b8549 100644
--- a/pkgs/development/tools/build-managers/rebar/default.nix
+++ b/pkgs/development/tools/build-managers/rebar/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
       variety of locations (git, hg, etc).
       '';
 
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.the-kenny ];
   };
 }

From 43d9f92c82826446619a988b690f9314672b7945 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Wed, 3 Sep 2014 21:22:20 +0200
Subject: [PATCH 1230/1453] nixos: docker, create docker group

---
 nixos/modules/virtualisation/docker.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix
index a0aa61353269..1ce066cdc73d 100644
--- a/nixos/modules/virtualisation/docker.nix
+++ b/nixos/modules/virtualisation/docker.nix
@@ -59,6 +59,7 @@ in
 
   config = mkIf cfg.enable (mkMerge [
     { environment.systemPackages = [ pkgs.docker ];
+      users.extraGroups.docker.gid = config.ids.gids.docker;
     }
     (mkIf cfg.socketActivation {
 

From b8a88ce472dbd40e2c4e8f53698dc1b00d7cb809 Mon Sep 17 00:00:00 2001
From: Paul Koerbitz <paul.koerbitz@theppro.com>
Date: Wed, 3 Sep 2014 21:30:31 +0200
Subject: [PATCH 1231/1453] Update oraclejdk-7 patch version from 65 to 67

---
 pkgs/development/compilers/oraclejdk/jdk7-linux.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/oraclejdk/jdk7-linux.nix b/pkgs/development/compilers/oraclejdk/jdk7-linux.nix
index 55e8ad45085f..cf4990c33b5f 100644
--- a/pkgs/development/compilers/oraclejdk/jdk7-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk7-linux.nix
@@ -1,9 +1,9 @@
 import ./jdk-linux-base.nix {
   productVersion = "7";
-  patchVersion = "65";
+  patchVersion = "67";
   downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html;
-  sha256_i686 = "e3032c561deb237c033b485a358cc429ec83b621303bc6b31768855778a9eaa0";
-  sha256_x86_64 = "33fac9630ca8c2d374247abc5c010ac8d2875a3384968aa3e74448361808e4b7";
+  sha256_i686 = "0p58pag1x85r911lxhmr4blk687ivjqigflx175vp7rcmmj108xn";
+  sha256_x86_64 = "0db36jg08qy8712qy6lgyifdqlqb468rrnjm3aa6937ixl9ixpal";
   jceName = "UnlimitedJCEPolicyJDK7.zip";
   jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html;
   sha256JCE = "7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d";

From f50c5602e9c0519c9fe4cd0ea34696028332f99b Mon Sep 17 00:00:00 2001
From: Andreas Herrmann <andreash87@gmx.ch>
Date: Wed, 3 Sep 2014 21:31:00 +0200
Subject: [PATCH 1232/1453] mpi4py: Adhere to package description convention

---
 pkgs/development/python-modules/mpi4py/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix
index 6c487dc07ad0..4422c4e9f37a 100644
--- a/pkgs/development/python-modules/mpi4py/default.nix
+++ b/pkgs/development/python-modules/mpi4py/default.nix
@@ -46,9 +46,8 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ openssh ];
 
   meta = {
-    description = "
-      Provides Python bindings for the Message Passing Interface standard.
-    ";
+    description =
+      "Provides Python bindings for the Message Passing Interface standard";
     homepage = "http://code.google.com/p/mpi4py/";
     license = stdenv.lib.licenses.bsd3;
   };

From 9ac9a06f13a1126c16df95f4f727eee5ea51396e Mon Sep 17 00:00:00 2001
From: Andreas Herrmann <andreash87@gmx.ch>
Date: Wed, 3 Sep 2014 21:31:13 +0200
Subject: [PATCH 1233/1453] h5py: Adhere to package description convention

---
 pkgs/development/python-modules/h5py/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix
index 9ab68ac4cd2b..f4df05fa595c 100644
--- a/pkgs/development/python-modules/h5py/default.nix
+++ b/pkgs/development/python-modules/h5py/default.nix
@@ -34,9 +34,8 @@ buildPythonPackage rec {
     ;
 
   meta = {
-    description = "
-      The h5py package is a Pythonic interface to the HDF5 binary data format.
-    ";
+    description =
+      "Provides a Pythonic interface to the HDF5 binary data format";
     homepage = "http://www.h5py.org/";
     license = stdenv.lib.licenses.bsd2;
   };

From ebbd54e9f0aa8d77ba0f72eac0b032dd4fd4f60a Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 3 Sep 2014 21:59:29 +0200
Subject: [PATCH 1234/1453] ocaml-javalib, ocaml-sawja: uses patchShebangs
 rather than ad-hoc patches

---
 pkgs/development/ocaml-modules/javalib/configure.sh.patch | 6 ------
 pkgs/development/ocaml-modules/javalib/default.nix        | 2 ++
 pkgs/development/ocaml-modules/sawja/configure.sh.patch   | 6 ------
 pkgs/development/ocaml-modules/sawja/default.nix          | 2 ++
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/ocaml-modules/javalib/configure.sh.patch b/pkgs/development/ocaml-modules/javalib/configure.sh.patch
index 77a2a5ba4ae5..67e019b277af 100644
--- a/pkgs/development/ocaml-modules/javalib/configure.sh.patch
+++ b/pkgs/development/ocaml-modules/javalib/configure.sh.patch
@@ -1,11 +1,5 @@
 --- javalib-2.3-orig/configure.sh	2013-10-30 08:35:30.000000000 +0100
 +++ javalib-2.3/configure.sh	2014-07-06 17:28:39.025066199 +0200
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
-
- ###
- ### A configuration script for Javalib
 @@ -44,7 +44,7 @@
  DESTDIR=
  # The ocamlpath variable for the compiler to locate the locally-installed
diff --git a/pkgs/development/ocaml-modules/javalib/default.nix b/pkgs/development/ocaml-modules/javalib/default.nix
index 2fa72dcf07f1..365fcc677cc9 100644
--- a/pkgs/development/ocaml-modules/javalib/default.nix
+++ b/pkgs/development/ocaml-modules/javalib/default.nix
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
 
   createFindlibDestdir = true;
 
+  preConfigure = "patchShebangs ./configure.sh";
+
   configureScript = "./configure.sh";
   dontAddPrefix = "true";
 
diff --git a/pkgs/development/ocaml-modules/sawja/configure.sh.patch b/pkgs/development/ocaml-modules/sawja/configure.sh.patch
index e01df32bbded..8165de242f57 100644
--- a/pkgs/development/ocaml-modules/sawja/configure.sh.patch
+++ b/pkgs/development/ocaml-modules/sawja/configure.sh.patch
@@ -1,11 +1,5 @@
 --- sawja-1.5-orig/configure.sh	2013-10-30 08:35:29.000000000 +0100
 +++ sawja-1.5/configure.sh	2014-07-05 18:50:26.833798254 +0200
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
-
- ###
- ### A configuration script for Sawja
 @@ -39,7 +39,7 @@
  DESTDIR=
  # The ocamlpath variable for the compiler to locate the locally-installed
diff --git a/pkgs/development/ocaml-modules/sawja/default.nix b/pkgs/development/ocaml-modules/sawja/default.nix
index bed87a50f81d..ef3ab9a46b93 100644
--- a/pkgs/development/ocaml-modules/sawja/default.nix
+++ b/pkgs/development/ocaml-modules/sawja/default.nix
@@ -19,6 +19,8 @@ stdenv.mkDerivation rec {
 
   createFindlibDestdir = true;
 
+  preConfigure = "patchShebangs ./configure.sh";
+
   configureScript = "./configure.sh";
   dontAddPrefix = "true";
 

From 2e97c06999db2a5dd56b3e105d8f57ad2013ff51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 3 Sep 2014 22:06:54 +0200
Subject: [PATCH 1235/1453] nixos-option: enable all flags by default and make
 output a bit readable cc @nbp

---
 nixos/doc/manual/man-nixos-option.xml         | 66 +++--------------
 nixos/modules/installer/tools/nixos-option.sh | 74 +++++++------------
 2 files changed, 36 insertions(+), 104 deletions(-)

diff --git a/nixos/doc/manual/man-nixos-option.xml b/nixos/doc/manual/man-nixos-option.xml
index 7952847d4db5..554b29691805 100644
--- a/nixos/doc/manual/man-nixos-option.xml
+++ b/nixos/doc/manual/man-nixos-option.xml
@@ -17,11 +17,6 @@
 <refsynopsisdiv>
   <cmdsynopsis>
     <command>nixos-option</command>
-    <group choice="opt">
-      <option>-v</option>
-      <option>-d</option>
-      <option>-l</option>
-    </group>
     <arg choice='plain'><replaceable>option.name</replaceable></arg>
   </cmdsynopsis>
 </refsynopsisdiv>
@@ -31,50 +26,13 @@
 
 <para>This command evaluates the configuration specified in
 <filename>/etc/nixos/configuration.nix</filename> and returns the properties
-of the option name given as argument.  By default, it returns the value of
-the option.</para>
+of the option name given as argument.</para>
 
 <para>When the option name is not an option, the command prints the list of
 attributes contained in the attribute set.</para>
 
 </refsection>
 
-<refsection><title>Options</title>
-
-<para>This command accepts the following options:</para>
-
-<variablelist>
-
-  <varlistentry>
-    <term><option>--value</option>, <option>-v</option></term>
-    <listitem>
-      <para>Returns the value of the option.  This is the default operation
-      if no other options are defined.</para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><option>--description</option>, <option>-d</option></term>
-    <listitem>
-      <para>Return the default value, the example and the description of the
-      option when available.</para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><option>--lookup</option>, <option>-l</option></term>
-    <listitem>
-      <para>Return the locations where the option is declared and where it
-      is defined.  This is extremely useful to find sources of errors in
-      your configuration.</para>
-    </listitem>
-  </varlistentry>
-
-</variablelist>
-
-</refsection>
-
-
 <refsection><title>Environment</title>
 
 <variablelist>
@@ -103,27 +61,21 @@ grub
 initScript
 
 $ nixos-option boot.loader.grub.enable
-true</screen></para>
+Value:
+true
 
-<para>Prints option information:
+Default: 
+true
 
-<screen>$ nixos-option -d networking.hostName
-Default: "nixos"
 Description:
-The name of the machine. Leave it empty if you want to obtain
-it from a DHCP server (if using DHCP).</screen></para>
+Whether to enable the GNU GRUB boot loader.
 
-<para>Find the locations which are declaring and defining an option:
-
-<screen>$ nixos-option -l hardware.firmware
 Declared by:
-  /mnt/data/nix-sources/nixos/modules/services/hardware/udev.nix
+  "/path/to/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix"
 
 Defined by:
-  /path/to/nixpkgs/nixos/modules/system/boot/kernel.nix
-  /path/to/nixpkgs/nixos/modules/hardware/network/rt73.nix
-  /path/to/nixpkgs/nixos/modules/hardware/network/intel-3945abg.nix
-  /path/to/nixpkgs/nixos/modules/hardware/network/intel-2200bg.nix</screen></para>
+  "/nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix"
+</screen></para>
 
 </refsection>
 
diff --git a/nixos/modules/installer/tools/nixos-option.sh b/nixos/modules/installer/tools/nixos-option.sh
index edc94d732084..d995787c76fe 100644
--- a/nixos/modules/installer/tools/nixos-option.sh
+++ b/nixos/modules/installer/tools/nixos-option.sh
@@ -11,9 +11,6 @@ usage () {
 # Process Arguments #
 #####################
 
-desc=false
-defs=false
-value=false
 xml=false
 verbose=false
 
@@ -24,14 +21,11 @@ for arg; do
   if test -z "$argfun"; then
     case $arg in
       -*)
-        longarg=""
         sarg="$arg"
+        longarg=""
         while test "$sarg" != "-"; do
           case $sarg in
             --*) longarg=$arg; sarg="--";;
-            -d*) longarg="$longarg --description";;
-            -v*) longarg="$longarg --value";;
-            -l*) longarg="$longarg --lookup";;
             -*) usage;;
           esac
           # remove the first letter option
@@ -42,9 +36,6 @@ for arg; do
     esac
     for larg in $longarg; do
       case $larg in
-        --description) desc=true;;
-        --value) value=true;;
-        --lookup) defs=true;;
         --xml) xml=true;;
         --verbose) verbose=true;;
         --help) usage;;
@@ -67,16 +58,6 @@ for arg; do
   fi
 done
 
-if $xml; then
-  value=true
-  desc=true
-  defs=true
-fi
-
-if ! $defs && ! $desc; then
-  value=true
-fi
-
 if $verbose; then
   set -x
 else
@@ -95,8 +76,7 @@ evalAttr(){
   local prefix="$1"
   local strict="$2"
   local suffix="$3"
-  echo "(import <nixos> {}).$prefix${option:+.$option}${suffix:+.$suffix}" |
-    evalNix ${strict:+--strict}
+  echo "(import <nixos> {}).$prefix${option:+.$option}${suffix:+.$suffix}" | evalNix ${strict:+--strict}
 }
 
 evalOpt(){
@@ -189,35 +169,35 @@ EOF
 fi
 
 if test "$(evalOpt "_type" 2> /dev/null)" = '"option"'; then
-  $value && evalCfg 1
+  echo "Value:"
+  evalCfg 1
 
-  if $desc; then
-    $value && echo;
+  echo
 
-    if default=$(evalOpt "default" - 2> /dev/null); then
-      echo "Default: $default"
-    else
-      echo "Default: <None>"
-    fi
-    if example=$(evalOpt "example" - 2> /dev/null); then
-      echo "Example: $example"
-    fi
-    echo "Description:"
-    eval printf $(evalOpt "description")
+  echo "Default:"
+  if default=$(evalOpt "default" - 2> /dev/null); then
+    echo "$default"
+  else
+    echo "<None>"
   fi
-
-  if $defs; then
-    $desc || $value && echo;
-
-    printPath () { echo "  $1"; }
-
-    echo "Declared by:"
-    nixMap printPath "$(findSources "declarations")"
-    echo ""
-    echo "Defined by:"
-    nixMap printPath "$(findSources "files")"
-    echo ""
+  echo
+  if example=$(evalOpt "example" - 2> /dev/null); then
+    echo "Example: $example"
   fi
+  echo "Description:"
+  echo
+  eval printf $(evalOpt "description")
+
+  echo $desc;
+
+  printPath () { echo "  $1"; }
+
+  echo "Declared by:"
+  nixMap printPath "$(findSources "declarations")"
+  echo
+  echo "Defined by:"
+  nixMap printPath "$(findSources "files")"
+  echo
 
 else
   # echo 1>&2 "Warning: This value is not an option."

From 1568dcd4dcbb02759c1320f863c6b1a979ceee90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 3 Sep 2014 22:31:26 +0200
Subject: [PATCH 1236/1453] move ike to applications/networking folder

---
 pkgs/applications/{ => networking}/ike/default.nix | 0
 pkgs/top-level/all-packages.nix                    | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/applications/{ => networking}/ike/default.nix (100%)

diff --git a/pkgs/applications/ike/default.nix b/pkgs/applications/networking/ike/default.nix
similarity index 100%
rename from pkgs/applications/ike/default.nix
rename to pkgs/applications/networking/ike/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6561ef69d9ea..81d46566877f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9114,7 +9114,7 @@ let
 
   ii = callPackage ../applications/networking/irc/ii { };
 
-  ike = callPackage ../applications/ike { };
+  ike = callPackage ../applications/networking/ike { };
 
   ikiwiki = callPackage ../applications/misc/ikiwiki {
     inherit (perlPackages) TextMarkdown URI HTMLParser HTMLScrubber

From 0dbdc857d75d9dc82dc3d7a37014ef0ae484b0ec Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 3 Sep 2014 22:19:38 +0200
Subject: [PATCH 1237/1453] nspr: Update to 4.10.7

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

diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix
index 0355ce25c62c..01967718c403 100644
--- a/pkgs/development/libraries/nspr/default.nix
+++ b/pkgs/development/libraries/nspr/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl }:
 
-let version = "4.10.6"; in
+let version = "4.10.7"; in
 
 stdenv.mkDerivation {
   name = "nspr-${version}";
 
   src = fetchurl {
     url = "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
-    sha1 = "3hzcslcfql1rg7drvcn4nmrigy7jfgwz";
+    sha256 = "389af5cfa863ea9bc6de7b30c15f8a4f9bddd8002f8c6fdc8b33caef43893938";
   };
 
   preConfigure = "cd nspr";

From b3b06af89a0179e023c69808fd00b36b57d27316 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 3 Sep 2014 22:48:52 +0200
Subject: [PATCH 1238/1453] nss: Update to 3.16.4

---
 pkgs/development/libraries/nss/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index 447030f5fccf..38eb4a93f245 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -11,11 +11,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "nss-${version}";
-  version = "3.16.3";
+  version = "3.16.4";
 
   src = fetchurl {
-    url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_16_3_RTM/src/${name}.tar.gz";
-    sha256 = "657711ff7a4058043b69019a66f44101d0234eae2b6b80ab900439dbf02add60";
+    url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_16_4_RTM/src/${name}.tar.gz";
+    sha256 = "adcd1e655fd9508e7f13847452fd5887a835eff882e3f0d3c42dfcd651650b77";
   };
 
   buildInputs = [ nspr perl zlib sqlite ];

From 88964f37a0f024b71326c3b0c99a2beccabe41d1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 3 Sep 2014 22:48:58 +0200
Subject: [PATCH 1239/1453] firefox: Update to 32.0

---
 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 e23a6d94ec1a..4f4a88f01c80 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -15,14 +15,14 @@
 
 assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
 
-let version = "31.0"; in
+let version = "32.0"; in
 
 stdenv.mkDerivation rec {
   name = "firefox-${version}";
 
   src = fetchurl {
     url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2";
-    sha1 = "a6c3e25ee3aeb7da42db2aaeb50a385d63532beb";
+    sha1 = "5cb7644af9741ebcdb3a21b777362913908c8f41";
   };
 
   buildInputs =

From 59ad713288134ba5441edfa941792a6652a1e5c2 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Wed, 3 Sep 2014 23:10:40 +0200
Subject: [PATCH 1240/1453] nixos-install: set umask 0022

---
 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 86952486ade0..c633cf4a839e 100644
--- a/nixos/modules/installer/tools/nixos-install.sh
+++ b/nixos/modules/installer/tools/nixos-install.sh
@@ -7,6 +7,9 @@
 #   * nix-env -p /nix/var/nix/profiles/system -i <nix-expr for the configuration>
 #   * install the boot loader
 
+# Ensure a consistent umask.
+umask 0022
+
 # Re-exec ourselves in a private mount namespace so that our bind
 # mounts get cleaned up automatically.
 if [ "$(id -u)" = 0 ]; then

From a1ded5c20e42c463686aa39ed8f0a3e7de8858d9 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Wed, 3 Sep 2014 23:11:37 +0200
Subject: [PATCH 1241/1453] nixos-install: use absolute path when running
 passwd in chroot

---
 nixos/modules/installer/tools/nixos-install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh
index c633cf4a839e..bd334c2a3cb4 100644
--- a/nixos/modules/installer/tools/nixos-install.sh
+++ b/nixos/modules/installer/tools/nixos-install.sh
@@ -246,7 +246,7 @@ chroot $mountPoint /nix/var/nix/profiles/system/activate
 # Ask the user to set a root password.
 if [ -t 0 ] ; then
     echo "setting root password..."
-    chroot $mountPoint passwd
+    chroot $mountPoint /var/setuid-wrappers/passwd
 fi
 
 

From e510a2769699342251704a7c4da09cfc933af90b Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 3 Sep 2014 23:57:34 +0200
Subject: [PATCH 1242/1453] bsd-games: fixed path to dictionary due to the
 update of miscfiles, see 4cf191a42530cce961b445b40243c3deb9fc4a7c

---
 pkgs/games/bsdgames/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/bsdgames/default.nix b/pkgs/games/bsdgames/default.nix
index 59423d7a5a66..882f5f3cde6b 100644
--- a/pkgs/games/bsdgames/default.nix
+++ b/pkgs/games/bsdgames/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
     bsd_games_cfg_varlibdir=.
     bsd_games_cfg_non_interactive=y
     bsd_games_cfg_no_build_dirs="dab hack phantasia sail"
-    bsd_games_cfg_dictionary_src=${miscfiles}/share/dict/words
+    bsd_games_cfg_dictionary_src=${miscfiles}/share/web2
     bsd_games_cfg_pager=${less}
     EOF
 

From 98778c4c2779d9e3c52003358a1978eb0bf0b2aa Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Thu, 4 Sep 2014 01:30:04 +0200
Subject: [PATCH 1243/1453] Add JohnTheRipper, a fast password cracker

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

diff --git a/pkgs/tools/security/john/default.nix b/pkgs/tools/security/john/default.nix
new file mode 100644
index 000000000000..97f67dfbd71f
--- /dev/null
+++ b/pkgs/tools/security/john/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchgit, openssl, nss, nspr, krb5, gmp, zlib, libpcap, re2 }:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  name = "JohnTheRipper-${version}";
+  version = "8a3e3c1d";
+  buildInputs = [ openssl nss nspr krb5 gmp zlib libpcap re2 ];
+  preConfigure = ''cd src'';
+  installPhase = ''
+    ensureDir $out/share/john/
+    ensureDir $out/bin
+    cp -R ../run/* $out/share/john
+    ln -s $out/share/john/john $out/bin/john
+  '';
+  src = fetchgit {
+    url = https://github.com/magnumripper/JohnTheRipper.git;
+    rev = "93f061bc41652c94ae049b52572aac709d18aa4c";
+    sha256 = "1rnfi09830n34jcqaxmsam54p4zsq9a49ic2ljh44lahcipympvy";
+  };
+  meta = {
+    description = "John the Ripper password cracker";
+    license = licenses.gpl2;
+    homepage = https://github.com/magnumripper/JohnTheRipper/;
+    maintainers = with maintainers; [offline];
+    platforms = with platforms; unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4fe7a5cd3556..e30d149c95e4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1394,6 +1394,8 @@ let
 
   jnettop = callPackage ../tools/networking/jnettop { };
 
+  john = callPackage ../tools/security/john { };
+
   jq = callPackage ../development/tools/jq {};
 
   jscoverage = callPackage ../development/tools/misc/jscoverage { };

From 0c398f60405090743fbdcf14faf1193c642b6328 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Thu, 4 Sep 2014 01:30:59 +0200
Subject: [PATCH 1244/1453] docker: add xz to PATH, make importing from
 archives work

---
 pkgs/applications/virtualization/docker/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 37550c2fe1fd..dafc093bf05a 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, makeWrapper, go, lxc, sqlite, iproute, bridge_utils, devicemapper,
-btrfsProgs, iptables, bash, e2fsprogs}:
+btrfsProgs, iptables, bash, e2fsprogs, xz}:
 
 stdenv.mkDerivation rec {
   name = "docker-${version}";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     install -Dm755 ./bundles/${version}/dynbinary/docker-${version} $out/libexec/docker/docker
     install -Dm755 ./bundles/${version}/dynbinary/dockerinit-${version} $out/libexec/docker/dockerinit
-    makeWrapper $out/libexec/docker/docker $out/bin/docker --prefix PATH : "${iproute}/sbin:sbin:${lxc}/bin:${iptables}/sbin:${e2fsprogs}/sbin"
+    makeWrapper $out/libexec/docker/docker $out/bin/docker --prefix PATH : "${iproute}/sbin:sbin:${lxc}/bin:${iptables}/sbin:${e2fsprogs}/sbin:${xz}/bin"
 
     # systemd
     install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service

From 2de0cf2549e79427fd23f0ce2f2b0021247ba07e Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 3 Sep 2014 18:40:05 -0700
Subject: [PATCH 1245/1453] nixos/utils: Don't remove first character if not a
 /

---
 nixos/lib/utils.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/lib/utils.nix b/nixos/lib/utils.nix
index 35c56e8c32bb..7b8be2050c13 100644
--- a/nixos/lib/utils.nix
+++ b/nixos/lib/utils.nix
@@ -5,6 +5,7 @@ rec {
   # Escape a path according to the systemd rules, e.g. /dev/xyzzy
   # becomes dev-xyzzy.  FIXME: slow.
   escapeSystemdPath = s:
-   replaceChars ["/" "-" " "] ["-" "\\x2d" "\\x20"] (substring 1 (stringLength s) s);
+   replaceChars ["/" "-" " "] ["-" "\\x2d" "\\x20"]
+    (if hasPrefix "/" s then substring 1 (stringLength s) s else s);
 
 }

From e6ab680cbfb8165b51c829303b63eb44a905e751 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Thu, 4 Sep 2014 10:25:56 +0200
Subject: [PATCH 1246/1453] nixos nat: add type for sourcePort and destination
 of forwardPorts

---
 nixos/modules/services/networking/nat.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/nat.nix b/nixos/modules/services/networking/nat.nix
index b6fa3b79eb2f..9ddd830a04ab 100644
--- a/nixos/modules/services/networking/nat.nix
+++ b/nixos/modules/services/networking/nat.nix
@@ -76,9 +76,19 @@ in
     };
 
     networking.nat.forwardPorts = mkOption {
-      type = types.listOf types.attrs;
+      type = types.listOf types.optionSet;
       default = [];
       example = [ { sourcePort = 8080; destination = "10.0.0.1:80"; } ];
+      options = {
+        sourcePort = mkOption {
+          type = types.int;
+        };
+
+        destination = mkOption {
+          type = types.str;
+        };
+      };
+
       description =
         ''
           List of forwarded ports from the external interface to

From 467aa737a0d4012f94eb448df3e04fe64a872203 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 4 Sep 2014 13:01:23 +0400
Subject: [PATCH 1247/1453] Fix QScintilla source

---
 pkgs/development/libraries/qscintilla/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix
index c98496e336c4..52736ba5d344 100644
--- a/pkgs/development/libraries/qscintilla/default.nix
+++ b/pkgs/development/libraries/qscintilla/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/pyqt/QScintilla2/QScintilla-2.8.3/${name}.tar.gz";
+    url = "mirror://sourceforge/pyqt/QScintilla2/QScintilla-${version}/QScintilla-gpl-${version}.tar.gz";
     sha256 = "fb94e6d61c3ccd4bf167d5f092629e619f7069d42207469458998b761a7cf505";
   };
 

From 2ba523df244d9a3eefec9e2303080f93108254fe Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Thu, 4 Sep 2014 11:32:40 +0200
Subject: [PATCH 1248/1453] nixos nat: add description to forwardPorts

---
 nixos/modules/services/networking/nat.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/modules/services/networking/nat.nix b/nixos/modules/services/networking/nat.nix
index 9ddd830a04ab..4a4c06503c29 100644
--- a/nixos/modules/services/networking/nat.nix
+++ b/nixos/modules/services/networking/nat.nix
@@ -82,10 +82,14 @@ in
       options = {
         sourcePort = mkOption {
           type = types.int;
+          example = 8080;
+          description = "Source port of the external interface";
         };
 
         destination = mkOption {
           type = types.str;
+          example = "10.0.0.1:80";
+          description = "Forward tcp connection to destination ip:port";
         };
       };
 

From 3ccd8af29d33052a3377f7ff5fe6138fe0512c2f Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Thu, 4 Sep 2014 12:08:34 +0200
Subject: [PATCH 1249/1453] Add curl-unix-socket, Run HTTP requests over UNIX
 socket

---
 .../networking/curl-unix-socket/default.nix   | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/tools/networking/curl-unix-socket/default.nix

diff --git a/pkgs/tools/networking/curl-unix-socket/default.nix b/pkgs/tools/networking/curl-unix-socket/default.nix
new file mode 100644
index 000000000000..88d75ba570e0
--- /dev/null
+++ b/pkgs/tools/networking/curl-unix-socket/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, go }:
+
+stdenv.mkDerivation {
+  name = "curl-unix-socket";
+
+  src = fetchFromGitHub {
+    owner = "Soulou";
+    repo = "curl-unix-socket";
+    rev = "e926dca77ba7d4a1eeae073918fdd3db92f1a350";
+    sha256 = "1ynrrav90y3dhk8jq2fxm3jswj5nvrffwslgykj429hk6n0czb3d";
+  };
+
+  buildInputs = [ go ];
+  buildPhase = "go build";
+  installPhase = "install -D curl-unix-socket* $out/bin/curl-unix-socket";
+
+  meta = with stdenv.lib; {
+    description = "Run HTTP requests over UNIX socket";
+    license = licenses.mit;
+    homepage = https://github.com/Soulou/curl-unix-socket;
+    maintainers = with maintainers; [offline];
+    platforms = with platforms; unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 092f18da60e8..b2063fe7206b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -855,6 +855,8 @@ let
     sslSupport = zlibSupport;
   };
 
+  curl_unix_socket = callPackage ../tools/networking/curl-unix-socket rec { };
+
   cunit = callPackage ../tools/misc/cunit { };
 
   curlftpfs = callPackage ../tools/filesystems/curlftpfs { };

From a517dfcf71fa643b55ab29f09cfef94c5e89ba02 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 4 Sep 2014 14:41:23 +0400
Subject: [PATCH 1250/1453] Fix ACL2

---
 pkgs/development/compilers/sbcl/1.2.0.nix | 78 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  6 +-
 2 files changed, 83 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/compilers/sbcl/1.2.0.nix

diff --git a/pkgs/development/compilers/sbcl/1.2.0.nix b/pkgs/development/compilers/sbcl/1.2.0.nix
new file mode 100644
index 000000000000..c9d360f0ec5c
--- /dev/null
+++ b/pkgs/development/compilers/sbcl/1.2.0.nix
@@ -0,0 +1,78 @@
+{ stdenv, fetchurl, sbclBootstrap, clisp}:
+
+stdenv.mkDerivation rec {
+  name    = "sbcl-${version}";
+  version = "1.2.0";
+
+  src = fetchurl {
+    url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
+    sha256 = "13k20sys1v4lvgis8cnbczww6zs93rw176vz07g4jx06418k53x2";
+  };
+
+  buildInputs = [ ]
+    ++ (stdenv.lib.optional stdenv.isDarwin sbclBootstrap)
+    ++ (stdenv.lib.optional stdenv.isLinux clisp)
+    ;
+
+  patchPhase = ''
+    echo '"${version}.nixos"' > version.lisp-expr
+    echo "
+    (lambda (features)
+      (flet ((enable (x)
+               (pushnew x features))
+             (disable (x)
+               (setf features (remove x features))))
+        (enable :sb-thread))) " > customize-target-features.lisp
+
+    pwd
+
+    # SBCL checks whether files are up-to-date in many places..
+    # Unfortunately, same timestamp is not good enough
+    sed -e 's@> x y@>= x y@' -i contrib/sb-aclrepl/repl.lisp
+    sed -e '/(date)/i((= date 2208988801) 2208988800)' -i contrib/asdf/asdf.lisp
+    sed -i src/cold/slam.lisp -e \
+      '/file-write-date input/a)'
+    sed -i src/cold/slam.lisp -e \
+      '/file-write-date output/i(or (and (= 2208988801 (file-write-date output)) (= 2208988801 (file-write-date input)))'
+    sed -i src/code/target-load.lisp -e \
+      '/date defaulted-fasl/a)'
+    sed -i src/code/target-load.lisp -e \
+      '/date defaulted-source/i(or (and (= 2208988801 (file-write-date defaulted-source-truename)) (= 2208988801 (file-write-date defaulted-fasl-truename)))'
+
+    # Fix the tests
+    sed -e '/deftest pwent/inil' -i contrib/sb-posix/posix-tests.lisp
+    sed -e '/deftest grent/inil' -i contrib/sb-posix/posix-tests.lisp
+    sed -e '/deftest .*ent.non-existing/,+5d' -i contrib/sb-posix/posix-tests.lisp
+    sed -e '/deftest \(pw\|gr\)ent/,+3d' -i contrib/sb-posix/posix-tests.lisp
+
+    sed -e '5,$d' -i contrib/sb-bsd-sockets/tests.lisp
+    sed -e '5,$d' -i contrib/sb-simple-streams/*test*.lisp
+  '';
+
+  preBuild = ''
+    export INSTALL_ROOT=$out
+    mkdir -p test-home
+    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'
+    '';
+
+  installPhase = ''
+    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;
+    inherit version;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b2063fe7206b..a7af80dbf718 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3462,6 +3462,10 @@ let
   sbcl = callPackage ../development/compilers/sbcl {
     clisp = clisp;
   };
+  # For ACL2
+  sbcl_1_2_0 = callPackage ../development/compilers/sbcl/1.2.0.nix {
+    clisp = clisp;
+  };
 
   scala_2_9 = callPackage ../development/compilers/scala/2.9.nix { };
   scala_2_10 = callPackage ../development/compilers/scala/2.10.nix { };
@@ -3553,7 +3557,7 @@ let
   ### DEVELOPMENT / INTERPRETERS
 
   acl2 = builderDefsPackage ../development/interpreters/acl2 {
-    inherit sbcl;
+    sbcl = sbcl_1_2_0;
   };
 
   angelscript = callPackage ../development/interpreters/angelscript {};

From 89eccb7fb0d10ae208df9b1c6eead8cbc654b32f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 4 Sep 2014 13:37:03 +0200
Subject: [PATCH 1251/1453] sudo: add sendmailPath option (defaults to
 /var/setuid-wrappers/sendmail)

It currently seems impossible to make sudo send emails. No matter how much
debugging I enable, sudo continues to be silent about sendmail. I tried setting
"Defaults mailerpath=/var/setuid-wrappers/sendmail" but that too was completely
ignored (except for logging that the variable mailerpath exists with the value
I assigned to it...).

This enables sendmail support and sets a default value that works on NixOS.
---
 pkgs/tools/security/sudo/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix
index ab46af5a1cd9..23b7241ace0f 100644
--- a/pkgs/tools/security/sudo/default.nix
+++ b/pkgs/tools/security/sudo/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, coreutils, pam, groff }:
+{ stdenv, fetchurl, coreutils, pam, groff
+, sendmailPath ? "/var/setuid-wrappers/sendmail"
+}:
 
 stdenv.mkDerivation rec {
   name = "sudo-1.8.10p3";
@@ -17,6 +19,7 @@ stdenv.mkDerivation rec {
     "--with-rundir=/var/run"
     "--with-vardir=/var/db/sudo"
     "--with-logpath=/var/log/sudo.log"
+    "--with-sendmail=${sendmailPath}"
   ];
 
   postConfigure =

From 82b4965b083383126c5a8653cc5031c6ecea72bb Mon Sep 17 00:00:00 2001
From: Matthew Brown <matt@ederoyd.co.uk>
Date: Thu, 4 Sep 2014 13:21:28 +0100
Subject: [PATCH 1252/1453] Removed mysql dependency as it does not pick up the
 header files on Linux, even when specified explicitly in the config params.

---
 pkgs/servers/search/sphinxsearch/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/search/sphinxsearch/default.nix b/pkgs/servers/search/sphinxsearch/default.nix
index 1979da5b2c0c..a72240064f2f 100644
--- a/pkgs/servers/search/sphinxsearch/default.nix
+++ b/pkgs/servers/search/sphinxsearch/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, mysql,
+{ stdenv, fetchurl, pkgconfig,
   version ? "2.1.9",
   mainSrc ? fetchurl {
     url = "http://sphinxsearch.com/files/sphinx-${version}-release.tar.gz";
@@ -12,11 +12,12 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "--program-prefix=sphinxsearch-"
+    "--without-mysql"
+    "--enable-id64"
   ];
 
-  buildInputs = [ 
+  buildInputs = [
     pkgconfig
-    mysql
   ];
 
   meta = {

From 7f9609756d3a11ea0551b43dcfca91f969ee1d51 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 3 Sep 2014 08:33:14 +0200
Subject: [PATCH 1253/1453] haskell-MFlow: update to version 0.4.5.9

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

diff --git a/pkgs/development/libraries/haskell/MFlow/default.nix b/pkgs/development/libraries/haskell/MFlow/default.nix
index f5e088a4238b..aaf84a841873 100644
--- a/pkgs/development/libraries/haskell/MFlow/default.nix
+++ b/pkgs/development/libraries/haskell/MFlow/default.nix
@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "MFlow";
-  version = "0.4.5.8";
-  sha256 = "1gfv5ky68dyn8gjjg60c5s9x3dl9xn6j9q43w7vaj9sd1q12wk3c";
+  version = "0.4.5.9";
+  sha256 = "0mqsyx7wkfgvpppqgpjpvzwx79vj7lh4c8afzzj1hgh8z0ilb4ik";
   buildDepends = [
     blazeHtml blazeMarkup caseInsensitive clientsession conduit
     conduitExtra extensibleExceptions httpTypes monadloc mtl parsec

From cbe7451b5e9f3b29292482a110eaa0efb206dfad Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 3 Sep 2014 08:33:17 +0200
Subject: [PATCH 1254/1453] haskell-crypto-random: update to version 0.0.8

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

diff --git a/pkgs/development/libraries/haskell/crypto-random/default.nix b/pkgs/development/libraries/haskell/crypto-random/default.nix
index 878eb3d2c71f..c7053cbf1e39 100644
--- a/pkgs/development/libraries/haskell/crypto-random/default.nix
+++ b/pkgs/development/libraries/haskell/crypto-random/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "crypto-random";
-  version = "0.0.7";
-  sha256 = "1dj63y85l3f1x7fw8j7hykz56ajd38iikl3f8ygaz8r95pd1zjxw";
+  version = "0.0.8";
+  sha256 = "058ilm05ni5ribggx25cfrhsv1z0abvgxzf3wd3d6qqq58p5wbkv";
   buildDepends = [ securemem vector ];
   meta = {
     homepage = "http://github.com/vincenthz/hs-crypto-random";

From 1ba291edc6cdea8242a336eb51535cd58649ab7a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 3 Sep 2014 08:33:20 +0200
Subject: [PATCH 1255/1453] haskell-digestive-functors-heist: update to version
 0.8.6.0

---
 .../libraries/haskell/digestive-functors-heist/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix
index aae120d56818..4c1ca9cd9aeb 100644
--- a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix
+++ b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "digestive-functors-heist";
-  version = "0.8.5.0";
-  sha256 = "0pjjr3b1zm23wpqnmcbr8ly08bp63sz3c9vbxcani4mwgx05qp87";
+  version = "0.8.6.0";
+  sha256 = "0n73hw8xl70x7c3hn4hz1qqijvvhv0qk30q0c22lnbjaf4n8dki2";
   buildDepends = [
     blazeBuilder digestiveFunctors heist mtl text xmlhtml
   ];

From cd5f33affd00133fc663179e46ff5051a898e47e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 3 Sep 2014 08:33:22 +0200
Subject: [PATCH 1256/1453] haskell-entropy: update to version 0.3.3

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

diff --git a/pkgs/development/libraries/haskell/entropy/default.nix b/pkgs/development/libraries/haskell/entropy/default.nix
index 881a9cd9a0af..207cc0ea5dac 100644
--- a/pkgs/development/libraries/haskell/entropy/default.nix
+++ b/pkgs/development/libraries/haskell/entropy/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "entropy";
-  version = "0.3.2";
-  sha256 = "1kk0vmfmfqcsw0pzbii9rvz32fvhvxqpn6p6jw6q2x33z6gm5f9x";
+  version = "0.3.3";
+  sha256 = "0px97mims7pbxyh8jqckc14ahdjj7r3hhckzpjqnxpkcisb2c738";
   meta = {
     homepage = "https://github.com/TomMD/entropy";
     description = "A platform independent entropy source";

From 4ff583358edb56112e2541efcbefe9d1b7afdb2a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 3 Sep 2014 08:33:25 +0200
Subject: [PATCH 1257/1453] haskell-hplayground: update to version 0.1.0.4

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

diff --git a/pkgs/development/libraries/haskell/hplayground/default.nix b/pkgs/development/libraries/haskell/hplayground/default.nix
index db38dbc23991..4f71d28010a8 100644
--- a/pkgs/development/libraries/haskell/hplayground/default.nix
+++ b/pkgs/development/libraries/haskell/hplayground/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hplayground";
-  version = "0.1.0.3";
-  sha256 = "1k46b94n9wkbh7374mjyg5jnwxxrhj8ai53q3r4lysx1rzgw7ak6";
+  version = "0.1.0.4";
+  sha256 = "12xqj7f9vqj2zsv3ipfmpkdnqagh2g0x4i4jsj98q91ynwhzg1am";
   buildDepends = [
     dataDefault hasteCompiler hastePerch monadsTf transformers
   ];

From fd9aed1a779ccf67c193abac49b66b37726da8ef Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 3 Sep 2014 08:33:28 +0200
Subject: [PATCH 1258/1453] haskell-monad-journal: update to version 0.2.3.2

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

diff --git a/pkgs/development/libraries/haskell/monad-journal/default.nix b/pkgs/development/libraries/haskell/monad-journal/default.nix
index 5cbfed976d14..f7c48f691ed2 100644
--- a/pkgs/development/libraries/haskell/monad-journal/default.nix
+++ b/pkgs/development/libraries/haskell/monad-journal/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "monad-journal";
-  version = "0.2.3.1";
-  sha256 = "11p7qdga26wz82x6a1fl57iij4swsr1d1aly76sjrlvl8maqlf7d";
+  version = "0.2.3.2";
+  sha256 = "02356yapx5g6lam72kdyhndq5lcyhd2zsjvvcndiyhqik6csi457";
   buildDepends = [
     either monadControl mtl transformers transformersBase
   ];

From 84b1072604b41901e9bc0dcd9a25a47d92fcfb6b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 3 Sep 2014 08:33:30 +0200
Subject: [PATCH 1259/1453] haskell-network-uri: update to version 2.6.0.1

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

diff --git a/pkgs/development/libraries/haskell/network-uri/default.nix b/pkgs/development/libraries/haskell/network-uri/default.nix
index e6259b09c244..e42d6d285993 100644
--- a/pkgs/development/libraries/haskell/network-uri/default.nix
+++ b/pkgs/development/libraries/haskell/network-uri/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "network-uri";
-  version = "2.6.0.0";
-  sha256 = "0dnprscb5nxidg56i7j6q783nwsrn3dabfsij3vjlvjn4f0sg11l";
+  version = "2.6.0.1";
+  sha256 = "09ymamb128jgqghpda4nixncr73all8qc6q53976aricm6a27p37";
   buildDepends = [ parsec ];
   testDepends = [
     HUnit network testFramework testFrameworkHunit

From dcd580b9d2b67f2a99cbf4e7f7fa1b6ece2b3fa6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 3 Sep 2014 08:33:36 +0200
Subject: [PATCH 1260/1453] haskell-purescript: update to version 0.5.5

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

diff --git a/pkgs/development/libraries/haskell/purescript/default.nix b/pkgs/development/libraries/haskell/purescript/default.nix
index c5087a692f9a..f8bb4d4a6dbc 100644
--- a/pkgs/development/libraries/haskell/purescript/default.nix
+++ b/pkgs/development/libraries/haskell/purescript/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "purescript";
-  version = "0.5.4.1";
-  sha256 = "1d2i2sspr1dbzjznk70flvnik0b2m226a3z0rkqwrjjbl92bhgwb";
+  version = "0.5.5";
+  sha256 = "19a2ra37cxh56gd1k43y9fg2cdp848yimybsx8728in39m8cjbxw";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 93778f97e2d84710c8d43c7bc81316a5e025c380 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 3 Sep 2014 08:33:38 +0200
Subject: [PATCH 1261/1453] haskell-rest-gen: update to version 0.15

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

diff --git a/pkgs/development/libraries/haskell/rest-gen/default.nix b/pkgs/development/libraries/haskell/rest-gen/default.nix
index 012f6db8bf24..148e8f1cc1ff 100644
--- a/pkgs/development/libraries/haskell/rest-gen/default.nix
+++ b/pkgs/development/libraries/haskell/rest-gen/default.nix
@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "rest-gen";
-  version = "0.14.2.1";
-  sha256 = "1dvcs25ndmzwdann5yq4567zjirirzskf9v31gkrki0im8mi9x14";
+  version = "0.15";
+  sha256 = "004rcxaw4xjsa1grz84wgik6nabd9c3nyp8s6ylfgwgcrvcc8li2";
   buildDepends = [
     aeson blazeHtml Cabal codeBuilder fclabels filepath hashable
     haskellSrcExts hslogger HStringTemplate hxt jsonSchema restCore

From a64103179f6ccbe4edc95a1cecc2c9c728854e23 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 3 Sep 2014 08:33:41 +0200
Subject: [PATCH 1262/1453] haskell-rest-happstack: update to version 0.2.10.2

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

diff --git a/pkgs/development/libraries/haskell/rest-happstack/default.nix b/pkgs/development/libraries/haskell/rest-happstack/default.nix
index 4c79bc58c065..93397e823633 100644
--- a/pkgs/development/libraries/haskell/rest-happstack/default.nix
+++ b/pkgs/development/libraries/haskell/rest-happstack/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "rest-happstack";
-  version = "0.2.10.1";
-  sha256 = "0p4km3l8n50flj9cnxvjl34pp3msxz2yq4d91r318di8pacrgnxc";
+  version = "0.2.10.2";
+  sha256 = "18i2q3kvsyrh41gdclrzpnsjy1p9cgl3d9jsvcqqnzrv519vzdig";
   buildDepends = [ happstackServer mtl restCore restGen utf8String ];
   meta = {
     description = "Rest driver for Happstack";

From 01760e9110ca780049ae9f1e4761e55b730873f2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 3 Sep 2014 08:33:43 +0200
Subject: [PATCH 1263/1453] haskell-retry: update to version 0.5.1

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

diff --git a/pkgs/development/libraries/haskell/retry/default.nix b/pkgs/development/libraries/haskell/retry/default.nix
index 9a0a994cf77e..0df453d10bbd 100644
--- a/pkgs/development/libraries/haskell/retry/default.nix
+++ b/pkgs/development/libraries/haskell/retry/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "retry";
-  version = "0.5";
-  sha256 = "1qp949w8pisgki06j5qgaxw1761q3gfccc7bqnhqpchazl4p6p6n";
+  version = "0.5.1";
+  sha256 = "1k5qv7c960dayhddvra1gpy1zv90rdjcrzpg8nzar9bpcxapczvj";
   buildDepends = [ dataDefaultClass exceptions transformers ];
   testDepends = [
     dataDefaultClass exceptions hspec HUnit QuickCheck time

From 6139f0f5ab1debd330393a81302207f9813ec50c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 3 Sep 2014 08:33:48 +0200
Subject: [PATCH 1264/1453] haskell-setlocale: update to version 1.0.0

---
 .../libraries/haskell/setlocale/default.nix            | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/setlocale/default.nix b/pkgs/development/libraries/haskell/setlocale/default.nix
index fcfd2d34d586..ef00effcfe6b 100644
--- a/pkgs/development/libraries/haskell/setlocale/default.nix
+++ b/pkgs/development/libraries/haskell/setlocale/default.nix
@@ -4,13 +4,11 @@
 
 cabal.mkDerivation (self: {
   pname = "setlocale";
-  version = "0.0.3";
-  sha256 = "08pd20ibmslr94p52rn6x9w3swn9jy7vjlvxzw29h8dlqgmvcrjl";
+  version = "1.0.0";
+  sha256 = "1bnxh09jjac8gyjl87w6v86dqc1xr398l28ili8283im141anpzi";
   meta = {
-    description = "A Haskell interface to setlocale()";
-    license = self.stdenv.lib.licenses.publicDomain;
+    description = "Haskell bindings to setlocale";
+    license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
   };
 })

From 061b9b148c81f5c78af462618161ecd9b1ef7f9d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 3 Sep 2014 08:33:51 +0200
Subject: [PATCH 1265/1453] haskell-x509: update to version 1.4.12

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

diff --git a/pkgs/development/libraries/haskell/x509/default.nix b/pkgs/development/libraries/haskell/x509/default.nix
index 4c8eb53c9956..71601c9306dd 100644
--- a/pkgs/development/libraries/haskell/x509/default.nix
+++ b/pkgs/development/libraries/haskell/x509/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "x509";
-  version = "1.4.11";
-  sha256 = "1ax56jps640cj1swy08y4k75vx908ckwkg2hi7y2s3bhnvpz49ga";
+  version = "1.4.12";
+  sha256 = "0bfsmmngpvghbfljxa2gymf6hvsw04snw6fr2r6hpaw40njxfxxj";
   buildDepends = [
     asn1Encoding asn1Parse asn1Types cryptohash cryptoPubkeyTypes
     filepath mtl pem time

From a6bb94573059b5e0d96e2cd1ef5a09cf88ecf024 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 3 Sep 2014 08:35:00 +0200
Subject: [PATCH 1266/1453] haskell-network: update to version 2.6.0.2

---
 .../libraries/haskell/network/{2.6.0.1.nix => 2.6.0.2.nix}    | 4 ++--
 pkgs/top-level/haskell-packages.nix                           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename pkgs/development/libraries/haskell/network/{2.6.0.1.nix => 2.6.0.2.nix} (83%)

diff --git a/pkgs/development/libraries/haskell/network/2.6.0.1.nix b/pkgs/development/libraries/haskell/network/2.6.0.2.nix
similarity index 83%
rename from pkgs/development/libraries/haskell/network/2.6.0.1.nix
rename to pkgs/development/libraries/haskell/network/2.6.0.2.nix
index d5d302fbd8e6..37540ad323eb 100644
--- a/pkgs/development/libraries/haskell/network/2.6.0.1.nix
+++ b/pkgs/development/libraries/haskell/network/2.6.0.2.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "network";
-  version = "2.6.0.1";
-  sha256 = "0qfffsdbvrf9gs8wr9ps7iv5h6drz4vb2ja9rprmc7ypswsacxsq";
+  version = "2.6.0.2";
+  sha256 = "12b7saam5ga6l4cplgkad49xa4vkynz2ri9jxidx1cxiqjcl0vc4";
   testDepends = [ HUnit testFramework testFrameworkHunit ];
   meta = {
     homepage = "https://github.com/haskell/network";
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index c09cf8b11827..8730ac6d1608 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1721,8 +1721,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   network_2_3_1_0 = callPackage ../development/libraries/haskell/network/2.3.1.0.nix {};
   network_2_4_1_2 = callPackage ../development/libraries/haskell/network/2.4.1.2.nix {};
   network_2_5_0_0 = callPackage ../development/libraries/haskell/network/2.5.0.0.nix {};
-  network_2_6_0_1 = callPackage ../development/libraries/haskell/network/2.6.0.1.nix {};
-  network = self.network_2_5_0_0; # the latest version break HTTP on all platforms
+  network_2_6_0_2 = callPackage ../development/libraries/haskell/network/2.6.0.2.nix {};
+  network = self.network_2_5_0_0;
 
   networkCarbon = callPackage ../development/libraries/haskell/network-carbon {};
 

From 064c3d3e545de2d050598546b79c9d1956b27409 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 3 Sep 2014 08:35:41 +0200
Subject: [PATCH 1267/1453] haskell-ghc-mod: update to version 5.0.1.2

---
 .../libraries/haskell/ghc-mod/{5.0.1.1.nix => 5.0.1.2.nix}    | 4 ++--
 pkgs/top-level/haskell-packages.nix                           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename pkgs/development/libraries/haskell/ghc-mod/{5.0.1.1.nix => 5.0.1.2.nix} (95%)

diff --git a/pkgs/development/libraries/haskell/ghc-mod/5.0.1.1.nix b/pkgs/development/libraries/haskell/ghc-mod/5.0.1.2.nix
similarity index 95%
rename from pkgs/development/libraries/haskell/ghc-mod/5.0.1.1.nix
rename to pkgs/development/libraries/haskell/ghc-mod/5.0.1.2.nix
index 3eefe056218d..1a4ada4d3dc5 100644
--- a/pkgs/development/libraries/haskell/ghc-mod/5.0.1.1.nix
+++ b/pkgs/development/libraries/haskell/ghc-mod/5.0.1.2.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "ghc-mod";
-  version = "5.0.1.1";
-  sha256 = "0qyl1653dj14ap3035kjj7xl8rsmgpwh32bj2lnwrmdm2223m8a3";
+  version = "5.0.1.2";
+  sha256 = "0hs2d6h3g077prm2mdr40k7m1cdc0h01agbcvs4h6y27nls3kyjx";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 8730ac6d1608..15575967f30a 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -906,7 +906,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   ghcjsCodemirror = callPackage ../development/libraries/haskell/ghcjs-codemirror {};
 
   ghcMod_4_1_6 = callPackage ../development/libraries/haskell/ghc-mod/4.1.6.nix { inherit (pkgs) emacs; };
-  ghcMod_5_0_1_1 = callPackage ../development/libraries/haskell/ghc-mod/5.0.1.1.nix { inherit (pkgs) emacs; };
+  ghcMod_5_0_1_2 = callPackage ../development/libraries/haskell/ghc-mod/5.0.1.2.nix { inherit (pkgs) emacs; };
   ghcMod = self.ghcMod_4_1_6;
 
   ghcMtl = callPackage ../development/libraries/haskell/ghc-mtl {};

From f82bf82465477c07a6aded38344b62c500f66adf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 3 Sep 2014 08:37:02 +0200
Subject: [PATCH 1268/1453] haskell-tls: update to version 1.2.9 (and drop
 obsolete tls-extra)

---
 .../libraries/haskell/tls-extra/default.nix   | 23 ----------------
 .../libraries/haskell/tls/1.1.5.nix           | 27 -------------------
 .../haskell/tls/{1.2.8.nix => default.nix}    |  4 +--
 pkgs/top-level/haskell-packages.nix           |  8 +-----
 4 files changed, 3 insertions(+), 59 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/tls-extra/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/tls/1.1.5.nix
 rename pkgs/development/libraries/haskell/tls/{1.2.8.nix => default.nix} (92%)

diff --git a/pkgs/development/libraries/haskell/tls-extra/default.nix b/pkgs/development/libraries/haskell/tls-extra/default.nix
deleted file mode 100644
index 0d5c97433b2a..000000000000
--- a/pkgs/development/libraries/haskell/tls-extra/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, certificate, cipherAes, cipherRc4, cryptohash
-, cryptoPubkey, cryptoRandom, mtl, network, pem, time, tls, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "tls-extra";
-  version = "0.6.6";
-  sha256 = "0k0sj3nq1lrvbmd582mjj8cxbxigivz1hm8hhij1ncl2pgnq5xyv";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    certificate cipherAes cipherRc4 cryptohash cryptoPubkey
-    cryptoRandom mtl network pem time tls vector
-  ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-tls";
-    description = "TLS extra default values and helpers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tls/1.1.5.nix b/pkgs/development/libraries/haskell/tls/1.1.5.nix
deleted file mode 100644
index ddb1651fd100..000000000000
--- a/pkgs/development/libraries/haskell/tls/1.1.5.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cereal, certificate, cprngAes, cryptohash, cryptoPubkey
-, cryptoRandom, mtl, network, QuickCheck, testFramework
-, testFrameworkQuickcheck2, time
-}:
-
-cabal.mkDerivation (self: {
-  pname = "tls";
-  version = "1.1.5";
-  sha256 = "1ja03x3i7dgjpy22h4shnni1xslph8i8q4accqq8njpqpz54c84c";
-  buildDepends = [
-    cereal certificate cryptohash cryptoPubkey cryptoRandom mtl network
-  ];
-  testDepends = [
-    cereal certificate cprngAes cryptoPubkey cryptoRandom mtl
-    QuickCheck testFramework testFrameworkQuickcheck2 time
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-tls";
-    description = "TLS/SSL protocol native implementation (Server and Client)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tls/1.2.8.nix b/pkgs/development/libraries/haskell/tls/default.nix
similarity index 92%
rename from pkgs/development/libraries/haskell/tls/1.2.8.nix
rename to pkgs/development/libraries/haskell/tls/default.nix
index 22eb615a6571..45cb3c693944 100644
--- a/pkgs/development/libraries/haskell/tls/1.2.8.nix
+++ b/pkgs/development/libraries/haskell/tls/default.nix
@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tls";
-  version = "1.2.8";
-  sha256 = "0fm36jn2yri3fn6wadl5v4k0cpnansqlid4fhavgnp6mazf0q5ha";
+  version = "1.2.9";
+  sha256 = "1cwhwxpsxx9x5hv2c66d3yvbs84lrgaxmaz18skidmhqhs4i0sjy";
   buildDepends = [
     asn1Encoding asn1Types byteable cereal cipherAes cipherDes
     cipherRc4 cryptoCipherTypes cryptohash cryptoNumbers cryptoPubkey
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 15575967f30a..c32a80c0e4b2 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2543,13 +2543,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   timeCompat = callPackage ../development/libraries/haskell/time-compat {};
 
-  tls_1_1_5 = callPackage ../development/libraries/haskell/tls/1.1.5.nix {};
-  tls_1_2_8 = callPackage ../development/libraries/haskell/tls/1.2.8.nix {};
-  tls = self.tls_1_2_8;
-
-  tlsExtra = callPackage ../development/libraries/haskell/tls-extra {
-    tls = self.tls_1_1_5;
-  };
+  tls = callPackage ../development/libraries/haskell/tls {};
 
   tostring = callPackage ../development/libraries/haskell/tostring {};
 

From 9f22ed986bff10e0901c81a96d8b070b2e4e7c7b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 3 Sep 2014 11:05:07 +0200
Subject: [PATCH 1269/1453] haskell-network-uri: disable test suite to fix the
 build

https://github.com/haskell/network-uri/issues/4
---
 pkgs/development/libraries/haskell/network-uri/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/network-uri/default.nix b/pkgs/development/libraries/haskell/network-uri/default.nix
index e42d6d285993..6cfd4dca161d 100644
--- a/pkgs/development/libraries/haskell/network-uri/default.nix
+++ b/pkgs/development/libraries/haskell/network-uri/default.nix
@@ -13,6 +13,7 @@ cabal.mkDerivation (self: {
     HUnit network testFramework testFrameworkHunit
     testFrameworkQuickcheck2
   ];
+  doCheck = false;
   meta = {
     homepage = "https://github.com/haskell/network-uri";
     description = "URI manipulation";

From 87bb484b9e34c8c8d0795fc1b2d2136ac2766376 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 4 Sep 2014 11:02:44 +0200
Subject: [PATCH 1270/1453] haskell-setlocale: jailbreak to fix build with GHC
 7.8.3

---
 pkgs/development/libraries/haskell/setlocale/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/setlocale/default.nix b/pkgs/development/libraries/haskell/setlocale/default.nix
index ef00effcfe6b..05696176d903 100644
--- a/pkgs/development/libraries/haskell/setlocale/default.nix
+++ b/pkgs/development/libraries/haskell/setlocale/default.nix
@@ -6,6 +6,7 @@ cabal.mkDerivation (self: {
   pname = "setlocale";
   version = "1.0.0";
   sha256 = "1bnxh09jjac8gyjl87w6v86dqc1xr398l28ili8283im141anpzi";
+  jailbreak = true;
   meta = {
     description = "Haskell bindings to setlocale";
     license = self.stdenv.lib.licenses.bsd3;

From 381ce7ef9489a1ddf09c037001d418018c28a9ee Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 4 Sep 2014 11:06:07 +0200
Subject: [PATCH 1271/1453] haskell-optparse-applicative: add version 0.10.0

---
 .../haskell/optparse-applicative/0.10.0.nix     | 17 +++++++++++++++++
 .../{default.nix => 0.9.1.1.nix}                |  0
 pkgs/top-level/haskell-packages.nix             |  4 +++-
 3 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/haskell/optparse-applicative/0.10.0.nix
 rename pkgs/development/libraries/haskell/optparse-applicative/{default.nix => 0.9.1.1.nix} (100%)

diff --git a/pkgs/development/libraries/haskell/optparse-applicative/0.10.0.nix b/pkgs/development/libraries/haskell/optparse-applicative/0.10.0.nix
new file mode 100644
index 000000000000..ff546c76eae5
--- /dev/null
+++ b/pkgs/development/libraries/haskell/optparse-applicative/0.10.0.nix
@@ -0,0 +1,17 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, ansiWlPprint, transformers, transformersCompat }:
+
+cabal.mkDerivation (self: {
+  pname = "optparse-applicative";
+  version = "0.10.0";
+  sha256 = "04hr6rzgc8h0c8fy748as3q7sc8vm94gvk0rw4gdj605z8hvaxcb";
+  buildDepends = [ ansiWlPprint transformers transformersCompat ];
+  jailbreak = true;
+  meta = {
+    homepage = "https://github.com/pcapriotti/optparse-applicative";
+    description = "Utilities and combinators for parsing command line options";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/optparse-applicative/default.nix b/pkgs/development/libraries/haskell/optparse-applicative/0.9.1.1.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/optparse-applicative/default.nix
rename to pkgs/development/libraries/haskell/optparse-applicative/0.9.1.1.nix
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index c32a80c0e4b2..25543d752df5 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1795,7 +1795,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   options = callPackage ../development/libraries/haskell/options {};
 
-  optparseApplicative = callPackage ../development/libraries/haskell/optparse-applicative {};
+  optparseApplicative_0_9_1_1 = callPackage ../development/libraries/haskell/optparse-applicative/0.9.1.1.nix {};
+  optparseApplicative_0_10_0 = callPackage ../development/libraries/haskell/optparse-applicative/0.10.0.nix {};
+  optparseApplicative = self.optparseApplicative_0_9_1_1;       # version 0.10.0 breaks too many builds
 
   pathPieces = callPackage ../development/libraries/haskell/path-pieces {};
 

From 0a6ad143959f350be0970d85d6a27420708ee9c9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 3 Sep 2014 08:33:12 +0200
Subject: [PATCH 1272/1453] haskell-idris: update to version 0.9.14.3

---
 pkgs/development/compilers/idris/default.nix | 4 ++--
 pkgs/top-level/haskell-packages.nix          | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix
index 0761f189bc82..7ff88017c055 100644
--- a/pkgs/development/compilers/idris/default.nix
+++ b/pkgs/development/compilers/idris/default.nix
@@ -11,8 +11,8 @@
 
 cabal.mkDerivation (self: {
   pname = "idris";
-  version = "0.9.14.2";
-  sha256 = "0j64kx357l16z9y9j20i7mvxgqff94bfssbhh1shb13c0pk5lmi6";
+  version = "0.9.14.3";
+  sha256 = "03zppfqjamy4mdwcfx3x1wzxav67ha1zgnynrxhvdqw3zcsrwnlr";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 25543d752df5..7e628308eb74 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2994,6 +2994,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   idris_plain = callPackage ../development/compilers/idris {
     llvmGeneral = self.llvmGeneral_3_3_8_2;
     llvmGeneralPure = self.llvmGeneralPure_3_3_8_2;
+    optparseApplicative = self.optparseApplicative_0_10_0;
   };
 
   idris = callPackage ../development/compilers/idris/wrapper.nix {};

From 3d8a3e97bdc91c07d3e29c55d4090ab86eb6e38e Mon Sep 17 00:00:00 2001
From: Igor Pashev <pashev.igor@gmail.com>
Date: Wed, 3 Sep 2014 22:20:31 +0200
Subject: [PATCH 1273/1453] Fixed buildLocalCabal by defining temporary $HOME
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This fixes build error:

building path(s) ‘/nix/store/c8i7gm134aij9330h77l4sdna635yj0a-foo.nix’
building /nix/store/c8i7gm134aij9330h77l4sdna635yj0a-foo.nix
cabal2nix: /homeless-shelter/.cache: createDirectory: does not exist (No such file or directory)
error: syntax error, unexpected $end, at /nix/store/c8i7gm134aij9330h77l4sdna635yj0a-foo.nix:1:1
(use ‘--show-trace’ to show detailed location information)…
---
 pkgs/top-level/haskell-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index cb2353617830..3bbee1d6fe5c 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -3037,6 +3037,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
       name = "${name}.nix";
 
       buildCommand = ''
+      export HOME="$TMPDIR"
       ${self.cabal2nix}/bin/cabal2nix ${src + "/${name}.cabal"} --sha256=FILTERME \
           | grep -v FILTERME | sed \
             -e 's/licenses.proprietary/licenses.unfree/' \

From c3436c0c4a683e9a57d91e7f6206d5f3b6530fbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 4 Sep 2014 15:34:36 +0200
Subject: [PATCH 1274/1453] sudo: change password prompt

The current sudo password prompt is "Password: ", while distros like
e.g. Ubuntu and Arch Linux use "[sudo] password for %p: ", where "%p"
expands to the username of the user running sudo.

Adopt the prompt from other distros because it makes it less confusing
when running commands with sudo that themselves ask for a password.
---
 pkgs/tools/security/sudo/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix
index 23b7241ace0f..167c369e3bb9 100644
--- a/pkgs/tools/security/sudo/default.nix
+++ b/pkgs/tools/security/sudo/default.nix
@@ -22,6 +22,10 @@ stdenv.mkDerivation rec {
     "--with-sendmail=${sendmailPath}"
   ];
 
+  configureFlagsArray = [
+    "--with-passprompt=[sudo] password for %p: "  # intentional trailing space
+  ];
+
   postConfigure =
     ''
     cat >> pathnames.h <<'EOF'

From 762c03ef6427a8eb20ea810099b40e576e34bb7a Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Thu, 4 Sep 2014 15:33:22 +0200
Subject: [PATCH 1275/1453] openttd: update from 1.4.1 to 1.4.2

---
 pkgs/games/openttd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix
index ff96622cb59c..c26c27aaf021 100644
--- a/pkgs/games/openttd/default.nix
+++ b/pkgs/games/openttd/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "openttd-${version}";
-  version = "1.4.1";
+  version = "1.4.2";
 
   src = fetchurl {
     url = "http://binaries.openttd.org/releases/${version}/${name}-source.tar.xz";
-    sha256 = "0gkmf2jj1rab81y10dp8cirr90kv9dpr3ww4wb06j8cvgapy7b0z";
+    sha256 = "1kzca8nxz9isb2r5q5pdxhkzy92rdibapzq256sxbaf55zlcg1p2";
   };
 
   buildInputs = [ SDL libpng pkgconfig xz zlib freetype fontconfig ];

From 484dc89a21e9bdb82f7f003ccfae43e0d02d5ba9 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Thu, 4 Sep 2014 15:34:42 +0200
Subject: [PATCH 1276/1453] pngcrush: update from 1.7.76 to 1.7.77

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

diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix
index b27e5132804b..0419732949d8 100644
--- a/pkgs/tools/graphics/pngcrush/default.nix
+++ b/pkgs/tools/graphics/pngcrush/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libpng }:
 
 stdenv.mkDerivation rec {
-  name = "pngcrush-1.7.76";
+  name = "pngcrush-1.7.77";
 
   src = fetchurl {
     url = "mirror://sourceforge/pmt/${name}-nolib.tar.xz";
-    sha256 = "0jbv3ijc0nfhy6pkhv4dwbk2v488rwixd8rv1c7lfs59wblb44hv";
+    sha256 = "0404275rb6934aiwrysgapg0irbimcb2y8giqlc63gfspnvy67fa";
   };
 
   configurePhase = ''

From 4678ddc1c03af307b46dee0fe61273a4f9a85e93 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Thu, 4 Sep 2014 15:36:31 +0200
Subject: [PATCH 1277/1453] gitAndTools.svn2git: update from 2.2.5 to 2.3.2

---
 .../version-management/git-and-tools/svn2git/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
index b0cfcaeb1108..f30a47a78b9a 100644
--- a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, ruby, makeWrapper, git }:
 
 let
-  version = "2.2.5";
+  version = "2.3.2";
 in
 stdenv.mkDerivation {
   name = "svn2git-${version}";
 
   src = fetchurl {
     url = "https://github.com/nirvdrum/svn2git/archive/v${version}.tar.gz";
-    sha256 = "1afmrr80357pg3kawyghhc55z1pszaq8fyrrjmxa6nr9dcrqjwwh";
+    sha256 = "1484mpcabqf9kr6xdpdgb1npkqav1bcah3w5lxj2djjx4bjf2g3y";
   };
 
   buildInputs = [ ruby makeWrapper ];

From 6f682f9afbc8dce081cbda8b8a529c7e49ae000f Mon Sep 17 00:00:00 2001
From: Moritz Heidkamp <moritz@twoticketsplease.de>
Date: Thu, 4 Sep 2014 15:48:49 +0200
Subject: [PATCH 1278/1453] Add Chibi-Scheme expression

---
 lib/maintainers.nix                           |  1 +
 .../interpreters/chibi/default.nix            | 36 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 39 insertions(+)
 create mode 100644 pkgs/development/interpreters/chibi/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 9ff9f7ea27ae..b616e30a858a 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -38,6 +38,7 @@
   coroa = "Jonas Hörsch <jonas@chaoflow.net>";
   cstrahan = "Charles Strahan <charles.c.strahan@gmail.com>";
   DamienCassou = "Damien Cassou <damien.cassou@gmail.com>";
+  DerGuteMoritz = "Moritz Heidkamp <moritz@twoticketsplease.de>";
   doublec = "Chris Double <chris.double@double.co.nz>";
   ederoyd46 = "Matthew Brown <matt@ederoyd.co.uk>";
   edwtjo = "Edward Tjörnhammar <ed@cflags.cc>";
diff --git a/pkgs/development/interpreters/chibi/default.nix b/pkgs/development/interpreters/chibi/default.nix
new file mode 100644
index 000000000000..89ec6097cc9e
--- /dev/null
+++ b/pkgs/development/interpreters/chibi/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, makeWrapper }:
+let
+  version = "0.7";
+  name = "chibi-scheme-${version}";
+in
+stdenv.mkDerivation {
+  inherit name;
+
+  meta = {
+    homepage = "https://code.google.com/p/chibi-scheme/";
+    description = "Small Footprint Scheme for use as a C Extension Language";
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.DerGuteMoritz ];
+  };
+
+  src = fetchurl {
+    url = "http://abrek.synthcode.com/${name}.tgz";
+    sha256 = "1hhkq0khgi8i24xv66y7r6pgk1issn1i2bf7rv91rbk0wm0kv7qm";
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    make install PREFIX="$out"
+  '';
+
+  fixupPhase = ''
+    wrapProgram "$out/bin/chibi-scheme" \
+      --prefix CHIBI_MODULE_PATH : "$out/share/chibi:$out/lib/chibi"
+
+    for f in chibi-doc chibi-ffi snow-chibi; do
+      substituteInPlace "$out/bin/$f" \
+        --replace "/usr/bin/env chibi-scheme" "$out/bin/chibi-scheme"
+    done
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a7af80dbf718..1003bf4652c3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3562,6 +3562,8 @@ let
 
   angelscript = callPackage ../development/interpreters/angelscript {};
 
+  chibi = callPackage ../development/interpreters/chibi { };
+
   clisp = callPackage ../development/interpreters/clisp { };
 
   # compatibility issues in 2.47 - at list 2.44.1 is known good

From cce6dd11b620a63b93d83281fbf99a60ea0b3aeb Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Thu, 4 Sep 2014 16:00:52 +0200
Subject: [PATCH 1279/1453] subversionClient: update from 1.8.9 to 1.8.10,
 potentially fixes CVE-2014-3504, CVE-2014-3522, CVE-2014-3528

---
 pkgs/applications/version-management/subversion/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index 7526bb5f0437..283ea7591538 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -17,13 +17,13 @@ assert javahlBindings -> jdk != null && perl != null;
 
 stdenv.mkDerivation rec {
 
-  version = "1.8.9";
+  version = "1.8.10";
 
   name = "subversion-${version}";
 
   src = fetchurl {
     url = "mirror://apache/subversion/${name}.tar.bz2";
-    sha1 = "424ee12708f39a126efd905886666083dcc4eeaf";
+    sha256 = "1k3xskg2kjfp3zipl46lqx4fq4lhqnswd79qxp1kfhwplz401j8w";
   };
 
   buildInputs = [ zlib apr aprutil sqlite ]

From e5878fa70b0720ff3dee575f38dcfd45fce91aa3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 4 Sep 2014 14:42:54 +0200
Subject: [PATCH 1280/1453] git-annex: re-build expression with latest
 cabal2nix

---
 .../version-management/git-and-tools/git-annex/default.nix   | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
index 7224d8c6900d..f00ca9da046d 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
@@ -35,10 +35,7 @@ cabal.mkDerivation (self: {
   ];
   buildTools = [ bup curl git gnupg1 lsof openssh perl rsync which ];
   configureFlags = "-fAssistant -fProduction";
-  preConfigure = ''
-    export HOME="$NIX_BUILD_TOP/tmp"
-    mkdir "$HOME"
-  '';
+  preConfigure = "export HOME=$TEMPDIR";
   installPhase = "./Setup install";
   checkPhase = ''
     cp dist/build/git-annex/git-annex git-annex

From 83683c414024e3575e9734fab1717971a33f9a3b Mon Sep 17 00:00:00 2001
From: Michel Kuhlmann <michel@kuhlmanns.info>
Date: Thu, 4 Sep 2014 12:17:15 +0200
Subject: [PATCH 1281/1453] haskell-ghc-server: initial expression

---
 .../libraries/haskell/ghc-server/default.nix  | 22 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  3 +++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/ghc-server/default.nix

diff --git a/pkgs/development/libraries/haskell/ghc-server/default.nix b/pkgs/development/libraries/haskell/ghc-server/default.nix
new file mode 100644
index 000000000000..ac9cb852704d
--- /dev/null
+++ b/pkgs/development/libraries/haskell/ghc-server/default.nix
@@ -0,0 +1,22 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, async, attoLisp, attoparsec, conduit, conduitExtra
+, ghcPaths, mtl, network, syb, text
+}:
+
+cabal.mkDerivation (self: {
+  pname = "ghc-server";
+  version = "1.1";
+  sha256 = "1rgrgx9xakq6vy6nanvwzwfvzbfg287pmm8pdm9lbd7kf7ls5ml4";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    async attoLisp attoparsec conduit conduitExtra ghcPaths mtl network
+    syb text
+  ];
+  meta = {
+    description = "A server interface to GHC";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 601e6f30ea31..c692800810e3 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -901,6 +901,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
     cabal = self.cabal.override { enableLibraryProfiling = false; }; # pkg cannot be built with profiling enabled
   };
 
+
+  ghcServer = callPackage ../development/libraries/haskell/ghc-server {};
+
   ghcjsDom = callPackage ../development/libraries/haskell/ghcjs-codemirror {};
 
   ghcjsCodemirror = callPackage ../development/libraries/haskell/ghcjs-codemirror {};

From 439ebda62a7eac0eba4051f72591be830d1400e1 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Thu, 4 Sep 2014 16:16:41 +0200
Subject: [PATCH 1282/1453] ffmpeg_1: update from 1.2.7 to 1.2.8

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

diff --git a/pkgs/development/libraries/ffmpeg/1.x.nix b/pkgs/development/libraries/ffmpeg/1.x.nix
index a0dcf52dcce0..e2aa336d5d21 100644
--- a/pkgs/development/libraries/ffmpeg/1.x.nix
+++ b/pkgs/development/libraries/ffmpeg/1.x.nix
@@ -31,11 +31,11 @@ assert playSupport -> SDL != null;
 assert freetypeSupport -> freetype != null;
 
 stdenv.mkDerivation rec {
-  name = "ffmpeg-1.2.7";
+  name = "ffmpeg-1.2.8";
 
   src = fetchurl {
     url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
-    sha256 = "13nj5q5ad0kcrid8r5x6x8lqfhk8kms14pmncf6vbdbk6x45k6v6";
+    sha256 = "0n9fklr8zqkd60dc5ai161l6k4dbiac5hqy0pi1w82yamc25k6s2";
   };
 
   # `--enable-gpl' (as well as the `postproc' and `swscale') mean that

From ff3ba4829471e51a72359b4f461fbe727f891d47 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Thu, 4 Sep 2014 16:18:11 +0200
Subject: [PATCH 1283/1453] fping: update from 3.8 to 3.10

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

diff --git a/pkgs/tools/networking/fping/default.nix b/pkgs/tools/networking/fping/default.nix
index 10f31fb8297d..03776c636b8e 100644
--- a/pkgs/tools/networking/fping/default.nix
+++ b/pkgs/tools/networking/fping/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "fping-3.8";
+  name = "fping-3.10";
 
   src = fetchurl {
     url = "http://www.fping.org/dist/${name}.tar.gz";
-    sha256 = "04iwj4x3wns09wp777mb3kwfi7ypb4m9m73p0s2y699px77hcx67";
+    sha256 = "1n2psfxgww6wg5rz8rly06xkghgp8lshx2lx6rramrigyd1fhiyd";
   };
 
   meta = {

From 0863bcb68373063ab52f07dddc64fcae0fe96e24 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Thu, 4 Sep 2014 16:20:40 +0200
Subject: [PATCH 1284/1453] gitAndTools.hub: update from 1.12.0 to 1.12.2,
 potentially fixes CVE-2014-0177

---
 .../version-management/git-and-tools/hub/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix
index 28484322d351..d41b175af9b8 100644
--- a/pkgs/applications/version-management/git-and-tools/hub/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "hub-${version}";
-  version = "1.12.0";
+  version = "1.12.2";
 
   src = fetchurl {
     url = "https://github.com/github/hub/archive/v${version}.tar.gz";
-    sha256 = "1lbl4dl7483q320qw4jm6mqq4dbbk3xncypxgg86zcdigxvw6igv";
+    sha256 = "112yfv9xklsmwv859kypv7hz0a6dj5hkrmjp7z1h40nrljc9mi79";
   };
 
   buildInputs = [ rake makeWrapper ];

From d788060cc73773a4a83c50b4b7d16c18ee42d987 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Thu, 4 Sep 2014 16:25:04 +0200
Subject: [PATCH 1285/1453] httrack: update from 3.48.17 to 3.48.19

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

diff --git a/pkgs/tools/backup/httrack/default.nix b/pkgs/tools/backup/httrack/default.nix
index 4df142afe3a5..02ab79bf2bb4 100644
--- a/pkgs/tools/backup/httrack/default.nix
+++ b/pkgs/tools/backup/httrack/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, zlib, openssl }:
 
 stdenv.mkDerivation rec {
-  version = "3.48.17";
+  version = "3.48.19";
   name = "httrack-${version}";
 
   src = fetchurl {
     url = "http://mirror.httrack.com/httrack-${version}.tar.gz";
-    sha256 = "03q8sk7qihw9x4bfgfhv6523khgj13nilqps28qy7ndpzpggw9vn";
+    sha256 = "1zlayvl6x0ck1g5rvmj7cc88w0an5f4y93r3g5l10hhhl87cvw0n";
   };
 
   buildInputs = [ zlib openssl ];

From dcf3ad6a2aa6103d5108f550a49b80101257cb2b Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Thu, 4 Sep 2014 16:28:23 +0200
Subject: [PATCH 1286/1453] chibi: Add missing meta.license field.

---
 pkgs/development/interpreters/chibi/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/interpreters/chibi/default.nix b/pkgs/development/interpreters/chibi/default.nix
index 89ec6097cc9e..b4a0b77e7054 100644
--- a/pkgs/development/interpreters/chibi/default.nix
+++ b/pkgs/development/interpreters/chibi/default.nix
@@ -10,6 +10,7 @@ stdenv.mkDerivation {
     homepage = "https://code.google.com/p/chibi-scheme/";
     description = "Small Footprint Scheme for use as a C Extension Language";
     platforms = stdenv.lib.platforms.all;
+    license = stdenv.lib.licenses.bsd3;
     maintainers = [ stdenv.lib.maintainers.DerGuteMoritz ];
   };
 

From c30b23166bba220560e2cef09db203645f8f5674 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Thu, 4 Sep 2014 16:29:58 +0200
Subject: [PATCH 1287/1453] scheme48: update from 1.9 to 1.9.2

---
 pkgs/development/interpreters/scheme48/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/scheme48/default.nix b/pkgs/development/interpreters/scheme48/default.nix
index 390567175978..1436f260a448 100644
--- a/pkgs/development/interpreters/scheme48/default.nix
+++ b/pkgs/development/interpreters/scheme48/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation {
-  name = "scheme48-1.9";
+  name = "scheme48-1.9.2";
 
   meta = {
     homepage = http://s48.org/;
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   };
 
   src = fetchurl {
-    url = http://s48.org/1.9/scheme48-1.9.tgz;
-    md5 = "b4c20057f92191d05a61fac1372878ad";
+    url = http://s48.org/1.9.2/scheme48-1.9.2.tgz;
+    sha256 = "1x4xfm3lyz2piqcw1h01vbs1iq89zq7wrsfjgh3fxnlm1slj2jcw";
   };
 }

From 332395b26295f7159ef1f7e606100d7ff3089fb9 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Thu, 4 Sep 2014 16:33:50 +0200
Subject: [PATCH 1288/1453] Add myself as a maintainer to a bunch of packages.

---
 .../version-management/git-and-tools/hub/default.nix             | 1 +
 pkgs/development/interpreters/scheme48/default.nix               | 1 +
 pkgs/development/libraries/ffmpeg/1.x.nix                        | 1 +
 pkgs/tools/backup/httrack/default.nix                            | 1 +
 pkgs/tools/networking/fping/default.nix                          | 1 +
 5 files changed, 5 insertions(+)

diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix
index d41b175af9b8..8d578c2b4660 100644
--- a/pkgs/applications/version-management/git-and-tools/hub/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix
@@ -23,5 +23,6 @@ stdenv.mkDerivation rec {
     description = "A GitHub specific wrapper for git";
     homepage = "http://defunkt.io/hub/";
     license = stdenv.lib.licenses.mit;
+    maintainers = with stdenv.lib.maintainers; [ the-kenny ];
   };
 }
diff --git a/pkgs/development/interpreters/scheme48/default.nix b/pkgs/development/interpreters/scheme48/default.nix
index 1436f260a448..4630828fe87d 100644
--- a/pkgs/development/interpreters/scheme48/default.nix
+++ b/pkgs/development/interpreters/scheme48/default.nix
@@ -6,6 +6,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://s48.org/;
     description = "Scheme 48";
+    maintainers = with stdenv.lib.maintainers; [ the-kenny ];
   };
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/ffmpeg/1.x.nix b/pkgs/development/libraries/ffmpeg/1.x.nix
index e2aa336d5d21..e9488530b5c3 100644
--- a/pkgs/development/libraries/ffmpeg/1.x.nix
+++ b/pkgs/development/libraries/ffmpeg/1.x.nix
@@ -100,5 +100,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.ffmpeg.org/;
     description = "A complete, cross-platform solution to record, convert and stream audio and video";
+    maintainers = with stdenv.lib.maintainers; [ the-kenny ];
   };
 }
diff --git a/pkgs/tools/backup/httrack/default.nix b/pkgs/tools/backup/httrack/default.nix
index 02ab79bf2bb4..fc5b83305224 100644
--- a/pkgs/tools/backup/httrack/default.nix
+++ b/pkgs/tools/backup/httrack/default.nix
@@ -15,5 +15,6 @@ stdenv.mkDerivation rec {
     homepage = "http://www.httrack.com";
     description = "Easy-to-use offline browser utility";
     license = stdenv.lib.licenses.gpl3;
+    maintainers = with stdenv.lib.maintainers; [ the-kenny ];
   };
 }
diff --git a/pkgs/tools/networking/fping/default.nix b/pkgs/tools/networking/fping/default.nix
index 03776c636b8e..c71f6b040843 100644
--- a/pkgs/tools/networking/fping/default.nix
+++ b/pkgs/tools/networking/fping/default.nix
@@ -11,5 +11,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://fping.org/";
     description = "Send ICMP echo probes to network hosts";
+    maintainers = with stdenv.lib.maintainers; [ the-kenny ];
   };
 }

From 963a554b31d169be83003e6dd64a9c18fd7aae56 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Thu, 4 Sep 2014 17:04:53 +0200
Subject: [PATCH 1289/1453] cura(engine): update to 14.0{7,3}.

---
 pkgs/applications/misc/cura/default.nix       | 12 +++---
 pkgs/applications/misc/curaengine/default.nix | 37 ++++++++++---------
 2 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix
index 937025c08403..5c12ebcbfeba 100644
--- a/pkgs/applications/misc/cura/default.nix
+++ b/pkgs/applications/misc/cura/default.nix
@@ -1,15 +1,14 @@
-{ stdenv, python27Packages, curaengine, makeDesktopItem, fetchgit }:
+{ stdenv, python27Packages, curaengine, makeDesktopItem, fetchurl }:
 let
     py = python27Packages;
+    version = "14.07";
 in
 stdenv.mkDerivation rec {
   name = "cura";
 
-  src = fetchgit {
-    url = "https://github.com/daid/Cura";
-    rev = "58414695269d60ca9b165e8cbc3424933ed79403";
-    sha256 = "1nxrrz8sjjx9i9cyvz15vay6yarnywp3vlk7qzr65sw88lzxgq23";
-    fetchSubmodules = false;
+  src = fetchurl {
+    url = "https://github.com/daid/Cura/archive/${version}.tar.gz";
+    sha256 = "1jfgkb2qh1syakcssk66yhnfjm9p9qcx48v34bbza9nryrdlmxdb";
   };
 
   desktopItem = makeDesktopItem {
@@ -67,5 +66,6 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/daid/Cura;
     license = licenses.agpl3;
     platforms = platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ the-kenny ];
   };
 }
diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix
index 256d337f679e..e004b7db336c 100644
--- a/pkgs/applications/misc/curaengine/default.nix
+++ b/pkgs/applications/misc/curaengine/default.nix
@@ -1,22 +1,25 @@
-{ stdenv, fetchgit }:
+{ stdenv, fetchurl }:
+let
+  version = "14.03";
+in
 stdenv.mkDerivation {
-    name = "curaengine";
+  name = "curaengine";
 
-    src = fetchgit {
-        url = "https://github.com/Ultimaker/CuraEngine";
-        rev = "62667ff2e7479b55d75e3d1dc9136242adf4a6a0";
-        sha256 = "0c68xmnq4c49vzg2cyqb375kc72rcnghj21wp3919w8sfwil00vr";
-    };
+  src = fetchurl {
+    url = "https://github.com/Ultimaker/CuraEngine/archive/${version}.tar.gz";
+    sha256 = "0f37jk6w3zd9x29c1rydqmfdzybx9nbmwdi3y3nzynq1vq7zmxcc";
+  };
 
-    installPhase = ''
-        mkdir -p $out/bin
-        cp CuraEngine $out/bin/
-    '';
+  installPhase = ''
+    mkdir -p $out/bin
+    cp CuraEngine $out/bin/
+  '';
 
-    meta = with stdenv.lib; {
-        description = "Engine for processing 3D models into 3D printing instructions";
-        homepage = https://github.com/Ultimaker/CuraEngine;
-        license = licenses.agpl3;
-        platforms = platforms.linux;
-    };
+  meta = with stdenv.lib; {
+    description = "Engine for processing 3D models into 3D printing instructions";
+    homepage = https://github.com/Ultimaker/CuraEngine;
+    license = licenses.agpl3;
+    platforms = platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ the-kenny ];
+  };
 }

From 40b13e798b9bdeb614865f67f961af1b825c2325 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Sat, 9 Aug 2014 17:13:21 -0300
Subject: [PATCH 1290/1453] CImg and WxCam - New Packages #3519

In this commit, I'm including two new softwares
* CImg: A small, simple image toolkit library
* WxCam: a small, simple, wxGTK-based webcam application
---
 pkgs/applications/video/wxcam/default.nix   | 52 +++++++++++++++++++++
 pkgs/development/libraries/cimg/builder.sh  | 12 +++++
 pkgs/development/libraries/cimg/default.nix | 27 +++++++++++
 pkgs/top-level/all-packages.nix             |  9 ++++
 4 files changed, 100 insertions(+)
 create mode 100644 pkgs/applications/video/wxcam/default.nix
 create mode 100644 pkgs/development/libraries/cimg/builder.sh
 create mode 100644 pkgs/development/libraries/cimg/default.nix

diff --git a/pkgs/applications/video/wxcam/default.nix b/pkgs/applications/video/wxcam/default.nix
new file mode 100644
index 000000000000..1f66d9a589b0
--- /dev/null
+++ b/pkgs/applications/video/wxcam/default.nix
@@ -0,0 +1,52 @@
+{ stdenv, fetchurl
+, pkgconfig
+, intltool
+, libX11, libXv, libSM
+, gtk, libglade
+, wxGTK
+, perlXMLParser
+, xvidcore
+, mjpegtools
+, alsaLib
+, libv4l
+, cimg
+}:
+
+stdenv.mkDerivation rec {
+
+  name = "wxcam-${version}";
+  version = "1.1";
+
+  src = fetchurl {
+    url = "http://downloads.sourceforge.net/project/wxcam/wxcam/${version}/${name}.tar.gz";
+    sha256 = "1765bvc65fpzn9ycnnj5hais9xkx9v0sm6a878d35x54bpanr859";
+  };
+
+  buildInputs = with stdenv.lib;
+  [ pkgconfig intltool libX11 libXv libSM gtk libglade wxGTK perlXMLParser xvidcore mjpegtools alsaLib libv4l cimg ];
+
+  NIX_CFLAGS_COMPILE="-I ${cimg}/include/cimg";
+
+  postUnpack = ''
+    sed -ie 's|/usr/share/|'"$out/share/"'|g' $sourceRoot/Makefile.in
+  '';
+
+  installPhase = ''
+    make install prefix="$out" wxcamdocdir="$out/share/doc/wxcam"
+  '';    
+  
+  meta = {
+    description = "An open-source, wxGTK-based webcam app for Linux"; 
+    longDescription = ''
+    wxCam is a webcam application for linux. It supports video recording
+    (avi uncompressed and Xvid formats), snapshot taking, and some special
+    commands for philips webcams, so you can also use it for astronomy purposes.
+    It supports both video4linux 1 and 2 drivers,
+    so it should work on a very large number of devices.
+    '';
+    homepage = http://wxcam.sourceforge.net/;
+    license = stdenv.lib.licenses.gpl3Plus;
+    maintainers = [ stdenv.lib.maintainers.AndersonTorres ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/cimg/builder.sh b/pkgs/development/libraries/cimg/builder.sh
new file mode 100644
index 000000000000..bbd5f7125517
--- /dev/null
+++ b/pkgs/development/libraries/cimg/builder.sh
@@ -0,0 +1,12 @@
+
+source $stdenv/setup
+
+unpackPhase
+cd $sourceRoot
+
+install -dm 755 $out/include/cimg $out/share/doc/cimg/html $out/share/cimg/examples $out/share/cimg/plugins
+
+install -m 644 CImg.h $out/include/cimg
+cp -dr --no-preserve=ownership html/* $out/share/doc/cimg/html/
+cp -dr --no-preserve=ownership examples/* $out/share/cimg/examples/
+cp -dr --no-preserve=ownership plugins/* $out/share/cimg/plugins/
diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix
new file mode 100644
index 000000000000..17b18e8f0be8
--- /dev/null
+++ b/pkgs/development/libraries/cimg/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl
+, unzip
+}:
+
+stdenv.mkDerivation rec {
+
+  name = "cimg-${version}";
+  version = "1.5.9";
+
+  src = fetchurl {
+    url = "http://downloads.sourceforge.net/project/cimg/CImg-${version}.zip";
+    sha256 = "1xn20643gcbl76kvy9ajhwbyjjb73mg65q32ma8mdkwn1qhn7f7c";
+  };
+
+  buildInputs = with stdenv.lib;
+  [ unzip ];
+
+  builder = ./builder.sh;
+  
+  meta = with stdenv.lib; {
+    description = "A small, open source, C++ toolkit for image processing";
+    homepage = http://cimg.sourceforge.net/;
+    license = licenses.cecill-c;
+    maintainers = [ maintainers.AndersonTorres ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1003bf4652c3..2686936fe683 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4481,6 +4481,8 @@ let
 
   capnproto = callPackage ../development/libraries/capnproto { };
 
+  cimg = callPackage  ../development/libraries/cimg { };
+
   scmccid = callPackage ../development/libraries/scmccid { };
 
   ccrtp = callPackage ../development/libraries/ccrtp { };
@@ -10221,6 +10223,13 @@ let
 
   wxhexeditor = callPackage ../applications/editors/wxhexeditor { };
 
+  wxcam = callPackage ../applications/video/wxcam {
+    inherit (gnome) libglade;
+    inherit intltool;
+    wxGTK = wxGTK28;
+    gtk = gtk2;
+  };    
+
   x11vnc = callPackage ../tools/X11/x11vnc { };
 
   x2vnc = callPackage ../tools/X11/x2vnc { };

From 476ca07d8e43c8a43b738f3e085424e1c47f453e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 4 Sep 2014 18:43:57 +0200
Subject: [PATCH 1291/1453] require Nix 1.7 for nixpkgs, since we're using
 antiquotation inside quoted attribute sets

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

diff --git a/default.nix b/default.nix
index c1b9bfd39f92..e0df520721cf 100644
--- a/default.nix
+++ b/default.nix
@@ -1,6 +1,6 @@
-if ! builtins ? nixVersion || builtins.compareVersions "1.6" builtins.nixVersion == 1 then
+if ! builtins ? nixVersion || builtins.compareVersions "1.7" builtins.nixVersion == 1 then
 
-  abort "This version of Nixpkgs requires Nix >= 1.6, please upgrade!"
+  abort "This version of Nixpkgs requires Nix >= 1.7, please upgrade!"
 
 else
 

From 3a38a9b127fd36db20e1a9b1f0eab2a5fd5086d9 Mon Sep 17 00:00:00 2001
From: Andreas Herrmann <andreash87@gmx.ch>
Date: Thu, 4 Sep 2014 18:47:57 +0200
Subject: [PATCH 1292/1453] mpi4py: Change description

---
 pkgs/development/python-modules/mpi4py/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix
index 4422c4e9f37a..ec181652da66 100644
--- a/pkgs/development/python-modules/mpi4py/default.nix
+++ b/pkgs/development/python-modules/mpi4py/default.nix
@@ -47,7 +47,7 @@ buildPythonPackage rec {
 
   meta = {
     description =
-      "Provides Python bindings for the Message Passing Interface standard";
+      "Python bindings for the Message Passing Interface standard";
     homepage = "http://code.google.com/p/mpi4py/";
     license = stdenv.lib.licenses.bsd3;
   };

From f41e336cc00cc513e0d7ab67030ceb939ac46984 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 3 Sep 2014 18:31:22 +0200
Subject: [PATCH 1293/1453] python-path: new package

path is a module wrapper for os.path.

It's a dependency of moretools (which is a dependency of
robotframework-tools, which is what I want to package).
---
 pkgs/top-level/python-packages.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ed334d27e0e6..26a0a61d9bbf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5583,6 +5583,22 @@ rec {
     };
   };
 
+  pathpy = buildPythonPackage rec {
+    name = "path.py-5.2";
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/p/path.py/${name}.zip";
+      sha256 = "0n1kpbbm1dg5f484yzxr7gb3ak6vjp92j70nw3bgjzsj9fh26afq";
+    };
+
+    meta = with stdenv.lib; {
+      description = "A module wrapper for os.path";
+      homepage = http://github.com/jaraco/path.py;
+      license = licenses.mit;
+      platforms = platforms.linux;
+    };
+  };
+
   paypalrestsdk = buildPythonPackage rec {
     name = "paypalrestsdk-0.7.0";
 

From c1614ab180a393a11f3b14fb3544b8ab03d9e1c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 3 Sep 2014 18:32:03 +0200
Subject: [PATCH 1294/1453] python-moretools: new package

It provides "Many more basic tools for python 2/3 extending itertools,
functools, operator and collections".

It's a dependency of robotframework-tools, which I want to package.
---
 pkgs/top-level/python-packages.nix | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 26a0a61d9bbf..b4b4520a8c50 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4734,6 +4734,25 @@ rec {
     };
   });
 
+  moretools = buildPythonPackage rec {
+    name = "moretools-0.1a41";
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/m/moretools/${name}.tar.gz";
+      sha256 = "1n442wprbl3cmg08233m1sr3g4z0i8hv9g6bhch7kzdmbl21399f";
+    };
+
+    buildInputs = [ six pathpy setuptools ];
+    propagatedBuildInputs = [ decorator ];
+
+    meta = with stdenv.lib; {
+      description = "Many more basic tools for python 2/3 extending itertools, functools, operator and collections";
+      homepage = https://bitbucket.org/userzimmermann/python-moretools;
+      license = licenses.gpl3Plus;
+      platforms = platforms.linux;
+    };
+  };
+
 
   mox = buildPythonPackage rec {
     name = "mox-0.5.3";

From 53732eac2a66ce7a30c4eea5a27cbe04509dc00b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 3 Sep 2014 18:32:26 +0200
Subject: [PATCH 1295/1453] python-robotframework-tools: new package

This package provides "Python Tools for Robot Framework and Test
Libraries".

In particular, I'm interested in the 'robotshell' extension for IPython.
---
 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 b4b4520a8c50..52927fa5f31a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7280,6 +7280,26 @@ rec {
   };
 
 
+  robotframework-tools = buildPythonPackage rec {
+    version = "0.1a115";
+    name = "robotframework-tools-${version}";
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/r/robotframework-tools/${name}.tar.gz";
+      sha256 = "04gkn1zpf3rsvbqdxrrjqqi8sa0md9gqwh6n5w2m03fdwjg4lc7q";
+    };
+
+    propagatedBuildInputs = [ robotframework moretools pathpy six setuptools ];
+
+    meta = with stdenv.lib; {
+      description = "Python Tools for Robot Framework and Test Libraries";
+      homepage = http://bitbucket.org/userzimmermann/robotframework-tools;
+      license = licenses.gpl3;
+      platforms = platforms.linux;
+    };
+  };
+
+
   robotsuite = buildPythonPackage rec {
     version = "1.4.2";
     name = "robotsuite-${version}";

From 4cae816420c9b9838b52983bb63cd96c1c1ae5e4 Mon Sep 17 00:00:00 2001
From: Andreas Herrmann <andreash87@gmx.ch>
Date: Thu, 4 Sep 2014 18:48:08 +0200
Subject: [PATCH 1296/1453] h5py: Change description

---
 pkgs/development/python-modules/h5py/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix
index f4df05fa595c..39a35ad49c6e 100644
--- a/pkgs/development/python-modules/h5py/default.nix
+++ b/pkgs/development/python-modules/h5py/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
 
   meta = {
     description =
-      "Provides a Pythonic interface to the HDF5 binary data format";
+      "Pythonic interface to the HDF5 binary data format";
     homepage = "http://www.h5py.org/";
     license = stdenv.lib.licenses.bsd2;
   };

From ad83a961ae37bfd1029c335ccfa3ebdd7816a894 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 4 Sep 2014 11:35:48 -0500
Subject: [PATCH 1297/1453] zotero: update to 4.0.22

Drop firefox-30.0, which we were only keeping around for
xulrunner-30.0. New Zotero version is compatible up to firefox-32.0.
---
 .../networking/browsers/firefox/30.nix        | 211 ------------------
 pkgs/applications/office/zotero/default.nix   |   6 +-
 pkgs/top-level/all-packages.nix               |  12 +-
 3 files changed, 4 insertions(+), 225 deletions(-)
 delete mode 100644 pkgs/applications/networking/browsers/firefox/30.nix

diff --git a/pkgs/applications/networking/browsers/firefox/30.nix b/pkgs/applications/networking/browsers/firefox/30.nix
deleted file mode 100644
index 1e2c3e2cfb19..000000000000
--- a/pkgs/applications/networking/browsers/firefox/30.nix
+++ /dev/null
@@ -1,211 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
-, libjpeg, libpng, zlib, dbus, dbus_glib, bzip2, xlibs
-, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
-, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
-, hunspell, libevent, libstartup_notification, libvpx
-, cairo, gstreamer, gst_plugins_base, icu
-, debugBuild ? false
-, # If you want the resulting program to call itself "Firefox" instead
-  # of "Shiretoko" or whatever, enable this option.  However, those
-  # binaries may not be distributed without permission from the
-  # Mozilla Foundation, see
-  # http://www.mozilla.org/foundation/trademarks/.
-  enableOfficialBranding ? false
-}:
-
-assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
-
-rec {
-
-  firefoxVersion = "30.0";
-
-  xulVersion = "30.0"; # this attribute is used by other packages
-
-
-  src = fetchurl {
-    url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
-    sha1 = "bll9hxf31gvg9db6gxgmq25qsjif3p11";
-  };
-
-  commonConfigureFlags =
-    [ "--with-system-jpeg"
-      "--with-system-zlib"
-      "--with-system-bz2"
-      "--with-system-nspr"
-      "--with-system-nss"
-      "--with-system-libevent"
-      "--with-system-libvpx"
-      "--with-system-png"
-      # "--with-system-icu" # causes ‘ar: invalid option -- 'L'’ in Firefox 28.0
-      "--enable-system-ffi"
-      "--enable-system-hunspell"
-      "--enable-system-pixman"
-      "--enable-system-sqlite"
-      "--enable-system-cairo"
-      "--enable-gstreamer"
-      "--enable-startup-notification"
-      # "--enable-content-sandbox"            # available since 26.0, but not much info available
-      # "--enable-content-sandbox-reporter"   # keeping disabled for now
-      "--disable-crashreporter"
-      "--disable-tests"
-      "--disable-necko-wifi" # maybe we want to enable this at some point
-      "--disable-installer"
-      "--disable-updater"
-      "--disable-pulseaudio"
-    ] ++ (if debugBuild then [ "--enable-debug" "--enable-profiling"]
-                        else [ "--disable-debug" "--enable-release"
-                               "--enable-optimize" "--enable-strip" ]);
-
-
-  xulrunner = stdenv.mkDerivation rec {
-    name = "xulrunner-${xulVersion}";
-
-    inherit src;
-
-    buildInputs =
-      [ pkgconfig libpng gtk perl zip libIDL libjpeg zlib bzip2
-        python dbus dbus_glib pango freetype fontconfig xlibs.libXi
-        xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
-        alsaLib nspr nss libnotify xlibs.pixman yasm mesa
-        xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite
-        xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper
-        hunspell libevent libstartup_notification libvpx cairo
-        gstreamer gst_plugins_base icu
-      ];
-
-    configureFlags =
-      [ "--enable-application=xulrunner"
-        "--disable-javaxpcom"
-      ] ++ commonConfigureFlags;
-
-    #enableParallelBuilding = true; # cf. https://github.com/NixOS/nixpkgs/pull/1699#issuecomment-35196282
-
-    preConfigure =
-      ''
-        export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}"
-
-        mkdir ../objdir
-        cd ../objdir
-        configureScript=../mozilla-release/configure
-      ''; # */
-
-    #installFlags = "SKIP_GRE_REGISTRATION=1";
-
-    preInstall = ''
-      # The following is needed for startup cache creation on grsecurity kernels
-      paxmark m ../objdir/dist/bin/xpcshell
-    '';
-
-    postInstall = ''
-      # Fix run-mozilla.sh search
-      libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*)
-      echo libDir: $libDir
-      test -n "$libDir"
-      cd $out/bin
-      rm xulrunner
-
-      for i in $out/lib/$libDir/*; do
-          file $i;
-          if file $i | grep executable &>/dev/null; then
-              echo -e '#! /bin/sh\nexec "'"$i"'" "$@"' > "$out/bin/$(basename "$i")";
-              chmod a+x "$out/bin/$(basename "$i")";
-          fi;
-      done
-      for i in $out/lib/$libDir/*.so; do
-          patchelf --set-rpath "$(patchelf --print-rpath "$i"):$out/lib/$libDir" $i || true
-      done
-
-      # For grsecurity kernels
-      paxmark m $out/lib/$libDir/{plugin-container,xulrunner}
-
-      for i in $out/lib/$libDir/{plugin-container,xulrunner,xulrunner-stub}; do
-          wrapProgram $i --prefix LD_LIBRARY_PATH ':' "$out/lib/$libDir"
-      done
-
-      rm -f $out/bin/run-mozilla.sh
-    ''; # */
-
-    meta = {
-      description = "Mozilla Firefox XUL runner";
-      homepage = http://www.mozilla.com/en-US/firefox/;
-    };
-
-    passthru = { inherit gtk; version = xulVersion; };
-  };
-
-
-  firefox = stdenv.mkDerivation rec {
-    name = "firefox-${firefoxVersion}";
-
-    inherit src;
-
-    enableParallelBuilding = true;
-
-    buildInputs =
-      [ pkgconfig libpng gtk perl zip libIDL libjpeg zlib bzip2 python
-        dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify
-        xlibs.pixman yasm mesa sqlite file unzip pysqlite
-        hunspell libevent libstartup_notification libvpx cairo
-        gstreamer gst_plugins_base icu
-      ];
-
-    patches = [
-      ./disable-reporter.patch # fixes "search box not working when built on xulrunner"
-      ./xpidl.patch
-    ];
-
-    propagatedBuildInputs = [xulrunner];
-
-    configureFlags =
-      [ "--enable-application=browser"
-        "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"
-        "--enable-chrome-format=jar"
-      ]
-      ++ commonConfigureFlags
-      ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
-
-    makeFlags = [
-      "SYSTEM_LIBXUL=1"
-    ];
-
-    # Because preConfigure runs configure from a subdirectory.
-    configureScript = "../configure";
-
-    preConfigure =
-      ''
-        # Hack to work around make's idea of -lbz2 dependency
-        find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${
-          stdenv.lib.concatStringsSep ":"
-            (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc]))
-        }' ';'
-
-        # Building directly in the main source directory is not allowed.
-        mkdir obj_dir
-        cd obj_dir
-      '';
-
-    postInstall =
-      ''
-        ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner
-        cd "$out/lib/"firefox-*
-        rm firefox
-        echo -e '#!${stdenv.shell}\nexec ${xulrunner}/bin/xulrunner "'"$PWD"'/application.ini" "$@"' > firefox
-        chmod a+x firefox
-
-        # Put chrome.manifest etc. in the right place.
-        mv browser/* .
-        rmdir browser
-      ''; # */
-
-    meta = {
-      description = "Mozilla Firefox - the browser, reloaded";
-      homepage = http://www.mozilla.com/en-US/firefox/;
-      maintainers = with stdenv.lib.maintainers; [ eelco wizeman ];
-    };
-
-    passthru = {
-      inherit gtk xulrunner nspr;
-      isFirefox3Like = true;
-    };
-  };
-}
diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix
index 0a5ef9099044..00fda8bf1c45 100644
--- a/pkgs/applications/office/zotero/default.nix
+++ b/pkgs/applications/office/zotero/default.nix
@@ -3,7 +3,7 @@
 assert (stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux");
 
 let
-  version = "4.0.21.2";
+  version = "4.0.22";
   arch = if stdenv.system == "x86_64-linux"
            then "linux-x86_64"
            else "linux-i686";
@@ -14,8 +14,8 @@ stdenv.mkDerivation {
   src = fetchurl {
     url = "https://download.zotero.org/standalone/${version}/Zotero-${version}_${arch}.tar.bz2";
     sha256 = if stdenv.system == "x86_64-linux"
-               then "1df101j2qwdp001m8x3ihbzz2j23x43804k8ww749y09d1ydb4dx"
-               else "1bcrpl6gdxlygd5ppyrhw42q24kjcakma3qv6mpzgp91phkf6g30";
+               then "0dq4x1cc0lnhs7g6w85qjdlb7sajr13mr2zcf4yvrciwhwy3r1i1"
+               else "0s4j2karaq85fwnd1niz8hzx5k71cqs493g38pg337i3iwxad9hg";
   };
 
   # Strip the bundled xulrunner
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2686936fe683..4415e35ee55e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3822,8 +3822,6 @@ let
     inherit (pythonPackages) pysqlite;
   };
 
-  xulrunner_30 = firefox30Pkgs.xulrunner;
-
 
   ### DEVELOPMENT / MISC
 
@@ -8869,12 +8867,6 @@ let
 
   firefox13Wrapper = wrapFirefox { browser = firefox13Pkgs.firefox; };
 
-  firefox30Pkgs = callPackage ../applications/networking/browsers/firefox/30.nix {
-    inherit (gnome) libIDL;
-    inherit (pythonPackages) pysqlite;
-    libpng = libpng_apng;
-  };
-
   firefox = callPackage ../applications/networking/browsers/firefox {
     inherit (gnome) libIDL;
     inherit (pythonPackages) pysqlite;
@@ -10383,9 +10375,7 @@ let
     pygtk = pyGtkGlade;
   };
   
-  zotero = callPackage ../applications/office/zotero {
-    xulrunner = xulrunner_30;
-  };
+  zotero = callPackage ../applications/office/zotero { };
 
   zynaddsubfx = callPackage ../applications/audio/zynaddsubfx { };
 

From 4d104542e987533f61cf6fb70cb970fc94e367b9 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Thu, 4 Sep 2014 19:10:46 +0200
Subject: [PATCH 1298/1453] Add keylogs, a GNU/Linux keylogger that works

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

diff --git a/pkgs/tools/security/logkeys/default.nix b/pkgs/tools/security/logkeys/default.nix
new file mode 100644
index 000000000000..ae7fa2316bcb
--- /dev/null
+++ b/pkgs/tools/security/logkeys/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchgit, which, procps, kbd }:
+
+stdenv.mkDerivation rec {
+  name = "logkeys-${version}";
+  version = "5ef6b0dcb9e3";
+
+  src = fetchgit {
+    url = "https://code.google.com/p/logkeys/";
+    rev = "5ef6b0dcb9e38e6137ad1579d624ec12107c56c3";
+    sha256 = "02p0l92l0fq069g31ks6xbqavzxa9njj9460vw2jsa7livcn2z9d";
+  };
+
+  buildInputs = [ which procps kbd ];
+
+  postPatch = ''
+    substituteInPlace src/Makefile.in --replace 'root' '$(id -u)'
+    substituteInPlace configure --replace '/dev/input' '/tmp'
+ '';
+
+  meta = with stdenv.lib; {
+    description = "A GNU/Linux keylogger that works!";
+    license = licenses.gpl3;
+    homepage = http://code.google.com/p/logkeys/;
+    maintainers = with maintainers; [offline];
+    platforms = with platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4415e35ee55e..6e5e6d92a4b2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1480,6 +1480,8 @@ let
     inherit (perlPackages) mimeConstruct;
   };
 
+  logkeys = callPackage ../tools/security/logkeys { };
+
   logrotate = callPackage ../tools/system/logrotate { };
 
   logstalgia = callPackage ../tools/graphics/logstalgia {};

From af8a91b0b2a41a3b53eaf153d672bb66edd2a057 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Thu, 4 Sep 2014 18:44:14 +0200
Subject: [PATCH 1299/1453] ant: update from 1.9.3 to 1.9.4

---
 pkgs/development/tools/build-managers/apache-ant/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/apache-ant/default.nix b/pkgs/development/tools/build-managers/apache-ant/default.nix
index 0dfb634c5944..751b40e714e8 100644
--- a/pkgs/development/tools/build-managers/apache-ant/default.nix
+++ b/pkgs/development/tools/build-managers/apache-ant/default.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, makeWrapper }:
 
-let version = "1.9.3"; in
+let version = "1.9.4"; in
 
 stdenv.mkDerivation {
   name = "ant-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://apache/ant/binaries/apache-ant-${version}-bin.tar.bz2";
-    sha1 = "efcf206e24b0dd1583c501182ad163af277951a4";
+    sha256 = "1kw801p8h5x4f0g8i5yknppssrj5a3xy1aqrkpfnk22bd1snbh90";
   };
 
   contrib = fetchurl {

From 32a3b655712091a589cd97905d8e762b4ebbdda2 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Thu, 4 Sep 2014 18:45:13 +0200
Subject: [PATCH 1300/1453] cgit: update from 0.10.1 to 0.10.2

---
 .../version-management/git-and-tools/cgit/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
index fb7232794c51..383114f1c3cc 100644
--- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "cgit-${version}";
-  version = "0.10.1";
+  version = "0.10.2";
 
   src = fetchurl {
     url = "http://git.zx2c4.com/cgit/snapshot/${name}.tar.xz";
-    sha256 = "0bci1p9spf79wirc4lk36cndcx2b9wj0fq1l58rlp6r563is77l3";
+    sha256 = "13ac4rqmxc87ymh78ff8kbw1s252nbid71l0ircmj9kmh9jqwncl";
   };
 
   # cgit is tightly coupled with git and needs a git source tree to build.

From e30baf653e1a2780c3453a65805b2c48e9a3bb4a Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Thu, 4 Sep 2014 18:45:51 +0200
Subject: [PATCH 1301/1453] cppcheck: update from 1.65 to 1.66

---
 pkgs/development/tools/analysis/cppcheck/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix
index ca4176dbe1eb..094cabb73060 100644
--- a/pkgs/development/tools/analysis/cppcheck/default.nix
+++ b/pkgs/development/tools/analysis/cppcheck/default.nix
@@ -4,14 +4,14 @@
 
 let
   name = "cppcheck";
-  version = "1.65";
+  version = "1.66";
 in
 stdenv.mkDerivation {
   name = "${name}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/${name}/${name}-${version}.tar.bz2";
-    sha256 = "0rsxnqvjyiviqsq4y5x4p1jpvcmhf8hh7d710rsvnv5d4cj7lmqn";
+    sha256 = "1dy1jd9ckqs565iwcv281pc3xmp9fnfw5ydh3wq06pyz74yw4scl";
   };
 
   configurePhase = ''

From f54f5539aa1d612446753bd52b0fedced7695042 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Thu, 4 Sep 2014 18:47:48 +0200
Subject: [PATCH 1302/1453] dhcpcd: update from 6.4.2 to 6.4.3

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

diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix
index 8e93c424cb1e..451e2954f402 100644
--- a/pkgs/tools/networking/dhcpcd/default.nix
+++ b/pkgs/tools/networking/dhcpcd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, udev }:
 
 stdenv.mkDerivation rec {
-  name = "dhcpcd-6.4.2";
+  name = "dhcpcd-6.4.3";
 
   src = fetchurl {
     url = "http://roy.marples.name/downloads/dhcpcd/${name}.tar.bz2";
-    sha256 = "1dr08aqvazg4ncq5p93v6givwh7naj75dn2npgplf3dl2fg9zfzf";
+    sha256 = "175bsmif76vigzljc4rpcjs5skx171y1bl37aj0w66p8krhh3b9n";
   };
 
   patches = [ /* ./lxc_ro_promote_secondaries.patch */ ];

From 14fd86307fe653c30fae933486e402a90d75d5b1 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Thu, 4 Sep 2014 18:48:42 +0200
Subject: [PATCH 1303/1453] diffstat: update from 1.58 to 1.59

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

diff --git a/pkgs/tools/text/diffstat/default.nix b/pkgs/tools/text/diffstat/default.nix
index e70dfaedddf5..62b696715d9c 100644
--- a/pkgs/tools/text/diffstat/default.nix
+++ b/pkgs/tools/text/diffstat/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "diffstat-1.58";
+  name = "diffstat-1.59";
 
   src = fetchurl {
     url = "ftp://invisible-island.net/diffstat/${name}.tgz";
-    sha256 = "14rpf5c05ff30f6vn6pn6pzy0k4g4is5im656ahsxff3k58i7mgs";
+    sha256 = "0w7jvfilbnfa9v3h8j8ipirvrj7n2x5gszfanzxvx748p10i8z96";
   };
 
   meta = with stdenv.lib; {

From c5697874c23d37cc1f1d77241e6028170cb5e418 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Thu, 4 Sep 2014 18:49:07 +0200
Subject: [PATCH 1304/1453] diffuse: update from 0.4.7 to 0.4.8

---
 pkgs/applications/version-management/diffuse/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/diffuse/default.nix b/pkgs/applications/version-management/diffuse/default.nix
index 92cdddd8dcb0..2bd4b5847241 100644
--- a/pkgs/applications/version-management/diffuse/default.nix
+++ b/pkgs/applications/version-management/diffuse/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, python, pygtk, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  version = "0.4.7";
+  version = "0.4.8";
   name = "diffuse-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/diffuse/diffuse/${version}/${name}.tar.bz2";
-    sha256 = "1b1riy9wix2gby78v9i30ijycjhkcyqsllggjakbkx26sb5nmxdh";
+    sha256 = "0ayz8bywmk1z3zicb0a7hbxliqpc7xym60s0mawzqllkpadvgly1";
   };
 
   buildInputs = [ python pygtk makeWrapper ];

From 2bfd7ae15c2c067a7a367ba4db8255a489e8016a Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Thu, 4 Sep 2014 18:50:07 +0200
Subject: [PATCH 1305/1453] dos2unix: update from 6.0.5 to 6.0.6

---
 pkgs/tools/text/dos2unix/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/text/dos2unix/default.nix b/pkgs/tools/text/dos2unix/default.nix
index a87901eb5eb9..6851ca896783 100644
--- a/pkgs/tools/text/dos2unix/default.nix
+++ b/pkgs/tools/text/dos2unix/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, perl, gettext }:
 
 stdenv.mkDerivation {
-  name = "dos2unix-6.0.5";
+  name = "dos2unix-6.0.6";
   
   src = fetchurl {
-    url = http://waterlan.home.xs4all.nl/dos2unix/dos2unix-6.0.5.tar.gz;
-    sha256 = "13w5blhv0i473y9lyrxh4axz4niyrxcpj4v2qiq3w5kamyp20czx";
+    url = http://waterlan.home.xs4all.nl/dos2unix/dos2unix-6.0.6.tar.gz;
+    sha256 = "0xnj4gmav1ypkgwmqldnq41b6l3cg08dyngkbygn9vrhlvlx9fwa";
   };
 
   configurePhase = ''

From f2779233db4b7a8918838eb9fd296a4fcde477e3 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Thu, 4 Sep 2014 18:51:21 +0200
Subject: [PATCH 1306/1453] ethtool: update from 3.14 to 3.15

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

diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix
index 1b6205db7ce7..36d49ce9b235 100644
--- a/pkgs/tools/misc/ethtool/default.nix
+++ b/pkgs/tools/misc/ethtool/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "ethtool-3.14";
+  name = "ethtool-3.15";
 
   src = fetchurl {
     url = "mirror://kernel/software/network/ethtool/${name}.tar.xz";
-    sha256 = "01v7a757757bk68vvap2x0v6jbqicchnjxvh52w8dccixxq2nkj3";
+    sha256 = "16kgw9y4fisldf1z6zpw3v965cc8nram0dycacwkc0js4l76klw8";
   };
 
   meta = with stdenv.lib; {

From 1e543f02dfc2be80c174a1279e099e2b02418d62 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Thu, 4 Sep 2014 18:55:20 +0200
Subject: [PATCH 1307/1453] fldigi: update from 3.21.82 to 3.21.83

---
 pkgs/applications/audio/fldigi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/fldigi/default.nix b/pkgs/applications/audio/fldigi/default.nix
index e78095a9c5df..e0250055ccda 100644
--- a/pkgs/applications/audio/fldigi/default.nix
+++ b/pkgs/applications/audio/fldigi/default.nix
@@ -2,13 +2,13 @@
   libsamplerate, pulseaudio, libXinerama, gettext, pkgconfig, alsaLib }:
 
 stdenv.mkDerivation rec {
-  version = "3.21.82";
+  version = "3.21.83";
   pname = "fldigi";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "http://www.w1hkj.com/downloads/${pname}/${name}.tar.gz";
-    sha256 = "1q2fc1zm9kfsjir4g6fh95vmjdq984iyxfcs6q4gjqy1znhqcyqs";
+    sha256 = "1fyg6dc6xnxb620rrhws60wj10lsgbwsmnhz8vc6ncspx8mx7019";
   };
 
   buildInputs = [ libXinerama gettext hamlib fltk13 libjpeg libpng portaudio

From bff6e8de3c8e4f2365a6dbf3a6b9b1beb52d989f Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Thu, 4 Sep 2014 18:57:51 +0200
Subject: [PATCH 1308/1453] gnuradio: update from 3.7.3 to 3.7.5

---
 pkgs/applications/misc/gnuradio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/gnuradio/default.nix b/pkgs/applications/misc/gnuradio/default.nix
index 1a0dea586d0e..19455f972a55 100644
--- a/pkgs/applications/misc/gnuradio/default.nix
+++ b/pkgs/applications/misc/gnuradio/default.nix
@@ -23,11 +23,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnuradio-${version}";
-  version = "3.7.3";
+  version = "3.7.5";
 
   src = fetchurl {
     url = "http://gnuradio.org/releases/gnuradio/${name}.tar.gz";
-    sha256 = "0caj7dqppav53nhn0ima106hpsn0sakw57v1ihac9fk7ka0x2w8w";
+    sha256 = "0hv2nyz2hp1mjinin2q7jimh9mr81rjqvghqmaglz8w70qcn4zs6";
   };
 
   buildInputs = [

From 8c2384a7cf4d77a6069c90d98ac61f9d2db9fa6e Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Thu, 4 Sep 2014 18:59:27 +0200
Subject: [PATCH 1309/1453] gparted: update from 0.18.0 to 0.19.1

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

diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix
index 16c7f652deca..cc07ac95db8d 100644
--- a/pkgs/tools/misc/gparted/default.nix
+++ b/pkgs/tools/misc/gparted/default.nix
@@ -2,11 +2,11 @@
 , pkgconfig, gtkmm, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "gparted-0.18.0";
+  name = "gparted-0.19.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/gparted/${name}.tar.bz2";
-    sha256 = "0slyf0sbv7a7xvdcpn9ibnixpy0w4s6zwpz6sklkxcyfybw1j7xz";
+    sha256 = "1x0mbks94jpzphb8hm8w0iqjrn665jkdm4qnzrvxrnvy0x3m2fwd";
   };
 
   configureFlags = "--disable-doc";

From 0fe866c3a15a62e800ac85f0c2925cc2d25eda97 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Thu, 4 Sep 2014 19:00:59 +0200
Subject: [PATCH 1310/1453] gtkwave: update from 3.3.53 to 3.3.61

---
 pkgs/applications/science/electronics/gtkwave/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix
index c761f6196424..a2f07bfe43df 100644
--- a/pkgs/applications/science/electronics/gtkwave/default.nix
+++ b/pkgs/applications/science/electronics/gtkwave/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, gtk, gperf, pkgconfig, bzip2, tcl, tk, judy, xz}:
 stdenv.mkDerivation rec {
-  name = "gtkwave-3.3.53";
+  name = "gtkwave-3.3.61";
 
   src = fetchurl {
     url = "mirror://sourceforge/gtkwave/${name}.tar.gz";
-    sha256 = "1jmrk2p2azjca250h2bi4c8v0cp1gqd3c027dx18sxy3cgw1fsp1";
+    sha256 = "1f8cw7xfr83mc5j6vq53jzzyw3n6pqdmrj4a7pm53m1wvjgk4w3v";
   };
 
   buildInputs = [ gtk gperf pkgconfig bzip2 tcl tk judy xz ];

From f73f7ccc6e0b17d08d2ef689b76755769d3663b4 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 3 Sep 2014 14:40:27 -0700
Subject: [PATCH 1311/1453] nixos/install-grub: Read correct mountpoints

---
 .../modules/system/boot/loader/grub/grub.nix  |  2 +-
 .../system/boot/loader/grub/install-grub.pl   | 45 ++++++++++++++++---
 2 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index bc9a155ac95b..892cd995a519 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -260,7 +260,7 @@ in
         if cfg.devices == [] then
           throw "You must set the option ‘boot.loader.grub.device’ to make the system bootable."
         else
-          "PERL5LIB=${makePerlPath [ pkgs.perlPackages.XMLLibXML pkgs.perlPackages.XMLSAX ]} " +
+          "PERL5LIB=${makePerlPath (with pkgs.perlPackages; [ FileSlurp XMLLibXML XMLSAX ])} " +
           "${pkgs.perl}/bin/perl ${./install-grub.pl} ${grubConfig}";
 
       system.build.grub = grub;
diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index 2dad8b36db32..eef81d81484e 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -6,6 +6,7 @@ use File::Basename;
 use File::Path;
 use File::stat;
 use File::Copy;
+use File::Slurp;
 use POSIX;
 use Cwd;
 
@@ -70,14 +71,48 @@ struct(Fs => {
     type => '$',
     mount => '$',
 });
+sub PathInMount {
+    my ($path, $mount) = @_;
+    my @splitMount = split /\//, $mount;
+    my @splitPath = split /\//, $path;
+    if ($#splitPath < $#splitMount) {
+        return 0;
+    }
+    for (my $i = 0; $i <= $#splitMount; $i++) {
+        if ($splitMount[$i] ne $splitPath[$i]) {
+            return 0;
+        }
+    }
+    return 1;
+}
 sub GetFs {
     my ($dir) = @_;
-    my ($status, @dfOut) = runCommand("df -T $dir");
-    if ($status != 0 || $#dfOut != 1) {
-        die "Failed to retrieve output about $dir from `df`";
+    my $bestFs = Fs->new(device => "", type => "", mount => "");
+    foreach my $fs (read_file("/proc/self/mountinfo")) {
+        chomp $fs;
+        my @fields = split / /, $fs;
+        my $mountPoint = $fields[4];
+        next unless -d $mountPoint;
+        my @mountOptions = split /,/, $fields[5];
+
+        # Skip the optional fields.
+        my $n = 6; $n++ while $fields[$n] ne "-"; $n++;
+        my $fsType = $fields[$n];
+        my $device = $fields[$n + 1];
+        my @superOptions = split /,/, $fields[$n + 2];
+
+        # Skip the read-only bind-mount on /nix/store.
+        next if $mountPoint eq "/nix/store" && (grep { $_ eq "rw" } @superOptions) && (grep { $_ eq "ro" } @mountOptions);
+
+        # Ensure this matches the intended directory
+        next unless PathInMount($dir, $mountPoint);
+
+        # Is it better than our current match?
+        if (length($mountPoint) > length($bestFs->mount)) {
+            $bestFs = Fs->new(device => $device, type => $fsType, mount => $mountPoint);
+        }
     }
-    my @boot = split(/[ \n\t]+/, $dfOut[1]);
-    return Fs->new(device => $boot[0], type => $boot[1], mount => $boot[6]);
+    return $bestFs;
 }
 struct (Grub => {
     path => '$',

From c6bd6d6d89abee84d08f12786086ef9e4ccd0860 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 4 Sep 2014 09:15:59 -0700
Subject: [PATCH 1312/1453] nixos/grub: Assert devices should be absolute paths

---
 nixos/modules/system/boot/loader/grub/grub.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index 892cd995a519..0269b95ae1db 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -277,7 +277,11 @@ in
         '') config.boot.loader.grub.extraFiles);
 
     assertions = [{ assertion = !cfg.zfsSupport || cfg.version == 2;
-                    message = "Only grub version 2 provides zfs support";}];
+                    message = "Only grub version 2 provides zfs support";}]
+      ++ flip map cfg.devices (dev: {
+        assertion = hasPrefix "/" dev;
+        message = "Grub devices must be absolute paths, not ${dev}";
+      });
 
     })
 

From 6fcab9baca7711255be2615f490c3bf522334859 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Tue, 26 Aug 2014 19:32:35 +0200
Subject: [PATCH 1313/1453] libretro-cores:   - adding: 4do, desmume, fceumm,
 mame, mupen64plus, scummvm,             snes9x, stella, picodrive, ppsspp and
 vba

retroarch:
  - added retroarch wrapper for configured cores
  - changed attributes, old retroarch is now retroarchBare*
---
 pkgs/misc/emulators/retroarch/cores.nix   | 170 ++++++++++++++++++++++
 pkgs/misc/emulators/retroarch/default.nix |   4 +-
 pkgs/misc/emulators/retroarch/master.nix  |  17 ++-
 pkgs/misc/emulators/retroarch/wrapper.nix |  36 +++++
 pkgs/top-level/all-packages.nix           |  45 ++++--
 5 files changed, 254 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/misc/emulators/retroarch/cores.nix
 create mode 100644 pkgs/misc/emulators/retroarch/wrapper.nix

diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix
new file mode 100644
index 000000000000..f1cef0acc1c2
--- /dev/null
+++ b/pkgs/misc/emulators/retroarch/cores.nix
@@ -0,0 +1,170 @@
+{ stdenv, fetchgit, pkgconfig, makeWrapper, python27
+, retroarch, fluidsynth, mesa, SDL, libpng, libjpeg, libvorbis, zlib }:
+
+let
+
+  d2u = stdenv.lib.replaceChars ["-"] ["_"];
+
+  mkLibRetroCore = ({ core, src, description, ... }@a:
+  stdenv.lib.makeOverridable stdenv.mkDerivation rec {
+
+    name = "libretro-${core}-${version}";
+    version = "20140902";
+    inherit src;
+
+    buildInputs = [ makeWrapper retroarch zlib ] ++ a.extraBuildInputs or [];
+
+    buildPhase = "make -f Makefile.libretro";
+    installPhase = ''
+      COREDIR="$out/lib/retroarch/cores"
+      mkdir -p $out/bin
+      mkdir -p $COREDIR
+      mv ${d2u core}_libretro.so $COREDIR/.
+      makeWrapper ${retroarch}/bin/retroarch $out/bin/retroarch-${core} \
+        --add-flags "-L $COREDIR/${d2u core}_libretro.so $@"
+    '';
+
+    passthru.libretroCore = "/lib/retroarch/cores";
+
+    meta = with stdenv.lib; {
+      inherit description;
+      homepage = "http://www.libretro.com/";
+      license = licenses.gpl3Plus;
+      maintainers = [ maintainers.edwtjo ];
+      platforms = platforms.linux;
+    };
+  } // a);
+
+  fetchRetro = { repo, rev, sha256 }:
+  fetchgit {
+    inherit rev sha256;
+    url = "https://github.com/libretro/${repo}.git";
+    fetchSubmodules = true;
+  };
+
+in
+
+{
+
+  _4do = (mkLibRetroCore rec {
+    core = "4do";
+    src = fetchRetro {
+      repo = core + "-libretro";
+      rev = "961812bc421f3fbfd83ea211783bb511a0b6d31c";
+      sha256 = "0217iq8sj8gn161c3mj632csl1da8ir2ffxxdillpcddv6ppsayl";
+    };
+    description = "Port of 4DO/libfreedo to libretro";
+  }).override {
+    buildPhase = "make";
+  };
+
+  desmume = mkLibRetroCore rec {
+    core = "desmume";
+    src = fetchRetro {
+      repo = core + "-libretro";
+      rev = "1dd58e4a9fa375b6909cd8718165a429d4b8bd6d";
+      sha256 = "137bw9316qxm8s6p0bzyvk39dv5b5bn60fgllmyj9z5y8x5lrc9l";
+    };
+    description = "libretro wrapper for desmume NDS emulator";
+  };
+
+  fceumm = mkLibRetroCore rec {
+    core = "fceumm";
+    src = fetchRetro {
+      repo = "libretro-" + core;
+      rev = "17e081541c9d36d0658e7139afa5b085aa0316c9";
+      sha256 = "0cn74z976rgjh7hf0yb1sdjlm347157893s2z397rgjvks8xssb0";
+    };
+    description = "FCEUmm libretro port";
+  };
+
+  mupen64plus = (mkLibRetroCore rec {
+    core = "mupen64plus";
+    src = fetchRetro {
+      repo = core + "-libretro";
+      rev = "2251b3aba2a5bb233ff49dd9b6472f2c0feb9b83";
+      sha256 = "04g93kj6n5vddbzfb30d8n711kg0yxfnl5v567aa854misn6gfxd";
+    };
+    description = "Libretro port of Mupen64 Plus, GL only";
+
+    extraBuildInputs = [ mesa ];
+  }).override {
+    buildPhase = "make WITH_DYNAREC=${if stdenv.system == "x86_64-linux" then "x86_64" else "x86"}";
+  };
+
+  scummvm = (mkLibRetroCore rec {
+    core = "scummvm";
+    src = fetchRetro {
+      repo = core;
+      rev = "c00247171ba8201614e85556c638b8825dc9f225";
+      sha256 = "1wir3x928b37va6gn14bmwsydkpk4afma5hppmbivw4qp8mj25pa";
+    };
+    description = "Libretro port of ScummVM";
+
+    extraBuildInputs = [ fluidsynth libjpeg libvorbis mesa SDL ];
+  }).override {
+    buildPhase = "cd backends/platform/libretro/build/;make";
+  };
+
+  snes9x-next = mkLibRetroCore rec {
+    core = "snes9x-next";
+    src = fetchRetro {
+      repo = core;
+      rev = "461d92be09e1857d215f51aeea448a8e180bbfdd";
+      sha256 = "0ci453qsyrv3brmy2szngis2xyvxilcv9yhc2qjz285mirg6fj57";
+    };
+    description = "Optimized port/rewrite of SNES9x 1.52+ to Libretro";
+  };
+
+  stella = (mkLibRetroCore rec {
+    core = "stella";
+    src = fetchRetro {
+      repo = core + "-libretro";
+      rev = "c7ee7ca7e8a29c986f49306c75832972f5749f72";
+      sha256 = "15wy9h3a2qk66lh8x40b3a9il0zkdflqil1h51zjmhq2zzsq8p95";
+    };
+    description = "Port of Stella to libretro";
+  }).override {
+    buildPhase = "make";
+  };
+
+  picodrive = (mkLibRetroCore rec {
+    core = "picodrive";
+    src = fetchRetro {
+      repo = core;
+      rev = "d84817550ac064fbba7ee718fb3baeda7d5546da";
+      sha256 = "17zh9m2v7h1cifzz8dcwqm4wn94zyhz6g85gf0aw6xylxahza627";
+    };
+    description = "Fast MegaDrive/MegaCD/32X emulator";
+
+    extraBuildInputs = [ libpng SDL ];
+  }).override {
+    patchPhase = "sed -i -e 's,SDL_CONFIG=\".*\",SDL_CONFIG=\"${SDL}/bin/sdl-config\",' configure";
+    configurePhase = "./configure";
+  };
+
+  ppsspp = (mkLibRetroCore rec {
+    core = "ppsspp";
+    src = fetchRetro {
+      repo = "libretro-" + core;
+      rev = "6ee828171218b26e124c5e8fa7877e6ee1d5ff79";
+      sha256 = "1559d4k3h0a2dv3684j4w924p2dg8z2j1fwhy7w9mhb5z4kddjhk";
+    };
+    description = "ppsspp libretro port";
+
+    extraBuildInputs = [ mesa ];
+  }).override{
+    buildPhase = "cd libretro && make";
+  };
+
+  vba-next = mkLibRetroCore rec {
+    core = "vba-next";
+    src = fetchRetro {
+      repo = core;
+      rev = "fb095107f83df5f93b8ba4833eaf43901f42c0c0";
+      sha256 = "0fvq1dfll27vjbmyh4qsp2nw166jsd91sjmf1sl84z56ab3q3iw8";
+    };
+    description = "VBA-M libretro port";
+  };
+
+}
\ No newline at end of file
diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix
index 8bc53da8f0c8..d110f2b789e2 100644
--- a/pkgs/misc/emulators/retroarch/default.nix
+++ b/pkgs/misc/emulators/retroarch/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "retroarch-0.9.9.7";
+  name = "retroarch-bare-0.9.9.7";
 
   src = fetchgit {
     url = "https://github.com/libretro/RetroArch.git";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     configureFlags="--global-config-dir=$out/etc"
   '';
- 
+
   meta = {
     description = "Modular multi-system game/emulator system";
     homepage = "http://www.libretro.com/";
diff --git a/pkgs/misc/emulators/retroarch/master.nix b/pkgs/misc/emulators/retroarch/master.nix
index 44bd6649045c..2efb43e5d5ee 100644
--- a/pkgs/misc/emulators/retroarch/master.nix
+++ b/pkgs/misc/emulators/retroarch/master.nix
@@ -1,8 +1,11 @@
-{ stdenv, fetchgit, pkgconfig, ffmpeg, mesa, nvidia_cg_toolkit, freetype, libxml2, libv4l
-, coreutils, python34, which, udev, alsaLib, libX11, libXext, libXxf86vm, libXdmcp, SDL
-, pulseaudio ? null }:
+{ stdenv, fetchgit, pkgconfig, ffmpeg, mesa, nvidia_cg_toolkit
+, freetype, libxml2, libv4l, coreutils, python34, which, udev, alsaLib
+, libX11, libXext, libXxf86vm, libXdmcp, SDL, pulseaudio ? null }:
+
 stdenv.mkDerivation rec {
-  name = "retroarch-20140902";
+  name = "retroarch-bare-${version}";
+  version = "20140902";
+
   src = fetchgit {
     url = git://github.com/libretro/RetroArch.git;
     rev = "0856091296c2e47409f36e13007805d71db69483";
@@ -19,10 +22,10 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://libretro.org/;
     description = "Multi-platform emulator frontend for libretro cores";
-    license = stdenv.lib.licenses.gpl3;
-    maintainers = with stdenv.lib.maintainers; [ MP2E ];
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ MP2E ];
   };
 }
diff --git a/pkgs/misc/emulators/retroarch/wrapper.nix b/pkgs/misc/emulators/retroarch/wrapper.nix
new file mode 100644
index 000000000000..f7e903ef5290
--- /dev/null
+++ b/pkgs/misc/emulators/retroarch/wrapper.nix
@@ -0,0 +1,36 @@
+{ stdenv, lib, makeWrapper, retroarch, cores }:
+
+let
+
+  p = builtins.parseDrvName retroarch.name;
+
+in
+
+stdenv.mkDerivation {
+  name = "retroarch-" + p.version;
+  version = p.version;
+
+  buildInputs = [ makeWrapper ];
+
+  buildCommand = ''
+    mkdir -p $out/lib
+    $(for coreDir in $cores
+    do
+      $(ln -s $coreDir/*.so $out/lib/.)
+    done)
+    makeWrapper ${retroarch}/bin/retroarch $out/bin/retroarch \
+      --suffix-each LD_LIBRARY_PATH ':' "$cores" \
+      --add-flags "-L $out/lib/ --menu" \
+  '';
+
+  cores = map (x: x + x.libretroCore) cores;
+  preferLocalBuild = true;
+
+  meta = with retroarch.meta; {
+    inherit license homepage;
+    description = description
+                  + " (with cores: "
+                  + lib.concatStrings (lib.intersperse ", " (map (x: ""+x.name) cores))
+                  + ")";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6e5e6d92a4b2..af3980aff7e4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1220,7 +1220,7 @@ let
    * objections before removal. The feature is integer coordinates
    */
   graphviz_2_0 = callPackage ../tools/graphics/graphviz/2.0.nix { };
-  
+
   /* Readded by Michael Raskin. There are programs in the wild
    * that do want 2.32 but not 2.0 or 2.36. Please give a day's notice for
    * objections before removal. The feature is libgraph.
@@ -7169,7 +7169,7 @@ let
   tomcat6 = callPackage ../servers/http/tomcat/6.0.nix { };
 
   tomcat7 = callPackage ../servers/http/tomcat/7.0.nix { };
-	
+
   tomcat8 = callPackage ../servers/http/tomcat/8.0.nix { };
 
   tomcat_mysql_jdbc = callPackage ../servers/http/tomcat/jdbc/mysql { };
@@ -9819,7 +9819,7 @@ let
   };
 
   stella = callPackage ../misc/emulators/stella { };
-  
+
   linuxstopmotion = callPackage ../applications/video/linuxstopmotion { };
 
   sweethome3d = recurseIntoAttrs (  (callPackage ../applications/misc/sweethome3d { })
@@ -10215,6 +10215,27 @@ let
       gtk_modules = [ libcanberra ];
     };
 
+  wrapRetroArch = { retroarch }:
+  let
+    cfg = stdenv.lib.attrByPath [ "retroarch" ] {} config;
+  in
+    import ../misc/emulators/retroarch/wrapper.nix {
+      inherit stdenv lib makeWrapper retroarch;
+      cores = with libretro;
+      ([ ]
+      ++ lib.optional (cfg.enable4do or false) _4do
+      ++ lib.optional (cfg.enableDesmume or false) desmume
+      ++ lib.optional (cfg.enableFceumm or false) fceumm
+      ++ lib.optional (cfg.enableMupen64Plus or false) mupen64plus
+      ++ lib.optional (cfg.enablePicodrive or false) picodrive
+      ++ lib.optional (cfg.enablePPSSPP or false) ppsspp
+      ++ lib.optional (cfg.enableScummVM or false) scummvm
+      ++ lib.optional (cfg.enableSnes9xNext or false) snes9x-next
+      ++ lib.optional (cfg.enableStella or false) stella
+      ++ lib.optional (cfg.enableVbaNext or false) vba-next
+      );
+  };
+
   wxhexeditor = callPackage ../applications/editors/wxhexeditor { };
 
   wxcam = callPackage ../applications/video/wxcam {
@@ -10222,7 +10243,7 @@ let
     inherit intltool;
     wxGTK = wxGTK28;
     gtk = gtk2;
-  };    
+  };
 
   x11vnc = callPackage ../tools/X11/x11vnc { };
 
@@ -10376,12 +10397,11 @@ let
   zim = callPackage ../applications/office/zim {
     pygtk = pyGtkGlade;
   };
-  
+
   zotero = callPackage ../applications/office/zotero { };
 
   zynaddsubfx = callPackage ../applications/audio/zynaddsubfx { };
 
-
   ### GAMES
 
   alienarena = callPackage ../games/alienarena { };
@@ -10897,7 +10917,7 @@ let
 
       libnm-qt = callPackage ../development/libraries/libnm-qt { };
 
-      massif-visualizer = callPackage ../development/tools/analysis/massif-visualizer { }; 
+      massif-visualizer = callPackage ../development/tools/analysis/massif-visualizer { };
 
       networkmanagement = callPackage ../tools/networking/networkmanagement { };
 
@@ -11477,8 +11497,15 @@ let
 
   putty = callPackage ../applications/networking/remote/putty { };
 
-  retroarch = callPackage ../misc/emulators/retroarch { };
-  retroarchMaster = callPackage ../misc/emulators/retroarch/master.nix { };
+  retroarchBare = callPackage ../misc/emulators/retroarch { };
+
+  retroarchBareMaster = callPackage ../misc/emulators/retroarch/master.nix { };
+
+  retroarch = wrapRetroArch { retroarch = retroarchBareMaster; };
+
+  libretro = recurseIntoAttrs (callPackage ../misc/emulators/retroarch/cores.nix {
+    retroarch = retroarchBareMaster;
+  });
 
   rssglx = callPackage ../misc/screensavers/rss-glx { };
 

From f21cccb2b63986a96775296f1f32d594faf6d6a0 Mon Sep 17 00:00:00 2001
From: Michael Fellinger <m.fellinger@gmail.com>
Date: Thu, 4 Sep 2014 20:24:21 +0200
Subject: [PATCH 1314/1453] vagrant: 1.6.3 -> 1.6.4

---
 pkgs/development/tools/vagrant/default.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix
index 072b8eeff5ca..69c91eff1799 100644
--- a/pkgs/development/tools/vagrant/default.nix
+++ b/pkgs/development/tools/vagrant/default.nix
@@ -3,19 +3,21 @@
 
 assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux";
 
+let version = "1.6.4";
+in
 stdenv.mkDerivation rec {
-  name = "vagrant-1.6.3";
+  name = "vagrant-${version}";
 
   src =
     if stdenv.system == "x86_64-linux" then
       fetchurl {
-        url    = https://dl.bintray.com/mitchellh/vagrant/vagrant_1.6.3_x86_64.deb;
-        sha256 = "1gmdg92dw7afnvpji0wg4nzr7vhk8mrmcqk3hcrkwscby2f2bhqg";
+        url    = "https://dl.bintray.com/mitchellh/vagrant/vagrant_${version}_x86_64.deb";
+        sha256 = "1f171d2yjs4p2kzlwcknx1k29qnjvaxizjrxp84ya3sfxvfckm92";
       }
     else
       fetchurl {
-        url    = https://dl.bintray.com/mitchellh/vagrant/vagrant_1.6.3_i686.deb;
-        sha256 = "1z26b6yghqgx8jbi2igf4kk4h6rzy869gli2vj7ayl7vbqdfvb60";
+        url    = "https://dl.bintray.com/mitchellh/vagrant/vagrant_${version}_i686.deb";
+        sha256 = "1845sg2v9qas6obkkjtkmmamds901ik9rp2q2r6v75v69m0opvog";
       };
 
   meta = with stdenv.lib; {
@@ -84,10 +86,10 @@ stdenv.mkDerivation rec {
 
   preFixup = ''
     # 'hide' the template file from shebang-patching
-    chmod -x $out/opt/vagrant/embedded/gems/gems/bundler-1.6.2/lib/bundler/templates/Executable
+    chmod -x $out/opt/vagrant/embedded/gems/gems/bundler-1.6.6/lib/bundler/templates/Executable
   '';
 
   postFixup = ''
-    chmod +x $out/opt/vagrant/embedded/gems/gems/bundler-1.6.2/lib/bundler/templates/Executable
+    chmod +x $out/opt/vagrant/embedded/gems/gems/bundler-1.6.6/lib/bundler/templates/Executable
   '';
 }

From 0ec38e5b7f14790c05979120c1a60d77407f1432 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Thu, 4 Sep 2014 20:32:30 +0200
Subject: [PATCH 1315/1453] Add myself to lib/maintainers.nix

---
 lib/maintainers.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index b616e30a858a..11325a011e4b 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -15,6 +15,7 @@
   AndersonTorres = "Anderson Torres <torres.anderson.85@gmail.com>";
   andres = "Andres Loeh <ksnixos@andres-loeh.de>";
   antono = "Antono Vasiljev <self@antono.info>";
+  aristid = "Aristid Breitkreuz <aristidb@gmail.com>";
   arobyn = "Alexei Robyn <shados@shados.net>";
   astsmtl = "Alexander Tsamutali <astsmtl@yandex.ru>";
   aszlig = "aszlig <aszlig@redmoonstudios.org>";

From 73e569bf01facc9e65738f708ee2fff1e49ac61f Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Thu, 4 Sep 2014 20:36:36 +0200
Subject: [PATCH 1316/1453] add postgresql 9.4beta2

---
 lib/licenses.nix                              |  5 +++
 pkgs/servers/sql/postgresql/9.4.x.nix         | 44 +++++++++++++++++++
 .../disable-resolve_symlinks-94.patch         | 12 +++++
 pkgs/top-level/all-packages.nix               |  2 +
 4 files changed, 63 insertions(+)
 create mode 100644 pkgs/servers/sql/postgresql/9.4.x.nix
 create mode 100644 pkgs/servers/sql/postgresql/disable-resolve_symlinks-94.patch

diff --git a/lib/licenses.nix b/lib/licenses.nix
index bdcf8a7b8a7b..6eb265b3316c 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -232,6 +232,11 @@ rec {
     fullName = "OpenSSL License";
   };
 
+  postgresql = spqd {
+    shortName = "PostgreSQL";
+    fullName = "PostgreSQL License";
+  };
+
   psfl = spdx {
     shortName = "Python-2.0";
     fullName = "Python Software Foundation License version 2";
diff --git a/pkgs/servers/sql/postgresql/9.4.x.nix b/pkgs/servers/sql/postgresql/9.4.x.nix
new file mode 100644
index 000000000000..2608dcae5042
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/9.4.x.nix
@@ -0,0 +1,44 @@
+{ stdenv, fetchurl, zlib, readline, libossp_uuid }:
+
+with stdenv.lib;
+
+let version = "9.4beta2"; in
+
+stdenv.mkDerivation rec {
+  name = "postgresql-${version}";
+
+  src = fetchurl {
+    url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
+    sha256 = "131q3b9hv4pw02xhjsfi5is9i7pp5f4srxwfdn8ifs9qb37hcx2n";
+  };
+
+  buildInputs = [ zlib readline ] ++ optionals (!stdenv.isDarwin) [ libossp_uuid ];
+
+  enableParallelBuilding = true;
+
+  makeFlags = [ "world" ];
+
+  configureFlags = optional (!stdenv.isDarwin)
+    ''
+      --with-ossp-uuid
+    '';
+
+  patches = [ ./disable-resolve_symlinks-94.patch ./less-is-more.patch ];
+
+  installTargets = [ "install-world" ];
+
+  LC_ALL = "C";
+
+  passthru = {
+    inherit readline;
+    psqlSchema = "9.4";
+  };
+
+  meta = {
+    homepage = http://www.postgresql.org/ ;
+    description = "A powerful, open source object-relational database system";
+    license = stdenv.lib.licenses.postgresql;
+    maintainers = with stdenv.lib.maintainers; [ aristid ocharles ];
+    hydraPlatforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/servers/sql/postgresql/disable-resolve_symlinks-94.patch b/pkgs/servers/sql/postgresql/disable-resolve_symlinks-94.patch
new file mode 100644
index 000000000000..fadeea90ac4b
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/disable-resolve_symlinks-94.patch
@@ -0,0 +1,12 @@
+--- a/src/common/exec.c	2014-09-04 20:19:12.236057588 +0200
++++ b/src/common/exec.c	2014-09-04 20:19:50.550251633 +0200
+@@ -218,6 +218,9 @@
+ static int
+ resolve_symlinks(char *path)
+ {
++	// On NixOS we *want* stuff relative to symlinks.
++	return 0;
++
+ #ifdef HAVE_READLINK
+ 	struct stat buf;
+ 	char		orig_wd[MAXPGPATH],
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index af3980aff7e4..c6e896163129 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7095,6 +7095,8 @@ let
 
   postgresql93 = callPackage ../servers/sql/postgresql/9.3.x.nix { };
 
+  postgresql94 = callPackage ../servers/sql/postgresql/9.4.x.nix { };
+
   postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { };
 
   psqlodbc = callPackage ../servers/sql/postgresql/psqlodbc { };

From 559045d98c747e45014377108ba9786fe64fd3af Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Thu, 4 Sep 2014 20:38:12 +0200
Subject: [PATCH 1317/1453] fix license for postgresql packages

---
 pkgs/servers/sql/postgresql/8.4.x.nix | 2 +-
 pkgs/servers/sql/postgresql/9.0.x.nix | 2 +-
 pkgs/servers/sql/postgresql/9.1.x.nix | 2 +-
 pkgs/servers/sql/postgresql/9.2.x.nix | 2 +-
 pkgs/servers/sql/postgresql/9.3.x.nix | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix
index 5151299e3b93..4807052478c0 100644
--- a/pkgs/servers/sql/postgresql/8.4.x.nix
+++ b/pkgs/servers/sql/postgresql/8.4.x.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.postgresql.org/;
     description = "A powerful, open source object-relational database system";
-    license = "bsd";
+    license = stdenv.lib.licenses.postgresql;
     maintainers = [ stdenv.lib.maintainers.ocharles ];
     hydraPlatforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix
index 97e98217f8aa..85c14931eedc 100644
--- a/pkgs/servers/sql/postgresql/9.0.x.nix
+++ b/pkgs/servers/sql/postgresql/9.0.x.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.postgresql.org/;
     description = "A powerful, open source object-relational database system";
-    license = "bsd";
+    license = stdenv.lib.licenses.postgresql;
     maintainers = [ stdenv.lib.maintainers.ocharles ];
     hydraPlatforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix
index 92417dc730c7..ef335a77ab6f 100644
--- a/pkgs/servers/sql/postgresql/9.1.x.nix
+++ b/pkgs/servers/sql/postgresql/9.1.x.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.postgresql.org/;
     description = "A powerful, open source object-relational database system";
-    license = "bsd";
+    license = stdenv.lib.licenses.postgresql;
     maintainers = [ stdenv.lib.maintainers.ocharles ];
     hydraPlatforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/servers/sql/postgresql/9.2.x.nix b/pkgs/servers/sql/postgresql/9.2.x.nix
index e5dbdd034d3f..fdfb5a17b54f 100644
--- a/pkgs/servers/sql/postgresql/9.2.x.nix
+++ b/pkgs/servers/sql/postgresql/9.2.x.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.postgresql.org/;
     description = "A powerful, open source object-relational database system";
-    license = "bsd";
+    license = stdenv.lib.licenses.postgresql;
     maintainers = [ stdenv.lib.maintainers.ocharles ];
     hydraPlatforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/servers/sql/postgresql/9.3.x.nix b/pkgs/servers/sql/postgresql/9.3.x.nix
index 6c6ef132e813..40f07d8ffe15 100644
--- a/pkgs/servers/sql/postgresql/9.3.x.nix
+++ b/pkgs/servers/sql/postgresql/9.3.x.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.postgresql.org/;
     description = "A powerful, open source object-relational database system";
-    license = "bsd";
+    license = stdenv.lib.licenses.postgresql;
     maintainers = [ stdenv.lib.maintainers.ocharles ];
     hydraPlatforms = stdenv.lib.platforms.linux;
   };

From 494ba98e65987320284dde09b373cd7f8edfaa69 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Thu, 4 Sep 2014 20:40:03 +0200
Subject: [PATCH 1318/1453] fix typo in postgresql license definition

---
 lib/licenses.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/licenses.nix b/lib/licenses.nix
index 6eb265b3316c..caffa7539d17 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -232,7 +232,7 @@ rec {
     fullName = "OpenSSL License";
   };
 
-  postgresql = spqd {
+  postgresql = spdx {
     shortName = "PostgreSQL";
     fullName = "PostgreSQL License";
   };

From 4a2b6a63b61890aab22a6cf6e4dbafb5be814957 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 4 Sep 2014 21:02:14 +0200
Subject: [PATCH 1319/1453] spring, warzone2100: work around build problems

I guess there was a slight API change in the last mesa update.
---
 pkgs/games/spring/default.nix      | 2 ++
 pkgs/games/warzone2100/default.nix | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix
index 539be06bf7fa..69387f0cfd3a 100644
--- a/pkgs/games/spring/default.nix
+++ b/pkgs/games/spring/default.nix
@@ -28,6 +28,8 @@ stdenv.mkDerivation rec {
   # reported upstream http://springrts.com/mantis/view.php?id=4305
   #enableParallelBuilding = true; # occasionally missing generated files on Hydra
 
+  NIX_CFLAGS_COMPILE = "-fpermissive"; # GL header minor incompatibility
+
   postInstall = ''
     wrapProgram "$out/bin/spring" \
       --prefix LD_LIBRARY_PATH : "${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib::${systemd}/lib"
diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix
index 284d420fe7f2..0db90e95cc90 100644
--- a/pkgs/games/warzone2100/default.nix
+++ b/pkgs/games/warzone2100/default.nix
@@ -28,6 +28,9 @@ stdenv.mkDerivation rec {
                       --replace "which %s" "${which}/bin/which %s"
   '';
   configureFlags = "--with-backend=qt --with-distributor=NixOS";
+
+  NIX_CFLAGS_COMPILE = "-fpermissive"; # GL header minor incompatibility
+
   postInstall = []
     ++ stdenv.lib.optional withVideos "cp ${sequences_src} $out/share/warzone2100/sequences.wz";
   meta = {

From c4a35d8cf9548344cedf259363eef4332fd2e072 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 4 Sep 2014 21:04:11 +0200
Subject: [PATCH 1320/1453] warzone2100: fix meta

---
 pkgs/games/warzone2100/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix
index 0db90e95cc90..248b58a4e1a5 100644
--- a/pkgs/games/warzone2100/default.nix
+++ b/pkgs/games/warzone2100/default.nix
@@ -33,7 +33,8 @@ stdenv.mkDerivation rec {
 
   postInstall = []
     ++ stdenv.lib.optional withVideos "cp ${sequences_src} $out/share/warzone2100/sequences.wz";
-  meta = {
+
+  meta = with stdenv.lib; {
     description = "A free RTS game, originally developed by Pumpkin Studios";
     longDescription = ''
         Warzone 2100 is an open source real-time strategy and real-time tactics
@@ -47,8 +48,8 @@ stdenv.mkDerivation rec {
       variety of possible units and tactics. 
     '';
     homepage = http://wz2100.net;
-    license = [ "GPLv2+" ];
-    maintainers = with stdenv.lib.maintainers; [ astsmtl ];
-    platforms = with stdenv.lib.platforms; linux;
+    license = licenses.gpl2Plus;
+    maintainers = [ maintainers.astsmtl ];
+    platforms = platforms.linux;
   };
 }

From 20113e5d8b45c99d551923e4a0380b5016a62ecd Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 4 Sep 2014 15:22:31 -0400
Subject: [PATCH 1321/1453] buildLocalCabal: Use host-native nixpkgs for the
 call to cabal2nix by default

---
 pkgs/top-level/haskell-packages.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index c692800810e3..0fd062940bc1 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -3031,13 +3031,19 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   cabal2nix = callPackage ../development/tools/haskell/cabal2nix {};
 
   # Build a cabal package given a local .cabal file
-  buildLocalCabalWithArgs = { src, name, args ? {}, cabalDrvArgs ? { jailbreak = true; } }: let
-    cabalExpr = pkgs.stdenv.mkDerivation ({
+  buildLocalCabalWithArgs = { src
+                            , name
+                            , args ? {}
+                            , cabalDrvArgs ? { jailbreak = true; }
+                            # for import-from-derivation, want to use current system
+                            , nativePkgs ? import pkgs.path {}
+                            }: let
+    cabalExpr = nativePkgs.stdenv.mkDerivation ({
       name = "${name}.nix";
 
       buildCommand = ''
       export HOME="$TMPDIR"
-      ${self.cabal2nix}/bin/cabal2nix ${src + "/${name}.cabal"} --sha256=FILTERME \
+      ${nativePkgs.haskellPackages.cabal2nix}/bin/cabal2nix ${src + "/${name}.cabal"} --sha256=FILTERME \
           | grep -v FILTERME | sed \
             -e 's/licenses.proprietary/licenses.unfree/' \
             -e 's/{ cabal/{ cabal, cabalInstall, cabalDrvArgs ? {}, src/' \
@@ -3046,9 +3052,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
             -e 's/pname = \([^\n]*\)/pname = \1\n  inherit src;\n/'  > $out
       '';
 
-    } // pkgs.lib.optionalAttrs pkgs.stdenv.isLinux {
+    } // pkgs.lib.optionalAttrs nativePkgs.stdenv.isLinux {
       LANG = "en_US.UTF-8";
-      LOCALE_ARCHIVE = "${pkgs.glibcLocales}/lib/locale/locale-archive";
+      LOCALE_ARCHIVE = "${nativePkgs.glibcLocales}/lib/locale/locale-archive";
     });
   in callPackage cabalExpr ({ inherit src cabalDrvArgs; } // args);
 

From bf1493401bf931c5ca073640e00560eccb232f90 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 5 Sep 2014 00:24:25 +0400
Subject: [PATCH 1322/1453] Update BATMAN module

---
 pkgs/os-specific/linux/batman-adv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix
index fee955bcca21..f7b2a984e406 100644
--- a/pkgs/os-specific/linux/batman-adv/default.nix
+++ b/pkgs/os-specific/linux/batman-adv/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, kernel }:
 
-let base = "batman-adv-2013.4.0"; in
+let base = "batman-adv-2014.3.0"; in
 
 stdenv.mkDerivation rec {
   name = "${base}-${kernel.version}";
 
   src = fetchurl {
     url = "http://downloads.open-mesh.org/batman/releases/${base}/${base}.tar.gz";
-    sha1 = "870a85df5410b3b5623be69e75297e642c91a7d4";
+    sha1 = "wh3if8v4wfwskvzwqsjsyr929krzfmsx";
   };
 
   preBuild = ''

From 440d876b540f0386d39e9f3bb0a71f5321a10a8d Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 4 Sep 2014 22:28:41 +0200
Subject: [PATCH 1323/1453] moc: update from 2.5.0-beta2 to 2.5.0 also set
 platforms to linux, use default configurePhase and adopt it

---
 pkgs/applications/audio/moc/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix
index 5c6a1d6ac54e..9fbf05a2feb1 100644
--- a/pkgs/applications/audio/moc/default.nix
+++ b/pkgs/applications/audio/moc/default.nix
@@ -5,23 +5,23 @@
 
 stdenv.mkDerivation rec {
   name = "moc-${version}";
-  version = "2.5.0-beta2";
+  version = "2.5.0";
 
   src = fetchurl {
-    url = "http://ftp.daper.net/pub/soft/moc/unstable/moc-${version}.tar.bz2";
-    sha256 = "486d50584c3fb0067b8c03af54e44351633a7740b18dc3b7358322051467034c";
+    url = "http://ftp.daper.net/pub/soft/moc/stable/moc-${version}.tar.bz2";
+    sha256 = "14b0g9jn12jzxsf292g64dc6frlxv99kaagsasmc8xmg80iab7nj";
   };
 
-  configurePhase = "./configure prefix=$out";
-
   buildInputs = [
     ncurses pkgconfig alsaLib flac libmad speex ffmpeg libvorbis
     mpc libsndfile jack2 db libmodplug timidity libid3tag libtool
   ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "An ncurses console audio player designed to be powerful and easy to use";
     homepage = http://moc.daper.net/;
-    license = stdenv.lib.licenses.gpl2;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ pSub ];
+    platforms = platforms.linux;
   };
 }

From d62e848cc912a7301e05a1a0bf5c89b59f70ca1c Mon Sep 17 00:00:00 2001
From: Michael Fellinger <m.fellinger@gmail.com>
Date: Thu, 4 Sep 2014 22:44:38 +0200
Subject: [PATCH 1324/1453] virtualbox: vboxusers may use /dev/vboxnetctl

---
 nixos/modules/programs/virtualbox.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/programs/virtualbox.nix b/nixos/modules/programs/virtualbox.nix
index fec1a7b61f32..1a190573e943 100644
--- a/nixos/modules/programs/virtualbox.nix
+++ b/nixos/modules/programs/virtualbox.nix
@@ -15,7 +15,7 @@ let virtualbox = config.boot.kernelPackages.virtualbox; in
     ''
       KERNEL=="vboxdrv",    OWNER="root", GROUP="vboxusers", MODE="0660", TAG+="systemd"
       KERNEL=="vboxdrvu",   OWNER="root", GROUP="root",      MODE="0666", TAG+="systemd"
-      KERNEL=="vboxnetctl", OWNER="root", GROUP="root",      MODE="0600", TAG+="systemd"
+      KERNEL=="vboxnetctl", OWNER="root", GROUP="vboxusers", MODE="0660", TAG+="systemd"
       SUBSYSTEM=="usb_device", ACTION=="add", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
       SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
       SUBSYSTEM=="usb_device", ACTION=="remove", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"

From 42bb59a8a650a90ed04facc90af05e2179c1dfe3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 4 Sep 2014 23:36:41 +0200
Subject: [PATCH 1325/1453] thunderbird: maintenance update, including security

---
 .../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 c0c11ff1f1c3..0827ca2cc758 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 = "31.0"; in
+let version = "31.1.0"; in
 let verName = "${version}"; in
 
 stdenv.mkDerivation rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "ftp://ftp.mozilla.org/pub/thunderbird/releases/${verName}/source/thunderbird-${verName}.source.tar.bz2";
-    sha1 = "0fe6666fddd4db82ec2e389f30c5ea11d4f72be5";
+    sha1 = "08d231541a80a79180826f98dde732c5796191f4";
   };
 
   buildInputs = # from firefox30Pkgs.xulrunner, but without gstreamer and libvpx

From 701cd705024d81b137f2ce0f3abf4730ec760b9a Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 4 Sep 2014 23:53:54 +0200
Subject: [PATCH 1326/1453] zim: fixed build; it also runs find now but the
 solution is hacky

---
 pkgs/applications/office/zim/default.nix | 25 ++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix
index cca52be1a17f..658f460793f1 100644
--- a/pkgs/applications/office/zim/default.nix
+++ b/pkgs/applications/office/zim/default.nix
@@ -20,8 +20,8 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ pythonPackages.sqlite3 pygtk /*pythonPackages.pyxdg*/ pygobject ];
 
   preBuild = ''
-    mkdir -p $tmp/home
-    export HOME="$tmp/home"
+    mkdir -p /tmp/home
+    export HOME="/tmp/home"
   '';
   
   setupPyInstallFlags = ["--skip-xdg-cmd"];
@@ -69,6 +69,27 @@ buildPythonPackage rec {
 
     runHook postInstall
   '';
+
+  # FIXME: this is quick and dirty hack, because zim expects the
+  # path to the executable in argv[0] therefore the wrapper is
+  # modified accordingly.
+  postFixup = ''
+    wrapPythonPrograms
+
+    sed -i "s#sys\.argv\[0\] = 'zim'#sys.argv[0] = '$out/bin/zim'#g" \
+      $out/bin/.zim-wrapped
+
+    if test -e $out/nix-support/propagated-build-inputs; then
+        ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages
+    fi
+
+    createBuildInputsPth build-inputs "$buildInputStrings"
+    for inputsfile in propagated-build-inputs propagated-native-build-inputs; do
+      if test -e $out/nix-support/$inputsfile; then
+          createBuildInputsPth $inputsfile "$(cat $out/nix-support/$inputsfile)"
+      fi
+    done
+  '';
   
   # Testing fails.
   doCheck = false;

From 498aef7766a1b96daee68aeab7308621e94b4ab8 Mon Sep 17 00:00:00 2001
From: Dmitry Malikov <malikov.d.y@gmail.com>
Date: Thu, 4 Sep 2014 23:40:22 +0200
Subject: [PATCH 1327/1453] haskell-regex-pcre-builtin: add 0.94.4.8.8.35

Closes #3972.

Signed-off-by: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
---
 .../haskell/regex-pcre-builtin/default.nix       | 16 ++++++++++++++++
 pkgs/top-level/haskell-packages.nix              |  2 ++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/regex-pcre-builtin/default.nix

diff --git a/pkgs/development/libraries/haskell/regex-pcre-builtin/default.nix b/pkgs/development/libraries/haskell/regex-pcre-builtin/default.nix
new file mode 100644
index 000000000000..f5ddf2a63889
--- /dev/null
+++ b/pkgs/development/libraries/haskell/regex-pcre-builtin/default.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, regexBase }:
+
+cabal.mkDerivation (self: {
+  pname = "regex-pcre-builtin";
+  version = "0.94.4.8.8.35";
+  sha256 = "0y7as9wqlkykpipka2cfdhmcnin345q01pp0wsva8fwmvsavdl8b";
+  buildDepends = [ regexBase ];
+  meta = {
+    homepage = "http://hackage.haskell.org/package/regex-pcre";
+    description = "Replaces/Enhances Text.Regex";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 0fd062940bc1..c4d8b42607d5 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2072,6 +2072,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   regexCompatTdfa = callPackage ../development/libraries/haskell/regex-compat-tdfa {};
 
+  regexPcreBuiltin = callPackage ../development/libraries/haskell/regex-pcre-builtin {};
+
   regexPosix_0_72_0_3 = callPackage ../development/libraries/haskell/regex-posix/0.72.0.3.nix {};
   regexPosix_0_94_1 = callPackage ../development/libraries/haskell/regex-posix/0.94.1.nix {};
   regexPosix_0_94_2 = callPackage ../development/libraries/haskell/regex-posix/0.94.2.nix {};

From f9ba413b558d4b628b97db2f2b127dc2a76a1457 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 5 Sep 2014 00:05:52 +0200
Subject: [PATCH 1328/1453] fix eval

---
 pkgs/development/compilers/agda/stdlib.nix | 6 +++---
 pkgs/development/tools/vagrant/default.nix | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/agda/stdlib.nix b/pkgs/development/compilers/agda/stdlib.nix
index 2857a7d3d71b..136d4e0c815a 100644
--- a/pkgs/development/compilers/agda/stdlib.nix
+++ b/pkgs/development/compilers/agda/stdlib.nix
@@ -18,10 +18,10 @@ agda.mkDerivation (self: rec {
 
   topSourceDirectories = [ "src" ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "http://wiki.portal.chalmers.se/agda/pmwiki.php?n=Libraries.StandardLibrary";
     description = "A standard library for use with the Agda compiler.";
     license = "unknown";
-    maintainers = with stdenv.lib.maintaianers; [ jwiegley ];
+    maintainers = with maintainers; [ jwiegley ];
   };
-})
\ No newline at end of file
+})
diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix
index 69c91eff1799..965f86450528 100644
--- a/pkgs/development/tools/vagrant/default.nix
+++ b/pkgs/development/tools/vagrant/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     else
       fetchurl {
         url    = "https://dl.bintray.com/mitchellh/vagrant/vagrant_${version}_i686.deb";
-        sha256 = "1845sg2v9qas6obkkjtkmmamds901ik9rp2q2r6v75v69m0opvog";
+        sha256 = "047zij0lvrlpyg6icnp4knl0q87icsavbd2g98bkcp79yh2y91d0";
       };
 
   meta = with stdenv.lib; {

From 19335acb0cc889b49fd25ed3ad85ec811d3f5e9e Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Fri, 5 Sep 2014 00:32:25 +0100
Subject: [PATCH 1329/1453] haskell-rope: add 0.6.4

---
 .../libraries/haskell/rope/default.nix         | 18 ++++++++++++++++++
 pkgs/top-level/haskell-packages.nix            |  2 ++
 2 files changed, 20 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/rope/default.nix

diff --git a/pkgs/development/libraries/haskell/rope/default.nix b/pkgs/development/libraries/haskell/rope/default.nix
new file mode 100644
index 000000000000..3c751d5eddd7
--- /dev/null
+++ b/pkgs/development/libraries/haskell/rope/default.nix
@@ -0,0 +1,18 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, fingertree, mtl, utf8String }:
+
+cabal.mkDerivation (self: {
+  pname = "rope";
+  version = "0.6.4";
+  sha256 = "1g77bv2mmfhy2mkb08k92m3f2jab6p2la2s7rfib2r1jy6lq5vhb";
+  buildDepends = [ fingertree mtl utf8String ];
+  jailbreak = true;
+  meta = {
+    homepage = "http://github.com/ekmett/rope";
+    description = "Tools for manipulating fingertrees of bytestrings with optional annotations";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index c4d8b42607d5..06ade738ca5e 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2139,6 +2139,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   robotsTxt = callPackage ../development/libraries/haskell/robots-txt {};
 
+  rope = callPackage ../development/libraries/haskell/rope {};
+
   rosezipper = callPackage ../development/libraries/haskell/rosezipper {};
 
   RSA = callPackage ../development/libraries/haskell/RSA {};

From eac5176529d4d7fa99fe685ba408d22ef8e8f6c7 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Fri, 5 Sep 2014 01:47:16 +0100
Subject: [PATCH 1330/1453] Fix license on unRAR to unfree.

This license is BAD and it needs to be caught. You need to agree to the
use conditions or you have to remove the software from your machine
which makes it not redistributable.

cc @ehmry
---
 pkgs/tools/archivers/unrar/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix
index a88c0b345d72..2757c2ee457b 100644
--- a/pkgs/tools/archivers/unrar/default.nix
+++ b/pkgs/tools/archivers/unrar/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Utility for RAR archives";
-    license = "freeware";
+    license = stdenv.lib.licenses.unfree;
     maintainers = [ stdenv.lib.maintainers.emery ];
     platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; # arbitrary
   };

From 6386df1645091e30106db2c097f9bfb5b2d0070b Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 23 Jul 2014 17:04:21 +0200
Subject: [PATCH 1331/1453] nixos/nsd: Fix indentation/coding style.

For Nix, we indent using two spaces, but in this module somehow 4 spaces
were snuck in. Other than that, remoteControl and ratelimit are just
nested attribute sets, so we don't need to make another submodule type
for no particular reason.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/modules/services/networking/nsd.nix | 432 +++++++++++-----------
 1 file changed, 212 insertions(+), 220 deletions(-)

diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix
index cacd52f130fb..0928bf90571b 100644
--- a/nixos/modules/services/networking/nsd.nix
+++ b/nixos/modules/services/networking/nsd.nix
@@ -10,16 +10,16 @@ let
   pidFile  = stateDir + "/var/nsd.pid";
 
   zoneFiles = pkgs.stdenv.mkDerivation {
-      preferLocalBuild = true;
-      name = "nsd-env";
-      buildCommand = concatStringsSep "\n"
-        [ "mkdir -p $out"
-          (concatStrings (mapAttrsToList (zoneName: zoneOptions: ''
-            cat > "$out/${zoneName}" <<_EOF_
-            ${zoneOptions.data}
-            _EOF_
-          '') zoneConfigs))
-        ];
+    preferLocalBuild = true;
+    name = "nsd-env";
+    buildCommand = concatStringsSep "\n"
+      [ "mkdir -p $out"
+        (concatStrings (mapAttrsToList (zoneName: zoneOptions: ''
+          cat > "$out/${zoneName}" <<_EOF_
+          ${zoneOptions.data}
+          _EOF_
+        '') zoneConfigs))
+      ];
   };
 
   configFile = pkgs.writeText "nsd.conf" ''
@@ -105,21 +105,20 @@ let
 
 
   zoneConfigFile = name: zone: ''
-        zone:
-          name:         "${name}"
-          zonefile:     "${stateDir}/zones/${name}"
-          ${maybeString "outgoing-interface: " zone.outgoingInterface}
-        ${forEach     "  rrl-whitelist: "      zone.rrlWhitelist}
+    zone:
+      name:         "${name}"
+      zonefile:     "${stateDir}/zones/${name}"
+      ${maybeString "outgoing-interface: " zone.outgoingInterface}
+    ${forEach     "  rrl-whitelist: "      zone.rrlWhitelist}
 
-        ${forEach     "  allow-notify: "       zone.allowNotify}
-        ${forEach     "  request-xfr: "        zone.requestXFR}
-          allow-axfr-fallback: ${yesOrNo       zone.allowAXFRFallback}
+    ${forEach     "  allow-notify: "       zone.allowNotify}
+    ${forEach     "  request-xfr: "        zone.requestXFR}
+      allow-axfr-fallback: ${yesOrNo       zone.allowAXFRFallback}
 
-        ${forEach     "  notify: "             zone.notify}
-          notify-retry:                        ${toString zone.notifyRetry}
-        ${forEach     "  provide-xfr: "        zone.provideXFR}
-
-    '';
+    ${forEach     "  notify: "             zone.notify}
+      notify-retry:                        ${toString zone.notifyRetry}
+    ${forEach     "  provide-xfr: "        zone.provideXFR}
+  '';
 
   zoneConfigs = zoneConfigs' {} "" { children = cfg.zones; };
 
@@ -130,8 +129,8 @@ let
 
       # fork -> pattern
       else zipAttrsWith (name: head) (
-          mapAttrsToList (name: child: zoneConfigs' (parent // zone // { children = {}; }) name child)
-                         zone.children
+        mapAttrsToList (name: child: zoneConfigs' (parent // zone // { children = {}; }) name child)
+                       zone.children
       );
 
   # fighting infinite recursion
@@ -145,138 +144,135 @@ let
 
   childConfig = x: v: { options.children = { type = types.attrsOf x; visible = v; }; };
 
-  zoneOptionsRaw = types.submodule (
-    { options, ... }:
-    { options = {
-        children = mkOption {
-            default     = {};
-            description = ''
-              Children zones inherit all options of their parents. Attributes
-              defined in a child will overwrite the ones of its parent. Only
-              leaf zones will be actually served. This way it's possible to
-              define maybe zones which share most attributes without
-              duplicating everything. This mechanism replaces nsd's patterns
-              in a save and functional way.
-            '';
-        };
-
-        allowNotify = mkOption {
-          type        = types.listOf types.str;
-          default     = [ ];
-          example     = [ "192.0.2.0/24 NOKEY" "10.0.0.1-10.0.0.5 my_tsig_key_name"
-                           "10.0.3.4&255.255.0.0 BLOCKED"
-                        ];
-          description = ''
-            Listed primary servers are allowed to notify this secondary server.
-            <screen><![CDATA[
-            Format: <ip> <key-name | NOKEY | BLOCKED>
-
-            <ip> either a plain IPv4/IPv6 address or range. Valid patters for ranges:
-            * 10.0.0.0/24            # via subnet size
-            * 10.0.0.0&255.255.255.0 # via subnet mask
-            * 10.0.0.1-10.0.0.254    # via range
-
-            A optional port number could be added with a '@':
-            * 2001:1234::1@1234
-
-            <key-name | NOKEY | BLOCKED>
-            * <key-name> will use the specified TSIG key
-            * NOKEY      no TSIG signature is required
-            * BLOCKED    notifies from non-listed or blocked IPs will be ignored
-            * ]]></screen>
-          '';
-        };
-
-        requestXFR = mkOption {
-          type        = types.listOf types.str;
-          default     = [];
-          example     = [];
-          description = ''
-            Format: <code>[AXFR|UDP] &lt;ip-address&gt; &lt;key-name | NOKEY&gt;</code>
-          '';
-        };
-
-        allowAXFRFallback = mkOption {
-          type        = types.bool;
-          default     = true;
-          description = ''
-            If NSD as secondary server should be allowed to AXFR if the primary
-            server does not allow IXFR.
-          '';
-        };
-
-        notify = mkOption {
-          type        = types.listOf types.str;
-          default     = [];
-          example     = [ "10.0.0.1@3721 my_key" "::5 NOKEY" ];
-          description = ''
-            This primary server will notify all given secondary servers about
-            zone changes.
-            <screen><![CDATA[
-            Format: <ip> <key-name | NOKEY>
-
-            <ip> a plain IPv4/IPv6 address with on optional port number (ip@port)
-
-            <key-name | NOKEY>
-            * <key-name> sign notifies with the specified key
-            * NOKEY      don't sign notifies
-            ]]></screen>
-          '';
-        };
-
-        notifyRetry = mkOption {
-          type        = types.int;
-          default     = 5;
-          description = ''
-            Specifies the number of retries for failed notifies. Set this along with notify.
-          '';
-        };
-
-        provideXFR = mkOption {
-          type        = types.listOf types.str;
-          default     = [];
-          example     = [ "192.0.2.0/24 NOKEY" "192.0.2.0/24 my_tsig_key_name" ];
-          description = ''
-            Allow these IPs and TSIG to transfer zones, addr TSIG|NOKEY|BLOCKED
-            address range 192.0.2.0/24, 1.2.3.4&amp;255.255.0.0, 3.0.2.20-3.0.2.40
-          '';
-        };
-
-        outgoingInterface = mkOption {
-          type        = types.nullOr types.str;
-          default     = null;
-          example     = "2000::1@1234";
-          description = ''
-            This address will be used for zone-transfere requests if configured
-            as a secondary server or notifications in case of a primary server.
-            Supply either a plain IPv4 or IPv6 address with an optional port
-            number (ip@port).
-          '';
-        };
-
-        rrlWhitelist = mkOption {
-          type        = types.listOf types.str;
-          default     = [];
-          description = ''
-            Whitelists the given rrl-types.
-            The RRL classification types are:  nxdomain,  error, referral, any,
-            rrsig, wildcard, nodata, dnskey, positive, all
-          '';
-        };
-
-        data = mkOption {
-          type        = types.str;
-          default     = "";
-          example     = "";
-          description = ''
-            The actual zone data. This is the content of your zone file.
-            Use imports or pkgs.lib.readFile if you don't want this data in your config file.
-          '';
-        };
-
+  zoneOptionsRaw = types.submodule {
+    options = {
+      children = mkOption {
+        default     = {};
+        description = ''
+          Children zones inherit all options of their parents. Attributes
+          defined in a child will overwrite the ones of its parent. Only
+          leaf zones will be actually served. This way it's possible to
+          define maybe zones which share most attributes without
+          duplicating everything. This mechanism replaces nsd's patterns
+          in a save and functional way.
+        '';
       };
-    }
-  );
+
+      allowNotify = mkOption {
+        type        = types.listOf types.str;
+        default     = [ ];
+        example     = [ "192.0.2.0/24 NOKEY" "10.0.0.1-10.0.0.5 my_tsig_key_name"
+                        "10.0.3.4&255.255.0.0 BLOCKED"
+                      ];
+        description = ''
+          Listed primary servers are allowed to notify this secondary server.
+          <screen><![CDATA[
+          Format: <ip> <key-name | NOKEY | BLOCKED>
+
+          <ip> either a plain IPv4/IPv6 address or range. Valid patters for ranges:
+          * 10.0.0.0/24            # via subnet size
+          * 10.0.0.0&255.255.255.0 # via subnet mask
+          * 10.0.0.1-10.0.0.254    # via range
+
+          A optional port number could be added with a '@':
+          * 2001:1234::1@1234
+
+          <key-name | NOKEY | BLOCKED>
+          * <key-name> will use the specified TSIG key
+          * NOKEY      no TSIG signature is required
+          * BLOCKED    notifies from non-listed or blocked IPs will be ignored
+          * ]]></screen>
+        '';
+      };
+
+      requestXFR = mkOption {
+        type        = types.listOf types.str;
+        default     = [];
+        example     = [];
+        description = ''
+          Format: <code>[AXFR|UDP] &lt;ip-address&gt; &lt;key-name | NOKEY&gt;</code>
+        '';
+      };
+
+      allowAXFRFallback = mkOption {
+        type        = types.bool;
+        default     = true;
+        description = ''
+          If NSD as secondary server should be allowed to AXFR if the primary
+          server does not allow IXFR.
+        '';
+      };
+
+      notify = mkOption {
+        type        = types.listOf types.str;
+        default     = [];
+        example     = [ "10.0.0.1@3721 my_key" "::5 NOKEY" ];
+        description = ''
+          This primary server will notify all given secondary servers about
+          zone changes.
+          <screen><![CDATA[
+          Format: <ip> <key-name | NOKEY>
+
+          <ip> a plain IPv4/IPv6 address with on optional port number (ip@port)
+
+          <key-name | NOKEY>
+          * <key-name> sign notifies with the specified key
+          * NOKEY      don't sign notifies
+          ]]></screen>
+        '';
+      };
+
+      notifyRetry = mkOption {
+        type        = types.int;
+        default     = 5;
+        description = ''
+          Specifies the number of retries for failed notifies. Set this along with notify.
+        '';
+      };
+
+      provideXFR = mkOption {
+        type        = types.listOf types.str;
+        default     = [];
+        example     = [ "192.0.2.0/24 NOKEY" "192.0.2.0/24 my_tsig_key_name" ];
+        description = ''
+          Allow these IPs and TSIG to transfer zones, addr TSIG|NOKEY|BLOCKED
+          address range 192.0.2.0/24, 1.2.3.4&amp;255.255.0.0, 3.0.2.20-3.0.2.40
+        '';
+      };
+
+      outgoingInterface = mkOption {
+        type        = types.nullOr types.str;
+        default     = null;
+        example     = "2000::1@1234";
+        description = ''
+          This address will be used for zone-transfere requests if configured
+          as a secondary server or notifications in case of a primary server.
+          Supply either a plain IPv4 or IPv6 address with an optional port
+          number (ip@port).
+        '';
+      };
+
+      rrlWhitelist = mkOption {
+        type        = types.listOf types.str;
+        default     = [];
+        description = ''
+          Whitelists the given rrl-types.
+          The RRL classification types are:  nxdomain,  error, referral, any,
+          rrsig, wildcard, nodata, dnskey, positive, all
+        '';
+      };
+
+      data = mkOption {
+        type        = types.str;
+        default     = "";
+        example     = "";
+        description = ''
+          The actual zone data. This is the content of your zone file.
+          Use imports or pkgs.lib.readFile if you don't want this data in your config file.
+        '';
+      };
+    };
+  };
 
 in
 {
@@ -585,37 +581,33 @@ in
 
 
       keys = mkOption {
-        type = types.attrsOf (types.submodule (
-          { options, ... }:
-          { options = {
-
-              algorithm = mkOption {
-                type        = types.str;
-                default     = "hmac-sha256";
-                description = ''
-                  Authentication algorithm for this key.
-                '';
-              };
-
-              keyFile = mkOption {
-                type        = types.path;
-                description = ''
-                  Path to the file which contains the actual base64 encoded
-                  key. The key will be copied into "${stateDir}/private" before
-                  NSD starts. The copied file is only accessibly by the NSD
-                  user.
-                '';
-              };
-
+        type = types.attrsOf (types.submodule {
+          options = {
+            algorithm = mkOption {
+              type        = types.str;
+              default     = "hmac-sha256";
+              description = ''
+                Authentication algorithm for this key.
+              '';
             };
-          }));
-        default = {
-        };
+
+            keyFile = mkOption {
+              type        = types.path;
+              description = ''
+                Path to the file which contains the actual base64 encoded
+                key. The key will be copied into "${stateDir}/private" before
+                NSD starts. The copied file is only accessibly by the NSD
+                user.
+              '';
+            };
+          };
+        });
+        default = {};
         example = {
-            "tsig.example.org" = {
-              algorithm = "hmac-md5";
-              secret    = "aaaaaabbbbbbccccccdddddd";
-            };
+          "tsig.example.org" = {
+            algorithm = "hmac-md5";
+            secret    = "aaaaaabbbbbbccccccdddddd";
+          };
         };
         description = ''
           Define your TSIG keys here.
@@ -626,32 +618,32 @@ in
         type        = types.attrsOf zoneOptions;
         default     = {};
         example     = {
-            "serverGroup1" = {
-                provideXFR = [ "10.1.2.3 NOKEY" ];
-                children = {
-                    "example.com." = {
-                        data = ''
-                          $ORIGIN example.com.
-                          $TTL    86400
-                          @ IN SOA a.ns.example.com. admin.example.com. (
-                          ...
-                        '';
-                    };
-                    "example.org." = {
-                        data = ''
-                          $ORIGIN example.org.
-                          $TTL    86400
-                          @ IN SOA a.ns.example.com. admin.example.com. (
-                          ...
-                        '';
-                    };
-                };
+          "serverGroup1" = {
+            provideXFR = [ "10.1.2.3 NOKEY" ];
+            children = {
+              "example.com." = {
+                data = ''
+                  $ORIGIN example.com.
+                  $TTL    86400
+                  @ IN SOA a.ns.example.com. admin.example.com. (
+                  ...
+                '';
+              };
+              "example.org." = {
+                data = ''
+                  $ORIGIN example.org.
+                  $TTL    86400
+                  @ IN SOA a.ns.example.com. admin.example.com. (
+                  ...
+                '';
+              };
             };
+          };
 
-            "example.net." = {
-                provideXFR = [ "10.3.2.1 NOKEY" ];
-                data = ''...'';
-            };
+          "example.net." = {
+            provideXFR = [ "10.3.2.1 NOKEY" ];
+            data = ''...'';
+          };
         };
         description = ''
           Define your zones here. Zones can cascade other zones and therefore
@@ -670,23 +662,23 @@ in
 
     # this is not working :(
     nixpkgs.config.nsd = {
-        ipv6       = cfg.ipv6;
-        ratelimit  = cfg.ratelimit.enable;
-        rootServer = cfg.rootServer;
+      ipv6       = cfg.ipv6;
+      ratelimit  = cfg.ratelimit.enable;
+      rootServer = cfg.rootServer;
     };
 
     users.extraGroups = singleton {
-        name = username;
-        gid  = config.ids.gids.nsd;
+      name = username;
+      gid  = config.ids.gids.nsd;
     };
 
     users.extraUsers = singleton {
-        name        = username;
-        description = "NSD service user";
-        home        = stateDir;
-        createHome  = true;
-        uid         = config.ids.uids.nsd;
-        group       = username;
+      name        = username;
+      description = "NSD service user";
+      home        = stateDir;
+      createHome  = true;
+      uid         = config.ids.uids.nsd;
+      group       = username;
     };
 
     systemd.services.nsd = {

From fd9c8fa3dcabf4a9def05779c6b2d837e0d8d183 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 23 Jul 2014 17:09:28 +0200
Subject: [PATCH 1332/1453] pkgs/nsd: Allow to easily override the package.

Allowing to use nixpkgs config to provide different defaults is not
going to help us here, so we would like to use nsd.override {} in order
to supply the correct options in the module.

Eventually removing the nixpkgs config option would make sense here as
well.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/servers/dns/nsd/default.nix | 30 +++++++++++++++++++-----------
 pkgs/top-level/all-packages.nix  |  2 +-
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix
index 7279aa6d4ef8..f5cf9544b9b4 100644
--- a/pkgs/servers/dns/nsd/default.nix
+++ b/pkgs/servers/dns/nsd/default.nix
@@ -1,4 +1,13 @@
 { config, stdenv, fetchurl, libevent, openssl
+, bind8Stats       ? false
+, checking         ? false
+, ipv6             ? true
+, mmap             ? false
+, minimalResponses ? true
+, nsec3            ? true
+, ratelimit        ? false
+, recvmmsg         ? false
+, rootServer       ? false
 }:
 
 stdenv.mkDerivation rec {
@@ -12,17 +21,16 @@ stdenv.mkDerivation rec {
   buildInputs = [ libevent openssl ];
 
   configureFlags =
-    let flag = state: flags: if state then map (x: "--enable-${x}")  flags
-                                      else map (x: "--disable-${x}") flags;
-     in flag (config.nsd.bind8Stats       or false) [ "bind8-stats" ]
-     ++ flag (config.nsd.checking         or false) [ "checking" ]
-     ++ flag (config.nsd.ipv6             or true)  [ "ipv6" ]
-     ++ flag (config.nsd.mmap             or false) [ "mmap" ]
-     ++ flag (config.nsd.minimalResponses or true)  [ "minimal-responses" ]
-     ++ flag (config.nsd.nsec3            or true)  [ "nsec3" ]
-     ++ flag (config.nsd.ratelimit        or false) [ "ratelimit" ]
-     ++ flag (config.nsd.recvmmsg         or false) [ "recvmmsg" ]
-     ++ flag (config.nsd.rootServer       or false) [ "root-server" ]
+    let edf = c: o: if c then ["--enable-${o}"] else ["--disable-${o}"];
+     in edf bind8Stats       "bind8-stats"
+     ++ edf checking         "checking"
+     ++ edf ipv6             "ipv6"
+     ++ edf mmap             "mmap"
+     ++ edf minimalResponses "minimal-responses"
+     ++ edf nsec3            "nsec3"
+     ++ edf ratelimit        "ratelimit"
+     ++ edf recvmmsg         "recvmmsg"
+     ++ edf rootServer       "root-server"
      ++ [ "--with-ssl=${openssl}" "--with-libevent=${libevent}" ];
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c6e896163129..31e9f9f64d3a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7003,7 +7003,7 @@ let
 
   nix-binary-cache = callPackage ../servers/http/nix-binary-cache {};
 
-  nsd = callPackage ../servers/dns/nsd { };
+  nsd = callPackage ../servers/dns/nsd (config.nsd or {});
 
   nsq = callPackage ../servers/nsq { };
 

From 141cb70d5c1f92fdbdb91b7929567bb144304f88 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 5 Sep 2014 02:47:26 +0200
Subject: [PATCH 1333/1453] nixos/networking: Fix typo in ipv6prefixLength.

Within the module it's referenced with an uppercase "P" and ipv6Address
also begins with an uppercase "A" after the "6", so let's make it
consistent.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/modules/tasks/network-interfaces.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 868039177d87..97b37b0714cd 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -108,7 +108,7 @@ let
         '';
       };
 
-      ipv6prefixLength = mkOption {
+      ipv6PrefixLength = mkOption {
         default = 64;
         example = 64;
         type = types.int;

From e8c4fde22d35d34219a65dd5e3e5c59c89fdcadb Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 5 Sep 2014 02:50:18 +0200
Subject: [PATCH 1334/1453] nixos/nsd: Improve support for journald/systemd.

Don't fork into the background and just log to stderr.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/modules/services/networking/nsd.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix
index 0928bf90571b..140b7ed2da37 100644
--- a/nixos/modules/services/networking/nsd.nix
+++ b/nixos/modules/services/networking/nsd.nix
@@ -33,7 +33,6 @@ let
       # the list of dynamically added zones.
       zonelistfile: "${stateDir}/var/zone.list"
       database:     "${stateDir}/var/nsd.db"
-      logfile:      "${stateDir}/var/nsd.log"
       pidfile:      "${pidFile}"
       xfrdfile:     "${stateDir}/var/xfrd.state"
       xfrdir:       "${stateDir}/tmp"
@@ -687,10 +686,9 @@ in
       after       = [ "network.target" ];
 
       serviceConfig = {
-        Type      = "forking";
         PIDFile   = pidFile;
         Restart   = "always";
-        ExecStart = "${pkgs.nsd}/sbin/nsd -c ${configFile}";
+        ExecStart = "${pkgs.nsd}/sbin/nsd -d -c ${configFile}";
       };
 
       preStart = ''

From c9d1c0d8d160e54cac9b42a6e839066a89208147 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 5 Sep 2014 02:52:05 +0200
Subject: [PATCH 1335/1453] nixos/tests: Add basic test for nsd module.

Currently only tests basic resource record lookup against IPv4 and IPv6.
Nothing special yet, but probably enough for most setups.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/release.nix   |  1 +
 nixos/tests/nsd.nix | 83 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 84 insertions(+)
 create mode 100644 nixos/tests/nsd.nix

diff --git a/nixos/release.nix b/nixos/release.nix
index d4e1a3737e3b..f8c437fff05f 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -247,6 +247,7 @@ in rec {
   tests.mysqlReplication = callTest tests/mysql-replication.nix {};
   tests.nat = callTest tests/nat.nix {};
   tests.nfs3 = callTest tests/nfs.nix { version = 3; };
+  tests.nsd = callTest tests/nsd.nix {};
   tests.openssh = callTest tests/openssh.nix {};
   tests.printing = callTest tests/printing.nix {};
   tests.proxy = callTest tests/proxy.nix {};
diff --git a/nixos/tests/nsd.nix b/nixos/tests/nsd.nix
new file mode 100644
index 000000000000..c2331931cdd9
--- /dev/null
+++ b/nixos/tests/nsd.nix
@@ -0,0 +1,83 @@
+let
+  common = { pkgs, ... }: {
+    networking.firewall.enable = false;
+    networking.useDHCP = false;
+    # for a host utility with IPv6 support
+    environment.systemPackages = [ pkgs.bind ];
+  };
+in import ./make-test.nix {
+  name = "nsd";
+
+  nodes = {
+    clientv4 = { lib, nodes, ... }: {
+      imports = [ common ];
+      networking.nameservers = lib.mkForce [
+        nodes.server.config.networking.interfaces.eth1.ipAddress
+      ];
+      networking.interfaces.eth1.ipAddress = "192.168.0.2";
+      networking.interfaces.eth1.prefixLength = 24;
+    };
+
+    clientv6 = { lib, nodes, ... }: {
+      imports = [ common ];
+      networking.nameservers = lib.mkForce [
+        nodes.server.config.networking.interfaces.eth1.ipv6Address
+      ];
+      networking.interfaces.eth1.ipv6Address = "dead:beef::2";
+    };
+
+    server = { lib, ... }: {
+      imports = [ common ];
+      networking.interfaces.eth1.ipAddress = "192.168.0.1";
+      networking.interfaces.eth1.prefixLength = 24;
+      networking.interfaces.eth1.ipv6Address = "dead:beef::1";
+      services.nsd.enable = true;
+      services.nsd.interfaces = lib.mkForce [];
+      services.nsd.zones."example.com.".data = ''
+        @ SOA ns.example.com noc.example.com 666 7200 3600 1209600 3600
+        ipv4 A 1.2.3.4
+        ipv6 AAAA abcd::eeff
+        deleg NS ns.example.com
+        ns A 192.168.0.1
+        ns AAAA dead:beef::1
+      '';
+      services.nsd.zones."deleg.example.com.".data = ''
+        @ SOA ns.example.com noc.example.com 666 7200 3600 1209600 3600
+        @ A 9.8.7.6
+        @ AAAA fedc::bbaa
+      '';
+    };
+  };
+
+  testScript = ''
+    startAll;
+
+    $clientv4->waitForUnit("network.target");
+    $clientv6->waitForUnit("network.target");
+    $server->waitForUnit("nsd.service");
+
+    sub assertHost {
+      my ($type, $rr, $query, $expected) = @_;
+      my $self = $type eq 4 ? $clientv4 : $clientv6;
+      my $out = $self->succeed("host -$type -t $rr $query");
+      $self->log("output: $out");
+      chomp $out;
+      die "DNS IPv$type query on $query gave '$out' instead of '$expected'"
+        if ($out !~ $expected);
+    }
+
+    foreach (4, 6) {
+      subtest "ipv$_", sub {
+        assertHost($_, "a", "example.com", qr/has no [^ ]+ record/);
+        assertHost($_, "aaaa", "example.com", qr/has no [^ ]+ record/);
+
+        assertHost($_, "soa", "example.com", qr/SOA.*?noc\.example\.com/);
+        assertHost($_, "a", "ipv4.example.com", qr/address 1.2.3.4$/);
+        assertHost($_, "aaaa", "ipv6.example.com", qr/address abcd::eeff$/);
+
+        assertHost($_, "a", "deleg.example.com", qr/address 9.8.7.6$/);
+        assertHost($_, "aaaa", "deleg.example.com", qr/address fedc::bbaa$/);
+      };
+    }
+  '';
+}

From 7e744041f34ce4087364837a2ec089041d502343 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 5 Sep 2014 12:37:07 +0200
Subject: [PATCH 1336/1453] rpm-closure.pl: Reduce verbosity

---
 pkgs/build-support/vm/rpm/rpm-closure.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/vm/rpm/rpm-closure.pl b/pkgs/build-support/vm/rpm/rpm-closure.pl
index 94da0a20adc1..411c351f1e44 100644
--- a/pkgs/build-support/vm/rpm/rpm-closure.pl
+++ b/pkgs/build-support/vm/rpm/rpm-closure.pl
@@ -91,7 +91,7 @@ for (my $i = 0; $i < scalar(@packagesFiles); $i++) {
 
 my %provides;
 foreach my $pkgName (keys %pkgs) {
-    print STDERR "looking at $pkgName\n";
+    #print STDERR "looking at $pkgName\n";
     my $pkg = $pkgs{$pkgName};
     
     #print STDERR keys %{$pkg->{format}}, "\n";

From 7d6a27a78060ffb1014633e5cb9a10d5222cdb5a Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@immobiliare.it>
Date: Fri, 5 Sep 2014 12:06:05 +0200
Subject: [PATCH 1337/1453] evolution: fix build

---
 pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix
index 8cba366faae6..b60363b024cf 100644
--- a/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix
@@ -1,7 +1,7 @@
 { stdenv, intltool, fetchurl, libxml2, webkitgtk, highlight
 , pkgconfig, gtk3, glib, hicolor_icon_theme, libnotify, gtkspell3
 , makeWrapper, itstool, shared_mime_info, libical, db, gcr
-, gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu
+, gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu, libtool
 , libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit }:
 
 stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
 
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2
+  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 libtool
                   gdk_pixbuf gnome3.gnome_icon_theme librsvg db icu
                   gnome3.evolution_data_server libsecret libical gcr
                   webkitgtk shared_mime_info gnome3.gnome_desktop gtkspell3

From daebba2c97625fa322c93777738642e8c03fec21 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 5 Sep 2014 14:08:35 +0200
Subject: [PATCH 1338/1453] Fix container test

---
 nixos/tests/containers.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/tests/containers.nix b/nixos/tests/containers.nix
index a582e23fda02..13d98d742075 100644
--- a/nixos/tests/containers.nix
+++ b/nixos/tests/containers.nix
@@ -67,7 +67,6 @@ import ./make-test.nix {
 
       # Execute commands via the root shell.
       $machine->succeed("nixos-container run $id1 -- uname") =~ /Linux/ or die;
-      $machine->succeed("nixos-container set-root-password $id1 foobar");
 
       # Destroy the containers.
       $machine->succeed("nixos-container destroy $id1");

From 1f7c7759103c07a1a2a6ac774d31e143fe36eaac Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 5 Sep 2014 14:25:17 +0200
Subject: [PATCH 1339/1453] Remove unrar from the installation CD since it's
 unfree

---
 nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix  | 1 -
 nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix | 1 -
 nixos/modules/profiles/base.nix                              | 1 -
 3 files changed, 3 deletions(-)

diff --git a/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix b/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
index c2a11a1a8b32..7d3346e4ea1f 100644
--- a/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
+++ b/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
@@ -79,7 +79,6 @@ in
       pkgs.jfsrec
 
       # Some compression/archiver tools.
-      pkgs.unrar
       pkgs.unzip
       pkgs.zip
       pkgs.xz
diff --git a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
index 2ed70c1daa95..4ce7582c166a 100644
--- a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
+++ b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
@@ -70,7 +70,6 @@ in
       pkgs.btrfsProgs
 
       # Some compression/archiver tools.
-      pkgs.unrar
       pkgs.unzip
       pkgs.zip
       pkgs.xz
diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix
index 6f9e3002f299..7a6f76572058 100644
--- a/nixos/modules/profiles/base.nix
+++ b/nixos/modules/profiles/base.nix
@@ -37,7 +37,6 @@
     #pkgs.jfsrec # disabled because of Boost dependency
 
     # Some compression/archiver tools.
-    pkgs.unrar
     pkgs.unzip
     pkgs.zip
     pkgs.dar # disk archiver

From 00887dc3f8a406b0aefdea28099e7f55a99c608a Mon Sep 17 00:00:00 2001
From: Michael Fellinger <m.fellinger@gmail.com>
Date: Thu, 4 Sep 2014 18:32:55 +0200
Subject: [PATCH 1340/1453] diod: fix service

---
 nixos/modules/services/network-filesystems/diod.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/network-filesystems/diod.nix b/nixos/modules/services/network-filesystems/diod.nix
index 1ab5f52d438c..7de7acaa4a08 100644
--- a/nixos/modules/services/network-filesystems/diod.nix
+++ b/nixos/modules/services/network-filesystems/diod.nix
@@ -31,7 +31,7 @@ in
 
       listen = mkOption {
         type = types.listOf types.str;
-        default = [ ];
+        default = [ "0.0.0.0:564" ];
         description = ''
           [ "IP:PORT" [,"IP:PORT",...] ]
           List the interfaces and ports that diod should listen on.
@@ -39,7 +39,7 @@ in
       };
 
       exports = mkOption {
-        type = types.listOf types.path;
+        type = types.listOf types.str;
         default = [];
         description = ''
           List the file systems that clients will be allowed to mount. All paths should
@@ -152,7 +152,8 @@ in
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
       serviceConfig = {
-        ExecStart = "${pkgs.diod}/sbin/diod -c ${diodConfig}";
+        ExecStart = "${pkgs.diod}/sbin/diod -f -c ${diodConfig}";
+        Capabilities = "cap_net_bind_service+=ep";
       };
     };
   };

From cd7129a037465ea36d95848561d7a00c72db3062 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 5 Sep 2014 14:43:11 +0200
Subject: [PATCH 1341/1453] Revert "nixos: add setuid wrappers for some
 networked filesystems' helpers"

This reverts commit 26a4001a98322ab903b8186b97f33c5b282828a5. It
breaks the NFS test:

  http://hydra.nixos.org/build/13943148

Also, having more setuid programs is a bad thing security-wise.
---
 nixos/modules/security/setuid-wrappers.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/nixos/modules/security/setuid-wrappers.nix b/nixos/modules/security/setuid-wrappers.nix
index 22dbdf6a6bf4..373afffd3fb5 100644
--- a/nixos/modules/security/setuid-wrappers.nix
+++ b/nixos/modules/security/setuid-wrappers.nix
@@ -77,9 +77,7 @@ in
   config = {
 
     security.setuidPrograms =
-      [ "mount.nfs" "mount.nfs4" "mount.cifs"
-        "fusermount" "umount"
-        "wodim" "cdrdao" "growisofs" ];
+      [ "fusermount" "wodim" "cdrdao" "growisofs" ];
 
     system.activationScripts.setuid =
       let

From bb9ee6a13f1623c3107d264891a52a76e4a2853a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 5 Sep 2014 14:46:36 +0200
Subject: [PATCH 1342/1453] Remove some setuid wrappers for non-standard
 programs

---
 nixos/modules/security/setuid-wrappers.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/modules/security/setuid-wrappers.nix b/nixos/modules/security/setuid-wrappers.nix
index 373afffd3fb5..2a289dc402ce 100644
--- a/nixos/modules/security/setuid-wrappers.nix
+++ b/nixos/modules/security/setuid-wrappers.nix
@@ -76,8 +76,7 @@ in
 
   config = {
 
-    security.setuidPrograms =
-      [ "fusermount" "wodim" "cdrdao" "growisofs" ];
+    security.setuidPrograms = [ "fusermount" ];
 
     system.activationScripts.setuid =
       let

From b0855d59a10d9b77e1e92fc15b9cab3bcd3557ae Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 5 Sep 2014 15:28:24 +0200
Subject: [PATCH 1343/1453] Improve option descriptions a bit

---
 nixos/modules/services/logging/logstash.nix | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix
index 802dd454878b..df81ac142dc3 100644
--- a/nixos/modules/services/logging/logstash.nix
+++ b/nixos/modules/services/logging/logstash.nix
@@ -11,20 +11,25 @@ in
   ###### interface
 
   options = {
+
     services.logstash = {
+
       enable = mkOption {
+        type = types.bool;
         default = false;
-        description = "Enable logstash";
+        description = "Enable logstash.";
       };
 
       enableWeb = mkOption {
+        type = types.bool;
         default = false;
-        description = "Enable logstash web interface";
+        description = "Enable the logstash web interface.";
       };
 
       inputConfig = mkOption {
+        type = types.lines;
         default = ''stdin { type => "example" }'';
-        description = "Logstash input configuration";
+        description = "Logstash input configuration.";
         example = ''
           # Read from journal
           pipe {
@@ -35,8 +40,9 @@ in
       };
 
       filterConfig = mkOption {
+        type = types.lines;
         default = ''noop {}'';
-        description = "logstash filter configuration";
+        description = "logstash filter configuration.";
         example = ''
           if [type] == "syslog" {
             # Keep only relevant systemd fields
@@ -52,13 +58,15 @@ in
       };
 
       outputConfig = mkOption {
+        type = types.lines;
         default = ''stdout { debug => true debug_format => "json"}'';
-        description = "Logstash output configuration";
+        description = "Logstash output configuration.";
         example = ''
           redis { host => "localhost" data_type => "list" key => "logstash" codec => json }
           elasticsearch { embedded => true }
         '';
       };
+
     };
   };
 

From da4fb089591e4f63c5f96255733c3034def95a36 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 5 Sep 2014 15:28:55 +0200
Subject: [PATCH 1344/1453] Disable the logstash test

It's broken because it uses the "grep" plugin, which is no longer
included in the standard distribution.
---
 nixos/release.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/release.nix b/nixos/release.nix
index f8c437fff05f..d8cc1c8291bd 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -239,7 +239,7 @@ in rec {
   tests.kde4 = callTest tests/kde4.nix {};
   tests.latestKernel.login = callTest tests/login.nix { latestKernel = true; };
   tests.login = callTest tests/login.nix {};
-  tests.logstash = callTest tests/logstash.nix {};
+  #tests.logstash = callTest tests/logstash.nix {};
   tests.misc = callTest tests/misc.nix {};
   tests.mumble = callTest tests/mumble.nix {};
   tests.munin = callTest tests/munin.nix {};

From 59edfd61ad839752dddb628813b6c74589649592 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 5 Sep 2014 15:50:55 +0200
Subject: [PATCH 1345/1453] Increase systemd timeout on Jenkins and Munin tests

These were timing out a lot.

http://hydra.nixos.org/build/13991108
http://hydra.nixos.org/build/13991107
---
 nixos/modules/services/monitoring/munin.nix | 16 ++++++++--------
 nixos/tests/jenkins.nix                     |  2 ++
 nixos/tests/munin.nix                       |  1 +
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix
index 21840bc67e8f..aab1c4b75efb 100644
--- a/nixos/modules/services/monitoring/munin.nix
+++ b/nixos/modules/services/monitoring/munin.nix
@@ -37,7 +37,7 @@ let
           --set PATH "/run/current-system/sw/bin:/run/current-system/sw/sbin" \
           --set MUNIN_LIBDIR "${pkgs.munin}/lib" \
           --set MUNIN_PLUGSTATE "/var/run/munin"
- 
+
         # munin uses markers to tell munin-node-configure what a plugin can do
         echo "#%# family=$family" >> $file
         echo "#%# capabilities=$cap" >> $file
@@ -57,7 +57,7 @@ let
       rundir    /var/run/munin
 
       ${cronCfg.extraGlobalConfig}
-      
+
       ${cronCfg.hosts}
     '';
 
@@ -72,10 +72,10 @@ let
       group root
       host_name ${config.networking.hostName}
       setsid 0
-  
+
       # wrapped plugins by makeWrapper being with dots
       ignore_file ^\.
-      
+
       allow ^127\.0\.0\.1$
 
       ${nodeCfg.extraConfig}
@@ -97,7 +97,7 @@ in
           See <link xlink:href='http://munin-monitoring.org/wiki/munin-node.conf' />.
         '';
       };
-      
+
       extraConfig = mkOption {
         default = "";
         description = ''
@@ -118,7 +118,7 @@ in
           Enable munin-cron. Takes care of all heavy lifting to collect data from
           nodes and draws graphs to html. Runs munin-update, munin-limits,
           munin-graphs and munin-html in that order.
- 
+
           HTML output is in <filename>/var/www/munin/</filename>, configure your
           favourite webserver to serve static files.
         '';
@@ -138,7 +138,7 @@ in
           };
         '';
       };
-      
+
       extraGlobalConfig = mkOption {
         default = "";
         description = ''
@@ -160,7 +160,7 @@ in
           <link xlink:href='http://munin-monitoring.org/wiki/munin.conf' />
         '';
       };
- 
+
     };
 
   };
diff --git a/nixos/tests/jenkins.nix b/nixos/tests/jenkins.nix
index 28027c294bc6..f0d3139d902c 100644
--- a/nixos/tests/jenkins.nix
+++ b/nixos/tests/jenkins.nix
@@ -16,6 +16,8 @@ import ./make-test.nix {
         services.jenkinsSlave.enable = true;
 
         users.extraUsers.jenkins.extraGroups = [ "users" ];
+
+        systemd.services.jenkins.unitConfig.TimeoutSec = 240;
       };
 
     slave =
diff --git a/nixos/tests/munin.nix b/nixos/tests/munin.nix
index 31676c10df1b..ddbac590143f 100644
--- a/nixos/tests/munin.nix
+++ b/nixos/tests/munin.nix
@@ -19,6 +19,7 @@ import ./make-test.nix {
            };
           };
         };
+      systemd.services.munin-node.unitConfig.TimeoutSec = 240;
     };
 
   testScript = ''

From 364bdc2a95f945a35d18058bdc6aa3e12da24240 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 5 Sep 2014 16:05:50 +0200
Subject: [PATCH 1346/1453] nixUnstable: Update to 1.8pre3782_d2d5543

---
 pkgs/tools/package-management/nix/unstable.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix
index bba53b0002fc..5c20c7eb72aa 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-1.8pre3766_809ca33";
+  name = "nix-1.8pre3782_d2d5543";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/13584170/download/5/${name}.tar.xz";
-    sha256 = "e6d91e73aabf8e8912f9701bf87b66089c197c5b8c8fbcc1707b888c88b96dfd";
+    url = "http://hydra.nixos.org/build/13991590/download/5/${name}.tar.xz";
+    sha256 = "dcef54f49d2ea6fcb7f31ec3fdcb64ac74b2d4ca4224eaf2d00587ae1133a64c";
   };
 
   nativeBuildInputs = [ perl pkgconfig ];

From 309851f999af2e9657cc36be134a74f8933f909f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 5 Sep 2014 15:18:24 +0200
Subject: [PATCH 1347/1453] scala-mode2: update to latest version

---
 pkgs/applications/editors/emacs-modes/scala-mode/v2.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/scala-mode/v2.nix b/pkgs/applications/editors/emacs-modes/scala-mode/v2.nix
index 13d3f4b00d1f..75861b0a9884 100644
--- a/pkgs/applications/editors/emacs-modes/scala-mode/v2.nix
+++ b/pkgs/applications/editors/emacs-modes/scala-mode/v2.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation {
 
-  name = "scala-mode2-2014-06-05";
+  name = "scala-mode2-2014-07-01";
 
   src = fetchurl {
-    url = "https://github.com/hvesalai/scala-mode2/archive/af2dc30226c890ff7d49d727450f8006b90781df.zip";
-    sha256 = "1jj08li9lfg5291jzj170wa3cmyf3g2a0j80cy5307l0mdawp9vx";
+    url = "https://github.com/hvesalai/scala-mode2/archive/c154f1623f4696d26e1c88d19170e67bf6825837.zip";
+    sha256 = "0fyxdpwz55n4c87v4ijqlbv6w1rybg5qrgsc40f6bs6sd747scy5";
   };
 
   buildInputs = [ unzip emacs ];

From a4ec7a6316e6a6caceb6e43bb80d11a16f188f70 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 5 Sep 2014 16:04:50 +0200
Subject: [PATCH 1348/1453] emacs-dash: add version 1.5.0

---
 .../editors/emacs-modes/dash/default.nix      | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  6 +++--
 2 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/applications/editors/emacs-modes/dash/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/dash/default.nix b/pkgs/applications/editors/emacs-modes/dash/default.nix
new file mode 100644
index 000000000000..aacc33c9b516
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/dash/default.nix
@@ -0,0 +1,23 @@
+{stdenv, fetchurl, emacs}:
+
+let version = "1.5.0";
+
+in stdenv.mkDerivation {
+  name = "emacs-dash-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/magnars/dash.el/archive/${version}.tar.gz";
+    sha256 = "0c6jknzy306vn22vqlabxkwxfnllrd33spymi74fkirbxaxvp8kp";
+  };
+
+  buildInputs = [ emacs ];
+
+  buildPhase = ''
+    emacs -L . --batch -f batch-byte-compile *.el
+  '';
+
+  installPhase = ''
+    install -d $out/share/emacs/site-lisp
+    install *.el *.elc $out/share/emacs/site-lisp
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 31e9f9f64d3a..3710dddccd26 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8641,9 +8641,9 @@ let
 
     darcsum = callPackage ../applications/editors/emacs-modes/darcsum { };
 
-    # ecb = callPackage ../applications/editors/emacs-modes/ecb { };
+    dash = callPackage ../applications/editors/emacs-modes/dash { };
 
-    jabber = callPackage ../applications/editors/emacs-modes/jabber { };
+    # ecb = callPackage ../applications/editors/emacs-modes/ecb { };
 
     emacsClangCompleteAsync = callPackage ../applications/editors/emacs-modes/emacs-clang-complete-async { };
 
@@ -8665,6 +8665,8 @@ let
 
     idris = callPackage ../applications/editors/emacs-modes/idris { };
 
+    jabber = callPackage ../applications/editors/emacs-modes/jabber { };
+
     jade = callPackage ../applications/editors/emacs-modes/jade { };
 
     jdee = callPackage ../applications/editors/emacs-modes/jdee {

From e8bff6f83820f595939d4686c628383aa4cdf216 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 5 Sep 2014 16:05:22 +0200
Subject: [PATCH 1349/1453] emacs-s: add version 1.9.0

---
 .../editors/emacs-modes/s/default.nix         | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/applications/editors/emacs-modes/s/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/s/default.nix b/pkgs/applications/editors/emacs-modes/s/default.nix
new file mode 100644
index 000000000000..b818348939e8
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/s/default.nix
@@ -0,0 +1,23 @@
+{stdenv, fetchurl, emacs}:
+
+let version = "1.9.0";
+
+in stdenv.mkDerivation {
+  name = "emacs-s-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/magnars/s.el/archive/${version}.tar.gz";
+    sha256 = "1gah2k577gvnmxlpw7zrz0jr571vghzhdv2hbgchlgah07czd091";
+  };
+
+  buildInputs = [ emacs ];
+
+  buildPhase = ''
+    emacs -L . --batch -f batch-byte-compile *.el
+  '';
+
+  installPhase = ''
+    install -d $out/share/emacs/site-lisp
+    install *.el *.elc $out/share/emacs/site-lisp
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3710dddccd26..4c0e57bc3c0f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8739,6 +8739,8 @@ let
 
     rudel = callPackage ../applications/editors/emacs-modes/rudel { };
 
+    s = callPackage ../applications/editors/emacs-modes/s { };
+
     sbtMode = callPackage ../applications/editors/emacs-modes/sbt-mode { };
 
     scalaMode1 = callPackage ../applications/editors/emacs-modes/scala-mode/v1.nix { };

From 7f5bc1018670f2b2389b106408308af1cdb7b96d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 5 Sep 2014 16:06:05 +0200
Subject: [PATCH 1350/1453] emacs-ensime: add current git snapshot

---
 .../editors/emacs-modes/ensime/default.nix    | 22 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/applications/editors/emacs-modes/ensime/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/ensime/default.nix b/pkgs/applications/editors/emacs-modes/ensime/default.nix
new file mode 100644
index 000000000000..26f3b8a9d38b
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/ensime/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, emacs, unzip, autoComplete, dash, s }:
+
+stdenv.mkDerivation {
+  name = "emacs-ensime-2014-09-04";
+
+  src = fetchurl {
+    url = "https://github.com/ensime/ensime-emacs/archive/d3820a3f362975f6e14b817988ec07bfef2b4dad.zip";
+    sha256 = "0gwr0r92z2hh2x8g0hpxaar2vvfk1b91cp6v04gaasw0fvl5i7g5";
+  };
+
+  buildInputs = [ emacs unzip ];
+  propagatedUserEnvPkgs = [ autoComplete dash s ];
+
+  buildPhase = ''
+    emacs -L . -L ${autoComplete}/share/emacs/site-lisp --batch -f batch-byte-compile *.el
+  '';
+
+  installPhase = ''
+    install -d $out/share/emacs/site-lisp
+    install *.el *.elc $out/share/emacs/site-lisp
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4c0e57bc3c0f..46166d608ef3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8653,6 +8653,8 @@ let
 
     emms = callPackage ../applications/editors/emacs-modes/emms { };
 
+    ensime = callPackage ../applications/editors/emacs-modes/ensime { };
+
     ess = callPackage ../applications/editors/emacs-modes/ess { };
 
     flymakeCursor = callPackage ../applications/editors/emacs-modes/flymake-cursor { };

From 96adde8f6a37cf747996a31a39e2da5d09d3f7ed Mon Sep 17 00:00:00 2001
From: Emery Hemingway <emery@vfemail.net>
Date: Fri, 5 Sep 2014 10:43:06 -0400
Subject: [PATCH 1351/1453] rsync: update 3.1.0 to 3.1.1

fix http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2014-2855
---
 .../networking/sync/rsync/default.nix         | 26 ++++++++-----------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix
index 00a00530df44..8d32c1e5d865 100644
--- a/pkgs/applications/networking/sync/rsync/default.nix
+++ b/pkgs/applications/networking/sync/rsync/default.nix
@@ -7,37 +7,33 @@ assert enableACLs -> acl != null;
 
 stdenv.mkDerivation rec {
   name = "rsync-${version}";
-  version = "3.1.0";
+  version = "3.1.1";
 
   mainSrc = fetchurl {
+    # signed with key 0048 C8B0 26D4 C96F 0E58  9C2F 6C85 9FB1 4B96 A8C5
     url = "http://rsync.samba.org/ftp/rsync/src/rsync-${version}.tar.gz";
-    sha256 = "0kirw8wglqvwi1v8bwxp373g03xg857h59j5k3mmgff9gzvj7jl1";
+    sha256 = "0896iah6w72q5izpxgkai75bn40dqkqifi2ivcxjzr2zrx7kdr3x";
   };
 
   patchesSrc = fetchurl {
+    # signed with key 0048 C8B0 26D4 C96F 0E58  9C2F 6C85 9FB1 4B96 A8C5
     url = "http://rsync.samba.org/ftp/rsync/rsync-patches-${version}.tar.gz";
-    sha256 = "0sl8aadpjblvbb05vgais40z90yzhr09rwz0cykjdiv452gli75p";
+    sha256 = "0iij996xbyn20yr4w3kv3rw3cx4jwkg2k85x6w5hb5xlgsis8zjl";
   };
 
   srcs = [mainSrc] ++ stdenv.lib.optional enableCopyDevicesPatch patchesSrc;
-  patches = [(fetchurl {
-      url = "https://git.samba.org/?p=rsync.git;a=commitdiff_plain;h=0dedfbce2c1b851684ba658861fe9d620636c56a";
-      sha256 = "0j1pqmwsqc5mh815x28izi4baki2y2r5q8k7ma1sgs4xsgjc4rk8";
-      name = "CVE-2014-2855.patch";
-    })]
-    ++ stdenv.lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff";
+  patches = stdenv.lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff";
 
   buildInputs = stdenv.lib.optional enableACLs acl;
   nativeBuildInputs = [perl];
 
   configureFlags = "--with-nobody-group=nogroup";
 
-  meta = {
-    homepage = http://samba.anu.edu.au/rsync/;
+  meta = with stdenv.lib; {
+    homepage = http://rsync.samba.org/;
     description = "A fast incremental file transfer utility";
-    license = stdenv.lib.licenses.gpl3Plus;
-
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.simons stdenv.lib.maintainers.emery ];
+    license = licenses.gpl3Plus;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ simons emery ];
   };
 }

From 1124d8a9b963bd9dac28dcf9db29f07377ff2075 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <emery@vfemail.net>
Date: Fri, 5 Sep 2014 10:14:36 -0400
Subject: [PATCH 1352/1453] unrar: update from 5.1.5 to 5.1.7, change license
 to 'unfree-redistributable'

---
 pkgs/tools/archivers/unrar/default.nix | 27 ++++++++++++--------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix
index 2757c2ee457b..a13c4c3b70bd 100644
--- a/pkgs/tools/archivers/unrar/default.nix
+++ b/pkgs/tools/archivers/unrar/default.nix
@@ -1,32 +1,29 @@
 {stdenv, fetchurl}:
 
 let
-  version = "5.1.5";
+  version = "5.1.7";
 in
 stdenv.mkDerivation {
   name = "unrar-${version}";
 
   src = fetchurl {
     url = "http://www.rarlab.com/rar/unrarsrc-${version}.tar.gz";
-    sha256 = "1jrla255911rbl953br2xbgvyw15kpi11r4lpqm3jlw553ccw912";
+    sha256 = "13ida8vcamiagl40d9yfjma9k6givxczhx278f1p7bv9wgb8gfmc";
   };
 
-  patchPhase = ''
-    sed -i \
-      -e "/CXX=/d" \
-      -e "/CXXFLAGS=/d" \
-      makefile
-  '';
-
   installPhase = ''
-    mkdir -p $out/bin
-    cp unrar $out/bin
+    installBin unrar
+
+    mkdir -p $out/share/doc/unrar
+    cp acknow.txt license.txt \
+        $out/share/doc/unrar
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Utility for RAR archives";
-    license = stdenv.lib.licenses.unfree;
-    maintainers = [ stdenv.lib.maintainers.emery ];
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; # arbitrary
+    homepage = http://www.rarlab.com/;
+    license = licenses.unfree-redistributable;
+    maintainers = [ maintainers.emery ];
+    platforms = platforms.all;
   };
 }

From 20be024d1bae622409fa56844b2f8799bbf29bb0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 5 Sep 2014 17:40:09 +0200
Subject: [PATCH 1353/1453] Fix subuid/subgid generation

I don't think we need to filter users with an unset uid, because
mkSubuidEntry/mkSubgidEntry don't references the uid.
---
 nixos/modules/config/users-groups.nix | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index d172ddb6bca7..619f329d74c5 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -276,23 +276,17 @@ let
     };
   };
 
-  filterNull = a: filter (x: hasAttr a x && getAttr a x != null);
-
-      sortOn "gid" (filterNull "gid" (attrValues cfg.extraGroups))
-      sortOn "uid" (filterNull "uid" (attrValues cfg.extraUsers))
   mkSubuidEntry = user: concatStrings (
     map (range: "${user.name}:${toString range.startUid}:${toString range.count}\n")
-        user.subUidRanges);
+      user.subUidRanges);
 
-  subuidFile = concatStrings (map mkSubuidEntry (
-    sortOn "uid" (filterNull "uid" (attrValues cfg.extraUsers))));
+  subuidFile = concatStrings (map mkSubuidEntry (attrValues cfg.extraUsers));
 
   mkSubgidEntry = user: concatStrings (
     map (range: "${user.name}:${toString range.startGid}:${toString range.count}\n")
         user.subGidRanges);
 
-  subgidFile = concatStrings (map mkSubgidEntry (
-    sortOn "uid" (filterNull "uid" (attrValues cfg.extraUsers))));
+  subgidFile = concatStrings (map mkSubgidEntry (attrValues cfg.extraUsers));
 
   idsAreUnique = set: idAttr: !(fold (name: args@{ dup, acc }:
     let

From 718106e958cbd872ecf3e08a451b80f68f950dae Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@immobiliare.it>
Date: Fri, 5 Sep 2014 18:42:14 +0200
Subject: [PATCH 1354/1453] Fix initrd after recent busybox upgrades

---
 nixos/modules/system/boot/stage-1.nix    | 2 +-
 nixos/modules/virtualisation/qemu-vm.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index 426da778f434..6977880fa284 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -50,7 +50,7 @@ let
       cp -pvd ${pkgs.busybox}/bin/* ${pkgs.busybox}/sbin/* $out/bin/
 
       # Copy some utillinux stuff.
-      cp -vf ${pkgs.utillinux}/sbin/blkid $out/bin
+      cp -vf --remove-destination ${pkgs.utillinux}/sbin/blkid $out/bin
       cp -pdv ${pkgs.utillinux}/lib/libblkid*.so.* $out/lib
       cp -pdv ${pkgs.utillinux}/lib/libuuid*.so.* $out/lib
 
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 58386ce5cf56..33f48d65d43e 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -278,7 +278,7 @@ in
     boot.initrd.extraUtilsCommands =
       ''
         # We need mke2fs in the initrd.
-        cp -f ${pkgs.e2fsprogs}/sbin/mke2fs $out/bin
+        cp -vf --remove-destination ${pkgs.e2fsprogs}/sbin/mke2fs $out/bin
       '';
 
     boot.initrd.postDeviceCommands =

From e07e1c3fdfda965ce244bf077cf98fd736be622f Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 4 Sep 2014 10:30:25 -0700
Subject: [PATCH 1355/1453] nixos/installer-test: Add writable store test

---
 nixos/tests/installer.nix | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 66ab2567e197..7cab313cec21 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -35,7 +35,8 @@ let
 
 
   # The configuration to install.
-  makeConfig = { testChannel, useEFI, grubVersion, grubDevice, grubIdentifier }:
+  makeConfig = { testChannel, useEFI, grubVersion, grubDevice, grubIdentifier
+    , readOnly ? true, forceGrubReinstallCount ? 0 }:
     pkgs.writeText "configuration.nix" ''
       { config, pkgs, modulesPath, ... }:
 
@@ -57,6 +58,10 @@ let
           boot.loader.grub.fsIdentifier = "${grubIdentifier}";
         ''}
 
+        boot.loader.grub.configurationLimit = 100 + ${toString forceGrubReinstallCount};
+
+        ${optionalString (!readOnly) "nix.readOnlyStore = false;"}
+
         environment.systemPackages = [ ${optionalString testChannel "pkgs.rlwrap"} ];
       }
     '';
@@ -198,6 +203,11 @@ let
       $machine->succeed("type -tP ls | tee /dev/stderr") =~ /.nix-profile/
           or die "nix-env failed";
 
+      # We need to a writable nix-store on next boot
+      $machine->copyFileFromHost(
+          "${ makeConfig { inherit testChannel useEFI grubVersion grubDevice grubIdentifier; readOnly = false; forceGrubReinstallCount = 1; } }",
+          "/etc/nixos/configuration.nix");
+
       # Check whether nixos-rebuild works.
       $machine->succeed("nixos-rebuild switch >&2");
 
@@ -208,6 +218,15 @@ let
 
       $machine->shutdown;
 
+      # Check whether a writable store build works
+      $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}" });
+      $machine->waitForUnit("multi-user.target");
+      $machine->copyFileFromHost(
+          "${ makeConfig { inherit testChannel useEFI grubVersion grubDevice grubIdentifier; readOnly = false; forceGrubReinstallCount = 2; } }",
+          "/etc/nixos/configuration.nix");
+      $machine->succeed("nixos-rebuild boot >&2");
+      $machine->shutdown;
+
       # And just to be sure, check that the machine still boots after
       # "nixos-rebuild switch".
       $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}" });

From 6fb6ba48f85f7ec8f954428468e96ce55f5535a3 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 5 Sep 2014 09:49:05 -0700
Subject: [PATCH 1356/1453] nixos/installer-test: nixos-option syntax
 correction

---
 nixos/tests/installer.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 7cab313cec21..3e29bc2a45b0 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -213,8 +213,8 @@ let
 
       # Test nixos-option.
       $machine->succeed("nixos-option boot.initrd.kernelModules | grep virtio_console");
-      $machine->succeed("nixos-option -d boot.initrd.kernelModules | grep 'List of modules'");
-      $machine->succeed("nixos-option -l boot.initrd.kernelModules | grep qemu-guest.nix");
+      $machine->succeed("nixos-option boot.initrd.kernelModules | grep 'List of modules'");
+      $machine->succeed("nixos-option  boot.initrd.kernelModules | grep qemu-guest.nix");
 
       $machine->shutdown;
 

From de03197100538cfa64cd5f2ddacf289d0c596f0d Mon Sep 17 00:00:00 2001
From: gounnoticed <justin.hobday@gmail.com>
Date: Fri, 5 Sep 2014 19:35:28 +0100
Subject: [PATCH 1357/1453] Add luna cpp build for eclipse

didnt have sha512 so used md5 instead.
---
 pkgs/applications/editors/eclipse/default.nix | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index b32981ccb944..6073dc42c698 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -191,6 +191,23 @@ in {
           sha256 = "0d6jlj7hwz8blx6csrlyi2h2prql0wckbh7ihwjmgclwpcpj84g6";
         };
   };
+  
+   eclipse_cpp_44 = buildEclipse {
+    name = "eclipse-cpp-4.4";
+    description = "Eclipse IDE for C/C++ Developers";
+    src =
+      if stdenv.system == "x86_64-linux" then
+        fetchurl {
+          url = http://www.mirrorservice.org/sites/download.eclipse.org/eclipseMirror/technology/epp/downloads/release/luna/R/eclipse-cpp-luna-R-linux-gtk-x86_64.tar.gz;
+          md5 = "b0a6ee33e8108a7ff4682ab911271b04";
+        }
+      else
+        fetchurl {
+          url = http://www.mirrorservice.org/sites/download.eclipse.org/eclipseMirror/technology/epp/downloads/release/luna/R/eclipse-cpp-luna-R-linux-gtk.tar.gz;
+          md5 = "5000f93cecf6ef9af112f0df6e8c87f3";
+        };
+  };
+
 
   eclipse_sdk_421 = buildEclipse {
     name = "eclipse-sdk-4.2.1";

From b420eeba44c8428bf90f4655d94cc336c49ffec4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 5 Sep 2014 22:49:18 +0200
Subject: [PATCH 1358/1453] remove bittorrent package since it's obsolete

---
 doc/quick-start.xml                           | 11 --------
 nixos/tests/bittorrent.nix                    |  2 +-
 .../networking/p2p/bittorrent/builder.sh      | 27 -------------------
 .../networking/p2p/bittorrent/default.nix     | 24 -----------------
 pkgs/top-level/release.nix                    |  1 -
 5 files changed, 1 insertion(+), 64 deletions(-)
 delete mode 100644 pkgs/tools/networking/p2p/bittorrent/builder.sh
 delete mode 100644 pkgs/tools/networking/p2p/bittorrent/default.nix

diff --git a/doc/quick-start.xml b/doc/quick-start.xml
index 0f11a906d771..c0f96f871529 100644
--- a/doc/quick-start.xml
+++ b/doc/quick-start.xml
@@ -92,17 +92,6 @@ $ git add pkgs/development/libraries/libfoo/default.nix</screen>
           hackery.</para>
         </listitem>
 
-        <listitem>
-          <para>BitTorrent (wxPython-based): <link
-          xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/networking/p2p/bittorrent/default.nix"><filename>pkgs/tools/networking/p2p/bittorrent/default.nix</filename></link>.
-          Uses an external <link
-          xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/networking/p2p/bittorrent/builder.sh">build
-          script</link>, which can be useful if you have lots of code
-          that you don’t want cluttering up the Nix expression.  But
-          external builders are mostly obsolete.
-          </para>
-        </listitem>
-
         <listitem>
           <para>Thunderbird: <link
           xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/networking/mailreaders/thunderbird/default.nix"><filename>pkgs/applications/networking/mailreaders/thunderbird/default.nix</filename></link>.
diff --git a/nixos/tests/bittorrent.nix b/nixos/tests/bittorrent.nix
index b12a861f723a..c4a00ee507b2 100644
--- a/nixos/tests/bittorrent.nix
+++ b/nixos/tests/bittorrent.nix
@@ -28,7 +28,7 @@ in
   nodes =
     { tracker =
         { config, pkgs, ... }:
-        { environment.systemPackages = [ pkgs.transmission pkgs.bittorrent ];
+        { environment.systemPackages = [ pkgs.transmission ];
 
           # We need Apache on the tracker to serve the torrents.
           services.httpd.enable = true;
diff --git a/pkgs/tools/networking/p2p/bittorrent/builder.sh b/pkgs/tools/networking/p2p/bittorrent/builder.sh
deleted file mode 100644
index 3f30aa5c851f..000000000000
--- a/pkgs/tools/networking/p2p/bittorrent/builder.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-source $stdenv/setup
-
-
-# Workaround for:
-#  File "...-python-2.4.4/lib/python2.4/posixpath.py", line 62, in join
-#    elif path == '' or path.endswith('/'):
-# AttributeError: 'NoneType' object has no attribute 'endswith'
-export HOME=$TMP
-
-
-buildPhase() {
-    python setup.py build
-}
-
-
-installPhase() {
-    python setup.py install --prefix=$out
-
-    # Create wrappers that set the environment correctly.
-    for i in $(cd $out/bin && ls); do
-        wrapProgram $out/bin/$i \
-            --set PYTHONPATH "$(toPythonPath $out):$PYTHONPATH"
-    done
-}
-
-
-genericBuild
diff --git a/pkgs/tools/networking/p2p/bittorrent/default.nix b/pkgs/tools/networking/p2p/bittorrent/default.nix
deleted file mode 100644
index 1d4f43445bf1..000000000000
--- a/pkgs/tools/networking/p2p/bittorrent/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ gui ? false
-, stdenv, fetchurl, makeWrapper
-, python, wxPython ? null, pycrypto, twisted
-}:
-
-assert gui -> wxPython != null;
-
-stdenv.mkDerivation {
-  name = "bittorrent-5.2.2";
-  
-  builder = ./builder.sh;
-  
-  src = fetchurl {
-    url = http://download.bittorrent.com/dl/archive/BitTorrent-5.2.2.tar.gz;
-    sha256 = "05k803hbwsyn51j4aibzdsnqxz24kw4rvr60v2c0wji8gcvy3kx9";
-  };
-  
-  buildInputs = [ python pycrypto twisted makeWrapper ]
-    ++ stdenv.lib.optional gui wxPython;
-
-  meta = {
-    description = "The original client for the BitTorrent peer-to-peer file sharing protocol";
-  };
-}
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 07c3126e5abe..ccd674a42d86 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -64,7 +64,6 @@ let
       binutils = linux;
       bind = linux;
       bitlbee = linux;
-      bittorrent = linux;
       blender = linux;
       bsdiff = all;
       btrfsProgs = linux;

From b7a889759dc8e3c2e9f39135ed9febc356630a11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 24 Aug 2014 13:54:16 +0200
Subject: [PATCH 1359/1453] nixos/fail2ban: don't use types.string (it's
 deprecated)

I'm not really sure which one of types.lines or types.str that fit
better, but I'm going for types.lines because it behaves more like the
current type (i.e. have the ability to merge).
---
 nixos/modules/services/security/fail2ban.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/security/fail2ban.nix b/nixos/modules/services/security/fail2ban.nix
index 3758652ebddf..c40f41e07d4f 100644
--- a/nixos/modules/services/security/fail2ban.nix
+++ b/nixos/modules/services/security/fail2ban.nix
@@ -40,7 +40,7 @@ in
             socket    = /run/fail2ban/fail2ban.sock
             pidfile   = /run/fail2ban/fail2ban.pid
           '';
-        type = types.string;
+        type = types.lines;
         description =
           ''
             The contents of Fail2ban's main configuration file.  It's
@@ -64,7 +64,7 @@ in
                 maxretry = 5
               '';
           };
-        type = types.attrsOf types.string;
+        type = types.attrsOf types.lines;
         description =
           ''
             The configuration of each Fail2ban “jail”.  A jail

From 1d263f3776bf31f48fbab34c91592f8e55665a0b Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 5 Sep 2014 23:53:19 +0200
Subject: [PATCH 1360/1453] calibre: update from 2.1.0 to 2.2.0

---
 pkgs/applications/misc/calibre/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 00a5d15a84c9..1bf5d6a9ff85 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "calibre-2.1.0";
+  name = "calibre-2.2.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/calibre/${name}.tar.xz";
-    sha256 = "1znwrmz740m08bihkmdijm193bvav4nm313xsagd5x9mjh2nffg7";
+    sha256 = "03qljbb3995cq25azwy9qh087dq7m6igia5301v89y98vxxg2lxm";
   };
 
   inherit python;

From db86b03b1c5b3940c7daf4a03dac364861fcead3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 2 Jan 2014 00:35:42 +0100
Subject: [PATCH 1361/1453] nixos/apcupsd: add systemd documentation hint

systemctl has the ability to display a list of documentation URLs in the
output of "systemctl status <service-name>".
---
 nixos/modules/services/monitoring/apcupsd.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/monitoring/apcupsd.nix b/nixos/modules/services/monitoring/apcupsd.nix
index 6cc0c122ec62..ffa7be7dd301 100644
--- a/nixos/modules/services/monitoring/apcupsd.nix
+++ b/nixos/modules/services/monitoring/apcupsd.nix
@@ -161,6 +161,7 @@ in
         # systemd kills it with SIGKILL.
         TimeoutStopSec = 5;
       };
+      unitConfig.Documentation = "man:apcupsd(8)";
     };
 
     # A special service to tell the UPS to power down/hibernate just before the

From c5f51039f477880351edd0b765cb7bda839adb82 Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Wed, 23 Apr 2014 01:03:14 +0200
Subject: [PATCH 1362/1453] steam: fix steam on x86_64

---
 .../build-fhs-chrootenv/default.nix           | 158 ++++++++++++++----
 pkgs/games/steam/chrootenv.nix                |  67 +++++++-
 pkgs/games/steam/default.nix                  | 107 +-----------
 pkgs/top-level/all-packages.nix               |  17 +-
 4 files changed, 198 insertions(+), 151 deletions(-)

diff --git a/pkgs/build-support/build-fhs-chrootenv/default.nix b/pkgs/build-support/build-fhs-chrootenv/default.nix
index e807a04628a3..411e73ab8102 100644
--- a/pkgs/build-support/build-fhs-chrootenv/default.nix
+++ b/pkgs/build-support/build-fhs-chrootenv/default.nix
@@ -1,16 +1,50 @@
-{stdenv, glibc, glibcLocales, gcc, coreutils, diffutils, findutils, gnused, gnugrep, gnutar, gzip, bzip2, 
-bashInteractive, xz, shadow, gawk, less, buildEnv}:
-{name, pkgs ? [], profile ? ""}:
+{ buildEnv, nixpkgs, nixpkgs_i686, system
+, stdenv, glibc, glibc_multi, glibcLocales
+, bashInteractive, coreutils, less, shadow su
+, gawk, gcc, diffutils, findutils, gnused, gnugrep
+, gnutar, gzip, bzip2, xz
+} :
+{ name, pkgs ? [], profile ? ""
+, targetPkgs ? null, multiPkgs ? null
+, extraBuildCommands ? "", extraBuildCommandsMulti ? ""
+}:
+
+assert pkgs       != []   -> targetPkgs == null && multiPkgs == null;
+assert targetPkgs != null -> multiPkgs  != null;
+assert multiPkgs  != null -> targetPkgs != null;
+assert targetPkgs != null -> pkgs       == [];
 
 let
-  basePkgs = [
-    glibc glibcLocales gcc coreutils diffutils findutils gnused gnugrep gnutar
-    gzip bzip2 bashInteractive xz shadow gawk less
-  ];
+  is64Bit       = system == "x86_64-linux";
+  # enable multi builds on x86_64 hosts if pakgs_target/multi are defined
+  isMultiBuild  = is64Bit && targetPkgs != null;
+  isNormalBuild = !isMultiBuild;
+
+  # list of packages (usually programs) which will only be installed for the
+  # hosts architecture
+  targetPaths = if targetPkgs == null
+                  then pkgs
+                  else targetPkgs nixpkgs ++ multiPkgs nixpkgs;
+
+  # list of pckages which should be build for both x86 and x86_64 on x86_64
+  # systems
+  multiPaths = if isMultiBuild
+                  then multiPkgs nixpkgs_i686
+                  else [];
+
+  # base packages of the chroot
+  # these match the hosts architecture, glibc_multi will be choosen
+  # on multi builds
+  basePkgs =
+    [ (if isMultiBuild then glibc_multi else glibc)
+      bashInteractive coreutils less shadow su
+      gawk gcc diffutils findutils gnused gnugrep
+      gnutar gzip bzip2 xz
+    ];
 
   # Compose a global profile for the chroot environment
-  profilePkg = stdenv.mkDerivation {
-    name = "${name}-chrootenv-profile";
+  profilePkg = nixpkgs.stdenv.mkDerivation {
+    name         = "${name}-chrootenv-profile";
     buildCommand = ''
       mkdir -p $out/etc
       cat >> $out/etc/profile << "EOF"
@@ -20,67 +54,117 @@ let
     '';
   };
 
-  paths = basePkgs ++ [ profilePkg ] ++ pkgs;
-
   # Composes a /usr like directory structure
-  staticUsrProfile = buildEnv {
-    name = "system-profile";
-    inherit paths;
+  staticUsrProfileTarget = buildEnv {
+    name = "system-profile-target";
+    paths = basePkgs ++ [ profilePkg ] ++ targetPaths;
   };
-  
+
+  staticUsrProfileMulti = buildEnv {
+    name = "system-profile-multi";
+    paths = multiPaths;
+  };
+
   # References to shell scripts that set up or tear down the environment
-  initSh = ./init.sh.in;
-  mountSh = ./mount.sh.in;
-  loadSh = ./load.sh.in;
-  umountSh = ./umount.sh.in;
+  initSh    = ./init.sh.in;
+  mountSh   = ./mount.sh.in;
+  loadSh    = ./load.sh.in;
+  umountSh  = ./umount.sh.in;
   destroySh = ./destroy.sh.in;
-in
-stdenv.mkDerivation {
-  name = "${name}-chrootenv";
-  buildCommand = ''
-    mkdir -p $out/sw
-    cd $out/sw
-    
-    for i in ${staticUsrProfile}/{etc,bin,lib{,32,64},sbin,var}
-    do
+
+  linkProfile = profile: ''
+    for i in ${profile}/{etc,bin,lib{,32,64},sbin,share,var}; do
         if [ -x "$i" ]
         then
             ln -s "$i"
         fi
     done
-    
-    ln -s ${staticUsrProfile} usr
-    
+  '';
+
+  # the target profile is the actual profile that will be used for the chroot
+  setupTargetProfile = ''
+    ${linkProfile staticUsrProfileTarget}
+    mkdir -m0755 usr
+    cd usr
+    ${linkProfile staticUsrProfileTarget}
     cd ..
-    
+  '';
+
+  # this will happen on x86_64 host:
+  # /x86         -> links to the whole profile defined by multiPaths
+  # /lib, /lib32 -> links to 32bit binaries
+  # /lib64       -> links to 64bit binaries
+  # /usr/lib*    -> same as above
+  setupMultiProfile = if isNormalBuild then "" else ''
+    mkdir -m0755 x86
+    cd x86
+    ${linkProfile staticUsrProfileMulti}
+    cd ..
+
+    ${setupLibDirs}
+
+    cd usr
+    ${setupLibDirs}
+    cd ..
+  '';
+
+  setupLibDirs = ''
+    rm -f lib lib32 lib64
+    mkdir -m0755 lib
+    # copy glibc stuff
+    cp -rs  ${staticUsrProfileTarget}/lib/32/* lib/
+    # copy contents of multiPaths
+    cp -rsf ${staticUsrProfileMulti}/lib/*     lib/
+
+    ln -s lib lib32
+    ln -s ${staticUsrProfileTarget}/lib lib64
+  '';
+
+in stdenv.mkDerivation {
+  name         = "${name}-chrootenv";
+  buildCommand = ''
+    mkdir -p "$out/sw"
+    cd "$out/sw"
+    ${setupTargetProfile}
+    ${setupMultiProfile}
+    cd ..
+
     mkdir -p bin
     cd bin
-    
+
     sed -e "s|@chrootEnv@|$out|g" \
         -e "s|@name@|${name}|g" \
         -e "s|@shell@|${stdenv.shell}|g" \
         ${initSh} > init-${name}-chrootenv
     chmod +x init-${name}-chrootenv
-    
+
     sed -e "s|@shell@|${stdenv.shell}|g" \
         -e "s|@name@|${name}|g" \
         ${mountSh} > mount-${name}-chrootenv
     chmod +x mount-${name}-chrootenv
-    
+
     sed -e "s|@shell@|${stdenv.shell}|g" \
         -e "s|@name@|${name}|g" \
         ${loadSh} > load-${name}-chrootenv
     chmod +x load-${name}-chrootenv
-    
+
     sed -e "s|@shell@|${stdenv.shell}|g" \
         -e "s|@name@|${name}|g" \
         ${umountSh} > umount-${name}-chrootenv
     chmod +x umount-${name}-chrootenv
-    
+
     sed -e "s|@chrootEnv@|$out|g" \
         -e "s|@shell@|${stdenv.shell}|g" \
         -e "s|@name@|${name}|g" \
         ${destroySh} > destroy-${name}-chrootenv
     chmod +x destroy-${name}-chrootenv
+
+    cd ..
+
+    cd "$out/sw"
+    ${extraBuildCommands}
+    cd "$out/sw"
+    ${extraBuildCommandsMulti}
+    cd ..
   '';
 }
diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix
index 2173d12666e5..d7b8437450df 100644
--- a/pkgs/games/steam/chrootenv.nix
+++ b/pkgs/games/steam/chrootenv.nix
@@ -1,12 +1,69 @@
-{ buildFHSChrootEnv, steam
-, xterm, libX11, zenity, python, mesa, xdg_utils, dbus_tools, alsaLib
-}:
+{ buildFHSChrootEnv }:
 
 buildFHSChrootEnv {
   name = "steam";
-  pkgs = [ steam xterm libX11 zenity python mesa xdg_utils dbus_tools alsaLib ];
+
+  targetPkgs = pkgs:
+    [ pkgs.steam
+      pkgs.corefonts
+      pkgs.curl
+      pkgs.dbus
+      pkgs.dpkg
+      pkgs.mono
+      pkgs.python
+      pkgs.gnome2.zenity
+      pkgs.xdg_utils
+    ];
+
+  multiPkgs = pkgs:
+      [ pkgs.cairo
+        pkgs.glib
+        pkgs.gtk
+        pkgs.gdk_pixbuf
+        pkgs.pango
+
+        pkgs.freetype
+        pkgs.xlibs.libICE
+        pkgs.xlibs.libSM
+        pkgs.xlibs.libX11
+        pkgs.xlibs.libXau
+        pkgs.xlibs.libxcb
+        pkgs.xlibs.libXcursor
+        pkgs.xlibs.libXdamage
+        pkgs.xlibs.libXdmcp
+        pkgs.xlibs.libXext
+        pkgs.xlibs.libXfixes
+        pkgs.xlibs.libXi
+        pkgs.xlibs.libXinerama
+        pkgs.xlibs.libXrandr
+        pkgs.xlibs.libXrender
+        pkgs.xlibs.libXScrnSaver
+        pkgs.xlibs.libXtst
+        pkgs.xlibs.libXxf86vm
+
+        pkgs.libpng12
+        pkgs.mesa
+        pkgs.SDL
+
+        pkgs.libgcrypt
+        pkgs.zlib
+
+        pkgs.alsaLib
+        pkgs.libvorbis
+        pkgs.openal
+        pkgs.pulseaudio
+
+        pkgs.flashplayer
+      ];
+
+  extraBuildCommandsMulti = ''
+    cd usr/lib
+    ln -sf ../lib64/steam steam
+  '';
+
   profile = ''
-    export LD_LIBRARY_PATH=/run/opengl-driver/lib:/run/opengl-driver-32/lib:/lib
+    export LD_LIBRARY_PATH=/run/opengl-driver/lib:/run/opengl-driver-32/lib:/lib:/lib32:/lib64
+    export PATH=$PATH:/usr/bin:/usr/sbin
     export FONTCONFIG_FILE=/etc/fonts/fonts.conf
   '';
 }
diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix
index c1273e9a20f2..ba5a410f3a39 100644
--- a/pkgs/games/steam/default.nix
+++ b/pkgs/games/steam/default.nix
@@ -1,118 +1,21 @@
-/*{ stdenv, fetchurl, dpkg, makeWrapper, xz, libX11, gcc, glibc
-, libselinux, libXrandr, pango, freetype, fontconfig, glib, gtk
-, gdk_pixbuf, cairo, libXi, alsaLib, libXrender, nss, nspr, zlib
-, dbus, libpng12, libXfixes, cups, libgcrypt, openal, pulseaudio
-, libxcb, libXau, libXdmcp, flashplayer, libSM, libICE, libXext
-, dbus_glib, libusb1, networkmanager
-, SDL # World of Goo
-, libvorbis # Osmos
-, curl, mesa # Superbrothers: S&S EP
-, patchelf }:
-
-assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
-
-let version = "1.0.0.39"; in
-
-stdenv.mkDerivation rec {
-  name = "steam-${version}";
-
-  src = fetchurl {
-    url = "http://repo.steampowered.com/steam/pool/steam/s/steam/steam-launcher_${version}_all.deb";
-    sha256 = "1z1cnlr2qw2ndnqsfwjck9617m2p0f3p9q9409vczj909h2a9wyk";
-  };
-
-  buildInputs = [ dpkg makeWrapper ];
-
-  phases = "installPhase";
-
-  installPhase = ''
-    mkdir -p $out
-    dpkg-deb -x $src $out
-    cp -r $out/usr/* $out/
-    rm -rf $out/usr
-    substituteInPlace "$out/bin/steam" --replace "/usr/bin/env bash" "/bin/sh"
-    substituteInPlace "$out/bin/steam" --replace "/usr/" "$out/"
-    sed -i 's,STEAMPACKAGE=.*,STEAMPACKAGE=steam,' $out/bin/steam
-    sed -i '/STEAMSCRIPT/d' $out/bin/steam
-
-    mv $out/bin/steam $out/bin/.steam-wrapped
-    cat > $out/bin/steam << EOF
-
-    export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${libX11}/lib:${gcc.gcc}/lib:${libselinux}/lib:${libXrandr}/lib:${pango}/lib:${freetype}/lib:${fontconfig}/lib:${glib}/lib:${gtk}/lib:${gdk_pixbuf}/lib:${cairo}/lib:${libXi}/lib:${alsaLib}/lib:${libXrender}/lib:${nss}/lib:${nspr}/lib:${zlib}/lib:${dbus}/lib:${libpng12}/lib:${libXfixes}/lib:${cups}/lib:${libgcrypt}/lib:${openal}/lib:${pulseaudio}/lib:${libxcb}/lib:${libXau}/lib:${libXdmcp}/lib:${SDL}/lib:${libvorbis}/lib:${curl}/lib:${libSM}/lib:${libICE}/lib:${dbus_glib}/lib:${networkmanager}/lib:${libXext}/lib:${libusb1}/lib
-    STEAMBOOTSTRAP=~/.steam/steam/steam.sh
-    if [ -f \$STEAMBOOTSTRAP ]; then
-      PLATFORM32=ubuntu12_32
-      STEAMCONFIG=~/.steam
-      STEAMROOT=~/.local/share/Steam
-      STEAMDATA="\$STEAMROOT"
-      PIDFILE="\$STEAMCONFIG/steam.pid"
-      STEAMBIN32LINK="\$STEAMCONFIG/bin32"
-      STEAMBIN64LINK="\$STEAMCONFIG/bin64"
-      STEAMSDK32LINK="\$STEAMCONFIG/sdk32"
-      STEAMSDK64LINK="\$STEAMCONFIG/sdk64"
-      STEAMROOTLINK="\$STEAMCONFIG/root"
-      STEAMDATALINK="\$STEAMCONFIG/steam"
-      STEAMSTARTING="\$STEAMCONFIG/starting"
-      # Create symbolic links for the Steam API
-      if [ ! -e "\$STEAMCONFIG" ]; then
-          mkdir "\$STEAMCONFIG"
-      fi
-      if [ "\$STEAMROOT" != "\$STEAMROOTLINK" -a "\$STEAMROOT" != "\$STEAMDATALINK" ]; then
-          rm -f "\$STEAMBIN32LINK" && ln -s "\$STEAMROOT/\$PLATFORM32" "\$STEAMBIN32LINK"
-          rm -f "\$STEAMBIN64LINK" && ln -s "\$STEAMROOT/\$PLATFORM64" "\$STEAMBIN64LINK"
-          rm -f "\$STEAMSDK32LINK" && ln -s "\$STEAMROOT/linux32" "\$STEAMSDK32LINK"
-          rm -f "\$STEAMSDK64LINK" && ln -s "\$STEAMROOT/linux64" "\$STEAMSDK64LINK"
-          rm -f "\$STEAMROOTLINK" && ln -s "\$STEAMROOT" "\$STEAMROOTLINK"
-          if [ "\$STEAMDATALINK" ]; then
-              rm -f "\$STEAMDATALINK" && ln -s "\$STEAMDATA" "\$STEAMDATALINK"
-          fi
-      fi
-      # Temporary bandaid until everyone has the new libsteam_api.so
-      rm -f ~/.steampath && ln -s "\$STEAMCONFIG/bin32/steam" ~/.steampath
-      rm -f ~/.steampid && ln -s "\$PIDFILE" ~/.steampid
-      rm -f ~/.steam/bin && ln -s "\$STEAMBIN32LINK" ~/.steam/bin
-      export LD_LIBRARY_PATH="\$STEAMBIN32LINK:\$LD_LIBRARY_PATH:${mesa}/lib"
-      export SDL_VIDEO_X11_DGAMOUSE=0
-      cd "\$STEAMROOT"
-      FLASHLINK="\$STEAMCONFIG/bin32/plugins"
-      rm -f "\$FLASHLINK" && ln -s "${flashplayer}/lib/mozilla/plugins" "\$FLASHLINK"
-      LDSO="\$STEAMBIN32LINK/ld.so"
-      cp ${glibc}/lib/ld-linux.so.2 "\$LDSO"
-      chmod u+w "\$LDSO"
-      echo \$\$ > "\$PIDFILE" # pid of the shell will become pid of steam
-      export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${glibc}/lib
-      exec "\$LDSO" "\$STEAMBIN32LINK/steam"
-    else
-      export PATH=${xz}/bin:\$PATH
-      exec $out/bin/.steam-wrapped
-    fi
-    EOF
-
-    chmod +x $out/bin/steam
-  '';
-
-  meta = {
-    description = "A digital distribution platform";
-    homepage = http://store.steampowered.com/;
-    license = stdenv.lib.licenses.unfree;
-  };
-}
-*/
-
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
   name = "steam-1.0.0.48";
+
   src = fetchurl {
     url = http://repo.steampowered.com/steam/pool/steam/s/steam/steam_1.0.0.48.tar.gz;
     sha256 = "08y5qf75ssk4fnazyv2yz1c5zs7gjiwigaibv8yz1gbr290r0b52";
   };
+
+  buildInputs = [ dpkg ];
+  unpackPhase = "true";
   installPhase = ''
     make DESTDIR=$out install
     mv $out/usr/* $out #*/
     rmdir $out/usr
   '';
-  
+
   meta = {
     description = "A digital distribution platform";
     homepage = http://store.steampowered.com/;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 46166d608ef3..9f2c7d5ed2bd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -262,9 +262,14 @@ let
   };
 
   buildFHSChrootEnv = import ../build-support/build-fhs-chrootenv {
-    inherit stdenv glibc glibcLocales gcc coreutils diffutils findutils;
-    inherit gnused gnugrep gnutar gzip bzip2 bashInteractive xz shadow gawk;
-    inherit less buildEnv;
+    inherit buildEnv system;
+    inherit stdenv glibc glibc_multi glibcLocales;
+    inherit bashInteractive coreutils less shadow su;
+    inherit gawk gcc diffutils findutils gnused gnugrep;
+    inherit gnutar gzip bzip2 xz;
+
+    nixpkgs      = pkgs;
+    nixpkgs_i686 = pkgsi686Linux;
   };
 
   dotnetenv = import ../build-support/dotnetenv {
@@ -10653,11 +10658,9 @@ let
 
   stardust = callPackage ../games/stardust {};
 
-  steam = callPackage_i686 ../games/steam {};
+  steam = callPackage ../games/steam {};
 
-  steamChrootEnv = callPackage_i686 ../games/steam/chrootenv.nix {
-    zenity = gnome2.zenity;
-  };
+  steamChrootEnv = callPackage ../games/steam/chrootenv.nix { };
 
   stuntrally = callPackage ../games/stuntrally { };
 

From 72b1f874ef0c43569516892b17c8893f0785bfef Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Wed, 23 Apr 2014 09:39:58 +0200
Subject: [PATCH 1363/1453] buildFHSChrootEnv: fix merge error

---
 pkgs/build-support/build-fhs-chrootenv/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/build-fhs-chrootenv/default.nix b/pkgs/build-support/build-fhs-chrootenv/default.nix
index 411e73ab8102..306cfeeb264d 100644
--- a/pkgs/build-support/build-fhs-chrootenv/default.nix
+++ b/pkgs/build-support/build-fhs-chrootenv/default.nix
@@ -1,6 +1,6 @@
 { buildEnv, nixpkgs, nixpkgs_i686, system
 , stdenv, glibc, glibc_multi, glibcLocales
-, bashInteractive, coreutils, less, shadow su
+, bashInteractive, coreutils, less, shadow, su
 , gawk, gcc, diffutils, findutils, gnused, gnugrep
 , gnutar, gzip, bzip2, xz
 } :

From 2d912e29d564872a729828d959836945a4736389 Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Sat, 26 Apr 2014 14:42:10 +0200
Subject: [PATCH 1364/1453] build-fhs-chrootenv: fix gcc_multi paths

---
 .../build-fhs-chrootenv/default.nix           | 39 +++++++++++++------
 pkgs/top-level/all-packages.nix               |  5 ++-
 2 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/pkgs/build-support/build-fhs-chrootenv/default.nix b/pkgs/build-support/build-fhs-chrootenv/default.nix
index 306cfeeb264d..41c60ea5fe8d 100644
--- a/pkgs/build-support/build-fhs-chrootenv/default.nix
+++ b/pkgs/build-support/build-fhs-chrootenv/default.nix
@@ -1,7 +1,7 @@
 { buildEnv, nixpkgs, nixpkgs_i686, system
 , stdenv, glibc, glibc_multi, glibcLocales
 , bashInteractive, coreutils, less, shadow, su
-, gawk, gcc, diffutils, findutils, gnused, gnugrep
+, gawk, gcc, gcc_multi, diffutils, findutils, gnused, gnugrep
 , gnutar, gzip, bzip2, xz
 } :
 { name, pkgs ? [], profile ? ""
@@ -33,12 +33,14 @@ let
                   else [];
 
   # base packages of the chroot
-  # these match the hosts architecture, glibc_multi will be choosen
+  # these match the hosts architecture, gcc/glibc_multi will be choosen
   # on multi builds
+  choosenGcc = if isMultiBuild then gcc_multi else gcc;
   basePkgs =
     [ (if isMultiBuild then glibc_multi else glibc)
+      choosenGcc
       bashInteractive coreutils less shadow su
-      gawk gcc diffutils findutils gnused gnugrep
+      gawk diffutils findutils gnused gnugrep
       gnutar gzip bzip2 xz
     ];
 
@@ -101,23 +103,36 @@ let
     ${linkProfile staticUsrProfileMulti}
     cd ..
 
-    ${setupLibDirs}
+    ${setupMultiLibDirs}
 
     cd usr
-    ${setupLibDirs}
+    ${setupMultiLibDirs}
     cd ..
   '';
 
-  setupLibDirs = ''
+  setupMultiLibDirs = ''
     rm -f lib lib32 lib64
     mkdir -m0755 lib
-    # copy glibc stuff
-    cp -rs  ${staticUsrProfileTarget}/lib/32/* lib/
-    # copy contents of multiPaths
-    cp -rsf ${staticUsrProfileMulti}/lib/*     lib/
-
+    mkdir -m0755 lib64
     ln -s lib lib32
-    ln -s ${staticUsrProfileTarget}/lib lib64
+
+    # copy glibc stuff
+    cp -rsf ${staticUsrProfileTarget}/lib/32/* lib/
+
+    # copy content of multiPaths (32bit libs)
+    cp -rsf ${staticUsrProfileMulti}/lib/*  lib/
+
+    # copy content of targetPaths (64bit libs)
+    cp -rsf ${staticUsrProfileTarget}/lib/*   lib64/
+    # most 64bit only libs put their stuff into /lib
+    # some pkgs (like gcc_multi) put 32bit libs into /lib 64bit libs into /lib64
+    # by overwriting these we will hopefully catch all these cases
+    # in the end /lib should only contain 32bit and /lib64 only 64bit libs
+    cp -rsf ${staticUsrProfileTarget}/lib64/* lib64/
+
+    # copy gcc libs (and may overwrite exitsting wrongly placed libs)
+    cp -rsf ${choosenGcc.gcc}/lib/*   lib/
+    cp -rsf ${choosenGcc.gcc}/lib64/* lib64/
   '';
 
 in stdenv.mkDerivation {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9f2c7d5ed2bd..6de1001c5cb4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -265,7 +265,7 @@ let
     inherit buildEnv system;
     inherit stdenv glibc glibc_multi glibcLocales;
     inherit bashInteractive coreutils less shadow su;
-    inherit gawk gcc diffutils findutils gnused gnugrep;
+    inherit gawk gcc gcc_multi diffutils findutils gnused gnugrep;
     inherit gnutar gzip bzip2 xz;
 
     nixpkgs      = pkgs;
@@ -2737,7 +2737,8 @@ let
 
   gambit = callPackage ../development/compilers/gambit { };
 
-  gcc = gcc48;
+  gcc       = gcc48;
+  gcc_multi = gcc48_multi;
 
   gcc33 = wrapGCC (import ../development/compilers/gcc/3.3 {
     inherit fetchurl stdenv noSysDirs;

From 64f873461f8e96dad4ea45253d7801e38108bc9d Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Sat, 26 Apr 2014 19:38:03 +0200
Subject: [PATCH 1365/1453] build-fhs-chrootenv: fix gcc libs on x86

---
 .../build-fhs-chrootenv/default.nix           | 66 +++++++++++++++----
 1 file changed, 52 insertions(+), 14 deletions(-)

diff --git a/pkgs/build-support/build-fhs-chrootenv/default.nix b/pkgs/build-support/build-fhs-chrootenv/default.nix
index 41c60ea5fe8d..38bd3623d29e 100644
--- a/pkgs/build-support/build-fhs-chrootenv/default.nix
+++ b/pkgs/build-support/build-fhs-chrootenv/default.nix
@@ -14,11 +14,36 @@ assert targetPkgs != null -> multiPkgs  != null;
 assert multiPkgs  != null -> targetPkgs != null;
 assert targetPkgs != null -> pkgs       == [];
 
+
+# HOWTO:
+# If pkgs is defined buildFHSChrootEnv will run in legacy mode. This means
+# it will build all pkgs contained in pkgs and basePkgs and then just merge
+# all of their contents together via buildEnv.
+#
+# The new way is to define both targetPkgs and multiPkgs. These two are
+# functions which get a pkgs environment supplied and should then return a list
+# of packages based this environment.
+# For example: targetPkgs = pkgs: [ pkgs.nmap ];
+#
+# All packages (most likeley programs) placed in targetPkgs will only be
+# installed once--matching the hosts architecture (64bit on x86_64 and 32bit on
+# x86). These packages will populate the chroot directory tree.
+#
+# Packages (most likeley libraries) defined in multiPkgs will be installed once
+# on x86 systems and twice on x86_64 systems.
+# On x86 they will just be merge with the packages defined in targetPkgs.
+# On x86_64 they will be added to targetPkgs and in addition their 32bit
+# versions will also be installed. The final directory should look as follows:
+# /lib will include 32bit libraries from multiPkgs
+# /lib32 will link to /lib
+# /lib64 will include 64bit libraries from multiPkgs and targetPkgs
+# /x86 will contain a complete 32bit environment composed by multiPkgs
+
 let
   is64Bit       = system == "x86_64-linux";
   # enable multi builds on x86_64 hosts if pakgs_target/multi are defined
   isMultiBuild  = is64Bit && targetPkgs != null;
-  isNormalBuild = !isMultiBuild;
+  isTargetBuild = !isMultiBuild;
 
   # list of packages (usually programs) which will only be installed for the
   # hosts architecture
@@ -75,7 +100,7 @@ let
   destroySh = ./destroy.sh.in;
 
   linkProfile = profile: ''
-    for i in ${profile}/{etc,bin,lib{,32,64},sbin,share,var}; do
+    for i in ${profile}/{etc,bin,sbin,share,var}; do
         if [ -x "$i" ]
         then
             ln -s "$i"
@@ -86,9 +111,12 @@ let
   # the target profile is the actual profile that will be used for the chroot
   setupTargetProfile = ''
     ${linkProfile staticUsrProfileTarget}
+    ${setupLibDirs}
+
     mkdir -m0755 usr
     cd usr
     ${linkProfile staticUsrProfileTarget}
+    ${setupLibDirs}
     cd ..
   '';
 
@@ -97,21 +125,30 @@ let
   # /lib, /lib32 -> links to 32bit binaries
   # /lib64       -> links to 64bit binaries
   # /usr/lib*    -> same as above
-  setupMultiProfile = if isNormalBuild then "" else ''
+  setupMultiProfile = if isTargetBuild then "" else ''
     mkdir -m0755 x86
     cd x86
     ${linkProfile staticUsrProfileMulti}
     cd ..
-
-    ${setupMultiLibDirs}
-
-    cd usr
-    ${setupMultiLibDirs}
-    cd ..
   '';
 
-  setupMultiLibDirs = ''
-    rm -f lib lib32 lib64
+  setupLibDirs = if isTargetBuild then setupLibDirs_target
+                                  else setupLibDirs_multi;
+
+  # setup library paths only for the targeted architecture
+  setupLibDirs_target = ''
+    mkdir -m0755 lib
+
+    # copy content of targetPaths
+    cp -rsf ${staticUsrProfileTarget}/lib/* lib/
+
+    # copy gcc libs
+    cp -rsf ${choosenGcc.gcc}/lib/* lib/
+
+  '';
+
+  # setup /lib, /lib32 and /lib64
+  setupLibDirs_multi = ''
     mkdir -m0755 lib
     mkdir -m0755 lib64
     ln -s lib lib32
@@ -120,12 +157,13 @@ let
     cp -rsf ${staticUsrProfileTarget}/lib/32/* lib/
 
     # copy content of multiPaths (32bit libs)
-    cp -rsf ${staticUsrProfileMulti}/lib/*  lib/
+    cp -rsf ${staticUsrProfileMulti}/lib/* lib/
 
     # copy content of targetPaths (64bit libs)
-    cp -rsf ${staticUsrProfileTarget}/lib/*   lib64/
+    cp -rsf ${staticUsrProfileTarget}/lib/* lib64/
+
     # most 64bit only libs put their stuff into /lib
-    # some pkgs (like gcc_multi) put 32bit libs into /lib 64bit libs into /lib64
+    # some pkgs (like gcc_multi) put 32bit libs into and /lib 64bit libs into /lib64
     # by overwriting these we will hopefully catch all these cases
     # in the end /lib should only contain 32bit and /lib64 only 64bit libs
     cp -rsf ${staticUsrProfileTarget}/lib64/* lib64/

From c376b1afa08be5d7efe3ddd3c1c210485eacb53f Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Sun, 15 Jun 2014 15:29:18 +0200
Subject: [PATCH 1366/1453] build-fhs-chrootenv: fix gcc libs on i686

---
 pkgs/build-support/build-fhs-chrootenv/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/build-support/build-fhs-chrootenv/default.nix b/pkgs/build-support/build-fhs-chrootenv/default.nix
index 38bd3623d29e..b325c22a25a1 100644
--- a/pkgs/build-support/build-fhs-chrootenv/default.nix
+++ b/pkgs/build-support/build-fhs-chrootenv/default.nix
@@ -141,10 +141,6 @@ let
 
     # copy content of targetPaths
     cp -rsf ${staticUsrProfileTarget}/lib/* lib/
-
-    # copy gcc libs
-    cp -rsf ${choosenGcc.gcc}/lib/* lib/
-
   '';
 
   # setup /lib, /lib32 and /lib64

From a383e0f1b8f043310f570ec78bbac52cabdd8082 Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Sun, 15 Jun 2014 15:34:27 +0200
Subject: [PATCH 1367/1453] steam: add optional java support

---
 pkgs/games/steam/chrootenv.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix
index d7b8437450df..67f69aa40670 100644
--- a/pkgs/games/steam/chrootenv.nix
+++ b/pkgs/games/steam/chrootenv.nix
@@ -1,4 +1,4 @@
-{ buildFHSChrootEnv }:
+{ buildFHSChrootEnv, config }:
 
 buildFHSChrootEnv {
   name = "steam";
@@ -13,7 +13,9 @@ buildFHSChrootEnv {
       pkgs.python
       pkgs.gnome2.zenity
       pkgs.xdg_utils
-    ];
+    ]
+    ++ (if config.steam.java or false then [ pkgs.jdk ] else [ ])
+    ;
 
   multiPkgs = pkgs:
       [ pkgs.cairo
@@ -23,6 +25,7 @@ buildFHSChrootEnv {
         pkgs.pango
 
         pkgs.freetype
+        pkgs.fontconfig
         pkgs.xlibs.libICE
         pkgs.xlibs.libSM
         pkgs.xlibs.libX11
@@ -41,9 +44,11 @@ buildFHSChrootEnv {
         pkgs.xlibs.libXtst
         pkgs.xlibs.libXxf86vm
 
+        pkgs.ffmpeg
         pkgs.libpng12
         pkgs.mesa
         pkgs.SDL
+        pkgs.SDL2
 
         pkgs.libgcrypt
         pkgs.zlib

From 573aa18e9f3527c23c88b250f101d17db116434f Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Sun, 15 Jun 2014 19:17:58 +0200
Subject: [PATCH 1368/1453] steam: fix extraBuildCommandsMulti on i686

---
 pkgs/build-support/build-fhs-chrootenv/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/build-fhs-chrootenv/default.nix b/pkgs/build-support/build-fhs-chrootenv/default.nix
index b325c22a25a1..89dd2faf3ba4 100644
--- a/pkgs/build-support/build-fhs-chrootenv/default.nix
+++ b/pkgs/build-support/build-fhs-chrootenv/default.nix
@@ -213,7 +213,7 @@ in stdenv.mkDerivation {
     cd "$out/sw"
     ${extraBuildCommands}
     cd "$out/sw"
-    ${extraBuildCommandsMulti}
+    ${if isMultiBuild then extraBuildCommandsMulti else ""}
     cd ..
   '';
 }

From 5a74e1a6060723dd721afbd3ce8885c9f36c0a09 Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Thu, 19 Jun 2014 11:28:14 +0200
Subject: [PATCH 1369/1453] steam-chrootenv: remove fontconfig from installed
 modules

---
 pkgs/games/steam/chrootenv.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix
index 67f69aa40670..4844e6a5c875 100644
--- a/pkgs/games/steam/chrootenv.nix
+++ b/pkgs/games/steam/chrootenv.nix
@@ -25,7 +25,6 @@ buildFHSChrootEnv {
         pkgs.pango
 
         pkgs.freetype
-        pkgs.fontconfig
         pkgs.xlibs.libICE
         pkgs.xlibs.libSM
         pkgs.xlibs.libX11

From 3894e687218b6eacf42420bf26b148a04a20a20a Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Thu, 10 Jul 2014 10:25:19 +0200
Subject: [PATCH 1370/1453] steam-chrootenv: fix indentation

---
 pkgs/games/steam/chrootenv.nix | 72 +++++++++++++++++-----------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix
index 4844e6a5c875..75bbca67ab07 100644
--- a/pkgs/games/steam/chrootenv.nix
+++ b/pkgs/games/steam/chrootenv.nix
@@ -18,47 +18,47 @@ buildFHSChrootEnv {
     ;
 
   multiPkgs = pkgs:
-      [ pkgs.cairo
-        pkgs.glib
-        pkgs.gtk
-        pkgs.gdk_pixbuf
-        pkgs.pango
+    [ pkgs.cairo
+      pkgs.glib
+      pkgs.gtk
+      pkgs.gdk_pixbuf
+      pkgs.pango
 
-        pkgs.freetype
-        pkgs.xlibs.libICE
-        pkgs.xlibs.libSM
-        pkgs.xlibs.libX11
-        pkgs.xlibs.libXau
-        pkgs.xlibs.libxcb
-        pkgs.xlibs.libXcursor
-        pkgs.xlibs.libXdamage
-        pkgs.xlibs.libXdmcp
-        pkgs.xlibs.libXext
-        pkgs.xlibs.libXfixes
-        pkgs.xlibs.libXi
-        pkgs.xlibs.libXinerama
-        pkgs.xlibs.libXrandr
-        pkgs.xlibs.libXrender
-        pkgs.xlibs.libXScrnSaver
-        pkgs.xlibs.libXtst
-        pkgs.xlibs.libXxf86vm
+      pkgs.freetype
+      pkgs.xlibs.libICE
+      pkgs.xlibs.libSM
+      pkgs.xlibs.libX11
+      pkgs.xlibs.libXau
+      pkgs.xlibs.libxcb
+      pkgs.xlibs.libXcursor
+      pkgs.xlibs.libXdamage
+      pkgs.xlibs.libXdmcp
+      pkgs.xlibs.libXext
+      pkgs.xlibs.libXfixes
+      pkgs.xlibs.libXi
+      pkgs.xlibs.libXinerama
+      pkgs.xlibs.libXrandr
+      pkgs.xlibs.libXrender
+      pkgs.xlibs.libXScrnSaver
+      pkgs.xlibs.libXtst
+      pkgs.xlibs.libXxf86vm
 
-        pkgs.ffmpeg
-        pkgs.libpng12
-        pkgs.mesa
-        pkgs.SDL
-        pkgs.SDL2
+      pkgs.ffmpeg
+      pkgs.libpng12
+      pkgs.mesa
+      pkgs.SDL
+      pkgs.SDL2
 
-        pkgs.libgcrypt
-        pkgs.zlib
+      pkgs.libgcrypt
+      pkgs.zlib
 
-        pkgs.alsaLib
-        pkgs.libvorbis
-        pkgs.openal
-        pkgs.pulseaudio
+      pkgs.alsaLib
+      pkgs.libvorbis
+      pkgs.openal
+      pkgs.pulseaudio
 
-        pkgs.flashplayer
-      ];
+      pkgs.flashplayer
+    ];
 
   extraBuildCommandsMulti = ''
     cd usr/lib

From 23d5fd2e2ff091468f493043e14526c1b8f1556b Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Sat, 6 Sep 2014 00:30:10 +0200
Subject: [PATCH 1371/1453] Fix steam package

---
 pkgs/games/steam/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix
index ba5a410f3a39..9104bb40f777 100644
--- a/pkgs/games/steam/default.nix
+++ b/pkgs/games/steam/default.nix
@@ -8,8 +8,6 @@ stdenv.mkDerivation {
     sha256 = "08y5qf75ssk4fnazyv2yz1c5zs7gjiwigaibv8yz1gbr290r0b52";
   };
 
-  buildInputs = [ dpkg ];
-  unpackPhase = "true";
   installPhase = ''
     make DESTDIR=$out install
     mv $out/usr/* $out #*/

From 0dc8d73d17873ddce19c7472d67662a41c96ca69 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 6 Sep 2014 00:54:40 +0200
Subject: [PATCH 1372/1453] Fix munin test evaluation

---
 nixos/tests/munin.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/munin.nix b/nixos/tests/munin.nix
index ddbac590143f..d18abd68ee0e 100644
--- a/nixos/tests/munin.nix
+++ b/nixos/tests/munin.nix
@@ -18,8 +18,8 @@ import ./make-test.nix {
              '';
            };
           };
+          systemd.services.munin-node.unitConfig.TimeoutSec = 240;
         };
-      systemd.services.munin-node.unitConfig.TimeoutSec = 240;
     };
 
   testScript = ''

From f4ebb3ebac9ccaf1dacebba0550c21818101be3d Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 5 Sep 2014 16:50:48 -0400
Subject: [PATCH 1373/1453] klibc: bump

---
 pkgs/os-specific/linux/klibc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix
index df44cb68d8bd..b948dbff2c1d 100644
--- a/pkgs/os-specific/linux/klibc/default.nix
+++ b/pkgs/os-specific/linux/klibc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, kernelHeaders, kernel, perl }:
 
 let
-  version = "2.0.3";
+  version = "2.0.4";
 
   commonMakeFlags = [
     "prefix=$(out)"
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://kernel/linux/libs/klibc/2.0/klibc-${version}.tar.xz";
-    sha256 = "02035f2b230020de569d40605485121e0fe481ed33a93bdb8bf8c6ee2695fffa";
+    sha256 = "7f9a0850586def7cf4faeeb75e5d0f66e613674c524f6e77b0f4d93a26c801cb";
   };
 
   patches = [ ./no-reinstall-kernel-headers.patch ];

From 7d6ce52d19281e3d0646782a899cf6623d41e4da Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Fri, 5 Sep 2014 19:59:01 -0700
Subject: [PATCH 1374/1453] firefox-bin: update to version 32.0

---
 .../browsers/firefox-bin/default.nix          | 360 +++++++++---------
 .../browsers/firefox-bin/generate_nix.rb      |   2 +
 2 files changed, 183 insertions(+), 179 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 56ba95c661f5..f24f44c1719f 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -40,186 +40,188 @@
 assert stdenv.isLinux;
 
 let
-  version = "31.0";
+  version = "32.0";
   sources = [
-    { locale = "ach"; arch = "linux-i686"; sha256 = "8372c1227b75486e297fd914bac530a45b22b789e627638e010d4c25337f350f"; }
-    { locale = "ach"; arch = "linux-x86_64"; sha256 = "e01412aa570a462a3bb1ba851cd7133014b3299c0ad349c15534edc35c6d6397"; }
-    { locale = "af"; arch = "linux-i686"; sha256 = "e75bd2d41de60483ed1eadcf03d9cd57146210ff9fdfe04e984404ce4bca29f7"; }
-    { locale = "af"; arch = "linux-x86_64"; sha256 = "32697271215a0e63b7d0b25398d27772da5d53e88d020df24f170ebc341e5394"; }
-    { locale = "an"; arch = "linux-i686"; sha256 = "3a590702183a86283e4de415eefdeed6f95f1e5d48c64456c4d6db8f84dcfb68"; }
-    { locale = "an"; arch = "linux-x86_64"; sha256 = "98d35a6a2f0875a9723ed9511f3bea65f58da3196db3f75aaf7420d45bde33ad"; }
-    { locale = "ar"; arch = "linux-i686"; sha256 = "e632f104442b725cf8e0e25c9a924b166289e1fab601a70aee0a81394632423c"; }
-    { locale = "ar"; arch = "linux-x86_64"; sha256 = "603a054ceb36645881f52042e556572252e898bfa78cec04811e65f27b9db026"; }
-    { locale = "as"; arch = "linux-i686"; sha256 = "05e64b9113f450bfbfa1b99c9580dbb2442af35d6cc20dec0c7af379dd5d37db"; }
-    { locale = "as"; arch = "linux-x86_64"; sha256 = "85b57a101afd0c4aae040bb1f3523ddda3079d46ac8abe9cad826939fd274353"; }
-    { locale = "ast"; arch = "linux-i686"; sha256 = "5df5eb0db623b42d9a2c9be58807ec66f43a26dd1365d44202d4b0db50d6a6f0"; }
-    { locale = "ast"; arch = "linux-x86_64"; sha256 = "6faac3f3637bd68d6c20c73dd84c554afdaa136c4e142c26eb8142b7ab00895f"; }
-    { locale = "be"; arch = "linux-i686"; sha256 = "4a87051df26ddb3fd2cf7c2beabc2d403cbc4d2f2e7e0802fb11566722171b57"; }
-    { locale = "be"; arch = "linux-x86_64"; sha256 = "8194b851ed7f9559b78f63711df598ed094783eb2cc288fbd1e880d53118dde5"; }
-    { locale = "bg"; arch = "linux-i686"; sha256 = "f6f903529d3276d1aa55968d4978fe5977d45076db0ee99d87199d59a9441ad5"; }
-    { locale = "bg"; arch = "linux-x86_64"; sha256 = "bce34ee8ec314db0f7abfeddf491d15642dcedea125dc9bb7d7dda3915054940"; }
-    { locale = "bn-BD"; arch = "linux-i686"; sha256 = "9bd0e37ddf9a222263ca90308245e2078f45d754d8a2b0bc1e4dea13a5e7b581"; }
-    { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "debb3a9983e4219b6632cdfd09d04ab95314ba4e0bd7ff36fd89f0a748d25cdd"; }
-    { locale = "bn-IN"; arch = "linux-i686"; sha256 = "ea2c9d29f4a3dfe8e0f146979c47ccba835b81cb1f1ed6e95124a837918590fa"; }
-    { locale = "bn-IN"; arch = "linux-x86_64"; sha256 = "b2bf8e36ac1ca1afeae463bf95a289db7cf2d2fa303083ab405497cca2993b57"; }
-    { locale = "br"; arch = "linux-i686"; sha256 = "b4b9d2828e5387a65d0f63b2149400626cd47fc81b97b912eda11b3fe31d4604"; }
-    { locale = "br"; arch = "linux-x86_64"; sha256 = "c3af78f1215ffc1e9b6c193ba87d17e2f08e1a24856ee68aabf95b3ee7804ea9"; }
-    { locale = "bs"; arch = "linux-i686"; sha256 = "7930f10d5d43e4504b9f347bcb2a2ef451be4418cee86c199b3e98c38587a20d"; }
-    { locale = "bs"; arch = "linux-x86_64"; sha256 = "ee31279d2acf7286c9a59c99e68fdd1692b96247585230df20ea2bea5ee30ba2"; }
-    { locale = "ca"; arch = "linux-i686"; sha256 = "f22f7964180ad27a122e56f070c6a2a0e3b044fe15ec5046b04db03877a3b7c7"; }
-    { locale = "ca"; arch = "linux-x86_64"; sha256 = "84e8675f9613d1a8a49a760ee46d4625b88092cfc542e6b750384d0d5a0a465f"; }
-    { locale = "cs"; arch = "linux-i686"; sha256 = "bed550a83c763a8147ef862cca7ca36106bfc5b34ea81f008c94886b86a3dde2"; }
-    { locale = "cs"; arch = "linux-x86_64"; sha256 = "8bf76f388c6286a1b91cf460325b98c2dd08842031288617d9141b1368b5f62c"; }
-    { locale = "csb"; arch = "linux-i686"; sha256 = "2420bf49ff3429b3f186b17555b8b3250d44579b5ff7ce616914af646b5996be"; }
-    { locale = "csb"; arch = "linux-x86_64"; sha256 = "a0ee304a61b12ec1dd3caf5d876acbd9d2ad4443f9b96e73ecc1de8a1e16206f"; }
-    { locale = "cy"; arch = "linux-i686"; sha256 = "603a66c237e95534d2dbd004e7fd77b69d5b99b73cba797c7825aaca6d849c61"; }
-    { locale = "cy"; arch = "linux-x86_64"; sha256 = "69f68c024d6e9999b5a846d12c5a61ca63d962f6bd21737769d1fe5519916dad"; }
-    { locale = "da"; arch = "linux-i686"; sha256 = "da8ed391e8ae9729cf2af35700aff3f6900af208fee9eab6a6bd0fcb303abd09"; }
-    { locale = "da"; arch = "linux-x86_64"; sha256 = "7e3cc63eb61289e1006f683581345caaffe3ae39f7a636ff4f451b1e77a8ffb6"; }
-    { locale = "de"; arch = "linux-i686"; sha256 = "f191e74047cdddd43fa72242b1dce15a28160f62b4b8eae08ad117f4b27d6e0f"; }
-    { locale = "de"; arch = "linux-x86_64"; sha256 = "a81165d446cab525645ca2b18ef28cf253c6ee6267086d692a3904c79f7e5be0"; }
-    { locale = "el"; arch = "linux-i686"; sha256 = "eb0757aafd2a1c4bb9abeab01a3960d3ac21b92879f8dc7d24f485a43d305957"; }
-    { locale = "el"; arch = "linux-x86_64"; sha256 = "900f64bad286393f6d96f0ff00c6e78ae6cce998046cf506e2b3ec7a7b8e76c0"; }
-    { locale = "en-GB"; arch = "linux-i686"; sha256 = "99284b229b7bfcc44cce3ebeee523e49bd5d9c7d860345ad3e242af4f9848683"; }
-    { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "9a4e003441556422375d4bede21da27a03d31b5ec452ff467abcfffdfe363f4a"; }
-    { locale = "en-US"; arch = "linux-i686"; sha256 = "13b4297db52ef851b38f292eba2b2136e4c2f1453e004012fe8b1fbcf000abce"; }
-    { locale = "en-US"; arch = "linux-x86_64"; sha256 = "ce87f081c4867b9968a2695341001854aa6c1f4f19073d13f54f333cfed236fc"; }
-    { locale = "en-ZA"; arch = "linux-i686"; sha256 = "849584baf4c6dd330bf9c798e3e8923004a3a381642d4f684b5de3fb5b4fd895"; }
-    { locale = "en-ZA"; arch = "linux-x86_64"; sha256 = "635d0cb43a2b5f7f0401f961fd88fc0d6735223ad421ec0ef92a4ee16b29727f"; }
-    { locale = "eo"; arch = "linux-i686"; sha256 = "91da9571212dc82f5d7140e4de073189018f7f895a3b263a4f8840401b4b10bb"; }
-    { locale = "eo"; arch = "linux-x86_64"; sha256 = "77f39ab0168efe9070ecd881dbd2884fe5f35eeea17a63ad8d957398f6eef40d"; }
-    { locale = "es-AR"; arch = "linux-i686"; sha256 = "f4ec6f07e67195981c12b5cbc3a6289a6e9d29539014c034039bd498a40f9301"; }
-    { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "3f24135fd1a6fd2207bf1d80fc79cb34536b109e195e43a3a13eba0b68548c0e"; }
-    { locale = "es-CL"; arch = "linux-i686"; sha256 = "de3672a512473cc6edc48bb775bc9a405d0c9effccdb0cd46af5ce2593d67613"; }
-    { locale = "es-CL"; arch = "linux-x86_64"; sha256 = "770134c2bd8bc9f2e629e355b8e3b0949f67dd2ecd1b3a1d513bff364e53b734"; }
-    { locale = "es-ES"; arch = "linux-i686"; sha256 = "4eeb5854427cde599468b90af70ae3e04eb9aff5132659f6e1ddb2f859f0be74"; }
-    { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "eb91e2e9b80cab85e6ab75e78a9b206a18bb647ffb247c0d5ed324ee219dccd9"; }
-    { locale = "es-MX"; arch = "linux-i686"; sha256 = "0aa0c85a51a50adb9eca5e5a1eda0ca11ddc15ad12b2d930ebe769f10d535433"; }
-    { locale = "es-MX"; arch = "linux-x86_64"; sha256 = "3f340072c80c95283b17e797bf4fdbde9d1de55b5f10f1c9e8193f8426c6157d"; }
-    { locale = "et"; arch = "linux-i686"; sha256 = "4719961e58e755ea2d9b94ff7439e1f9e858b0dacbd8631f98fadebca36c72a1"; }
-    { locale = "et"; arch = "linux-x86_64"; sha256 = "70aa1a76414c50b00fc85be87a07b936c7f60d83037f13716862e8491ec8d609"; }
-    { locale = "eu"; arch = "linux-i686"; sha256 = "ea450d11b0cd3b4381797bf6ca48d74fb18d661864eccb365bc2d51b872b101a"; }
-    { locale = "eu"; arch = "linux-x86_64"; sha256 = "d543e7fdd4c27875d30a1d527219e257296c6010e80dc0d5529722aa82cc666f"; }
-    { locale = "fa"; arch = "linux-i686"; sha256 = "4b8aaf0d27f10474c6ec4eeec1418ffb08338475c5433199ac2db79aab5273b2"; }
-    { locale = "fa"; arch = "linux-x86_64"; sha256 = "df10d71c7a762696ee682ca705052b15031dc7e84aa396f67fa26463e3dcd353"; }
-    { locale = "ff"; arch = "linux-i686"; sha256 = "acdfec7656b48e5502692c408cd8c7543add80181130bdd2e0ec66ac44219a06"; }
-    { locale = "ff"; arch = "linux-x86_64"; sha256 = "a9a0041cba2f80b09a2f22da6f1e9bfdfc1cbf0f5c324a427a1758174901fc27"; }
-    { locale = "fi"; arch = "linux-i686"; sha256 = "304e90020134af5564d5c90c5d9fee6264aa871e82419408f5b0e9d97f8f8ff1"; }
-    { locale = "fi"; arch = "linux-x86_64"; sha256 = "bfb86547ea4e0a5650a152070a7651a7f63b0df366fa4aed7f890033332e64a5"; }
-    { locale = "fr"; arch = "linux-i686"; sha256 = "1ccef0f95df1571b9e378d97122303982f93251bd3ed70d0af93babc3459bad2"; }
-    { locale = "fr"; arch = "linux-x86_64"; sha256 = "93ffcc3bbba8b7e0941fe674f6a67ed378e75b37c3e52debbef2434ea75f2b09"; }
-    { locale = "fy-NL"; arch = "linux-i686"; sha256 = "20ae7baa888fdcb467388313fa51104f8ba77ca31b2bcd731e2d65a46ff75c3f"; }
-    { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "33a028be0c63dc892efc93bd03375c8c4f9be38acb96a2bc516300c204086b3d"; }
-    { locale = "ga-IE"; arch = "linux-i686"; sha256 = "ddf134c692d321744bd787b7833ccc9b06ef130865c8f8ee816d35ff55c344a7"; }
-    { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "e76e18b18a7468ee6a550e837abf04b79833ae084210f723d0781f2b81e3077e"; }
-    { locale = "gd"; arch = "linux-i686"; sha256 = "3c361e322be79ffaec9a382aacf3b9cc90f03fa664e35e283cd8572e66d3b8b0"; }
-    { locale = "gd"; arch = "linux-x86_64"; sha256 = "5e95305321ff373d9cc6eee522dbd5ee948e6c298f2fb38d655965ec1de448e0"; }
-    { locale = "gl"; arch = "linux-i686"; sha256 = "99b9dbf38f50f5385072d72d14684e980aead6125c4c91cfa8e69bd5c7f1aa0e"; }
-    { locale = "gl"; arch = "linux-x86_64"; sha256 = "372bf1395f96be3b41d05630267354f7a6c0706e90f5e21320ab5ebd5d411d41"; }
-    { locale = "gu-IN"; arch = "linux-i686"; sha256 = "0b8429553052c8e23d3aaf1210d53b51fac2250d1d526311a22757ebd85ca54f"; }
-    { locale = "gu-IN"; arch = "linux-x86_64"; sha256 = "da6a7d7292965a0c1eaf58564d9bf85192719831208e8762d06c7082ee9824d7"; }
-    { locale = "he"; arch = "linux-i686"; sha256 = "78ac97da0515eb5a94455dcbf4cbd9a8d1ddbf03d4b8d29bad7b9e8fdbf5ef12"; }
-    { locale = "he"; arch = "linux-x86_64"; sha256 = "c0d853c639cfa7b14ce10ee50776f3aebf0c84807bb59d9ec6e0e20554ae8ed2"; }
-    { locale = "hi-IN"; arch = "linux-i686"; sha256 = "82376fe3005c56d2e895e1ffa0e9233f3885700117a73d1c49d67d742e324752"; }
-    { locale = "hi-IN"; arch = "linux-x86_64"; sha256 = "0ed6234fa9c5d449437d133c83f572ceca3dd82df6cbee8573c9f137c50bcf9c"; }
-    { locale = "hr"; arch = "linux-i686"; sha256 = "10ff3539c27dc49763fe322e9540878d421bdf590d9a307fecc6c158472889c3"; }
-    { locale = "hr"; arch = "linux-x86_64"; sha256 = "f97d7e3b290b0fc6a9116198da7fc7eb32895da74a3ad572d29577e14ab12f20"; }
-    { locale = "hsb"; arch = "linux-i686"; sha256 = "bba1a949823e70d1b5f4a0bec27437b6fc11638fa67b2ca286a833a0d44f5ef8"; }
-    { locale = "hsb"; arch = "linux-x86_64"; sha256 = "5efaf3ec7f7b5d94df17d2fe0d5877a35442d33ccbf141fcf30e11351f9b4000"; }
-    { locale = "hu"; arch = "linux-i686"; sha256 = "88a86463f2a47e38886cd2e8b470702623c772086b71d55e61de80e1c1be4fb3"; }
-    { locale = "hu"; arch = "linux-x86_64"; sha256 = "967ff3bb62c8dbc93a25f75bec73803428b3fe5024841d3e2d97e444c1d27304"; }
-    { locale = "hy-AM"; arch = "linux-i686"; sha256 = "4bac63a8b8fea36c3dab794dff933972f9adff7f91a7d3957d4edc3c60534016"; }
-    { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "9c26a2438462429f96b2d8bb8c4566b1b1f7d03200ed68aaca4eb6602342c33c"; }
-    { locale = "id"; arch = "linux-i686"; sha256 = "e36cd7195d5cd21afd97f31a5108af5999ade8a97f92db3e00067f3cfc31cd72"; }
-    { locale = "id"; arch = "linux-x86_64"; sha256 = "191e47625a6764670bfbab673989e5b2e6ad45ad1c3a0544a129afe8cb963171"; }
-    { locale = "is"; arch = "linux-i686"; sha256 = "c839d21d4e16b05bd9aa995ff2124b6b8418ca1405a8f3bfc70fb65b5710488b"; }
-    { locale = "is"; arch = "linux-x86_64"; sha256 = "16d8df9867e6a13a2be7408f459e2c67d449a47105cf9709e4a743abed8229a9"; }
-    { locale = "it"; arch = "linux-i686"; sha256 = "7f9c3909cda97d9a40f2630af4f11e6dd8e29f45ab949348123c4334f6aee8fe"; }
-    { locale = "it"; arch = "linux-x86_64"; sha256 = "52f95491dbf4ee9a1f2ee552feb8a30b8196b6747064e45d5a98d0fecfa11f67"; }
-    { locale = "ja"; arch = "linux-i686"; sha256 = "6586fd1d792feea4e98442736f06eab15d7de526667db6a3ce7de1afac9fdaec"; }
-    { locale = "ja"; arch = "linux-x86_64"; sha256 = "0ef883bdf3d415a5795bd613af05b16a406b3af3415ac1c1ebc646dd76f76467"; }
-    { locale = "kk"; arch = "linux-i686"; sha256 = "39167c7ee9f0e9b62308fcaba0f061bda0eaac9d3bb707c6556f71085c7ddd54"; }
-    { locale = "kk"; arch = "linux-x86_64"; sha256 = "ec2c9ae1f5daba1e3b0c8a4f24737b0968bc818748b682418f02983e25302703"; }
-    { locale = "km"; arch = "linux-i686"; sha256 = "797747aa402ad42b6addd04d69995b0ea5c628da71f2cce15c8e612d15461189"; }
-    { locale = "km"; arch = "linux-x86_64"; sha256 = "fd75e5fbba75dd8a6cdafdb1c4983bfd4336f300df559518d3fff0e6e7e482d6"; }
-    { locale = "kn"; arch = "linux-i686"; sha256 = "fada07e5679bcf174078e0c596cd121301f72c307401922e5772c6fa79eeedbe"; }
-    { locale = "kn"; arch = "linux-x86_64"; sha256 = "d9cbb3dc02e3db54ea691dc09c882fcd65fd99bb1d0250e29e3d0a37df72179b"; }
-    { locale = "ko"; arch = "linux-i686"; sha256 = "22bd8b1dec10117579a267d5bb9b10f460c27c9419305aa1cc4456b09fcd7df5"; }
-    { locale = "ko"; arch = "linux-x86_64"; sha256 = "0e9da5e79ebb149a62606e002202b70908d329a26c213df35480962fb05a9f7c"; }
-    { locale = "ku"; arch = "linux-i686"; sha256 = "e5f55ab5112ca3a137c4df37460304ff7e33471e3e95e2709ace1cb32ef88084"; }
-    { locale = "ku"; arch = "linux-x86_64"; sha256 = "224385ae3a9da1fbbbc0d309eba0de6f64e29da4de29299cb1c778cb5a57c968"; }
-    { locale = "lij"; arch = "linux-i686"; sha256 = "e39f5edc61e25f490dcae7ea4fdc91033f5e868cbcaf848180c40bd920455f17"; }
-    { locale = "lij"; arch = "linux-x86_64"; sha256 = "f6e9725f368ce4df3be078a1ad268a29cfeba01e5606de85fbe2e375b3a5e263"; }
-    { locale = "lt"; arch = "linux-i686"; sha256 = "46b2c694c60540ded3d3f6cb504bc5b7a709cc0940ff6b3223f05d7b8e1f7309"; }
-    { locale = "lt"; arch = "linux-x86_64"; sha256 = "51d10f5c63e377b0f9e46d7ee12ea8552b8df57d6e8d9334555b7fbab617c8a4"; }
-    { locale = "lv"; arch = "linux-i686"; sha256 = "8e224c3efcca9864255332b7f7c089c0c04b0eb2dfe60cd04d7dd6a61d807852"; }
-    { locale = "lv"; arch = "linux-x86_64"; sha256 = "e53090be92e7557be5d38aed25ac0a2fb1006d15bb38d61141473f4b38c6e26c"; }
-    { locale = "mai"; arch = "linux-i686"; sha256 = "479795f542d17476bb721d3e7c7fef565617528016085976a63b9e5864b4dd31"; }
-    { locale = "mai"; arch = "linux-x86_64"; sha256 = "8daa2882e27a19894ded43885e868dd7203f506cb1bd25ede1d36328fffbbe0d"; }
-    { locale = "mk"; arch = "linux-i686"; sha256 = "78f6fa53d5fda46fbe54b9978acaa75faaf094d2d3b8e464539609253da07c52"; }
-    { locale = "mk"; arch = "linux-x86_64"; sha256 = "47a147a93dc7d1e683a57f0d7ddd7fbe3d944145932e0773be8dab6a7a0b4b01"; }
-    { locale = "ml"; arch = "linux-i686"; sha256 = "6ac6a36596db8bf675df76abc629fc99ff019455f8c08842668a08cb40b67e9a"; }
-    { locale = "ml"; arch = "linux-x86_64"; sha256 = "c4d4bed760c429c5db1d5c42682127794f81e20182aed0fc37f4c9aaf7bc582c"; }
-    { locale = "mr"; arch = "linux-i686"; sha256 = "a2fc483f2aca2cbb7bdff42e4b27b711fdf27f46bee707d1c6d664c391c95def"; }
-    { locale = "mr"; arch = "linux-x86_64"; sha256 = "5209926b3130b8b75d933287872af62ac752fc9e3fc170b540a2f0bc49d97bdf"; }
-    { locale = "ms"; arch = "linux-i686"; sha256 = "926944ef9a3807b3379bba4b2fff05d8c2776cc4e3239b0b2bd2e5424151e6ee"; }
-    { locale = "ms"; arch = "linux-x86_64"; sha256 = "20cf8557fa41119febc99bbc6de10ea7e97d3c1abc2245241db862ca8a735db1"; }
-    { locale = "nb-NO"; arch = "linux-i686"; sha256 = "5a2778d9e93ae4371ad29737904aaecacf494855b45e5e79cfe773410f6600f6"; }
-    { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "8cfe4c778ee258dcd511990fd71eefcda46ab73c4448705e3815c5c371ee6ea1"; }
-    { locale = "nl"; arch = "linux-i686"; sha256 = "350efbbaeb3ef9eee16a398ce482c2a3790f5b85dda6177857d7448de03af9e1"; }
-    { locale = "nl"; arch = "linux-x86_64"; sha256 = "6d1310f7e2ebe5fc846f966bfa930a2bf3cd0877260de40b01496cb860630c37"; }
-    { locale = "nn-NO"; arch = "linux-i686"; sha256 = "6447690e509ec0d1306bbfa484df82e62dd5909603b43440443c28bf2f489f24"; }
-    { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "6e71ad4fe85b02f8745e6b3b39a6f69f13fff45fd555704747d1f59fcf64447a"; }
-    { locale = "or"; arch = "linux-i686"; sha256 = "71866d15af41df9d98716544d25d8fc2069a9a8f92cdd8180731e3b3fb3c3492"; }
-    { locale = "or"; arch = "linux-x86_64"; sha256 = "22ace7c20948526f1011e16581c870a919c4d8002bd0c3210ae8f702d1f8a03f"; }
-    { locale = "pa-IN"; arch = "linux-i686"; sha256 = "12eabc66d39bd767c129c1a1777a6a13812efa0bc3df430dd7940908f53094ec"; }
-    { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "54501bca85e231e9fab0aa894a6e566966fdbd172fc45888d97eb828e248d105"; }
-    { locale = "pl"; arch = "linux-i686"; sha256 = "e16acf44c5ab2ee708ba0f74301106a5fc0c36cd65ebd302043af09803f30138"; }
-    { locale = "pl"; arch = "linux-x86_64"; sha256 = "a1532684d5d0e9e2091a5d42202dc6b49ee8c21df14600f0772e1f0f53f6d638"; }
-    { locale = "pt-BR"; arch = "linux-i686"; sha256 = "9827bfda689b01e795d4ddf7ab1169e25cc1728175af74e8a08fa3e8ef40e40c"; }
-    { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "bfe02180011d564fe8deff4d3f3f8e3a6bfde05469738b5b2f8849a2ee485ba8"; }
-    { locale = "pt-PT"; arch = "linux-i686"; sha256 = "83fcda599d09946da8a968d903fa12b93502a23337f019d3217cc80f81607fe7"; }
-    { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "533050be56e6dbf06a5631a5b7a7db2da4f5514f224cb787600671c79c020379"; }
-    { locale = "rm"; arch = "linux-i686"; sha256 = "62906af16b8e179be3015f6be9cf4b9481fcc506044c053373f9bc2e315729fa"; }
-    { locale = "rm"; arch = "linux-x86_64"; sha256 = "f968ed9ba8ed43d0d52b02db23b2badf6e6a2544d105f23d6b09b80a07a28ee3"; }
-    { locale = "ro"; arch = "linux-i686"; sha256 = "503fc4cf0de24ff5b1658d09264f8bb3b131c678f61c554ddf1006633ff2d336"; }
-    { locale = "ro"; arch = "linux-x86_64"; sha256 = "514625ffbf4af4519a7671896f2f2797a1b17057dea356f7c17fa52a17736358"; }
-    { locale = "ru"; arch = "linux-i686"; sha256 = "01521832ab38fd46751578691b82c0283d9c7a68459ab7225328afa285699b01"; }
-    { locale = "ru"; arch = "linux-x86_64"; sha256 = "16b780ed767ff0537ec4619453d8cd3ebdcf124704d03d1741b5501007078dee"; }
-    { locale = "si"; arch = "linux-i686"; sha256 = "35ee6cded95ea13c8c480a46ffc9398f50d172aff2030611d6713b04ddc1c54d"; }
-    { locale = "si"; arch = "linux-x86_64"; sha256 = "c4ad9cec257bacffbcf3b4c84c63ec52e1ce830754b5be0b622a44ab223919ad"; }
-    { locale = "sk"; arch = "linux-i686"; sha256 = "53a6bc5aebe5edf4bad34e163a54a3bed30a7c74ff883463caf057793ac3f58e"; }
-    { locale = "sk"; arch = "linux-x86_64"; sha256 = "5110806bb3f02317b542bb79ce34c6bffeef68982807a5e53614958fb9adc779"; }
-    { locale = "sl"; arch = "linux-i686"; sha256 = "3a58652b394fc2ffe1abcc1e89596f3e9357a2455cda8a0c76a44ff20331ada2"; }
-    { locale = "sl"; arch = "linux-x86_64"; sha256 = "fb733f327080e5b4e2ae079a5cdbdb645fde1c9388368c13fcc6af4d3d91da7a"; }
-    { locale = "son"; arch = "linux-i686"; sha256 = "56a262e4411404e94747312858ae1e7ca99ea48171361f03cdc660f8b0da0da2"; }
-    { locale = "son"; arch = "linux-x86_64"; sha256 = "db77a5cab885f96efcbaae8e9f284ad30ab78aae1a405a5f1c2ac7d4d2e43498"; }
-    { locale = "sq"; arch = "linux-i686"; sha256 = "fde7c85f09997ab3f7918072a9577f8d70947c5fafcc70782d684759146941bd"; }
-    { locale = "sq"; arch = "linux-x86_64"; sha256 = "9865054be5d0a3913e4fa16aafdacd345607955b1d733d978033a2825d926c32"; }
-    { locale = "sr"; arch = "linux-i686"; sha256 = "87f9f7d46a211b9205df5258f551b7c42264fdb81c70f836a37b3d5a821c4c03"; }
-    { locale = "sr"; arch = "linux-x86_64"; sha256 = "ed03914c382efdec2f218e87e8efdd2b761e16ad0cc2a646b02050f27503161b"; }
-    { locale = "sv-SE"; arch = "linux-i686"; sha256 = "1e28e39ac45177607a2ff3c71d3317b8b777679bc9e8dad2236991f05c6823ca"; }
-    { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "81c2fdc5ec9f338b1dc3cd5d2e8dd62cf106c4cf759826be8eb7f3f3f550c49e"; }
-    { locale = "ta"; arch = "linux-i686"; sha256 = "8e27ba1c8079745a93bebf6f7e4dbfa9ffc32b91d6dfa12975497466f3ec1550"; }
-    { locale = "ta"; arch = "linux-x86_64"; sha256 = "c244aeff11608d6f1a8513045ab53d4909af02915761b15ff34ddbbc9995dcbe"; }
-    { locale = "te"; arch = "linux-i686"; sha256 = "32e404eeeebeb521d909cc64fe1ba3c0b40130f7a4b4ae742a48ba61e8b668d4"; }
-    { locale = "te"; arch = "linux-x86_64"; sha256 = "83b5cefddc6308050c24d9fb30818fa1fb3c1d4ba9a2de9d8fc99878b01855b4"; }
-    { locale = "th"; arch = "linux-i686"; sha256 = "009cb39521635c1c89717b3d526a59c05e7ab82082ec31f0fd482800f01d3e8b"; }
-    { locale = "th"; arch = "linux-x86_64"; sha256 = "1fe31902ef44e7049e9efa4774098c00d3ecad0a4c4f585716cb4bec158e3b88"; }
-    { locale = "tr"; arch = "linux-i686"; sha256 = "e54ee04479b9891420af6fc1d639da121b677660a5bf1dfd8565792c9e1cdbdf"; }
-    { locale = "tr"; arch = "linux-x86_64"; sha256 = "bdfae1142a7714a0be9bd24b02582a9ab9913c17d130cf0b2928deb657f8bebc"; }
-    { locale = "uk"; arch = "linux-i686"; sha256 = "b2d6b518e86c3bae1068f7a6d7cdc975f3b0f99e514c5d3d18dbe5e62d15dbce"; }
-    { locale = "uk"; arch = "linux-x86_64"; sha256 = "71bd0518b69c911dbb21297cd676ed66231a3b7bc59090a9f6a85d6882263277"; }
-    { locale = "vi"; arch = "linux-i686"; sha256 = "390fb219da7169d69a7aca1df883750d56bf34f0f7b6b49781d6f3c6b8962962"; }
-    { locale = "vi"; arch = "linux-x86_64"; sha256 = "1c5af9f646ced5533223bca6dd36f364c0ca9d3f02ba93797aa8b091144cf7e2"; }
-    { locale = "xh"; arch = "linux-i686"; sha256 = "5d0d04c7c84ffc51b11f99205ae767954b78d98c3a2d18bfcceca1cb292fcd9a"; }
-    { locale = "xh"; arch = "linux-x86_64"; sha256 = "5fafe2b375ee0935da52ec9037c4f515d1be5cf783548215d289a300e06bb9de"; }
-    { locale = "zh-CN"; arch = "linux-i686"; sha256 = "1361b7cfc08d4d000107a244ec2a163ab27616b1d1db13917f34acc4d4167d34"; }
-    { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "66aa04a7b5240df285afd37608c816b7c09cb365c6d0cd5aa4dbe8a7be61d824"; }
-    { locale = "zh-TW"; arch = "linux-i686"; sha256 = "c0e3d9b584ba10e2a67a904253b2d93ab3546465e69619f932b566ad6b04a003"; }
-    { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "6a24f9f3631bc0bcc15de6a124c0f7dbcee6d0099e2f0b0622a18e54c04620a9"; }
-    { locale = "zu"; arch = "linux-i686"; sha256 = "7fa59f6ee26d48f992015b0bb667a0c230cea854eafa67d7c4e51d38e1a267d3"; }
-    { locale = "zu"; arch = "linux-x86_64"; sha256 = "4af969f1e0d0703e83d903fc2a30739ae2ab42cc3a24219be8bfd152490970c5"; }
+    { locale = "ach"; arch = "linux-i686"; sha256 = "cef5938e567e6dc4d0460c1eb3f770d2acfa045d98186f6a490ad53b3c69d302"; }
+    { locale = "ach"; arch = "linux-x86_64"; sha256 = "bd5427dfd1d11f8a9a8d4803608453fdb11a7d304aed618f26b3fd6667a0d131"; }
+    { locale = "af"; arch = "linux-i686"; sha256 = "48e97eb3c65b381b8fe579d9a3cb4e4f28f06137043be1a54288f3e85c1f8312"; }
+    { locale = "af"; arch = "linux-x86_64"; sha256 = "fea64b289b3ee69ec0efa55b0d57998485125bf000c78e1c4567be5b40e1ac34"; }
+    { locale = "an"; arch = "linux-i686"; sha256 = "022110d1b31f51f5e9aedb2eac01159fd7c14e9c787530c246ba907e68317d0d"; }
+    { locale = "an"; arch = "linux-x86_64"; sha256 = "418f9b1061950b93ff8a2889a47ebd65c792a221510eb15ec6e0d67c73fa4da0"; }
+    { locale = "ar"; arch = "linux-i686"; sha256 = "228739f558428aa97364da3869ab28e68499e103bac0af7c391f1ee66be97754"; }
+    { locale = "ar"; arch = "linux-x86_64"; sha256 = "44255bbfed7a804a205846a2c634a0ec4868a05f58a9ce0350ac3d2ce147f500"; }
+    { locale = "as"; arch = "linux-i686"; sha256 = "0a40d888a10b2be8b76ddab70e32a534a3e95a029aac4c8945bb71b4a6e63d3d"; }
+    { locale = "as"; arch = "linux-x86_64"; sha256 = "a55a81da699c51b3bb422ba0942d548373d2a207c6e8eb0d7abde50dca6dc57f"; }
+    { locale = "ast"; arch = "linux-i686"; sha256 = "61826f0098f2535a1019eb1c7e21fb8971f66fa1d39bf773a130e96cfa99897a"; }
+    { locale = "ast"; arch = "linux-x86_64"; sha256 = "4b84870ecb220189ab59e837f74a2195a38265226dce5542841187d35dbd18dd"; }
+    { locale = "be"; arch = "linux-i686"; sha256 = "40029f2cdcb4964a43193456f436c3a9428face17ed3ef4b655e3f1bc47c217c"; }
+    { locale = "be"; arch = "linux-x86_64"; sha256 = "7490f9815dac528c32d0254c9f5e7834e4af6b4e61d6618d235481b0e086906a"; }
+    { locale = "bg"; arch = "linux-i686"; sha256 = "320e9f8c338d180cd90390b3dbf38b2ed17ab9606ac13c79d64ae114e72653a1"; }
+    { locale = "bg"; arch = "linux-x86_64"; sha256 = "921ef8a9beb4469d5faba09e6786415dce37030a4c24f6057ec5fbe301113dd4"; }
+    { locale = "bn-BD"; arch = "linux-i686"; sha256 = "69833779015e09952825d0fdc6fb9283379c9b9a26d7bad4a12bb29bb74c277c"; }
+    { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "de3f0efafc6b838e90d550287d574f9fa26c9b2690fa1fc48b766b9d478fc1b9"; }
+    { locale = "bn-IN"; arch = "linux-i686"; sha256 = "aff667e3277bf61f3b117ebd13a3ce469e9bf6ba58b7dd736d8913b234c4a4a4"; }
+    { locale = "bn-IN"; arch = "linux-x86_64"; sha256 = "c446d8a57a1542eb2aefd4a0b5304917dde8446c94c11d8f80110ff881878bb2"; }
+    { locale = "br"; arch = "linux-i686"; sha256 = "5f05c4bb347f5150c5685e7308aee338b6d92b8cac204e7afb326d2c44ff8dd8"; }
+    { locale = "br"; arch = "linux-x86_64"; sha256 = "6dfa3436ddcf6f47e7d40846b09ad4c7555aae40f25f5380b30a0776d0368d37"; }
+    { locale = "bs"; arch = "linux-i686"; sha256 = "7df19221c455bfe29e9a8eb6f48088e37be5a493319c46e45b48a72ebbac1df2"; }
+    { locale = "bs"; arch = "linux-x86_64"; sha256 = "aaa2c0f3eb430337e865732c0bbf3d5efe72869954607f5560c8925bd736cfba"; }
+    { locale = "ca"; arch = "linux-i686"; sha256 = "9c725ba77e778144e31b907b2b4cdd4f045dc6ce12bedd9bbb92a98224a44327"; }
+    { locale = "ca"; arch = "linux-x86_64"; sha256 = "30a27b9558bcc7f7c03f4a204e20aabc9b1d4fd5240a93fe14e02f95ba4f34e8"; }
+    { locale = "cs"; arch = "linux-i686"; sha256 = "491b7114f686235233e3ceb2c7db47d8bef426bd1578545f5d1cd001b15afb71"; }
+    { locale = "cs"; arch = "linux-x86_64"; sha256 = "098596de29865bac4dcb642d8da801b7707fafbc60f25e5c1803ed8aaaa77d50"; }
+    { locale = "csb"; arch = "linux-i686"; sha256 = "a53579fc73f5bf4811ab608320b0d889406be9b655574fbaef2aa8db7478e023"; }
+    { locale = "csb"; arch = "linux-x86_64"; sha256 = "903bb549115252d2850ab7cbca9d46890cb8ee5f40ac7b8740fc3d81a1225c68"; }
+    { locale = "cy"; arch = "linux-i686"; sha256 = "0f3db887046a8f5b597eca5d943a9eed295f8ca7b8831f8c27ec6c833c63b2b4"; }
+    { locale = "cy"; arch = "linux-x86_64"; sha256 = "ab680b6ef58106766de8aeae909ffd313abc03f2400a06e2b3f8371e211a0a0d"; }
+    { locale = "da"; arch = "linux-i686"; sha256 = "47280c825f065cfbfccbef0077032f3c04a75f860eb5a31861515295b6a85050"; }
+    { locale = "da"; arch = "linux-x86_64"; sha256 = "25a93f49d789d3d5d6d3fa82cbfc5f5c195a8da4d1dfb12c113d29b125e71e79"; }
+    { locale = "de"; arch = "linux-i686"; sha256 = "2922c1a06f37322c05b6ad66a95fd7cdc2ad10a86ee082739810060a932bea55"; }
+    { locale = "de"; arch = "linux-x86_64"; sha256 = "5dadafb7e44eb174c717101a336b00a03b8f7fefb606f356c0ae4b00209d5723"; }
+    { locale = "dsb"; arch = "linux-i686"; sha256 = "047f3c1b05ac28e1e566451e6b93fbb88e300afb0f264faf17e72ac5f9aae201"; }
+    { locale = "dsb"; arch = "linux-x86_64"; sha256 = "f0de9a6713f197a4664183b4fe80179543588cbaf83d4f174f360177e0149a6d"; }
+    { locale = "el"; arch = "linux-i686"; sha256 = "5343cc2302d49a57c3fabb7b03ca4f11a0eb979bbab7442262bc34186b3bd596"; }
+    { locale = "el"; arch = "linux-x86_64"; sha256 = "91ab977a9089fc68ed54062cee6d0a71caa2591ec5d4994181d8939605baa114"; }
+    { locale = "en-GB"; arch = "linux-i686"; sha256 = "1d4c0d24b2558bd311f9f6cf44186596f9634d7a5c69b4b7648b59a2443272bd"; }
+    { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "7c13ae7155b92b7aaec599fffdbc8c02fde8b6575f892fd3e5edf67c3102790b"; }
+    { locale = "en-US"; arch = "linux-i686"; sha256 = "1a6d8fe7cf0df7ccee2047c2031da4b8f0ef8271d6413e0c7bc87bf208c8af90"; }
+    { locale = "en-US"; arch = "linux-x86_64"; sha256 = "3b9793fe7957031f88f240254326697e685de3690aac1fa13d447cb2a23a2738"; }
+    { locale = "en-ZA"; arch = "linux-i686"; sha256 = "63fd411e37656bfe56fec468f47dca7a61ffe5f9be3ab1c23ad252b8199f39d5"; }
+    { locale = "en-ZA"; arch = "linux-x86_64"; sha256 = "3a5510c7a996a50e94e68c05cff1fbf31a7cc787d2bd173828d867d4b8d22243"; }
+    { locale = "eo"; arch = "linux-i686"; sha256 = "cf2004a5134c6240bfb05f499cee09f425295ce0bd8d170b0832a845b4d255c3"; }
+    { locale = "eo"; arch = "linux-x86_64"; sha256 = "186753142ed4c28eded8861e399ff33bc7738ba75c112507b4acb53ccd11b13c"; }
+    { locale = "es-AR"; arch = "linux-i686"; sha256 = "57cf456aed64517f69801d6c19a143aa9a90f85de015be22b8a2e2d4a6b33d23"; }
+    { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "09c833d17aa31e99fa0aae3eb5f296c643c34ea22d94f8b5ff64e2b871e70dbe"; }
+    { locale = "es-CL"; arch = "linux-i686"; sha256 = "5b2fca43e84335e8b0cdb5d341402d5b1b57016881e7112a0ae8f5c5374f8857"; }
+    { locale = "es-CL"; arch = "linux-x86_64"; sha256 = "f1a03f0e4c69d796d5fd4b26aed1d356dfdcdd5ce7f180bf045a97ce308f13c2"; }
+    { locale = "es-ES"; arch = "linux-i686"; sha256 = "0167a7dcc31364818981372dce640c408a4bfd2983b5bc3d2726b5525873361e"; }
+    { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "92dac800255e1ba12c48b8078b8098ae1b3980401c6da54c3798d853c6685c13"; }
+    { locale = "es-MX"; arch = "linux-i686"; sha256 = "e0f7c028869ac2d1edf582622fa2dfe5c6c6dfe042f8d74bc3ec9080dc70a36c"; }
+    { locale = "es-MX"; arch = "linux-x86_64"; sha256 = "02669ae0b19e3b1cb8589b583b6de0b0b62f2987ef126c7fcc2efa2cd63e714f"; }
+    { locale = "et"; arch = "linux-i686"; sha256 = "855f6c7bf2bb01e08b8e20e7c8d633000c70e64fd37405695be7cf3cee515be1"; }
+    { locale = "et"; arch = "linux-x86_64"; sha256 = "348dc193a4bfc6fc53d203cae7e5b5af68c56bcb01ffec0f7c427017f5d3b98f"; }
+    { locale = "eu"; arch = "linux-i686"; sha256 = "7a79a9967b0522199c62ea03edc27cd2752c80eeba816a9334e9624f48c7525d"; }
+    { locale = "eu"; arch = "linux-x86_64"; sha256 = "5cc04f7915a31d54d858d0e532e49829ab45ccd250416aed1612774c960d0cb9"; }
+    { locale = "fa"; arch = "linux-i686"; sha256 = "59ff7d6cd90eb7a4f2e34adacec95ef728e4fe1739a098a22da8843c5a2da1c0"; }
+    { locale = "fa"; arch = "linux-x86_64"; sha256 = "529a65d93b5da907cc8f2389996e783d261fcd03711c92aab7be0ee05e92aba5"; }
+    { locale = "ff"; arch = "linux-i686"; sha256 = "62c8c769fc847b2fd564e85748e0b8b1249555d86e09d38212566e4dbbb9526c"; }
+    { locale = "ff"; arch = "linux-x86_64"; sha256 = "fbc42b7aaf60f83da91b76905ddca103cbdfa660824343348c7b5325977b9e70"; }
+    { locale = "fi"; arch = "linux-i686"; sha256 = "7377752db6d01993cde0ac9d73234bf8538cee217e3d11089a50c4c2be447751"; }
+    { locale = "fi"; arch = "linux-x86_64"; sha256 = "5909ddaa88ad8408b8590518ea4b738d7f581ee827ecd679bd8ebd2208287c5e"; }
+    { locale = "fr"; arch = "linux-i686"; sha256 = "7c9de38b184ca8d10b0d7035c0b31cde79103a25efc516b98f6a2d91e054d7e8"; }
+    { locale = "fr"; arch = "linux-x86_64"; sha256 = "8668f081a5c976cde7bcea6727d1885d77711c11bbb4a0023c9759d6f0bfb619"; }
+    { locale = "fy-NL"; arch = "linux-i686"; sha256 = "dff7ae0b0a4b18eaae1501a03ad754e71794cef3981334bbc77cd55f15b42fa2"; }
+    { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "3b20b9fe8eee700192296d70b93ff5f21d6667093cbff16303679a3491c78fd7"; }
+    { locale = "ga-IE"; arch = "linux-i686"; sha256 = "fb4c5e7689668af719f2ed2c16d7605298e61003b6d9490a67742b6146b0f98b"; }
+    { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "f3d379924e56b8296004be9c3dbf381cf3535bf1790e44ee2bb1f6477829def1"; }
+    { locale = "gd"; arch = "linux-i686"; sha256 = "1768c0e05770c502fe3122dd1c37dbd1e51b9b5c5aaa7cf57a5590e9217393d4"; }
+    { locale = "gd"; arch = "linux-x86_64"; sha256 = "95d77215bd1332cefba9dac1f55eaf3f479927526ca6ed38281837b3c8fbac39"; }
+    { locale = "gl"; arch = "linux-i686"; sha256 = "0af5c23d8e11ec797537c9710b179c7f6ae182bb4831f535848aba0b229ea89f"; }
+    { locale = "gl"; arch = "linux-x86_64"; sha256 = "1befe0623ee71fdc3f7508b532a411fb5f8438ca06963f79cd9c3d20c3fdaa7f"; }
+    { locale = "gu-IN"; arch = "linux-i686"; sha256 = "d61a8bc5eb6b78a4a9d36078ce5946487e0bb9f89ceaba0feb7c449d486feacb"; }
+    { locale = "gu-IN"; arch = "linux-x86_64"; sha256 = "bcfdfe861bfd7447cab99a03826013e77e004ef9b01927b5dbeb0afd40f46f67"; }
+    { locale = "he"; arch = "linux-i686"; sha256 = "0b4c596542e65af735a2f66a61743492c146c51373acf7026274378033a6431d"; }
+    { locale = "he"; arch = "linux-x86_64"; sha256 = "96cd11044613c0a924eee6272313f21e01b987982732d6bcc362935d799fa6ff"; }
+    { locale = "hi-IN"; arch = "linux-i686"; sha256 = "8640aae3dc8d965ac3c0aa65e3579e7613d0c78dfabb06d23840d39df8881ec0"; }
+    { locale = "hi-IN"; arch = "linux-x86_64"; sha256 = "b1b84b405b4d0f5c87ab750ed5942d29018e46b73e298296dc9931f8b3981998"; }
+    { locale = "hr"; arch = "linux-i686"; sha256 = "006e932d4b7474b5f24628d08ec5e28d45b9a23dfb144599fda2b0969f57863e"; }
+    { locale = "hr"; arch = "linux-x86_64"; sha256 = "b70aa31702ea42b85e6ed678cc20bff94267a746cb81ac70dec0d84a244b489f"; }
+    { locale = "hsb"; arch = "linux-i686"; sha256 = "c33442ce4cb0d9355c915fa1ea3407f67c0470e8711055bb2fb275e612a64fa4"; }
+    { locale = "hsb"; arch = "linux-x86_64"; sha256 = "19d6b48b415d48c278f5ec203ee03136a5f80a8ee566e336de187694ab9862a9"; }
+    { locale = "hu"; arch = "linux-i686"; sha256 = "eddcf8119a9680c2676720f33d0fbe750e015d7d21f07325bd47dea0b7cc5bd9"; }
+    { locale = "hu"; arch = "linux-x86_64"; sha256 = "703e8e9da4bd1adb2e1ca77b221c4ce80d9e2b63be7b27eb34c0fed29a2d76b6"; }
+    { locale = "hy-AM"; arch = "linux-i686"; sha256 = "3c2fe1bb3bc7d9d0bf1006962e635262b7ab23017ea703746d436e25b68d7ec6"; }
+    { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "602942788ce157b3d2d6a02d0105e1da632a055bf657282131a0946f87a4431d"; }
+    { locale = "id"; arch = "linux-i686"; sha256 = "de47061063986cff65ae50537a2dbc0abb3d5ec7f1fc5b2a3c8aa66dc4ca4a6e"; }
+    { locale = "id"; arch = "linux-x86_64"; sha256 = "2d3c4a294c1dc8ece94de489dbef9ce3b4222b0883c5f61f1f90fa881329cd53"; }
+    { locale = "is"; arch = "linux-i686"; sha256 = "0ae9ae73771c7429e7f6ec457e656bef034d211a191e5125dc09006a4157b57a"; }
+    { locale = "is"; arch = "linux-x86_64"; sha256 = "8618faa41d021e98d5d010efbead4440828f9f2cc485068fef3f3fef39713bdf"; }
+    { locale = "it"; arch = "linux-i686"; sha256 = "e91bbb7a5bc1052b2f8558598fc9c4cb610314bf026c5eae97a7e85badcc096f"; }
+    { locale = "it"; arch = "linux-x86_64"; sha256 = "1b2c610711bfa05aa0ecbd4ddd81724d29f3f162798cdb35b2c15b1a07cc5743"; }
+    { locale = "ja"; arch = "linux-i686"; sha256 = "c4495bdfc92b1089a3c812d863df20856d585ad9601f41a8c99a522df216736a"; }
+    { locale = "ja"; arch = "linux-x86_64"; sha256 = "55a5fc7eef3d8a4bb2ea7b19eff6dbeddf9fe9f239f645b996aba44477cb4bf3"; }
+    { locale = "kk"; arch = "linux-i686"; sha256 = "ca09ceaf455f7fdc93e871617f73200eedd9cff32e8704ead4fd68b86190a8ac"; }
+    { locale = "kk"; arch = "linux-x86_64"; sha256 = "b6f09b29afe73ab3a25a8cfa2b88ef7f51b83f501990fc80fa886da75916a257"; }
+    { locale = "km"; arch = "linux-i686"; sha256 = "920de5e59f13894e0f2b008cbecf4089b1b36087744ee4bc050b32e1887f8e7b"; }
+    { locale = "km"; arch = "linux-x86_64"; sha256 = "fee6df7cce32d81675c91116ed89996ceaf5de1cc3fde028b04d6012338527b0"; }
+    { locale = "kn"; arch = "linux-i686"; sha256 = "d6587c2a00e4c1a9c38a75f64085bd66e100482a7977dfbb3434bc6a902be313"; }
+    { locale = "kn"; arch = "linux-x86_64"; sha256 = "b6066271412a7d4faa2fa028b03f88061477bd5a0ea5e7d5ec8e3e81c52ce166"; }
+    { locale = "ko"; arch = "linux-i686"; sha256 = "c0de3fcf13a0947239a1310d862deaf5d37836f82f4d618f9aaf09ed69fcfcfc"; }
+    { locale = "ko"; arch = "linux-x86_64"; sha256 = "b929dffdf57cb08087e2ec4054ba58368cc5535579d336872b4016d5bddc9ceb"; }
+    { locale = "ku"; arch = "linux-i686"; sha256 = "4926a59d15eda575ec3a0b32f8ebecd12a354b80746efc61d0630a91720c5e9b"; }
+    { locale = "ku"; arch = "linux-x86_64"; sha256 = "04083b8b57ab3e5693637ca424daa18ab678594b37a56ba4ba9e70c369782002"; }
+    { locale = "lij"; arch = "linux-i686"; sha256 = "730ef2c9920b0eb6e511d5725780ce3d6c2b341d03049e6cb8e83ceeeaf191d7"; }
+    { locale = "lij"; arch = "linux-x86_64"; sha256 = "b068b0e242ff84055665eb9688d392d98e433ed0c44793734f264b340c2efdf5"; }
+    { locale = "lt"; arch = "linux-i686"; sha256 = "885ad622f8a36bb5385187995423e811be28a169c8f33d8eec064f04f45e85cc"; }
+    { locale = "lt"; arch = "linux-x86_64"; sha256 = "d289b593c8c6ccef5d0ee339de674385b08ee28da7b851230da20469aeba7558"; }
+    { locale = "lv"; arch = "linux-i686"; sha256 = "e5558f1cd93264f7f30a9259c28cc50131782d1941388b71f80b1672a29c597f"; }
+    { locale = "lv"; arch = "linux-x86_64"; sha256 = "61788b9ef4f13369114abe4a16e7ee89e16d791cf5d3e1eb74eedb88c3a90e9b"; }
+    { locale = "mai"; arch = "linux-i686"; sha256 = "a9991d23913da8fe6dcf47aacc23b92055c7019265d6c7a01d9d6b3c7ffa4c4d"; }
+    { locale = "mai"; arch = "linux-x86_64"; sha256 = "946420fd821b3ec97bfa1fab52b22111428da0ed919e86c0d33be53b30f5d476"; }
+    { locale = "mk"; arch = "linux-i686"; sha256 = "bf10e053684e5e71eb1886f4127743937a560eee15e7c85c9849bc4b15a60123"; }
+    { locale = "mk"; arch = "linux-x86_64"; sha256 = "b5d1d9d3eaff11f230c864799c77c8169415ee5dd2e1dab944d91ce1c8e8c054"; }
+    { locale = "ml"; arch = "linux-i686"; sha256 = "c899ba567d847933fa40e3bf1be26e8a5fd3bdf4af45db60cb9198b1a6c98ee8"; }
+    { locale = "ml"; arch = "linux-x86_64"; sha256 = "fb069df12d603c808c798e43d3ef92868c239a130e078e7492456d1f54cac882"; }
+    { locale = "mr"; arch = "linux-i686"; sha256 = "14027be4ec9f060b3ac69975dfa1da7aa0b58531383bd335fe3dca98f06597a8"; }
+    { locale = "mr"; arch = "linux-x86_64"; sha256 = "a18dc57bd2b73bf733a0ad61b7ac9b8b4bd149260a4c59fed171b76e52eaed41"; }
+    { locale = "ms"; arch = "linux-i686"; sha256 = "3fbd39a0c2def17862e266ef295a38f93400135898348e6321fd37829461660c"; }
+    { locale = "ms"; arch = "linux-x86_64"; sha256 = "0fb3bab95d1aa501304069aad3c4a8ec38088f3b86ebbd0ef58f29c9d837602d"; }
+    { locale = "nb-NO"; arch = "linux-i686"; sha256 = "1c36cae02772a2e7465f1b6a67e91d169120724c0f13aaa06ff66a095084d71f"; }
+    { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "7a64797441cc03f947c98c5ebdfb7c36caa2daf0597374904a25e6d499501de5"; }
+    { locale = "nl"; arch = "linux-i686"; sha256 = "32b93da5068e6cd76c4bde1833592d89d0c2ebf3d9b4ac636e7b00e7007edb6d"; }
+    { locale = "nl"; arch = "linux-x86_64"; sha256 = "6dfa7bd9edfe177e03a4f3244760c7d75db1c6edb291bf05df2db31156235743"; }
+    { locale = "nn-NO"; arch = "linux-i686"; sha256 = "d9fa7e708e90c20ebb1c2b2df9bf866817f87cc8638b886c6d69ba5033e6482d"; }
+    { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "fd431fe5784dd4d5b42b53bea56439db95f5bebc4b8f47517e2cdd4ff5ebaa7c"; }
+    { locale = "or"; arch = "linux-i686"; sha256 = "83f358e0e8e545ee4bdb01da4795f4609edd5c504150260241274b205f4df5ae"; }
+    { locale = "or"; arch = "linux-x86_64"; sha256 = "128c80cc0c6e2ff558960b8f4d191239b92a38ed4537dc58b77c7c464254992b"; }
+    { locale = "pa-IN"; arch = "linux-i686"; sha256 = "87af71809038e38b00bbefc8795aa8fdba6bbe6fae0a7a6c82e9e752044b8573"; }
+    { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "263c8f80b2e7f4cb86f829cea41c92ec876fa77c945cfb46452e456a55f72685"; }
+    { locale = "pl"; arch = "linux-i686"; sha256 = "32dad8cb30e70394b118d305135d86ffc4ad1fc345cafb063712a7d288e04209"; }
+    { locale = "pl"; arch = "linux-x86_64"; sha256 = "97231cd5c4fc5e5c125d6ead400ea941c60bcadecaa46200a485e2df79e6ccc6"; }
+    { locale = "pt-BR"; arch = "linux-i686"; sha256 = "9f5fcbc0c9f70c02e997483888dd69c5a510cdf07f4d6d6447c04c258ad60681"; }
+    { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "2921da4f0d1018201c2db7e65823f36fc307d46759cd0cf94d3667f8c1ae719f"; }
+    { locale = "pt-PT"; arch = "linux-i686"; sha256 = "6aebbc3a93961d2baeeb2e07f00b57c4abd73d1ffe4ff21f9bc4812c98b0025d"; }
+    { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "59cf5be7d0a3390ac0094a436b7b498bf26a42c178082f2ba2a79273f4ba8a44"; }
+    { locale = "rm"; arch = "linux-i686"; sha256 = "b57ca3477f1869cdbe474b875640a0516d6dac660aeb2b16f1902f776131aeec"; }
+    { locale = "rm"; arch = "linux-x86_64"; sha256 = "0cdad1a4bc9af986bdab8cafd0efc0d96c0010d8c86797e0cd58de9b90fad5cd"; }
+    { locale = "ro"; arch = "linux-i686"; sha256 = "1cf86aa09a145bd190ee815a2dc66129f0f05fb4c30802c9f85d977ec370dbe8"; }
+    { locale = "ro"; arch = "linux-x86_64"; sha256 = "6e10324605e7b50adee8597ce9694c318125131e301c7c5608e15206784d2475"; }
+    { locale = "ru"; arch = "linux-i686"; sha256 = "30d902defb08ab7661c369118729e78046fd0bb17ae9ac080587d105c44c7e04"; }
+    { locale = "ru"; arch = "linux-x86_64"; sha256 = "a3ad52e02e346f5c51ea58b92ebda1f5d98234583dbd1627e002ee95db150837"; }
+    { locale = "si"; arch = "linux-i686"; sha256 = "367ba16e7505ac93908443861ef76f7bcb9444a65add1155a3e80bbc97564c72"; }
+    { locale = "si"; arch = "linux-x86_64"; sha256 = "018c013809857c5bda53b931080c40e8152a229f3d2b079975d381cb106059a7"; }
+    { locale = "sk"; arch = "linux-i686"; sha256 = "471da0ef940666ed3442a576b085ed065a6da4de102f59aacaf2168c84d127de"; }
+    { locale = "sk"; arch = "linux-x86_64"; sha256 = "4cb690b5c1b8a97f83eeb8d26870f19492ed61463765eae29294946f3fb173fd"; }
+    { locale = "sl"; arch = "linux-i686"; sha256 = "863a1866b30700a6b22775b8b7c01ad27502ee3bd73ed20a874a9cac0a889638"; }
+    { locale = "sl"; arch = "linux-x86_64"; sha256 = "1c2c815b9fbf5cef9bd0b732bf47d56c1ecfc554ca4573d3fb67be3351a35bf9"; }
+    { locale = "son"; arch = "linux-i686"; sha256 = "aaa955cb028036b3f70e0284eedfcfb2b655dd6b7bd6f717ec0609323ad6a897"; }
+    { locale = "son"; arch = "linux-x86_64"; sha256 = "84751dbf1e16f8912bd71f24a9c80805ac3a7aa32f30eeb2f3f945113ff4c1ee"; }
+    { locale = "sq"; arch = "linux-i686"; sha256 = "50ef1fe3d72312a78d951bda1892b7548d46669ddcb60f0af5a22fdd1b8f23aa"; }
+    { locale = "sq"; arch = "linux-x86_64"; sha256 = "05b24a18a637a730804dc485f86e3b3d4ce3046ff81689984c0e14d6e55c9ade"; }
+    { locale = "sr"; arch = "linux-i686"; sha256 = "3388ec26ca4c9ac2ed327037bc73eddcd7fd390765107e47fa3953c53e0ab1f2"; }
+    { locale = "sr"; arch = "linux-x86_64"; sha256 = "d81f19076ce990256fdd4c5e7bdf39f8f70d24f3057a1383aa100d259844ada9"; }
+    { locale = "sv-SE"; arch = "linux-i686"; sha256 = "3ae73ff229c1280ab7b271c29096804839c5d92ef0c15f7a8a8366946ba24720"; }
+    { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "77f723f41ec258309a66e8c808ff4ebc5705ba115bf2417f87943d381d6b57e8"; }
+    { locale = "ta"; arch = "linux-i686"; sha256 = "6897b368738eed28e6b2b17529d6e6656d22f228ecaae04c4f8c539a1dfc3d6c"; }
+    { locale = "ta"; arch = "linux-x86_64"; sha256 = "831bdc86dd2023f273c55276c81181027a0e701520aba397308ad662076a6ee4"; }
+    { locale = "te"; arch = "linux-i686"; sha256 = "3a33e92dc25ea10c55b5ca56345e5b8659c99ca335112e049ba9edb9017c09b4"; }
+    { locale = "te"; arch = "linux-x86_64"; sha256 = "3c071efaef763ea731caa1c6cb97357c13e07b112d923b3c3ef7ee22badbeca9"; }
+    { locale = "th"; arch = "linux-i686"; sha256 = "7982fa0407ff8f3a955c7a74b70fb9fd10cc06f7f06d429ce06cc60fe4b7b635"; }
+    { locale = "th"; arch = "linux-x86_64"; sha256 = "06f54c193ba9bbf19774e8d507c9e15414a9859584de806900ccb0bcb546178e"; }
+    { locale = "tr"; arch = "linux-i686"; sha256 = "c1565d373b951065a1c6ac827590f944e1524d5a91748bd42740ea25210ece31"; }
+    { locale = "tr"; arch = "linux-x86_64"; sha256 = "6d49988225ae1a662e1fd721910f445bf1c111bef6894153b2092a4117391bdb"; }
+    { locale = "uk"; arch = "linux-i686"; sha256 = "f03049ea0b8bd86d95e386bb79a90513087691b725a90e01fec4f7a54803ba0b"; }
+    { locale = "uk"; arch = "linux-x86_64"; sha256 = "5bac7c50bb2a850c208c8410a2deab0b37e03a02f33d52e3d4097ce2c8718d37"; }
+    { locale = "vi"; arch = "linux-i686"; sha256 = "ee6b3f27f68c3d37e8170c7222249c1459e4530f61438a0f1553fe36213c5ce7"; }
+    { locale = "vi"; arch = "linux-x86_64"; sha256 = "1cb80cac3b942d588e133ccad7ac8c77d3af31cf6ddd9676ffa7be130434788c"; }
+    { locale = "xh"; arch = "linux-i686"; sha256 = "86f7bab77885e5cf391d9dca758f8c1112bea9dd249dc7d2f184845da9df6316"; }
+    { locale = "xh"; arch = "linux-x86_64"; sha256 = "07d874163ace6a820dfca49829032efd1b1a612e76c14a012287db39841280b7"; }
+    { locale = "zh-CN"; arch = "linux-i686"; sha256 = "27a7039cdd5be498d2de89e2993264c432e36309bb5c40bd519212de6f8b3469"; }
+    { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "f65d8334d5fb6b7bdcb6b212c232e2bad3d8d2718d96dba7c149a6bb2add81c8"; }
+    { locale = "zh-TW"; arch = "linux-i686"; sha256 = "1aab3b3aad0adbb72edc3db1780838bb2fdf80554eb9eb00fe7b50918bef843c"; }
+    { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "b322ec6027b6760855520dbc40b6e934f931b64c0a859682e4014ee1bdb2b321"; }
+    { locale = "zu"; arch = "linux-i686"; sha256 = "f29d8c82b595edb03a42b0c8896e1880efe2fd14e87802501c4007088bf3ad9c"; }
+    { locale = "zu"; arch = "linux-x86_64"; sha256 = "bed6ddb23da87c4d7f469d92a1cec9817a41b51012bb30145227633b3265e998"; }
   ];
 
   arch = if stdenv.system == "i686-linux"
diff --git a/pkgs/applications/networking/browsers/firefox-bin/generate_nix.rb b/pkgs/applications/networking/browsers/firefox-bin/generate_nix.rb
index a768b1f8dffc..7c38f275169c 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/generate_nix.rb
+++ b/pkgs/applications/networking/browsers/firefox-bin/generate_nix.rb
@@ -83,6 +83,8 @@ puts(<<"EOH")
 , systemd
 }:
 
+assert stdenv.isLinux;
+
 let
   version = "#{real_version}";
   sources = [

From 2e33964a6a97b738764045960f4f87a328c2ae70 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 5 Sep 2014 00:45:55 +0400
Subject: [PATCH 1375/1453] Fix leafnode by working around the check

---
 pkgs/servers/news/leafnode/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/news/leafnode/default.nix b/pkgs/servers/news/leafnode/default.nix
index 23f236a9a34e..a3579aa83099 100644
--- a/pkgs/servers/news/leafnode/default.nix
+++ b/pkgs/servers/news/leafnode/default.nix
@@ -10,6 +10,11 @@ stdenv.mkDerivation rec {
 
   configureFlags = "--enable-runas-user=nobody";
 
+  preConfigure = ''
+    # configure uses id to check environment; we don't want this check
+    sed -re 's/^ID[=].*/ID="echo whatever"/' -i configure
+  '';
+
   postConfigure = ''
       # The is_validfqdn is far too restrictive, and only allows
       # Internet-facing servers to run.  In order to run leafnode via
@@ -24,6 +29,5 @@ stdenv.mkDerivation rec {
     description = "Leafnode implements a store & forward NNTP proxy";
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.unix;
-    broken = true; # The user check in the configure does not work in a chroot
   };
 }

From 2ca3c23ddc7bb7881a8219b7e7931062df053dc4 Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@ens-lyon.org>
Date: Thu, 15 May 2014 14:11:46 +0200
Subject: [PATCH 1376/1453] Add a derivation for ocaml-calendar

---
 .../ocaml-modules/calendar/default.nix        | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/calendar/default.nix

diff --git a/pkgs/development/ocaml-modules/calendar/default.nix b/pkgs/development/ocaml-modules/calendar/default.nix
new file mode 100644
index 000000000000..0010508a215b
--- /dev/null
+++ b/pkgs/development/ocaml-modules/calendar/default.nix
@@ -0,0 +1,23 @@
+{stdenv, fetchurl, ocaml, findlib}:
+
+stdenv.mkDerivation {
+  name = "ocaml-calendar-2.03.2";
+  src = fetchurl {
+    url = https://forge.ocamlcore.org/frs/download.php/915/calendar-2.03.2.tar.gz;
+    sha256 = "04pvhwb664g3s644c7v7419a3kvf5s3pynkhmk5j59dvlfm1yf0f";
+    };
+
+  buildInputs = [ocaml findlib];
+
+  createFindlibDestdir = true;
+
+  meta =  {
+    homepage = https://forge.ocamlcore.org/projects/calendar/;
+    description = "An Objective Caml library managing dates and times.";
+    license = "LGPL";
+    platforms = ocaml.meta.platforms;
+    maintainers = [
+      stdenv.lib.maintainers.gal_bolle
+    ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6de1001c5cb4..50bbe3e90525 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3297,6 +3297,8 @@ let
 
     camlp5_transitional = camlp5_6_transitional;
 
+    calendar = callPackage ../development/ocaml-modules/calendar { };
+
     camlzip = callPackage ../development/ocaml-modules/camlzip { };
 
     camomile_0_8_2 = callPackage ../development/ocaml-modules/camomile/0.8.2.nix { };

From 6863dfeccc4296bba01a0a736878141545f54f14 Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@ens-lyon.org>
Date: Sat, 17 May 2014 12:51:18 +0200
Subject: [PATCH 1377/1453] Add a derivation for ocaml-optcomp

---
 .../ocaml-modules/optcomp/default.nix         | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/optcomp/default.nix

diff --git a/pkgs/development/ocaml-modules/optcomp/default.nix b/pkgs/development/ocaml-modules/optcomp/default.nix
new file mode 100644
index 000000000000..6075bc4ab2aa
--- /dev/null
+++ b/pkgs/development/ocaml-modules/optcomp/default.nix
@@ -0,0 +1,25 @@
+{stdenv, fetchurl, ocaml, findlib}:
+
+stdenv.mkDerivation {
+  name = "ocaml-optcomp";
+  src = fetchurl {
+    url = https://github.com/diml/optcomp/archive/1.6.tar.gz;
+    md5 = "d3587244dba1b8b10f24d0b60a8c700d";
+    };
+  
+  createFindlibDestdir = true;
+
+  buildInputs = [ocaml findlib];
+
+
+  meta =  {
+    homepage = https://github.com/diml/optcomp;
+    description = "Optional compilation for OCaml with cpp-like directives";
+    license = "BSD";
+    platforms = ocaml.meta.platforms;
+    maintainers = [
+      stdenv.lib.maintainers.gal_bolle
+    ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 50bbe3e90525..77bb9e814c20 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3381,6 +3381,8 @@ let
 
     ocaml_oasis = callPackage ../development/tools/ocaml/oasis { };
 
+    ocaml_optcomp = callPackage ../development/ocaml-modules/optcomp { };
+
     ocaml_pcre = callPackage ../development/ocaml-modules/pcre {
       inherit pcre;
     };

From ffe02360dced874fae5168cf683e77c0451d363c Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@ens-lyon.org>
Date: Sat, 17 May 2014 12:52:37 +0200
Subject: [PATCH 1378/1453] =?UTF-8?q?Add=20a=20derivation=20for=20deriving?=
 =?UTF-8?q?=20(ocaml=20instance=20derivation=20=C3=A0=20la=20Haskell)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocsigen-deriving/default.nix              | 32 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/ocsigen-deriving/default.nix

diff --git a/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix b/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix
new file mode 100644
index 000000000000..d2a1ed3a6240
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix
@@ -0,0 +1,32 @@
+{stdenv, fetchgit, ocaml, findlib, ocaml_oasis, ocaml_data_notation, ocaml_optcomp}:
+
+stdenv.mkDerivation {
+  name = "ocsigen-deriving";
+  src = fetchgit {
+    url = "git://github.com/ocsigen/deriving";
+    rev = "refs/tags/0.6.2";
+    sha256 = "2b3bf3f4972d0e6eaf075f7353ce482b776726e0cd04947a89b7156384ec0662";
+    };
+  
+  buildInputs = [ocaml findlib ocaml_oasis ocaml_data_notation ocaml_optcomp];
+
+  configurePhase = ''
+  make setup-dev.exe
+  ./setup-dev.exe -configure --prefix $out
+  '';
+
+  createFindlibDestdir = true;
+
+
+  meta =  {
+    homepage = https://github.com/ocsigen/deriving;
+    description = "Extension to OCaml for deriving functions from type declarations";
+    license = "MIT";
+    platforms = ocaml.meta.platforms;
+    maintainers = [
+      stdenv.lib.maintainers.gal_bolle
+    ];
+  };
+
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 77bb9e814c20..9e44b18cbb58 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3441,6 +3441,8 @@ let
 
     zed = callPackage ../development/ocaml-modules/zed { };
 
+    ocsigen_deriving = callPackage ../development/ocaml-modules/ocsigen-deriving { };
+
   };
 
   ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0;

From b5c621062d1928150d9dd75ae9efd180733a7718 Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@ens-lyon.org>
Date: Wed, 28 May 2014 21:52:23 +0200
Subject: [PATCH 1379/1453] add ocaml-ipaddr

---
 .../ocaml-modules/ocaml-ipaddr/default.nix        | 15 +++++++++++++++
 pkgs/top-level/all-packages.nix                   |  2 ++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/ocaml-ipaddr/default.nix

diff --git a/pkgs/development/ocaml-modules/ocaml-ipaddr/default.nix b/pkgs/development/ocaml-modules/ocaml-ipaddr/default.nix
new file mode 100644
index 000000000000..e96f3f179a98
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ocaml-ipaddr/default.nix
@@ -0,0 +1,15 @@
+{ocaml, findlib, stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "ocaml-ipaddr-2.4.0";
+  
+  src = fetchurl {
+    url = https://github.com/mirage/ocaml-ipaddr/archive/2.4.0.tar.gz;
+    sha256 = "0g7qg35w3vzcg37798rhbx7iia83286md3gj5gdhs1qgizlg56wx";
+  };
+
+  buildInputs = [ocaml findlib];
+
+  createFindlibDestdir = true;
+  
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9e44b18cbb58..e29f01ef042e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3371,6 +3371,8 @@ let
 
     ocamlify = callPackage ../development/tools/ocaml/ocamlify { };
 
+    ocaml_ipaddr = callPackage ../development/ocaml-modules/ocaml-ipaddr { };
+
     ocaml_lwt = callPackage ../development/ocaml-modules/lwt { };
 
     ocamlmod = callPackage ../development/tools/ocaml/ocamlmod { };

From 3245b97000313f24fd626e2e61084179f358ac89 Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@ens-lyon.org>
Date: Wed, 28 May 2014 22:04:40 +0200
Subject: [PATCH 1380/1453] Add a derivation for js_of_ocaml

---
 .../ocaml/js_of_ocaml/Makefile.conf.diff      | 10 +++++++
 .../tools/ocaml/js_of_ocaml/default.nix       | 28 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 40 insertions(+)
 create mode 100644 pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff
 create mode 100644 pkgs/development/tools/ocaml/js_of_ocaml/default.nix

diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff b/pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff
new file mode 100644
index 000000000000..ee39855fec9d
--- /dev/null
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff
@@ -0,0 +1,10 @@
+--- old/Makefile.conf	2014-05-19 16:53:09.263564921 +0200
++++ new/Makefile.conf	2014-05-19 16:53:42.213152994 +0200
+@@ -1,6 +1,6 @@
+ 
+ # Where binaries are installed:
+-BINDIR := /usr/local/bin
++BINDIR := $(out)/bin
+ 
+ ####
+ 
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
new file mode 100644
index 000000000000..a7167d0c2262
--- /dev/null
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
@@ -0,0 +1,28 @@
+{stdenv, fetchurl, ocaml, findlib, ocaml_lwt, menhir, ocsigen_deriving}:
+
+stdenv.mkDerivation {
+  name = "js_of_ocaml";
+  src = fetchurl {
+    url = https://github.com/ocsigen/js_of_ocaml/archive/2.2.tar.gz;
+    sha256 = "1cp81gpvyxgvzxg0vzyl8aa2zvcixp6m433w8zjifrg6vb7lhp97";
+    };
+  
+  buildInputs = [ocaml findlib ocaml_lwt menhir ocsigen_deriving];
+
+  patches = [ ./Makefile.conf.diff ];  
+
+  createFindlibDestdir = true;
+
+
+  meta =  {
+    homepage = http://ocsigen.org/js_of_ocaml/;
+    description = "Compiler of OCaml bytecode to Javascript. It makes it possible to run Ocaml programs in a Web browser";
+    license = "LGPL";
+    platforms = ocaml.meta.platforms;
+    maintainers = [
+      stdenv.lib.maintainers.gal_bolle
+    ];
+  };
+
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e29f01ef042e..f0e223b12882 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3337,6 +3337,8 @@ let
 
     gmetadom = callPackage ../development/ocaml-modules/gmetadom { };
 
+    js_of_ocaml = callPackage ../development/tools/ocaml/js_of_ocaml { };
+
     lablgl = callPackage ../development/ocaml-modules/lablgl { };
 
     lablgtk = callPackage ../development/ocaml-modules/lablgtk {

From 02a4e404745d40854baf322b84fffa501465f5f4 Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@ens-lyon.org>
Date: Sat, 7 Jun 2014 22:38:47 +0200
Subject: [PATCH 1381/1453] Reexport ocaml data notation in the ocaml-oasis
 derivation

---
 pkgs/development/tools/ocaml/oasis/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/ocaml/oasis/default.nix b/pkgs/development/tools/ocaml/oasis/default.nix
index 3ab935705a2d..a5260b499c45 100644
--- a/pkgs/development/tools/ocaml/oasis/default.nix
+++ b/pkgs/development/tools/ocaml/oasis/default.nix
@@ -13,9 +13,11 @@ stdenv.mkDerivation {
 
   buildInputs =
     [
-      ocaml findlib ocaml_data_notation ocaml_typeconv ocamlmod ocamlify ounit
+      ocaml findlib ocaml_typeconv ocamlmod ocamlify ounit
     ];
 
+  propagatedBuildInputs = [ ocaml_data_notation ];
+
   configurePhase = "ocaml setup.ml -configure --prefix $out";
   buildPhase     = "ocaml setup.ml -build";
   installPhase   = "ocaml setup.ml -install";

From da6859722d943a1cd964df4d6490cccfe8f5c31c Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@ens-lyon.org>
Date: Sun, 8 Jun 2014 12:12:27 +0200
Subject: [PATCH 1382/1453] Add tyxml (XML library for ocaml)

---
 .../ocaml-modules/tyxml/default.nix           | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/tyxml/default.nix

diff --git a/pkgs/development/ocaml-modules/tyxml/default.nix b/pkgs/development/ocaml-modules/tyxml/default.nix
new file mode 100644
index 000000000000..39cee4e32ce0
--- /dev/null
+++ b/pkgs/development/ocaml-modules/tyxml/default.nix
@@ -0,0 +1,30 @@
+{stdenv, fetchurl, ocaml, findlib, ocaml_oasis}:
+
+stdenv.mkDerivation {
+  name = "tyxml-3.0.0";
+
+  src = fetchurl {
+    url = http://ocsigen.org/download/tyxml-3.0.0.tar.gz;
+    sha256 = "0cvbmyg4g0lg4f23032cjlxqklisccbjgj47117wm6gva8xi7xa3";
+    };
+
+  buildInputs = [ocaml findlib ocaml_oasis];
+
+  createFindlibDestdir = true;
+
+  configurePhase = ''
+  make setup-dev.exe
+  ./setup-dev.exe -configure --prefix $out
+  '';
+
+  meta = {
+    homepage = http://ocsigen.org/tyxml/;
+    description = "Tyxml is a library that makes it almost impossible for your OCaml programs to generate wrong XML ouput, using static typing.";
+    license = "LGPL";
+    platforms = ocaml.meta.platforms;
+    maintainers = [
+      stdenv.lib.maintainers.gal_bolle
+      ];
+  };
+
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f0e223b12882..975370ff5e89 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3403,6 +3403,8 @@ let
 
     ounit = callPackage ../development/ocaml-modules/ounit { };
 
+    tyxml = callPackage ../development/ocaml-modules/tyxml { };
+
     ulex = callPackage ../development/ocaml-modules/ulex { };
 
     ulex08 = callPackage ../development/ocaml-modules/ulex/0.8 {

From e8250dd94ae4cebec34a08aedd4e2c016c408576 Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@ens-lyon.org>
Date: Sun, 8 Jun 2014 12:13:31 +0200
Subject: [PATCH 1383/1453] Add a derivation for the ocsigen server (ocaml
 webserver)

---
 .../ocaml-modules/ocsigen-server/default.nix  | 34 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/ocsigen-server/default.nix

diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix
new file mode 100644
index 000000000000..0e01b811b57c
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix
@@ -0,0 +1,34 @@
+{stdenv, fetchurl, ocaml, findlib, which, ocaml_react, ocaml_ssl, ocaml_lwt, ocamlnet, ocaml_pcre, cryptokit, tyxml, ocaml_ipaddr, zlib, libev, openssl, ocaml_sqlite3, tree}:
+
+stdenv.mkDerivation {
+  name = "ocsigenserver-2.4.0";
+  
+  src = fetchurl {
+    url = https://github.com/ocsigen/ocsigenserver/archive/2.4.0.tar.gz;
+    sha256 = "1fjj8g6ivyfsa0446w77rjihhbw0gh5pgx7brywql2shk999riby";
+  };
+
+  buildInputs = [ocaml which findlib ocaml_react ocaml_ssl ocaml_lwt ocamlnet ocaml_pcre cryptokit tyxml ocaml_ipaddr zlib libev openssl ocaml_sqlite3 tree];
+
+  configureFlags = "--root $(out) --prefix /";
+
+  dontAddPrefix = true;
+
+  createFindlibDestdir = true;
+
+  postFixup = 
+  ''
+  rm -rf $out/var/run
+  '';
+
+  dontPatchShebangs = true;
+
+  meta = {
+    homepage = http://ocsigen.org/ocsigenserver/;
+    description = "Ocsigen Server is a full featured Web server. It implements most features of the HTTP protocol, and has a very powerful extension mechanism that make very easy to plug your own OCaml modules for generating pages.";
+    license = "LGPL"; # <- todo: check
+    platforms = ocaml.meta.platforms;
+    maintainers = [ stdenv.lib.maintainers.gal_bolle ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 975370ff5e89..2271a5b96fb6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3401,6 +3401,8 @@ let
 
     ocaml_text = callPackage ../development/ocaml-modules/ocaml-text { };
 
+    ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { };
+
     ounit = callPackage ../development/ocaml-modules/ounit { };
 
     tyxml = callPackage ../development/ocaml-modules/tyxml { };

From 2709d322746e549a5c04d5952ca355da259bcb14 Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@ens-lyon.org>
Date: Sun, 8 Jun 2014 12:14:08 +0200
Subject: [PATCH 1384/1453] Add a derivation for eliom (ocaml web framework)

---
 .../ocaml-modules/eliom/default.nix           | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/eliom/default.nix

diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix
new file mode 100644
index 000000000000..af85a0a8f94c
--- /dev/null
+++ b/pkgs/development/ocaml-modules/eliom/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, ocaml, findlib, which, ocsigen_server, ocsigen_deriving,
+  js_of_ocaml, ocaml_react, ocaml_lwt, calendar, cryptokit, tyxml,
+  ocaml_ipaddr, ocamlnet, ocaml_ssl, ocaml_pcre, ocaml_optcomp}:
+
+stdenv.mkDerivation
+{
+  name = "eliom-4.0.0";
+
+  src = fetchurl {
+    url = https://github.com/ocsigen/eliom/archive/4.0.0.tar.gz;
+    sha256 = "1xf2l6lvngxzwaw6lvr6sgi48rz0wxg65q9lz4jzqjarkp0sx206";
+  };
+
+  buildInputs = [ocaml which ocsigen_server findlib ocsigen_deriving
+                 js_of_ocaml ocaml_react ocaml_lwt calendar
+                 cryptokit tyxml ocaml_ipaddr ocamlnet ocaml_ssl
+                 ocaml_pcre ocaml_optcomp];
+
+  preConfigure =
+  ''chmod a+x configure
+    sed s/deriving-ocsigen/deriving/g -i configure
+  '';
+
+  configureFlags = "--root $(out) --prefix /";
+
+  dontAddPrefix = true;  
+
+  createFindlibDestdir = true;
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2271a5b96fb6..eb6f671a3b24 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3325,6 +3325,8 @@ let
 
     easy-format = callPackage ../development/ocaml-modules/easy-format { };
 
+    eliom = callPackage ../development/ocaml-modules/eliom { };
+
     findlib = callPackage ../development/tools/ocaml/findlib { };
 
     javalib = callPackage ../development/ocaml-modules/javalib {

From 9a9ecbf32df0d5bfee978e310281b8f539d67fe6 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 6 Sep 2014 12:44:20 +0400
Subject: [PATCH 1385/1453] A description cleanup after merge

---
 pkgs/development/ocaml-modules/calendar/default.nix       | 2 +-
 pkgs/development/ocaml-modules/ocsigen-server/default.nix | 5 ++++-
 pkgs/development/ocaml-modules/tyxml/default.nix          | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/ocaml-modules/calendar/default.nix b/pkgs/development/ocaml-modules/calendar/default.nix
index 0010508a215b..6af7ce250772 100644
--- a/pkgs/development/ocaml-modules/calendar/default.nix
+++ b/pkgs/development/ocaml-modules/calendar/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   meta =  {
     homepage = https://forge.ocamlcore.org/projects/calendar/;
-    description = "An Objective Caml library managing dates and times.";
+    description = "An Objective Caml library managing dates and times";
     license = "LGPL";
     platforms = ocaml.meta.platforms;
     maintainers = [
diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix
index 0e01b811b57c..c69bf92b614c 100644
--- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix
+++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix
@@ -25,7 +25,10 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = http://ocsigen.org/ocsigenserver/;
-    description = "Ocsigen Server is a full featured Web server. It implements most features of the HTTP protocol, and has a very powerful extension mechanism that make very easy to plug your own OCaml modules for generating pages.";
+    description = "A full featured Web server''
+    longDescription =''
+      A full featured Web server. It implements most features of the HTTP protocol, and has a very powerful extension mechanism that make very easy to plug your own OCaml modules for generating pages.
+      '';
     license = "LGPL"; # <- todo: check
     platforms = ocaml.meta.platforms;
     maintainers = [ stdenv.lib.maintainers.gal_bolle ];
diff --git a/pkgs/development/ocaml-modules/tyxml/default.nix b/pkgs/development/ocaml-modules/tyxml/default.nix
index 39cee4e32ce0..02ac7f381e51 100644
--- a/pkgs/development/ocaml-modules/tyxml/default.nix
+++ b/pkgs/development/ocaml-modules/tyxml/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = http://ocsigen.org/tyxml/;
-    description = "Tyxml is a library that makes it almost impossible for your OCaml programs to generate wrong XML ouput, using static typing.";
+    description = "A library that makes it almost impossible for your OCaml programs to generate wrong XML ouput, using static typing";
     license = "LGPL";
     platforms = ocaml.meta.platforms;
     maintainers = [
@@ -27,4 +27,4 @@ stdenv.mkDerivation {
       ];
   };
 
-}
\ No newline at end of file
+}

From 98a46755812d8203e3a18263640f2aab8881e9b4 Mon Sep 17 00:00:00 2001
From: "Robert M. Mather" <robert.mather.rmm@gmail.com>
Date: Thu, 26 Jun 2014 05:11:56 -0700
Subject: [PATCH 1386/1453] Ur/Web compiler: new release, 20140531 -> 20140830

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

diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix
index bd457b227e6f..01dbaee8cde6 100644
--- a/pkgs/development/compilers/urweb/default.nix
+++ b/pkgs/development/compilers/urweb/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "urweb";
-  version = "20140531";
+  version = "20140830";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "http://www.impredicative.com/ur/${name}.tgz";
-    sha256 = "0gbk16hzs8267cfhb7w1cqgjxdv2icxg5clxdbda6qsn84jaf3n4";
+    sha256 = "0l4zhvdy2fdvhihyl4gl09v8q4w05b1k0c6h4k8281px96d5ljgr";
   };
 
   buildInputs = [ stdenv.gcc file openssl mlton mysql postgresql sqlite ];

From f7ce66985ae4ec360054cc1769c640b6d113e9be Mon Sep 17 00:00:00 2001
From: Nathaniel Baxter <nathaniel.baxter@gmail.com>
Date: Sat, 6 Sep 2014 20:32:01 +1000
Subject: [PATCH 1387/1453] bittorrent: Remove reference to deleted package.

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eb6f671a3b24..cffaebd5e63f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -690,10 +690,6 @@ let
     inherit (strategoPackages016) strategoxt sdf;
   };
 
-  bittorrent = callPackage ../tools/networking/p2p/bittorrent {
-    gui = true;
-  };
-
   bittornado = callPackage ../tools/networking/p2p/bit-tornado { };
 
   blueman = callPackage ../tools/bluetooth/blueman {

From 8f30cabb834954eb02a5331fb52c253251a2e979 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Sat, 6 Sep 2014 12:45:20 +0200
Subject: [PATCH 1388/1453] fix ocsigen expression

---
 pkgs/development/ocaml-modules/ocsigen-server/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix
index c69bf92b614c..6f68958aeab1 100644
--- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix
+++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = http://ocsigen.org/ocsigenserver/;
-    description = "A full featured Web server''
+    description = "A full featured Web server";
     longDescription =''
       A full featured Web server. It implements most features of the HTTP protocol, and has a very powerful extension mechanism that make very easy to plug your own OCaml modules for generating pages.
       '';

From 4a1a77a432cec719c2fdcf3e36a02afb09dde3fe Mon Sep 17 00:00:00 2001
From: Nathaniel Baxter <nathaniel.baxter@gmail.com>
Date: Sat, 6 Sep 2014 20:53:45 +1000
Subject: [PATCH 1389/1453] unrar: Fixed license typo

---
 pkgs/tools/archivers/unrar/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix
index a13c4c3b70bd..9ef93a30b681 100644
--- a/pkgs/tools/archivers/unrar/default.nix
+++ b/pkgs/tools/archivers/unrar/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     description = "Utility for RAR archives";
     homepage = http://www.rarlab.com/;
-    license = licenses.unfree-redistributable;
+    license = licenses.unfreeRedistributable;
     maintainers = [ maintainers.emery ];
     platforms = platforms.all;
   };

From 4c5d12d3f0c3623dd99938d9dca1658a44692319 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 6 Sep 2014 13:28:53 +0200
Subject: [PATCH 1390/1453] all-packages.nix: re-arrange Emacs packages into a
 semi-alphabetical order

---
 pkgs/top-level/all-packages.nix | 36 ++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cffaebd5e63f..42af3f0743b3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8683,34 +8683,22 @@ let
 
     gist = callPackage ../applications/editors/emacs-modes/gist { };
 
+    haskellMode = callPackage ../applications/editors/emacs-modes/haskell { };
+
+    hol_light_mode = callPackage ../applications/editors/emacs-modes/hol_light { };
+
+    htmlize = callPackage ../applications/editors/emacs-modes/htmlize { };
+
     idris = callPackage ../applications/editors/emacs-modes/idris { };
 
     jabber = callPackage ../applications/editors/emacs-modes/jabber { };
 
     jade = callPackage ../applications/editors/emacs-modes/jade { };
 
-    jdee = callPackage ../applications/editors/emacs-modes/jdee {
-      # Requires Emacs 23, for `avl-tree'.
-    };
+    jdee = callPackage ../applications/editors/emacs-modes/jdee { };
 
     js2 = callPackage ../applications/editors/emacs-modes/js2 { };
 
-    stratego = callPackage ../applications/editors/emacs-modes/stratego { };
-
-    haskellMode = callPackage ../applications/editors/emacs-modes/haskell { };
-
-    ocamlMode = callPackage ../applications/editors/emacs-modes/ocaml { };
-
-    structuredHaskellMode = callPackage ../applications/editors/emacs-modes/structured-haskell-mode {
-      inherit (haskellPackages) cabal haskellSrcExts;
-    };
-
-    tuaregMode = callPackage ../applications/editors/emacs-modes/tuareg { };
-
-    hol_light_mode = callPackage ../applications/editors/emacs-modes/hol_light { };
-
-    htmlize = callPackage ../applications/editors/emacs-modes/htmlize { };
-
     logito = callPackage ../applications/editors/emacs-modes/logito { };
 
     loremIpsum = callPackage ../applications/editors/emacs-modes/lorem-ipsum { };
@@ -8723,6 +8711,8 @@ let
 
     notmuch = lowPrio (callPackage ../applications/networking/mailreaders/notmuch { });
 
+    ocamlMode = callPackage ../applications/editors/emacs-modes/ocaml { };
+
     offlineimap = callPackage ../applications/editors/emacs-modes/offlineimap {};
 
     # This is usually a newer version of Org-Mode than that found in GNU Emacs, so
@@ -8766,8 +8756,16 @@ let
     scalaMode1 = callPackage ../applications/editors/emacs-modes/scala-mode/v1.nix { };
     scalaMode2 = callPackage ../applications/editors/emacs-modes/scala-mode/v2.nix { };
 
+    stratego = callPackage ../applications/editors/emacs-modes/stratego { };
+
+    structuredHaskellMode = callPackage ../applications/editors/emacs-modes/structured-haskell-mode {
+      inherit (haskellPackages) cabal haskellSrcExts;
+    };
+
     sunriseCommander = callPackage ../applications/editors/emacs-modes/sunrise-commander { };
 
+    tuaregMode = callPackage ../applications/editors/emacs-modes/tuareg { };
+
     writeGood = callPackage ../applications/editors/emacs-modes/writegood { };
 
     xmlRpc = callPackage ../applications/editors/emacs-modes/xml-rpc { };

From 1e92a862404c952404fd570f7fa99750b76646d4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 6 Sep 2014 13:30:13 +0200
Subject: [PATCH 1391/1453] emacs-rainbow-delimiters: add version 1.3.8

---
 .../rainbow-delimiters/default.nix            | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/applications/editors/emacs-modes/rainbow-delimiters/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/rainbow-delimiters/default.nix b/pkgs/applications/editors/emacs-modes/rainbow-delimiters/default.nix
new file mode 100644
index 000000000000..5d92397d2954
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/rainbow-delimiters/default.nix
@@ -0,0 +1,23 @@
+{stdenv, fetchurl, emacs}:
+
+let version = "1.3.8";
+
+in stdenv.mkDerivation {
+  name = "emacs-rainbow-delimiters-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/jlr/rainbow-delimiters/archive/${version}.tar.gz";
+    sha256 = "1xavygdnd9q80wqavxliks0w662mvn8v79qmg0kr494yfqc5hw6h";
+  };
+
+  buildInputs = [ emacs ];
+
+  buildPhase = ''
+    emacs -L . --batch -f batch-byte-compile *.el
+  '';
+
+  installPhase = ''
+    install -d $out/share/emacs/site-lisp
+    install *.el *.elc $out/share/emacs/site-lisp
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 42af3f0743b3..b3a48315d868 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8743,6 +8743,8 @@ let
 
     quack = callPackage ../applications/editors/emacs-modes/quack { };
 
+    rainbowDelimiters = callPackage ../applications/editors/emacs-modes/rainbow-delimiters { };
+
     rectMark = callPackage ../applications/editors/emacs-modes/rect-mark { };
 
     remember = callPackage ../applications/editors/emacs-modes/remember { };

From 6f819ef4f4ec451ccbeac69d8112e9b93840a634 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 6 Sep 2014 13:30:37 +0200
Subject: [PATCH 1392/1453] emacs-ensime: depend on scala-mode2 and sbt-mode

---
 pkgs/applications/editors/emacs-modes/ensime/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/ensime/default.nix b/pkgs/applications/editors/emacs-modes/ensime/default.nix
index 26f3b8a9d38b..d776103a6627 100644
--- a/pkgs/applications/editors/emacs-modes/ensime/default.nix
+++ b/pkgs/applications/editors/emacs-modes/ensime/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, emacs, unzip, autoComplete, dash, s }:
+{ stdenv, fetchurl, emacs, unzip, autoComplete, dash, s, scalaMode2, sbtMode }:
 
 stdenv.mkDerivation {
   name = "emacs-ensime-2014-09-04";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [ emacs unzip ];
-  propagatedUserEnvPkgs = [ autoComplete dash s ];
+  propagatedUserEnvPkgs = [ autoComplete dash s scalaMode2 sbtMode ];
 
   buildPhase = ''
     emacs -L . -L ${autoComplete}/share/emacs/site-lisp --batch -f batch-byte-compile *.el

From 46266cc216c42b983f3d293f42e651113fa83481 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=BCdiger=20Sonderfeld?= <ruediger@c-plusplus.de>
Date: Tue, 19 Aug 2014 20:36:25 +0200
Subject: [PATCH 1393/1453] gdb: Update to 7.8 and include Guile support.

GDB 7.8 adds Guile scripting support.  This is now enabled by default as
well.  Checking for guile also adds a pkg-config dependency.

It seems Python is explicitly excluded from cross building.  I'm not
sure if Guile should also be excluded.
---
 pkgs/development/tools/misc/gdb/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix
index 5ee0f64a4e41..d9af1e3eb548 100644
--- a/pkgs/development/tools/misc/gdb/default.nix
+++ b/pkgs/development/tools/misc/gdb/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, ncurses, readline, gmp, mpfr, expat, texinfo
-, dejagnu, python, target ? null
+, dejagnu, python, pkgconfig, guile, target ? null
 
 # Additional dependencies for GNU/Hurd.
 , mig ? null, hurd ? null
@@ -8,7 +8,7 @@
 
 let
 
-  basename = "gdb-7.7";
+  basename = "gdb-7.8";
 
   # Whether (cross-)building for GNU/Hurd.  This is an approximation since
   # having `stdenv ? cross' doesn't tell us if we're building `crossDrv' and
@@ -26,8 +26,8 @@ stdenv.mkDerivation rec {
       ("-" + target.config);
 
   src = fetchurl {
-    url = "mirror://gnu/gdb/${basename}.tar.bz2";
-    sha256 = "08vcb97j1b7vxwq6088wb6s3g3bm8iwikd922y0xsgbbxv3d2104";
+    url = "mirror://gnu/gdb/${basename}.tar.xz";
+    sha256 = "49c4abe174f79f54e1f9e75210ffb590d9b497d5b5200b5398c0e073a4ecb875";
   };
 
   patches = [ ./edit-signals.patch ];
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ texinfo python ]
     ++ stdenv.lib.optional isGNU mig;
 
-  buildInputs = [ ncurses readline gmp mpfr expat ]
+  buildInputs = [ ncurses readline gmp mpfr expat pkgconfig guile ]
     ++ stdenv.lib.optional isGNU hurd
     ++ stdenv.lib.optional doCheck dejagnu;
 

From 538195e088be108e741d2f3b5df24470c5704762 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Sat, 6 Sep 2014 13:40:16 +0200
Subject: [PATCH 1394/1453] disable guile by default and add attribute for
 gdb-with-guile

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b3a48315d868..390af2f731e3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4366,11 +4366,14 @@ let
   };
 
   gdb = callPackage ../development/tools/misc/gdb {
+    guile = null;
     hurd = gnu.hurdCross;
     readline = readline63;
     inherit (gnu) mig;
   };
 
+  gdbGuile = lowPrio (gdb.override { inherit guile; });
+
   gdbCross = lowPrio (callPackage ../development/tools/misc/gdb {
     target = crossSystem;
   });

From c3fe942a57ac5772ace50df1b6580530d7163565 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Sun, 31 Aug 2014 14:34:12 +0200
Subject: [PATCH 1395/1453] start dhcpcd after network-interfaces

---
 nixos/modules/services/networking/dhcpcd.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix
index 084ac69e8d5d..15dbf80a987e 100644
--- a/nixos/modules/services/networking/dhcpcd.nix
+++ b/nixos/modules/services/networking/dhcpcd.nix
@@ -138,6 +138,9 @@ in
       { description = "DHCP Client";
 
         wantedBy = [ "network.target" ];
+        # Work-around to deal with problems where the kernel would remove &
+        # re-create Wifi interfaces early during boot.
+        after = [ "network-interfaces.target" ];
 
         # Stopping dhcpcd during a reconfiguration is undesirable
         # because it brings down the network interfaces configured by

From 0fc621e66691e510b5fd72f09829a9014da26578 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 5 Sep 2014 22:52:31 +0200
Subject: [PATCH 1396/1453] pypyPackages.greenlet: disable

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 467b24ffea99..2c87b5da7349 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3852,6 +3852,7 @@ rec {
 
   greenlet = buildPythonPackage rec {
     name = "greenlet-0.4.3";
+    disabled = isPyPy;  # builtin for pypy
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/g/greenlet/${name}.zip";

From ed706113a899fa2f562e866e5ae46db2ae5a7398 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 6 Sep 2014 15:23:22 +0200
Subject: [PATCH 1397/1453] sproxy-web: mark as broken

---
 pkgs/tools/networking/sproxy-web/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/networking/sproxy-web/default.nix b/pkgs/tools/networking/sproxy-web/default.nix
index fa3221a77598..67daab083598 100644
--- a/pkgs/tools/networking/sproxy-web/default.nix
+++ b/pkgs/tools/networking/sproxy-web/default.nix
@@ -22,5 +22,6 @@ cabal.mkDerivation (self: {
     description = "Web interface to sproxy";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    broken = true;
   };
 })

From b08be368796357c34cbef0c01ba1be641b956b6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 6 Sep 2014 15:56:48 +0200
Subject: [PATCH 1398/1453] pythonPackages.zope_testrunner: enable tests

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2c87b5da7349..f1540ca2a6bf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9779,8 +9779,7 @@ rec {
 
     propagatedBuildInputs = [ zope_interface zope_exceptions zope_testing six ] ++ optional (!python.is_py3k or false) subunit;
 
-    # a test is failing
-    doCheck = false;
+    doCheck = true;
 
     meta = {
       description = "A flexible test runner with layer support";

From 2c7290c58f21f053abbf3512ec7b4b3255e94c28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 6 Sep 2014 16:08:01 +0200
Subject: [PATCH 1399/1453] pythonPackages.sure: use upstream package, next
 release should have tests

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f1540ca2a6bf..e59a8af5c60d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8315,15 +8315,11 @@ rec {
       export LC_ALL="en_US.UTF-8"
     '';
 
-    # Not picking up from PyPI because it doesn't contain tests.
-    src = fetchgit {
-      url = "git://github.com/gabrielfalcao/sure.git";
-      rev = "86ab9faa97aa9c1720c7d090deac2be385ed3d7a";
-      sha256 = "02vffcdgr6vbj80lhl925w7zqy6cqnfvs088i0rbkjs5lxc511b3";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/s/sure/${name}.tar.gz";
+      md5 = "6dbecef27dffc41c8cd8aab8a8b3fdfb";
     };
 
-
-
     buildInputs = [ nose ];
 
     propagatedBuildInputs = [ six mock ];

From 2eed178fe70f0ce545190beb86c83b25d740a653 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 6 Sep 2014 16:15:40 +0200
Subject: [PATCH 1400/1453] pypyPackages.fabric: disable tests

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e59a8af5c60d..7b6b91873d48 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2109,6 +2109,7 @@ rec {
       sha256 = "103mzf0l15kyvw5nmf7bsdrqg6y3wpyxmkyl2h9lk7jxb5gdc9s1";
     };
     disabled = isPy3k;
+    doCheck = (!isPyPy);  # https://github.com/fabric/fabric/issues/11891
     propagatedBuildInputs = [ paramiko pycrypto ];
     buildInputs = [ fudge nose ];
   };

From e8a38b78227cb6d91d00b26ed4d0e7332b510a1c Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Sat, 6 Sep 2014 16:18:26 +0200
Subject: [PATCH 1401/1453] add more convenient adapter for making debug builds

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 390af2f731e3..d7c89d881d6d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -423,6 +423,8 @@ let
     { deps = [ pkgs.lcov pkgs.enableGCOVInstrumentation ]; }
     ../build-support/setup-hooks/make-coverage-analysis-report.sh;
 
+  # intended to be used like nix-build -E 'with <nixpkgs> {}; enableDebugging fooPackage'
+  enableDebugging = pkg : pkg.override { stdenv = stdenvAdapters.keepDebugInfo pkg.stdenv; };
 
   ### TOOLS
 

From f99ad6fe9404d9c026baa5e6e2ea53d0d85d254b Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 6 Sep 2014 16:22:31 +0200
Subject: [PATCH 1402/1453] help2man: update from 1.46.1 to 1.46.2

---
 pkgs/development/tools/misc/help2man/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix
index c8cff1162821..e8e50999f3ed 100644
--- a/pkgs/development/tools/misc/help2man/default.nix
+++ b/pkgs/development/tools/misc/help2man/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl, gettext, LocaleGettext, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "help2man-1.46.1";
+  name = "help2man-1.46.2";
 
   src = fetchurl {
     url = "mirror://gnu/help2man/${name}.tar.xz";
-    sha256 = "0iqwb3qirl7rp1wwpbh01q89qxvi4h3bc73wi03av6hl4sh05z9x";
+    sha256 = "0483cpizy0mqngibv56p6p8jxwh8678qksf5zs5wh963r3n1s6cj";
   };
 
   buildInputs = [ makeWrapper perl gettext LocaleGettext ];

From ee27bd1d99ab6eb4834e0d45e1456cdb8af15712 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 6 Sep 2014 16:35:54 +0200
Subject: [PATCH 1403/1453] pypyPackages.pil: fix build

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7b6b91873d48..4e62a6c7f126 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5785,8 +5785,9 @@ rec {
     buildInputs = [ python pkgs.libjpeg pkgs.zlib pkgs.freetype ];
 
     disabled = isPy3k;
-
     doCheck = true;
+    
+    postInstall = "ln -s $out/lib/${python.libPrefix}/site-packages $out/lib/${python.libPrefix}/site-packages/PIL";
 
     preConfigure = ''
       sed -i "setup.py" \
@@ -5795,13 +5796,8 @@ rec {
               s|^ZLIB_ROOT =.*$|ZLIB_ROOT = libinclude("${pkgs.zlib}")|g ;'
     '';
 
-    checkPhase   = "${python}/bin/${python.executable} selftest.py";
-    buildPhase   = "${python}/bin/${python.executable} setup.py build_ext -i";
-
-    postInstall = ''
-      cd "$out"/lib/python*/site-packages
-      ln -s $PWD PIL
-    '';
+    checkPhase = "${python}/bin/${python.executable} selftest.py";
+    buildPhase = "${python}/bin/${python.executable} setup.py build_ext -i";
 
     meta = {
       homepage = http://www.pythonware.com/products/pil/;

From 7cc77a12e48aec34b68a437ab1e63120cafe59e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 6 Sep 2014 16:54:14 +0200
Subject: [PATCH 1404/1453] pypyPackages.numpy: disable and upgrade

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4e62a6c7f126..00f0203db3e2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5297,12 +5297,14 @@ rec {
   };
 
   numpy = buildPythonPackage ( rec {
-    name = "numpy-1.7.1";
+    name = "numpy-1.8.2";
 
     src = fetchurl {
       url = "mirror://sourceforge/numpy/${name}.tar.gz";
-      sha256 = "0jh832j439jj2b7m1z5a4rv5cpdn1yiw1r6gwrhdihw562d029am";
+      sha256 = "1gcxlk3mf43pzpxvbw8kcfg173g4105j9szsfc1kxwablail6myf";
     };
+    
+    disabled = isPyPy;  # WIP
 
     preConfigure = ''
       sed -i 's/-faltivec//' numpy/distutils/system_info.py

From a9d25eae98e41b0c89a6784090a59fb72f6e59c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 6 Sep 2014 17:10:29 +0200
Subject: [PATCH 1405/1453] pypyPackages.lxml: 3.0.2 -> 3.3.6 (fixes pypy
 build)

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 00f0203db3e2..9cdd9c0d074c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4368,11 +4368,11 @@ rec {
   };
 
   lxml = buildPythonPackage ( rec {
-    name = "lxml-3.0.2";
+    name = "lxml-3.3.6";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/l/lxml/${name}.tar.gz";
-      md5 = "38b15b0dd5e9292cf98be800e84a3ce4";
+      md5 = "a804b36864c483fe7abdd7f493a0c379";
     };
 
     buildInputs = [ pkgs.libxml2 pkgs.libxslt ];

From e69dd3b9aa497698c8012b71f5d0aa78aa2a60c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 6 Sep 2014 17:12:11 +0200
Subject: [PATCH 1406/1453] pypyPackages.psycopg2: disable

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9cdd9c0d074c..b14043a83498 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5982,6 +5982,7 @@ rec {
 
   psycopg2 = buildPythonPackage rec {
     name = "psycopg2-2.5.3";
+    disabled = isPyPy;
 
     # error: invalid command 'test'
     doCheck = false;

From 8d85bfefcf6ceeb26a160a08092d9a7ee5648a2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 6 Sep 2014 17:16:44 +0200
Subject: [PATCH 1407/1453] pypyPackages.pycurl: disable

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b14043a83498..61cdc637f086 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6203,6 +6203,7 @@ rec {
 
   pycurl = buildPythonPackage (rec {
     name = "pycurl-7.19.5";
+    disabled = isPyPy; # https://github.com/pycurl/pycurl/issues/208
 
     src = fetchurl {
       url = "http://pycurl.sourceforge.net/download/${name}.tar.gz";

From 424669e7b040296ca62669f43e53876adfe20db2 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sat, 6 Sep 2014 18:08:33 +0200
Subject: [PATCH 1408/1453] ack: update from 2.12 to 2.14

---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 67accf016cc9..c183edb1ac72 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -25,10 +25,10 @@ let self = _self // overrides; _self = with self; {
 
 
   ack = buildPerlPackage rec {
-    name = "ack-2.12";
+    name = "ack-2.14";
     src = fetchurl {
       url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz";
-      sha256 = "0avxpgg1fvib4354d9a9710j63sgxpb5j07if5qr83apq9xx7wjj";
+      sha256 = "0gqv30666vlclnwylhk9i64s7raa70x4ncy6bg48s5gcxwrshjc5";
     };
     # use gnused so that the preCheck command passes
     buildInputs = stdenv.lib.optional stdenv.isDarwin [ gnused ];

From 9d73922ed7812bb214619d86280fe04e1c2cbe47 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sat, 6 Sep 2014 18:12:35 +0200
Subject: [PATCH 1409/1453] blueman: update from 1.21 to 1.23

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

diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix
index 095337d12510..a9a167355edb 100644
--- a/pkgs/tools/bluetooth/blueman/default.nix
+++ b/pkgs/tools/bluetooth/blueman/default.nix
@@ -5,11 +5,11 @@
 }:
    
 stdenv.mkDerivation rec {
-  name = "blueman-1.21";
+  name = "blueman-1.23";
    
   src = fetchurl {
     url = "http://download.tuxfamily.org/blueman/${name}.tar.gz";
-    sha256 = "1bz31w0cqcl77r7vfjwm9c4gmk4hvq3nqn1pjnd5qndia2mhs846";
+    sha256 = "04ghlh4h5bwp9mqr5jxcmjm01595l5fq5561qxvf369fvjy63cjh";
   };
 
   configureFlags = "--disable-polkit";

From 17f1043eb076d5e7e80ee6b8d6f670e96e45dd71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 6 Sep 2014 18:12:38 +0200
Subject: [PATCH 1410/1453] buildPythonPackage: support .override {}

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 61cdc637f086..85f11a129161 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -38,7 +38,7 @@ rec {
   # global distutils config used by buildPythonPackage
   distutils-cfg = callPackage ../development/python-modules/distutils-cfg { };
 
-  buildPythonPackage = callPackage ../development/python-modules/generic { };
+  buildPythonPackage = makeOverridable (callPackage ../development/python-modules/generic { });
 
   wrapPython = pkgs.makeSetupHook
     { deps = pkgs.makeWrapper;

From 46acec64c29dfc6fe6bc3dce1264797fec4424e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 6 Sep 2014 18:13:01 +0200
Subject: [PATCH 1411/1453] pythonPackages.sqlalchemy{,8}: disable on py34

---
 pkgs/top-level/python-packages.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 85f11a129161..7e7188c628a6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8140,9 +8140,10 @@ rec {
     };
   });
 
-  sqlalchemy = pkgs.lib.overrideDerivation sqlalchemy9 (args: rec {
+  sqlalchemy = sqlalchemy9.override rec {
     name = "SQLAlchemy-0.7.10";
-    disabled = isPy3k;
+    disabled = isPy34;
+
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/S/SQLAlchemy/${name}.tar.gz";
       sha256 = "0rhxgr85xdhjn467qfs0dkyj8x46zxcv6ad3dfx3w14xbkb3kakp";
@@ -8155,10 +8156,12 @@ rec {
     preConfigure = optionalString isPy3k ''
       python3 sa2to3.py --no-diffs -w lib test examples
     '';
-  });
+  };
 
-  sqlalchemy8 = pkgs.lib.overrideDerivation sqlalchemy9 (args: rec {
+  sqlalchemy8 = sqlalchemy9.override rec {
     name = "SQLAlchemy-0.8.7";
+    disabled = isPy34;
+
     src = fetchurl {
       url = "https://pypi.python.org/packages/source/S/SQLAlchemy/${name}.tar.gz";
       md5 = "4f3377306309e46739696721b1785335";
@@ -8166,7 +8169,7 @@ rec {
     preConfigure = optionalString isPy3k ''
       python3 sa2to3.py --no-diffs -w lib test examples
     '';
-  });
+  };
 
   sqlalchemy9 = buildPythonPackage rec {
     name = "SQLAlchemy-0.9.4";

From 2415c6cbb27d43dd656063e5782ebeb29ec1dce1 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sat, 6 Sep 2014 18:16:45 +0200
Subject: [PATCH 1412/1453] memtest86: update from 4.3.3 to 4.3.6

---
 pkgs/tools/misc/memtest86/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/memtest86/default.nix b/pkgs/tools/misc/memtest86/default.nix
index ebf0a89a7075..6fccff7781d4 100644
--- a/pkgs/tools/misc/memtest86/default.nix
+++ b/pkgs/tools/misc/memtest86/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation {
-  name = "memtest86-4.3.3";
+  name = "memtest86-4.3.6";
   
   src = fetchurl {
-    url = http://www.memtest86.com/downloads/memtest86-4.3.3-src.tar.gz;
-    sha256 = "1fzpk0s97lx8h1wbv2bgr6m8v4ag8i58kzr8fa25bvwyl8hks9sl";
+    url = http://www.memtest86.com/downloads/memtest86-4.3.6-src.tar.gz;
+    sha256 = "0qbksyl2hmkm12n7zbmf2m2n3q811skhykxx6a9a7y6r7k8y5qmv";
   };
 
   preBuild = ''

From 7694fcf524789b1b5d75fe2dab898aaeac11564f Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sat, 6 Sep 2014 18:18:21 +0200
Subject: [PATCH 1413/1453] mysql55: update from 5.5.37 to 5.5.39, potentially
 fixes CVE-2014-2494, CVE-2014-4207, CVE-2014-4258, CVE-2014-4260

---
 pkgs/servers/sql/mysql/5.5.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix
index 7c31bd7c5828..7266727fdad8 100644
--- a/pkgs/servers/sql/mysql/5.5.x.nix
+++ b/pkgs/servers/sql/mysql/5.5.x.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "mysql-${version}";
-  version = "5.5.37";
+  version = "5.5.39";
 
   src = fetchurl {
     url = "http://cdn.mysql.com/Downloads/MySQL-5.5/${name}.tar.gz";
-    md5 = "bf1d80c66d4822ec6036300399a33c03";
+    sha256 = "0qj8bc83v6vf8jyn4ag179nclpn6ilw4h4xqb50zz9jd0c5s14qq";
   };
 
   preConfigure = stdenv.lib.optional stdenv.isDarwin ''

From 43fdbc0bd70769aecb2d365d0ed3e4d83f1b9bfe Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sat, 6 Sep 2014 18:20:17 +0200
Subject: [PATCH 1414/1453] mysql: update from 5.1.72 to 5.1.73, potentially
 fixes CVE-2013-5908, CVE-2014-0401, CVE-2014-0412, CVE-2014-0437

---
 pkgs/servers/sql/mysql/5.1.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/mysql/5.1.x.nix b/pkgs/servers/sql/mysql/5.1.x.nix
index c309158a6705..b422b9938320 100644
--- a/pkgs/servers/sql/mysql/5.1.x.nix
+++ b/pkgs/servers/sql/mysql/5.1.x.nix
@@ -3,11 +3,11 @@
 # Note: zlib is not required; MySQL can use an internal zlib.
 
 stdenv.mkDerivation rec {
-  name = "mysql-5.1.72";
+  name = "mysql-5.1.73";
 
   src = fetchurl {
     url = "http://cdn.mysql.com/Downloads/MySQL-5.1/${name}.tar.gz";
-    md5 = "ed79cd48e3e7402143548917813cdb80";
+    sha256 = "1dfwi4ck0vq6sdci6gz0031s7zz5lc3pddqlgm0292s00l9y5sq5";
   };
 
   buildInputs = [ncurses zlib perl openssl] ++ stdenv.lib.optional stdenv.isLinux ps;

From db0076b659967e6212d0c51f488679430c4b2351 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sat, 6 Sep 2014 18:32:11 +0200
Subject: [PATCH 1415/1453] python34Packages.httplib2: update from 0.8 to 0.9,
 potentially fixes CVE-2013-2037

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7e7188c628a6..982f053da243 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4026,11 +4026,11 @@ rec {
   };
 
   httplib2 = buildPythonPackage rec {
-    name = "httplib2-0.8";
+    name = "httplib2-0.9";
 
     src = fetchurl {
       url = "https://pypi.python.org/packages/source/h/httplib2/${name}.tar.gz";
-      sha256 = "174w6rz4na1sdlfz37h95l0pkfm9igf9nqmhbd8aqh3sm7d9zrff";
+      sha256 = "1asi5wpncnc6ki3bz33mhb9xh2lrkb24y4qng8bmqnczdmm8rsir";
     };
 
     meta = {

From 73bd403a579257b7483bc49977fa6c00239c2228 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sat, 6 Sep 2014 19:01:31 +0200
Subject: [PATCH 1416/1453] shared_mime_info: update from 1.2 to 1.3

---
 pkgs/data/misc/shared-mime-info/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix
index 134a6f5307eb..57f5b24a6f87 100644
--- a/pkgs/data/misc/shared-mime-info/default.nix
+++ b/pkgs/data/misc/shared-mime-info/default.nix
@@ -2,11 +2,11 @@
 , libxml2, glib}:
 
 stdenv.mkDerivation rec {
-  name = "shared-mime-info-1.2";
+  name = "shared-mime-info-1.3";
 
   src = fetchurl {
     url = "http://freedesktop.org/~hadess/${name}.tar.xz";
-    sha256 = "0y5vi0vr6rbhvfzcfg57cfskn362bpvcpca9cy598nmr87i6lld5";
+    sha256 = "0fijrc8j2kw6bvdx7fmlfafbcwxvinhr8l44b46b3v59gj69rm2g";
   };
 
   buildInputs = [

From d54fd845bc785aa55913e7c65190738a944b1391 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sat, 6 Sep 2014 19:04:08 +0200
Subject: [PATCH 1417/1453] at: update from 3.1.14 to 3.1.15

---
 pkgs/tools/system/at/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/system/at/default.nix b/pkgs/tools/system/at/default.nix
index 2964db34e124..1dc36043ea9e 100644
--- a/pkgs/tools/system/at/default.nix
+++ b/pkgs/tools/system/at/default.nix
@@ -1,12 +1,12 @@
 { fetchurl, stdenv, bison, flex, pam, ssmtp }:
 
 stdenv.mkDerivation {
-  name = "at-3.1.14";
+  name = "at-3.1.15";
 
   src = fetchurl {
     # Debian is apparently the last location where it can be found.
-    url = mirror://debian/pool/main/a/at/at_3.1.14.orig.tar.gz;
-    sha256 = "cd092bf05d29c25b286f55a960ce8b8c3c5beb571d86ed8eb1dfb3b61291b3ae";
+    url = mirror://debian/pool/main/a/at/at_3.1.15.orig.tar.gz;
+    sha256 = "1z7pgglr0zmwapb4sc1bdb3z0hgig1asyzqv4gs5xafmjd94za03";
   };
 
   patches = [ ./install.patch ];

From 0d357114129097b7978c79c371ff399fe85cd046 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Sat, 6 Sep 2014 20:10:19 +0200
Subject: [PATCH 1418/1453] atd: use /var/setuid-wrappers/sendmail by default
 instead of ssmtp

---
 pkgs/tools/system/at/default.nix | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/system/at/default.nix b/pkgs/tools/system/at/default.nix
index 1dc36043ea9e..5108174c8870 100644
--- a/pkgs/tools/system/at/default.nix
+++ b/pkgs/tools/system/at/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, bison, flex, pam, ssmtp }:
+{ fetchurl, stdenv, bison, flex, pam, sendmailPath ? "/var/setuid-wrappers/sendmail" }:
 
 stdenv.mkDerivation {
   name = "at-3.1.15";
@@ -12,15 +12,11 @@ stdenv.mkDerivation {
   patches = [ ./install.patch ];
 
   buildInputs =
-    [ bison flex pam
-      # `configure' and `atd' want the `sendmail' command.
-      ssmtp
-    ];
+    [ bison flex pam ];
 
   preConfigure =
     ''
-      export PATH="${ssmtp}/sbin:$PATH"
-
+      export SENDMAIL=${sendmailPath}
       # Purity: force atd.pid to be placed in /var/run regardless of
       # whether it exists now.
       substituteInPlace ./configure --replace "test -d /var/run" "true"

From a71744392b6964e624d3ae968bee660731b7d271 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sat, 6 Sep 2014 20:10:37 +0200
Subject: [PATCH 1419/1453] pcre: update from 8.34 to 8.35

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

diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix
index 4cf6bd44dd3b..930d7b86f063 100644
--- a/pkgs/development/libraries/pcre/default.nix
+++ b/pkgs/development/libraries/pcre/default.nix
@@ -5,11 +5,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "pcre-8.34";
+  name = "pcre-8.35";
 
   src = fetchurl {
     url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${name}.tar.bz2";
-    sha256 = "0gsqmsp0q0n3q0ba32gkjvgcsdy6nwidqa7sbxkbw817zzhkl15n";
+    sha256 = "0nw66r92dr24vy9k4lw17bkv8x5nlzn6wx9hq4y2dvzgig3w2qd9";
   };
 
   # The compiler on Darwin crashes with an internal error while building the

From 18d99044331fa99372fc67abf0451056087e5629 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 6 Sep 2014 20:59:06 +0200
Subject: [PATCH 1420/1453] nixos-option: fixes as suggested by @nbp

---
 nixos/doc/manual/man-nixos-option.xml         | 2 +-
 nixos/modules/installer/tools/nixos-option.sh | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/nixos/doc/manual/man-nixos-option.xml b/nixos/doc/manual/man-nixos-option.xml
index 554b29691805..2875336c67e5 100644
--- a/nixos/doc/manual/man-nixos-option.xml
+++ b/nixos/doc/manual/man-nixos-option.xml
@@ -71,7 +71,7 @@ Description:
 Whether to enable the GNU GRUB boot loader.
 
 Declared by:
-  "/path/to/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix"
+  "/nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix"
 
 Defined by:
   "/nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix"
diff --git a/nixos/modules/installer/tools/nixos-option.sh b/nixos/modules/installer/tools/nixos-option.sh
index d995787c76fe..96d09c3a6058 100644
--- a/nixos/modules/installer/tools/nixos-option.sh
+++ b/nixos/modules/installer/tools/nixos-option.sh
@@ -182,7 +182,9 @@ if test "$(evalOpt "_type" 2> /dev/null)" = '"option"'; then
   fi
   echo
   if example=$(evalOpt "example" - 2> /dev/null); then
-    echo "Example: $example"
+    echo "Example:"
+    echo "$example"
+    echo
   fi
   echo "Description:"
   echo

From 420385f81a9b3d288e9ab975bd980643e12b5fec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 6 Sep 2014 21:26:03 +0200
Subject: [PATCH 1421/1453] lua-5.2: minor update to fix CVE-2014-5461

Note that almost all packages use lua-5.1 which does remain vulnerable,
as they released no update on that branch. CC: @peti.
---
 pkgs/development/interpreters/lua-5/5.2.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix
index ea44adb462c1..1839e7789a80 100644
--- a/pkgs/development/interpreters/lua-5/5.2.nix
+++ b/pkgs/development/interpreters/lua-5/5.2.nix
@@ -10,11 +10,11 @@ in
 stdenv.mkDerivation rec {
   name = "lua-${version}";
   majorVersion = "5.2";
-  version = "${majorVersion}.2";
+  version = "${majorVersion}.3";
 
   src = fetchurl {
     url = "http://www.lua.org/ftp/${name}.tar.gz";
-    sha256 = "004zyh9p3lpvbwhyhlmrw6wwcia5abx84q4h2brkn4zdypipvmiz";
+    sha1 = "926b7907bc8d274e063d42804666b40a3f3c124c";
   };
 
   nativeBuildInputs = [ readline ];

From ac03d296b9b261b342e95871c62593d374179204 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 6 Sep 2014 21:28:03 +0200
Subject: [PATCH 1422/1453] telegram-cli: work around a build problem

---
 .../networking/instant-messengers/telegram-cli/default.nix      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix b/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix
index b0302ba8e0bf..812f00829e27 100644
--- a/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix
@@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libconfig lua5_2 openssl readline zlib ];
 
+  NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; # CPPFunction
+
   installPhase = ''
     mkdir -p $out/bin
     cp ./telegram $out/bin/telegram-wo-key

From 81046b9e5d20077c4a394c8d5e685ead9c7f609c Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Sat, 6 Sep 2014 21:37:46 +0200
Subject: [PATCH 1423/1453] Initial configuration + image generation script for
 Micro$oft Azure. Work in progress for #3986.

---
 .../maintainers/scripts/azure/create-azure.sh |  11 ++
 nixos/modules/virtualisation/azure-config.nix |   5 +
 nixos/modules/virtualisation/azure-image.nix  | 122 ++++++++++++++++++
 3 files changed, 138 insertions(+)
 create mode 100755 nixos/maintainers/scripts/azure/create-azure.sh
 create mode 100644 nixos/modules/virtualisation/azure-config.nix
 create mode 100644 nixos/modules/virtualisation/azure-image.nix

diff --git a/nixos/maintainers/scripts/azure/create-azure.sh b/nixos/maintainers/scripts/azure/create-azure.sh
new file mode 100755
index 000000000000..f87a88404f67
--- /dev/null
+++ b/nixos/maintainers/scripts/azure/create-azure.sh
@@ -0,0 +1,11 @@
+#! /bin/sh -e
+
+BUCKET_NAME=${BUCKET_NAME:-nixos}
+export NIX_PATH=nixpkgs=../../../..
+export NIXOS_CONFIG=$(dirname $(readlink -f $0))/../../../modules/virtualisation/azure-image.nix
+export TIMESTAMP=$(date +%Y%m%d%H%M)
+
+nix-build '<nixpkgs/nixos>' \
+   -A config.system.build.azureImage --argstr system x86_64-linux -o azure --option extra-binary-caches http://hydra.nixos.org -j 10
+
+azure vm image create nixos-test --location "West Europe" --md5-skip -v --os Linux azure/disk.vhd
diff --git a/nixos/modules/virtualisation/azure-config.nix b/nixos/modules/virtualisation/azure-config.nix
new file mode 100644
index 000000000000..5c9f18ef52a5
--- /dev/null
+++ b/nixos/modules/virtualisation/azure-config.nix
@@ -0,0 +1,5 @@
+{ config, pkgs, modulesPath, ... }:
+
+{
+  imports = [ "${modulesPath}/virtualisation/azure-image.nix" ];
+}
diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixos/modules/virtualisation/azure-image.nix
new file mode 100644
index 000000000000..8c980c5eec94
--- /dev/null
+++ b/nixos/modules/virtualisation/azure-image.nix
@@ -0,0 +1,122 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+let
+  diskSize = "4096";
+in
+{
+  imports = [ ../profiles/headless.nix ];
+
+  system.build.azureImage =
+    pkgs.vmTools.runInLinuxVM (
+      pkgs.runCommand "azure-image"
+        { preVM =
+            ''
+              mkdir $out
+              diskImage=$out/$diskImageBase
+
+              cyl=$(((${diskSize}*1024*1024)/(512*63*255)))
+              size=$(($cyl*255*63*512))              
+              roundedsize=$((($size/(1024*1024)+1)*(1024*1024)))
+              ${pkgs.vmTools.qemu}/bin/qemu-img create -f raw $diskImage $roundedsize
+              mv closure xchg/
+            '';
+
+          postVM =
+            ''
+              mkdir -p $out
+              ${pkgs.vmTools.qemu}/bin/qemu-img convert -f raw -O vpc $diskImage $out/disk.vhd
+              rm $diskImage
+            '';
+          diskImageBase = "nixos-${config.system.nixosVersion}-${pkgs.stdenv.system}.raw";
+          buildInputs = [ pkgs.utillinux pkgs.perl ];
+          exportReferencesGraph =
+            [ "closure" config.system.build.toplevel ];
+        }
+        ''
+          # Create partition table
+          ${pkgs.parted}/sbin/parted /dev/vda mklabel msdos
+          ${pkgs.parted}/sbin/parted /dev/vda mkpart primary ext4 1 ${diskSize}M
+          ${pkgs.parted}/sbin/parted /dev/vda print
+          . /sys/class/block/vda1/uevent
+          mknod /dev/vda1 b $MAJOR $MINOR
+
+          # Create an empty filesystem and mount it.
+          ${pkgs.e2fsprogs}/sbin/mkfs.ext4 -L nixos /dev/vda1
+          ${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda1
+
+          mkdir /mnt
+          mount /dev/vda1 /mnt
+
+          # The initrd expects these directories to exist.
+          mkdir /mnt/dev /mnt/proc /mnt/sys
+
+          mount --bind /proc /mnt/proc
+          mount --bind /dev /mnt/dev
+          mount --bind /sys /mnt/sys
+
+          # Copy all paths in the closure to the filesystem.
+          storePaths=$(perl ${pkgs.pathsFromGraph} /tmp/xchg/closure)
+
+          mkdir -p /mnt/nix/store
+          echo "copying everything (will take a while)..."
+          cp -prd $storePaths /mnt/nix/store/
+
+          # Register the paths in the Nix database.
+          printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \
+              chroot /mnt ${config.nix.package}/bin/nix-store --load-db
+
+          # Create the system profile to allow nixos-rebuild to work.
+          chroot /mnt ${config.nix.package}/bin/nix-env \
+              -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel}
+
+          # `nixos-rebuild' requires an /etc/NIXOS.
+          mkdir -p /mnt/etc
+          touch /mnt/etc/NIXOS
+
+          # `switch-to-configuration' requires a /bin/sh
+          mkdir -p /mnt/bin
+          ln -s ${config.system.build.binsh}/bin/sh /mnt/bin/sh
+
+          # Install a configuration.nix.
+          mkdir -p /mnt/etc/nixos /mnt/boot/grub
+          cp ${./azure-config.nix} /mnt/etc/nixos/configuration.nix
+
+          # Generate the GRUB menu.
+          ln -s vda /dev/sda
+          chroot /mnt ${config.system.build.toplevel}/bin/switch-to-configuration boot
+
+          umount /mnt/proc /mnt/dev /mnt/sys
+          umount /mnt
+        ''
+    );
+
+  fileSystems."/".device = "/dev/disk/by-label/nixos";
+
+  boot.kernelParams = [ "console=ttyS0" "earlyprintk=ttyS0" "rootdelay=300" "panic=1" "boot.panic_on_fail" ];
+  boot.initrd.kernelModules = [ "hv_vmbus" "hv_netvsc" "hv_utils" "hv_storvsc" ];
+
+  # Generate a GRUB menu. 
+  boot.loader.grub.device = "/dev/sda";
+  boot.loader.grub.version = 2;
+  boot.loader.grub.timeout = 0;
+
+  # Don't put old configurations in the GRUB menu.  The user has no
+  # way to select them anyway.
+  boot.loader.grub.configurationLimit = 0;
+
+  # Allow root logins only using the SSH key that the user specified
+  # at instance creation time.
+  services.openssh.enable = true;
+  services.openssh.permitRootLogin = "without-password";
+
+  # Force getting the hostname from Azure
+  networking.hostName = mkDefault "";
+
+  # Always include cryptsetup so that NixOps can use it.
+  environment.systemPackages = [ pkgs.cryptsetup ];
+
+  networking.usePredictableInterfaceNames = false;
+
+  users.extraUsers.root.openssh.authorizedKeys.keys = [ builtins.readFile <ssh-pub-key> ];
+}

From e9c1fb0c89a75e23f9a78f6388629db244066449 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Sat, 6 Sep 2014 21:53:10 +0200
Subject: [PATCH 1424/1453] Azure: Mount metadata 'CD' on /metadata

---
 nixos/modules/virtualisation/azure-image.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixos/modules/virtualisation/azure-image.nix
index 8c980c5eec94..c415890d6c40 100644
--- a/nixos/modules/virtualisation/azure-image.nix
+++ b/nixos/modules/virtualisation/azure-image.nix
@@ -93,6 +93,9 @@ in
 
   fileSystems."/".device = "/dev/disk/by-label/nixos";
 
+  # Azure metadata is available as a CD-ROM drive.
+  fileSystems."/metadata".device = "/dev/sr0";
+
   boot.kernelParams = [ "console=ttyS0" "earlyprintk=ttyS0" "rootdelay=300" "panic=1" "boot.panic_on_fail" ];
   boot.initrd.kernelModules = [ "hv_vmbus" "hv_netvsc" "hv_utils" "hv_storvsc" ];
 

From 0418d8299d17e7efac7585bf7843c4a3356e9316 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 6 Sep 2014 22:24:56 +0200
Subject: [PATCH 1425/1453] disable a bunch of python packages on pypy

---
 pkgs/development/python-modules/sip/4.16.nix    | 4 ++--
 pkgs/development/python-modules/sip/default.nix | 4 ++--
 pkgs/top-level/python-packages.nix              | 9 ++++++---
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/sip/4.16.nix b/pkgs/development/python-modules/sip/4.16.nix
index aa1fb1984385..210346062f9e 100644
--- a/pkgs/development/python-modules/sip/4.16.nix
+++ b/pkgs/development/python-modules/sip/4.16.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, python }:
+{ stdenv, fetchurl, python, isPyPy }:
 
-stdenv.mkDerivation rec {
+if isPyPy then throw "sip not supported for interpreter ${python.executable}" else stdenv.mkDerivation rec {
   name = "sip-4.16.1";
 
   src = fetchurl {
diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix
index db397f959448..cf3a0149844b 100644
--- a/pkgs/development/python-modules/sip/default.nix
+++ b/pkgs/development/python-modules/sip/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, python }:
+{ stdenv, fetchurl, python, isPyPy }:
 
-stdenv.mkDerivation rec {
+if isPyPy then throw "sip not supported for interpreter ${python.executable}" else stdenv.mkDerivation rec {
   name = "sip-4.14.7"; # kde410.pykde4 doesn't build with 4.15
 
   src = fetchurl {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 982f053da243..d1ad28a9cde0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -188,12 +188,12 @@ rec {
 
   sip = import ../development/python-modules/sip {
     inherit (pkgs) stdenv fetchurl;
-    inherit python;
+    inherit python isPyPy;
   };
 
   sip_4_16 = import ../development/python-modules/sip/4.16.nix {
     inherit (pkgs) stdenv fetchurl;
-    inherit python;
+    inherit python isPyPy;
   };
 
   tables = import ../development/python-modules/tables {
@@ -440,6 +440,7 @@ rec {
 
   apsw = buildPythonPackage rec {
     name = "apsw-3.7.6.2-r1";
+    disabled = isPyPy;
 
     src = fetchurl {
       url = "http://apsw.googlecode.com/files/${name}.zip";
@@ -2005,6 +2006,7 @@ rec {
   eyeD3 = buildPythonPackage rec {
     version = "0.7.4";
     name    = "eyeD3-${version}";
+    disabled = isPyPy;
 
     src = fetchurl {
       url = "http://eyed3.nicfit.net/releases/${name}.tgz";
@@ -6478,6 +6480,7 @@ rec {
   pyparted = buildPythonPackage rec {
     name = "pyparted-${version}";
     version = "3.10";
+    disabled = isPyPy;
 
     src = fetchurl {
       url = "https://fedorahosted.org/releases/p/y/pyparted/${name}.tar.gz";
@@ -8536,7 +8539,7 @@ rec {
 
   smmap = buildPythonPackage rec {
     name = "smmap-0.8.2";
-    disabled = isPy3k;  # next release will have py3k support
+    disabled = isPy3k || isPyPy;  # next release will have py3k/pypy support
     meta.maintainers = [ stdenv.lib.maintainers.mornfall ];
 
     src = fetchurl {

From f14d1d76bb14dd186ee6854aded124cdb09133db Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Sat, 6 Sep 2014 22:54:15 +0200
Subject: [PATCH 1426/1453] Azure: Fix authorized_keys

---
 nixos/modules/virtualisation/azure-image.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixos/modules/virtualisation/azure-image.nix
index c415890d6c40..ec7e8888c036 100644
--- a/nixos/modules/virtualisation/azure-image.nix
+++ b/nixos/modules/virtualisation/azure-image.nix
@@ -121,5 +121,5 @@ in
 
   networking.usePredictableInterfaceNames = false;
 
-  users.extraUsers.root.openssh.authorizedKeys.keys = [ builtins.readFile <ssh-pub-key> ];
+  users.extraUsers.root.openssh.authorizedKeys.keys = [ (builtins.readFile <ssh-pub-key>) ];
 }

From 7668e3dafedfe2ca801f42e1830bf8073fa7d6ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 7 Sep 2014 00:13:07 +0200
Subject: [PATCH 1427/1453] sip: use package from pythonPackages attrset

---
 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 d7c89d881d6d..9b04b37d7d7a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6825,7 +6825,7 @@ let
 
   rhpl = callPackage ../development/python-modules/rhpl { };
 
-  sip = callPackage ../development/python-modules/sip { };
+  sip = pythonPackages.sip;
 
   pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix {
     stdenv = if stdenv.isDarwin

From 301fe9360e70b364d6a58065f4175c0923c201a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 7 Sep 2014 00:13:28 +0200
Subject: [PATCH 1428/1453] pypyPackages.skype4py: disable

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d1ad28a9cde0..f97da897ba5c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7980,7 +7980,7 @@ rec {
 
   skype4py = buildPythonPackage (rec {
     name = "Skype4Py-1.0.32.0";
-    disabled = isPy3k;
+    disabled = isPy3k || isPyPy;
 
     src = fetchurl {
       url = mirror://sourceforge/skype4py/Skype4Py-1.0.32.0.tar.gz;

From 4ead67b785fc666aaebaa3958b034dca28d61f19 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 7 Sep 2014 00:46:25 +0200
Subject: [PATCH 1429/1453] firefox: Workaround for building on i686-linux

http://hydra.nixos.org/build/13992569
---
 pkgs/applications/networking/browsers/firefox/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 4f4a88f01c80..3223f873bfba 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -66,7 +66,8 @@ stdenv.mkDerivation rec {
     ]
     ++ (if debugBuild then [ "--enable-debug" "--enable-profiling"]
                       else [ "--disable-debug" "--enable-release"
-                             "--enable-optimize" "--enable-strip" ])
+                             "--enable-optimize${lib.optionalString (stdenv.system == "i686-linux") "=-O1"}"
+                             "--enable-strip" ])
     ++ lib.optional enableOfficialBranding "--enable-official-branding";
 
   enableParallelBuilding = true;

From eb7dbf90677983f7febf251c3f286a0dc7966507 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Sat, 6 Sep 2014 16:18:23 -0700
Subject: [PATCH 1430/1453] Remove eternityMaster

---
 pkgs/games/eternity-engine/master.nix | 30 ---------------------------
 pkgs/top-level/all-packages.nix       |  1 -
 2 files changed, 31 deletions(-)
 delete mode 100644 pkgs/games/eternity-engine/master.nix

diff --git a/pkgs/games/eternity-engine/master.nix b/pkgs/games/eternity-engine/master.nix
deleted file mode 100644
index 0d0f8e26b440..000000000000
--- a/pkgs/games/eternity-engine/master.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, cmake, mesa, SDL, SDL_mixer, SDL_net, fetchgit }:
-
-stdenv.mkDerivation rec {
-  name = "eternity-engine-20140902";
-  src = fetchgit {
-    url = git://github.com/team-eternity/eternity.git;
-    rev = "db21379abb33f6d92dc0e1665e527e4d49acc722";
-    sha256 = "0k54yvxqxnd60az21b734ka3myxkqb7pjmdp3klrkfwp1kl02ysc";
-  };
-
-  cmakeFlags = ''
-    -DCMAKE_BUILD_TYPE=Release
-  '';
-
-  buildInputs = [ stdenv cmake mesa SDL SDL_mixer SDL_net ];
-
-  enableParallelBuilding = true;
-
-  installPhase = ''
-  mkdir -p $out/bin
-  cp source/eternity $out/bin
-  '';
-
-  meta = {
-    homepage = http://doomworld.com/eternity;
-    description = "New school Doom port by James Haley";
-    license = stdenv.lib.licenses.gpl3;
-    maintainers = with stdenv.lib.maintainers; [ MP2E ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 30f43d300599..2bf19ae4bab5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -994,7 +994,6 @@ let
   ethtool = callPackage ../tools/misc/ethtool { };
 
   eternity = callPackage ../games/eternity-engine { };
-  eternityMaster = callPackage ../games/eternity-engine/master.nix { };
 
   ettercap = callPackage ../applications/networking/sniffers/ettercap { };
 

From fb9d919fe414404794f0354b6dce65785ac78153 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 6 Sep 2014 18:47:24 -0700
Subject: [PATCH 1431/1453] libotr: git -> 4.0.0

---
 pkgs/development/libraries/libotr/default.nix | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/libotr/default.nix b/pkgs/development/libraries/libotr/default.nix
index 3782dabc67bd..7b8f40d1886a 100644
--- a/pkgs/development/libraries/libotr/default.nix
+++ b/pkgs/development/libraries/libotr/default.nix
@@ -1,23 +1,22 @@
-{stdenv, fetchgit, libgcrypt, autoconf, automake, libtool}:
+{ stdenv, fetchurl, libgcrypt, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "libotr-20130821-git-f0f8a2";
-  src = fetchgit {
-    url = "http://git.code.sf.net/p/otr/libotr";
-    rev = "f0f8a2";
-    sha256 = "08019r8bnk8f4yx6574jdz217p283ry7dmpqcad2d87yhkdmc3mm";
+  name = "libotr-4.0.0";
+
+  src = fetchurl {
+    url = "https://otr.cypherpunks.ca/${name}.tar.gz";
+    sha256 = "1d4k0b7v4d3scwm858cmqr9c6xgd6ppla1vk4x2yg64q82a1k49z";
   };
 
-  NIX_LDFLAGS = "-lssp";
+  buildInputs = [ autoreconfHook ];
+  propagatedBuildInputs = [ libgcrypt ];
 
-  propagatedBuildInputs = [ libgcrypt autoconf automake libtool ];
-
-  preConfigure = "autoreconf -vfi";
-
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "http://www.cypherpunks.ca/otr/";
     repositories.git = git://git.code.sf.net/p/otr/libotr;
-    license = stdenv.lib.licenses.lgpl21;
+    license = licenses.lgpl21;
     description = "Library for Off-The-Record Messaging";
+    maintainers = with maintainers; [ wkennington ];
+    platforms = platforms.unix;
   };
 }

From cc5d2cf55a0cbfc54b4a132b059b9e49b5ed51db Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 6 Sep 2014 18:47:44 -0700
Subject: [PATCH 1432/1453] bitlbee: 3.2 -> 3.2.2

---
 .../instant-messengers/bitlbee/default.nix    | 20 +++++++++++--------
 pkgs/top-level/all-packages.nix               |  5 +----
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
index cf10c1e6fe20..8685e704af4b 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
@@ -1,19 +1,23 @@
 { fetchurl, stdenv, gnutls, glib, pkgconfig, check, libotr }:
 
+with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "bitlbee-3.2";
+  name = "bitlbee-3.2.2";
 
   src = fetchurl {
     url = "mirror://bitlbee/src/${name}.tar.gz";
-    sha256 = "1b43828e906f5450993353f2ebecc6c038f0261c4dc3f1722ebafa6ea3e62030";
+    sha256 = "13jmcxxgli82wb2n4hs091159xk8rgh7nb02f478lgpjh6996f5s";
   };
 
   buildInputs = [ gnutls glib pkgconfig libotr ]
-    ++ stdenv.lib.optional doCheck check;
+    ++ optional doCheck check;
 
-  configureFlags = [ "--otr=1" ];
+  configureFlaags = [
+    "--gcov=1"
+    "--otr=1"
+    "--ssl=gnutls"
+  ];
 
-  preCheck = "mkdir tests/.depend";
   doCheck = true;
 
   meta = {
@@ -31,9 +35,9 @@ stdenv.mkDerivation rec {
     '';
 
     homepage = http://www.bitlbee.org/;
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = licenses.gpl2Plus;
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
-    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+    maintainers = with maintainers; [ ludo wkennington ];
+    platforms = platforms.gnu;  # arbitrary choice
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9b04b37d7d7a..5c0d6039f046 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8423,10 +8423,7 @@ let
     (callPackage ../applications/misc/bitcoin/dogecoin.nix {})
   );
 
-  bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee {
-    gnutls = gnutls;
-    libotr = libotr_3_2;
-  };
+  bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee { };
 
   blender = callPackage  ../applications/misc/blender {
     python = python34;

From c3361f9414561822bb05e1306f29cd24198219c0 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Sun, 7 Sep 2014 11:34:15 +0200
Subject: [PATCH 1433/1453] perlPackages.FinanceQuote: update from 1.29 to 1.35

---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index c183edb1ac72..f77836671cb9 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3785,10 +3785,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   FinanceQuote = buildPerlPackage rec {
-    name = "Finance-Quote-1.29";
+    name = "Finance-Quote-1.35";
     src = fetchurl {
       url = "mirror://cpan/authors/id/E/EC/ECOCODE/${name}.tar.gz";
-      sha256 = "0rx8whixbhwq2imd3ffx3vcqdgfbjj6y1s01m38b52x3bjn9hw0f";
+      sha256 = "0mxfhi1ndckj4w7fw20rwy6ymalg2yncnp9xn0v2bnk5ibqj439w";
     };
     propagatedBuildInputs = [ CryptSSLeay HTMLTableExtract HTMLTree HTTPMessage LWP DateCalc JSON ];
     meta = {

From 5856fbc7d2d80f6fdab7400890b43a0d03d94d29 Mon Sep 17 00:00:00 2001
From: Nathaniel Baxter <nathaniel.baxter@gmail.com>
Date: Sun, 7 Sep 2014 12:14:44 +1000
Subject: [PATCH 1434/1453] nixos-manual: Fix reference to obsolete
 configuration option

---
 nixos/doc/manual/configuration/x-windows.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml
index bc58bb1f0669..4008e89fceac 100644
--- a/nixos/doc/manual/configuration/x-windows.xml
+++ b/nixos/doc/manual/configuration/x-windows.xml
@@ -67,7 +67,7 @@ with other kernel modules.</para>
 <para>On 64-bit systems, if you want full acceleration for 32-bit
 programs such as Wine, you should also set the following:
 <programlisting>
-services.xserver.driSupport32Bit = true;
+hardware.opengl.driSupport32Bit = true;
 </programlisting>
 </para>
 

From 9104888b3824932ca6a0b880c9dcf681bac30a55 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Sun, 7 Sep 2014 11:40:47 +0100
Subject: [PATCH 1435/1453] haskellPackages.tastyAntXml: Update to 1.0.0.9

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

diff --git a/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix b/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix
index 9f8e59322b04..2dbd8a17b941 100644
--- a/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix
+++ b/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tasty-ant-xml";
-  version = "1.0.0.8";
-  sha256 = "0khjx3anxp63ch6wkdhqnsk5miavkq014ab30rpir97gdqw0vykm";
+  version = "1.0.0.9";
+  sha256 = "0zl1gdm5cm3vpi551ysvcis17grb83q18y3c329bxynnizrm8q9f";
   buildDepends = [
     genericDeriving mtl reducers stm tagged tasty transformers xml
   ];

From 218c28934e16d80397c7c5227798595d1bbf8564 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 7 Sep 2014 13:09:27 +0200
Subject: [PATCH 1436/1453] jquery-ui: align attrname with pkgname (jquery_ui
 => jquery-ui)

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5c0d6039f046..c562c530ba19 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6695,7 +6695,7 @@ let
 
   ### DEVELOPMENT / LIBRARIES / JAVASCRIPT
 
-  jquery_ui = callPackage ../development/libraries/javascript/jquery-ui { };
+  jquery-ui = callPackage ../development/libraries/javascript/jquery-ui { };
 
   yuicompressor = callPackage ../development/tools/yuicompressor { };
 
@@ -11778,6 +11778,7 @@ let
   asciidocFull = asciidoc-full;  # added 2014-06-22
   lttngTools = lttng-tools;  # added 2014-07-31
   lttngUst = lttng-ust;  # added 2014-07-31
+  jquery_ui = jquery-ui;  # added 2014-09-07
 
 
 }; in self; in pkgs

From f8c7e340a4a65b53f4015abd9225e3298588e2ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 7 Sep 2014 13:36:13 +0200
Subject: [PATCH 1437/1453] jquery-ui: update to latest stable (v1.11.1)

The current version (v1.10.4) is now called "legacy". The new stable version
has a different directory layout; it no longer splits css/ and js/ directories.
Since the *.js files refer to the *.css files by relative paths, I'm not
splitting them. Everything now goes to "$out/js/".

Also, upstream removed version numbers from filenames, so we don't need to
create those version-less symlinks anymore.
---
 .../javascript/jquery-ui/default.nix          | 20 +++++--------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/libraries/javascript/jquery-ui/default.nix b/pkgs/development/libraries/javascript/jquery-ui/default.nix
index 9a485906e536..fd7f5367c8e0 100644
--- a/pkgs/development/libraries/javascript/jquery-ui/default.nix
+++ b/pkgs/development/libraries/javascript/jquery-ui/default.nix
@@ -1,29 +1,19 @@
 { stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "jquery-ui-1.10.4";
+  name = "jquery-ui-1.11.1";
 
   src = fetchurl {
-    url = "http://jqueryui.com/resources/download/${name}.custom.zip";
-    sha256 = "04kp27ln74j4k2jacs54264x2bsdjx1dxlw5zlpd889jqv2m6dfc";
+    url = "http://jqueryui.com/resources/download/${name}.zip";
+    sha256 = "05dlcfwklymx94fb4n88l5syf80l6zrs862zzmla477vd8ndk537";
   };
 
   buildInputs = [ unzip ];
 
   installPhase =
     ''
-      mkdir -p $out
-      cp -prvd css js $out/
-
-      # For convenience, provide symlinks "jquery.min.js" etc. (i.e.,
-      # without the version number).
-      pushd $out/js
-      ln -s jquery-ui-*.custom.js jquery-ui.js
-      ln -s jquery-ui-*.custom.min.js jquery-ui.min.js
-      ln -s jquery-1.*.js jquery.js
-      popd
-      pushd $out/css/smoothness
-      ln -s jquery-ui-*.custom.css jquery-ui.css
+      mkdir -p "$out/js"
+      cp -rv . "$out/js"
     '';
 
   meta = {

From af26d5e25b12316f350723a0d9eac3af8ce0baca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 7 Sep 2014 14:20:11 +0200
Subject: [PATCH 1438/1453] jquery: new package

jQuery is a JavaScript library designed to simplify the client-side
scripting of HTML.

I'm adding version 1.x instead of 2.x because 1.x supports IE 6, 7, 8
browsers and both versions are API compatible.

http://jquery.com/
---
 .../libraries/javascript/jquery/default.nix   | 36 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/development/libraries/javascript/jquery/default.nix

diff --git a/pkgs/development/libraries/javascript/jquery/default.nix b/pkgs/development/libraries/javascript/jquery/default.nix
new file mode 100644
index 000000000000..7dd2b6284fa3
--- /dev/null
+++ b/pkgs/development/libraries/javascript/jquery/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, compressed ? true }:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  name = "jquery-1.11.1";
+
+  src = if compressed then
+    fetchurl {
+      url = "http://code.jquery.com/${name}.min.js";
+      sha256 = "0hgly37jhg0n5cqlx3ylmwcxkxmbkvv07f9z9pm94jyxq7gcc2sl";
+    }
+    else
+    fetchurl {
+      url = "http://code.jquery.com/${name}.js";
+      sha256 = "1g7nhy8dwzzai7h7m800fsig4gzw34kjxxbpqdac2y8ch9586a9h";
+    };
+
+  unpackPhase = "true";
+
+  installPhase =
+    ''
+      mkdir -p "$out/js"
+      cp -v "$src" "$out/js/jquery.js"
+      ${optionalString compressed ''
+        (cd "$out/js" && ln -s jquery.js jquery.min.js)
+      ''}
+    '';
+
+  meta = with stdenv.lib; {
+    description = "JavaScript library designed to simplify the client-side scripting of HTML";
+    homepage = http://jquery.com/;
+    license = licenses.mit;
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c562c530ba19..550f36680751 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6695,6 +6695,8 @@ let
 
   ### DEVELOPMENT / LIBRARIES / JAVASCRIPT
 
+  jquery = callPackage ../development/libraries/javascript/jquery { };
+
   jquery-ui = callPackage ../development/libraries/javascript/jquery-ui { };
 
   yuicompressor = callPackage ../development/tools/yuicompressor { };

From 130e56cd422342b7e370738d6cf52d8726868a56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 7 Sep 2014 12:40:35 +0200
Subject: [PATCH 1439/1453] nixos.tests.gnome3: wait 20sec for the screenshot

---
 nixos/tests/gnome3.nix    | 2 +-
 nixos/tests/gnome3_12.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/gnome3.nix b/nixos/tests/gnome3.nix
index 44668f57fc1e..df30283e3155 100644
--- a/nixos/tests/gnome3.nix
+++ b/nixos/tests/gnome3.nix
@@ -23,7 +23,7 @@ import ./make-test.nix {
 
       $machine->succeed("su - alice -c 'DISPLAY=:0.0 gnome-terminal &'");
       $machine->waitForWindow(qr/Terminal/);
-      $machine->sleep(10);
+      $machine->sleep(20);
       $machine->screenshot("screen");
     '';
 
diff --git a/nixos/tests/gnome3_12.nix b/nixos/tests/gnome3_12.nix
index 439674b69d5d..723d1bc45229 100644
--- a/nixos/tests/gnome3_12.nix
+++ b/nixos/tests/gnome3_12.nix
@@ -24,7 +24,7 @@ import ./make-test.nix {
 
       $machine->succeed("su - alice -c 'DISPLAY=:0.0 gnome-terminal &'");
       $machine->waitForWindow(qr/Terminal/);
-      $machine->sleep(10);
+      $machine->sleep(20);
       $machine->screenshot("screen");
     '';
 

From dce3e9261bd6d2fdd764b4d0394bae19791e8337 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 7 Sep 2014 14:48:48 +0200
Subject: [PATCH 1440/1453] pypy: disable some more packages

---
 pkgs/top-level/python-packages.nix | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f97da897ba5c..705e66966953 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4138,11 +4138,11 @@ rec {
     };
   };
 
-  ipdb = buildPythonPackage {
-    name = "ipdb-0.7";
+  ipdb = buildPythonPackage rec {
+    name = "ipdb-0.8";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/i/ipdb/ipdb-0.7.tar.gz";
-      md5 = "d879f9b2b0f26e0e999809585dcaec61";
+      url = "http://pypi.python.org/packages/source/i/ipdb/${name}.zip";
+      md5 = "96dca0712efa01aa5eaf6b22071dd3ed";
     };
     propagatedBuildInputs = [ pythonPackages.ipythonLight ];
   };
@@ -5356,13 +5356,13 @@ rec {
     };
   };
 
-  livestreamer = if isPy34 then null else (buildPythonPackage rec {
-    version = "1.8.2";
+  livestreamer = buildPythonPackage rec {
+    version = "1.10.2";
     name = "livestreamer-${version}";
 
     src = fetchurl {
       url = "https://github.com/chrippa/livestreamer/archive/v${version}.tar.gz";
-      sha256 = "130h97qdb7qx8xg0gz54p5a6cb2zbffi5hsi305xf0ah9nf4rbrc";
+      sha256 = "0f1m51wax4q17ida4h0ckyakmlchf36kbhfa9qs6bpxc6xqqbry0";
     };
 
     buildInputs = [ pkgs.makeWrapper ];
@@ -5379,7 +5379,7 @@ rec {
       '';
       license = "bsd";
     };
-  });
+  };
 
   oauth2 = buildPythonPackage (rec {
     name = "oauth2-1.5.211";
@@ -6365,6 +6365,7 @@ rec {
   pygpgme = buildPythonPackage rec {
     version = "0.3";
     name = "pygpgme-${version}";
+    disabled = isPyPy;
 
     src = fetchurl {
       url = "https://launchpad.net/pygpgme/trunk/${version}/+download/${name}.tar.gz";
@@ -6441,6 +6442,7 @@ rec {
 
   pyodbc = buildPythonPackage rec {
     name = "pyodbc-3.0.7";
+    disabled = isPyPy;  # use pypypdbc instead
 
     src = fetchurl {
       url = "https://pyodbc.googlecode.com/files/${name}.zip";
@@ -9258,6 +9260,7 @@ rec {
 
   zfec = buildPythonPackage (rec {
     name = "zfec-1.4.24";
+    disabled = isPyPy;
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/z/zfec/${name}.tar.gz";
@@ -9331,6 +9334,7 @@ rec {
 
   zodbpickle = pythonPackages.buildPythonPackage rec {
     name = "zodbpickle-0.5.2";
+    disabled = isPyPy; # https://github.com/zopefoundation/zodbpickle/issues/10
 
     src = fetchurl {
       url = "https://pypi.python.org/packages/source/z/zodbpickle/${name}.tar.gz";
@@ -9729,11 +9733,13 @@ rec {
 
 
   zope_sqlalchemy = buildPythonPackage rec {
-    name = "zope.sqlalchemy-0.7.3";
+    name = "zope.sqlalchemy-0.7.5";
+
+    doCheck = !isPyPy; # https://github.com/zopefoundation/zope.sqlalchemy/issues/12
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/z/zope.sqlalchemy/${name}.zip";
-      md5 = "8b317b41244fc2e67f2f286890ba59a0";
+      md5 = "0a468bd5b8884cd29fb71acbf7eaa31e";
     };
 
     buildInputs = [ zope_testing zope_interface ];

From c839205a69165804637b80550c2b1882248456dd Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Sun, 7 Sep 2014 16:23:23 +0200
Subject: [PATCH 1441/1453] added libfreefare

A library on top of libnfc for MIFARE support.
---
 lib/maintainers.nix                           |  1 +
 .../libraries/libfreefare/default.nix         | 21 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/libraries/libfreefare/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 11325a011e4b..c52b66380399 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -28,6 +28,7 @@
   bjg = "Brian Gough <bjg@gnu.org>";
   bjornfor = "Bjørn Forsman <bjorn.forsman@gmail.com>";
   bluescreen303 = "Mathijs Kwik <mathijs@bluescreen303.nl>";
+  bobvanderlinden = "Bob van der Linden <bobvanderlinden@gmail.com>";
   bodil = "Bodil Stokke <nix@bodil.org>";
   bosu = "Boris Sukholitko <boriss@gmail.com>";
   calrama = "Moritz Maxeiner <moritz@ucworks.org>";
diff --git a/pkgs/development/libraries/libfreefare/default.nix b/pkgs/development/libraries/libfreefare/default.nix
new file mode 100644
index 000000000000..17afa9423b0e
--- /dev/null
+++ b/pkgs/development/libraries/libfreefare/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, pkgconfig, libnfc, openssl }:
+
+stdenv.mkDerivation rec {
+  name = "libfreefare-${version}";
+  version = "0.4.0";
+
+  src = fetchurl {
+    url = "https://libfreefare.googlecode.com/files/libfreefare-0.4.0.tar.bz2";
+    sha256 = "0r5wfvwgf35lb1v65wavnwz2wlfyfdims6a9xpslf4lsm4a1v8xz";
+  };
+
+  buildInputs = [ pkgconfig libnfc openssl ];
+
+  meta = with stdenv.lib; {
+    description = "The libfreefare project aims to provide a convenient API for MIFARE card manipulations";
+    license = licenses.gpl3;
+    homepage = http://code.google.com/p/libfreefare/;
+    maintainers = with maintainers; [bobvanderlinden];
+    platforms = with platforms; unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 46166d608ef3..2abd6f4a13d3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5339,6 +5339,8 @@ let
 
   libffi = callPackage ../development/libraries/libffi { };
 
+  libfreefare = callPackage ../development/libraries/libfreefare { };
+
   libftdi = callPackage ../development/libraries/libftdi { };
 
   libftdi1 = callPackage ../development/libraries/libftdi/1.x.nix { };

From 5c6e4e7433247bda35ae994ccf793d61c8259d62 Mon Sep 17 00:00:00 2001
From: Igor Pashev <pashev.igor@gmail.com>
Date: Sun, 7 Sep 2014 17:50:51 +0200
Subject: [PATCH 1442/1453] Updated Mediawiki to 1.23.3

Removed mediawiki-postgresql-fixes.patch (fixed upstream)
---
 .../mediawiki-postgresql-fixes.patch          | 22 -------------------
 .../web-servers/apache-httpd/mediawiki.nix    |  6 ++---
 2 files changed, 2 insertions(+), 26 deletions(-)
 delete mode 100644 nixos/modules/services/web-servers/apache-httpd/mediawiki-postgresql-fixes.patch

diff --git a/nixos/modules/services/web-servers/apache-httpd/mediawiki-postgresql-fixes.patch b/nixos/modules/services/web-servers/apache-httpd/mediawiki-postgresql-fixes.patch
deleted file mode 100644
index c46d492dc7a9..000000000000
--- a/nixos/modules/services/web-servers/apache-httpd/mediawiki-postgresql-fixes.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/includes/specials/SpecialActiveusers.php b/includes/specials/SpecialActiveusers.php
-index f739d3b..fdd8db3 100644
---- a/includes/specials/SpecialActiveusers.php
-+++ b/includes/specials/SpecialActiveusers.php
-@@ -112,7 +112,7 @@ class ActiveUsersPager extends UsersPager {
- 		return array(
- 			'tables' => array( 'querycachetwo', 'user', 'recentchanges' ),
- 			'fields' => array( 'user_name', 'user_id', 'recentedits' => 'COUNT(*)', 'qcc_title' ),
--			'options' => array( 'GROUP BY' => array( 'qcc_title' ) ),
-+			'options' => array( 'GROUP BY' => array( 'qcc_title', 'user_name', 'user_id' ) ),
- 			'conds' => $conds
- 		);
- 	}
-@@ -349,7 +349,7 @@ class SpecialActiveUsers extends SpecialPage {
- 			__METHOD__,
- 			array(
- 				'GROUP BY' => array( 'rc_user_text' ),
--				'ORDER BY' => 'NULL' // avoid filesort
-+				'ORDER BY' => 'lastedittime DESC'
- 			)
- 		);
- 		$names = array();
diff --git a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
index bb066aa6c476..d7bdd81b7ebe 100644
--- a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
@@ -72,15 +72,13 @@ let
 
   # Unpack Mediawiki and put the config file in its root directory.
   mediawikiRoot = pkgs.stdenv.mkDerivation rec {
-    name= "mediawiki-1.23.1";
+    name= "mediawiki-1.23.3";
 
     src = pkgs.fetchurl {
       url = "http://download.wikimedia.org/mediawiki/1.23/${name}.tar.gz";
-      sha256 = "07z5j8d988cdg4ml4n0vs9fwmj0p594ibbqdid16faxwqm52dkhl";
+      sha256 = "0l6798jwjwk2khfnm84mgc65ij53a8pnv30wdnn15ys4ivia4bpf";
     };
 
-    patches = [ ./mediawiki-postgresql-fixes.patch ];
-
     skins = config.skins;
 
     buildPhase =

From 79411db08b86a606f3658c66f05e0508e933c8f5 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Wed, 27 Aug 2014 11:53:08 +0200
Subject: [PATCH 1443/1453] Export options.json & options.xml for building
 tools for NixOS.

---
 nixos/doc/manual/default.nix | 49 +++++++++++++++++++++++++++++++-----
 1 file changed, 43 insertions(+), 6 deletions(-)

diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix
index 47e01437ccc4..bd89ad4eb9cc 100644
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@@ -6,12 +6,21 @@ with pkgs.lib;
 let
 
   # Remove invisible and internal options.
-  options' = filter (opt: opt.visible && !opt.internal) (optionAttrSetToDocList options);
+  optionsList = filter (opt: opt.visible && !opt.internal) (optionAttrSetToDocList options);
+
+  # Replace functions by the string <function>
+  substFunction = x:
+    if builtins.isAttrs x then mapAttrs (name: substFunction) x
+    else if builtins.isList x then map substFunction x
+    else if builtins.isFunction x then "<function>"
+    else x;
 
   # Clean up declaration sites to not refer to the NixOS source tree.
-  options'' = flip map options' (opt: opt // {
+  optionsList' = flip map optionsList (opt: opt // {
     declarations = map (fn: stripPrefix fn) opt.declarations;
-  });
+  }
+  // optionalAttrs (opt ? example) { example = substFunction opt.example; }
+  // optionalAttrs (opt ? default) { default = substFunction opt.default; });
 
   prefix = toString ../../..;
 
@@ -21,10 +30,35 @@ let
     else
       fn;
 
-  optionsXML = builtins.toFile "options.xml" (builtins.unsafeDiscardStringContext (builtins.toXML options''));
+  # Convert the list of options into an XML file and a JSON file.  The builtin
+  # unsafeDiscardStringContext is used to prevent the realisation of the store
+  # paths which are used in options definitions.
+  optionsXML = builtins.toFile "options.xml" (builtins.unsafeDiscardStringContext (builtins.toXML optionsList'));
+  optionsJSON = builtins.toFile "options.json" (builtins.unsafeDiscardStringContext (builtins.toJSON optionsList'));
+
+  # Tools-friendly version of the list of NixOS options.
+  options' = stdenv.mkDerivation {
+    name = "options";
+
+    buildCommand = ''
+      # Export list of options in different format.
+      dst=$out/share/doc/nixos
+      mkdir -p $dst
+
+      cp ${optionsJSON} $dst/options.json
+      cp ${optionsXML} $dst/options.xml
+
+      mkdir -p $out/nix-support
+      echo "file json $dst/options.json" >> $out/nix-support/hydra-build-products
+      echo "file xml $dst/options.xml" >> $out/nix-support/hydra-build-products
+    ''; # */
+
+    meta.description = "List of NixOS options in various formats.";
+  };
 
   optionsDocBook = runCommand "options-db.xml" {} ''
-    if grep /nixpkgs/nixos/modules ${optionsXML}; then
+    optionsXML=${options'}/doc/share/nixos/options.xml
+    if grep /nixpkgs/nixos/modules $optionsXML; then
       echo "The manual appears to depend on the location of Nixpkgs, which is bad"
       echo "since this prevents sharing via the NixOS channel.  This is typically"
       echo "caused by an option default that refers to a relative path (see above"
@@ -33,7 +67,7 @@ let
     fi
     ${libxslt}/bin/xsltproc \
       --stringparam revision '${revision}' \
-      -o $out ${./options-to-docbook.xsl} ${optionsXML}
+      -o $out ${./options-to-docbook.xsl} $optionsXML
   '';
 
   sources = sourceFilesBySuffices ./. [".xml"];
@@ -49,6 +83,9 @@ let
 
 in rec {
 
+  # Tools-friendly version of the list of NixOS options.
+  options = options';
+
   # Generate the NixOS manual.
   manual = stdenv.mkDerivation {
     name = "nixos-manual";

From bb944b4dc80e7b2a22ac8e76355e7bf80aec6636 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Fri, 29 Aug 2014 14:38:19 +0200
Subject: [PATCH 1444/1453] Annotate option-set options with the file in which
 they are declared.

This modification improves NixOS manual by listing in which file, each
submodule option is declared.  This solve the issue that files are not
reported when looking at options such as fileSystems.<name?>.neededForBoot
---
 lib/modules.nix | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/lib/modules.nix b/lib/modules.nix
index 9fe26083cfd4..31134c66276b 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -132,7 +132,12 @@ rec {
      The exception is the ‘options’ attribute, which specifies
      sub-options.  These can be specified multiple times to allow one
      module to add sub-options to an option declared somewhere else
-     (e.g. multiple modules define sub-options for ‘fileSystems’). */
+     (e.g. multiple modules define sub-options for ‘fileSystems’).
+
+     'loc' is the list of attribute names where the option is located.
+
+     'opts' is a list of modules.  Each module has an options attribute which
+     correspond to the definition of 'loc' in 'opt.file'. */
   mergeOptionDecls = loc: opts:
     fold (opt: res:
       if opt.options ? default && res ? default ||
@@ -143,9 +148,23 @@ rec {
       then
         throw "The option `${showOption loc}' in `${opt.file}' is already declared in ${showFiles res.declarations}."
       else
-        opt.options // res //
+        let
+          /* Add the modules of the current option to the list of modules
+             already collected.  The options attribute except either a list of
+             submodules or a submodule. For each submodule, we add the file of the
+             current option declaration as the file use for the submodule.  If the
+             submodule defines any filename, then we ignore the enclosing option file. */
+          options' = toList opt.options.options;
+          coerceOption = file: opt:
+            if isFunction opt then args: { _file = file; } // (opt args)
+            else args: { _file = file; options = opt; };
+          submodules =
+            if opt.options ? options
+            then map (coerceOption opt.file) options' ++ res.options
+            else res.options;
+        in opt.options // res //
           { declarations = [opt.file] ++ res.declarations;
-            options = if opt.options ? options then [(toList opt.options.options ++ res.options)] else [];
+            options = submodules;
           }
     ) { inherit loc; declarations = []; options = []; } opts;
 
@@ -276,12 +295,8 @@ rec {
      optionSet to configOf.  FIXME: remove eventually. */
   fixupOptionType = loc: opt:
     let
-      options' = opt.options or
+      options = opt.options or
         (throw "Option `${showOption loc'}' has type optionSet but has no option attribute, in ${showFiles opt.declarations}.");
-      coerce = x:
-        if isFunction x then x
-        else { config, ... }: { options = x; };
-      options = map coerce (flatten options');
       f = tp:
         if tp.name == "option set" || tp.name == "submodule" then
           throw "The option ${showOption loc} uses submodules without a wrapping type, in ${showFiles opt.declarations}."

From b5f0cc3cdaa70673a6229f01dc1104a272120b59 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Fri, 29 Aug 2014 16:42:44 +0200
Subject: [PATCH 1445/1453] Merge options having the submodule type.

Now we should be able to have multiple declaration of the same option as
long as all declarations have the same type.  If the type has a sub module,
then it is merged with the submodules of other declarations, as done with
option sets.

In addition, the file of the option declaration is passed into the
submodule, such as the documentation can display it correctly.
---
 lib/modules.nix | 21 +++++++++++++++------
 lib/types.nix   | 21 ++++++++++++++++++++-
 2 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/lib/modules.nix b/lib/modules.nix
index 31134c66276b..1d428311cd19 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -144,7 +144,8 @@ rec {
          opt.options ? example && res ? example ||
          opt.options ? description && res ? description ||
          opt.options ? apply && res ? apply ||
-         opt.options ? type && res ? type
+         # Accept to merge options which have identical types.
+         opt.options ? type && res ? type && opt.options.type.name != res.type.name
       then
         throw "The option `${showOption loc}' in `${opt.file}' is already declared in ${showFiles res.declarations}."
       else
@@ -155,12 +156,16 @@ rec {
              current option declaration as the file use for the submodule.  If the
              submodule defines any filename, then we ignore the enclosing option file. */
           options' = toList opt.options.options;
+          addModuleFile = m:
+            if isFunction m then args: { _file = opt.file; } // (m args)
+            else { _file = opt.file; } // m;
           coerceOption = file: opt:
             if isFunction opt then args: { _file = file; } // (opt args)
-            else args: { _file = file; options = opt; };
+            else { _file = file; options = opt; };
+          getSubModules = opt.options.type.getSubModules or null;
           submodules =
-            if opt.options ? options
-            then map (coerceOption opt.file) options' ++ res.options
+            if getSubModules != null then map addModuleFile getSubModules ++ res.options
+            else if opt.options ? options then map (coerceOption opt.file) options' ++ res.options
             else res.options;
         in opt.options // res //
           { declarations = [opt.file] ++ res.declarations;
@@ -292,7 +297,8 @@ rec {
     in sort compare defs';
 
   /* Hack for backward compatibility: convert options of type
-     optionSet to configOf.  FIXME: remove eventually. */
+     optionSet to options of type submodule.  FIXME: remove
+     eventually. */
   fixupOptionType = loc: opt:
     let
       options = opt.options or
@@ -305,7 +311,10 @@ rec {
         else if tp.name == "list of option sets" then types.listOf (types.submodule options)
         else if tp.name == "null or option set" then types.nullOr (types.submodule options)
         else tp;
-    in opt // { type = f (opt.type or types.unspecified); };
+    in
+      if opt.type.getSubModules or null == null
+      then opt // { type = f (opt.type or types.unspecified); }
+      else opt // { type = opt.type.substSubModules opt.options; options = []; };
 
 
   /* Properties. */
diff --git a/lib/types.nix b/lib/types.nix
index 0e2b6515e165..783e07cdc721 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -33,9 +33,14 @@ rec {
     , # Return a flat list of sub-options.  Used to generate
       # documentation.
       getSubOptions ? prefix: {}
+    , # List of modules if any, or null if none.
+      getSubModules ? null
+    , # Function for building the same option type  with a different list of
+      # modules.
+      substSubModules ? m: null
     }:
     { _type = "option-type";
-      inherit name check merge getSubOptions;
+      inherit name check merge getSubOptions getSubModules substSubModules;
     };
 
 
@@ -110,6 +115,8 @@ rec {
           elemType.merge (loc ++ ["[${toString n}-${toString m}]"])
             [{ inherit (def) file; value = def'; }]) def.value) defs);
       getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["*"]);
+      getSubModules = elemType.getSubModules;
+      substSubModules = m: listOf (elemType.substSubModules m);
     };
 
     attrsOf = elemType: mkOptionType {
@@ -121,6 +128,8 @@ rec {
           (map (def: listToAttrs (mapAttrsToList (n: def':
             { name = n; value = { inherit (def) file; value = def'; }; }) def.value)) defs);
       getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["<name>"]);
+      getSubModules = elemType.getSubModules;
+      substSubModules = m: attrsOf (elemType.substSubModules m);
     };
 
     # List or attribute set of ...
@@ -147,12 +156,16 @@ rec {
           else false;
         merge = loc: defs: attrOnly.merge loc (imap convertIfList defs);
         getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["<name?>"]);
+        getSubModules = elemType.getSubModules;
+        substSubModules = m: loaOf (elemType.substSubModules m);
       };
 
     uniq = elemType: mkOptionType {
       inherit (elemType) name check;
       merge = mergeOneOption;
       getSubOptions = elemType.getSubOptions;
+      getSubModules = elemType.getSubModules;
+      substSubModules = m: uniq (elemType.substSubModules m);
     };
 
     nullOr = elemType: mkOptionType {
@@ -165,6 +178,8 @@ rec {
           throw "The option `${showOption loc}' is defined both null and not null, in ${showFiles (getFiles defs)}."
         else elemType.merge loc defs;
       getSubOptions = elemType.getSubOptions;
+      getSubModules = elemType.getSubModules;
+      substSubModules = m: nullOr (elemType.substSubModules m);
     };
 
     functionTo = elemType: mkOptionType {
@@ -173,6 +188,8 @@ rec {
       merge = loc: defs:
         fnArgs: elemType.merge loc (map (fn: { inherit (fn) file; value = fn.value fnArgs; }) defs);
       getSubOptions = elemType.getSubOptions;
+      getSubModules = elemType.getSubModules;
+      substSubModules = m: functionTo (elemType.substSubModules m);
     };
 
     submodule = opts:
@@ -192,6 +209,8 @@ rec {
           { modules = opts'; inherit prefix;
             # FIXME: hack to get shit to evaluate.
             args = { name = ""; }; }).options;
+        getSubModules = opts';
+        substSubModules = m: submodule m;
       };
 
     enum = values: mkOptionType {

From becde6132bf4847b80666aecb619032c286cc733 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Fri, 29 Aug 2014 22:38:12 +0200
Subject: [PATCH 1446/1453] Replace environment.profileVariables by
 environment.profileRelativeEnvVars

---
 nixos/modules/config/shells-environment.nix | 43 ++++++++++++---------
 nixos/modules/programs/environment.nix      | 37 +++++++++---------
 2 files changed, 43 insertions(+), 37 deletions(-)

diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix
index 2559c53ac163..e5b342afcc41 100644
--- a/nixos/modules/config/shells-environment.nix
+++ b/nixos/modules/config/shells-environment.nix
@@ -9,6 +9,23 @@ let
 
   cfg = config.environment;
 
+  exportedEnvVars =
+    let
+      absoluteVariables =
+        mapAttrs (n: toList) cfg.variables;
+
+      suffixedVariables =
+        flip mapAttrs cfg.profileRelativeEnvVars (envVar: listSuffixes:
+          concatMap (profile: map (suffix: "${profile}${suffix}") listSuffixes) cfg.profiles
+        );
+
+      allVariables =
+        zipAttrsWith (n: concatLists) [ absoluteVariables suffixedVariables ];
+
+      exportVariables =
+        mapAttrsToList (n: v: ''export ${n}="${concatStringsSep ":" v}"'') allVariables;
+    in
+      concatStringsSep "\n" exportVariables;
 in
 
 {
@@ -49,22 +66,15 @@ in
       type = types.listOf types.string;
     };
 
-    environment.profileVariables = mkOption {
-      default = (p: {});
+    environment.profileRelativeEnvVars = mkOption {
+      type = types.attrsOf (types.listOf types.str);
+      example = { PATH = [ "/bin" "/sbin" ]; MANPATH = [ "/man" "/share/man" ]; };
       description = ''
-        A function which given a profile path should give back
-        a set of environment variables for that profile.
+	Attribute set of environment variable.  Each attribute maps to a list
+	of relative paths.  Each relative path is appended to the each profile
+        of <option>environment.profiles</option> to form the content of the
+        corresponding environment variable.
       '';
-      # !!! this should be of the following type:
-      #type = types.functionTo (types.attrsOf (types.optionSet envVar));
-      # and envVar should be changed to something more like environOpts.
-      # Having unique `value' _or_ multiple `list' is much more useful
-      # than just sticking everything together with ':' unconditionally.
-      # Anyway, to have this type mentioned above
-      # types.optionSet needs to be transformed into a type constructor
-      # (it has a !!! mark on that in nixpkgs)
-      # for now we hack all this to be
-      type = types.functionTo (types.attrsOf (types.listOf types.string));
     };
 
     # !!! isn't there a better way?
@@ -165,10 +175,7 @@ in
 
     system.build.setEnvironment = pkgs.writeText "set-environment"
        ''
-         ${concatStringsSep "\n" (
-           (mapAttrsToList (n: v: ''export ${n}="${concatStringsSep ":" v}"'')
-             # This line is a kind of a hack because of !!! note above
-             (zipAttrsWith (const concatLists) ([ (mapAttrs (n: v: [ v ]) cfg.variables) ] ++ map cfg.profileVariables cfg.profiles))))}
+         ${exportedEnvVars}
 
          ${cfg.extraInit}
 
diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix
index 6bf984420137..623a428fc1a6 100644
--- a/nixos/modules/programs/environment.nix
+++ b/nixos/modules/programs/environment.nix
@@ -37,25 +37,24 @@ in
         "/run/current-system/sw"
       ];
 
-    # !!! fix environment.profileVariables definition and then move
-    # most of these elsewhere
-    environment.profileVariables = (i:
-      { PATH = [ "${i}/bin" "${i}/sbin" "${i}/lib/kde4/libexec" ];
-        MANPATH = [ "${i}/man" "${i}/share/man" ];
-        INFOPATH = [ "${i}/info" "${i}/share/info" ];
-        PKG_CONFIG_PATH = [ "${i}/lib/pkgconfig" ];
-        TERMINFO_DIRS = [ "${i}/share/terminfo" ];
-        PERL5LIB = [ "${i}/lib/perl5/site_perl" ];
-        ALSA_PLUGIN_DIRS = [ "${i}/lib/alsa-lib" ];
-        KDEDIRS = [ "${i}" ];
-        STRIGI_PLUGIN_PATH = [ "${i}/lib/strigi/" ];
-        QT_PLUGIN_PATH = [ "${i}/lib/qt4/plugins" "${i}/lib/kde4/plugins" ];
-        QTWEBKIT_PLUGIN_PATH = [ "${i}/lib/mozilla/plugins/" ];
-        GTK_PATH = [ "${i}/lib/gtk-2.0" "${i}/lib/gtk-3.0" ];
-        XDG_CONFIG_DIRS = [ "${i}/etc/xdg" ];
-        XDG_DATA_DIRS = [ "${i}/share" ];
-        MOZ_PLUGIN_PATH = [ "${i}/lib/mozilla/plugins" ];
-      });
+    # TODO: move most of these elsewhere
+    environment.profileRelativeEnvVars =
+      { PATH = [ "/bin" "/sbin" "/lib/kde4/libexec" ];
+        MANPATH = [ "/man" "/share/man" ];
+        INFOPATH = [ "/info" "/share/info" ];
+        PKG_CONFIG_PATH = [ "/lib/pkgconfig" ];
+        TERMINFO_DIRS = [ "/share/terminfo" ];
+        PERL5LIB = [ "/lib/perl5/site_perl" ];
+        ALSA_PLUGIN_DIRS = [ "/lib/alsa-lib" ];
+        KDEDIRS = [ "" ];
+        STRIGI_PLUGIN_PATH = [ "/lib/strigi/" ];
+        QT_PLUGIN_PATH = [ "/lib/qt4/plugins" "/lib/kde4/plugins" ];
+        QTWEBKIT_PLUGIN_PATH = [ "/lib/mozilla/plugins/" ];
+        GTK_PATH = [ "/lib/gtk-2.0" "/lib/gtk-3.0" ];
+        XDG_CONFIG_DIRS = [ "/etc/xdg" ];
+        XDG_DATA_DIRS = [ "/share" ];
+        MOZ_PLUGIN_PATH = [ "/lib/mozilla/plugins" ];
+      };
 
     environment.extraInit =
       ''

From 4ff1ab5a56f1280d2de319ad4eb4b2796e07ed35 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Fri, 29 Aug 2014 22:40:17 +0200
Subject: [PATCH 1447/1453] Remove types.functionTo.

---
 lib/types.nix | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/lib/types.nix b/lib/types.nix
index 783e07cdc721..1e7abf36535f 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -182,16 +182,6 @@ rec {
       substSubModules = m: nullOr (elemType.substSubModules m);
     };
 
-    functionTo = elemType: mkOptionType {
-      name = "function that evaluates to a(n) ${elemType.name}";
-      check = isFunction;
-      merge = loc: defs:
-        fnArgs: elemType.merge loc (map (fn: { inherit (fn) file; value = fn.value fnArgs; }) defs);
-      getSubOptions = elemType.getSubOptions;
-      getSubModules = elemType.getSubModules;
-      substSubModules = m: functionTo (elemType.substSubModules m);
-    };
-
     submodule = opts:
       let
         opts' = toList opts;

From 970f51ac0afebcda177010bc5a807c874c36bcba Mon Sep 17 00:00:00 2001
From: Andreas Herrmann <andreash87@gmx.ch>
Date: Sun, 7 Sep 2014 19:44:08 +0200
Subject: [PATCH 1448/1453] mpi4py: Disable for Python3 and PyPy

Builds for Python3 and PyPy are failing at the moment [1-3]. Therefore, they
are disabled.

[1]: https://github.com/NixOS/nixpkgs/pull/3938#issuecomment-54750065
[2]: http://hydra.nixos.org/build/13993137/nixlog/1/raw
[3]: http://hydra.nixos.org/build/13873028/log/raw
---
 pkgs/development/python-modules/mpi4py/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix
index ec181652da66..c38d948dd6be 100644
--- a/pkgs/development/python-modules/mpi4py/default.nix
+++ b/pkgs/development/python-modules/mpi4py/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python, buildPythonPackage, mpi, openssh }:
+{ stdenv, fetchurl, python, buildPythonPackage, mpi, openssh, isPy3k, isPyPy }:
 
 buildPythonPackage rec {
   name = "mpi4py-1.3.1";
@@ -45,6 +45,8 @@ buildPythonPackage rec {
   # if openssh is not present. E.g. h5py with mpi support.
   propagatedBuildInputs = [ openssh ];
 
+  disabled = isPy3k || isPyPy;
+
   meta = {
     description =
       "Python bindings for the Message Passing Interface standard";

From 073cd3cfb97221b4cd91185e65d81b6fad660564 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 7 Sep 2014 19:55:08 +0200
Subject: [PATCH 1449/1453] Update version of 'lua' and 'lua5' attributes to
 lua 5.2.

@vcunat kindly pointed out that earlier versions are vulnerable to
CVE-2014-5461. There remain a whole lot of packages that have hard-coded
use of version 5.1, unfortunately.
---
 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 944a21d7b289..a798391ccd94 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3646,7 +3646,7 @@ let
   lua5_2_compat = callPackage ../development/interpreters/lua-5/5.2.nix {
     compat = true;
   };
-  lua5 = lua5_1;
+  lua5 = lua5_2_compat;
   lua = lua5;
 
   lua5_sockets = callPackage ../development/interpreters/lua-5/sockets.nix {};

From ff85b53c5f266a6a7bbcf8b30c4eea7c3f6160ee Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 8 Sep 2014 10:22:50 +0200
Subject: [PATCH 1450/1453] highlight: update to version 3.18 to fix build
 errors with Lua 5.2

---
 pkgs/tools/text/highlight/default.nix | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix
index 9bca0a91d4fd..585f501e1fcd 100644
--- a/pkgs/tools/text/highlight/default.nix
+++ b/pkgs/tools/text/highlight/default.nix
@@ -1,19 +1,16 @@
-{ stdenv, fetchurl, getopt, lua, boost }:
-        
+{ stdenv, fetchurl, getopt, lua, boost, pkgconfig }:
+
 stdenv.mkDerivation rec {
-  name = "highlight-3.9";
+  name = "highlight-3.18";
 
   src = fetchurl {
     url = "http://www.andre-simon.de/zip/${name}.tar.bz2";
-    sha256 = "1vysj34zz8gk5yhlzm7g6lbphb8y6zfbd9smfgsgwkyawfargrja";
+    sha256 = "0jsq78qb75sawwggbpx5pdqxk00wgjr1a0la0w8wihmamsjzgijm";
   };
 
-  buildInputs = [ getopt lua boost ];
+  buildInputs = [ getopt lua boost pkgconfig ];
 
-  makeFlags = [
-    "PREFIX=$(out)"
-    "conf_dir=$(out)/etc/highlight/"
-  ];
+  preConfigure = ''makeFlags="PREFIX=$out conf_dir=$out/etc/highlight"'';
 
   meta = {
     description = "Source code highlighting tool";

From dfa6f03ea3c01331f84abf2af08e77ee10a595cf Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@immobiliare.it>
Date: Mon, 8 Sep 2014 12:00:34 +0200
Subject: [PATCH 1451/1453] Do not assert absolute path for nodev grub device.
 Closes #3996

---
 nixos/modules/system/boot/loader/grub/grub.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index 0269b95ae1db..c46b3ba705ad 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -279,7 +279,7 @@ in
     assertions = [{ assertion = !cfg.zfsSupport || cfg.version == 2;
                     message = "Only grub version 2 provides zfs support";}]
       ++ flip map cfg.devices (dev: {
-        assertion = hasPrefix "/" dev;
+        assertion = dev == "nodev" || hasPrefix "/" dev;
         message = "Grub devices must be absolute paths, not ${dev}";
       });
 

From 5e3eff3bbd9897e7f695dcbec0f1b84a21d6cba2 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Mon, 8 Sep 2014 12:07:45 +0100
Subject: [PATCH 1452/1453] haskellPackages.twitterConduit: Update to 0.0.5.8
 and remove 'broken' flag

---
 .../libraries/haskell/twitter-conduit/default.nix           | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/twitter-conduit/default.nix b/pkgs/development/libraries/haskell/twitter-conduit/default.nix
index 0d5766800442..63a490202a89 100644
--- a/pkgs/development/libraries/haskell/twitter-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/twitter-conduit/default.nix
@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "twitter-conduit";
-  version = "0.0.5.6";
-  sha256 = "1l6gk4538nqknrj082hkdy2jp4gzyq3y473p8gg4mm2n67417r9m";
+  version = "0.0.5.8";
+  sha256 = "0cpakiajrwgpg2f04nbfryajln281kgsi0ly9xnx370y5pn98r86";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -31,7 +31,5 @@ cabal.mkDerivation (self: {
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
   };
 })

From af69fcde47774876588fbf61179ca0e55fa69eac Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 8 Sep 2014 11:49:44 +0200
Subject: [PATCH 1453/1453] Fix Nixpkgs evaluation

error: attribute `luaversion' missing, at /home/eelco/Dev/nixpkgs/pkgs/development/interpreters/lua-5/expat.nix:16:34
---
 pkgs/development/interpreters/lua-5/5.2.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix
index 1839e7789a80..1812ccbf7d6e 100644
--- a/pkgs/development/interpreters/lua-5/5.2.nix
+++ b/pkgs/development/interpreters/lua-5/5.2.nix
@@ -9,8 +9,8 @@ let
 in
 stdenv.mkDerivation rec {
   name = "lua-${version}";
-  majorVersion = "5.2";
-  version = "${majorVersion}.3";
+  luaversion = "5.2";
+  version = "${luaversion}.3";
 
   src = fetchurl {
     url = "http://www.lua.org/ftp/${name}.tar.gz";
@@ -24,17 +24,17 @@ stdenv.mkDerivation rec {
   configurePhase =
     if stdenv.isDarwin
     then ''
-    makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=macosx CFLAGS="-DLUA_USE_LINUX -fno-common -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDFLAGS="-fPIC" V=${majorVersion} R=${version} )
+    makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=macosx CFLAGS="-DLUA_USE_LINUX -fno-common -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDFLAGS="-fPIC" V=${luaversion} R=${version} )
     installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.${version}.dylib" INSTALL_DATA='cp -d' )
   '' else ''
-    makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-DLUA_USE_LINUX -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDFLAGS="-fPIC" V=${majorVersion} R=${version} )
-    installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.a liblua.so liblua.so.${majorVersion} liblua.so.${version}" INSTALL_DATA='cp -d' )
+    makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-DLUA_USE_LINUX -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDFLAGS="-fPIC" V=${luaversion} R=${version} )
+    installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.a liblua.so liblua.so.${luaversion} liblua.so.${version}" INSTALL_DATA='cp -d' )
   '';
 
   postInstall = ''
     mkdir -p "$out/share/doc/lua" "$out/lib/pkgconfig"
     mv "doc/"*.{gif,png,css,html} "$out/share/doc/lua/"
-    rmdir $out/{share,lib}/lua/${majorVersion} $out/{share,lib}/lua
+    rmdir $out/{share,lib}/lua/${luaversion} $out/{share,lib}/lua
     mkdir -p "$out/lib/pkgconfig"
     cat >"$out/lib/pkgconfig/lua.pc" <<EOF
     prefix=$out
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
         CC=${stdenv.cross.config}-gcc
         STRIP=:
         RANLIB=${stdenv.cross.config}-ranlib
-        V=${majorVersion}
+        V=${luaversion}
         R=${version}
         ${if isMingw then "mingw" else stdenv.lib.optionalString isDarwin ''
         AR="${stdenv.cross.config}-ar rcu"